Fix verbose messages when IPv6 logic was added

(closes issue ASTERISK-18612)
Reported by: Tim Osman
........

Merged revisions 340418 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 340419 from http://svn.asterisk.org/svn/asterisk/branches/10

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 06b03d3..32e0f79 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11299,7 +11299,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
                        needaudio = TRUE;
 
                if (debug) {
                        needaudio = TRUE;
 
                if (debug) {

-                       ast_verbose("Audio is at %s\n", ast_sockaddr_stringify_port(&p->ourip));
+                       ast_verbose("Audio is at %s\n", ast_sockaddr_stringify_port(&addr));

                }
 
                /* Ok, we need video. Let's add what we need for video and set codecs.
                }
 
                /* Ok, we need video. Let's add what we need for video and set codecs.

@@ -11313,7 +11313,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
                        if (p->maxcallbitrate)
                                snprintf(bandwidth, sizeof(bandwidth), "b=CT:%d\r\n", p->maxcallbitrate);
                        if (debug) {
                        if (p->maxcallbitrate)
                                snprintf(bandwidth, sizeof(bandwidth), "b=CT:%d\r\n", p->maxcallbitrate);
                        if (debug) {

-                               ast_verbose("Video is at %s\n", ast_sockaddr_stringify(&p->ourip));
+                               ast_verbose("Video is at %s\n", ast_sockaddr_stringify(&vdest));

                        }
                }
 
                        }
                }
 

@@ -11326,7 +11326,7 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
                        ast_str_append(&m_text, 0, "m=text %d RTP/%s", ast_sockaddr_port(&tdest),
                                t_a_crypto ? "SAVP" : "AVP");
                        if (debug) {  /* XXX should I use tdest below ? */
                        ast_str_append(&m_text, 0, "m=text %d RTP/%s", ast_sockaddr_port(&tdest),
                                t_a_crypto ? "SAVP" : "AVP");
                        if (debug) {  /* XXX should I use tdest below ? */

-                               ast_verbose("Text is at %s\n", ast_sockaddr_stringify(&p->ourip));
+                               ast_verbose("Text is at %s\n", ast_sockaddr_stringify(&taddr));

                        }
                }
 
                        }
                }