October 2006 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r3077 - freeswitch/trunk/conf
by Freeswitch SVN 18 Oct '06

18 Oct '06

Author: mikej Date: Wed Oct 18 13:18:16 2006 New Revision: 3077 Modified: freeswitch/trunk/conf/freeswitch.xml Log: comment registration in default config so all new builds don't try to reg. Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Wed Oct 18 13:18:16 2006 @@ -116,7 +116,7 @@ <profiles> <profile name="test"> <registrations> - <registration name="asterlink"> +  </registrations> <settings> <param name="debug" value="1"/>

1 0

[commit] r3073 - in freeswitch/trunk/src: . include mod/dialplans/mod_dialplan_xml mod/endpoints/mod_dingaling mod/endpoints/mod_wanpipe mod/event_handlers/mod_cdr mod/languages/mod_spidermonkey
by Freeswitch SVN 17 Oct '06

17 Oct '06

Author: brian Date: Tue Oct 17 19:33:32 2006 New Revision: 3073 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: Rename ani2 to aniii and ANI2 to ANI-II where appropriate. Because its not ANI2 its ANI II (eye eye) What is ANI II ? Refer to: http://en.wikipedia.org/wiki/Automatic_number_identification Thanks, /b Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Tue Oct 17 19:33:32 2006 @@ -73,7 +73,7 @@ /*! ANI (when applicable) */ char *ani; /*! ANI II (when applicable) */ - char *ani2; + char *aniii; /*! RDNIS */ char *rdnis; /*! Destination Number */ @@ -159,7 +159,7 @@ \param caller_id_number caller ID number \param network_addr network address \param ani ANI information - \param ani2 ANI II information + \param aniii ANI II information \param rdnis RDNIS \param source the source \param context a logical context @@ -173,7 +173,7 @@ char *caller_id_number, char *network_addr, char *ani, - char *ani2, + char *aniii, char *rdnis, char *source, char *context, Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Tue Oct 17 19:33:32 2006 @@ -273,12 +273,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Processing %s->%s!\n", caller_profile->caller_id_name, caller_profile->destination_number); - snprintf(params, sizeof(params), "context=%s&dest=%s&cid_name=%s&cid_num=%s&netaddr=%s&ani=%s&ani2=%s&rdnis=%s&source=%s&chan_name=%s&uuid=%s", + snprintf(params, sizeof(params), "context=%s&dest=%s&cid_name=%s&cid_num=%s&netaddr=%s&ani=%s&aniii=%s&rdnis=%s&source=%s&chan_name=%s&uuid=%s", caller_profile->context, caller_profile->destination_number, caller_profile->caller_id_name, caller_profile->caller_id_number, caller_profile->network_addr?caller_profile->network_addr:"", caller_profile->ani?caller_profile->ani:"", - caller_profile->ani2?caller_profile->ani2:"", + caller_profile->aniii?caller_profile->aniii:"", caller_profile->rdnis?caller_profile->rdnis:"", caller_profile->source, caller_profile->chan_name, caller_profile->uuid); Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue Oct 17 19:33:32 2006 @@ -1839,7 +1839,7 @@ cid_num, ldl_session_get_ip(dlsession), ldl_session_get_value(dlsession, "ani"), - ldl_session_get_value(dlsession, "ani2"), + ldl_session_get_value(dlsession, "aniii"), ldl_session_get_value(dlsession, "rdnis"), (char *)modname, context, Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Tue Oct 17 19:33:32 2006 @@ -1211,7 +1211,7 @@ if ((session = switch_core_session_request(&wanpipe_endpoint_interface, NULL))) { struct private_object *tech_pvt; - char ani2str[4] = ""; + char aniiistr[4] = ""; //wanpipe_tdm_api_t tdm_api; switch_core_session_add_stream(session, NULL); @@ -1229,8 +1229,8 @@ return 0; } - if (event->ring.ani2 >= 0) { - snprintf(ani2str, 5, "%.2d", event->ring.ani2); + if (event->ring.aniii >= 0) { + snprintf(aniiistr, 5, "%.2d", event->ring.aniii); } if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), @@ -1239,7 +1239,7 @@ "FreeSWITCH", event->ring.callingnum, event->ring.callingani, - switch_strlen_zero(ani2str) ? NULL : ani2str, + switch_strlen_zero(aniiistr) ? NULL : aniiistr, NULL, NULL, (char *)modname, Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/basecdr.h Tue Oct 17 19:33:32 2006 @@ -90,7 +90,7 @@ char srcchannel[80]; char dstchannel[80]; char ani[80]; - char ani2[80]; + char aniii[80]; char network_addr[40]; char lastapp[80]; char lastdata[255]; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/mysqlcdr.h Tue Oct 17 19:33:32 2006 @@ -88,7 +88,7 @@ long unsigned int srcchannel_length; long unsigned int dstchannel_length; long unsigned int ani_length; - long unsigned int ani2_length; + long unsigned int aniii_length; long unsigned int lastapp_length; long unsigned int lastdata_length; // Now a couple internal methods Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Oct 17 19:33:32 2006 @@ -1235,7 +1235,7 @@ /*********************************************************************************/ enum session_tinyid { SESSION_NAME, SESSION_STATE, - PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI2, PROFILE_DEST + PROFILE_DIALPLAN, PROFILE_CID_NAME, PROFILE_CID_NUM, PROFILE_IP, PROFILE_ANI, PROFILE_ANI_II, PROFILE_DEST }; static JSFunctionSpec session_methods[] = { @@ -1266,7 +1266,7 @@ {"caller_id_num", PROFILE_CID_NUM, JSPROP_READONLY|JSPROP_PERMANENT}, {"network_addr", PROFILE_IP, JSPROP_READONLY|JSPROP_PERMANENT}, {"ani", PROFILE_ANI, JSPROP_READONLY|JSPROP_PERMANENT}, - {"ani2", PROFILE_ANI2, JSPROP_READONLY|JSPROP_PERMANENT}, + {"aniii", PROFILE_ANI_II, JSPROP_READONLY|JSPROP_PERMANENT}, {"destination", PROFILE_DEST, JSPROP_READONLY|JSPROP_PERMANENT}, {0} }; @@ -1325,9 +1325,9 @@ *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->ani)); } break; - case PROFILE_ANI2: + case PROFILE_ANI_II: if (caller_profile) { - *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->ani2)); + *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, caller_profile->aniii)); } break; case PROFILE_DEST: @@ -1402,7 +1402,7 @@ char *cid_num = ""; char *network_addr = ""; char *ani = ""; - char *ani2 = ""; + char *aniii = ""; char *rdnis = ""; char *context = ""; char *username = NULL; @@ -1442,7 +1442,7 @@ ani = JS_GetStringBytes(JS_ValueToString(cx, argv[7])); } if (argc > 8) { - ani2 = JS_GetStringBytes(JS_ValueToString(cx, argv[8])); + aniii = JS_GetStringBytes(JS_ValueToString(cx, argv[8])); } if (argc > 9) { rdnis = JS_GetStringBytes(JS_ValueToString(cx, argv[9])); @@ -1467,7 +1467,7 @@ cid_num, network_addr, ani, - ani2, + aniii, rdnis, (char *)modname, context, Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Tue Oct 17 19:33:32 2006 @@ -39,7 +39,7 @@ char *caller_id_number, char *network_addr, char *ani, - char *ani2, + char *aniii, char *rdnis, char *source, char *context, @@ -59,7 +59,7 @@ profile->caller_id_number = switch_core_strdup(pool, caller_id_number); profile->network_addr = switch_core_strdup(pool, network_addr); profile->ani = switch_core_strdup(pool, ani); - profile->ani2 = switch_core_strdup(pool, ani2); + profile->aniii = switch_core_strdup(pool, aniii); profile->rdnis = switch_core_strdup(pool, rdnis); profile->source = switch_core_strdup(pool, source); profile->context = switch_core_strdup(pool, context); @@ -80,7 +80,7 @@ profile->dialplan = switch_core_session_strdup(session, tocopy->dialplan); profile->caller_id_name = switch_core_session_strdup(session, tocopy->caller_id_name); profile->ani = switch_core_session_strdup(session, tocopy->ani); - profile->ani2 = switch_core_session_strdup(session, tocopy->ani2); + profile->aniii = switch_core_session_strdup(session, tocopy->aniii); profile->caller_id_number = switch_core_session_strdup(session, tocopy->caller_id_number); profile->network_addr = switch_core_session_strdup(session, tocopy->network_addr); profile->rdnis = switch_core_session_strdup(session, tocopy->rdnis); @@ -109,8 +109,8 @@ if (!strcasecmp(name, "ani")) { return caller_profile->ani; } - if (!strcasecmp(name, "ani2")) { - return caller_profile->ani2; + if (!strcasecmp(name, "aniii")) { + return caller_profile->aniii; } if (!strcasecmp(name, "caller_id_number")) { return caller_profile->caller_id_number; @@ -169,9 +169,9 @@ snprintf(header_name, sizeof(header_name), "%s-ANI", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->ani); } - if (caller_profile->ani2) { - snprintf(header_name, sizeof(header_name), "%s-ANI2", prefix); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->ani2); + if (caller_profile->aniii) { + snprintf(header_name, sizeof(header_name), "%s-ANI-II", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->aniii); } if (caller_profile->destination_number) { snprintf(header_name, sizeof(header_name), "%s-Destination-Number", prefix); Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Tue Oct 17 19:33:32 2006 @@ -1330,7 +1330,7 @@ ecaller_id_number ? ecaller_id_number : caller_profile->caller_id_number, caller_profile->network_addr, caller_profile->ani, - caller_profile->ani2, + caller_profile->aniii, caller_profile->rdnis, caller_profile->source, caller_profile->context, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Oct 17 19:33:32 2006 @@ -1846,7 +1846,7 @@ caller_profile_override->caller_id_number, caller_profile_override->network_addr, caller_profile_override->ani, - caller_profile_override->ani2, + caller_profile_override->aniii, caller_profile_override->rdnis, caller_profile_override->source, caller_profile_override->context,

