- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12506 - freeswitch/trunk/debian
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: nicholas Date: Sat Mar 7 06:43:48 2009 New Revision: 12506 Log: fixed openzap.conf issue in deb package Modified: freeswitch/trunk/debian/freeswitch.install Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sat Mar 7 06:43:48 2009 @@ -52,6 +52,7 @@ opt/freeswitch/conf/web-vm.tpl opt/freeswitch/conf/tetris.ttml opt/freeswitch/conf/fur_elise.ttml +opt/freeswitch/conf/openzap.conf opt/freeswitch/conf/dialplan/public.xml opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml

1 0

[commit] r12505 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: gmaruzz Date: Sat Mar 7 05:46:01 2009 New Revision: 12505 Log: skypiax: Visual C: correcting the warning ' Potential comparison of a constant with another constant' Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Mar 7 05:46:01 2009 @@ -12,6 +12,7 @@ extern switch_memory_pool_t *skypiax_module_pool; extern switch_endpoint_interface_t *skypiax_endpoint_interface; #endif /* ASTERISK */ +int samplerate_skypiax = SAMPLERATE_SKYPIAX; extern int running; @@ -484,7 +485,7 @@ if (len == 320) { unsigned int howmany; - if (SAMPLERATE_SKYPIAX == 8000) { + if (samplerate_skypiax == 8000) { /* we're downsampling from 16khz to 8khz, srv_out will contain each other sample from srv_in */ a = 0; for (i = 0; i < len / sizeof(short); i++) { @@ -492,7 +493,7 @@ i++; a++; } - } else if (SAMPLERATE_SKYPIAX == 16000) { + } else if (samplerate_skypiax == 16000) { /* we're NOT downsampling, srv_out will contain ALL samples from srv_in */ for (i = 0; i < len / sizeof(short); i++) { srv_out[i] = srv_in[i]; @@ -647,7 +648,7 @@ } if (got == SAMPLES_PER_FRAME * sizeof(short)) { - if (SAMPLERATE_SKYPIAX == 8000) { + if (samplerate_skypiax == 8000) { /* we're upsampling from 8khz to 16khz, cli_out will contain two times each sample from cli_in */ a = 0; @@ -658,7 +659,7 @@ a++; } got = got * 2; - } else if (SAMPLERATE_SKYPIAX == 16000) { + } else if (samplerate_skypiax == 16000) { /* we're NOT upsampling, cli_out will contain just ALL samples from cli_in */ for (i = 0; i < got / sizeof(short); i++) { cli_out[i] = cli_in[i];

1 0

[commit] r12504 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: gmaruzz Date: Sat Mar 7 05:41:54 2009 New Revision: 12504 Log: skypiax: Visual C: correcting a typo, was causing 'argument 1' might be '0': this does not adhere to the specification for the function 'CloseHandle' Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Mar 7 05:41:54 2009 @@ -1051,7 +1051,7 @@ } } if (fReturnStatus == 0) - CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle), + CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle); tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL; return (fReturnStatus); } @@ -1060,7 +1060,7 @@ { UnregisterClass(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName, tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle); - CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle), + CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle); tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL; }

1 0

