- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8730 - freeswitch/trunk/src
by Freeswitch SVN 30 May '08

30 May '08

Author: anthm Date: Fri May 30 14:11:05 2008 New Revision: 8730 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add failed_xml_cdr magic variable Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri May 30 14:11:05 2008 @@ -1202,6 +1202,7 @@ } done: + *cause = SWITCH_CAUSE_UNALLOCATED; if (caller_channel && !switch_channel_ready(caller_channel)) { @@ -1216,8 +1217,18 @@ *cause = SWITCH_CAUSE_SUCCESS; } else { + const char *cdr_var = NULL; + int cdr_total = 0; + switch_xml_t cdr; + char *xml_text; + char buf[128] = "", buf2[128] = ""; + + if (caller_channel) { + cdr_var = switch_channel_get_variable(caller_channel, "failed_xml_cdr_prefix"); + } + if (peer_channel) { - *cause = switch_channel_get_cause(peer_channel); + *cause = switch_channel_get_cause(peer_channel); } else { for (i = 0; i < and_argc; i++) { if (!peer_channels[i]) { @@ -1227,6 +1238,28 @@ break; } } + + if (cdr_var) { + for (i = 0; i < and_argc; i++) { + if (!peer_sessions[i]) { + continue; + } + + if (switch_ivr_generate_xml_cdr(peer_sessions[i], &cdr) == SWITCH_STATUS_SUCCESS) { + if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { + switch_snprintf(buf, sizeof(buf), "%s_%d", cdr_var, ++cdr_total); + switch_channel_set_variable(caller_channel, buf, xml_text); + switch_safe_free(xml_text); + } + switch_xml_free(cdr); + cdr = NULL; + } + + } + switch_snprintf(buf, sizeof(buf), "%s_total", cdr_var); + switch_snprintf(buf2, sizeof(buf2), "%d", cdr_total ? cdr_total : 0); + switch_channel_set_variable(caller_channel, buf, buf2); + } if (!*cause) { if (reason) {

1 0

[commit] r8729 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 30 May '08

30 May '08

Author: anthm Date: Fri May 30 13:27:32 2008 New Revision: 8729 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: tweak constructor Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Fri May 30 13:27:32 2008 @@ -2619,7 +2619,8 @@ static JSBool session_construct(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { struct js_session *jss = NULL; - + JSObject *session_obj = NULL; + jss = malloc(sizeof(*jss)); switch_assert(jss); memset(jss, 0, sizeof(*jss)); @@ -2627,10 +2628,31 @@ jss->obj = obj; JS_SetPrivate(cx, obj, jss); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + if (argc > 0) { char *uuid = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - if (uuid) { + + if (!strchr(uuid, '/')) { jss->session = switch_core_session_locate(uuid); + switch_set_flag(jss, S_HUP); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + } else { + struct js_session *old_jss = NULL; + + if (argc > 1) { + if (JS_ValueToObject(cx, argv[1], &session_obj) && session_obj) { + old_jss = JS_GetPrivate(cx, session_obj); + } + } + if (switch_ivr_originate(old_jss ? old_jss->session : NULL, + &jss->session, &jss->cause, uuid, 60, NULL, NULL, NULL, NULL, SOF_NONE) == SWITCH_STATUS_SUCCESS) { + switch_set_flag(jss, S_HUP); + switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_SOFT_EXECUTE); + *rval = BOOLEAN_TO_JSVAL(JS_TRUE); + } else { + *rval = STRING_TO_JSVAL(JS_NewStringCopyZ(cx, switch_channel_cause2str(jss->cause))); + } } }

1 0

[commit] r8728 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:56:35 2008 New Revision: 8728 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: double doh Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:56:35 2008 @@ -312,7 +312,7 @@ globals.legs |= CDR_LEG_A; } - if (strchr(val, 'a')) { + if (strchr(val, 'b')) { globals.legs |= CDR_LEG_B; } } else if (!strcasecmp(var, "log-base")) {

1 0

[commit] r8727 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:49:01 2008 New Revision: 8727 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: legs option to cdr_csv doh2 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:49:01 2008 @@ -173,7 +173,7 @@ char *log_line, *path = NULL; if (!((globals.legs & CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { - if ((globals.legs && CDR_LEG_A)) { + if ((globals.legs & CDR_LEG_A)) { if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8726 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:46:49 2008 New Revision: 8726 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: legs option to cdr_csv doh Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:46:49 2008 @@ -172,7 +172,7 @@ const char *log_dir = NULL, *accountcode = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; - if (!((globals.legs && CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { + if (!((globals.legs & CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { if ((globals.legs && CDR_LEG_A)) { if (switch_channel_get_originator_caller_profile(channel)) { return SWITCH_STATUS_SUCCESS;

1 0

[commit] r8725 - in freeswitch/trunk: conf/autoload_configs src/mod/event_handlers/mod_cdr_csv
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 17:35:58 2008 New Revision: 8725 Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Log: legs option to cdr_csv Modified: freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/cdr_csv.conf.xml Thu May 29 17:35:58 2008 @@ -6,6 +6,8 @@   <param name="rotate-on-hup" value="true"/> +  + <param name="legs" value="a"/> </settings> <templates> <template name="sql">INSERT INTO cdr VALUES ("${caller_id_name}","${caller_id_number}","${destination_number}","${context}","${start_stamp}","${answer_stamp}","${end_stamp}","${duration}","${billsec}","${hangup_cause}","${uuid}","${bleg_uuid}", "${accountcode}");</template> Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu May 29 17:35:58 2008 @@ -29,6 +29,11 @@ #include <sys/stat.h> #include <switch.h> +typedef enum { + CDR_LEG_A = (1 << 0), + CDR_LEG_B = (1 << 1) +} cdr_leg_t; + struct cdr_fd { int fd; char *path; @@ -50,6 +55,7 @@ int shutdown; int rotate; int debug; + cdr_leg_t legs; } globals; SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_csv_load); @@ -166,8 +172,16 @@ const char *log_dir = NULL, *accountcode = NULL, *a_template_str = NULL, *g_template_str = NULL; char *log_line, *path = NULL; - if (switch_channel_get_originator_caller_profile(channel)) { - return SWITCH_STATUS_SUCCESS; + if (!((globals.legs && CDR_LEG_A) && (globals.legs & CDR_LEG_B))) { + if ((globals.legs && CDR_LEG_A)) { + if (switch_channel_get_originator_caller_profile(channel)) { + return SWITCH_STATUS_SUCCESS; + } + } else { + if (switch_channel_get_originatee_caller_profile(channel)) { + return SWITCH_STATUS_SUCCESS; + } + } } if (!(log_dir = switch_channel_get_variable(channel, "cdr_csv_base"))) { @@ -278,10 +292,11 @@ switch_core_hash_init(&globals.template_hash, pool); globals.pool = pool; - + switch_core_hash_insert(globals.template_hash, "default", default_template); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding default template.\n"); - + globals.legs = CDR_LEG_A; + if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { if ((settings = switch_xml_child(cfg, "settings"))) { @@ -290,6 +305,16 @@ char *val = (char *) switch_xml_attr_soft(param, "value"); if (!strcasecmp(var, "debug")) { globals.debug = switch_true(val); + } else if (!strcasecmp(var, "legs")) { + globals.legs = 0; + + if (strchr(val, 'a')) { + globals.legs |= CDR_LEG_A; + } + + if (strchr(val, 'a')) { + globals.legs |= CDR_LEG_B; + } } else if (!strcasecmp(var, "log-base")) { globals.log_dir = switch_core_sprintf(pool, "%s%scdr-csv", val, SWITCH_PATH_SEPARATOR); } else if (!strcasecmp(var, "rotate-on-hup")) {

1 0

[commit] r8724 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 16:25:58 2008 New Revision: 8724 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add presence events to proxy mode 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 Thu May 29 16:25:58 2008 @@ -1923,6 +1923,18 @@ msg.from = __FILE__; msg.string_arg = (char *) r_sdp; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp); + + if (switch_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + if (!switch_stristr("sendonly", r_sdp)) { + switch_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + switch_channel_presence(tech_pvt->channel, "unknown", "unhold"); + } + } else if (switch_stristr("sendonly", r_sdp)) { + switch_set_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + switch_channel_presence(tech_pvt->channel, "unknown", "hold"); + } + + if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n"); nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END()); 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 Thu May 29 16:25:58 2008 @@ -706,7 +706,7 @@ } } } - printf("WTF [%s] %d\n", new_uri, uri_only); + return new_uri; }

1 0

[commit] r8723 - in freeswitch/trunk: conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: mikej Date: Thu May 29 16:02:06 2008 New Revision: 8723 Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal.xml freeswitch/trunk/conf/sip_profiles/nat.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add enable-3pcc sofia profile param, it is now disabled by default. Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Thu May 29 16:02:06 2008 @@ -37,5 +37,6 @@ <param name="ext-sip-ip" value="$${external_sip_ip}"/> <param name="rtp-timeout-sec" value="300"/> <param name="rtp-hold-timeout-sec" value="1800"/> +  </settings> </profile> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu May 29 16:02:06 2008 @@ -118,6 +118,8 @@    +  + </settings> </profile> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Thu May 29 16:02:06 2008 @@ -28,5 +28,6 @@ <param name="ext-sip-ip" value="$${external_sip_ip}"/> <param name="rtp-timeout-sec" value="300"/> <param name="rtp-hold-timeout-sec" value="1800"/> +  </settings> </profile> 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 Thu May 29 16:02:06 2008 @@ -147,7 +147,8 @@ PFLAG_DISABLE_TIMER = (1 << 19), PFLAG_DISABLE_100REL = (1 << 20), PFLAG_AGGRESSIVE_NAT_DETECTION = (1 << 21), - PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22) + PFLAG_RECIEVED_IN_NAT_REG_CONTACT = (1 << 22), + PFLAG_3PCC = (1 << 23) } PFLAGS; typedef enum { 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 Thu May 29 16:02:06 2008 @@ -1244,6 +1244,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_REG; } + } else if (!strcasecmp(var, "enable-3pcc")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_3PCC; + } } else if (!strcasecmp(var, "accept-blind-auth")) { if (switch_true(val)) { profile->pflags |= PFLAG_BLIND_AUTH; @@ -1877,15 +1881,20 @@ if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) { goto done; } else { - switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); - sofia_glue_tech_choose_port(tech_pvt, 0); - sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); - switch_channel_set_state(channel, CS_HIBERNATE); - nua_respond(tech_pvt->nh, SIP_200_OK, - SIPTAG_CONTACT_STR(tech_pvt->profile->url), - SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), - SOATAG_REUSE_REJECTED(1), - SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + if (profile->pflags & PFLAG_3PCC) { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RECEIVED_NOSDP"); + sofia_glue_tech_choose_port(tech_pvt, 0); + sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0); + switch_channel_set_state(channel, CS_HIBERNATE); + nua_respond(tech_pvt->nh, SIP_200_OK, + SIPTAG_CONTACT_STR(tech_pvt->profile->url), + SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), + SOATAG_REUSE_REJECTED(1), + SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END()); + } else { + switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "3PCC DISABLED"); + switch_channel_hangup(channel, SWITCH_CAUSE_MANDATORY_IE_MISSING); + } goto done; } }

1 0

[commit] r8722 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 15:05:48 2008 New Revision: 8722 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: hangup properly on malformed 3pcc calls being bastardized into a way to ping 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 Thu May 29 15:05:48 2008 @@ -2056,7 +2056,9 @@ break; case nua_callstate_terminating: if (session) { - if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { + if (status == 488 || switch_channel_get_state(channel) == CS_HIBERNATE) { + tech_pvt->q850_cause = SWITCH_CAUSE_MANDATORY_IE_MISSING; + } else if (!switch_test_flag(tech_pvt, TFLAG_BYE)) { switch_set_flag_locked(tech_pvt, TFLAG_BYE); } }

1 0

[commit] r8721 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 29 May '08

29 May '08

Author: anthm Date: Thu May 29 13:35:16 2008 New Revision: 8721 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix uri bug which will never end cos text based signalling is lame 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 Thu May 29 13:35:16 2008 @@ -697,12 +697,16 @@ } } else { if (params) { - new_uri = switch_core_session_sprintf(session, "%s;%s", stripped, params); + new_uri = switch_core_session_sprintf(session, "%s%s;%s%s", uri_only ? "" : "<", stripped, params, uri_only ? "" : ">"); } else { - new_uri = stripped; + if (uri_only) { + new_uri = stripped; + } else { + new_uri = switch_core_session_sprintf(session, "<%s>", stripped); + } } } - + printf("WTF [%s] %d\n", new_uri, uri_only); return new_uri; } @@ -1040,7 +1044,7 @@ url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE, invite_params); invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE, NULL); - from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE, NULL); + from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_TRUE, NULL); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE, invite_params); @@ -1050,7 +1054,7 @@ */ use_from_str = from_str; from_str = switch_core_session_sprintf(session, "\"%s\" <%s>", tech_pvt->caller_profile->caller_id_name, use_from_str); - + tech_pvt->nh = nua_handle(tech_pvt->profile->nua, NULL, NUTAG_URL(url_str), SIPTAG_TO_STR(to_str), SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), TAG_END());

1 0