1 0

[commit] r3072 - in freeswitch/trunk/libs/libdingaling: . src
by Freeswitch SVN 17 Oct '06

17 Oct '06

Author: mikej Date: Tue Oct 17 17:56:45 2006 New Revision: 3072 Modified: freeswitch/trunk/libs/libdingaling/libdingaling.vcproj freeswitch/trunk/libs/libdingaling/src/libdingaling.c Log: up the warning level. Modified: freeswitch/trunk/libs/libdingaling/libdingaling.vcproj ============================================================================== --- freeswitch/trunk/libs/libdingaling/libdingaling.vcproj (original) +++ freeswitch/trunk/libs/libdingaling/libdingaling.vcproj Tue Oct 17 17:56:45 2006 @@ -46,9 +46,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" + DisableSpecificWarnings="4100;4706" /> <Tool Name="VCManagedResourceCompilerTool" @@ -107,9 +108,10 @@ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" + DisableSpecificWarnings="4100" /> <Tool Name="VCManagedResourceCompilerTool" @@ -170,9 +172,10 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" + DisableSpecificWarnings="4100" /> <Tool Name="VCManagedResourceCompilerTool" @@ -247,9 +250,10 @@ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;APR_DECLARE_STATIC;APU_DECLARE_STATIC" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" + DisableSpecificWarnings="4100" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/libs/libdingaling/src/libdingaling.c ============================================================================== --- freeswitch/trunk/libs/libdingaling/src/libdingaling.c (original) +++ freeswitch/trunk/libs/libdingaling/src/libdingaling.c Tue Oct 17 17:56:45 2006 @@ -395,7 +395,7 @@ session->candidates[index].address = apr_pstrdup(session->pool, key); } if ((key = iks_find_attrib(tag, "port"))) { - session->candidates[index].port = atoi(key); + session->candidates[index].port = (uint16_t)atoi(key); } if (globals.debug) { globals.logger(DL_LOG_DEBUG, @@ -1185,7 +1185,7 @@ { iks *iq, *sess, *tag; - unsigned int x, id; + unsigned int x, id = 0; for (x = 0; x < clen; x++) { @@ -1408,7 +1408,7 @@ int8_t ldl_handle_ready(ldl_handle_t *handle) { - return ldl_test_flag(handle, LDL_FLAG_READY); + return (int8_t)ldl_test_flag(handle, LDL_FLAG_READY); } ldl_status ldl_handle_init(ldl_handle_t **handle, @@ -1454,7 +1454,7 @@ new_handle->server = apr_pstrdup(pool, server); if ((p = strchr(new_handle->server, ':'))) { *p++ = '\0'; - new_handle->port = atoi(p); + new_handle->port = (uint16_t)atoi(p); } }

