May 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8379 - freeswitch/trunk/conf
by Freeswitch SVN 13 May '08

13 May '08

Author: mikej Date: Tue May 13 03:45:58 2008 New Revision: 8379 Modified: freeswitch/trunk/conf/freeswitch.xml Log: having trouble with double globs, just include english for now. Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Tue May 13 03:45:58 2008 @@ -37,7 +37,7 @@  <section name="phrases" description="Speech Phrase Management"> <macros> - <X-PRE-PROCESS cmd="include" data="lang/*/*.xml"/> + <X-PRE-PROCESS cmd="include" data="lang/en/*.xml"/> </macros> </section>

1 0

[commit] r8378 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 13 May '08

13 May '08

Author: mikej Date: Tue May 13 02:59:52 2008 New Revision: 8378 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: use proper directory sep. Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue May 13 02:59:52 2008 @@ -252,7 +252,7 @@ return SWITCH_STATUS_FALSE; } - alt_path = switch_mprintf("%s/%d", path, handle->samplerate); + alt_path = switch_mprintf("%s%s%d", path, SWITCH_PATH_SEPARATOR, handle->samplerate); switch_mutex_lock(globals.mutex); if ((source = switch_core_hash_find(globals.source_hash, alt_path))) {

1 0

[commit] r8377 - freeswitch/trunk/src
by Freeswitch SVN 13 May '08

13 May '08

Author: mikej Date: Tue May 13 02:23:47 2008 New Revision: 8377 Modified: freeswitch/trunk/src/switch_stun.c Log: fix msvc build Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Tue May 13 02:23:47 2008 @@ -118,7 +118,7 @@ { switch_stun_packet_t *packet; switch_stun_packet_attribute_t *attr; - int32_t bytes_left = len; + uint32_t bytes_left = len; void *end_buf = buf + len; if (len < SWITCH_STUN_PACKET_MIN_LEN) { @@ -295,12 +295,12 @@ } while (bytes_left >= SWITCH_STUN_ATTRIBUTE_MIN_LEN && switch_stun_packet_next_attribute(attr, end_buf)); - if ((packet->header.length + 20) > (len - bytes_left)) { + if ((uint32_t)(packet->header.length + 20) > (uint32_t)(len - bytes_left)) { /* * the packet length is longer than the length of all attributes? * for now simply decrease the packet size */ - packet->header.length = (len - bytes_left) - 20; + packet->header.length = (uint16_t)((len - bytes_left) - 20); } return packet;

1 0

[commit] r8376 - in freeswitch/trunk: debian docs
by Freeswitch SVN 13 May '08

13 May '08

Author: anthm Date: Tue May 13 02:04:11 2008 New Revision: 8376 Modified: freeswitch/trunk/debian/changelog freeswitch/trunk/docs/ChangeLog Log: getting ready for rc5 Modified: freeswitch/trunk/debian/changelog ============================================================================== --- freeswitch/trunk/debian/changelog (original) +++ freeswitch/trunk/debian/changelog Tue May 13 02:04:11 2008 @@ -1,3 +1,38 @@ +freeswitch (1.0~rc5-1) unstable; urgency=low + + * Changed internal state names to avoid confusion + Fixed video negotiation + Enhanced accuracy of windows timer + Fixed mod_ldap build + Added dialplan and context to sql table for channels + Multiple fixes to mod_lua and mod_perl + Fixed logic bug in fifo causing segfault + internal changes to sip stack so we can remove a hash redundant to the stack + Fixed multiple memory leaks in mod_sofia + Fixed event fetch segfault on sip subscribe + Fixed segfault on timer rollover in sofia on 64bit + Fixed audio timing issues in mod_portaudio + Changed names of sip profiles in default config to avoid confusion + Fixed memory usage leak-like behavior when playing files requiring resampling + Removed some unused api's + Fix rtp timeout when playing moh + Removed some un-needed libraries and files from tree + Fixed multiple issues in sip stack including multiple segfaults + Added support for sip transfers on bypass_media and proxy_media calls + Added say application + Fixed --disable-debug configure option + Enhanced switch_cpp wrapper (and perl, python, lua, java) + Fixed segfault on inavalid stun response + Fixed configure help output + Fixed segfault on mp3 playback + Fixed assert on invalid sdp (missing m= line) + Added configurable windows service name + Fixed proxy mode call transition to non proxy call + Fixed solaris build of voipcodecs + Fixed sofia seg when call failure edge case + + -- Michael Jerris <mike(a)jerris.com> Tue, 13 May 2008 02:01:00 -0400 + freeswitch (1.0~8327) unstable; urgency=low * Adding perl and lua separate packages @@ -38,6 +73,16 @@ Fixed MSVC build Fixed segfault on sip SUBSCRIBE with Expires: 0 Added mod_say_zh + Added --with-pyton and --with-pyton-config configure options + Added mod_lua + Enhanced switch_cpp wrapper in core and normalized interfaces for perl, python, lua, and java + Fixed multiple issues in cpp wrapper and the languages perl, python, lua and java + Added back mod_perl + Added sofia gateway option ping to adjust options ping frequency + Added .net event socket lib to contrib + Fixed passing of exact response codes of sip across a bridge + Added mod_reference, reference endpoint module + Enhanced build so you can now make commented out modules using "make mod_name" -- Michael Jerris <mike(a)jerris.com> Wed, 23 Apr 2008 12:58:00 -0400 Modified: freeswitch/trunk/docs/ChangeLog ============================================================================== --- freeswitch/trunk/docs/ChangeLog (original) +++ freeswitch/trunk/docs/ChangeLog Tue May 13 02:04:11 2008 @@ -1,3 +1,36 @@ +freeswitch (1.0.rc5) + + Changed internal state names to avoid confusion + Fixed video negotiation + Enhanced accuracy of windows timer + Fixed mod_ldap build + Added dialplan and context to sql table for channels + Multiple fixes to mod_lua and mod_perl + Fixed logic bug in fifo causing segfault + internal changes to sip stack so we can remove a hash redundant to the stack + Fixed multiple memory leaks in mod_sofia + Fixed event fetch segfault on sip subscribe + Fixed segfault on timer rollover in sofia on 64bit + Fixed audio timing issues in mod_portaudio + Changed names of sip profiles in default config to avoid confusion + Fixed memory usage leak-like behavior when playing files requiring resampling + Removed some unused api's + Fix rtp timeout when playing moh + Removed some un-needed libraries and files from tree + Fixed multiple issues in sip stack including multiple segfaults + Added support for sip transfers on bypass_media and proxy_media calls + Added say application + Fixed --disable-debug configure option + Enhanced switch_cpp wrapper (and perl, python, lua, java) + Fixed segfault on inavalid stun response + Fixed configure help output + Fixed segfault on mp3 playback + Fixed assert on invalid sdp (missing m= line) + Added configurable windows service name + Fixed proxy mode call transition to non proxy call + Fixed solaris build of voipcodecs + Fixed sofia seg when call failure edge case + freeswitch (1.0.rc4) Add tab completion in cli @@ -32,6 +65,16 @@ Fixed MSVC build Fixed segfault on sip SUBSCRIBE with Expires: 0 Added mod_say_zh + Added --with-pyton and --with-pyton-config configure options + Added mod_lua + Enhanced switch_cpp wrapper in core and normalized interfaces for perl, python, lua, and java + Fixed multiple issues in cpp wrapper and the languages perl, python, lua and java + Added back mod_perl + Added sofia gateway option ping to adjust options ping frequency + Added .net event socket lib to contrib + Fixed passing of exact response codes of sip across a bridge + Added mod_reference, reference endpoint module + Enhanced build so you can now make commented out modules using "make mod_name" freeswitch (1.0.rc3)

1 0

[commit] r8375 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 13 May '08

13 May '08

Author: mikej Date: Mon May 12 20:50:12 2008 New Revision: 8375 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: don't pass around 0 status (possible fix for MODENDP-107) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon May 12 20:50:12 2008 @@ -226,9 +226,11 @@ if (!switch_strlen_zero(ps_cause) && !strncasecmp(ps_cause, "sip:", 4)) { int new_cause = atoi(ps_cause + 4); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Overriding SIP cause %d with %d from the other leg\n", - switch_channel_get_name(channel), sip_cause, new_cause); - sip_cause = new_cause; + if (new_cause) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Overriding SIP cause %d with %d from the other leg\n", + switch_channel_get_name(channel), sip_cause, new_cause); + sip_cause = new_cause; + } } if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) && cause != SWITCH_CAUSE_ATTENDED_TRANSFER) { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon May 12 20:50:12 2008 @@ -2106,10 +2106,12 @@ } else { cause = sofia_glue_sip_cause_to_freeswitch(status); } - switch_snprintf(st, sizeof(st), "%d", status); - switch_channel_set_variable(channel, "sip_term_status", st); - switch_snprintf(st, sizeof(st), "sip:%d", status); - switch_channel_set_variable_partner(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); + if (status) { + switch_snprintf(st, sizeof(st), "%d", status); + switch_channel_set_variable(channel, "sip_term_status", st); + switch_snprintf(st, sizeof(st), "sip:%d", status); + switch_channel_set_variable_partner(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); + } switch_snprintf(st, sizeof(st), "%d", cause); switch_channel_set_variable(channel, "sip_term_cause", st); switch_channel_hangup(channel, cause);

1 0

[commit] r8374 - freeswitch/trunk/libs/voipcodecs/src
by Freeswitch SVN 13 May '08

13 May '08

Author: mikej Date: Mon May 12 20:30:09 2008 New Revision: 8374 Added: freeswitch/trunk/libs/voipcodecs/src/bit_operations.c Modified: freeswitch/trunk/libs/voipcodecs/src/Makefile.am Log: fix for LBCODEC-2 Modified: freeswitch/trunk/libs/voipcodecs/src/Makefile.am ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/Makefile.am (original) +++ freeswitch/trunk/libs/voipcodecs/src/Makefile.am Mon May 12 20:30:09 2008 @@ -27,6 +27,7 @@ lib_LTLIBRARIES = libvoipcodecs.la libvoipcodecs_la_SOURCES = bitstream.c \ + bit_operations.c \ g711.c \ g722_encode.c \ g722_decode.c \ Added: freeswitch/trunk/libs/voipcodecs/src/bit_operations.c ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/voipcodecs/src/bit_operations.c Mon May 12 20:30:09 2008 @@ -0,0 +1,180 @@ +/* + * SpanDSP - a series of DSP components for telephony + * + * bit_operations.c - Various bit level operations, such as bit reversal + * + * Written by Steve Underwood <steveu(a)coppice.org> + * + * Copyright (C) 2006 Steve Underwood + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id: bit_operations.c,v 1.13 2008/04/17 14:26:56 steveu Exp $ + */ + +/*! \file */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <inttypes.h> +#include <stdlib.h> +#include <fcntl.h> +#include <string.h> +#include <assert.h> +#include <memory.h> + +#include "voipcodecs/telephony.h" +#include "voipcodecs/bit_operations.h" + +uint16_t bit_reverse16(uint16_t x) +{ + x = (x >> 8) | (x << 8); + x = ((x & 0xF0F0) >> 4) | ((x & 0x0F0F) << 4); + x = ((x & 0xCCCC) >> 2) | ((x & 0x3333) << 2); + return ((x & 0xAAAA) >> 1) | ((x & 0x5555) << 1); +} +/*- End of function --------------------------------------------------------*/ + +uint32_t bit_reverse32(uint32_t x) +{ + x = (x >> 16) | (x << 16); + x = ((x & 0xFF00FF00) >> 8) | ((x & 0x00FF00FF) << 8); + x = ((x & 0xF0F0F0F0) >> 4) | ((x & 0x0F0F0F0F) << 4); + x = ((x & 0xCCCCCCCC) >> 2) | ((x & 0x33333333) << 2); + return ((x & 0xAAAAAAAA) >> 1) | ((x & 0x55555555) << 1); +} +/*- End of function --------------------------------------------------------*/ + +uint32_t bit_reverse_4bytes(uint32_t x) +{ + x = ((x & 0xF0F0F0F0) >> 4) | ((x & 0x0F0F0F0F) << 4); + x = ((x & 0xCCCCCCCC) >> 2) | ((x & 0x33333333) << 2); + return ((x & 0xAAAAAAAA) >> 1) | ((x & 0x55555555) << 1); +} +/*- End of function --------------------------------------------------------*/ + +#if defined(__x86_64__) +uint64_t bit_reverse_8bytes(uint64_t x) +{ + x = ((x & 0xF0F0F0F0F0F0F0F0LLU) >> 4) | ((x & 0x0F0F0F0F0F0F0F0FLLU) << 4); + x = ((x & 0xCCCCCCCCCCCCCCCCLLU) >> 2) | ((x & 0x3333333333333333LLU) << 2); + return ((x & 0xAAAAAAAAAAAAAAAALLU) >> 1) | ((x & 0x5555555555555555LLU) << 1); +} +/*- End of function --------------------------------------------------------*/ +#endif + +void bit_reverse(uint8_t to[], const uint8_t from[], int len) +{ +#if defined(__sparc__) || defined(__sparc) + int i; +#else + const uint8_t *y1; + uint8_t *z1; + const uint32_t *y4; + uint32_t *z4; + uint32_t x4; +#if defined(__x86_64__) + const uint64_t *y8; + uint64_t *z8; + uint64_t x8; +#endif +#endif + +#if defined(__sparc__) || defined(__sparc) + /* This code work 8 bits at a time, so it works on machines where misalignment + is either desperately slow or fails */ + for (i = 0; i < len; i++) + to[i] = bit_reverse8(from[i]); +#else + /* This code is this is based on the woolly assumption that the start of the buffers + is memory aligned. If it isn't, the routine will be less efficient on some machines, + but might not work at all on others. */ +#if defined(__x86_64__) + y8 = (const uint64_t *) from; + z8 = (uint64_t *) to; + while (len >= sizeof(uint64_t)) + { + x8 = *y8++; + x8 = ((x8 & 0xF0F0F0F0F0F0F0F0LLU) >> 4) | ((x8 & 0x0F0F0F0F0F0F0F0FLLU) << 4); + x8 = ((x8 & 0xCCCCCCCCCCCCCCCCLLU) >> 2) | ((x8 & 0x3333333333333333LLU) << 2); + *z8++ = ((x8 & 0xAAAAAAAAAAAAAAAALLU) >> 1) | ((x8 & 0x5555555555555555LLU) << 1); + len -= sizeof(uint64_t); + } + y4 = (const uint32_t *) y8; + z4 = (uint32_t *) z8; +#else + y4 = (const uint32_t *) from; + z4 = (uint32_t *) to; +#endif + while (len >= sizeof(uint32_t)) + { + x4 = *y4++; + x4 = ((x4 & 0xF0F0F0F0) >> 4) | ((x4 & 0x0F0F0F0F) << 4); + x4 = ((x4 & 0xCCCCCCCC) >> 2) | ((x4 & 0x33333333) << 2); + *z4++ = ((x4 & 0xAAAAAAAA) >> 1) | ((x4 & 0x55555555) << 1); + len -= sizeof(uint32_t); + } + y1 = (const uint8_t *) y4; + z1 = (uint8_t *) z4; + while (len-- > 0) + *z1++ = bit_reverse8(*y1++); +#endif +} +/*- End of function --------------------------------------------------------*/ + +int one_bits32(uint32_t x) +{ + x = x - ((x >> 1) & 0x55555555); + /* We now have 16 2-bit counts */ + x = (x & 0x33333333) + ((x >> 2) & 0x33333333); + /* We now have 8 4-bit counts */ + x = (x + (x >> 4)) & 0x0F0F0F0F; + /* We now have 4 8-bit counts */ +#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__powerpc__) + /* If multiply is fast */ + return (x*0x01010101) >> 24; +#else + /* If multiply is slow */ + x += (x >> 8); + x += (x >> 16); + return (x & 0x0000003F); +#endif +} +/*- End of function --------------------------------------------------------*/ + +uint32_t make_mask32(uint32_t x) +{ + x |= (x >> 1); + x |= (x >> 2); + x |= (x >> 4); + x |= (x >> 8); + x |= (x >> 16); + return x; +} +/*- End of function --------------------------------------------------------*/ + +uint16_t make_mask16(uint16_t x) +{ + x |= (x >> 1); + x |= (x >> 2); + x |= (x >> 4); + x |= (x >> 8); + return x; +} +/*- End of function --------------------------------------------------------*/ +/*- End of file ------------------------------------------------------------*/

1 0

[commit] r8373 - in freeswitch/trunk/src: . include
by Freeswitch SVN 13 May '08

13 May '08

Author: anthm Date: Mon May 12 20:17:58 2008 New Revision: 8373 Modified: freeswitch/trunk/src/include/switch_stun.h freeswitch/trunk/src/switch_rtp.c freeswitch/trunk/src/switch_stun.c Log: more robust stun packet validation from stkn Modified: freeswitch/trunk/src/include/switch_stun.h ============================================================================== --- freeswitch/trunk/src/include/switch_stun.h (original) +++ freeswitch/trunk/src/include/switch_stun.h Mon May 12 20:17:58 2008 @@ -40,6 +40,7 @@ SWITCH_BEGIN_EXTERN_C #define SWITCH_STUN_DEFAULT_PORT 3478 #define SWITCH_STUN_PACKET_MIN_LEN 20 +#define SWITCH_STUN_ATTRIBUTE_MIN_LEN 8 typedef enum { SWITCH_STUN_BINDING_REQUEST = 0x0001, SWITCH_STUN_BINDING_RESPONSE = 0x0101, @@ -98,13 +99,13 @@ } switch_stun_type_t; typedef struct { - int16_t type; - int16_t length; + uint16_t type; + uint16_t length; char id[16]; } switch_stun_packet_header_t; typedef struct { - int16_t type; + uint16_t type; uint16_t length; char value[]; } switch_stun_packet_attribute_t; @@ -115,10 +116,10 @@ } switch_stun_packet_t; typedef struct { - int8_t wasted; - int8_t family; - int16_t port; - int32_t address; + uint8_t wasted; + uint8_t family; + uint16_t port; + uint32_t address; } switch_stun_ip_t; @@ -208,6 +209,12 @@ switch_port_t *port, char *stunip, switch_port_t stunport, char **err, switch_memory_pool_t *pool); +/*! + \brief Obtain the padded length of an attribute's value + \param attribute the attribute + \return the padded size in bytes +*/ +#define switch_stun_attribute_padded_length(attribute) ((uint16_t)(attribute->length + (sizeof(uint32_t)-1)) & ~sizeof(uint32_t)) /*! \brief set a switch_stun_packet_attribute_t pointer to point at the first attribute in a packet @@ -221,7 +228,7 @@ \param attribute the pointer to increment \return true or false depending on if there are any more attributes */ -#define switch_stun_packet_next_attribute(attribute, end) (attribute && (attribute = (switch_stun_packet_attribute_t *) (attribute->value + attribute->length)) && ((void *)attribute < end) && attribute->length && ((void *)(attribute + attribute->length) < end)) +#define switch_stun_packet_next_attribute(attribute, end) (attribute && (attribute = (switch_stun_packet_attribute_t *) (attribute->value + switch_stun_attribute_padded_length(attribute))) && ((void *)attribute < end) && attribute->length && ((void *)(attribute + switch_stun_attribute_padded_length(attribute)) < end)) /*! \brief Obtain the correct length in bytes of a stun packet Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon May 12 20:17:58 2008 @@ -261,7 +261,12 @@ memcpy(buf, data, cpylen); packet = switch_stun_packet_parse(buf, sizeof(buf)); - end_buf = buf + sizeof(buf); + if (!packet) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid STUN/ICE packet received\n"); + goto end; + } + end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf)); + rtp_session->last_stun = switch_time_now(); switch_stun_packet_first_attribute(packet, attr); Modified: freeswitch/trunk/src/switch_stun.c ============================================================================== --- freeswitch/trunk/src/switch_stun.c (original) +++ freeswitch/trunk/src/switch_stun.c Mon May 12 20:17:58 2008 @@ -113,10 +113,12 @@ } } + SWITCH_DECLARE(switch_stun_packet_t *) switch_stun_packet_parse(uint8_t * buf, uint32_t len) { switch_stun_packet_t *packet; switch_stun_packet_attribute_t *attr; + int32_t bytes_left = len; void *end_buf = buf + len; if (len < SWITCH_STUN_PACKET_MIN_LEN) { @@ -126,23 +128,181 @@ packet = (switch_stun_packet_t *) buf; packet->header.type = ntohs(packet->header.type); packet->header.length = ntohs(packet->header.length); + bytes_left -= packet->header.length + 20; + + /* + * Check packet type (RFC3489(bis?) values) + */ + switch(packet->header.type) { + case SWITCH_STUN_BINDING_REQUEST: + case SWITCH_STUN_BINDING_RESPONSE: + case SWITCH_STUN_BINDING_ERROR_RESPONSE: + case SWITCH_STUN_SHARED_SECRET_REQUEST: + case SWITCH_STUN_SHARED_SECRET_RESPONSE: + case SWITCH_STUN_SHARED_SECRET_ERROR_RESPONSE: + case SWITCH_STUN_ALLOCATE_REQUEST: + case SWITCH_STUN_ALLOCATE_RESPONSE: + case SWITCH_STUN_ALLOCATE_ERROR_RESPONSE: + case SWITCH_STUN_SEND_REQUEST: + case SWITCH_STUN_SEND_RESPONSE: + case SWITCH_STUN_SEND_ERROR_RESPONSE: + case SWITCH_STUN_DATA_INDICATION: + /* Valid */ + break; + + default: + /* Invalid value */ + return NULL; + } + + /* + * Check for length overflow + */ + if (bytes_left <= 0) { + /* Invalid */ + return NULL; + } + + /* + * No payload? + */ + if (packet->header.length == 0) { + /* Invalid?! */ + return NULL; + } + + /* check if we have enough bytes left for an attribute */ + if (bytes_left < SWITCH_STUN_ATTRIBUTE_MIN_LEN) { + return NULL; + } + switch_stun_packet_first_attribute(packet, attr); do { attr->length = ntohs(attr->length); attr->type = ntohs(attr->type); - if (!attr->length) { - break; + bytes_left -= 4; /* attribute header consumed */ + + if (!attr->length || switch_stun_attribute_padded_length(attr) > bytes_left) { + /* + * Note we simply don't "break" here out of the loop anymore because + * we don't want the upper layers to have to deal with attributes without a value + * (or worse: invalid length) + */ + return NULL; } + + /* + * Handle STUN attributes + */ switch (attr->type) { - case SWITCH_STUN_ATTR_MAPPED_ADDRESS: - if (attr->type) { + case SWITCH_STUN_ATTR_MAPPED_ADDRESS: /* Address, we only care about this one, but parse the others too */ + case SWITCH_STUN_ATTR_RESPONSE_ADDRESS: + case SWITCH_STUN_ATTR_SOURCE_ADDRESS: + case SWITCH_STUN_ATTR_CHANGED_ADDRESS: + case SWITCH_STUN_ATTR_REFLECTED_FROM: + case SWITCH_STUN_ATTR_ALTERNATE_SERVER: + case SWITCH_STUN_ATTR_DESTINATION_ADDRESS: + case SWITCH_STUN_ATTR_SOURCE_ADDRESS2: + { switch_stun_ip_t *ip; + uint32_t addr_length = 0; ip = (switch_stun_ip_t *) attr->value; + + switch (ip->family) { + case 0x01: /* IPv4 */ + addr_length = 4; + break; + + case 0x02: /* IPv6 */ + addr_length = 16; + break; + + default: /* Invalid */ + return NULL; + } + + /* attribute payload length must be == address length + size of other payload fields (family...) */ + if (attr->length != addr_length + 4) { + /* Invalid */ + return NULL; + } + ip->port = ntohs(ip->port); } break; + + case SWITCH_STUN_ATTR_CHANGE_REQUEST: /* UInt32 */ + case SWITCH_STUN_ATTR_LIFETIME: + case SWITCH_STUN_ATTR_BANDWIDTH: + case SWITCH_STUN_ATTR_OPTIONS: + { + uint32_t *val = (uint32_t *) attr->value; + + if (attr->length != sizeof(uint32_t)) { + /* Invalid */ + return NULL; + } + + *val = ntohl(*val); /* should we do this here? */ + } + break; + + case SWITCH_STUN_ATTR_USERNAME: /* ByteString, multiple of 4 bytes */ + case SWITCH_STUN_ATTR_PASSWORD: /* ByteString, multiple of 4 bytes */ + if (attr->length % 4 != 0) { + /* Invalid */ + return NULL; + } + break; + + case SWITCH_STUN_ATTR_DATA: /* ByteString */ + case SWITCH_STUN_ATTR_ERROR_CODE: /* ErrorCode */ + case SWITCH_STUN_ATTR_TRANSPORT_PREFERENCES: /* TransportPrefs */ + /* + * No length checking here, since we already checked against the padded length + * before + */ + break; + + case SWITCH_STUN_ATTR_MESSAGE_INTEGRITY: /* ByteString, 20 bytes */ + if (attr->length != 20) { + /* Invalid */ + return NULL; + } + break; + + case SWITCH_STUN_ATTR_MAGIC_COOKIE: /* ByteString, 4 bytes */ + if (attr->length != 4) { + /* Invalid */ + return NULL; + } + break; + + case SWITCH_STUN_ATTR_UNKNOWN_ATTRIBUTES: /* UInt16List (= multiple of 2 bytes) */ + if (attr->length % 2 != 0) { + return NULL; + } + break; + + default: + /* Mandatory attribute range? => invalid */ + if (attr->type <= 0x7FFF) { + return NULL; + } + break; } - } while (switch_stun_packet_next_attribute(attr, end_buf)); + bytes_left -= switch_stun_attribute_padded_length(attr); /* attribute value consumed, substract padded length */ + + } while (bytes_left >= SWITCH_STUN_ATTRIBUTE_MIN_LEN && switch_stun_packet_next_attribute(attr, end_buf)); + + if ((packet->header.length + 20) > (len - bytes_left)) { + /* + * the packet length is longer than the length of all attributes? + * for now simply decrease the packet size + */ + packet->header.length = (len - bytes_left) - 20; + } + return packet; } @@ -337,9 +497,13 @@ switch_socket_close(sock); packet = switch_stun_packet_parse(buf, sizeof(buf)); - end_buf = buf + sizeof(buf); - switch_stun_packet_first_attribute(packet, attr); + if (!packet) { + *err = "Invalid STUN/ICE packet"; + return SWITCH_STATUS_FALSE; + } + end_buf = buf + ((sizeof(buf) > packet->header.length) ? packet->header.length : sizeof(buf)); + switch_stun_packet_first_attribute(packet, attr); do { switch (attr->type) { case SWITCH_STUN_ATTR_MAPPED_ADDRESS:

1 0

[commit] r8372 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 May '08

12 May '08

Author: anthm Date: Mon May 12 17:05:14 2008 New Revision: 8372 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: flush proxy mode if you try to answer a sip channel with no bridge Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon May 12 17:05:14 2008 @@ -335,6 +335,8 @@ switch_status_t status; uint32_t session_timeout = tech_pvt->profile->session_timeout; const char *val; + const char *b_sdp = NULL; + int is_proxy = 0; if (switch_test_flag(tech_pvt, TFLAG_ANS) || switch_channel_test_flag(channel, CF_OUTBOUND)) { return SWITCH_STATUS_SUCCESS; @@ -342,11 +344,12 @@ switch_set_flag_locked(tech_pvt, TFLAG_ANS); - if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { - const char *sdp = NULL; - if ((sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE))) { - tech_pvt->local_sdp_str = switch_core_session_strdup(session, sdp); - } + b_sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE); + is_proxy = (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)); + + if (b_sdp && is_proxy) { + tech_pvt->local_sdp_str = switch_core_session_strdup(session, b_sdp); + if (switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { sofia_glue_tech_patch_sdp(tech_pvt); if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) { @@ -354,12 +357,20 @@ } } } else { - if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + if ((is_proxy && !b_sdp) || switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); + + if (is_proxy) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Disabling proxy mode due to call answer with no bridge\n"); + switch_channel_clear_flag(channel, CF_PROXY_MEDIA); + switch_channel_clear_flag(channel, CF_PROXY_MODE); + } + if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE); tech_pvt->num_codecs = 0; sofia_glue_tech_prepare_codecs(tech_pvt); + if (sofia_glue_tech_media(tech_pvt, r_sdp) != SWITCH_STATUS_SUCCESS) { switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "CODEC NEGOTIATION ERROR"); //nua_respond(tech_pvt->nh, SIP_488_NOT_ACCEPTABLE, TAG_END());

1 0

[commit] r8371 - in freeswitch/trunk: . build/config
by Freeswitch SVN 12 May '08

12 May '08

Author: stkn Date: Mon May 12 15:12:37 2008 New Revision: 8371 Modified: freeswitch/trunk/build/config/ax_check_java.m4 freeswitch/trunk/configure.in Log: Add AS_HELP_STRING to options missing it, fix --disable-core-libedit-support value handling after rename (oops) Modified: freeswitch/trunk/build/config/ax_check_java.m4 ============================================================================== --- freeswitch/trunk/build/config/ax_check_java.m4 (original) +++ freeswitch/trunk/build/config/ax_check_java.m4 Mon May 12 15:12:37 2008 @@ -9,9 +9,9 @@ AC_DEFUN([AX_CHECK_JAVA], [ AC_ARG_WITH([java], - AC_HELP_STRING([ --with-java=PFX], [prefix where 'java' is installed.]), - [with_java_prefix=$withval], - [with_java_prefix=${JAVA_INSTALL_PATH:-/usr/java/j2sdk1.4.1_01}]) + [AC_HELP_STRING([--with-java=PFX], [prefix where 'java' is installed.])], + [with_java_prefix="$withval"], + [with_java_prefix="${JAVA_INSTALL_PATH:-/usr/java/j2sdk1.4.1_01}"]) have_java='no' LIB_JAVA='' JAVA_FLAGS='' Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon May 12 15:12:37 2008 @@ -31,7 +31,8 @@ AC_SUBST(switch_builddir) # Where to install the modules -AC_ARG_WITH(modinstdir, [ --with-modinstdir (default=$prefix/mod)], modinstdir=$withval, modinstdir="${prefix}/mod") +AC_ARG_WITH([modinstdir], + [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modinstdir="$withval"], [modinstdir="${prefix}/mod"]) AC_SUBST(modinstdir) AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modinstdir}",[where to install the modules to]) @@ -408,10 +409,10 @@ AC_SUBST(LIBCURL_DEPS) AC_ARG_ENABLE(core-odbc-support, - [ --enable-core-odbc-support Compile with ODBC Support],,[enable_core_odbc_support="no"]) + [AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"]) AC_ARG_ENABLE(core-libedit-support, - [ --disable-core-libedit-support Compile without libedit Support],,[enable_core_libedit_support="yes"]) + [AS_HELP_STRING([--disable-core-libedit-support], [Compile without libedit Support])], [enable_core_libedit_support="$enableval"], [enable_core_libedit_support="yes"]) if test "$enable_core_libedit_support" = "yes" ; then AC_CHECK_LIB(ncurses, tgetent,,

1 0

[commit] r8370 - freeswitch/trunk/src
by Freeswitch SVN 12 May '08

12 May '08

Author: mikej Date: Mon May 12 15:05:02 2008 New Revision: 8370 Modified: freeswitch/trunk/src/switch.c Log: add configurable windows service name (FSCORE-122) Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Mon May 12 15:05:02 2008 @@ -44,8 +44,6 @@ #define PIDFILE "freeswitch.pid" static char *pfile = PIDFILE; -/* If we are a windows service, what should we be called */ -#define SERVICENAME "Freeswitch" /* Picky compiler */ #ifdef __ICC @@ -53,6 +51,10 @@ #endif #ifdef WIN32 +/* If we are a windows service, what should we be called */ +#define SERVICENAME_DEFAULT "FreeSWITCH" +#define SERVICENAME_MAXLEN 256 +static char service_name[SERVICENAME_MAXLEN]; #include <winsock2.h> #include <windows.h> @@ -62,7 +64,7 @@ /* signal handler for when freeswitch is running in background mode. * signal triggers the shutdown of freeswitch - */ +# */ static void handle_SIGTERM(int sig) { int32_t arg = 0; @@ -172,7 +174,7 @@ status.dwControlsAccepted = SERVICE_ACCEPT_STOP; /* register our handler for service control messages */ - hStatus = RegisterServiceCtrlHandler(SERVICENAME, &ServiceCtrlHandler); + hStatus = RegisterServiceCtrlHandler(service_name, &ServiceCtrlHandler); /* update the service status */ SetServiceStatus(hStatus, &status); @@ -217,17 +219,10 @@ switch_file_t *fd; switch_memory_pool_t *pool = NULL; - -#ifdef WIN32 - SERVICE_TABLE_ENTRY dispatchTable[] = { - {SERVICENAME, &service_main}, - {NULL, NULL} - }; -#endif usageDesc = "these are the optional arguments you can pass to freeswitch\n" #ifdef WIN32 - "\t-service -- start freeswitch as a service, cannot be used if loaded as a console app\n" - "\t-install -- install freeswitch as a service\n" + "\t-service [name] -- start freeswitch as a service, cannot be used if loaded as a console app\n" + "\t-install [name] -- install freeswitch as a service, with optional service name\n" "\t-uninstall -- remove freeswitch as a service\n" #else "\t-nf -- no forking\n" @@ -253,42 +248,100 @@ #ifdef WIN32 if (x == 1) { if (argv[x] && !strcmp(argv[x], "-service")) { - known_opt++; - if (StartServiceCtrlDispatcher(dispatchTable) == 0) { - /* Not loaded as a service */ - fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n"); - fprintf(stderr, "To install the service load freeswitch with -install\n"); + /* New installs will always have the service name specified, but keep a default for compat */ + x++; + if (argv[x] && strlen(argv[x])) { + switch_copy_string(service_name, argv[x], SERVICENAME_MAXLEN); + } else { + switch_copy_string(service_name, SERVICENAME_DEFAULT, SERVICENAME_MAXLEN); + } + { /* Attempt to start service */ + SERVICE_TABLE_ENTRY dispatchTable[] = { + {service_name, &service_main}, + {NULL, NULL} + }; + known_opt++; + if (StartServiceCtrlDispatcher(dispatchTable) == 0) { + /* Not loaded as a service */ + fprintf(stderr, "Error Freeswitch loaded as a console app with -service option\n"); + fprintf(stderr, "To install the service load freeswitch with -install\n"); + } + exit(0); } - exit(0); } if (argv[x] && !strcmp(argv[x], "-install")) { char exePath[1024]; char servicePath[1024]; - - SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + x++; + if (argv[x] && strlen(argv[x])) { + switch_copy_string(service_name, argv[x], SERVICENAME_MAXLEN); + } else { + switch_copy_string(service_name, SERVICENAME_DEFAULT, SERVICENAME_MAXLEN); + } known_opt++; GetModuleFileName(NULL, exePath, 1024); - snprintf(servicePath, sizeof(servicePath), "%s -service", exePath); - if (!CreateService(handle, - SERVICENAME, - SERVICENAME, - GENERIC_READ | GENERIC_EXECUTE, - SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, servicePath, NULL, NULL, NULL, NULL, NULL)) { - fprintf(stderr, "Error installing freeswitch as a service.\n"); + snprintf(servicePath, sizeof(servicePath), "%s -service %s", exePath, service_name); + { /* Perform service installation */ + SC_HANDLE hService; + SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!hSCManager) { + fprintf(stderr, "Could not open service manager (%d).\n", GetLastError()); + exit(1); + } + hService = CreateService(hSCManager, + service_name, + service_name, + GENERIC_READ | GENERIC_EXECUTE | SERVICE_CHANGE_CONFIG, + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, + servicePath, NULL, NULL, NULL, + "NT AUTHORITY\\NetworkService", /* Service start name */ + NULL); + if (!hService) { + fprintf(stderr, "Error creating freeswitch service (%d).\n", GetLastError()); + } else { + /* Set desc, and don't care if it succeeds */ + SERVICE_DESCRIPTION desc; + desc.lpDescription = "The FreeSWITCH service."; + if (!ChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &desc)) { + fprintf(stderr, "FreeSWITCH installed, but could not set the service description (%d).\n", GetLastError()); + } + CloseServiceHandle(hService); + } + CloseServiceHandle(hSCManager); + exit(0); } - exit(0); } if (argv[x] && !strcmp(argv[x], "-uninstall")) { - SC_HANDLE handle = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - SC_HANDLE service = OpenService(handle, SERVICENAME, DELETE); - known_opt++; - if (service != NULL) { - /* remove the service! */ - DeleteService(service); + x++; + if (argv[x] && strlen(argv[x])) { + switch_copy_string(service_name, argv[x], SERVICENAME_MAXLEN); + } else { + switch_copy_string(service_name, SERVICENAME_DEFAULT, SERVICENAME_MAXLEN); + } + { /* Do the uninstallation */ + SC_HANDLE hService; + SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (!hSCManager) { + fprintf(stderr, "Could not open service manager (%d).\n", GetLastError()); + exit(1); + } + hService = OpenService(hSCManager, service_name, DELETE); + known_opt++; + if (hService != NULL) { + /* remove the service! */ + if (!DeleteService(hService)) { + fprintf(stderr, "Error deleting service (%d).\n", GetLastError()); + } + CloseServiceHandle(hService); + } else { + fprintf(stderr, "Error opening service (%d).\n", GetLastError()); + } + CloseServiceHandle(hSCManager); + exit(0); } - exit(0); } } + #else if (argv[x] && !strcmp(argv[x], "-u")) { x++;

1 0