- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

29 Dec '07

Author: brian Date: Sat Dec 29 12:51:26 2007 New Revision: 7017 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: woops 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 29 12:51:26 2007 @@ -683,7 +683,6 @@ if (!strcasecmp(state, "cs_execute") && !strstr(event_status, "hold")) { goto end; } - printf("WTF %s, %s, %s, %s\n", state, event_status, answer_state, astate); if (!strcasecmp(event_status, "Registered")) { answer_state = "resubscribe"; @@ -758,7 +757,6 @@ pl = stream.data; ct = "application/dialog-info+xml"; - printf("%s\n", pl); if (astate && uuid && helper->stream.data) { stream.write_function(&helper->stream, "update sip_dialogs set state='%s' where uuid='%s';\n", astate, uuid); }

1 0

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

29 Dec '07

Author: brian Date: Sat Dec 29 12:50:38 2007 New Revision: 7016 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: this is some really ugly logic to try to do in SIP... head hurts 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 29 12:50:38 2007 @@ -537,7 +537,7 @@ if (switch_strlen_zero(state)) { 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", "terminated"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "resubscribe"); } else { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", uuid); @@ -667,6 +667,7 @@ const char *state = switch_str_nil(switch_event_get_header(helper->event, "channel-state")); 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, "astate")); + char *answer_state = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); const char *dft_state; SWITCH_STANDARD_STREAM(stream); @@ -682,6 +683,20 @@ if (!strcasecmp(state, "cs_execute") && !strstr(event_status, "hold")) { goto end; } + printf("WTF %s, %s, %s, %s\n", state, event_status, answer_state, astate); + + if (!strcasecmp(event_status, "Registered")) { + answer_state = "resubscribe"; + } + + stream.write_function(&stream, + "<?xml version=\"1.0\"?>\n" + "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" " + "version=\"%s\" state=\"%s\" entity=\"%s\">\n", + switch_str_nil(switch_event_get_header(helper->event, "event_count")), + !strcasecmp(answer_state, "resubscribe") ? "partial" : "full", clean_id); + + if (strcasecmp(answer_state, "resubscribe")) { if (!strcasecmp(state, "cs_hangup")) { astate = "terminated"; @@ -707,20 +722,43 @@ astate = "confirmed"; } } + stream.write_function(&stream, "<dialog id=\"%s\" direction=\"%s\">\n", uuid, direction); + stream.write_function(&stream, "<state>%s</state>\n", astate); + if (!strcasecmp(astate, "early") | !strcasecmp(astate, "confirmed")) { + const char *from_id = switch_str_nil(switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Number")); + const char *to_user = switch_str_nil(switch_event_get_header(helper->event, "variable_sip_to_user")); + const char *from_user = switch_str_nil(switch_event_get_header(helper->event, "variable_sip_from_user")); + const char *clean_to_user; + const char *clean_from_user; - 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")), clean_id); + printf("from:%s -> to:%s\n", from_id ? from_id : from_user, sub_to_user ? sub_to_user : to_user ); + clean_to_user = switch_mprintf("%s", sub_to_user ? sub_to_user : to_user, host); + clean_from_user = switch_mprintf("%s", from_id ? from_id : from_user, host); + + if(!switch_strlen_zero(clean_to_user) && !switch_strlen_zero(clean_from_user)) { + stream.write_function(&stream, "<local>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_to_user, clean_to_user, host); + stream.write_function(&stream, "<target uri=\"sip:%s@%s\">\n", clean_to_user, host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"%s\"/>\n", !strcasecmp(event_status, "hold") ? "no" : "yes" ); + stream.write_function(&stream, "</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"%s\">sip:%s@%s</identity>\n", clean_from_user, clean_from_user, host); + stream.write_function(&stream, "<target uri=\"sip:**%s%s@%s\"/>\n", !strcasecmp(proto, "park") ? "park+" : "", clean_to_user, host); + stream.write_function(&stream, "</remote>\n"); + + } + + } + stream.write_function(&stream, "</dialog>\n"); + + } else { + printf("resubscribe\n"); + } + + stream.write_function(&stream, "</dialog-info>\n"); - stream.write_function(&stream, "<dialog id=\"%s\" direction=\"%s\">\n", uuid, direction); - stream.write_function(&stream, "<state>%s</state>\n", astate); - stream.write_function(&stream, "</dialog>\n</dialog-info>\n"); pl = stream.data; ct = "application/dialog-info+xml"; - + printf("%s\n", pl); if (astate && uuid && helper->stream.data) { stream.write_function(&helper->stream, "update sip_dialogs set state='%s' where uuid='%s';\n", astate, uuid); }

1 0

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