1 0

[commit] r3069 - in freeswitch/trunk: libs/win32/sofia src/mod/codecs/mod_ilbc
by Freeswitch SVN 17 Oct '06

17 Oct '06

Author: mikej Date: Mon Oct 16 23:45:51 2006 New Revision: 3069 Modified: freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj Log: raise warning levels. Modified: freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj (original) +++ freeswitch/trunk/libs/win32/sofia/libsofia_sip_ua_static.vcproj Mon Oct 16 23:45:51 2006 @@ -53,8 +53,9 @@ ObjectFile=".\Debug/" ProgramDataBaseFileName=".\Debug/" BrowseInformation="1" - WarningLevel="3" + WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> <Tool @@ -131,8 +132,9 @@ ObjectFile=".\Release/" ProgramDataBaseFileName=".\Release/" BrowseInformation="1" - WarningLevel="3" + WarningLevel="4" SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" /> <Tool Name="VCManagedResourceCompilerTool" Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.c Mon Oct 16 23:45:51 2006 @@ -49,7 +49,7 @@ { struct ilbc_context *context; int encoding, decoding; - uint8_t ms = codec->implementation->microseconds_per_frame / 1000; + uint8_t ms = (uint8_t)(codec->implementation->microseconds_per_frame / 1000); if (ms != 20 && ms != 30) { Modified: freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_ilbc/mod_ilbc.vcproj Mon Oct 16 23:45:51 2006 @@ -48,7 +48,8 @@ BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" /> @@ -127,7 +128,8 @@ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS" RuntimeLibrary="2" UsePrecompiledHeader="0" - WarningLevel="3" + WarningLevel="4" + WarnAsError="true" Detect64BitPortabilityProblems="true" DebugInformationFormat="3" />

