diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-11-14 09:06:33 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-14 09:06:33 -0600 |
| commit | 69d12bcf3e313801446254f394b66abc127f603f (patch) | |
| tree | 139816b717a1f54e028047dee5c2959a783dc594 | |
| parent | 9d7b0960232209d7da946ab0cd3a107ade2a0d64 (diff) | |
| parent | 96f2ee865edb787128b3c7966bb00eeb6edfa9fe (diff) | |
Merge "pjsip: Add patch to allow all transports to be destroyed."
| -rw-r--r-- | third-party/pjproject/patches/0030-sip_transport-Destroy-transports-not-in-hash.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/third-party/pjproject/patches/0030-sip_transport-Destroy-transports-not-in-hash.patch b/third-party/pjproject/patches/0030-sip_transport-Destroy-transports-not-in-hash.patch new file mode 100644 index 000000000..e42b0f7c6 --- /dev/null +++ b/third-party/pjproject/patches/0030-sip_transport-Destroy-transports-not-in-hash.patch @@ -0,0 +1,27 @@ +diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c +index e4bec24..a39b56e 100644 +--- a/pjsip/src/pjsip/sip_transport.c ++++ b/pjsip/src/pjsip/sip_transport.c +@@ -957,7 +957,21 @@ static pj_bool_t is_transport_valid(pjsip_tpmgr *tpmgr, pjsip_transport *tp, + const pjsip_transport_key *key, + int key_len) + { +- return (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp); ++ transport *tp_iter; ++ ++ if (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp) { ++ return PJ_TRUE; ++ } ++ ++ tp_iter = tpmgr->tp_list.next; ++ while (tp_iter != &tpmgr->tp_list) { ++ if (tp_iter->tp == tp) { ++ return PJ_TRUE; ++ } ++ tp_iter = tp_iter->next; ++ } ++ ++ return PJ_FALSE; + } + + /* |