- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6822 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 16:38:11 2007 New Revision: 6822 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/conf/sip_profiles/outbound.xml Log: adding more things to the configs Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 15 16:38:11 2007 @@ -31,6 +31,8 @@ <param name="hold-music" value="local_stream://moh"/>  <param name="manage-presence" value="true"/> +  +     @@ -69,7 +71,7 @@    -  + <param name="rtp-timeout-sec" value="1800"/>    Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Sat Dec 15 16:38:11 2007 @@ -20,6 +20,7 @@ <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> <param name="auth-calls" value="true"/> + <param name="rtp-timeout-sec" value="1800"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/> Modified: freeswitch/trunk/conf/sip_profiles/outbound.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/outbound.xml (original) +++ freeswitch/trunk/conf/sip_profiles/outbound.xml Sat Dec 15 16:38:11 2007 @@ -25,6 +25,7 @@ <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> <param name="auth-calls" value="false"/> + <param name="rtp-timeout-sec" value="1800"/> <param name="rtp-ip" value="$${local_ip_v4}"/> <param name="sip-ip" value="$${local_ip_v4}"/> <param name="ext-rtp-ip" value="$${external_rtp_ip}"/>

1 0

[commit] r6821 - freeswitch/trunk/conf/lang/en/vm
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 16:24:30 2007 New Revision: 6821 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: press is good Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/vm/sounds.xml (original) +++ freeswitch/trunk/conf/lang/en/vm/sounds.xml Sat Dec 15 16:24:30 2007 @@ -82,6 +82,7 @@ <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-advanced.wav"/> + <action function="play-file" data="voicemail/vm-press.wav"/> <action function="say" data="$4" method="pronounced" type="name_phonetic"/> <action function="play-file" data="voicemail/vm-to_exit.wav"/> </match>

1 0

[commit] r6820 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 16:21:40 2007 New Revision: 6820 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: testing more stuff Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 15 16:21:40 2007 @@ -31,11 +31,10 @@  - <condition field="${numbering_plan}" condition="^1$"> + <condition field="${numbering_plan}" condition="^$"> <action application="set_user" data="default@${domain}"/> </condition> <condition> - <action application="info"/> <action application="db" data="insert/spymap/${caller_id_number}/${uuid}"/> <action application="db" data="insert/last_dial/${caller_id_number}/${destination_number}"/> <action application="db" data="insert/last_dial/global/${uuid}"/>

1 0