1 0

[commit] r3068 - freeswitch/trunk/src
by Freeswitch SVN 17 Oct '06

17 Oct '06

Author: mikej Date: Mon Oct 16 23:41:05 2006 New Revision: 3068 Modified: freeswitch/trunk/src/switch_event.c Log: typo Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Oct 16 23:41:05 2006 @@ -604,7 +604,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - return = vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) {

1 0

[commit] r3065 - freeswitch/trunk/src/mod/applications/mod_playback
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: anthm Date: Mon Oct 16 16:24:11 2006 New Revision: 3065 Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Log: let * be end playback not hangup Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Mon Oct 16 16:24:11 2006 @@ -47,7 +47,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Digits %s\n", dtmf); if (*dtmf == '*') { - return SWITCH_STATUS_FALSE; + return SWITCH_STATUS_BREAK; } } break; @@ -101,6 +101,7 @@ switch_channel_t *channel; char *timer_name = NULL; char *file_name = NULL; + switch_status_t status; file_name = switch_core_session_strdup(session, data); @@ -113,7 +114,9 @@ switch_channel_pre_answer(channel); - if (switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0) != SWITCH_STATUS_SUCCESS) { + status = switch_ivr_play_file(session, NULL, file_name, timer_name, on_dtmf, NULL, 0); + + if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); }

1 0

[commit] r3064 - freeswitch/trunk/src
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: anthm Date: Mon Oct 16 15:56:42 2006 New Revision: 3064 Modified: freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: find missing ret = and put them back Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Mon Oct 16 15:56:42 2006 @@ -52,7 +52,7 @@ ret = vasprintf(&data, fmt, ap); #else if ((data = (char *) malloc(2048))) { - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); } #endif va_end(ap); @@ -152,7 +152,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Oct 16 15:56:42 2006 @@ -479,7 +479,7 @@ va_list ap; va_start(ap, fmt); - vsnprintf(data, sizeof(data), fmt, ap); + ret = vsnprintf(data, sizeof(data), fmt, ap); va_end(ap); if (ret == -1) { @@ -604,7 +604,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + return = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { @@ -674,7 +674,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) { Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Mon Oct 16 15:56:42 2006 @@ -196,7 +196,7 @@ ret = vasprintf(&data, fmt, ap); #else data = (char *) malloc(2048); - vsnprintf(data, 2048, fmt, ap); + ret = vsnprintf(data, 2048, fmt, ap); #endif va_end(ap); if (ret == -1) {

1 0

[commit] r3060 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: mikej Date: Mon Oct 16 12:06:44 2006 New Revision: 3060 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: Make error message more descriptive, and less antagonistic. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Oct 16 12:06:44 2006 @@ -124,7 +124,7 @@ } else if (!strcasecmp(arg, "number")) { switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode ASSHAT\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode [no|yes|name|full|number].\n"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); }

1 0

[commit] r3059 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: mikej Date: Mon Oct 16 11:04:54 2006 New Revision: 3059 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add privacy application, thanks ken. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Oct 16 11:04:54 2006 @@ -24,6 +24,7 @@ * Contributor(s): * * Anthony Minessale II <anthmct(a)yahoo.com> + * Ken Rice, Asteria Solutions Group, Inc <ken(a)asteriasgi.com> * * * mod_dptools.c -- Raw Audio File Streaming Application Module @@ -93,6 +94,42 @@ } } +static void privacy_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + char *arg; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + caller_profile = switch_channel_get_caller_profile(channel); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No privacy mode specified.\n"); + } else { + arg = switch_core_session_strdup(session, data); + + switch_set_flag(caller_profile, SWITCH_CPF_SCREEN); + + if(!strcasecmp(arg, "no")) { + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + switch_clear_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "yes")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "full")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "name")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NAME); + } else if (!strcasecmp(arg, "number")) { + switch_set_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID privacy mode specified. Use a valid mode ASSHAT\n"); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Privacy to %s [%d]\n", arg, caller_profile->flags); + } +} + static void strftime_function(switch_core_session_t *session, char *data) { char *argv[2]; @@ -183,13 +220,22 @@ /* next */ &sleep_application_interface }; +static const switch_application_interface_t privacy_application_interface = { + /*.interface_name */ "privacy", + /*.application_function */ privacy_function, + /* long_desc */ "Set caller privacy on calls.", + /* short_desc */ "Set privacy on calls", + /* syntax */ "off|on|name|full|number", + /*.next */ &transfer_application_interface +}; + static const switch_loadable_module_interface_t mod_dptools_module_interface = { /*.module_name = */ modname, /*.endpoint_interface = */ NULL, /*.timer_interface = */ NULL, /*.dialplan_interface = */ NULL, /*.codec_interface = */ NULL, - /*.application_interface */ &transfer_application_interface, + /*.application_interface */ &privacy_application_interface, /*.api_interface */ &dptools_api_interface };