[commit] r12503 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: gmaruzz Date: Sat Mar 7 05:14:08 2009 New Revision: 12503 Log: skypiax: Visual C: use switch_string_copy instead of strncpy, fix the Release build (Release was lacking rpcrt4.lib in the linker command line of the mod_skypiax project) Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.2008.vcproj Sat Mar 7 05:14:08 2009 @@ -116,6 +116,7 @@ /> <Tool Name="VCLinkerTool" + AdditionalOptions="rpcrt4.lib" RandomizedBaseAddress="1" DataExecutionPrevention="0" /> Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sat Mar 7 05:14:08 2009 @@ -2,11 +2,13 @@ #ifdef ASTERISK #define skypiax_sleep usleep +#define skypiax_strncpy strncpy #define tech_pvt p extern int skypiax_debug; extern char *skypiax_console_active; #else /* FREESWITCH */ #define skypiax_sleep switch_sleep +#define skypiax_strncpy switch_copy_string extern switch_memory_pool_t *skypiax_module_pool; extern switch_endpoint_interface_t *skypiax_endpoint_interface; #endif /* ASTERISK */ @@ -75,7 +77,7 @@ tech_pvt->interface_state = SKYPIAX_STATE_DOWN; } } - strncpy(message_2, message, sizeof(message) - 1); + skypiax_strncpy(message_2, message, sizeof(message) - 1); buf = message; stringp = &buf; where = strsep(stringp, " "); @@ -96,9 +98,9 @@ } } if (!strcasecmp(message, "CURRENTUSERHANDLE")) { - strncpy(obj, where, sizeof(obj) - 1); + skypiax_strncpy(obj, where, sizeof(obj) - 1); where = strsep(stringp, " "); - strncpy(id, where, sizeof(id) - 1); + skypiax_strncpy(id, where, sizeof(id) - 1); if (!strcasecmp(id, tech_pvt->skype_user)) { tech_pvt->SkypiaxHandles.currentuserhandle = 1; DEBUGA_SKYPE @@ -107,11 +109,11 @@ } } if (!strcasecmp(message, "USER")) { - strncpy(obj, where, sizeof(obj) - 1); + skypiax_strncpy(obj, where, sizeof(obj) - 1); where = strsep(stringp, " "); - strncpy(id, where, sizeof(id) - 1); + skypiax_strncpy(id, where, sizeof(id) - 1); where = strsep(stringp, " "); - strncpy(prop, where, sizeof(prop) - 1); + skypiax_strncpy(prop, where, sizeof(prop) - 1); if (!strcasecmp(prop, "RECEIVEDAUTHREQUEST")) { char msg_to_skype[256]; DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s!\n", @@ -122,14 +124,14 @@ } } if (!strcasecmp(message, "MESSAGE")) { - strncpy(obj, where, sizeof(obj) - 1); + skypiax_strncpy(obj, where, sizeof(obj) - 1); where = strsep(stringp, " "); - strncpy(id, where, sizeof(id) - 1); + skypiax_strncpy(id, where, sizeof(id) - 1); where = strsep(stringp, " "); - strncpy(prop, where, sizeof(prop) - 1); + skypiax_strncpy(prop, where, sizeof(prop) - 1); if (!strcasecmp(prop, "STATUS")) { where = strsep(stringp, " "); - strncpy(value, where, sizeof(value) - 1); + skypiax_strncpy(value, where, sizeof(value) - 1); if (!strcasecmp(value, "RECEIVED")) { char msg_to_skype[256]; DEBUGA_SKYPE("Skype MSG: message: %s, obj: %s, id: %s, prop: %s value: %s!\n", @@ -148,13 +150,13 @@ } } if (!strcasecmp(message, "CALL")) { - strncpy(obj, where, sizeof(obj) - 1); + skypiax_strncpy(obj, where, sizeof(obj) - 1); where = strsep(stringp, " "); - strncpy(id, where, sizeof(id) - 1); + skypiax_strncpy(id, where, sizeof(id) - 1); where = strsep(stringp, " "); - strncpy(prop, where, sizeof(prop) - 1); + skypiax_strncpy(prop, where, sizeof(prop) - 1); where = strsep(stringp, " "); - strncpy(value, where, sizeof(value) - 1); + skypiax_strncpy(value, where, sizeof(value) - 1); where = strsep(stringp, " "); DEBUGA_SKYPE @@ -162,7 +164,7 @@ SKYPIAX_P_LOG, message, obj, id, prop, value, where ? where : "NULL"); if (!strcasecmp(prop, "PARTNER_HANDLE")) { - strncpy(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1); + skypiax_strncpy(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1); DEBUGA_SKYPE ("the skype_call %s caller PARTNER_HANDLE (tech_pvt->callid_number) is: %s\n", SKYPIAX_P_LOG, id, tech_pvt->callid_number); @@ -196,7 +198,7 @@ } if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) { if (strcasecmp(id, tech_pvt->skype_call_id)) { - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); DEBUGA_SKYPE ("We called a Skype contact and he answered us on skype_call: %s.\n", SKYPIAX_P_LOG, id); @@ -227,7 +229,7 @@ skypiax_signaling_write(tech_pvt, msg_to_skype); DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPIAX_P_LOG, id); - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); } else { /* we're owned, we're in a call, let's try to transfer */ /************************** TODO @@ -264,7 +266,7 @@ /* we are calling out */ tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING; tech_pvt->interface_state = SKYPIAX_STATE_RINGING; - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n", SKYPIAX_P_LOG, id); remote_party_is_ringing(tech_pvt); @@ -320,7 +322,7 @@ ("we tried to call Skype on skype_call %s and Skype has now FAILED\n", SKYPIAX_P_LOG, id); tech_pvt->skype_call_id[0] = '\0'; - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); tech_pvt->interface_state = SKYPIAX_STATE_DOWN; return CALLFLOW_INCOMING_HANGUP; } else if (!strcasecmp(value, "REFUSED")) { @@ -330,7 +332,7 @@ DEBUGA_SKYPE ("we tried to call Skype on skype_call %s and Skype has now REFUSED\n", SKYPIAX_P_LOG, id); - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); tech_pvt->interface_state = SKYPIAX_STATE_DOWN; tech_pvt->skype_call_id[0] = '\0'; return CALLFLOW_INCOMING_HANGUP; @@ -341,19 +343,19 @@ } else if (!strcasecmp(value, "ROUTING")) { tech_pvt->skype_callflow = CALLFLOW_STATUS_ROUTING; tech_pvt->interface_state = SKYPIAX_STATE_DIALING; - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "UNPLACED")) { tech_pvt->skype_callflow = CALLFLOW_STATUS_UNPLACED; tech_pvt->interface_state = SKYPIAX_STATE_DIALING; - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPIAX_P_LOG, id); } else if (!strcasecmp(value, "INPROGRESS")) { char msg_to_skype[1024]; if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id) || !strcasecmp(tech_pvt->skype_call_id, id)) { - strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); + skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1); DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id); if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) { tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS; @@ -389,19 +391,19 @@ /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[11]: %s\n", SKYPIAX_P_LOG, * message_2, &message_2[11]); */ memset(tech_pvt->skype_friends, 0, 4096); - strncpy(tech_pvt->skype_friends, &message_2[11], 4095); + skypiax_strncpy(tech_pvt->skype_friends, &message_2[11], 4095); } if (!strcasecmp(message, "#222")) { /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG, * message_2, &message_2[10]); */ memset(tech_pvt->skype_fullname, 0, 512); - strncpy(tech_pvt->skype_fullname, &message_2[10], 511); + skypiax_strncpy(tech_pvt->skype_fullname, &message_2[10], 511); } if (!strcasecmp(message, "#765")) { /* DEBUGA_SKYPE("Skype MSG: message_2: %s, message2[10]: %s\n", SKYPIAX_P_LOG, * message_2, &message_2[10]); */ memset(tech_pvt->skype_displayname, 0, 512); - strncpy(tech_pvt->skype_displayname, &message_2[10], 511); + skypiax_strncpy(tech_pvt->skype_displayname, &message_2[10], 511); } a = 0; } //message end @@ -943,7 +945,7 @@ PCOPYDATASTRUCT poCopyData = (PCOPYDATASTRUCT) ulParam; memset(msg_from_skype, '\0', sizeof(msg_from_skype)); - strncpy(msg_from_skype, (const char *) poCopyData->lpData, + skypiax_strncpy(msg_from_skype, (const char *) poCopyData->lpData, sizeof(msg_from_skype) - 2); howmany = strlen(msg_from_skype) + 1;

