From 8e730ca03e8d092ff7b4726b0fea2ccd138acdcb Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 14 Jul 2009 14:56:30 +0000 Subject: [PATCH] Merged revisions 206386 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r206386 | russell | 2009-07-14 09:51:44 -0500 (Tue, 14 Jul 2009) | 20 lines Merged revisions 206385 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r206385 | russell | 2009-07-14 09:48:00 -0500 (Tue, 14 Jul 2009) | 13 lines Merged revisions 206384 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r206384 | russell | 2009-07-14 09:45:47 -0500 (Tue, 14 Jul 2009) | 6 lines Ensure apathetic replies are sent out on the proper socket. chan_iax2 supports multiple address bindings. The send_apathetic_reply() function did not attempt to send its response on the same socket that the incoming message came in on. ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@206388 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_iax2.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 569546bafb..14db61147a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3628,13 +3628,15 @@ struct parsed_dial_string { char *options; }; -static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno) +static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, + struct sockaddr_in *sin, int command, int ts, unsigned char seqno, + int sockfd) { struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno), .ts = htonl(ts), .iseqno = seqno, .oseqno = 0, .type = AST_FRAME_IAX, .csub = compress_subclass(command) }; - return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin)); + return sendto(sockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin)); } /*! @@ -8355,7 +8357,7 @@ static int socket_process(struct iax2_thread *thread) /* Deal with POKE/PONG without allocating a callno */ if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) { /* Reply back with a PONG, but don't care about the result. */ - send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohl(fh->ts), fh->iseqno + 1); + send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohl(fh->ts), fh->iseqno + 1, fd); return 1; } else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) { /* Ignore */