1 0

[commit] r3058 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by Freeswitch SVN 16 Oct '06

16 Oct '06

Author: anthm Date: Mon Oct 16 00:39:00 2006 New Revision: 3058 Modified: freeswitch/trunk/src/include/switch_caller.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_core.c Log: rpid for sofia Modified: freeswitch/trunk/src/include/switch_caller.h ============================================================================== --- freeswitch/trunk/src/include/switch_caller.h (original) +++ freeswitch/trunk/src/include/switch_caller.h Mon Oct 16 00:39:00 2006 @@ -86,6 +86,8 @@ char *uuid; /*! context */ char *context; + /*! flags */ + switch_caller_profile_flag_t flags; struct switch_caller_profile *next; }; Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Oct 16 00:39:00 2006 @@ -131,6 +131,11 @@ #define SWITCH_FALSE 0 #define SWITCH_CORE_QUEUE_LEN 100000 +typedef enum { + SWITCH_CPF_SCREEN = (1 << 0), + SWITCH_CPF_HIDE_NAME = (1 << 1), + SWITCH_CPF_HIDE_NUMBER = (1 << 2) +} switch_caller_profile_flag_t; typedef enum { SWITCH_AUDIO_COL_STR_TITLE = 0x01, 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 Oct 16 00:39:00 2006 @@ -842,6 +842,7 @@ static void do_invite(switch_core_session_t *session) { + char rpid[1024]; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -869,6 +870,23 @@ switch_set_flag_locked(tech_pvt, TFLAG_READY); + // forge a RPID for now KHR -- Should wrap this in an if statement so it can be turned on and off + if (switch_test_flag(caller_profile, SWITCH_CPF_SCREEN)) { + char *priv = "no"; + + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { + priv = "name"; + if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { + priv = "yes"; + } + } else if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER)) { + priv = "yes"; + } + + snprintf(rpid, sizeof(rpid) - 1, "Remote-Party-ID: %s;party=calling;screen=yes;privacy=%s", tech_pvt->from_str, priv); + + } + if (!tech_pvt->nh) { tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, SIPTAG_TO_STR(tech_pvt->dest), @@ -882,6 +900,7 @@ } nua_invite(tech_pvt->nh, + TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), @@ -897,6 +916,7 @@ static void do_xfer_invite(switch_core_session_t *session) { + char rpid[1024]; private_object_t *tech_pvt; switch_channel_t *channel = NULL; switch_caller_profile_t *caller_profile; @@ -918,7 +938,6 @@ ))) { char *rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); - tech_pvt->nh2 = nua_handle(tech_pvt->profile->nua, NULL, SIPTAG_TO_STR(tech_pvt->dest), @@ -932,6 +951,7 @@ nua_invite(tech_pvt->nh2, + TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), @@ -3115,6 +3135,7 @@ { switch_core_session_t *session = sofia_private ? sofia_private->session : NULL; char key[128] = ""; + sip_unknown_t *un; if (!session) { @@ -3212,10 +3233,62 @@ (profile->pflags & PFLAG_FULL_ID) ? to_username : (char *) to_user )) != 0) { + + + for (un=sip->sip_unknown; un; un=un->un_next) { + // Loop thru Known Headers Here so we can do something with them + // John Doe <sip:+19018577141@209.247.16.1>;party=calling;screen=yes;privacy=off + if (!strncasecmp(un->un_name, "Remote-Party-ID", 15)) { + int argc, x, screen = 1; + char *mydata, *argv[10] = { 0 }; + if (!switch_strlen_zero(un->un_value)) { + if ((mydata = strdup(un->un_value))) { + argc = switch_separate_string(mydata, ';', argv, (sizeof(argv) / sizeof(argv[0]))); + + // Do We really need this at this time + // clid_uri = argv[0]; + + for (x=1; x < argc && argv[x]; x++){ + // we dont need to do anything with party yet we should only be seeing party=calling here anyway + // maybe thats a dangerous assumption bit oh well yell at me later + // if (!strncasecmp(argv[x], "party", 5)) { + // party = argv[x]; + // } else + if (!strncasecmp(argv[x], "privacy=", 8)) { + char *arg = argv[x] + 9; + + if(!strcasecmp(arg, "no")) { + switch_clear_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME); + switch_clear_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "yes")) { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "full")) { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } else if (!strcasecmp(arg, "name")) { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME); + } else if (!strcasecmp(arg, "number")) { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NUMBER); + } + } else if (!strncasecmp(argv[x], "screen=", 7) && screen > 0) { + char *arg = argv[x] + 8; + if (!strcasecmp(arg, "no")) { + screen = 0; + switch_clear_flag(tech_pvt->caller_profile, SWITCH_CPF_SCREEN); + } + } + } + free(mydata); + } + } + break; + } + } + switch_channel_set_caller_profile(channel, tech_pvt->caller_profile); switch_core_db_free(username); switch_core_db_free(to_username); } + switch_set_flag_locked(tech_pvt, TFLAG_INBOUND); tech_pvt->sofia_private.session = session; nua_handle_bind(nh, &tech_pvt->sofia_private); Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Mon Oct 16 00:39:00 2006 @@ -64,6 +64,7 @@ profile->source = switch_core_strdup(pool, source); profile->context = switch_core_strdup(pool, context); profile->destination_number = switch_core_strdup(pool, destination_number); + switch_set_flag(profile, SWITCH_CPF_SCREEN); } return profile; @@ -88,6 +89,7 @@ profile->source = switch_core_session_strdup(session, tocopy->source); profile->context = switch_core_session_strdup(session, tocopy->context); profile->chan_name = switch_core_session_strdup(session, tocopy->chan_name); + profile->flags = tocopy->flags; } return profile; @@ -195,6 +197,17 @@ snprintf(header_name, sizeof(header_name), "%s-Channel-Name", prefix); switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, "%s", caller_profile->chan_name); } + + snprintf(header_name, sizeof(header_name), "%s-Screen-Bit", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_SCREEN) ? "yes" : "no"); + + snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Name", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME) ? "yes" : "no"); + + snprintf(header_name, sizeof(header_name), "%s-Privacy-Hide-Number", prefix); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, header_name, switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NUMBER) ? "yes" : "no"); + + } Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Oct 16 00:39:00 2006 @@ -1335,7 +1335,7 @@ caller_profile->source, caller_profile->context, caller_profile->destination_number); - + outgoing_profile->flags = caller_profile->flags; } } }

1 0