- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13533 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: mikej Date: Mon Jun 1 13:51:19 2009 New Revision: 13533 Log: msvc build fix 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 Mon Jun 1 13:51:19 2009 @@ -70,12 +70,12 @@ } if (argv[0] && switch_stristr("add", argv[0])) { - if (switch_nat_add_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + if (switch_nat_add_mapping((switch_port_t)atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "true"); goto ok; } } else if (argv[0] && switch_stristr("del", argv[0])) { - if (switch_nat_del_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + if (switch_nat_del_mapping((switch_port_t)atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "true"); goto ok; }

1 0

[commit] r13532 - freeswitch/trunk/src
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 13:28:19 2009 New Revision: 13532 Log: moving init up so we have it in pre process vars Modified: freeswitch/trunk/src/switch_core.c Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Jun 1 13:28:19 2009 @@ -1128,8 +1128,6 @@ runtime.flags = flags; runtime.sps_total = 30; - - switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET); switch_core_set_variable("local_ip_v4", guess_ip); switch_find_local_ip(guess_ip, sizeof(guess_ip), AF_INET6); @@ -1139,6 +1137,8 @@ switch_event_init(runtime.memory_pool); + switch_nat_init(runtime.memory_pool); + if (switch_xml_init(runtime.memory_pool, err) != SWITCH_STATUS_SUCCESS) { apr_terminate(); return SWITCH_STATUS_MEMERR; @@ -1161,7 +1161,6 @@ switch_scheduler_task_thread_start(); switch_rtp_init(runtime.memory_pool); - switch_nat_init(runtime.memory_pool); runtime.running = 1;

1 0

[commit] r13531 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 13:24:54 2009 New Revision: 13531 Log: adding nat_map api 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 Mon Jun 1 13:24:54 2009 @@ -44,6 +44,53 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_commands_shutdown); SWITCH_MODULE_DEFINITION(mod_commands, mod_commands_load, mod_commands_shutdown, NULL); +SWITCH_STANDARD_API(nat_map_function) +{ + int argc; + char *mydata = NULL, *argv[4]; + switch_nat_ip_proto_t proto = SWITCH_NAT_UDP; + + if (!cmd) { + goto error; + } + + mydata = strdup(cmd); + switch_assert(mydata); + + argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); + + if (argc < 3) { + goto error; + } + + if (argv[2] && switch_stristr("tcp", argv[2])) { + proto = SWITCH_NAT_TCP; + } else if (argv[2] && switch_stristr("udp", argv[2])) { + proto = SWITCH_NAT_UDP; + } + + if (argv[0] && switch_stristr("add", argv[0])) { + if (switch_nat_add_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "true"); + goto ok; + } + } else if (argv[0] && switch_stristr("del", argv[0])) { + if (switch_nat_del_mapping(atoi(argv[1]), proto) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "true"); + goto ok; + } + } + + error: + + stream->write_function(stream, "false"); + + ok: + + switch_safe_free(mydata); + + return SWITCH_STATUS_SUCCESS; +} SWITCH_STANDARD_API(time_test_function) { @@ -3483,6 +3530,7 @@ SWITCH_ADD_API(commands_api_interface, "stun", "stun", stun_function, "<stun_server>[:port]"); SWITCH_ADD_API(commands_api_interface, "system", "Execute a system command", system_function, SYSTEM_SYNTAX); SWITCH_ADD_API(commands_api_interface, "time_test", "time_test", time_test_function, "<mss>"); + SWITCH_ADD_API(commands_api_interface, "nat_map", "nat_map", nat_map_function, "[add|del] <port> [tcp|udp]"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD;

1 0

[commit] r13530 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: anthm Date: Mon Jun 1 12:45:36 2009 New Revision: 13530 Log: fix regression MODAPP-284 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jun 1 12:45:36 2009 @@ -772,8 +772,8 @@ conference->count--; if (switch_test_flag(member, MFLAG_ENDCONF)) { - if (!--member->conference->end_count) { - switch_set_flag_locked(member->conference, CFLAG_DESTRUCT); + if (!--conference->end_count) { + switch_set_flag_locked(conference, CFLAG_DESTRUCT); } }

1 0

[commit] r13528 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 08:55:17 2009 New Revision: 13528 Log: ok only do this is callee_id_name is set Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 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 Jun 1 08:55:17 2009 @@ -179,21 +179,15 @@ { private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); const char *callee_name = NULL, *callee_number = NULL; - const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent"); - - if (ua && switch_stristr("polycom", ua)) { - if (!(callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name"))) { - callee_name = ""; - } + char *pai = NULL; + if ((callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name"))) { if (!(callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number"))) { callee_number = tech_pvt->caller_profile->destination_number; } - - return switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>", callee_name, callee_number); + pai = switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>", callee_name, callee_number); } - - return NULL; + return pai; } /* map QSIG cause codes to SIP from RFC4497 section 8.4.1 */

