[Pkg-voip-commits] r7833 - in /asterisk/branches/lenny/debian: changelog patches/r159246 patches/r201993 patches/r206385 patches/regression-iax-apathetic-reply patches/series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Nov 30 03:27:39 2009
New Revision: 7833

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7833
Log:
Merge r201993, r206385, r159246 into a single patch for ease of review since they touch the same code and are similar

Added:
    asterisk/branches/lenny/debian/patches/regression-iax-apathetic-reply
Removed:
    asterisk/branches/lenny/debian/patches/r159246
    asterisk/branches/lenny/debian/patches/r201993
    asterisk/branches/lenny/debian/patches/r206385
Modified:
    asterisk/branches/lenny/debian/changelog
    asterisk/branches/lenny/debian/patches/series

Modified: asterisk/branches/lenny/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny/debian/changelog?rev=7833&op=diff
==============================================================================
--- asterisk/branches/lenny/debian/changelog (original)
+++ asterisk/branches/lenny/debian/changelog Mon Nov 30 03:27:39 2009
@@ -22,7 +22,7 @@
     Thanks to Wolfgang Pichler. (Closes: #554820)
   * Create the /usr/share/asterisk/agi-bin directory. (Closes: #463983)
 
- -- Faidon Liambotis <paravoid at debian.org>  Sat, 07 Nov 2009 12:41:24 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 30 Nov 2009 05:26:29 +0200
 
 asterisk (1:1.4.21.2~dfsg-3) unstable; urgency=medium
 

Added: asterisk/branches/lenny/debian/patches/regression-iax-apathetic-reply
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny/debian/patches/regression-iax-apathetic-reply?rev=7833&op=file
==============================================================================
--- asterisk/branches/lenny/debian/patches/regression-iax-apathetic-reply (added)
+++ asterisk/branches/lenny/debian/patches/regression-iax-apathetic-reply Mon Nov 30 03:27:39 2009
@@ -1,0 +1,42 @@
+Upstream fixes r159246, r201993, r206385
+
+Regression fix for last security fix.  Set the iseqno correctly.
+
+timestamp was being converted to host order as a short rather than a long
+
+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.
+
+--- a/channels/chan_iax2.c
++++ b/channels/chan_iax2.c
+@@ -3171,13 +3171,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 = seqno, .type = AST_FRAME_IAX,
++		.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));
+ }
+ 
+ /*!
+@@ -7221,7 +7223,7 @@ static int socket_process(struct iax2_th
+ 		/* 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, ntohs(fh->ts), fh->oseqno);
++			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 */

Modified: asterisk/branches/lenny/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/lenny/debian/patches/series?rev=7833&op=diff
==============================================================================
--- asterisk/branches/lenny/debian/patches/series (original)
+++ asterisk/branches/lenny/debian/patches/series Mon Nov 30 03:27:39 2009
@@ -100,9 +100,7 @@
 r171264
 AST-2009-003
 
-r159246
-r201993
-r206385
+regression-iax-apathetic-reply
 #AST-2009-006
 
 AST-2009-008