June 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8767 - in freeswitch/trunk/libs/sofia-sip: . tests
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: mikej Date: Thu Jun 5 12:20:48 2008 New Revision: 8767 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/tests/test_nua_params.c Log: Thu Jun 5 11:58:03 EDT 2008 Pekka Pessi <Pekka.Pessi(a)nokia.com> * test_nua_params.c: fixed typecasting problem on 64-bit platforms Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 5 12:20:48 2008 @@ -1 +1 @@ -Thu Jun 5 12:19:53 EDT 2008 +Thu Jun 5 12:20:19 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/tests/test_nua_params.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_nua_params.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_nua_params.c Thu Jun 5 12:20:48 2008 @@ -613,7 +613,7 @@ TEST(refer_expires, (unsigned)-1); TEST(refer_with_id, -1); TEST(substate, -1); - TEST(sub_expires, -1); + TEST(sub_expires, (unsigned)-1); TEST_P(allow, NONE); TEST_S(allow_str, "NONE");

1 0

[commit] r8766 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: mikej Date: Thu Jun 5 12:20:01 2008 New Revision: 8766 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Thu Jun 5 11:32:08 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: sanitized asserts with dialog usage for SIP session Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 5 12:20:01 2008 @@ -1 +1 @@ -Tue Jun 3 14:56:27 EDT 2008 +Thu Jun 5 12:19:53 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Thu Jun 5 12:20:01 2008 @@ -761,18 +761,18 @@ { nua_handle_t *nh = cr->cr_owner; nua_dialog_usage_t *du = cr->cr_usage; - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss; int offer_sent = 0, retval; sip_time_t invite_timeout; if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); + ss = NUA_DIALOG_USAGE_PRIVATE(du); + if (ss->ss_state >= nua_callstate_terminating) return nua_client_return(cr, 900, "Session is terminating", msg); - assert(ss); - invite_timeout = NH_PGET(nh, invite_timeout); if (invite_timeout == 0) invite_timeout = UINT_MAX; @@ -868,7 +868,7 @@ nua_dialog_usage_t *du = cr->cr_usage; nua_session_usage_t *ss = nua_dialog_usage_private(du); - assert(sip); assert(ss); + assert(sip); if (ss && sip && sip->sip_rseq) { /* Handle 100rel responses */ @@ -1683,7 +1683,7 @@ { nua_handle_t *nh = cr->cr_owner; nua_dialog_usage_t *du = cr->cr_usage; - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss; nua_client_request_t *cri; int offer_sent = 0, answer_sent = 0, retval; int status = 0; char const *phrase = "PRACK Sent"; @@ -1691,7 +1691,8 @@ if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); - assert(ss); + + ss = NUA_DIALOG_USAGE_PRIVATE(du); if (ss->ss_state >= nua_callstate_terminating) return nua_client_return(cr, 900, "Session is terminating", msg); @@ -2371,8 +2372,6 @@ return retval; } - assert(ss); - /* Update session state */ if (status < 300 || application != 0) { assert(ss->ss_state != nua_callstate_calling); @@ -3148,14 +3147,15 @@ { nua_handle_t *nh = cr->cr_owner; nua_dialog_usage_t *du = cr->cr_usage; - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss; nua_server_request_t *sr; nua_client_request_t *cri; int offer_sent = 0, retval; if (du == NULL) /* Call terminated */ return nua_client_return(cr, SIP_481_NO_TRANSACTION, msg); - assert(ss); + + ss = NUA_DIALOG_USAGE_PRIVATE(du); if (ss->ss_state >= nua_callstate_terminating) return nua_client_return(cr, 900, "Session is terminating", msg);

1 0

[commit] r8765 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: anthm Date: Thu Jun 5 11:59:09 2008 New Revision: 8765 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: forgot one 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 Jun 5 11:59:09 2008 @@ -567,7 +567,7 @@ node->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ - NTATAG_SERVER_RPORT(2), NUTAG_URL(node->url), TAG_END()); /* Last tag should always finish the sequence */ + NTATAG_SERVER_RPORT(profile->rport_level), NUTAG_URL(node->url), TAG_END()); /* Last tag should always finish the sequence */ nua_set_params(node->nua, NUTAG_APPL_METHOD("OPTIONS"),

1 0

[commit] r8764 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: anthm Date: Thu Jun 5 11:55:06 2008 New Revision: 8764 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: NDLB-force-rport option 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 Jun 5 11:55:06 2008 @@ -338,7 +338,7 @@ uint32_t reg_acl_count; char *nat_acl[SOFIA_MAX_ACL]; uint32_t nat_acl_count; - + int rport_level; }; struct private_object { 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 Jun 5 11:55:06 2008 @@ -526,7 +526,7 @@ profile->nua = nua_create(profile->s_root, /* Event loop */ sofia_event_callback, /* Callback for processing events */ profile, /* Additional data to pass to callback */ - NUTAG_URL(profile->bindurl), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), NTATAG_UDP_MTU(65536), NTATAG_SERVER_RPORT(2), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ + NUTAG_URL(profile->bindurl), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), NTATAG_UDP_MTU(65536), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */ if (!profile->nua) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Creating SIP UA for profile: %s\n", profile->name); @@ -1047,7 +1047,8 @@ profile->dtmf_duration = 100; profile->tls_version = 0; profile->mflags = MFLAG_REFER | MFLAG_REGISTER; - + profile->rport_level = 1; + for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); @@ -1080,6 +1081,8 @@ } else { profile->dtmf_type = DTMF_NONE; } + } else if (!strcasecmp(var, "NDLB-force-rport")) { + profile->rport_level = 2; } else if (!strcasecmp(var, "record-template")) { profile->record_template = switch_core_strdup(profile->pool, val);; } else if (!strcasecmp(var, "inbound-no-media") && switch_true(val)) {