[commit] r6819 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 15:56:56 2007 New Revision: 6819 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: make sure we are using null terminated strings. Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Sat Dec 15 15:56:56 2007 @@ -1056,7 +1056,7 @@ switch_channel_mark_ring_ready(channel); } else if (switch_test_flag(tech_pvt, TFLAG_PARSE_INCOMING) && !strcasecmp(wmsg.command, "INCOMING")) { char *exten; - char cid_name[512]; + char cid_name[512] = ""; char *cid_num; char *ip; char *p;

1 0

[commit] r6818 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 15:55:10 2007 New Revision: 6818 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: use switch_copy_string instead of strncpy to make sure we have a null terminated string. Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Sat Dec 15 15:55:10 2007 @@ -719,10 +719,10 @@ if (cr && (cr = strchr(cr, ' ')) != 0) { *cr = '\0'; cr++; - strncpy(wmsg->command_args, cr, WOOMERA_STRLEN); + switch_copy_string(wmsg->command_args, cr, WOOMERA_STRLEN); } if (id) { - strncpy(wmsg->callid, id, sizeof(wmsg->callid) - 1); + switch_copy_string(wmsg->callid, id, sizeof(wmsg->callid) - 1); } } } else { @@ -736,7 +736,7 @@ } } if (cur) { - strncpy(wmsg->command, cur, WOOMERA_STRLEN); + switch_copy_string(wmsg->command, cur, WOOMERA_STRLEN); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Malformed Message!\n"); break; @@ -751,9 +751,9 @@ *val = '\0'; val++; } - strncpy(wmsg->values[wmsg->last - 1], val, WOOMERA_STRLEN); + switch_copy_string(wmsg->values[wmsg->last - 1], val, WOOMERA_STRLEN); } - strncpy(wmsg->names[wmsg->last - 1], name, WOOMERA_STRLEN); + switch_copy_string(wmsg->names[wmsg->last - 1], name, WOOMERA_STRLEN); if (name && val && !strcasecmp(name, "content-type")) { switch_set_flag(wmsg, WFLAG_CONTENT); bytes = atoi(val); @@ -1070,7 +1070,7 @@ } if ((p = woomera_message_header(&wmsg, "Remote-Name")) != 0) { - strncpy(cid_name, p, sizeof(cid_name)); + switch_copy_string(cid_name, p, sizeof(cid_name)); } if ((cid_num = strchr(cid_name, '!')) != 0) { @@ -1122,7 +1122,7 @@ char *ptr; switch_port_t port = 0; - strncpy(ip, raw_audio_header, sizeof(ip) - 1); + switch_copy_string(ip, raw_audio_header, sizeof(ip) - 1); if ((ptr = strchr(ip, '/')) != 0) { *ptr = '\0'; ptr++; @@ -1327,9 +1327,9 @@ switch_set_flag(profile, PFLAG_INBOUND | PFLAG_OUTBOUND); profile->name = "main"; - strncpy(profile->dialplan, "default", sizeof(profile->dialplan) - 1); - strncpy(profile->audio_ip, "127.0.0.1", sizeof(profile->audio_ip) - 1); - strncpy(profile->woomera_host, "127.0.0.1", sizeof(profile->woomera_host) - 1); + switch_copy_string(profile->dialplan, "default", sizeof(profile->dialplan) - 1); + switch_copy_string(profile->audio_ip, "127.0.0.1", sizeof(profile->audio_ip) - 1); + switch_copy_string(profile->woomera_host, "127.0.0.1", sizeof(profile->woomera_host) - 1); profile->woomera_port = (switch_port_t) 42420; if ((settings = switch_xml_child(cfg, "settings"))) { @@ -1351,9 +1351,9 @@ char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcmp(var, "audio-ip")) { - strncpy(profile->audio_ip, val, sizeof(profile->audio_ip) - 1); + switch_copy_string(profile->audio_ip, val, sizeof(profile->audio_ip) - 1); } else if (!strcmp(var, "host")) { - strncpy(profile->woomera_host, val, sizeof(profile->woomera_host) - 1); + switch_copy_string(profile->woomera_host, val, sizeof(profile->woomera_host) - 1); } else if (!strcmp(var, "port")) { profile->woomera_port = (switch_port_t) atoi(val); } else if (!strcmp(var, "disabled")) { @@ -1369,7 +1369,7 @@ switch_clear_flag(profile, PFLAG_OUTBOUND); } } else if (!strcmp(var, "dialplan")) { - strncpy(profile->dialplan, val, sizeof(profile->dialplan) - 1); + switch_copy_string(profile->dialplan, val, sizeof(profile->dialplan) - 1); } } }

1 0

[commit] r6817 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 15:50:15 2007 New Revision: 6817 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: cleanups and a check to bail on woomera messages with too many params instead of segfaulting. Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Sat Dec 15 15:50:15 2007 @@ -557,9 +557,11 @@ va_start(ap, fmt); #ifndef vasprintf stuff = (char *) malloc(10240); + switch_assert(stuff); vsnprintf(stuff, 10240, fmt, ap); #else res = vasprintf(&stuff, fmt, ap); + switch_assert(stuff); #endif va_end(ap); if (res == -1) { @@ -694,6 +696,9 @@ break; } } + if (wmsg->last > WOOMERA_ARRAY_LEN) { + break; + } if (!cur || !cur[0]) { break;

1 0

[commit] r6816 - freeswitch/trunk/src
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 15:04:49 2007 New Revision: 6816 Modified: freeswitch/trunk/src/switch.c Log: cleanups, avoid null deref, check returns of some more functions, use switch_snprintf to make sure we are null terminating strings. Modified: freeswitch/trunk/src/switch.c ============================================================================== --- freeswitch/trunk/src/switch.c (original) +++ freeswitch/trunk/src/switch.c Sat Dec 15 15:04:49 2007 @@ -83,7 +83,7 @@ switch_core_set_globals(); /* get the full path of the pid file. */ - snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + switch_snprintf(path, sizeof(path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); /* open the pid file */ if ((f = fopen(path, "r")) == 0) { @@ -116,9 +116,9 @@ } else { /* signal the event to shutdown */ SetEvent(shutdown_event); + /* cleanup */ + CloseHandle(shutdown_event); } - /* cleanup */ - CloseHandle(shutdown_event); #else /* for unix, send the signal to kill. */ kill(pid, SIGTERM); @@ -213,7 +213,7 @@ int known_opt; int high_prio = 0; switch_core_flag_t flags = SCF_USE_SQL; - int status; + int ret; switch_file_t *fd; switch_memory_pool_t *pool = NULL; @@ -265,11 +265,13 @@ known_opt++; GetModuleFileName(NULL, exePath, 1024); snprintf(servicePath, sizeof(servicePath), "%s -service", exePath); - CreateService(handle, + if (!CreateService(handle, SERVICENAME, SERVICENAME, GENERIC_READ | GENERIC_EXECUTE, - SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, servicePath, NULL, NULL, NULL, NULL, NULL); + SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_IGNORE, servicePath, NULL, NULL, NULL, NULL, NULL)) { + fprintf(stderr, "Error installing freeswitch as a service.\n"); + } exit(0); } if (argv[x] && !strcmp(argv[x], "-uninstall")) { @@ -377,11 +379,15 @@ known_opt++; } - if ((!known_opt || argv[x]) && (!strcmp(argv[x], "-help") || !strcmp(argv[x], "-h") || !strcmp(argv[x], "-?"))) { + if (!known_opt || (argv[x] && (!strcmp(argv[x], "-help") || !strcmp(argv[x], "-h") || !strcmp(argv[x], "-?")))) { printf("%s\n", usageDesc); exit(0); } + } + if (apr_initialize() != SWITCH_STATUS_SUCCESS) { + fprintf(stderr, "FATAL ERROR! Could not initilize APR\n"); + return 255; } if (die) { @@ -419,17 +425,12 @@ } #endif - if (apr_initialize() != SWITCH_STATUS_SUCCESS) { - fprintf(stderr, "FATAL ERROR! Could not initilize APR\n"); - return 255; - } - switch_core_set_globals(); pid = getpid(); - snprintf(pid_path, sizeof(pid_path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); - snprintf(pid_buffer, sizeof(pid_buffer), "%d", pid); + switch_snprintf(pid_path, sizeof(pid_path), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, pfile); + switch_snprintf(pid_buffer, sizeof(pid_buffer), "%d", pid); pid_len = strlen(pid_buffer); apr_pool_create(&pool, NULL); @@ -456,12 +457,15 @@ switch_core_runtime_loop(nc); - status = switch_core_destroy(); + ret = switch_core_destroy(); switch_file_close(fd); - unlink(pid_path); - return status; + if (unlink(pid_path) != 0) { + fprintf(stderr, "Failed to delete pid file [%s]\n", pid_path); + } + + return ret; } /* For Emacs:

1 0

[commit] r6815 - freeswitch/trunk/src/mod/directories/mod_ldap
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 14:47:19 2007 New Revision: 6815 Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c Log: cleanup. Modified: freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c ============================================================================== --- freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c (original) +++ freeswitch/trunk/src/mod/directories/mod_ldap/mod_ldap.c Sat Dec 15 14:47:19 2007 @@ -81,7 +81,6 @@ return SWITCH_STATUS_FALSE; } - dh->private_info = context; return SWITCH_STATUS_SUCCESS; @@ -92,7 +91,7 @@ struct ldap_context *context; context = dh->private_info; - assert(context != NULL); + switch_assert(context != NULL); ldap_unbind_s(context->ld); @@ -102,11 +101,17 @@ static switch_status_t mod_ldap_query(switch_directory_handle_t *dh, char *base, char *query) { struct ldap_context *context; + char **attrs = NULL; context = dh->private_info; - assert(context != NULL); + switch_assert(context != NULL); +#if _MSC_VER >= 1500 + /* Silence warning from incorrect code analysis signature. attrs == NULL indicates to return all attrs */ + /* http://msdn2.microsoft.com/en-us/library/aa908101.aspx */ + __analysis_assume(attrs); +#endif - if (ldap_search_s(context->ld, base, LDAP_SCOPE_SUBTREE, query, NULL, 0, &context->msg) != LDAP_SUCCESS) { + if (ldap_search_s(context->ld, base, LDAP_SCOPE_SUBTREE, query, attrs, 0, &context->msg) != LDAP_SUCCESS) { return SWITCH_STATUS_FALSE; } @@ -122,7 +127,7 @@ struct ldap_context *context; context = dh->private_info; - assert(context != NULL); + switch_assert(context != NULL); context->vitt = 0; @@ -146,7 +151,7 @@ struct ldap_context *context; context = dh->private_info; - assert(context != NULL); + switch_assert(context != NULL); *var = *val = NULL;

1 0

[commit] r6814 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 14:38:05 2007 New Revision: 6814 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: comment this out now Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 15 14:38:05 2007 @@ -656,7 +656,7 @@ stream.write_function(&stream, "</dialog>\n</dialog-info>\n"); pl = stream.data; ct = "application/dialog-info+xml"; - printf("%s\n", pl); + //printf("%s\n", pl); } else { pl = switch_mprintf("<?xml version='1.0' encoding='UTF-8'?>\r\n" "<presence xmlns='urn:ietf:params:xml:ns:pidf'\r\n"

1 0

[commit] r6813 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: mikej Date: Sat Dec 15 14:33:36 2007 New Revision: 6813 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: to reduce ambiguity, don't mask var names in lower scope. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Sat Dec 15 14:33:36 2007 @@ -620,7 +620,7 @@ //const char *direction = switch_str_nil(switch_event_get_header(helper->event, "call-direction")); const char *uuid = switch_str_nil(switch_event_get_header(helper->event, "unique-id")); const char *state = switch_str_nil(switch_event_get_header(helper->event, "channel-state")); - const char *status = switch_str_nil(switch_event_get_header(helper->event, "status")); + const char *event_status = switch_str_nil(switch_event_get_header(helper->event, "status")); const char *astate = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); SWITCH_STANDARD_STREAM(stream); @@ -648,7 +648,7 @@ stream.write_function(&stream, "<state>%s</state>\n", astate); - if (!strcasecmp(status, "hold")) { + if (!strcasecmp(event_status, "hold")) { stream.write_function(&stream, "<local>\n<target uri=\"%s\">\n" "<param pname=\"+sip.rendering\" pvalue=\"no\">\n" "</target>\n</local>\n", clean_id);

1 0