29 Dec '07

Author: brian Date: Sat Dec 29 11:07:03 2007 New Revision: 7015 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: commit expire fix from yesterday 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 29 11:07:03 2007 @@ -601,13 +601,22 @@ char *sub_to_host = argv[4]; char *event = argv[5]; char *call_id = argv[7]; + char *expires = argv[10]; nua_handle_t *nh; char *to = NULL; char *open; char *prpid; int done = 0; const char *ct; - + time_t exptime = time(NULL) + 3600; + char exp[80] = ""; + + if (expires) { + long tmp = atol(expires); + if (tmp > 0) { + exptime = tmp - time(NULL); + } + } 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); @@ -746,9 +755,11 @@ ct = "application/pidf+xml"; } + switch_snprintf(exp, sizeof(exp), "active;expires=%ld", (long) exptime); + nua_notify(nh, NUTAG_NEWSUB(1), - SIPTAG_SUBSCRIPTION_STATE_STR("active;expires=3600"), + SIPTAG_SUBSCRIPTION_STATE_STR(exp), SIPTAG_EVENT_STR(event), SIPTAG_CONTENT_TYPE_STR(ct), SIPTAG_PAYLOAD_STR(pl), TAG_END()); if (done) {

1 0

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

29 Dec '07

Author: brian Date: Fri Dec 28 21:18:23 2007 New Revision: 7014 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: tweak to update when confirm happens when no subscriptions are present 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 Fri Dec 28 21:18:23 2007 @@ -1325,6 +1325,12 @@ sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); free(sql); + } else if (status == 200) { + char *sql = NULL; + sql = switch_mprintf("update sip_dialogs set state='%s' where uuid='%s';\n", astate, switch_core_session_get_uuid(session)); + switch_assert(sql); + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + free(sql); } } }

1 0

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

29 Dec '07

Author: brian Date: Fri Dec 28 21:15:54 2007 New Revision: 7013 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix subscribe 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 Fri Dec 28 21:15:54 2007 @@ -1032,9 +1032,9 @@ nua_respond(nh, SIP_202_ACCEPTED, NUTAG_WITH_THIS(nua), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), - SIPTAG_FROM(sip->sip_to), - SIPTAG_TO(sip->sip_from), - SIPTAG_CONTACT_STR(contact_str), + //SIPTAG_FROM(sip->sip_to), + //SIPTAG_TO(sip->sip_from), + //SIPTAG_CONTACT_STR(contact_str), TAG_END()); }

1 0

[commit] r7012 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Fri Dec 28 20:38:48 2007 New Revision: 7012 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: naughty Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Dec 28 20:38:48 2007 @@ -44,7 +44,7 @@ </extension> <extension name="refer"> - <condition field="${sip_refer_to}" expression="<sip:${destination_number}@$${domain}>" continue="on_false"> + <condition field="${sip_refer_to}" expression="<sip:${destination_number}@$${domain}>" continue="on_false"/> <condition field="${sip_refer_to}" expression="<sip:(.*)@(.*)>"> <action application="set" data="refer_user=$1"/> <action application="set" data="refer_domain=$2"/>

1 0

