If a peer uses any transport other than UDP, then MWI will

fail for that peer since sip_alloc will allocate a sip_pvt with
a default transport of UDP. This change resets the socket type
immediately after allocating the sip_pvt in sip_send_mwi_from_peer,
so that the proceeding call to create_addr_from_peer does not fail
right away. The socket data from the peer is properly copied to
the sip_pvt in create_addr_from_peer.

(closes issue #13710)
Reported by: andrew53
Patches:
      sip_notify_use_tcp.patch uploaded by andrew53 (license 519)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@151428 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 1df8b72..f141a77 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -20260,6 +20260,11 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer, const struct ast_event *e
                /* Build temporary dialog for this message */
                if (!(p = sip_alloc(NULL, NULL, 0, SIP_NOTIFY))) 
                        return -1;
+               /* If we don't set the socket type to 0, then create_addr_from_peer will fail immediately if the peer
+                * uses any transport other than UDP. We set the type to 0 here and then let create_addr_from_peer copy 
+                * the peer's socket information to the sip_pvt we just allocated
+                */
+               p->socket.type = 0;
                if (create_addr_from_peer(p, peer)) {
                        /* Maybe they're not registered, etc. */
                        dialog_unlink_all(p, TRUE, TRUE);