- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6643 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 10:52:11 2007 New Revision: 6643 Modified: freeswitch/trunk/docs/phrase/phrase_en.xml Log: add tones and music types along with conference prompts Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Tue Dec 11 10:52:11 2007 @@ -212,5 +212,21 @@ <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> <prompt phrase="to return the call now" filename="vm-return_call.wav"/> </voicemail> + <conference> + <prompt phrase="'TONE'" filename="ack.wav" type="tone"/> + <prompt phrase="'TONE'" filename="nack.wav" type="tone"/> + <prompt phrase="The conference is muted." filename="mute.wav"/> + <prompt phrase="The conference is unmuted." filename="unmuted.wav"/> + <prompt phrase="You are currently the only person in this conference." filename="alone.wav"/> + <prompt phrase="'NONE'" filename="perpetual.wav" type="music"/> + <prompt phrase="'NONE'" filename="enter.wav" type="tone"/> + <prompt phrase="'NONE'" filename="exit.wav" type="tone"/> + <prompt phrase="You have been kicked from this conference." filename="kicked.wav"/> + <prompt phrase="This conference is locked." filename="locked.wav"/> + <prompt phrase="The conference is now locked." filename="is-locked.wav"/> + <prompt phrase="The conference is now unlocked." filename="is-unlocked.wav"/> + <prompt phrase="Please enter the conference pin number." filename="pin.wav"/> + <prompt phrase="Invalid pin number, try again." filename="bad-pin.wav"/> + </conference> </en> </language>

1 0

[commit] r6642 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: brian Date: Tue Dec 11 10:39:48 2007 New Revision: 6642 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/brian.xml Log: update config because its user_context Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Tue Dec 11 10:39:48 2007 @@ -8,7 +8,7 @@ <param name="dial-string" value="sofia/${use_profile}/888(a)conference.freeswitch.org"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Tue Dec 11 10:39:48 2007 @@ -4,7 +4,7 @@ <param name="password" value="1234"/> </params> <variables> - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/brian.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/brian.xml (original) +++ freeswitch/trunk/conf/directory/default/brian.xml Tue Dec 11 10:39:48 2007 @@ -49,7 +49,7 @@ </params> <variables>  - <variable name="inbound_context" value="default"/> + <variable name="user_context" value="default"/>

1 0

[commit] r6641 - in freeswitch/trunk/src/mod: applications/mod_dptools endpoints/mod_sofia
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Tue Dec 11 10:38:07 2007 New Revision: 6641 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: change var name Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Dec 11 10:38:07 2007 @@ -1507,7 +1507,7 @@ new_channel = switch_core_session_get_channel(*new_session); - if ((context = switch_channel_get_variable(new_channel, "inbound_context"))) { + if ((context = switch_channel_get_variable(new_channel, "user_context"))) { if ((cp = switch_channel_get_caller_profile(new_channel))) { cp->context = switch_core_strdup(cp->pool, context); } 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 Tue Dec 11 10:38:07 2007 @@ -2053,7 +2053,7 @@ } if (!context) { - context = switch_channel_get_variable(channel, "inbound_context"); + context = switch_channel_get_variable(channel, "user_context"); } if (!context) {

1 0

[commit] r6640 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: anthm Date: Tue Dec 11 10:14:33 2007 New Revision: 6640 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add vars Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Dec 11 10:14:33 2007 @@ -1446,6 +1446,7 @@ const char *dest = NULL; static switch_call_cause_t cause; unsigned int timelimit = 60; + switch_channel_t *new_channel = NULL; user = switch_core_session_strdup(session, outbound_profile->destination_number); @@ -1460,6 +1461,19 @@ goto done; } + if ((x_params = switch_xml_child(x_domain, "params"))) { + for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + + if (!strcasecmp(var, "dial-string")) { + dest = val; + break; + } + + } + } + if ((x_params = switch_xml_child(x_user, "params"))) { for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr(x_param, "name"); @@ -1486,11 +1500,12 @@ } d_dest = switch_channel_expand_variables(channel, dest); - + if (switch_ivr_originate(session, new_session, &cause, d_dest, timelimit, NULL, NULL, NULL, NULL) == SWITCH_STATUS_SUCCESS) { const char *context; switch_caller_profile_t *cp; - switch_channel_t *new_channel = switch_core_session_get_channel(*new_session); + + new_channel = switch_core_session_get_channel(*new_session); if ((context = switch_channel_get_variable(new_channel, "inbound_context"))) { if ((cp = switch_channel_get_caller_profile(new_channel))) { @@ -1506,6 +1521,25 @@ } } + if (new_channel && xml) { + if ((x_params = switch_xml_child(x_domain, "variables"))) { + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + switch_channel_set_variable(new_channel, var, val); + } + } + + if ((x_params = switch_xml_child(x_user, "variables"))) { + for (x_param = switch_xml_child(x_params, "variable"); x_param; x_param = x_param->next) { + const char *var = switch_xml_attr(x_param, "name"); + const char *val = switch_xml_attr(x_param, "value"); + switch_channel_set_variable(new_channel, var, val); + } + } + + } + if (xml) { switch_xml_free(xml); }