1 0

[commit] r12502 - in freeswitch/trunk: . src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mikej Date: Sat Mar 7 03:33:39 2009 New Revision: 12502 Log: add skypiax to sln file and fix some warnings Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/src/mod/endpoints/mod_skypiax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Sat Mar 7 03:33:39 2009 @@ -992,6 +992,11 @@ {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skypiax", "src\mod\endpoints\mod_skypiax\mod_skypiax.2008.vcproj", "{C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution All|Win32 = All|Win32 @@ -2396,6 +2401,13 @@ {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Debug|x64.ActiveCfg = Debug|x64 {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|Win32.ActiveCfg = Release|Win32 {11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}.Release|x64.ActiveCfg = Release|x64 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.ActiveCfg = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|Win32.Build.0 = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.All|x64.ActiveCfg = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Debug|x64.ActiveCfg = Debug|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|Win32.ActiveCfg = Release|Win32 + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2415,6 +2427,7 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {B3F424EC-3D8F-417C-B244-3919D5E1A577} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {05C9FB27-480E-4D53-B3B7-6338E2526666} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} + {C6E78A4C-DB1E-47F4-9B63-4DC27D86343F} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C} {30A5B29C-983E-4580-9FD0-D647CCDCC7EB} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {C24FB505-05D7-4319-8485-7540B44C8603} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Sat Mar 7 03:33:39 2009 @@ -158,10 +158,10 @@ private_t *tech_pvt = NULL; tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); switch_set_flag_locked(tech_pvt, TFLAG_IO); /* Move channel's state machine to ROUTING. This means the call is trying @@ -184,10 +184,10 @@ char msg_to_skype[256]; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch_clear_flag_locked(tech_pvt, TFLAG_IO); switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); @@ -226,10 +226,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); DEBUGA_SKYPE("%s CHANNEL ROUTING\n", SKYPIAX_P_LOG, switch_channel_get_name(channel)); @@ -243,10 +243,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); DEBUGA_SKYPE("%s CHANNEL EXECUTE\n", SKYPIAX_P_LOG, switch_channel_get_name(channel)); @@ -259,10 +259,10 @@ private_t *tech_pvt = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (sig) { case SWITCH_SIG_KILL: @@ -320,10 +320,10 @@ switch_byte_t *data; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); tech_pvt->read_frame.flags = SFF_NONE; *frame = NULL; @@ -390,10 +390,10 @@ unsigned int sent; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); if (!switch_test_flag(tech_pvt, TFLAG_IO)) { ERRORA("CIAPA \n", SKYPIAX_P_LOG); @@ -424,10 +424,10 @@ switch_channel_t *channel = NULL; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); DEBUGA_SKYPE("ANSWERED! \n", SKYPIAX_P_LOG); @@ -441,10 +441,10 @@ private_t *tech_pvt; channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); tech_pvt = (private_t *) switch_core_session_get_private(session); - assert(tech_pvt != NULL); + switch_assert(tech_pvt != NULL); switch (msg->message_id) { case SWITCH_MESSAGE_INDICATE_ANSWER: @@ -521,11 +521,11 @@ int found = 0; char interface_name[256]; - if (strlen(outbound_profile->destination_number)) { + if (!switch_strlen_zero(outbound_profile->destination_number)) { int i; char *slash; - strncpy(interface_name, outbound_profile->destination_number, 255); + switch_copy_string(interface_name, outbound_profile->destination_number, 255); slash = strrchr(interface_name, '/'); *slash = '\0'; @@ -657,12 +657,12 @@ } else { DEBUGA_SKYPE("no session\n", SKYPIAX_P_LOG); } - } else { + tech_pvt->interface_state = SKYPIAX_STATE_DOWN; + memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str)); + } else { ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG); - } - tech_pvt->interface_state = SKYPIAX_STATE_DOWN; - memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str)); - } + } + } } return NULL; } @@ -1217,25 +1217,29 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; - if (strlen(tech_pvt->session_uuid_str)) { + if (!switch_strlen_zero(tech_pvt->session_uuid_str)) { session = switch_core_session_locate(tech_pvt->session_uuid_str); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); + goto done; } if (session) { channel = switch_core_session_get_channel(session); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); + goto done; } if (channel) { switch_channel_mark_ring_ready(channel); DEBUGA_SKYPE("skype_call: REMOTE PARTY RINGING\n", SKYPIAX_P_LOG); } else { ERRORA("No channel???\n", SKYPIAX_P_LOG); + goto done; } switch_core_session_rwunlock(session); +done: return 0; } @@ -1244,26 +1248,30 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; - if (strlen(tech_pvt->session_uuid_str)) { + if (!switch_strlen_zero(tech_pvt->session_uuid_str)) { session = switch_core_session_locate(tech_pvt->session_uuid_str); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); + goto done; } if (session) { channel = switch_core_session_get_channel(session); switch_core_session_add_stream(session, NULL); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); + goto done; } if (channel) { switch_channel_mark_pre_answered(channel); NOTICA("skype_call: REMOTE PARTY EARLY MEDIA\n", SKYPIAX_P_LOG); } else { ERRORA("No channel???\n", SKYPIAX_P_LOG); + goto done; } switch_core_session_rwunlock(session); +done: return 0; } @@ -1272,24 +1280,29 @@ switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; - if (strlen(tech_pvt->session_uuid_str)) { + if (!switch_strlen_zero(tech_pvt->session_uuid_str)) { session = switch_core_session_locate(tech_pvt->session_uuid_str); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); + goto done; } if (session) { channel = switch_core_session_get_channel(session); } else { ERRORA("No session???\n", SKYPIAX_P_LOG); + goto done; } if (channel) { switch_channel_mark_answered(channel); //DEBUGA_SKYPE("skype_call: %s, answered\n", SKYPIAX_P_LOG, id); } else { ERRORA("No channel???\n", SKYPIAX_P_LOG); + goto done; } switch_core_session_rwunlock(session); + +done: DEBUGA_SKYPE("HERE!\n", SKYPIAX_P_LOG); return 0;

1 0

[commit] r12501 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mikej Date: Sat Mar 7 02:45:54 2009 New Revision: 12501 Log: fix dependencies Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.2008.vcproj Sat Mar 7 02:45:54 2009 @@ -213,7 +213,6 @@ <Tool Name="VCLinkerTool" UseLibraryDependencyInputs="false" - AdditionalDependencies="sphinxbase.lib pocketsphinx.lib" LinkIncremental="1" AdditionalLibraryDirectories=""$(SolutionDir)$(ConfigurationName)"" GenerateDebugInformation="true" @@ -292,7 +291,6 @@ <Tool Name="VCLinkerTool" UseLibraryDependencyInputs="false" - AdditionalDependencies="sphinxbase.lib pocketsphinx.lib" OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories=""$(SolutionDir)$(ConfigurationName)""

1 0

[commit] r12500 - in freeswitch/trunk: . libs/esl libs/esl/src libs/ilbc libs/libdingaling libs/speex/win32/VS2008/libspeex libs/voipcodecs libs/win32/apr-util libs/win32/curl libs/win32/flite libs/win32/howl libs/win32/iksemel libs/win32/js libs/win32/libg722_1 libs/win32/libmp3lame libs/win32/libogg libs/win32/libshout libs/win32/libsndfile libs/win32/mpg123 libs/win32/pocketsphinx libs/win32/pthread libs/win32/sofia libs/win32/sphinxbase libs/win32/udns libs/xmlrpc-c/Windows libs/xmlrpc-
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mikej Date: Sat Mar 7 02:45:21 2009 New Revision: 12500 Log: svn:ignore Modified: freeswitch/trunk/libs/esl/ (props changed) freeswitch/trunk/libs/esl/src/ (props changed) freeswitch/trunk/libs/ilbc/ (props changed) freeswitch/trunk/libs/libdingaling/ (props changed) freeswitch/trunk/libs/speex/win32/VS2008/libspeex/ (props changed) freeswitch/trunk/libs/voipcodecs/ (props changed) freeswitch/trunk/libs/win32/apr-util/ (props changed) freeswitch/trunk/libs/win32/curl/ (props changed) freeswitch/trunk/libs/win32/flite/ (props changed) freeswitch/trunk/libs/win32/howl/ (props changed) freeswitch/trunk/libs/win32/iksemel/ (props changed) freeswitch/trunk/libs/win32/js/ (props changed) freeswitch/trunk/libs/win32/libg722_1/ (props changed) freeswitch/trunk/libs/win32/libmp3lame/ (props changed) freeswitch/trunk/libs/win32/libogg/ (props changed) freeswitch/trunk/libs/win32/libshout/ (props changed) freeswitch/trunk/libs/win32/libsndfile/ (props changed) freeswitch/trunk/libs/win32/mpg123/ (props changed) freeswitch/trunk/libs/win32/pocketsphinx/ (props changed) freeswitch/trunk/libs/win32/pthread/ (props changed) freeswitch/trunk/libs/win32/sofia/ (props changed) freeswitch/trunk/libs/win32/sphinxbase/ (props changed) freeswitch/trunk/libs/win32/udns/ (props changed) freeswitch/trunk/libs/xmlrpc-c/Windows/ (props changed) freeswitch/trunk/libs/xmlrpc-c/lib/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_conference/ (props changed) freeswitch/trunk/src/mod/applications/mod_dptools/ (props changed) freeswitch/trunk/src/mod/applications/mod_easyroute/ (props changed) freeswitch/trunk/src/mod/applications/mod_enum/ (props changed) freeswitch/trunk/src/mod/applications/mod_esf/ (props changed) freeswitch/trunk/src/mod/applications/mod_expr/ (props changed) freeswitch/trunk/src/mod/applications/mod_fax/ (props changed) freeswitch/trunk/src/mod/applications/mod_fifo/ (props changed) freeswitch/trunk/src/mod/applications/mod_fsv/ (props changed) freeswitch/trunk/src/mod/applications/mod_lcr/ (props changed) freeswitch/trunk/src/mod/applications/mod_limit/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_snom/ (props changed) freeswitch/trunk/src/mod/applications/mod_vmd/ (props changed) freeswitch/trunk/src/mod/applications/mod_voicemail/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/ (props changed) freeswitch/trunk/src/mod/codecs/mod_amr/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g723_1/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_h26x/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_siren/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/codecs/mod_voipcodecs/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_loopback/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_sofia/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_socket/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/mod_local_stream/ (props changed) freeswitch/trunk/src/mod/formats/mod_native_file/ (props changed) freeswitch/trunk/src/mod/formats/mod_shout/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/formats/mod_tone_stream/ (props changed) freeswitch/trunk/src/mod/languages/mod_lua/ (props changed) freeswitch/trunk/src/mod/languages/mod_lua/lua/ (props changed) freeswitch/trunk/src/mod/languages/mod_managed/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_odbc/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_socket/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/loggers/mod_logfile/ (props changed) freeswitch/trunk/src/mod/say/mod_say_de/ (props changed) freeswitch/trunk/src/mod/say/mod_say_en/ (props changed) freeswitch/trunk/src/mod/say/mod_say_es/ (props changed) freeswitch/trunk/src/mod/say/mod_say_fr/ (props changed) freeswitch/trunk/src/mod/say/mod_say_it/ (props changed) freeswitch/trunk/src/mod/say/mod_say_nl/ (props changed) freeswitch/trunk/src/mod/say/mod_say_zh/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_curl/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) freeswitch/trunk/w32/Console/ (props changed) freeswitch/trunk/w32/Library/ (props changed) Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed)

1 0

[commit] r12499 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mrene Date: Sat Mar 7 00:50:10 2009 New Revision: 12499 Log: avoid (null) confusion Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Sat Mar 7 00:50:10 2009 @@ -215,8 +215,12 @@ newstring = value; /* Regex match, accept value*/ } else { newstring = (char*)item->defaultvalue; /* Regex failed */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", - value, item->key, newstring ? newstring : "(null)"); + if (newstring) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s], setting default [%s]\n", + value, item->key, newstring); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key); + } switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item); } } else {

1 0

[commit] r12498 - freeswitch/trunk/src
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mikej Date: Sat Mar 7 00:45:14 2009 New Revision: 12498 Log: tweak Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Sat Mar 7 00:45:14 2009 @@ -284,7 +284,7 @@ switch_xml_config_enum_item_t *enum_options = (switch_xml_config_enum_item_t*)item->data; int *dest = (int*)item->ptr; int newval = 0; - switch_status_t lookup_result; + switch_status_t lookup_result = SWITCH_STATUS_SUCCESS; if (value) { lookup_result = switch_xml_config_enum_str2int(enum_options, value, &newval); @@ -292,7 +292,7 @@ newval = (int)(intptr_t)item->defaultvalue; } - if (value != SWITCH_STATUS_SUCCESS) { + if (lookup_result != SWITCH_STATUS_SUCCESS) { newval = (int)(intptr_t)item->defaultvalue; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid value [%s] for parameter [%s]\n", value, item->key); switch_xml_config_item_print_doc(SWITCH_LOG_ERROR, item);

1 0

[commit] r12497 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 07 Mar '09

07 Mar '09

Author: mrene Date: Fri Mar 6 22:56:07 2009 New Revision: 12497 Log: Add events and a shutdown function to mod_limit Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Fri Mar 6 22:56:07 2009 @@ -37,8 +37,11 @@ #include <switch_odbc.h> #endif +#define LIMIT_EVENT_USAGE "limit::usage" + SWITCH_MODULE_LOAD_FUNCTION(mod_limit_load); -SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, NULL, NULL); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown); +SWITCH_MODULE_DEFINITION(mod_limit, mod_limit_load, mod_limit_shutdown, NULL); static struct { switch_memory_pool_t *pool; @@ -291,6 +294,21 @@ return status; } +static void limit_fire_event(const char *realm, const char *key, uint32_t usage, uint32_t rate, uint32_t max, uint32_t ratemax) +{ + switch_event_t *event; + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, LIMIT_EVENT_USAGE) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "realm", realm); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "key", key); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "usage", "%d", usage); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rate", "%d", rate); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "max", "%d", max); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "ratemax", "%d", ratemax); + switch_event_fire(&event); + } +} + static switch_status_t db_state_handler(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); @@ -792,7 +810,8 @@ limit_execute_sql(sql, NULL); switch_safe_free(sql); - switch_channel_set_variable(channel, "limit_usage", switch_core_session_sprintf(session, "%d", ++got)); + switch_channel_set_variable_printf(channel, "limit_usage", "%d", ++got); + limit_fire_event(realm, id, got, 0, max, 0); done: switch_mutex_unlock(globals.mutex); @@ -954,7 +973,6 @@ if (increment) { item->total_usage++; - switch_core_hash_insert(pvt->hash, hashkey, item); if (max == -1) { @@ -964,6 +982,8 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Usage for %s is now %d/%d for the last %d seconds\n", hashkey, item->rate_usage, max, interval); } + + limit_fire_event(realm, id, item->total_usage, item->rate_usage, max, max >=0 ? (uint32_t)max : 0); } /* Save current usage & rate into channel variables so it can be used later in the dialplan, or added to CDR records */ @@ -1036,6 +1056,13 @@ gethostname(globals.hostname, sizeof(globals.hostname)); globals.pool = pool; + + if (switch_event_reserve_subclass(LIMIT_EVENT_USAGE) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldnt register event subclass \"%s\"", + LIMIT_EVENT_USAGE); + return SWITCH_STATUS_FALSE; + } + if ((status = do_config() != SWITCH_STATUS_SUCCESS)) { return status; } @@ -1048,6 +1075,8 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_APP(app_interface, "limit", "Limit", LIMIT_DESC, limit_function, LIMIT_USAGE, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "limit_hash", "Limit (hash)", LIMITHASH_DESC, limit_hash_function, LIMITHASH_USAGE, SAF_SUPPORT_NOMEDIA); @@ -1074,6 +1103,23 @@ return SWITCH_STATUS_SUCCESS; } + +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_limit_shutdown) +{ + switch_event_free_subclass(LIMIT_EVENT_USAGE); + + switch_xml_config_cleanup(config_settings); + + switch_mutex_destroy(globals.mutex); + switch_mutex_destroy(globals.limit_hash_mutex); + switch_mutex_destroy(globals.db_hash_mutex); + + switch_core_hash_destroy(&globals.limit_hash); + switch_core_hash_destroy(&globals.db_hash); + + return SWITCH_STATUS_SUCCESS; +} + /* For Emacs: * Local Variables: * mode:c

1 0