- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7024 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 14:54:23 2007 New Revision: 7024 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add direction to the rest of the events 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 Sat Dec 29 14:54:23 2007 @@ -682,6 +682,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } @@ -974,6 +975,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); 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, "call-direction", "%s", "inbound"); switch_event_fire(&event); } @@ -4910,6 +4912,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conf_name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { @@ -4924,6 +4927,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conf_name); 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, "call-direction", "%s", "inbound"); switch_event_fire(&event); }

1 0

[commit] r7023 - in freeswitch/trunk/src/mod/applications: mod_conference mod_fifo
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 14:41:41 2007 New Revision: 7023 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: ensure directions are correct for dialog-info 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 Sat Dec 29 14:41:41 2007 @@ -548,6 +548,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sat Dec 29 14:41:41 2007 @@ -140,7 +140,7 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", node->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", node->waiting_count > 0 ? "early" : "terminated"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "astate", "%s", node->waiting_count > 0 ? "early" : "terminated"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "outbound"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); switch_event_fire(&event); } }

1 0

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

29 Dec '07

Author: brian Date: Sat Dec 29 14:41:17 2007 New Revision: 7022 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: update for conference and parking presence for dialog-info 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 14:41:17 2007 @@ -740,12 +740,27 @@ 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, "<target uri=\"sip:**%s@%s\"/>\n", clean_to_user, host); + stream.write_function(&stream, "</remote>\n"); + } else if (!strcasecmp(proto, "park")) { + stream.write_function(&stream, "<local>\n<identity display=\"parking\">sip:parking@%s;fifo=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:parking@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"no\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"parking\">sip:%s</identity>\n", uuid); + stream.write_function(&stream, "<target uri=\"sip:park+%s\"/>\n", uuid); + stream.write_function(&stream, "</remote>\n"); + } else if (!strcasecmp(proto, "conf")) { + stream.write_function(&stream, "<local>\n<identity display=\"conference\">sip:conference@%s;conference=%s</identity>\n", + host, !switch_strlen_zero(clean_to_user) ? clean_to_user : "unknown"); + stream.write_function(&stream, "<target uri=\"sip:conference@%s\">\n", host); + stream.write_function(&stream, "<param pname=\"+sip.rendering\" pvalue=\"yes\"/>\n</target>\n</local>\n"); + stream.write_function(&stream, "<remote>\n<identity display=\"conference\">sip:%s@%s</identity>\n", uuid, host); + stream.write_function(&stream, "<target uri=\"sip:conf+%s@%s\"/>\n", uuid, host); stream.write_function(&stream, "</remote>\n"); - } - } + stream.write_function(&stream, "</dialog>\n"); }

1 0

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

29 Dec '07

Author: brian Date: Sat Dec 29 13:30:48 2007 New Revision: 7021 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: use const here as per tip from Sir MikeJ 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 13:30:48 2007 @@ -667,7 +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 *answer_state = switch_str_nil(switch_event_get_header(helper->event, "answer-state")); const char *dft_state; SWITCH_STANDARD_STREAM(stream); @@ -753,6 +753,7 @@ stream.write_function(&stream, "</dialog-info>\n"); pl = stream.data; + ct = "application/dialog-info+xml"; 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] r7020 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 Dec '07

29 Dec '07

Author: brian Date: Sat Dec 29 12:57:07 2007 New Revision: 7020 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: more cleanup 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:57:07 2007 @@ -731,7 +731,6 @@ const char *clean_to_user; const char *clean_from_user; - 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);

1 0

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

29 Dec '07

Author: mikej Date: Sat Dec 29 12:56:42 2007 New Revision: 7019 Modified: freeswitch/trunk/src/include/switch_platform.h Log: for msvc 2005 team edition. Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Sat Dec 29 12:56:42 2007 @@ -69,7 +69,7 @@ #pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>) -#if (_MSC_VER >= 1500) // VC9+ +#if (_MSC_VER >= 1400) // VC8+ #define switch_assert(expr) assert(expr);__analysis_assume( expr ) #endif

1 0

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

29 Dec '07

Author: brian Date: Sat Dec 29 12:52:22 2007 New Revision: 7018 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: more cleanup 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:52:22 2007 @@ -749,11 +749,9 @@ } stream.write_function(&stream, "</dialog>\n"); - } else { - printf("resubscribe\n"); } - - stream.write_function(&stream, "</dialog-info>\n"); + + stream.write_function(&stream, "</dialog-info>\n"); pl = stream.data; ct = "application/dialog-info+xml";

1 0

[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