January 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11253 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: andrew Date: Thu Jan 15 19:40:32 2009 New Revision: 11253 Log: Add support for 'pa devlist xml' to return the device list and which are the ring/in/out devices in XML format Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jan 15 19:40:32 2009 @@ -1037,34 +1037,51 @@ if (numDevices < 0) { return SWITCH_STATUS_SUCCESS; } - for (i = 0; i < numDevices; i++) { - deviceInfo = Pa_GetDeviceInfo(i); - stream->write_function(stream, "%d;%s;%d;%d;", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); - prev = 0; - if (globals.ringdev == i) { - stream->write_function(stream, "r"); - prev = 1; + if (argv[0] && !strcasecmp(argv[0], "xml")) { + stream->write_function(stream, "<xml>\n\t<devices>\n"); + + for (i = 0; i < numDevices; i++) { + deviceInfo = Pa_GetDeviceInfo(i); + stream->write_function(stream, "\t\t<device id=\"%d\" name=\"%s\" inputs=\"%d\" outputs=\"%d\" />\n", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); } - if (globals.indev == i) { - if (prev) { - stream->write_function(stream, ","); + stream->write_function(stream, "\t</devices>\n\t<bindings>\n" + "\t\t<ring device=\"%d\" />\n" + "\t\t<input device=\"%d\" />\n" + "\t\t<output device=\"%d\" />\n" + "\t</bindings>\n</xml>\n", globals.ringdev, globals.indev, globals.outdev); + } else { + + for (i = 0; i < numDevices; i++) { + deviceInfo = Pa_GetDeviceInfo(i); + stream->write_function(stream, "%d;%s;%d;%d;", i, deviceInfo->name, deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels); + + prev = 0; + if (globals.ringdev == i) { + stream->write_function(stream, "r"); + prev = 1; } - stream->write_function(stream, "i"); - prev = 1; - } - if (globals.outdev == i) { - if (prev) { - stream->write_function(stream, ","); + if (globals.indev == i) { + if (prev) { + stream->write_function(stream, ","); + } + stream->write_function(stream, "i"); + prev = 1; + } + + if (globals.outdev == i) { + if (prev) { + stream->write_function(stream, ","); + } + stream->write_function(stream, "o"); + prev = 1; } - stream->write_function(stream, "o"); - prev = 1; - } - stream->write_function(stream, "\n"); + stream->write_function(stream, "\n"); + } } return SWITCH_STATUS_SUCCESS; @@ -1670,7 +1687,7 @@ "pa switch [<call_id>|none]\n" "pa dtmf <digit string>\n" "pa flags [on|off] [ear] [mouth]\n" - "pa devlist\n" + "pa devlist [xml]\n" "pa indev #<num>|<partial name>\n" "pa outdev #<num>|<partial name>\n" "pa ringdev #<num>|<partial name>\n"

1 0

[commit] r11252 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 19:11:11 2009 New Revision: 11252 Log: i'm finally over my tourettes Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 19:11:11 2009 @@ -166,9 +166,6 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; -# printf("WTF\n"); -# printf("WTF\n"); -# printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11251 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 19:00:11 2009 New Revision: 11251 Log: test Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 19:00:11 2009 @@ -166,9 +166,9 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; - printf("WTF\n"); - printf("WTF\n"); - printf("WTF\n"); +# printf("WTF\n"); +# printf("WTF\n"); +# printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11250 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 18:56:39 2009 New Revision: 11250 Log: test Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 18:56:39 2009 @@ -166,6 +166,9 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; + printf("WTF\n"); + printf("WTF\n"); + printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11249 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 18:16:16 2009 New Revision: 11249 Log: untest Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 18:16:16 2009 @@ -166,7 +166,6 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; -# printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11248 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 18:06:26 2009 New Revision: 11248 Log: test Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 18:06:26 2009 @@ -166,7 +166,7 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; - printf("WTF\n"); +# printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11247 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 18:03:39 2009 New Revision: 11247 Log: test Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 18:03:39 2009 @@ -166,7 +166,7 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; -# printf("WTF\n"); + printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11246 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 16 Jan '09

16 Jan '09

Author: intralanman Date: Thu Jan 15 18:02:25 2009 New Revision: 11246 Log: test Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 18:02:25 2009 @@ -166,7 +166,7 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; - printf("WTF\n"); +# printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11245 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: intralanman Date: Thu Jan 15 17:47:06 2009 New Revision: 11245 Log: test Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jan 15 17:47:06 2009 @@ -166,6 +166,7 @@ maxes->dialstring = (headers[LCR_DIALSTRING_PLACE] == NULL ? 0 : strlen(headers[LCR_DIALSTRING_PLACE])); maxes->digit_str = (headers[LCR_DIGITS_PLACE] == NULL ? 0 : strlen(headers[LCR_DIGITS_PLACE])); maxes->rate = 8; + printf("WTF\n"); } switch_status_t process_max_lengths(max_obj_t *maxes, lcr_route routes, char *destination_number)

1 0

[commit] r11244 - freeswitch/trunk/src
by FreeSWITCH SVN 15 Jan '09

15 Jan '09

Author: anthm Date: Thu Jan 15 17:40:11 2009 New Revision: 11244 Log: fix ignored error condition bug reported on the dev list Modified: freeswitch/trunk/src/switch_odbc.c Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Thu Jan 15 17:40:11 2009 @@ -331,7 +331,8 @@ SQLLEN m = 0, t = 0; char *err_str = NULL; int result; - + int err = 0; + switch_assert(callback != NULL); if (!db_is_up(handle)) { @@ -366,6 +367,7 @@ int done = 0; if (!(result = SQLFetch(stmt)) == SQL_SUCCESS) { + err++; break; } @@ -407,9 +409,11 @@ SQLFreeHandle(SQL_HANDLE_STMT, stmt); - return SWITCH_ODBC_SUCCESS; + if (!err) { + return SWITCH_ODBC_SUCCESS; + } - error: + error: /* err_str is already defined for some error cases */ if (err_str != NULL) {

1 0