1 0

[commit] r6639 - freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 08:07:52 2007 New Revision: 6639 Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: Location of certificate files can be specified now, defaults to $prefix/conf/ssl Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Dec 11 08:07:52 2007 @@ -226,6 +226,7 @@ char *hold_music; char *bind_params; char *tls_bind_params; + char *tls_cert_dir; char *reg_domain; char *user_agent; int sip_port; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Dec 11 08:07:52 2007 @@ -351,11 +351,13 @@ } 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(profile->pflags & PFLAG_TLS, NUTAG_SIPS_URL(profile->tls_bindurl)), - NTATAG_UDP_MTU(65536), TAG_END()); /* Last tag should always finish the sequence */ + sofia_event_callback, /* Callback for processing events */ + profile, /* Additional data to pass to callback */ + NUTAG_URL(profile->bindurl), + TAG_IF(profile->pflags & PFLAG_TLS, NUTAG_SIPS_URL(profile->tls_bindurl)), + TAG_IF(profile->pflags & PFLAG_TLS, NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), + NTATAG_UDP_MTU(65536), + 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); @@ -992,7 +994,9 @@ profile->tls_bind_params = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "tls-sip-port")) { profile->tls_sip_port = atoi(val); - } + } else if (!strcasecmp(var, "tls-cert-dir")) { + profile->tls_cert_dir = switch_core_strdup(profile->pool, val); + } } if (!profile->cng_pt) { @@ -1067,6 +1071,10 @@ char *url = profile->tls_bindurl; profile->tls_bindurl = switch_core_sprintf(profile->pool, "%s;%s", url, profile->tls_bind_params); } + + if (!profile->tls_cert_dir) { + profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir); + } } } if (profile) {

1 0

[commit] r6638 - in freeswitch/branches/stkn/sofia-exp/trunk: . conf/sip_profiles src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 07:57:45 2007 New Revision: 6638 Modified: freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: Basic TLS support, listening for TLS connections works, first few packets of outgoing connections are encrypted but the connection will drop back to non-tls tcp (probably a "sip:" vs "sips:" uri issue). Also includes SCTP support (needs more testing too). Modified: freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/Makefile.am Tue Dec 11 07:57:45 2007 @@ -168,7 +168,7 @@ install-data-local: @echo Installing $(NAME) - @for x in conf conf/dialplan conf/directory conf/sip_profiles mod db log log/xml_cdr bin scripts htdocs grammar ; do \ + @for x in conf conf/dialplan conf/directory conf/sip_profiles conf/ssl mod db log log/xml_cdr bin scripts htdocs grammar ; do \ $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ done for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name mime.types` ; do \ Modified: freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/conf/sip_profiles/default.xml Tue Dec 11 07:57:45 2007 @@ -36,6 +36,15 @@ <param name="inbound-codec-negotiation" value="generous"/>   + +  +  +  +  +  +  +  +    Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Dec 11 07:57:45 2007 @@ -113,7 +113,8 @@ PFLAG_RESPAWN = (1 << 9), PFLAG_GREEDY = (1 << 10), PFLAG_MULTIREG = (1 << 11), - PFLAG_SUPRESS_CNG = (1 << 12) + PFLAG_SUPRESS_CNG = (1 << 12), + PFLAG_TLS = (1 << 13) } PFLAGS; typedef enum { @@ -219,13 +220,16 @@ char *username; char *url; char *bindurl; + char *tls_bindurl; char *sipdomain; char *timer_name; char *hold_music; char *bind_params; + char *tls_bind_params; char *reg_domain; char *user_agent; int sip_port; + int tls_sip_port; char *codec_string; int running; int dtmf_duration; @@ -368,6 +372,14 @@ 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);\ @@ -468,7 +480,7 @@ void sofia_presence_set_hash_key(char *hash_key, int32_t len, sip_t const *sip); void sofia_glue_sql_close(sofia_profile_t *profile); int sofia_glue_init_sql(sofia_profile_t *profile); -char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport, switch_bool_t uri_only); +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only); switch_bool_t sofia_glue_execute_sql_callback(sofia_profile_t *profile, switch_bool_t master, switch_mutex_t *mutex, Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Dec 11 07:57:45 2007 @@ -353,7 +353,9 @@ 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), NTATAG_UDP_MTU(65536), TAG_END()); /* Last tag should always finish the sequence */ + NUTAG_URL(profile->bindurl), + TAG_IF(profile->pflags & PFLAG_TLS, NUTAG_SIPS_URL(profile->tls_bindurl)), + NTATAG_UDP_MTU(65536), 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); @@ -978,6 +980,18 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Duration out of bounds!\n"); } + + /* + * handle TLS params #1 + */ + } else if (!strcasecmp(var, "tls")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_TLS; + } + } else if (!strcasecmp(var, "tls-bind-params")) { + profile->tls_bind_params = switch_core_strdup(profile->pool, val); + } else if (!strcasecmp(var, "tls-sip-port")) { + profile->tls_sip_port = atoi(val); } } @@ -1034,7 +1048,26 @@ char *url = profile->bindurl; profile->bindurl = switch_core_sprintf(profile->pool, "%s;%s", url, profile->bind_params); } - + + /* + * handle TLS params #2 + */ + if (profile->pflags & PFLAG_TLS) { + if (!profile->tls_sip_port) { + profile->tls_sip_port = profile->sip_port + 1; + } + + if (profile->extsipip) { + profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d;maddr=%s", profile->extsipip, profile->tls_sip_port, profile->sipip); + } else { + profile->tls_bindurl = switch_core_sprintf(profile->pool, "sips:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); + } + + if (profile->tls_bind_params) { + char *url = profile->tls_bindurl; + profile->tls_bindurl = switch_core_sprintf(profile->pool, "%s;%s", url, profile->tls_bind_params); + } + } } if (profile) { switch_xml_t aliases_tag, alias_tag; Modified: freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Dec 11 07:57:45 2007 @@ -447,20 +447,73 @@ return SWITCH_STATUS_SUCCESS; } -char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const char *transport, switch_bool_t uri_only) +static sofia_transport_t sofia_glue_str2transport(const char *str) +{ + if (!strcasecmp(str, "udp")) { + return SOFIA_TRANSPORT_UDP; + } + else if (!strcasecmp(str, "tcp")) { + return SOFIA_TRANSPORT_TCP; + } + else if (!strcasecmp(str, "sctp")) { + return SOFIA_TRANSPORT_SCTP; + } + else if (!strcasecmp(str, "tls")) { + return SOFIA_TRANSPORT_TCP_TLS; + } + + return SOFIA_TRANSPORT_UNKNOWN; +} + +static const char *sofia_glue_transport2str(const sofia_transport_t tp) +{ + switch(tp) { + case SOFIA_TRANSPORT_TCP: + return "tcp"; + + case SOFIA_TRANSPORT_TCP_TLS: + return "tls"; + + case SOFIA_TRANSPORT_SCTP: + return "sctp"; + + default: + return "udp"; + } +} + +static const char *sofia_glue_transport2scheme(const sofia_transport_t tp) +{ + switch (tp) { + case SOFIA_TRANSPORT_TCP_TLS: + return "sips"; + + default: + return "sip"; + } +} + +char *sofia_overcome_sip_uri_weakness(switch_core_session_t *session, const char *uri, const sofia_transport_t transport, switch_bool_t uri_only) { char *stripped = switch_core_session_strdup(session, uri); char *new_uri = NULL; stripped = sofia_glue_get_url_from_contact(stripped, 0); - if (transport && strcasecmp(transport, "udp")) { + if (transport && transport != SOFIA_TRANSPORT_UDP) { + const char *scheme = sofia_glue_transport2scheme(transport); + char *tmp; + + if ((tmp = strchr(stripped, ':')) != NULL) { + stripped = ++tmp; + } + if (switch_stristr("port=", stripped)) { - new_uri = switch_core_session_sprintf(session, "%s%s%s", uri_only ? "" : "<", stripped, uri_only ? "" : ">"); + new_uri = switch_core_session_sprintf(session, "%s%s:%s%s", uri_only ? "" : "<", scheme, stripped, uri_only ? "" : ">"); } else { if (strchr(stripped, ';')) { - new_uri = switch_core_session_sprintf(session, "%s%s&transport=%s%s", uri_only ? "" : "<", stripped, transport, uri_only ? "" : ">"); + new_uri = switch_core_session_sprintf(session, "%s%s:%s&transport=%s%s", uri_only ? "" : "<", scheme, stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); } else { - new_uri = switch_core_session_sprintf(session, "%s%s;transport=%s%s", uri_only ? "" : "<", stripped, transport, uri_only ? "" : ">"); + new_uri = switch_core_session_sprintf(session, "%s%s:%s;transport=%s%s", uri_only ? "" : "<", scheme, stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); } } } else { @@ -541,8 +594,9 @@ 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 *transport = "udp", *t_var; + const char *t_var; char *rpid_domain = "cluecon.com", *p; const char *priv = "off"; const char *screen = "no"; @@ -583,20 +637,22 @@ rpid_domain = "cluecon.com"; } - if (switch_stristr("port=tcp", url)) { - transport = "tcp"; + if (switch_stristr("tport=tcp", url)) { + transport = SOFIA_TRANSPORT_TCP; } else { if ((t_var = switch_channel_get_variable(channel, "sip_transport"))) { - if (!strcasecmp(t_var, "tcp") || !strcasecmp(t_var, "udp")) { - transport = t_var; + sofia_transport_t t_val; + + if ((t_val = sofia_glue_str2transport(t_var)) != SOFIA_TRANSPORT_UNKNOWN) { + transport = t_val; } } } 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); - from_str = sofia_overcome_sip_uri_weakness(session, use_from_str, NULL, SWITCH_FALSE); - to_str = sofia_overcome_sip_uri_weakness(session, tech_pvt->dest_to, NULL, 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); /* Does the "genius" who wanted SIP to be "text-based" so it was "easier to read" even use it now,

1 0

[commit] r6637 - freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 07:01:20 2007 New Revision: 6637 Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c Log: Fix copy&paste error in sofia-sip SCTP tport handler Modified: freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c ============================================================================== --- freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c (original) +++ freeswitch/branches/stkn/sofia-exp/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c Tue Dec 11 07:01:20 2007 @@ -242,7 +242,7 @@ return 0; /* End of stream */ } - tport_recv_bytes(self, n, n); + tport_recv_bytes(self, N, N); veclen = tport_recv_iovec(self, &self->tp_msg, iovec, N, 0); if (veclen < 0)

1 0

[commit] r6636 - freeswitch/branches/stkn/sofia-exp/trunk
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 06:21:57 2007 New Revision: 6636 Added: freeswitch/branches/stkn/sofia-exp/trunk/ - copied from r6635, /freeswitch/trunk/ Log: Mod_sofia TLS / Transports experimental branch

1 0

[commit] r6635 - freeswitch/branches/stkn/sofia-exp
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 06:21:32 2007 New Revision: 6635 Added: freeswitch/branches/stkn/sofia-exp/ Log: Prepare new branch

1 0

[commit] r6634 - freeswitch/branches/stkn/buildsys
by Freeswitch SVN 11 Dec '07

11 Dec '07

Author: stkn Date: Tue Dec 11 06:17:13 2007 New Revision: 6634 Removed: freeswitch/branches/stkn/buildsys/ Log: Not needed anymore

1 0