[asterisk-commits] tilghman: tag 1.4.21.2 r132783 - in /tags/1.4.21.2: ./ channels/ configs/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Jul 22 17:01:07 CDT 2008
Author: tilghman
Date: Tue Jul 22 17:01:07 2008
New Revision: 132783
URL: http://svn.digium.com/view/asterisk?view=rev&rev=132783
Log:
Merge security fix from 1.4 branch
Modified:
tags/1.4.21.2/ (props changed)
tags/1.4.21.2/channels/chan_iax2.c
tags/1.4.21.2/configs/iax.conf.sample
Propchange: tags/1.4.21.2/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Modified: tags/1.4.21.2/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/tags/1.4.21.2/channels/chan_iax2.c?view=diff&rev=132783&r1=132782&r2=132783
==============================================================================
--- tags/1.4.21.2/channels/chan_iax2.c (original)
+++ tags/1.4.21.2/channels/chan_iax2.c Tue Jul 22 17:01:07 2008
@@ -268,6 +268,7 @@
IAX_DELAYPBXSTART = (1 << 25), /*!< Don't start a PBX on the channel until the peer sends us a
response, so that we've achieved a three-way handshake with
them before sending voice or anything else*/
+ IAX_ALLOWFWDOWNLOAD = (1 << 26), /*!< Allow the FWDOWNL command? */
} iax2_flags;
static int global_rtautoclear = 120;
@@ -1575,10 +1576,10 @@
snprintf(host, sizeof(host), "%s:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
now = ast_tvnow();
- start = 1 + (ast_random() % (TRUNK_CALL_START - 1));
+ start = 2 + (ast_random() % (TRUNK_CALL_START - 1));
for (x = start; 1; x++) {
if (x == TRUNK_CALL_START) {
- x = 0;
+ x = 1;
continue;
}
@@ -3148,6 +3149,15 @@
char *context;
char *options;
};
+
+static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno)
+{
+ struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno),
+ .ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX,
+ .csub = compress_subclass(command) };
+
+ return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin));
+}
/*!
* \brief Parses an IAX dial string into its component parts.
@@ -7126,6 +7136,17 @@
} else {
f.subclass = uncompress_subclass(fh->csub);
}
+
+ /* 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);
+ return 1;
+ } else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) {
+ /* Ignore */
+ return 1;
+ }
+
if ((f.frametype == AST_FRAME_IAX) && ((f.subclass == IAX_COMMAND_NEW) || (f.subclass == IAX_COMMAND_REGREQ) ||
(f.subclass == IAX_COMMAND_POKE) || (f.subclass == IAX_COMMAND_FWDOWNL) ||
(f.subclass == IAX_COMMAND_REGREL)))
@@ -8356,6 +8377,10 @@
break;
case IAX_COMMAND_FWDOWNL:
/* Firmware download */
+ if (!ast_test_flag(&globalflags, IAX_ALLOWFWDOWNLOAD)) {
+ send_command_final(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_UNSUPPORT, 0, NULL, 0, -1);
+ break;
+ }
memset(&ied0, 0, sizeof(ied0));
res = iax_firmware_append(&ied0, (unsigned char *)ies.devicetype, ies.fwdesc);
if (res < 0)
@@ -9982,6 +10007,8 @@
ast_set2_flag((&globalflags), ast_true(v->value), IAX_FORCEJITTERBUF);
else if (!strcasecmp(v->name, "delayreject"))
delayreject = ast_true(v->value);
+ else if (!strcasecmp(v->name, "allowfwdownload"))
+ ast_set2_flag((&globalflags), ast_true(v->value), IAX_ALLOWFWDOWNLOAD);
else if (!strcasecmp(v->name, "rtcachefriends"))
ast_set2_flag((&globalflags), ast_true(v->value), IAX_RTCACHEFRIENDS);
else if (!strcasecmp(v->name, "rtignoreregexpire"))
Modified: tags/1.4.21.2/configs/iax.conf.sample
URL: http://svn.digium.com/view/asterisk/tags/1.4.21.2/configs/iax.conf.sample?view=diff&rev=132783&r1=132782&r2=132783
==============================================================================
--- tags/1.4.21.2/configs/iax.conf.sample (original)
+++ tags/1.4.21.2/configs/iax.conf.sample Tue Jul 22 17:01:07 2008
@@ -236,6 +236,16 @@
; The default value is 'host'
;
;codecpriority=host
+;
+; allowfwdownload controls whether this host will serve out firmware to
+; IAX clients which request it. This has only been used for the IAXy,
+; and it has been recently proven that this firmware distribution method
+; can be used as a source of traffic amplification attacks. Also, the
+; IAXy firmware has not been updated for at least 18 months, so unless
+; you are provisioning IAXys in a secure network, we recommend that you
+; leave this option to the default, off.
+;
+;allowfwdownload=yes
;rtcachefriends=yes ; Cache realtime friends by adding them to the internal list
; just like friends added from the config file only on a
More information about the asterisk-commits
mailing list