December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[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

[commit] r6812 - in freeswitch/trunk: conf/lang/en/vm src
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: brian Date: Sat Dec 15 13:48:06 2007 New Revision: 6812 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml freeswitch/trunk/src/switch_channel.c Log: commit a missing file from tonys commit and my update to sounds.xml 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 13:48:06 2007 @@ -201,7 +201,7 @@ </macro> <macro name="voicemail_greeting_selected"> - <input pattern="^(.*)$"> + <input pattern="^(\d+)$"> <match> <action function="play-file" data="voicemail/vm-greeting.wav"/> <action function="say" data="$1" method="pronounced" type="items"/> @@ -220,7 +220,7 @@ </macro> <macro name="voicemail_say_number"> - <input pattern="^(.*)$"> + <input pattern="^(\d+)$"> <match> <action function="say" data="$1" method="pronounced" type="items"/> </match> @@ -228,7 +228,7 @@ </macro> <macro name="voicemail_say_message_number"> - <input pattern="^([a-z]+):(.*)$"> + <input pattern="^([a-z]+):(\d+)$"> <match> <action function="play-file" data="voicemail/vm-$1.wav"/> <action function="play-file" data="voicemail/vm-message_number.wav"/> Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sat Dec 15 13:48:06 2007 @@ -610,7 +610,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Unique-ID", "%s", switch_core_session_get_uuid(channel->session)); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Call-Direction", "%s", switch_channel_test_flag(channel, CF_OUTBOUND) ? "outbound" : "inbound"); if (switch_channel_test_flag(channel, CF_ANSWERED)) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "answered"); } else if (switch_channel_test_flag(channel, CF_EARLY_MEDIA)) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Answer-State", "early"); } else {

1 0

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

15 Dec '07

Author: brian Date: Sat Dec 15 13:44:41 2007 New Revision: 6811 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: doc this string 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 13:44:41 2007 @@ -15,6 +15,7 @@ </domains> <settings> +  <param name="debug" value="0"/> <param name="sip-trace" value="no"/> <param name="context" value="public"/>

1 0

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

15 Dec '07

Author: brian Date: Sat Dec 15 13:44:27 2007 New Revision: 6810 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: clean up dialplan Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sat Dec 15 13:44:27 2007 @@ -141,20 +141,20 @@ </extension>  - <extension name="FS_Conf_SIP"> + <extension name="freeswitch_public_conf_via_sip"> <condition field="destination_number" expression="^888$"> <action application="bridge" data="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </condition> </extension> <extension name="static-park"> - <condition field="destination_number" expression="^8192$"> - <action application="fifo" data="default in undef /ram/swimp.raw"/> + <condition field="destination_number" expression="^8792$"> + <action application="fifo" data="default in undef local_stream://moh"/> </condition> </extension> <extension name="unpark"> - <condition field="destination_number" expression="^8193$"> + <condition field="destination_number" expression="^8793$"> <action application="answer"/> <action application="fifo" data="default out nowait"/> </condition>

1 0

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

15 Dec '07

Author: brian Date: Sat Dec 15 13:33:59 2007 New Revision: 6809 Modified: freeswitch/trunk/conf/lang/en/vm/sounds.xml Log: name_spelled instead of items, thanks L2SHO 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 13:33:59 2007 @@ -3,7 +3,7 @@ <input pattern="(.*)"> <match> <action function="play-file" data="voicemail/vm-enter_id.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> </match> </input> </macro> @@ -12,7 +12,7 @@ <input pattern="(.*)"> <match> <action function="play-file" data="voicemail/vm-enter_pass.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> </match> </input> </macro>

1 0

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

15 Dec '07