1 0

[commit] r8763 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: brian Date: Thu Jun 5 11:34:14 2008 New Revision: 8763 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add var 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 Jun 5 11:34:14 2008 @@ -2103,6 +2103,9 @@ switch_channel_set_variable(channel, "sip_term_status", st); switch_snprintf(st, sizeof(st), "sip:%d", status); switch_channel_set_variable_partner(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE, st); + if (phrase) { + switch_channel_set_variable_partner(channel, "sip_hangup_phrase", phrase); + } } switch_snprintf(st, sizeof(st), "%d", cause); switch_channel_set_variable(channel, "sip_term_cause", st);

1 0

[commit] r8762 - freeswitch/trunk/src
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: anthm Date: Thu Jun 5 11:24:14 2008 New Revision: 8762 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: eliminate need for escaped , in [] Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Jun 5 11:24:14 2008 @@ -729,6 +729,8 @@ for (r = 0; r < or_argc; r++) { uint32_t hups; + char *p,*e = NULL; + reason = SWITCH_CAUSE_UNALLOCATED; memset(peer_names, 0, sizeof(peer_names)); peer_session = NULL; @@ -751,7 +753,24 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms); switch_yield(sleep_ms * 1000); } + + p = pipe_names[r]; + while(p && *p) { + if (*p == '[') { + e = switch_find_end_paren(p, '[', ']'); + } + + if (e && p && *p == ',') { + *p = '|'; + } + if (p == e) { + e = NULL; + } + + p++; + } + and_argc = switch_separate_string(pipe_names[r], ',', peer_names, (sizeof(peer_names) / sizeof(peer_names[0]))); if ((flags & SOF_NOBLOCK) && and_argc > 1) { @@ -761,7 +780,7 @@ for (i = 0; i < and_argc; i++) { char *vdata; - char *e = NULL; + e = NULL; chan_type = peer_names[i]; while (chan_type && *chan_type && *chan_type == ' ') { @@ -862,7 +881,7 @@ if (vdata) { char *var_array[1024] = { 0 }; int var_count = 0; - if ((var_count = switch_separate_string(vdata, ',', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { + if ((var_count = switch_separate_string(vdata, '|', var_array, (sizeof(var_array) / sizeof(var_array[0]))))) { int x = 0; for (x = 0; x < var_count; x++) { char *inner_var_array[2] = { 0 };

1 0

[commit] r8761 - freeswitch/trunk/src/include
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: brian Date: Thu Jun 5 09:34:39 2008 New Revision: 8761 Modified: freeswitch/trunk/src/include/switch_types.h Log: Commit FSCORE-134 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Jun 5 09:34:39 2008 @@ -156,7 +156,8 @@ SBF_EXEC_BLEG = (1 << 3), SBF_EXEC_OPPOSITE = (1 << 4), SBF_EXEC_SAME = (1 << 5) -} switch_bind_flag_t; +} switch_bind_flag_enum_t; +typedef uint32_t switch_bind_flag_t; typedef enum { SWITCH_DTMF_RECV = 0, @@ -167,19 +168,22 @@ SOF_NONE = 0, SOF_NOBLOCK = (1 << 0), SOF_FORKED_DIAL = (1 << 1) -} switch_originate_flag_t; +} switch_originate_flag_enum_t; +typedef uint32_t switch_originate_flag_t; typedef enum { SPF_NONE = 0, SPF_ODD = (1 << 0), SPF_EVEN = (1 << 1) -} switch_port_flag_t; +} switch_port_flag_enum_t; +typedef uint32_t switch_port_flag_t; typedef enum { ED_MUX_READ = (1 << 0), ED_MUX_WRITE = (1 << 1), ED_DTMF = (1 << 2) -} switch_eavesdrop_flag_t; +} switch_eavesdrop_flag_enum_t; +typedef uint32_t switch_eavesdrop_flag_t; typedef enum { SCF_NONE = 0, @@ -187,7 +191,8 @@ SCF_NO_NEW_SESSIONS = (1 << 1), SCF_SHUTTING_DOWN = (1 << 2), SCF_CRASH_PROT = (1 << 3) -} switch_core_flag_t; +} switch_core_flag_enum_t; +typedef uint32_t switch_core_flag_t; typedef enum { SWITCH_ENDPOINT_INTERFACE, @@ -210,7 +215,8 @@ SUF_THREAD_RUNNING = (1 << 0), SUF_READY = (1 << 1), SUF_NATIVE = (1 << 2) -} switch_unicast_flag_t; +} switch_unicast_flag_enum_t; +typedef uint32_t switch_unicast_flag_t; typedef enum { SWITCH_FALSE = 0, @@ -256,7 +262,8 @@ SSHF_OWN_THREAD = (1 << 0), SSHF_FREE_ARG = (1 << 1), SSHF_NO_DEL = (1 << 2) -} switch_scheduler_flag_t; +} switch_scheduler_flag_enum_t; +typedef uint32_t switch_scheduler_flag_t; typedef enum { SMF_NONE = 0, @@ -266,7 +273,8 @@ SMF_FORCE = (1 << 3), SMF_LOOP = (1 << 4), SMF_HOLD_BLEG = (1 << 5) -} switch_media_flag_t; +} switch_media_flag_enum_t; +typedef uint32_t switch_media_flag_t; typedef enum { SWITCH_BITPACK_MODE_RFC3551, @@ -334,7 +342,8 @@ SWITCH_CPF_SCREEN = (1 << 0), SWITCH_CPF_HIDE_NAME = (1 << 1), SWITCH_CPF_HIDE_NUMBER = (1 << 2) -} switch_caller_profile_flag_t; +} switch_caller_profile_flag_enum_t; +typedef uint32_t switch_caller_profile_flag_t; typedef enum { SWITCH_AUDIO_COL_STR_TITLE = 0x01, @@ -351,7 +360,8 @@ SWITCH_XML_SECTION_DIRECTORY = (1 << 1), SWITCH_XML_SECTION_DIALPLAN = (1 << 2), SWITCH_XML_SECTION_PHRASES = (1 << 3) -} switch_xml_section_t; +} switch_xml_section_enum_t; +typedef uint32_t switch_xml_section_t; /*! \enum switch_vad_flag_t @@ -368,7 +378,8 @@ SWITCH_VAD_FLAG_EVENTS_TALK = (1 << 1), SWITCH_VAD_FLAG_EVENTS_NOTALK = (1 << 2), SWITCH_VAD_FLAG_CNG = (1 << 3) -} switch_vad_flag_t; +} switch_vad_flag_enum_t; +typedef uint32_t switch_vad_flag_t; #define SWITCH_RTP_CNG_PAYLOAD 13 @@ -414,7 +425,8 @@ SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17), SWITCH_RTP_FLAG_PROXY_MEDIA = (1 << 18), SWITCH_RTP_FLAG_SHUTDOWN = (1 << 19) -} switch_rtp_flag_t; +} switch_rtp_flag_enum_t; +typedef uint32_t switch_rtp_flag_t; #ifdef _MSC_VER @@ -482,7 +494,8 @@ SWITCH_IVR_OPTION_NONE = 0, SWITCH_IVR_OPTION_ASYNC = (1 << 0), SWITCH_IVR_OPTION_FILE = (1 << 1) -} switch_ivr_option_t; +} switch_ivr_option_enum_t; +typedef uint32_t switch_ivr_option_t; /*! \enum switch_core_session_message_types_t @@ -634,7 +647,8 @@ typedef enum { SCSMF_DYNAMIC = (1 << 0) -} switch_core_session_message_flag_t; +} switch_core_session_message_flag_enum_t; +typedef uint32_t switch_core_session_message_flag_t; #define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__, NULL #define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __SWITCH_FUNC__, __LINE__, NULL @@ -741,7 +755,8 @@ CF_PROXY_MEDIA = (1 << 27), CF_INNER_BRIDGE = (1 << 28), CF_REQ_MEDIA = (1 << 29) -} switch_channel_flag_t; +} switch_channel_flag_enum_t; +typedef uint32_t switch_channel_flag_t; /*! @@ -764,13 +779,15 @@ SFF_PLC = (1 << 3), SFF_RFC2833 = (1 << 4), SFF_PROXY_PACKET = (1 << 5) -} switch_frame_flag_t; +} switch_frame_flag_enum_t; +typedef uint32_t switch_frame_flag_t; typedef enum { SAF_NONE = 0, SAF_SUPPORT_NOMEDIA = (1 << 0) -} switch_application_flag_t; +} switch_application_flag_enum_t; +typedef uint32_t switch_application_flag_t; /*! \enum switch_signal_t @@ -811,7 +828,8 @@ SWITCH_CODEC_FLAG_FREE_POOL = (1 << 5), SWITCH_CODEC_FLAG_AAL2 = (1 << 6), SWITCH_CODEC_FLAG_PASSTHROUGH = (1 << 7) -} switch_codec_flag_t; +} switch_codec_flag_enum_t; +typedef uint32_t switch_codec_flag_t; /*! @@ -832,8 +850,8 @@ SWITCH_SPEECH_FLAG_FREE_POOL = (1 << 2), SWITCH_SPEECH_FLAG_BLOCKING = (1 << 3), SWITCH_SPEECH_FLAG_PAUSE = (1 << 4) - -} switch_speech_flag_t; +} switch_speech_flag_enum_t; +typedef uint32_t switch_speech_flag_t; /*! \enum switch_asr_flag_t @@ -853,7 +871,9 @@ SWITCH_ASR_FLAG_CLOSED = (1 << 2), SWITCH_ASR_FLAG_FIRE_EVENTS = (1 << 3), SWITCH_ASR_FLAG_AUTO_RESUME = (1 << 4) -} switch_asr_flag_t; + +} switch_asr_flag_enum_t; +typedef uint32_t switch_asr_flag_t; /*! \enum switch_directory_flag_t @@ -865,7 +885,8 @@ typedef enum { SWITCH_DIRECTORY_FLAG_FREE_POOL = (1 << 0) -} switch_directory_flag_t; +} switch_directory_flag_enum_t; +typedef uint32_t switch_directory_flag_t; /*! \enum switch_codec_type_t @@ -894,7 +915,8 @@ */ typedef enum { SWITCH_TIMER_FLAG_FREE_POOL = (1 << 0) -} switch_timer_flag_t; +} switch_timer_flag_enum_t; +typedef uint32_t switch_timer_flag_t; /*! @@ -920,7 +942,8 @@ SMBF_STEREO = (1 << 5), SMBF_RECORD_ANSWER_REQ = (1 << 6), SMBF_THREAD_LOCK = (1 << 7) -} switch_media_bug_flag_t; +} switch_media_bug_flag_enum_t; +typedef uint32_t switch_media_bug_flag_t; /*! \enum switch_file_flag_t @@ -954,12 +977,14 @@ SWITCH_FILE_SEEK = (1 << 10), SWITCH_FILE_OPEN = (1 << 11), SWITCH_FILE_CALLBACK = (1 << 12) -} switch_file_flag_t; +} switch_file_flag_enum_t; +typedef uint32_t switch_file_flag_t; typedef enum { SWITCH_IO_FLAG_NONE = 0, SWITCH_IO_FLAG_NOBLOCK = (1 << 0) -} switch_io_flag_t; +} switch_io_flag_enum_t; +typedef uint32_t switch_io_flag_t; /* make sure this is synced with the EVENT_NAMES array in switch_event.c also never put any new ones before EVENT_ALL

1 0

[commit] r8760 - freeswitch/trunk/src
by Freeswitch SVN 05 Jun '08

05 Jun '08

Author: anthm Date: Wed Jun 4 20:23:58 2008 New Revision: 8760 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: update Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Jun 4 20:23:58 2008 @@ -1195,7 +1195,7 @@ peer_channel = peer_channels[idx]; } else { status = SWITCH_STATUS_FALSE; - if (caller_channel) { + if (caller_channel && peer_channel) { process_import(session, peer_channel); } peer_channel = NULL; @@ -1238,7 +1238,9 @@ if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); - process_import(session, peer_channel); + if (peer_channel) { + process_import(session, peer_channel); + } } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); *cause = SWITCH_CAUSE_SUCCESS;

1 0

[commit] r8759 - freeswitch/trunk/src
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 19:33:29 2008 New Revision: 8759 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: add import var Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Wed Jun 4 19:33:29 2008 @@ -454,6 +454,29 @@ return status; } +static void process_import(switch_core_session_t *session, switch_channel_t *peer_channel) +{ + const char *import, *val; + switch_channel_t *caller_channel; + + switch_assert(session && peer_channel); + caller_channel = switch_core_session_get_channel(session); + + if ((import = switch_channel_get_variable(caller_channel, "import"))) { + char *mydata = switch_core_session_strdup(session, import); + int i, argc; + char *argv[64] = { 0 }; + + if ((argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))))) { + for(i = 0; i < argc; i++) { + if ((val = switch_channel_get_variable(peer_channel, argv[i]))) { + switch_channel_set_variable(caller_channel, argv[i], val); + } + } + } + } +} + #define MAX_PEERS 128 SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *session, switch_core_session_t **bleg, @@ -1172,6 +1195,9 @@ peer_channel = peer_channels[idx]; } else { status = SWITCH_STATUS_FALSE; + if (caller_channel) { + process_import(session, peer_channel); + } peer_channel = NULL; goto done; } @@ -1212,6 +1238,7 @@ if (status == SWITCH_STATUS_SUCCESS) { if (caller_channel) { switch_channel_set_variable(caller_channel, "originate_disposition", "call accepted"); + process_import(session, peer_channel); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel)); *cause = SWITCH_CAUSE_SUCCESS;

1 0

[commit] r8758 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Jun '08

04 Jun '08

Author: anthm Date: Wed Jun 4 19:18:59 2008 New Revision: 8758 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: blank username will trigger a lookup for user "nobody" Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Jun 4 19:18:59 2008 @@ -1033,14 +1033,15 @@ domain_name = realm; } - if (switch_xml_locate_user("id", username, domain_name, ip, &xml, &domain, &user, params) != SWITCH_STATUS_SUCCESS) { + if (switch_xml_locate_user("id", switch_strlen_zero(username) ? "nobody" : username, + domain_name, ip, &xml, &domain, &user, params) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", username, domain_name); ret = AUTH_FORBIDDEN; goto end; } if (!(mailbox = (char *) switch_xml_attr(user, "mailbox"))) { - mailbox = username; + mailbox = switch_strlen_zero(username) ? "nobody" : username; } dparams = switch_xml_child(domain, "params");

1 0