1 0

[commit] r13527 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: brian Date: Mon Jun 1 08:45:50 2009 New Revision: 13527 Log: sigh, guess we can only do this on snom and polycom right now to be safe Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 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 Jun 1 08:45:50 2009 @@ -179,16 +179,21 @@ { private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session); const char *callee_name = NULL, *callee_number = NULL; + const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent"); - if (!(callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name"))) { - callee_name = ""; - } + if (ua && switch_stristr("polycom", ua)) { + if (!(callee_name = switch_channel_get_variable(tech_pvt->channel, "callee_id_name"))) { + callee_name = ""; + } + + if (!(callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number"))) { + callee_number = tech_pvt->caller_profile->destination_number; + } - if (!(callee_number = switch_channel_get_variable(tech_pvt->channel, "callee_id_number"))) { - callee_number = tech_pvt->caller_profile->destination_number; + return switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>", callee_name, callee_number); } - return switch_core_session_sprintf(tech_pvt->session, "P-Asserted-Identity: \"%s\" <%s>", callee_name, callee_number); + return NULL; } /* map QSIG cause codes to SIP from RFC4497 section 8.4.1 */ @@ -1258,7 +1263,7 @@ if (ua && switch_stristr("snom", ua)) { snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", msg->string_arg, tech_pvt->caller_profile->destination_number); nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); - } else { + } else if (ua && switch_stristr("polycom", ua)) { snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number); nua_update(tech_pvt->nh, TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)), @@ -1274,8 +1279,17 @@ sofia_glue_do_invite(session); if (!switch_strlen_zero(msg->string_arg)) { char message[256] = ""; - snprintf(message, sizeof(message), "From:\r\nTo: \"%s\"\r\n", msg->string_arg); - nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent"); + + if (ua && switch_stristr("snom", ua)) { + snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", msg->string_arg, tech_pvt->caller_profile->destination_number); + nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); + } else if (ua && switch_stristr("polycom", ua)) { + snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number); + nua_update(tech_pvt->nh, + TAG_IF(!switch_strlen_zero_buf(message), SIPTAG_HEADER_STR(message)), + TAG_END()); + } } } break; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Jun 1 08:45:50 2009 @@ -5072,7 +5072,7 @@ snprintf(message, sizeof(message), "From:\r\nTo: \"%s\" %s\r\n", acp->caller_id_name, acp->caller_id_number); } nua_info(b_tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), SIPTAG_PAYLOAD_STR(message), TAG_END()); - } else { + } else if (ua && switch_stristr("polycom", ua)) { if (switch_strlen_zero(acp->caller_id_name)) { snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", acp->caller_id_number, acp->caller_id_number); } else {

1 0

[commit] r13526 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: anthm Date: Mon Jun 1 08:06:45 2009 New Revision: 13526 Log: make endconf count cumulative Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Mon Jun 1 08:06:45 2009 @@ -279,6 +279,7 @@ int video_running; uint32_t eflags; uint32_t verbose_events; + int end_count; } conference_obj_t; /* Relationship with another member */ @@ -609,6 +610,11 @@ if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { conference->count++; + + if (switch_test_flag(member, MFLAG_ENDCONF)) { + if (conference->end_count++); + } + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name); @@ -756,10 +762,6 @@ switch_core_speech_close(&member->lsh, &flags); } - if (switch_test_flag(member, MFLAG_ENDCONF)) { - switch_set_flag_locked(member->conference, CFLAG_DESTRUCT); - } - if (member == member->conference->floor_holder) { member->conference->floor_holder = NULL; } @@ -768,6 +770,14 @@ if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { conference->count--; + + if (switch_test_flag(member, MFLAG_ENDCONF)) { + if (!--member->conference->end_count) { + switch_set_flag_locked(member->conference, CFLAG_DESTRUCT); + } + } + + if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", CONF_CHAT_PROTO); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", conference->name);

