- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4078 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 10:51:38 2007 New Revision: 4078 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: few sofia cleanups complements of CtRiX (thanks for pointing them out) 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 Jan 29 10:51:38 2007 @@ -543,12 +543,8 @@ } end: - if (input) { - switch_safe_free(input); - } - if (input2) { - switch_safe_free(input2); - } + switch_safe_free(input); + switch_safe_free(input2); switch_safe_free(nonce); switch_safe_free(uri); switch_safe_free(qop); @@ -5073,6 +5069,14 @@ } } + if (!profile->sipip) { + profile->sipip = switch_core_strdup(profile->pool, globals.guess_ip); + } + + if (!profile->rtpip) { + profile->rtpip = switch_core_strdup(profile->pool, globals.guess_ip); + } + if (profile->nonce_ttl < 60) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Setting nonce TTL to 60 seconds\n"); profile->nonce_ttl = 60;

1 0

[commit] r4077 - in freeswitch/trunk/src: . include mod/codecs/mod_g711 mod/codecs/mod_l16
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: anthm Date: Mon Jan 29 10:43:41 2007 New Revision: 4077 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_loadable_module.c Log: codec tweaks (do a make sure) Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jan 29 10:43:41 2007 @@ -176,7 +176,7 @@ SWITCH_DECLARE_DATA extern switch_directories SWITCH_GLOBAL_dirs; #define SWITCH_THREAD_STACKSIZE 240 * 1024 -#define SWITCH_RECCOMMENDED_BUFFER_SIZE 2048 +#define SWITCH_RECCOMMENDED_BUFFER_SIZE 3968 #define SWITCH_MAX_CODECS 30 #define SWITCH_MAX_STATE_HANDLERS 30 #define SWITCH_TRUE 1 Modified: freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g711/mod_g711.c Mon Jan 29 10:43:41 2007 @@ -188,7 +188,6 @@ /* Registration */ - static const switch_codec_implementation_t g711u_8k_60ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -209,7 +208,6 @@ /*.destroy */ switch_g711u_destroy }; -#if 0 static const switch_codec_implementation_t g711u_8k_30ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, @@ -228,20 +226,20 @@ /*.encode */ switch_g711u_encode, /*.decode */ switch_g711u_decode, /*.destroy */ switch_g711u_destroy, - /*.next */ NULL + /*.next*/ &g711u_8k_60ms_implementation }; -static const switch_codec_implementation_t g711u_16k_implementation = { +static const switch_codec_implementation_t g711u_8k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, /*.iananame */ "PCMU", /*.fmtp */ NULL, - /*.samples_per_second */ 16000, - /*.bits_per_second */ 128000, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, /*.microseconds_per_frame */ 20000, - /*.samples_per_frame */ 320, - /*.bytes_per_frame */ 640, - /*.encoded_bytes_per_frame */ 320, + /*.samples_per_frame */ 160, + /*.bytes_per_frame */ 320, + /*.encoded_bytes_per_frame */ 160, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, @@ -249,21 +247,20 @@ /*.encode */ switch_g711u_encode, /*.decode */ switch_g711u_decode, /*.destroy */ switch_g711u_destroy, - /*.next */ &g711u_8k_30ms_implementation + /*.next*/ &g711u_8k_30ms_implementation }; -#endif -static const switch_codec_implementation_t g711u_8k_implementation = { +static const switch_codec_implementation_t g711u_8k_10ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 0, /*.iananame */ "PCMU", /*.fmtp */ NULL, /*.samples_per_second */ 8000, /*.bits_per_second */ 64000, - /*.microseconds_per_frame */ 20000, - /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 320, - /*.encoded_bytes_per_frame */ 160, + /*.microseconds_per_frame */ 10000, + /*.samples_per_frame */ 80, + /*.bytes_per_frame */ 160, + /*.encoded_bytes_per_frame */ 80, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, @@ -271,12 +268,54 @@ /*.encode */ switch_g711u_encode, /*.decode */ switch_g711u_decode, /*.destroy */ switch_g711u_destroy, - ///*.next */ &g711u_16k_implementation - &g711u_8k_60ms_implementation + /*.next*/ &g711u_8k_20ms_implementation }; -static const switch_codec_implementation_t g711a_8k_implementation = { + + +static const switch_codec_implementation_t g711a_8k_60ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 8, + /*.iananame */ "PCMA", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 19200, + /*.microseconds_per_frame */ 60000, + /*.samples_per_frame */ 480, + /*.bytes_per_frame */ 960, + /*.encoded_bytes_per_frame */ 480, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g711u_init, + /*.encode */ switch_g711u_encode, + /*.decode */ switch_g711u_decode, + /*.destroy */ switch_g711u_destroy, +}; + +static const switch_codec_implementation_t g711a_8k_30ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 8, + /*.iananame */ "PCMA", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 96000, + /*.microseconds_per_frame */ 30000, + /*.samples_per_frame */ 240, + /*.bytes_per_frame */ 480, + /*.encoded_bytes_per_frame */ 240, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g711u_init, + /*.encode */ switch_g711u_encode, + /*.decode */ switch_g711u_decode, + /*.destroy */ switch_g711u_destroy, + /*.next*/ &g711a_8k_60ms_implementation +}; + +static const switch_codec_implementation_t g711a_8k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 8, /*.iananame */ "PCMA", @@ -293,18 +332,41 @@ /*.init */ switch_g711a_init, /*.encode */ switch_g711a_encode, /*.decode */ switch_g711a_decode, - /*.destroy */ switch_g711a_destroy + /*.destroy */ switch_g711a_destroy, + /*.next*/ &g711a_8k_30ms_implementation }; +static const switch_codec_implementation_t g711a_8k_10ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 8, + /*.iananame */ "PCMA", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 64000, + /*.microseconds_per_frame */ 10000, + /*.samples_per_frame */ 80, + /*.bytes_per_frame */ 160, + /*.encoded_bytes_per_frame */ 80, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_g711u_init, + /*.encode */ switch_g711u_encode, + /*.decode */ switch_g711u_decode, + /*.destroy */ switch_g711u_destroy, + /*.next*/ &g711a_8k_20ms_implementation +}; + + static const switch_codec_interface_t g711a_codec_interface = { /*.interface_name */ "g711 alaw", - /*.implementations */ &g711a_8k_implementation + /*.implementations */ &g711a_8k_10ms_implementation }; static const switch_codec_interface_t g711u_codec_interface = { /*.interface_name */ "g711 ulaw", - /*.implementations */ &g711u_8k_implementation, + /*.implementations */ &g711u_8k_10ms_implementation, /*.next */ &g711a_codec_interface }; Modified: freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_l16/mod_l16.c Mon Jan 29 10:43:41 2007 @@ -89,7 +89,49 @@ return SWITCH_STATUS_SUCCESS; } -static const switch_codec_implementation_t raw_32k_implementation = { +static const switch_codec_implementation_t raw_32k_60ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second = */ 32000, + /*.bits_per_second = */ 512000, + /*.microseconds_per_frame = */ 60000, + /*.samples_per_frame = */ 1920, + /*.bytes_per_frame = */ 3840, + /*.encoded_bytes_per_frame = */ 3840, + /*.number_of_channels = */ 1, + /*.pref_frames_per_packet = */ 1, + /*.max_frames_per_packet = */ 1, + /*.init = */ switch_raw_init, + /*.encode = */ switch_raw_encode, + /*.decode = */ switch_raw_decode, + /*.destroy = */ switch_raw_destroy + /*.next = */ +}; + +static const switch_codec_implementation_t raw_32k_30ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second = */ 32000, + /*.bits_per_second = */ 512000, + /*.microseconds_per_frame = */ 30000, + /*.samples_per_frame = */ 960, + /*.bytes_per_frame = */ 1920, + /*.encoded_bytes_per_frame = */ 1920, + /*.number_of_channels = */ 1, + /*.pref_frames_per_packet = */ 1, + /*.max_frames_per_packet = */ 1, + /*.init = */ switch_raw_init, + /*.encode = */ switch_raw_encode, + /*.decode = */ switch_raw_decode, + /*.destroy = */ switch_raw_destroy, + /*.next = */ &raw_32k_60ms_implementation +}; + +static const switch_codec_implementation_t raw_32k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", @@ -106,10 +148,32 @@ /*.init = */ switch_raw_init, /*.encode = */ switch_raw_encode, /*.decode = */ switch_raw_decode, - /*.destroy = */ switch_raw_destroy + /*.destroy = */ switch_raw_destroy, + /*.next = */ &raw_32k_30ms_implementation }; -static const switch_codec_implementation_t raw_22k_implementation = { +static const switch_codec_implementation_t raw_32k_10ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second = */ 32000, + /*.bits_per_second = */ 512000, + /*.microseconds_per_frame = */ 10000, + /*.samples_per_frame = */ 320, + /*.bytes_per_frame = */ 960, + /*.encoded_bytes_per_frame = */ 960, + /*.number_of_channels = */ 1, + /*.pref_frames_per_packet = */ 1, + /*.max_frames_per_packet = */ 1, + /*.init = */ switch_raw_init, + /*.encode = */ switch_raw_encode, + /*.decode = */ switch_raw_decode, + /*.destroy = */ switch_raw_destroy, + /*.next = */ &raw_32k_20ms_implementation +}; + +static const switch_codec_implementation_t raw_22k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", @@ -127,10 +191,73 @@ /*.encode = */ switch_raw_encode, /*.decode = */ switch_raw_decode, /*.destroy = */ switch_raw_destroy, - /*.next = */ &raw_32k_implementation + /*.next = */ &raw_32k_10ms_implementation +}; + +static const switch_codec_implementation_t raw_16k_120ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second */ 8000, + /*.bits_per_second */ 256000, + /*.microseconds_per_frame */ 120000, + /*.samples_per_frame */ 1920, + /*.bytes_per_frame */ 3840, + /*.encoded_bytes_per_frame */ 3840, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_raw_init, + /*.encode */ switch_raw_encode, + /*.decode */ switch_raw_decode, + /*.destroy */ switch_raw_destroy, + /*.next */ &raw_22k_20ms_implementation +}; + +static const switch_codec_implementation_t raw_16k_60ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second */ 16000, + /*.bits_per_second */ 256000, + /*.microseconds_per_frame */ 60000, + /*.samples_per_frame */ 960, + /*.bytes_per_frame */ 1920, + /*.encoded_bytes_per_frame */ 1920, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_raw_init, + /*.encode */ switch_raw_encode, + /*.decode */ switch_raw_decode, + /*.destroy */ switch_raw_destroy, + /*.next */ &raw_16k_120ms_implementation +}; + +static const switch_codec_implementation_t raw_16k_30ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second */ 16000, + /*.bits_per_second */ 256000, + /*.microseconds_per_frame */ 30000, + /*.samples_per_frame */ 480, + /*.bytes_per_frame */ 960, + /*.encoded_bytes_per_frame */ 960, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_raw_init, + /*.encode */ switch_raw_encode, + /*.decode */ switch_raw_decode, + /*.destroy */ switch_raw_destroy, + /*.next */ &raw_16k_60ms_implementation }; -static const switch_codec_implementation_t raw_16k_implementation = { +static const switch_codec_implementation_t raw_16k_20ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", @@ -148,17 +275,17 @@ /*.encode = */ switch_raw_encode, /*.decode = */ switch_raw_decode, /*.destroy = */ switch_raw_destroy, - /*.next = */ &raw_22k_implementation + /*.next = */ &raw_16k_30ms_implementation }; -static const switch_codec_implementation_t raw_8k_implementation = { +static const switch_codec_implementation_t raw_16k_10ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", /*.fmtp */ NULL, - /*.samples_per_second = */ 8000, - /*.bits_per_second = */ 128000, - /*.microseconds_per_frame = */ 20000, + /*.samples_per_second = */ 16000, + /*.bits_per_second = */ 256000, + /*.microseconds_per_frame = */ 10000, /*.samples_per_frame = */ 160, /*.bytes_per_frame = */ 320, /*.encoded_bytes_per_frame = */ 320, @@ -169,21 +296,22 @@ /*.encode = */ switch_raw_encode, /*.decode = */ switch_raw_decode, /*.destroy = */ switch_raw_destroy, - /*.next = */ &raw_16k_implementation + /*.next = */ &raw_16k_20ms_implementation }; +/////////////////////////////// -static const switch_codec_implementation_t raw_8k_30ms_implementation = { +static const switch_codec_implementation_t raw_8k_120ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, - /*.bits_per_second */ 128000, - /*.microseconds_per_frame */ 30000, - /*.samples_per_frame */ 240, - /*.bytes_per_frame */ 480, - /*.encoded_bytes_per_frame */ 480, + /*.bits_per_second */ 512000, + /*.microseconds_per_frame */ 120000, + /*.samples_per_frame */ 960, + /*.bytes_per_frame */ 1920, + /*.encoded_bytes_per_frame */ 1920, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, @@ -191,7 +319,7 @@ /*.encode */ switch_raw_encode, /*.decode */ switch_raw_decode, /*.destroy */ switch_raw_destroy, - /*.next */ &raw_8k_implementation + /*.next */ &raw_16k_10ms_implementation }; @@ -213,20 +341,20 @@ /*.encode */ switch_raw_encode, /*.decode */ switch_raw_decode, /*.destroy */ switch_raw_destroy, - /*.next */ &raw_8k_30ms_implementation + /*.next */ &raw_8k_120ms_implementation }; -static const switch_codec_implementation_t raw_8k_120ms_implementation = { +static const switch_codec_implementation_t raw_8k_30ms_implementation = { /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.ianacode */ 10, /*.iananame */ "L16", /*.fmtp */ NULL, /*.samples_per_second */ 8000, - /*.bits_per_second */ 512000, - /*.microseconds_per_frame */ 120000, - /*.samples_per_frame */ 960, - /*.bytes_per_frame */ 1920, - /*.encoded_bytes_per_frame */ 1920, + /*.bits_per_second */ 128000, + /*.microseconds_per_frame */ 30000, + /*.samples_per_frame */ 240, + /*.bytes_per_frame */ 480, + /*.encoded_bytes_per_frame */ 480, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1, /*.max_frames_per_packet */ 1, @@ -236,11 +364,54 @@ /*.destroy */ switch_raw_destroy, /*.next */ &raw_8k_60ms_implementation }; +static const switch_codec_implementation_t raw_8k_20ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second = */ 8000, + /*.bits_per_second = */ 128000, + /*.microseconds_per_frame = */ 20000, + /*.samples_per_frame = */ 160, + /*.bytes_per_frame = */ 320, + /*.encoded_bytes_per_frame = */ 320, + /*.number_of_channels = */ 1, + /*.pref_frames_per_packet = */ 1, + /*.max_frames_per_packet = */ 1, + /*.init = */ switch_raw_init, + /*.encode = */ switch_raw_encode, + /*.decode = */ switch_raw_decode, + /*.destroy = */ switch_raw_destroy, + /*.next */ &raw_8k_30ms_implementation +}; + + + +static const switch_codec_implementation_t raw_8k_10ms_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 10, + /*.iananame */ "L16", + /*.fmtp */ NULL, + /*.samples_per_second = */ 8000, + /*.bits_per_second = */ 128000, + /*.microseconds_per_frame = */ 10000, + /*.samples_per_frame = */ 80, + /*.bytes_per_frame = */ 160, + /*.encoded_bytes_per_frame = */ 160, + /*.number_of_channels = */ 1, + /*.pref_frames_per_packet = */ 1, + /*.max_frames_per_packet = */ 1, + /*.init = */ switch_raw_init, + /*.encode = */ switch_raw_encode, + /*.decode = */ switch_raw_decode, + /*.destroy = */ switch_raw_destroy, + /*.next */ &raw_8k_20ms_implementation +}; static const switch_codec_interface_t raw_codec_interface = { /*.interface_name */ "raw signed linear (16 bit)", - /*.implementations */ &raw_8k_120ms_implementation + /*.implementations */ &raw_8k_10ms_implementation }; static switch_loadable_module_interface_t raw_module_interface = { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jan 29 10:43:41 2007 @@ -782,6 +782,19 @@ return SWITCH_STATUS_GENERR; } + /* If no specific codec interval is requested opt for 20ms above all else because lots of stuff assumes it */ + if (!ms) { + for (iptr = codec_interface->implementations; iptr; iptr = iptr->next) { + if ((!rate || rate == iptr->samples_per_second) && + (20 == (iptr->microseconds_per_frame / 1000)) && + (!channels || channels == iptr->number_of_channels)) { + implementation = iptr; + goto found; + } + } + } + + /* Either looking for a specific interval or there was no interval specified and there wasn't one @20ms available*/ for (iptr = codec_interface->implementations; iptr; iptr = iptr->next) { if ((!rate || rate == iptr->samples_per_second) && (!ms || ms == (iptr->microseconds_per_frame / 1000)) && @@ -791,6 +804,8 @@ } } + found: + if (implementation) { switch_status_t status; codec->codec_interface = codec_interface; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Jan 29 10:43:41 2007 @@ -758,6 +758,27 @@ } if ((codec_interface = switch_loadable_module_get_codec_interface(name)) != 0 ) { + /* If no specific codec interval is requested opt for 20ms above all else because lots of stuff assumes it */ + if (!interval) { + for (imp = codec_interface->implementations; imp; imp = imp->next) { + uint8_t match = 1; + + if ((uint32_t)(imp->microseconds_per_frame / 1000) != 20) { + match = 0; + } + + if (match && rate && (uint32_t)imp->samples_per_second != rate) { + match = 0; + } + + if (match) { + array[i++] = imp; + goto found; + } + } + } + + /* Either looking for a specific interval or there was no interval specified and there wasn't one @20ms available*/ for (imp = codec_interface->implementations; imp; imp = imp->next) { uint8_t match = 1; @@ -771,8 +792,12 @@ if (match) { array[i++] = imp; + goto found; } } + + found: + if (i > arraylen) { break; }