[commit] r7011 - freeswitch/trunk/src
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: anthm Date: Fri Dec 28 19:10:07 2007 New Revision: 7011 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Log: tweak Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Dec 28 19:10:07 2007 @@ -1223,10 +1223,13 @@ switch_mutex_unlock(channel->profile_mutex); } + switch_set_flag(channel, CF_BREAK); + switch_clear_flag(channel, CF_BROADCAST); + if (channel->state < CS_HANGUP) { switch_event_t *event; switch_channel_state_t last_state = channel->state; - + channel->state = CS_HANGUP; channel->hangup_cause = hangup_cause; switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n", Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Fri Dec 28 19:10:07 2007 @@ -84,9 +84,12 @@ switch_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; + switch_core_session_read_lock(session); + channel = switch_core_session_get_channel(session); switch_channel_hangup(channel, cause); - switch_core_session_kill_channel(session, SWITCH_SIG_KILL); + + switch_core_session_rwunlock(session); } } switch_mutex_unlock(runtime.throttle_mutex);

1 0

[commit] r7010 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: intralanman Date: Fri Dec 28 18:33:07 2007 New Revision: 7010 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add refer support to default config Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Dec 28 18:33:07 2007 @@ -1,4 +1,4 @@ - + <include> <context name="default"> <extension name="intercept"> @@ -42,6 +42,16 @@ <action application="db" data="insert/last_dial/global/${uuid}"/> </condition> </extension> + + <extension name="refer"> + <condition field="${sip_refer_to}" expression="<sip:${destination_number}@$${domain}>" continue="on_false"> + <condition field="${sip_refer_to}" expression="<sip:(.*)@(.*)>"> + <action application="set" data="refer_user=$1"/> + <action application="set" data="refer_domain=$2"/> + <action application="info"/> + <action application="bridge" data="sofia/outbound/${refer_user}@${refer_domain}"/> + </condition> + </extension> <extension name="eavesdrop"> <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$">

1 0

[commit] r7009 - freeswitch/trunk/src
by Freeswitch SVN 28 Dec '07

28 Dec '07

Author: anthm Date: Fri Dec 28 18:03:31 2007 New Revision: 7009 Modified: freeswitch/trunk/src/switch_channel.c Log: change event data Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Dec 28 18:03:31 2007 @@ -954,14 +954,20 @@ switch_caller_profile_event_set_data(caller_profile, "Caller", event); } - /* Index Originator's Profile */ - if (originator_caller_profile) { + + if (originator_caller_profile && originatee_caller_profile) { + /* Index Originator's Profile */ switch_caller_profile_event_set_data(originator_caller_profile, "Originator", event); - } - /* Index Originatee's Profile */ - if (originatee_caller_profile) { + /* Index Originatee's Profile */ switch_caller_profile_event_set_data(originatee_caller_profile, "Originatee", event); + } else { + /* Index Originator's Profile */ + if (originator_caller_profile) { + switch_caller_profile_event_set_data(originator_caller_profile, "Other-Leg", event); + } else if (originatee_caller_profile) { /* Index Originatee's Profile */ + switch_caller_profile_event_set_data(originatee_caller_profile, "Other-Leg", event); + } } x = 0; /* Index Variables */

1 0

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

28 Dec '07

Author: anthm Date: Fri Dec 28 17:53:04 2007 New Revision: 7008 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add sip_refer_to var Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Fri Dec 28 17:53:04 2007 @@ -72,6 +72,7 @@ #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_" #define SOFIA_DEFAULT_PORT "5060" #define SOFIA_DEFAULT_TLS_PORT "5061" +#define SOFIA_REFER_TO_VARIABLE "sip_refer_to" #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> 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 Fri Dec 28 17:53:04 2007 @@ -1720,6 +1720,7 @@ switch_channel_t *channel_a = NULL, *channel_b = NULL; su_home_t *home = NULL; char *full_ref_by = NULL; + char *full_ref_to = NULL; tech_pvt = switch_core_session_get_private(session); channel_a = switch_core_session_get_channel(session); @@ -1739,14 +1740,16 @@ from = sip->sip_from; to = sip->sip_to; + home = su_home_new(sizeof(*home)); + switch_assert(home != NULL); - if (sip->sip_referred_by) { - home = su_home_new(sizeof(*home)); - switch_assert(home != NULL); + if (sip->sip_referred_by) { full_ref_by = sip_header_as_string(home, (void *) sip->sip_referred_by); } if ((refer_to = sip->sip_refer_to)) { + full_ref_to = sip_header_as_string(home, (void *) sip->sip_refer_to); + if (profile->pflags & PFLAG_FULL_ID) { exten = switch_mprintf("%s@%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host); } else { @@ -1774,11 +1777,6 @@ goto done; } - if (!home) { - home = su_home_new(sizeof(*home)); - switch_assert(home != NULL); - } - if ((replaces = sip_replaces_make(home, rep)) && (bnh = nua_handle_by_replaces(nua, replaces))) { sofia_private_t *b_private = NULL; @@ -1845,6 +1843,10 @@ switch_channel_set_variable(t_channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); } + if (!switch_strlen_zero(full_ref_to)) { + switch_channel_set_variable(t_channel, SOFIA_REFER_TO_VARIABLE, full_ref_to); + } + switch_ivr_session_transfer(t_session, ext, NULL, NULL); nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), @@ -1898,7 +1900,9 @@ if (!switch_strlen_zero(full_ref_by)) { switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); } - + if (!switch_strlen_zero(full_ref_to)) { + switch_channel_set_variable(channel, SOFIA_REFER_TO_VARIABLE, full_ref_to); + } if (switch_ivr_originate(a_session, &tsession, &cause, exten, timeout, &noop_state_handler, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) { @@ -1954,7 +1958,9 @@ if (!switch_strlen_zero(full_ref_by)) { switch_channel_set_variable(b_channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); } - + if (!switch_strlen_zero(full_ref_to)) { + switch_channel_set_variable(b_channel, SOFIA_REFER_TO_VARIABLE, full_ref_to); + } switch_ivr_session_transfer(b_session, exten, NULL, NULL); switch_core_session_rwunlock(b_session); }

1 0