Author: anthm Date: Sat Dec 15 13:26:10 2007 New Revision: 6808 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix 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 Sat Dec 15 13:26:10 2007 @@ -2107,6 +2107,15 @@ su_free(profile->home, tmp); } +#if 0 + if (sofia_test_pflag(profile, PFLAG_PRESENCE)) { + char *tmp = switch_mprintf("%s@%s", switch_str_nil(switch_channel_get_variable(channel, "sip_to_user")), switch_str_nil(switch_channel_get_variable(channel, "sip_to_host"))); + switch_assert(tmp); + switch_channel_set_variable(channel, "presence_id", tmp); + free(tmp); + } +#endif + check_decode(displayname, session); tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), from_user, 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 13:26:10 2007 @@ -413,14 +413,14 @@ case SWITCH_EVENT_PRESENCE_IN: sql = switch_mprintf - ("select *,1,'%q','%q' from sip_subscriptions where proto='%q' and (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", - status, rpid, proto, event_type, alt_event_type, euser, host); + ("select *,1,'%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", + status, rpid, event_type, alt_event_type, euser, host); break; case SWITCH_EVENT_PRESENCE_OUT: sql = switch_mprintf - ("select *,0,'%q','%q' from sip_subscriptions where proto='%q' and (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", - status, rpid, proto, event_type, alt_event_type, euser, host); + ("select *,0,'%q','%q' from sip_subscriptions where (event='%q' or event='%q') and sub_to_user='%q' and sub_to_host='%q'", + status, rpid, event_type, alt_event_type, euser, host); break; default: break; @@ -436,6 +436,7 @@ if (sql) { struct presence_helper helper; + helper.profile = profile; helper.event = event; sofia_glue_execute_sql_callback(profile, @@ -507,6 +508,12 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "status", "%s", status); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", SOFIA_CHAT_PROTO); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_HANGUP"); + //switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "void"); + switch_event_fire(&event); } @@ -550,7 +557,7 @@ struct presence_helper *helper = (struct presence_helper *) pArg; sofia_profile_t *profile = helper->profile; char *pl; - char *id, *note; + char *clean_id = NULL, *id = NULL, *note; uint32_t in = atoi(argv[13]); char *status = argv[14]; char *rpid = argv[15]; @@ -567,6 +574,8 @@ char *open; char *prpid; int done = 0; + const char *ct; + if (!(nh = (nua_handle_t *) switch_core_hash_find(profile->sub_hash, call_id))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find handle for %s\n", call_id); @@ -592,6 +601,8 @@ open = "closed"; } + clean_id = switch_mprintf("sip:%s@%s", sub_to_user, sub_to_host); + if (!strcasecmp(sub_to_host, host)) { /* same host */ id = switch_mprintf("sip:%s+%s@%s", proto, sub_to_user, sub_to_host); @@ -610,15 +621,23 @@ 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")); - - SWITCH_STANDARD_STREAM(stream); + const char *astate = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); + SWITCH_STANDARD_STREAM(stream); + + if (!strcasecmp(state, "cs_hangup")) { + astate = "terminated"; + } else if (!strcasecmp(astate, "answered")) { + astate = "confirmed"; + } else if (!strcasecmp(astate, "ringing")) { + astate = "early"; + } stream.write_function(&stream, "<?xml version=\"1.0\"?>\n" "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" " "version=\"%s\" state=\"full\" entity=\"%s\">\n", - switch_str_nil(switch_event_get_header(helper->event, "event_count")), to); + switch_str_nil(switch_event_get_header(helper->event, "event_count")), clean_id); if (!strcasecmp(state, "RING")) { stream.write_function(&stream, "<dialog id=\"%s\" direction=\"recipient\">\n", uuid); @@ -626,14 +645,18 @@ stream.write_function(&stream, "<dialog id=\"%s\">\n", uuid); } - stream.write_function(&stream, "<state>%s</state>\n", switch_str_nil(switch_event_get_header(helper->event, "answer-state"))); + + stream.write_function(&stream, "<state>%s</state>\n", astate); + if (!strcasecmp(status, "hold")) { stream.write_function(&stream, "<local>\n<target uri=\"%s\">\n" - "<param pname=\"+sip.rendering\" pvalue=\"no\">\n" - "</target>\n</local>\n", to); + "<param pname=\"+sip.rendering\" pvalue=\"no\">\n" + "</target>\n</local>\n", clean_id); } stream.write_function(&stream, "</dialog>\n</dialog-info>\n"); pl = stream.data; + ct = "application/dialog-info+xml"; + 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" @@ -661,18 +684,20 @@ "</presence>", id, id, profile->url, open, status, prpid, open, rpid, note); + ct = "application/pidf+xml"; } nua_notify(nh, NUTAG_NEWSUB(1), SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=3600"), - SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR("application/pidf+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); + SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(pl), TAG_END()); if (done) { switch_core_hash_delete(profile->sub_hash, call_id); } switch_safe_free(id); + switch_safe_free(clean_id); switch_safe_free(note); switch_safe_free(pl); switch_safe_free(to);

1 0

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

15 Dec '07

Author: anthm Date: Sat Dec 15 11:58:30 2007 New Revision: 6807 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Sat Dec 15 11:58:30 2007 @@ -470,10 +470,6 @@ } } } else { - char *p; - if ((p = strrchr(stripped, ';'))) { - *p = '\0'; - } new_uri = stripped; }

1 0

[commit] r6806 - freeswitch/trunk/libs/libteletone/src
by Freeswitch SVN 15 Dec '07

15 Dec '07

Author: anthm Date: Sat Dec 15 10:32:41 2007 New Revision: 6806 Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Log: update Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Sat Dec 15 10:32:41 2007 @@ -211,7 +211,7 @@ int16_t sample_buffer[], int samples) { - int sample, limit, j, x = 0; + int sample, limit = 0, j, x = 0; float v1, famp; float eng_sum = 0, eng_all[TELETONE_MAX_TONES]; int gtest = 0, see_hit = 0; @@ -224,6 +224,9 @@ } else { limit = samples; } + if (limit < 0 || limit > samples) { + limit = samples; + } for (j = sample; j < limit; j++) { famp = sample_buffer[j];

1 0