1 0

[commit] r4076 - in freeswitch/trunk/src/mod/codecs: mod_g723_1 mod_g729
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: brian Date: Mon Jan 29 10:34:38 2007 New Revision: 4076 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Log: this is the correct values Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Mon Jan 29 10:34:38 2007 @@ -1,7 +1,7 @@ ifeq ($(shell ls -d $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1) -CFLAGS += -I$(PREFIX)/include/libg723_1 -LDFLAGS +=-lg723_1 +CFLAGS += -I$(PREFIX)/include/g723 +LDFLAGS +=-lg723 else Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/mod_g723_1.c Mon Jan 29 10:34:38 2007 @@ -34,7 +34,7 @@ #include "switch.h" #ifndef G723_PASSTHROUGH -#include "g723_1.h" +#include "g723/g723.h" #define TYPE_HIGH 0x0 #define TYPE_LOW 0x1 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/mod_g729.c Mon Jan 29 10:34:38 2007 @@ -37,7 +37,7 @@ #include "switch.h" #ifndef G729_PASSTHROUGH -#include "g729.h" +#include "g729/g729.h" struct g729_context { struct dec_state decoder_object;

1 0

[commit] r4075 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 29 Jan '07

29 Jan '07

Author: mikej Date: Mon Jan 29 03:37:40 2007 New Revision: 4075 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: fix session_record api interface param handling (from prof_HATE via irc) Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Jan 29 03:37:40 2007 @@ -384,7 +384,7 @@ uuid = argv[0]; action = argv[1]; - action = argv[2]; + path = argv[2]; if (!(session = switch_core_session_locate(uuid))) { stream->write_function(stream, "-Error Cannot locate session!\n");

1 0

[commit] r4074 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: brian Date: Sun Jan 28 16:43:00 2007 New Revision: 4074 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: update to allow args to enum dialplan for lookups. Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Sun Jan 28 16:43:00 2007 @@ -521,6 +521,7 @@ enum_record_t *results, *rp; switch_channel_t *channel = switch_core_session_get_channel(session); enum_route_t *rtp; + char *dp = (char *) arg; assert(channel != NULL); @@ -528,7 +529,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ENUM Lookup on %s\n", caller_profile->destination_number); - if (enum_lookup(globals.root, caller_profile->destination_number, &results) == SWITCH_STATUS_SUCCESS) { + if (enum_lookup(switch_strlen_zero(dp) ? globals.root : dp, caller_profile->destination_number, &results) == SWITCH_STATUS_SUCCESS) { if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, caller_profile->destination_number)) == 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "memory error!\n"); free_results(&results);

1 0

[commit] r4073 - in freeswitch/trunk: conf src src/include src/mod/endpoints/mod_sofia
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sun Jan 28 12:37:51 2007 New Revision: 4073 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_core.c Log: CODEC TWEAK mod_sofia will now examine a variable in the channel to see what the channel's originator was using for a codec and try to put that to the top of the list in the sdp. if this new sofia profile param is set: <param name="disable-transcoding" value="true"/> All outbound calls will use *only* the codec that thier originator is using to ensure no transcoding. (of course that could lead to a failed call where there is no way to do this, so use sparingly) Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Sun Jan 28 12:37:51 2007 @@ -38,7 +38,9 @@  <param name="nonce-ttl" value="60"/> - +  +     Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sun Jan 28 12:37:51 2007 @@ -82,6 +82,7 @@ #define SWITCH_BRIDGE_VARIABLE "_bridge_to_" #define SWITCH_SIGNAL_BRIDGE_VARIABLE "_signal_bridge_to_" #define SWITCH_ORIGINATOR_VARIABLE "_originator_" +#define SWITCH_ORIGINATOR_CODEC_VARIABLE "_originator_codec_" #define SWITCH_LOCAL_MEDIA_IP_VARIABLE "_local_media_ip_" #define SWITCH_LOCAL_MEDIA_PORT_VARIABLE "_local_media_port_" #define SWITCH_REMOTE_MEDIA_IP_VARIABLE "_remote_media_ip_" Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Sun Jan 28 12:37:51 2007 @@ -62,6 +62,11 @@ apr_size_t *len); +#define switch_codec2str(codec,buf,len) snprintf(buf, len, "%s@%uk@%ui", \ + codec->implementation->iananame, \ + codec->implementation->samples_per_second, \ + codec->implementation->microseconds_per_frame / 1000) + #ifdef WIN32 #define switch_is_file_path(file) (*(file +1) == ':' || *file == '/') #else 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 Sun Jan 28 12:37:51 2007 @@ -142,7 +142,8 @@ PFLAG_AUTH_ALL = (1 << 2), PFLAG_FULL_ID = (1 << 3), PFLAG_PRESENCE = (1 << 4), - PFLAG_PASS_RFC2833 = (1 << 5) + PFLAG_PASS_RFC2833 = (1 << 5), + PFLAG_DISABLE_TRANSCODING = (1 << 6) } PFLAGS; typedef enum { @@ -772,6 +773,8 @@ { switch_channel_t *channel; char *codec_string = NULL; + char *csdyn = NULL; + char *ocodec = NULL; if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { return; @@ -786,11 +789,25 @@ channel = switch_core_session_get_channel(tech_pvt->session); assert (channel != NULL); + if (!(codec_string = switch_channel_get_variable(channel, "codec_string"))) { codec_string = tech_pvt->profile->codec_string; } + if ((ocodec = switch_channel_get_variable(channel, SWITCH_ORIGINATOR_CODEC_VARIABLE))) { + if (!codec_string || (tech_pvt->profile->pflags & PFLAG_DISABLE_TRANSCODING)) { + codec_string = ocodec; + } else { + if ((csdyn = switch_mprintf("%s,%s", ocodec, codec_string))) { + codec_string = csdyn; + } else { + codec_string = ocodec; + } + } + } + if (codec_string) { + tech_pvt->profile->codec_order_last = switch_separate_string(codec_string, ',', tech_pvt->profile->codec_order, SWITCH_MAX_CODECS); tech_pvt->num_codecs = switch_loadable_module_get_codecs_sorted(tech_pvt->codecs, SWITCH_MAX_CODECS, tech_pvt->profile->codec_order, @@ -800,6 +817,8 @@ tech_pvt->num_codecs = switch_loadable_module_get_codecs(switch_core_session_get_pool(tech_pvt->session), tech_pvt->codecs, sizeof(tech_pvt->codecs) / sizeof(tech_pvt->codecs[0])); } + + switch_safe_free(csdyn); } @@ -829,9 +848,10 @@ switch_core_session_set_private(session, tech_pvt); - tech_set_codecs(tech_pvt); + snprintf(name, sizeof(name), "sofia/%s/%s", profile->name, channame); switch_channel_set_name(channel, name); + //tech_set_codecs(tech_pvt); } @@ -939,7 +959,8 @@ cid_name = (char *) caller_profile->caller_id_name; cid_num = (char *) caller_profile->caller_id_number; - + tech_set_codecs(tech_pvt); + if ((tech_pvt->from_str = switch_mprintf("\"%s\" <sip:%s@%s>", cid_name, cid_num, @@ -1433,7 +1454,7 @@ flags |= SWITCH_RTP_FLAG_BUGGY_2833; } - if (tech_pvt->profile->flags & PFLAG_PASS_RFC2833 || ((val = switch_channel_get_variable(channel, "pass_rfc2833")) && switch_true(val))) { + if ((tech_pvt->profile->pflags & PFLAG_PASS_RFC2833) || ((val = switch_channel_get_variable(channel, "pass_rfc2833")) && switch_true(val))) { flags |= SWITCH_RTP_FLAG_PASS_RFC2833; } @@ -2205,6 +2226,7 @@ attach_private(nsession, profile, tech_pvt, dest); + nchannel = switch_core_session_get_channel(nsession); caller_profile = switch_caller_profile_clone(nsession, outbound_profile); switch_channel_set_caller_profile(nchannel, caller_profile); @@ -4164,7 +4186,7 @@ } attach_private(session, profile, tech_pvt, username); - + tech_set_codecs(tech_pvt); channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, "endpoint_disposition", "INBOUND CALL"); @@ -4993,6 +5015,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PASS_RFC2833; } + } else if (!strcasecmp(var, "disable-transcoding")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_DISABLE_TRANSCODING; + } } else if (!strcasecmp(var, "auth-calls")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_CALLS; @@ -5035,7 +5061,6 @@ profile->max_calls = atoi(val); } else if (!strcasecmp(var, "codec-prefs")) { profile->codec_string = switch_core_strdup(profile->pool, val); - profile->codec_order_last = switch_separate_string(profile->codec_string, ',', profile->codec_order, SWITCH_MAX_CODECS); } else if (!strcasecmp(var, "codec-ms")) { profile->codec_ms = atoi(val); } else if (!strcasecmp(var, "dtmf-duration")) { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Sun Jan 28 12:37:51 2007 @@ -1577,10 +1577,17 @@ if (channel && peer_channel) { char *export_vars, *val; + switch_codec_t *read_codec = switch_core_session_get_read_codec(session); - switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_VARIABLE, switch_core_session_get_uuid(session)); - - /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */ + if (read_codec) { + char tmp[80]; + switch_codec2str(read_codec, tmp, sizeof(tmp)); + switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_CODEC_VARIABLE, tmp); + } + + switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_VARIABLE, switch_core_session_get_uuid(session)); + + /* A comma (,) separated list of variable names that should ne propagated from originator to originatee */ if ((export_vars = switch_channel_get_variable(channel, "export_vars"))) { char *cptmp = switch_core_session_strdup(session, export_vars); int argc;

1 0

[commit] r4072 - freeswitch/trunk/src
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sat Jan 27 22:17:12 2007 New Revision: 4072 Modified: freeswitch/trunk/src/switch_ivr.c Log: fix sleep to work right on unanswered channels Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Sat Jan 27 22:17:12 2007 @@ -71,7 +71,8 @@ break; } - if (switch_channel_test_flag(channel, CF_SERVICE)) { + if (switch_channel_test_flag(channel, CF_SERVICE) || + (!switch_channel_test_flag(channel, CF_ANSWERED) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA))) { switch_yield(1000); } else { status = switch_core_session_read_frame(session, &read_frame, left, 0);

1 0

[commit] r4071 - freeswitch/trunk/conf
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sat Jan 27 22:05:20 2007 New Revision: 4071 Modified: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/conf/enum.conf.xml freeswitch/trunk/conf/sofia.conf.xml Log: tweak default conf for better first experience Modified: freeswitch/trunk/conf/default_context.xml ============================================================================== --- freeswitch/trunk/conf/default_context.xml (original) +++ freeswitch/trunk/conf/default_context.xml Sat Jan 27 22:05:20 2007 @@ -29,7 +29,7 @@    -  +    @@ -45,7 +45,7 @@  <action application="set" data="ringback=${us-ring}"/>  - <action application="bridge" data="sofia/test/1234(a)conference.freeswitch.org"/> + <action application="bridge" data="sofia/$${domain}/1234(a)conference.freeswitch.org"/> </condition> </extension> @@ -59,7 +59,7 @@  <extension name="2000"> <condition field="destination_number" expression="^2000$"> - <action application="conference" data="bridge:mydynaconf:sofia/test/1234@conference.freeswitch.org"/> + <action application="conference" data="bridge:mydynaconf:sofia/$${domain}/1234@conference.freeswitch.org"/> </condition> </extension> Modified: freeswitch/trunk/conf/enum.conf.xml ============================================================================== --- freeswitch/trunk/conf/enum.conf.xml (original) +++ freeswitch/trunk/conf/enum.conf.xml Sat Jan 27 22:05:20 2007 @@ -4,8 +4,8 @@ </settings> <routes> - <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/test/$1"/> + <route service="E2U+SIP" regex="sip:(.*)" replace="sofia/$${domain}/$1"/> <route service="E2U+IAX2" regex="iax2:(.*)" replace="iax/$1"/> - <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/jingle/$1"/> + <route service="E2U+XMPP" regex="XMPP:(.*)" replace="dingaling/$${domain}/$1"/> </routes> </configuration> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Sat Jan 27 22:05:20 2007 @@ -17,7 +17,7 @@ <param name="debug" value="1"/> <param name="rfc2833-pt" value="101"/> <param name="sip-port" value="5060"/> - <param name="dialplan" value="XML"/> + <param name="dialplan" value="enum,XML"/> <param name="dtmf-duration" value="100"/> <param name="codec-prefs" value="$${default_codecs}"/> <param name="codec-ms" value="20"/>

1 0

[commit] r4070 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 28 Jan '07

28 Jan '07

Author: anthm Date: Sat Jan 27 21:38:52 2007 New Revision: 4070 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Log: add stupid 2833 crap Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Sat Jan 27 21:38:52 2007 @@ -240,6 +240,7 @@ SWITCH_RTP_FLAG_MINI - Use mini RTP when possible SWITCH_RTP_FLAG_DATAWAIT - Do not return from reads unless there is data even when non blocking SWITCH_RTP_FLAG_BUGGY_2833 - Emulate the bug in cisco equipment to allow interop + SWITCH_RTP_FLAG_PASS_RFC2833 - Pass 2833 (ignore it) </pre> */ typedef enum { @@ -255,7 +256,8 @@ SWITCH_RTP_FLAG_BREAK = ( 1 << 9), SWITCH_RTP_FLAG_MINI = ( 1 << 10), SWITCH_RTP_FLAG_DATAWAIT = (1 << 11), - SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 12) + SWITCH_RTP_FLAG_BUGGY_2833 = (1 << 12), + SWITCH_RTP_FLAG_PASS_RFC2833 = (1 << 13) } switch_rtp_flag_t; /*! 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 Sat Jan 27 21:38:52 2007 @@ -141,7 +141,8 @@ PFLAG_BLIND_REG = (1 << 1), PFLAG_AUTH_ALL = (1 << 2), PFLAG_FULL_ID = (1 << 3), - PFLAG_PRESENCE = (1 << 4) + PFLAG_PRESENCE = (1 << 4), + PFLAG_PASS_RFC2833 = (1 << 5) } PFLAGS; typedef enum { @@ -1402,6 +1403,7 @@ int bw, ms; switch_channel_t *channel; const char *err = NULL; + char *val = NULL; switch_rtp_flag_t flags; switch_status_t status; char tmp[50]; @@ -1431,6 +1433,10 @@ flags |= SWITCH_RTP_FLAG_BUGGY_2833; } + if (tech_pvt->profile->flags & PFLAG_PASS_RFC2833 || ((val = switch_channel_get_variable(channel, "pass_rfc2833")) && switch_true(val))) { + flags |= SWITCH_RTP_FLAG_PASS_RFC2833; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n", switch_channel_get_name(channel), tech_pvt->local_sdp_audio_ip, @@ -4983,6 +4989,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; } + } else if (!strcasecmp(var, "pass-rfc2833")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_PASS_RFC2833; + } } else if (!strcasecmp(var, "auth-calls")) { if (switch_true(val)) { profile->pflags |= PFLAG_AUTH_CALLS; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Sat Jan 27 21:38:52 2007 @@ -840,7 +840,7 @@ } /* RFC2833 ... TBD try harder to honor the duration etc.*/ - if (rtp_session->recv_msg.header.pt == rtp_session->te) { + if (!switch_test_flag(rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833) && rtp_session->recv_msg.header.pt == rtp_session->te) { unsigned char *packet = (unsigned char *) rtp_session->recv_msg.body; int end = packet[1]&0x80; int duration = (packet[2]<<8) + packet[3];

1 0

[commit] r4069 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Jan '07

27 Jan '07

Author: anthm Date: Sat Jan 27 13:26:17 2007 New Revision: 4069 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: fix (part2) 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 Sat Jan 27 13:26:17 2007 @@ -2301,15 +2301,15 @@ } if (mimp) { - if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)mimp->rm_encoding))) { + if ((tech_pvt->rm_encoding = switch_core_session_strdup(session, (char *)map->rm_encoding))) { char tmp[50]; - tech_pvt->pt = (switch_payload_t)mimp->rm_pt; - tech_pvt->rm_rate = mimp->rm_rate; + tech_pvt->pt = (switch_payload_t)map->rm_pt; + tech_pvt->rm_rate = map->rm_rate; tech_pvt->codec_ms = mimp->microseconds_per_frame / 1000; tech_pvt->remote_sdp_audio_ip = switch_core_session_strdup(session, (char *)sdp->sdp_connection->c_address); - tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)mimp->rm_fmtp); + tech_pvt->rm_fmtp = switch_core_session_strdup(session, (char *)map->rm_fmtp); tech_pvt->remote_sdp_audio_port = (switch_port_t)m->m_port; - tech_pvt->agreed_pt = (switch_payload_t)mimp->rm_pt; + tech_pvt->agreed_pt = (switch_payload_t)map->rm_pt; snprintf(tmp, sizeof(tmp), "%d", tech_pvt->remote_sdp_audio_port); switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE, tech_pvt->remote_sdp_audio_ip); switch_channel_set_variable(channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE, tmp);

1 0