December 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10798 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: gmaruzz Date: Tue Dec 16 11:59:24 2008 New Revision: 10798 Log: skypiax: compile on windows Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 16 11:59:24 2008 @@ -65,8 +65,8 @@ int exit = 0; unsigned int kill_cli_size; short kill_cli_buff[320]; - int i; - int a; + //int i; + //int a; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG);

1 0

[commit] r10797 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: anthm Date: Tue Dec 16 11:40:38 2008 New Revision: 10797 Log: tweak codec lookup func Modified: freeswitch/trunk/src/switch_loadable_module.c Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Tue Dec 16 11:40:38 2008 @@ -1415,7 +1415,7 @@ for (x = 0; x < preflen; x++) { char *cur, *last = NULL, *next = NULL, *name, *p, buf[256]; - uint32_t interval = 0, rate = 8000; + uint32_t interval = 0, rate = 0; switch_copy_string(buf, prefs[x], sizeof(buf)); last = name = next = cur = buf; @@ -1442,25 +1442,25 @@ 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 (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { - if ((uint32_t) (imp->microseconds_per_packet / 1000) != 20) { - match = 0; - } - - if (match && rate && (uint32_t) imp->samples_per_second != rate) { - match = 0; - } + for (imp = codec_interface->implementations; imp; imp = imp->next) { + uint8_t match = 1; + + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { + + if ((!interval && (uint32_t) (imp->microseconds_per_packet / 1000) != 20) || + (interval && (uint32_t) (imp->microseconds_per_packet / 1000) != interval)) { + match = 0; } - if (match) { - array[i++] = imp; - goto found; + if (match && ((!rate && (uint32_t) imp->samples_per_second != 8000) || (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 */ @@ -1468,10 +1468,11 @@ uint8_t match = 1; if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { + if (interval && (uint32_t) (imp->microseconds_per_packet / 1000) != interval) { match = 0; } - + if (match && rate && (uint32_t) imp->samples_per_second != rate) { match = 0; }

1 0

[commit] r10796 - freeswitch/trunk/libs/js/nsprpub
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: stkn Date: Tue Dec 16 11:03:46 2008 New Revision: 10796 Log: Fix FSBUILD-97 Modified: freeswitch/trunk/libs/js/nsprpub/configure.in Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Tue Dec 16 11:03:46 2008 @@ -2825,4 +2825,7 @@ MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile" fi +# mmkay, this fixes things on FreeBSD-7.1(-rc1)... +MAKEFILES="`echo $MAKEFILES | tr -d '\n'`" + AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])

1 0

[commit] r10795 - freeswitch/trunk/src/mod/directories/mod_ldap
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: intralanman Date: Tue Dec 16 10:48:25 2008 New Revision: 10795 Log: newer version of openldap for MDXMLINT-44 Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile Tue Dec 16 10:48:25 2008 @@ -1,6 +1,6 @@ switch_srcdir=../../../.. -LDAP=openldap-2.3.19 +LDAP=openldap-2.4.11 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP) LDAPLA=$(LDAP_DIR)/libraries/libldap_r/libldap_r.la

1 0

[commit] r10794 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: intralanman Date: Tue Dec 16 10:37:35 2008 New Revision: 10794 Log: you ever feel like you don't belong? Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Tue Dec 16 10:37:35 2008 @@ -157,11 +157,6 @@   -  -  -  -  -    <!--

1 0

[commit] r10793 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: cparker Date: Tue Dec 16 09:32:17 2008 New Revision: 10793 Log: Use const char, instead of passing func to switch_true Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/mod_radius_cdr.c Tue Dec 16 09:32:17 2008 @@ -156,7 +156,8 @@ } if(channel) { - if(switch_true(switch_channel_get_variable(channel, "disable_radius_start"))) { + const char *disable_flag = switch_channel_get_variable(channel, "disable_radius_start"); + if(switch_true(disable_flag)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Not Sending RADIUS Start\n"); return SWITCH_STATUS_SUCCESS; } @@ -393,12 +394,13 @@ } - if(channel) { - if(switch_true(switch_channel_get_variable(channel, "disable_radius_stop"))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Not Sending RADIUS Stop\n"); - return SWITCH_STATUS_SUCCESS; - } - } + if(channel) { + const char *disable_flag = switch_channel_get_variable(channel, "disable_radius_stop"); + if(switch_true(disable_flag)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "[mod_radius_cdr] Not Sending RADIUS Stop\n"); + return SWITCH_STATUS_SUCCESS; + } + } switch_thread_rwlock_rdlock(globals.rwlock);

1 0

[commit] r10792 - freeswitch/trunk
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: stkn Date: Tue Dec 16 09:31:17 2008 New Revision: 10792 Log: check aclocal availability and version too Modified: freeswitch/trunk/bootstrap.sh Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Tue Dec 16 09:31:17 2008 @@ -60,6 +60,27 @@ echo "bootstrap: automake version $am_version (ok)" fi +# aclocal 1.7 or newer + +acl_version=`${ACLOCAL:-aclocal} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]* *$//;s/[- ].*//g;q'` +if test -z "$acl_version"; then +echo "bootstrap: aclocal not found." +echo " You need aclocal version 1.7 or newer installed" +echo " to build FreeSWITCH from SVN." +exit 1 +fi +IFS=_; set $acl_version; IFS=' ' +acl_version=$1 +IFS=.; set $acl_version; IFS=' ' +if test "$1" = "1" -a "$2" -lt "7"; then +echo "bootstrap: aclocal version $acl_version found." +echo " You need aclocal version 1.7 or newer installed" +echo " to build FreeSWITCH from SVN." +exit 1 +else +echo "bootstrap: aclocal version $acl_version (ok)" +fi + # Sample libtool --version outputs: # ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11) # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a

1 0

[commit] r10791 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: gmaruzz Date: Tue Dec 16 08:56:16 2008 New Revision: 10791 Log: skypiax: beginning native samplerate on linux Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Dec 16 08:56:16 2008 @@ -107,7 +107,7 @@ p->tech_pvt = tech_pvt; } - if (skypiax_codec(tech_pvt, 8000, 20) != SWITCH_STATUS_SUCCESS) { + if (skypiax_codec(tech_pvt, 16000, 20) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "skypiax_codec SUCCESS\n"); @@ -390,9 +390,10 @@ } #endif - sent = frame->datalen; + sent = frame->datalen/sizeof(short); + //ERRORA("CLI to be sent %d\n", SKYPIAX_P_LOG, sent); switch_file_write(p->audioskypepipe[1], (short *) frame->data, &sent); - //ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); + //ERRORA("CLI sent %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Tue Dec 16 08:56:16 2008 @@ -37,13 +37,13 @@ /**********************************************************/ /**********************************************************/ /**********************************************************/ -#define SAMPLES_PER_FRAME 160 +#define SAMPLES_PER_FRAME 320 static void *SWITCH_THREAD_FUNC skypiax_do_tcp_srv_thread(switch_thread_t * thread, void *obj) { struct skypiax_interface *p = obj; - short srv_out[SAMPLES_PER_FRAME / 2]; + //short srv_out[SAMPLES_PER_FRAME / 2]; int s; #ifdef WIN32 unsigned int len; @@ -53,10 +53,10 @@ int sin_size; unsigned int fd; #else - int len; - int i; - int a; - short srv_in[SAMPLES_PER_FRAME]; + int len = 0; + //int i; + //int a; + short srv_in[SAMPLES_PER_FRAME * 2]; unsigned int sin_size; int fd; #endif /* WIN32 */ @@ -65,6 +65,8 @@ int exit = 0; unsigned int kill_cli_size; short kill_cli_buff[320]; + int i; + int a; if (option_debug > 10) { WARNINGA("ENTERING FUNC\n", SKYPIAX_P_LOG); @@ -118,16 +120,61 @@ fdselect = fd; FD_ZERO(&fs); FD_SET(fdselect, &fs); - to.tv_usec = 10000; + to.tv_usec = 100000; to.tv_sec = 0; rt = select(fdselect + 1, &fs, NULL, NULL, &to); - //usleep(1000); + //switch_sleep(10000); //rt=1; if (rt > 0) { - len = recv(fd, srv_in, sizeof(short) * SAMPLES_PER_FRAME, 0); + len = recv(fd, srv_in, SAMPLES_PER_FRAME * sizeof(short), 0); //DEBUGA_SKYPE("recv %d\n", SKYPIAX_P_LOG, len); if (len > 0) { + if(len == SAMPLES_PER_FRAME * sizeof(short)) { + unsigned int howmany; + + howmany = len / sizeof(short); + switch_file_write(p->audiopipe[1], srv_in, &howmany); + if(howmany == 320){ + NOTICA("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, len / sizeof(short), howmany); + } else { + ERRORA("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME * sizeof(short), len, len / sizeof(short), howmany); + switch_sleep(1000); + } + } else { + + if (!p->audiobuf_is_loaded) { + for (i = 0; i < (len / sizeof(short)); i++) { + p->audiobuf[i] = srv_in[i]; + } + p->audiobuf_is_loaded = 1; + } else { + unsigned int howmany; + short totalbuf[SAMPLES_PER_FRAME]; + + howmany = len / 2 ; + for (i = 0; i < howmany; i++) + totalbuf[i] = p->audiobuf[i]; + + howmany = len / 2 ; + for (a = 0; a < howmany; a++) { + totalbuf[i] = srv_in[a]; + i++; + } + + howmany = SAMPLES_PER_FRAME; + + switch_file_write(p->audiopipe[1], totalbuf, &howmany); + p->audiobuf_is_loaded = 0; + DEBUGA_SKYPE("SRV=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, SAMPLES_PER_FRAME, howmany); + } + + + + + } + +#if 0 a = 0; for (i = 0; i < len / sizeof(short); i++) { srv_out[a] = srv_in[i]; @@ -161,6 +208,7 @@ //DEBUGA_SKYPE("read=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, sizeof(short)*SAMPLES_PER_FRAME, len, (len*sizeof(short))/2, howmany); } +#endif } else if (len == 0) { DEBUGA_SKYPE("Skype client GONE\n", SKYPIAX_P_LOG); break; @@ -223,9 +271,9 @@ unsigned int fd; #else int len; - int i; - int a; - short cli_in[SAMPLES_PER_FRAME / 2]; + //int i; + //int a; + //short cli_in[SAMPLES_PER_FRAME / 2]; short cli_out[SAMPLES_PER_FRAME]; unsigned int sin_size; int fd; @@ -288,9 +336,17 @@ to.tv_usec = 10000; to.tv_sec = 0; //rt = select(fdselect + 1, &fs, NULL, NULL, &to); - switch_sleep(5000); + switch_sleep(1000); rt = 1; if (rt > 0) { + //got = (SAMPLES_PER_FRAME / 2) * sizeof(short); + got = SAMPLES_PER_FRAME; + switch_file_read(p->audioskypepipe[0], cli_out, &got); + if (got > 0) { + len = send(fd, cli_out, got * sizeof(short), 0); + NOTICA("CLI=====> req=%d recv=%d to sent=%d sent=%d\n", SKYPIAX_P_LOG, SAMPLES_PER_FRAME, got, got*sizeof(short), len); + } +#if 0 got = (SAMPLES_PER_FRAME / 2) * sizeof(short); switch_file_read(p->audioskypepipe[0], cli_in, &got); @@ -314,6 +370,7 @@ switch_sleep(1000); //ERRORA("Audio skype pipe give us: %u\n", SKYPIAX_P_LOG, got); } +#endif } } @@ -352,7 +409,7 @@ rv = switch_file_pipe_create(&p->audioskypepipe[0], &p->audioskypepipe[1], skypiax_module_pool); - rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100); + rv = switch_file_pipe_timeout_set(p->audioskypepipe[0], 100000); if (option_debug > 10) { DEBUGA_PBX("EXITING FUNC\n", SKYPIAX_P_LOG); } @@ -372,22 +429,24 @@ memset(buf, '\0', sizeof(buf)); + //switch_sleep(10000); rt = 1; if (rt > 0) { - samples = SAMPLES_PER_FRAME * sizeof(short); + samples = SAMPLES_PER_FRAME; switch_file_read(p->audiopipe[0], tech_pvt->read_frame.data, &samples); //if ((samples = read(p->audiopipe[0], buf, SAMPLES_PER_FRAME * sizeof(short))) != 320) - if (samples != SAMPLES_PER_FRAME * sizeof(short)) { - if (samples) - DEBUGA_SKYPE("read=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, - samples, SAMPLES_PER_FRAME * sizeof(short)); + if (samples != SAMPLES_PER_FRAME) { + if (samples){ + DEBUGA_SKYPE("SRV=====> NOT GOOD samples=%d expected=%d\n", SKYPIAX_P_LOG, samples, SAMPLES_PER_FRAME); + //tech_pvt->read_frame.datalen = 0; //do nothing + } } else { - tech_pvt->read_frame.datalen = samples; - //DEBUGA_SKYPE("read=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); + tech_pvt->read_frame.datalen = samples * sizeof(short); + NOTICA("SRV=====> GOOD samples=%d\n", SKYPIAX_P_LOG, samples); /* A real frame */ } } else {

1 0

[commit] r10790 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: anthm Date: Tue Dec 16 08:48:43 2008 New Revision: 10790 Log: let more commands in mod_commmands run from the dialplan via the eval app Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 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 Tue Dec 16 08:48:43 2008 @@ -457,10 +457,6 @@ const char *err; switch_xml_t xml_root; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (cmd && !strcmp(cmd, "reloadxml")) { if ((xml_root = switch_xml_open_root(1, &err))) { switch_xml_free(xml_root); @@ -696,10 +692,6 @@ int sps = 0, last_sps = 0; const char *var; - if (session) { - return SWITCH_STATUS_FALSE; - } - switch_core_measure_time(switch_core_uptime(), &duration); if (stream->param_event) { @@ -877,10 +869,6 @@ { const char *err; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", LOAD_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -902,10 +890,6 @@ switch_bool_t force = SWITCH_FALSE; const char *p = cmd; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -950,10 +934,6 @@ switch_bool_t force = SWITCH_FALSE; const char *p = cmd; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", UNLOAD_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -1003,10 +983,6 @@ const char *err; switch_xml_t xml_root; - if (session) { - return SWITCH_STATUS_FALSE; - } - if ((xml_root = switch_xml_open_root(1, &err))) { switch_xml_free(xml_root); } @@ -1023,10 +999,6 @@ char *mycmd = NULL, *kcause = NULL; switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { stream->write_function(stream, "-USAGE: %s\n", KILL_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -1057,10 +1029,6 @@ { switch_core_session_t *ksession = NULL; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!cmd) { stream->write_function(stream, "-USAGE: %s\n", PARK_SYNTAX); } else if ((ksession = switch_core_session_locate(cmd))) { @@ -1082,10 +1050,6 @@ int argc = 0; char *tuuid, *dest, *dp, *context, *arg = NULL; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { stream->write_function(stream, "-USAGE: %s\n", TRANSFER_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -1303,10 +1267,6 @@ char *mycmd = NULL, *argv[6] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1346,10 +1306,6 @@ char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1392,10 +1348,6 @@ int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (session) { - return status; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1427,10 +1379,6 @@ int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (session) { - return status; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1467,10 +1415,6 @@ int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (session) { - return status; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1514,10 +1458,6 @@ int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (session) { - return status; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1549,10 +1489,6 @@ int argc = 0; switch_status_t status = SWITCH_STATUS_FALSE; - if (session) { - return status; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1589,10 +1525,6 @@ char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -1633,10 +1565,6 @@ int argc = 0; uint32_t limit = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd)) { goto usage; } @@ -1704,10 +1632,6 @@ uint32_t limit = 0; char *flags = NULL; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { goto usage; } @@ -1769,10 +1693,6 @@ char *mycmd, *flag; switch_channel_t *channel = NULL; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd)) { stream->write_function(stream, "-USAGE: %s\n", BREAK_SYNTAX); return SWITCH_STATUS_SUCCESS; @@ -1812,10 +1732,6 @@ char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } @@ -2368,10 +2284,6 @@ switch_core_flag_t cflags = switch_core_flags(); switch_status_t status = SWITCH_STATUS_SUCCESS; - if (session) { - return SWITCH_STATUS_FALSE; - } - db = switch_core_db_handle(); holder.justcount = 0; @@ -2657,10 +2569,6 @@ char *mycmd = NULL, *argv[3] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if ((argc == 2 || argc == 3) && !switch_strlen_zero(argv[0])) { @@ -2709,10 +2617,6 @@ int argc = 0; char *var_name, *var_value = NULL; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { char *uuid = mycmd; if (!(vars = strchr(uuid, ' '))) { @@ -2763,10 +2667,6 @@ char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc >= 2 && !switch_strlen_zero(argv[0])) { @@ -2814,10 +2714,6 @@ char *uuid = NULL, *dtmf_data = NULL; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (switch_strlen_zero(cmd)) { goto usage; } @@ -2864,10 +2760,6 @@ char *mycmd = NULL, *argv[4] = { 0 }; int argc = 0; - if (session) { - return SWITCH_STATUS_FALSE; - } - if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) { argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); if (argc >= 0 && !switch_strlen_zero(argv[0])) {

1 0

[commit] r10789 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 16 Dec '08

16 Dec '08

Author: mikej Date: Tue Dec 16 08:15:42 2008 New Revision: 10789 Log: uninitialized var. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 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 Tue Dec 16 08:15:42 2008 @@ -2707,7 +2707,7 @@ switch_core_session_t *psession = NULL; char *mycmd = NULL, *vars, *argv[64] = { 0 }; int argc = 0; - char *var_name, *var_value; + char *var_name, *var_value = NULL; if (session) { return SWITCH_STATUS_FALSE;

1 0