1 0

[commit] r13525 - freeswitch/trunk/src
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: anthm Date: Mon Jun 1 07:45:56 2009 New Revision: 13525 Log: extended data from hangup_complete event Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Jun 1 07:45:56 2009 @@ -1359,6 +1359,7 @@ event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS || event->event_id == SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA || event->event_id == SWITCH_EVENT_CHANNEL_HANGUP || + event->event_id == SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE || event->event_id == SWITCH_EVENT_REQUEST_PARAMS || event->event_id == SWITCH_EVENT_CHANNEL_DATA || event->event_id == SWITCH_EVENT_CHANNEL_EXECUTE_COMPLETE ||

1 0

[commit] r13524 - freeswitch/trunk/docs/phrase
by FreeSWITCH SVN 01 Jun '09

01 Jun '09

Author: buklov Date: Mon Jun 1 03:41:50 2009 New Revision: 13524 Log: fix Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml Modified: freeswitch/trunk/docs/phrase/phrase_ru.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_ru.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_ru.xml Mon Jun 1 03:41:50 2009 @@ -431,14 +431,14 @@ <prompt phrase="Почтовый ящик переполнен. Пожалуйста перезвоните позже" filename="vm-mailbox_full.wav"/>  </voicemail> <conference> - <prompt phrase="NULL" filename="conf-ack type.wav"/>  - <prompt phrase="NULL" filename="conf-nack type.wav"/>  + <prompt phrase="NULL" filename="conf-ack.wav" type="tone"/>  + <prompt phrase="NULL" filename="conf-nack.wav" type="tone"/>  <prompt phrase="Ваш микрофон отключен" filename="conf-muted.wav"/>  <prompt phrase="Ваш микрофон включён" filename="conf-unmuted.wav"/>  <prompt phrase="Вы единственный участник конференции" filename="conf-alone.wav"/>  - <prompt phrase="NULL" filename="conf-perpetual type.wav"/>  - <prompt phrase="NULL" filename="conf-enter type.wav"/>  - <prompt phrase="NULL" filename="conf-exit type.wav"/>  + <prompt phrase="NULL" filename="conf-perpetual.wav" type="tone"/>  + <prompt phrase="NULL" filename="conf-enter.wav" type="tone"/>  + <prompt phrase="NULL" filename="conf-exit.wav" type="tone"/>  <prompt phrase="Вы были отключены от конференции" filename="conf-kicked.wav"/>  <prompt phrase="Эта конференция заблокирована" filename="conf-locked.wav"/>  <prompt phrase="Конференция заблокирована" filename="conf-is-locked.wav"/>

1 0

[commit] r13523 - freeswitch/trunk/src
by FreeSWITCH SVN 30 May '09

30 May '09

Author: brian Date: Sat May 30 05:24:38 2009 New Revision: 13523 Log: more clean up Modified: freeswitch/trunk/src/switch_nat.c Modified: freeswitch/trunk/src/switch_nat.c ============================================================================== --- freeswitch/trunk/src/switch_nat.c (original) +++ freeswitch/trunk/src/switch_nat.c Sat May 30 05:24:38 2009 @@ -53,12 +53,12 @@ static int init_upnp (void) { - struct UPNPDev * devlist; - struct UPNPDev * dev; + struct UPNPDev *devlist; + struct UPNPDev *dev; char * descXML; int descXMLsize = 0; - const char * multicastif = 0; - const char * minissdpdpath = 0; + const char *multicastif = 0; + const char *minissdpdpath = 0; int r = -2; memset(&nat_globals.urls, 0, sizeof(struct UPNPUrls)); @@ -157,7 +157,7 @@ switch_core_set_variable("nat_private_addr", nat_globals.pvt_addr); switch_core_set_variable("nat_type", nat_globals.nat_type == SWITCH_NAT_TYPE_PMP ? "pmp" : "upnp"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No NAT Detected!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No PMP or uPNP NAT device detected!\n"); } }

1 0