diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-01-25 13:42:56 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-01-25 13:42:56 +0000 |
| commit | 31f597e11a1547e0ce2932b02183f8807a6c6722 (patch) | |
| tree | 69ee18cf67fda25a88f1da66cc07839823e393fa /pjsip/include/pjsip | |
| parent | bee900b43985446ad579a2642a68ae2461dd2964 (diff) | |
Initial commit for #1033: Assertion error when shutting down PJSIP while TCP/TLS connect is in progress and a transaction is waiting
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3071 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/include/pjsip')
| -rw-r--r-- | pjsip/include/pjsip/sip_transaction.h | 5 | ||||
| -rw-r--r-- | pjsip/include/pjsip/sip_transport.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pjsip/include/pjsip/sip_transaction.h b/pjsip/include/pjsip/sip_transaction.h index eb8510ae..febc53c9 100644 --- a/pjsip/include/pjsip/sip_transaction.h +++ b/pjsip/include/pjsip/sip_transaction.h @@ -97,7 +97,6 @@ struct pjsip_transaction pj_str_t transaction_key;/**< Hash table key. */ pj_uint32_t hashed_key; /**< Key's hashed value. */ pj_str_t branch; /**< The branch Id. */ - pjsip_tpselector tp_sel; /**< Transport selector. */ /* * State and status. @@ -121,6 +120,10 @@ struct pjsip_transaction pjsip_response_addr res_addr; /**< Response address. */ unsigned transport_flag; /**< Miscelaneous flag. */ pj_status_t transport_err; /**< Internal error code. */ + pjsip_tpselector tp_sel; /**< Transport selector. */ + pjsip_tx_data *pending_tx; /**< Tdata which caused + pending transport flag + to be set on tsx. */ /* * Messages and timer. diff --git a/pjsip/include/pjsip/sip_transport.h b/pjsip/include/pjsip/sip_transport.h index b971762f..04c5255c 100644 --- a/pjsip/include/pjsip/sip_transport.h +++ b/pjsip/include/pjsip/sip_transport.h @@ -569,6 +569,10 @@ struct pjsip_tx_data */ pjsip_tpselector tp_sel; + /** + * Arbitrary data attached by PJSIP modules. + */ + void *mod_data[PJSIP_MAX_MODULE]; }; |