- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7272 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: anthm Date: Thu Jan 17 17:57:17 2008 New Revision: 7272 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_ivr_async.c Log: tweaks 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 Jan 17 17:57:17 2008 @@ -1574,7 +1574,7 @@ if (m->m_type == sdp_media_audio) { sdp_rtpmap_t *map; - + for (attr = m->m_attributes; attr; attr = attr->a_next) { if (!strcasecmp(attr->a_name, "ptime") && attr->a_value) { ptime = atoi(attr->a_value); @@ -1594,7 +1594,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); tech_pvt->crypto_tag = crypto_tag; - + if (switch_rtp_ready(tech_pvt->rtp_session)) { sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, @@ -1605,7 +1605,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring unacceptable key\n"); } } - } else { + } else if (!switch_rtp_ready(tech_pvt->rtp_session)) { tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Remote Key [%s]\n", tech_pvt->remote_crypto_key); tech_pvt->crypto_tag = crypto_tag; @@ -1622,16 +1622,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n"); } } - - if (switch_rtp_ready(tech_pvt->rtp_session) && - !switch_strlen_zero(tech_pvt->local_crypto_key) && !switch_strlen_zero(tech_pvt->remote_crypto_key)) { - switch_set_flag_locked(tech_pvt, TFLAG_SECURE); - sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1); - switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, - tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); - switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, tech_pvt->crypto_tag, - tech_pvt->crypto_type, tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN); - } } } } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Thu Jan 17 17:57:17 2008 @@ -1705,7 +1705,7 @@ switch_assert(path); if (!(session = switch_core_session_locate(uuid))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "uuid [%s] does not match an existing session.\n", switch_str_nil(uuid)); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "uuid [%s] does not match an existing session.\n", switch_str_nil(uuid)); return SWITCH_STATUS_FALSE; }

1 0

[commit] r7271 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: anthm Date: Thu Jan 17 16:59:35 2008 New Revision: 7271 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: fix small issue 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 Jan 17 16:59:35 2008 @@ -1583,7 +1583,7 @@ crypto = attr->a_value; crypto_tag = atoi(crypto); - if (tech_pvt->remote_crypto_key) { + if (tech_pvt->remote_crypto_key && switch_rtp_ready(tech_pvt->rtp_session)) { if (crypto_tag && crypto_tag == tech_pvt->crypto_tag) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Existing key is still valid.\n"); } else { @@ -1594,9 +1594,12 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto); tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto); tech_pvt->crypto_tag = crypto_tag; - sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); - switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, - tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + + if (switch_rtp_ready(tech_pvt->rtp_session)) { + sofia_glue_add_crypto(tech_pvt, tech_pvt->remote_crypto_key, SWITCH_RTP_CRYPTO_RECV); + switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_RECV, tech_pvt->crypto_tag, + tech_pvt->crypto_type, tech_pvt->remote_raw_key, SWITCH_RTP_KEY_LEN); + } got_crypto++; } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring unacceptable key\n");

1 0

[commit] r7270 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: brian Date: Thu Jan 17 15:44:50 2008 New Revision: 7270 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: tweak Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Thu Jan 17 15:44:50 2008 @@ -145,7 +145,7 @@ <anti-action application="set" data="transfer_ringback=${us-ring}"/> <anti-action application="set" data="call_timeout=30"/> <anti-action application="set" data="hangup_after_bridge=true"/> - <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> + <anti-action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,BUSY,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION,CALL_REJECTED"/> <anti-action application="db" data="insert/call_return/${dialed_ext}/${caller_id_number}"/> <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/>

1 0

[commit] r7269 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: anthm Date: Thu Jan 17 14:25:01 2008 New Revision: 7269 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: add user_agent to sip lookups 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 Jan 17 14:25:01 2008 @@ -469,8 +469,9 @@ void sofia_presence_cancel(void); switch_status_t config_sofia(int reload, char *profile_name); void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale); -auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen, - char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user); +auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, + char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user); + void sofia_reg_handle_sip_r_challenge(int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, 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 Jan 17 14:25:01 2008 @@ -196,7 +196,7 @@ if (authorization) { char network_ip[80]; get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_addr); - auth_res = sofia_reg_parse_auth(profile, authorization, + auth_res = sofia_reg_parse_auth(profile, authorization, sip, (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0, REG_INVITE, NULL); } 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 Thu Jan 17 14:25:01 2008 @@ -412,8 +412,8 @@ if (authorization) { char *v_contact_str; - if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event, exptime, regtype, to_user)) - == AUTH_STALE) { + if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip, sip->sip_request->rq_method_name, + key, keylen, network_ip, v_event, exptime, regtype, to_user)) == AUTH_STALE) { stale = 1; } @@ -757,7 +757,7 @@ } -auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, +auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user) { int indexnum; @@ -853,8 +853,9 @@ free(sql); } - pbuf = switch_mprintf("profile=%s", profile->name); - + pbuf = switch_mprintf("action=sip_auth&profile=%s&user_agent=%s", + profile->name, + (sip && sip->sip_user_agent) ? sip->sip_user_agent->g_string : "unknown"); if (!switch_strlen_zero(profile->reg_domain)) { domain_name = profile->reg_domain;

1 0

[commit] r7268 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: anthm Date: Thu Jan 17 12:37:49 2008 New Revision: 7268 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: tls interop Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Jan 17 12:37:49 2008 @@ -1628,7 +1628,7 @@ nchannel = switch_core_session_get_channel(nsession); if (!strncasecmp(profile_name, "gateway", 7)) { - char *gw; + char *gw, *params; sofia_gateway_t *gateway_ptr = NULL; if (!(gw = strchr(profile_name, '/'))) { @@ -1653,19 +1653,55 @@ goto error; } + tech_pvt->transport = gateway_ptr->register_transport; + + /* + * Handle params, strip them off the destination and add them to the + * invite contact. + * + * TODO: + * - Add parameters back to destination url? + */ + if ((params = strchr(dest, ';'))) { + char *tp_param; + + *params++ = '\0'; + + if ((tp_param = (char *)switch_stristr("port=", params))) { + tp_param += 5; + tech_pvt->transport = sofia_glue_str2transport(tp_param); + if (tech_pvt->transport == SOFIA_TRANSPORT_UNKNOWN) { + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; + } + } + } + + if (tech_pvt->transport != gateway_ptr->register_transport) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "You are trying to use a different transport type for this gateway (overriding the register-transport), this is unsupported!\n"); + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + goto error; + } + profile = gateway_ptr->profile; tech_pvt->gateway_name = switch_core_session_strdup(nsession, gateway_ptr->name); switch_channel_set_variable(nchannel, "sip_gateway_name", gateway_ptr->name); - + if (!switch_test_flag(gateway_ptr, REG_FLAG_CALLERID)) { tech_pvt->gateway_from_str = switch_core_session_strdup(nsession, gateway_ptr->register_from); } + if (!strchr(dest, '@')) { tech_pvt->dest = switch_core_session_sprintf(nsession, "sip:%s@%s", dest, gateway_ptr->register_proxy + 4); } else { tech_pvt->dest = switch_core_session_sprintf(nsession, "sip:%s", dest); } - tech_pvt->invite_contact = switch_core_session_strdup(nsession, gateway_ptr->register_contact); + + if (params) { + tech_pvt->invite_contact = switch_core_session_sprintf(nsession, "%s;%s", gateway_ptr->register_contact, params); + } else { + tech_pvt->invite_contact = switch_core_session_strdup(nsession, gateway_ptr->register_contact); + } } else { if (!(dest = strchr(profile_name, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); @@ -1729,7 +1765,7 @@ } } switch_channel_set_variable(nchannel, "sip_destination_url", tech_pvt->dest); - + caller_profile = switch_caller_profile_clone(nsession, outbound_profile); caller_profile->destination_number = switch_core_strdup(caller_profile->pool, dest); switch_channel_set_caller_profile(nchannel, caller_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 Jan 17 12:37:49 2008 @@ -196,6 +196,14 @@ REG_STATE_LAST } reg_state_t; +typedef enum { + SOFIA_TRANSPORT_UNKNOWN = 0, + SOFIA_TRANSPORT_UDP, + SOFIA_TRANSPORT_TCP, + SOFIA_TRANSPORT_TCP_TLS, + SOFIA_TRANSPORT_SCTP +} sofia_transport_t; + struct sofia_gateway { sofia_private_t *sofia_private; nua_handle_t *nh; @@ -212,6 +220,7 @@ char *register_context; char *expires_str; char *register_url; + sofia_transport_t register_transport; uint32_t freq; time_t expires; time_t retry; @@ -358,6 +367,7 @@ switch_payload_t bte; switch_payload_t cng_pt; switch_payload_t bcng_pt; + sofia_transport_t transport; nua_handle_t *nh; nua_handle_t *nh2; sip_contact_t *contact; @@ -401,14 +411,6 @@ AUTH_STALE, } auth_res_t; -typedef enum { - SOFIA_TRANSPORT_UNKNOWN = 0, - SOFIA_TRANSPORT_UDP, - SOFIA_TRANSPORT_TCP, - SOFIA_TRANSPORT_TCP_TLS, - SOFIA_TRANSPORT_SCTP, -} sofia_transport_t; - #define sofia_test_pflag(obj, flag) ((obj)->pflags & flag) #define sofia_set_pflag(obj, flag) (obj)->pflags |= (flag) #define sofia_set_pflag_locked(obj, flag) assert(obj->flag_mutex != NULL);\ @@ -568,8 +570,10 @@ */ sofia_transport_t sofia_glue_via2transport(const sip_via_t *via); sofia_transport_t sofia_glue_url2transport(const url_t *url); +sofia_transport_t sofia_glue_str2transport(const char *str); const char *sofia_glue_transport2str(const sofia_transport_t tp); +char * sofia_glue_find_parameter(const char *str, const char *param); int sofia_glue_transport_has_tls(const sofia_transport_t tp); const char *sofia_glue_get_unknown_header(sip_t const *sip, const char *name); 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 Jan 17 12:37:49 2008 @@ -664,8 +664,9 @@ *register_proxy = NULL, *contact_params = NULL, *params = NULL, - *register_transport = "udp"; + *register_transport = NULL; + gateway->register_transport = SOFIA_TRANSPORT_UDP; gateway->pool = profile->pool; gateway->profile = profile; gateway->name = switch_core_strdup(gateway->pool, name); @@ -707,12 +708,14 @@ } else if (!strcmp(var, "contact-params")) { contact_params = val; } else if (!strcmp(var, "register-transport")) { - if (!strcasecmp(val, "udp") || !strcasecmp(val, "tcp")) { - register_transport = val; - } else { + sofia_transport_t transport = sofia_glue_str2transport(val); + + if (transport == SOFIA_TRANSPORT_UNKNOWN || (!sofia_test_pflag(profile, PFLAG_TLS) && sofia_glue_transport_has_tls(transport))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR: unsupported transport\n"); goto skip; } + + gateway->register_transport = transport; } } @@ -767,6 +770,7 @@ if (switch_true(caller_id_in_from)) { switch_set_flag(gateway, REG_FLAG_CALLERID); } + register_transport = (char *)sofia_glue_transport2str(gateway->register_transport); if (contact_params) { if (*contact_params == ';') { params = switch_core_sprintf(gateway->pool, "%s&transport=%s", contact_params, register_transport); @@ -777,10 +781,11 @@ params = switch_core_sprintf(gateway->pool, ";transport=%s", register_transport); } - gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", register_proxy,register_transport); + gateway->register_url = switch_core_sprintf(gateway->pool, "sip:%s;transport=%s", register_proxy, register_transport); gateway->register_from = switch_core_sprintf(gateway->pool, "<sip:%s@%s;transport=%s>", from_user, from_domain, register_transport); gateway->register_contact = switch_core_sprintf(gateway->pool, "<sip:%s@%s:%d%s>", extension, - profile->extsipip ? profile->extsipip : profile->sipip, profile->sip_port, params); + profile->extsipip ? profile->extsipip : profile->sipip, + sofia_glue_transport_has_tls(gateway->register_transport) ? profile->tls_sip_port : profile->sip_port, params); if (!strncasecmp(proxy, "sip:", 4)) { gateway->register_proxy = switch_core_strdup(gateway->pool, proxy); 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 Jan 17 12:37:49 2008 @@ -509,24 +509,40 @@ return SWITCH_STATUS_SUCCESS; } -static sofia_transport_t sofia_glue_str2transport(const char *str) +sofia_transport_t sofia_glue_str2transport(const char *str) { - if (!strcasecmp(str, "udp")) { + if (!strncasecmp(str, "udp", 3)) { return SOFIA_TRANSPORT_UDP; } - else if (!strcasecmp(str, "tcp")) { + else if (!strncasecmp(str, "tcp", 3)) { return SOFIA_TRANSPORT_TCP; } - else if (!strcasecmp(str, "sctp")) { + else if (!strncasecmp(str, "sctp", 4)) { return SOFIA_TRANSPORT_SCTP; } - else if (!strcasecmp(str, "tls")) { + else if (!strncasecmp(str, "tls", 3)) { return SOFIA_TRANSPORT_TCP_TLS; } return SOFIA_TRANSPORT_UNKNOWN; } +char * sofia_glue_find_parameter(const char *str, const char *param) +{ + char *ptr = NULL; + + ptr = (char *)str; + while(ptr) { + if (!strncasecmp(ptr, param, strlen(param))) + return ptr; + + if ((ptr = strchr(ptr, ';'))) + ptr++; + } + + return NULL; +} + sofia_transport_t sofia_glue_url2transport(const url_t *url) { char *ptr = NULL; @@ -539,29 +555,8 @@ tls++; } - ptr = (char *)url->url_params; - while(ptr) { - - if (!strncasecmp(ptr, "transport=", 10)) { - ptr += 10; - - if (!strncasecmp(ptr, "udp", 3)) { - return SOFIA_TRANSPORT_UDP; - } - else if (!strncasecmp(ptr, "tcp", 3)) { - return SOFIA_TRANSPORT_TCP; - } - else if (!strncasecmp(ptr, "tls", 3)) { - return SOFIA_TRANSPORT_TCP_TLS; - } - else if (!strncasecmp(ptr, "sctp", 4)) { - return SOFIA_TRANSPORT_SCTP; - } - break; - } - - if ((ptr = strchr(ptr, ';'))) - ptr++; + if ((ptr = sofia_glue_find_parameter(url->url_params, "transport="))) { + return sofia_glue_str2transport(ptr + 10); } return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; @@ -713,7 +708,6 @@ if (!tech_pvt->nh) { char *d_url = NULL, *url = NULL; sofia_private_t *sofia_private; - sofia_transport_t transport = SOFIA_TRANSPORT_UDP; char *invite_contact = NULL, *to_str, *use_from_str, *from_str, *url_str; const char *t_var; char *rpid_domain = "cluecon.com", *p; @@ -752,28 +746,35 @@ rpid_domain = "cluecon.com"; } - if ((p = (char *)switch_stristr("port=", url))) { - p += 5; - transport = sofia_glue_str2transport( p ); - } else { - if ((t_var = switch_channel_get_variable(channel, "sip_transport"))) { - transport = sofia_glue_str2transport(t_var); + /* + * Ignore transport chanvar and uri parameter for gateway connections + * since all of them have been already taken care of in mod_sofia.c:sofia_outgoing_channel() + */ + if (switch_strlen_zero(tech_pvt->gateway_name)) { + if ((p = (char *)switch_stristr("port=", url))) { + p += 5; + tech_pvt->transport = sofia_glue_str2transport( p ); + } else { + if ((t_var = switch_channel_get_variable(channel, "sip_transport"))) { + tech_pvt->transport = sofia_glue_str2transport(t_var); + } } - } - if (transport == SOFIA_TRANSPORT_UNKNOWN) { - transport = SOFIA_TRANSPORT_UDP; + if (tech_pvt->transport == SOFIA_TRANSPORT_UNKNOWN) { + tech_pvt->transport = SOFIA_TRANSPORT_UDP; + } } - if (switch_strlen_zero(tech_pvt->invite_contact)) { - if (sofia_glue_transport_has_tls(transport)) + if (switch_strlen_zero(tech_pvt->invite_contact)) + { + if (sofia_glue_transport_has_tls(tech_pvt->transport)) tech_pvt->invite_contact = tech_pvt->profile->tls_url; else tech_pvt->invite_contact = tech_pvt->profile->url; } - url_str = sofia_overcome_sip_uri_weakness(session, url, transport, SWITCH_TRUE); - invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, transport, SWITCH_FALSE); + url_str = sofia_overcome_sip_uri_weakness(session, url, tech_pvt->transport, SWITCH_TRUE); + invite_contact = sofia_overcome_sip_uri_weakness(session, tech_pvt->invite_contact, tech_pvt->transport, SWITCH_FALSE); from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, 0, SWITCH_FALSE); to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, 0, SWITCH_FALSE); 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 Thu Jan 17 12:37:49 2008 @@ -343,7 +343,7 @@ char network_ip[80]; char *register_gateway = NULL; int network_port; - int cd = 0; + const char *reg_desc = "Registered"; const char *call_id = NULL; char *force_user; @@ -431,34 +431,19 @@ } if ((v_contact_str = switch_event_get_header(*v_event, "sip-force-contact"))) { - if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || + !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { if (contact->m_url->url_params) { switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); } else { switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); } - cd = 1; - exptime = 20; - } else if (!strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { - const char *pt = contact->m_url->url_port; - int port; - - if (!pt) { - pt = "5060"; - } - - port = atoi(pt); - - if (port > 0) { - port++; - if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", - display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); - } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", - display, contact->m_url->url_user, contact->m_url->url_host, port); - } + if (strstr(v_contact_str, "tls")) { + reg_desc = "Registered(TLSHACK)"; + } else { + reg_desc = "Registered(NATHACK)"; + exptime = 20; } } else { char *p; @@ -524,7 +509,7 @@ switch_safe_free(sql); sql = switch_mprintf("insert into sip_registrations values ('%q', '%q','%q','%q','%q', '%q', %ld, '%q')", call_id, - to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", + to_user, to_host, contact_str, reg_desc, rpid, (long) switch_timestamp(NULL) + (long) exptime * 2, agent);

1 0

[commit] r7267 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: anthm Date: Thu Jan 17 11:31:08 2008 New Revision: 7267 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: interop 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 Thu Jan 17 11:31:08 2008 @@ -440,6 +440,26 @@ } cd = 1; exptime = 20; + } else if (!strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { + const char *pt = contact->m_url->url_port; + int port; + + if (!pt) { + pt = "5060"; + } + + port = atoi(pt); + + if (port > 0) { + port++; + if (contact->m_url->url_params) { + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", + display, contact->m_url->url_user, contact->m_url->url_host, port, contact->m_url->url_params); + } else { + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", + display, contact->m_url->url_user, contact->m_url->url_host, port); + } + } } else { char *p; switch_copy_string(contact_str, v_contact_str, sizeof(contact_str));

1 0

[commit] r7266 - freeswitch/trunk/scripts
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: stkn Date: Thu Jan 17 09:37:45 2008 New Revision: 7266 Modified: freeswitch/trunk/scripts/gentls_cert.in Log: More gentls_cert improvements: check for usable CA and improve confirmation prompt in create command Modified: freeswitch/trunk/scripts/gentls_cert.in ============================================================================== --- freeswitch/trunk/scripts/gentls_cert.in (original) +++ freeswitch/trunk/scripts/gentls_cert.in Thu Jan 17 09:37:45 2008 @@ -12,15 +12,25 @@ umask 037 -setup_ca() { - echo "Creating new CA..." +check_ca() { + for x in cacert.pem cakey.pem config.tpl; do + if [ ! -e "${CONFDIR}/CA/${x}" ]; then + return 1 + fi + done - if [ -e "${CONFDIR}/CA/cacert.pem" ] || [ -e "${CONFDIR}/CA/cakey.pem" ] - then - echo "existing CA found in \"${CONFDIR}/CA\"!" + return 0 +} + +setup_ca() { + if check_ca; then + echo "Existing CA found in \"${CONFDIR}/CA\"" + echo "(Use \"gentls_cert remove\" to delete)" exit 1 fi + echo "Creating new CA..." + if [ ! -d "${CONFDIR}/CA" ]; then mkdir -p -m 750 "${CONFDIR}/CA" || exit 1 fi @@ -68,6 +78,11 @@ generate_cert() { local val="" + if ! check_ca; then + echo "No existing CA found, please create one with \"gentls_cert setup\" first" + exit 1 + fi + echo "Generating new certificate..." echo @@ -78,9 +93,9 @@ echo echo "Certificate filename \"${OUTFILE}\"" echo - echo "[Enter \"OK\" to accept]" + echo "[Is this OK? (y/N)]" read val - if [ "${val}" != "OK" ]; then + if [ "${val}" != "y" ] && [ "${val}" != "Y" ]; then echo "Aborted" return 2 fi

1 0

[commit] r7265 - freeswitch/trunk/scripts
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: stkn Date: Thu Jan 17 05:14:54 2008 New Revision: 7265 Modified: freeswitch/trunk/scripts/gentls_cert.in Log: Add -out option to specify filename for new cert, some other minor improvements Modified: freeswitch/trunk/scripts/gentls_cert.in ============================================================================== --- freeswitch/trunk/scripts/gentls_cert.in (original) +++ freeswitch/trunk/scripts/gentls_cert.in Thu Jan 17 05:14:54 2008 @@ -8,12 +8,19 @@ COMMON_NAME="FreesSWITCH CA" ALT_NAME="DNS:test.freeswitch.org" ORG_NAME="FreeSWITCH" +OUTFILE="agent.pem" umask 037 setup_ca() { echo "Creating new CA..." + if [ -e "${CONFDIR}/CA/cacert.pem" ] || [ -e "${CONFDIR}/CA/cakey.pem" ] + then + echo "existing CA found in \"${CONFDIR}/CA\"!" + exit 1 + fi + if [ ! -d "${CONFDIR}/CA" ]; then mkdir -p -m 750 "${CONFDIR}/CA" || exit 1 fi @@ -69,9 +76,12 @@ echo "ORG_NAME: \"${ORG_NAME}\"" echo "ALT_NAME: \"${ALT_NAME}\"" echo + echo "Certificate filename \"${OUTFILE}\"" + echo echo "[Enter \"OK\" to accept]" read val if [ "${val}" != "OK" ]; then + echo "Aborted" return 2 fi @@ -91,7 +101,7 @@ -extensions ext -days ${DAYS} -sha1 >/dev/null || exit 1 cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem" - cat "${TMPFILE}.crt" "${TMPFILE}.key" > "${CONFDIR}/agent.pem" + cat "${TMPFILE}.crt" "${TMPFILE}.key" > "${CONFDIR}/${OUTFILE}" rm "${TMPFILE}.cfg" "${TMPFILE}.crt" "${TMPFILE}.key" "${TMPFILE}.req" @@ -99,7 +109,7 @@ } remove_ca() { - echo "Cleaning CA" + echo "Removing CA" if [ ! -d "${CONFDIR}/CA" ]; then rm "${CONFDIR}/CA/"* @@ -126,6 +136,10 @@ shift ORG_NAME="$1" ;; + -out) + shift + OUTFILE="$1" + ;; esac shift done @@ -157,14 +171,17 @@ * commands: setup - Setup new CA - create - Create new certificate (overwriting old!) remove - Remove CA + create - Create new certificate (overwriting old!) + + * options: -cn Set common name -alt Set alternative name (use prefix 'DNS:' or 'URI:') -org Set organization name + -out Filename for new certificate (create only) EOF exit 1

1 0

[commit] r7264 - freeswitch/trunk/src/mod/applications/mod_esf
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: mikej Date: Thu Jan 17 01:27:42 2008 New Revision: 7264 Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Log: protect against null deref Modified: freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c (original) +++ freeswitch/trunk/src/mod/applications/mod_esf/mod_esf.c Thu Jan 17 01:27:42 2008 @@ -140,7 +140,7 @@ continue; } - if (!SWITCH_READ_ACCEPTABLE(status)) { + if (!SWITCH_READ_ACCEPTABLE(status) || !read_frame) { goto fail; }

1 0

[commit] r7263 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 17 Jan '08

17 Jan '08

Author: mikej Date: Thu Jan 17 01:23:23 2008 New Revision: 7263 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: clarify varname to remove var scope masking. 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 Jan 17 01:23:23 2008 @@ -1477,7 +1477,7 @@ switch_payload_t te = 0, cng_pt = 0; private_object_t *tech_pvt; sdp_media_t *m; - sdp_attribute_t *a; + sdp_attribute_t *attr; int first = 0, last = 0; int ptime = 0, dptime = 0; int sendonly = 0; @@ -1512,17 +1512,17 @@ sendonly = 1; } - for (a = sdp->sdp_attributes; a; a = a->a_next) { - if (switch_strlen_zero(a->a_name)) { + for (attr = sdp->sdp_attributes; attr; attr = attr->a_next) { + if (switch_strlen_zero(attr->a_name)) { continue; } - if ((!strcasecmp(a->a_name, "sendonly")) || (!strcasecmp(a->a_name, "inactive"))) { + if ((!strcasecmp(attr->a_name, "sendonly")) || (!strcasecmp(attr->a_name, "inactive"))) { sendonly = 1; - } else if (!strcasecmp(a->a_name, "sendrecv")) { + } else if (!strcasecmp(attr->a_name, "sendrecv")) { sendonly = 0; - } else if (!strcasecmp(a->a_name, "ptime")) { - dptime = atoi(a->a_value); + } else if (!strcasecmp(attr->a_name, "ptime")) { + dptime = atoi(attr->a_value); } } @@ -1574,13 +1574,13 @@ if (m->m_type == sdp_media_audio) { sdp_rtpmap_t *map; - for (a = m->m_attributes; a; a = a->a_next) { - if (!strcasecmp(a->a_name, "ptime") && a->a_value) { - ptime = atoi(a->a_value); - } else if (!got_crypto && !strcasecmp(a->a_name, "crypto") && !switch_strlen_zero(a->a_value)) { - crypto = a->a_value; - int crypto_tag = atoi(crypto); - + for (attr = m->m_attributes; attr; attr = attr->a_next) { + if (!strcasecmp(attr->a_name, "ptime") && attr->a_value) { + ptime = atoi(attr->a_value); + } else if (!got_crypto && !strcasecmp(attr->a_name, "crypto") && !switch_strlen_zero(attr->a_value)) { + int crypto_tag; + crypto = attr->a_value; + crypto_tag = atoi(crypto); if (tech_pvt->remote_crypto_key) { if (crypto_tag && crypto_tag == tech_pvt->crypto_tag) { @@ -1813,9 +1813,9 @@ for (map = m->m_rtpmaps; map; map = map->rm_next) { - for (a = m->m_attributes; a; a = a->a_next) { - if (!strcasecmp(a->a_name, "framerate") && a->a_value) { - framerate = atoi(a->a_value); + for (attr = m->m_attributes; attr; attr = attr->a_next) { + if (!strcasecmp(attr->a_name, "framerate") && attr->a_value) { + framerate = atoi(attr->a_value); } } if (!(rm_encoding = map->rm_encoding)) {

1 0