December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6880 - freeswitch/trunk/src/mod/formats/mod_local_stream
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: anthm Date: Tue Dec 18 16:51:34 2007 New Revision: 6880 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Log: add shuffle to directory Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Tue Dec 18 16:51:34 2007 @@ -55,7 +55,6 @@ }; typedef struct local_stream_context local_stream_context_t; - struct local_stream_source { char *name; char *location; @@ -70,9 +69,21 @@ switch_dir_t *dir_handle; switch_mutex_t *mutex; switch_memory_pool_t *pool; + int shuffle; }; typedef struct local_stream_source local_stream_source_t; +static unsigned int S = 0; + +static int do_rand(void) +{ + srand(getpid() + ++S); + double r = ((double)rand() / ((double)(RAND_MAX)+(double)(1))); + int index = (r * 9) + 1; + return index; +} + + static void *SWITCH_THREAD_FUNC read_stream_thread(switch_thread_t *thread, void *obj) { local_stream_source_t *source = obj; @@ -84,7 +95,7 @@ switch_buffer_t *audio_buffer; switch_byte_t *dist_buf; switch_size_t used; - + int skip = 0; if (!source->prebuf) { source->prebuf = DEFAULT_PREBUFFER_SIZE; @@ -93,6 +104,10 @@ switch_buffer_create_dynamic(&audio_buffer, 1024, source->prebuf + 10, 0); dist_buf = switch_core_alloc(source->pool, source->prebuf + 10); + if (source->shuffle) { + skip = do_rand(); + } + while(RUNNING) { const char *fname; @@ -101,7 +116,7 @@ return NULL; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open directory: %s\n", source->location); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "open directory: %s\n", source->location); switch_yield(1000000); while(RUNNING) { @@ -137,6 +152,11 @@ } + if (skip > 0) { + skip--; + continue; + } + fname = path_buf; fh.prebuf = source->prebuf; @@ -188,7 +208,9 @@ } switch_core_timer_destroy(&timer); - + if (source->shuffle) { + skip = do_rand(); + } } switch_dir_close(source->dir_handle); @@ -318,28 +340,6 @@ switch_mutex_unlock(context->audio_mutex); handle->sample_count += *len; return SWITCH_STATUS_SUCCESS; -#if 0 - local_stream_context_t *context = handle->private_info; - switch_size_t bytes = 0; - size_t need = *len * 2; - - - switch_mutex_lock(context->audio_mutex); - if ((bytes = switch_buffer_read(context->audio_buffer, data, need))) { - *len = bytes / 2; - } else { - if (need > context->source->samples * 2) { - need = context->source->samples * 2; - } - - memset(data, 0, need); - *len = need / 2; - } - switch_mutex_unlock(context->audio_mutex); - - handle->sample_count += *len; - return SWITCH_STATUS_SUCCESS; -#endif } static switch_status_t local_stream_file_write(switch_file_handle_t *handle, void *data, size_t *len) @@ -411,6 +411,8 @@ if (tmp == 8000 || tmp == 16000) { source->rate = tmp; } + } else if (!strcasecmp(var, "shuffle")) { + source->shuffle = switch_true(val); } else if (!strcasecmp(var, "prebuf")) { int tmp = atoi(val); if (tmp > 0) {

1 0

[commit] r6879 - freeswitch/trunk/src
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: mikej Date: Tue Dec 18 16:37:28 2007 New Revision: 6879 Modified: freeswitch/trunk/src/switch_xml.cpp Log: handle some error cases. Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Tue Dec 18 16:37:28 2007 @@ -356,7 +356,25 @@ if (ent[b++]) { // found a match if ((c = (long) strlen(ent[b])) - 1 > (e = strchr(s, ';')) - s) { l = (d = (long) (s - r)) + c + (long) strlen(e); // new length - r = (r == m) ? strcpy((char *)malloc(l), r) : (char *)realloc(r, l); + if (l) { + if (r == m) { + char *tmp = (char *)malloc(l); + if (tmp) { + r = strcpy(tmp, r); + } else { + if (r) free(r); + return NULL; + } + } else { + char *tmp = (char *)realloc(r, l); + if (tmp) { + r = tmp; + } else { + if (r) free(r); + return NULL; + } + } + } e = strchr((s = r + d), ';'); // fix up pointers }

1 0

[commit] r6878 - freeswitch/trunk/scripts/trace
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: anthm Date: Tue Dec 18 16:18:53 2007 New Revision: 6878 Added: freeswitch/trunk/scripts/trace/ freeswitch/trunk/scripts/trace/sipgrep (contents, props changed) Log: add modified sipgrep Added: freeswitch/trunk/scripts/trace/sipgrep ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/trace/sipgrep Tue Dec 18 16:18:53 2007 @@ -0,0 +1,290 @@ +#!/usr/bin/perl +# sipgrep version 0.2. Skin for ngrep. (C) 2005-2006 Alexandr Dubovikov <shurik(a)start4.info> +# Modified 2007 Anthony Minessale <anthmct(a)yahoo.com> + +use Term::ANSIColor; +use Getopt::Std; + +#colors: BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, ON_BLACK, ON_RED, ON_GREEN, ON_YELLOW, ON_BLUE, ON_MAGENTA, ON_CYAN, ON_WHITE +# +#type: BOLD, DARK, UNDERLINE, UNDERSCORE, BLINK, REVERSE, CONCEALED, + +$COLORS{'method'}='bold red'; +$COLORS{'response'} ='bold yellow'; +$COLORS{'callid'} = 'bold magenta'; +$COLORS{'fromtag'} = 'bold blue'; +$COLORS{'totag'} = 'bold green'; +$COLORS{'viabranch'} = 'bold cyan'; + +$limit=2000; +$ngrep="/usr/local/bin/ngrep"; #path to NGREP +$ngrep_flags="-l"; # Flag for Ngrep + +$colorsmethods="INVITE|REGISTER|BYE|ACK|CANCEL|OPTIONS|REFER|NOTIFY|MESSAGE|INFO|PRACK|UPDATE"; + +%options=(); +getopts("f:t:l:ahVp:TcCnArm:",\%options); + +$version=<<END; +Sipgrep version 0.2 + Created by Alexandr Dubovikov <shurik\(a)start4.info> + +END + + $usage=<<END; +Usage: sipgrep <-h> <-f number> <-t number> <-a> <-l file> <-V> <-p> <-T> <-n|-c> + + -h Displays this help message. + -A Match anything. + -f ARG Search ARG in From field. + -c ARG Search ARG in Contact field. + -t ARG Search ARG in To field. + -a Search the ARG from '-f' and '-t' parameters in To and From fields. + -l ARG Debug file name. + -V Displays the current version. + -p Port for ngrep. + -T Parameter for ngrep. Indicating the delta between packet matches. + -C Allow colors in debug file. + -n Not allow colors in STDOUT. + -m Allowed METHODS to filter e.g. -m "INVITE,REGISTER" + -r match replies as well when matching with -m +Example: sipgrep -f 0123456 -t 0654321 -l debug.sip + or + sipgrep -f 0123456 -a -l debug.sip +END + +#version + if(defined $options{V}) +{ + print $version; exit; +} + +#usage +if((!defined $options{f} && !defined $options{t} && !defined $options{c} && !defined $options{A}) || defined $options{h}) +{ + print $usage; exit; +} + +#TimeStamp +$ngrep_flags .= sprintf(" %s", (defined $options{T}) ? "-T" : "-t" ); + +#Port +$ngrep_flags .= sprintf(" port %d", (defined $options{p}) ? $options{p} : "5060" ); + +#our system variables +$any=$options{A}; +$mstr=$options{m}; +$anumber=$options{f}; +$bnumber=$options{t}; +$cnumber=$options{c}; +$replies=$options{r}; +$all=$options{a}; +$filedebug=$options{l}; +$nocolors=$options{n}; +$debugfilecolors=$options{C}; + +@METHODS = split(",", $mstr); + +#remove old debug file. +unlink $filedebug if(defined $filedebug); + +#open PIPE +open(PIPE,"$ngrep $ngrep_flags |") or die "Can't run '$ngrep' programm: $!\n"; + +select(PIPE); $| = 1; # make unbuffered +select(STDOUT); $| = 1; # make unbuffered + +while(<PIPE>) +{ + chomp($_); + s/ //ig; + s/ // if(/^ /); + + if(/\.\. (.*)$/) + { + $tmp.=$_; + + if(create_newline($tmp)==1) + { + undef $firstvia; + #system_out("----------------begin of packet -----------------------------\n"); + foreach $key (@tmparray) + { + system_out($key."\n"); + } + #system_out("------------------end of packet -----------------------------\n"); + } + } + elsif(/^#/) { undef $tmp;} + elsif(/^U /) { $tmp=$_."....";} + else { $tmp.=$_;} + } + close(PIPE); + + sub create_newline +{ + my $tmpstring = shift; + exit if($index > $limit); + undef @tmparray; + @tmparray=split(/\.\./,$tmpstring); + $print_out=1; + undef $searchcallid; + + if (@METHODS) { + $print_out=0; + foreach $key (@tmparray) { + my $test = 0; + $test = ($key =~ /^\S+\s+\S+\s+SIP\/2.0/) ? 1 : 0; + + if ($replies && !$test) { + $test = $key =~ /CSeq\:/i; + } + + if ($test) { + foreach $m (@METHODS) { + if ($key =~ $m) { + $print_out=1; + last; + } + } + } + } + } + + if (!$print_out) { + return $print_out; + } + + if ($any) { + $print_out=1; + return $print_out; + } + + foreach $key(@tmparray) + { + if(defined $anumber || defined $bnumber || defined $cnumber) + { + $print_out=0; + getmatch($key); #if(!$callid) + $tmpcallid=getcallid($key); + if($searchcallid==1) + { + $GCALLID{$tmpcallid}=1; + $print_out=1; + last; + } + } + } + return $print_out; +} + +sub getmatch +{ + my $tmps = shift; + + #From: "Martin Mustermann" <sip:021173067200@qsc.de>;tag=2bdf62455c76484b9e1163154d2758cd;epid=46aa53832b + if($tmps=~/^From:/i && ((defined $anumber && $tmps=~/$anumber/ig) || (defined $all && defined $bnumber && $tmps=~/$bnumber/ig))) + { + $searchcallid=1; + } + elsif($tmps=~/^To:/i && ((defined $bnumber && $tmps=~/$bnumber/ig) || (defined $all && defined $anumber && $tmps=~/$anumber/ig))) + { + $searchcallid=1; + } + elsif($tmps=~/^Contact:/i && ((defined $cnumber && $tmps=~/$cnumber/ig))) + { + $searchcallid=1; + } + if($tmps=~/^Call-ID:/ig) + { + (undef,$tmpcallid)=split(/: /,$tmps,2); + $print_out=1 if($GCALLID{$tmpcallid}==1); + } +} + +sub getcallid +{ + my $tmps = shift; + (undef,$tmpcallid)=split(/: /,$tmps,2) if($tmps=~/^Call-ID:/ig); + return $tmpcallid; +} + + +sub system_out +{ + my $out = shift; + my $tmpmain, $tmpstr; + + #Method: + if($out =~/^($colorsmethods) /ig) + { + ($tmpmain,$tmpstr)=split(/ /,$out,2); + + print_out($tmpmain, $COLORS{'method'}); + + print_out(" ".$tmpstr); + } + #Response: + elsif($out =~/^SIP\/2\.0 [1-6][0-9][0-9] /ig) + { + ($tmpstr, $tmpmain)=split(/ /,$out,2); + print_out($tmpstr." "); + print_out($tmpmain, $COLORS{'response'}); + } + #Callid + elsif($out =~/^(Call-ID):/ig) + { + ($tmpstr, $tmpmain)=split(/: /,$out,2); + print_out($tmpstr.": "); + print_out($tmpmain, $COLORS{'callid'}); + } + #From/To: tag + elsif($out =~/^(From|f|To|t): /ig && $out=~/;tag=/ig) + { + + ($tmpstr, $tmpmain)=split(/;tag=/,$out,2); + print_out($tmpstr.";tag="); + + ($tmpmain, $tmpstr)=split(/;/,$tmpmain,2); + print_out($tmpmain, $out =~/^(From|f): / ? $COLORS{'fromtag'} : $COLORS{'totag'}); + + print_out(";".$tmpstr) if(defined $tmpstr); + } + #Via: branch + elsif($out =~/^(Via|v): /ig && $out=~/;branch=/ig && !defined $firstvia) + { + + ($tmpstr, $tmpmain)=split(/;branch=/,$out,2); + print_out($tmpstr.";branch="); + + ($tmpmain, $tmpstr)=split(/;/,$tmpmain,2); + print_out($tmpmain, $COLORS{'viabranch'}); + + print_out(";".$tmpstr) if(defined $tmpstr); + + $firstvia = 1; + } + else { print_out($out); } +} + + +sub print_out +{ + my $ltext = shift; + my $lcolor = shift; + + $lcolor='reset' if(!defined $lcolor || defined $nocolors); + + print color $lcolor; + + print $ltext; + + if(defined $filedebug) + { + open(DBG, ">>$filedebug"); + $lcolor = 'reset' if(!(defined $debugfilecolors)); + print DBG color $lcolor; + print DBG $ltext; + close(DBG); + } +}

1 0

[commit] r6877 - freeswitch/trunk
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: mikej Date: Tue Dec 18 15:57:52 2007 New Revision: 6877 Modified: freeswitch/trunk/Makefile.am Log: add make samples target, make samples by default if there are not already dirs out there, don't update configs on each make install Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Tue Dec 18 15:57:52 2007 @@ -163,11 +163,8 @@ $(switch_builddir)/quiet_libtool: $(switch_builddir)/libtool @cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > quiet_libtool -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 \ - $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ - done +samples-conf: + test -d $(DESTDIR)$(prefix)/conf || $(mkinstalldirs) $(DESTDIR)$(prefix)/conf for conffile in `find conf -name \*.xml && find conf -name \*.conf && find conf -name \*.tpl && find conf -name mime.types` ; do \ dir=`echo $$conffile | sed -e 's|/[^/]*$$||'`; \ filename=`echo $$conffile | sed -e 's|^.*/||'`; \ @@ -175,13 +172,26 @@ test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || \ test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename.noload || \ $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ - done ; + done + +samples-htdocs: + test -d $(DESTDIR)$(prefix)/htdocs || $(mkinstalldirs) $(DESTDIR)$(prefix)/htdocs for htdocsfile in `find htdocs -name \* | grep -v .svn` ; do \ dir=`echo $$htdocsfile | sed -e 's|/[^/]*$$||'`; \ filename=`echo $$htdocsfile | sed -e 's|^.*/||'`; \ test -d $(DESTDIR)$(PREFIX)/$$dir || $(mkinstalldirs) $(DESTDIR)$(prefix)/$$dir ; \ test -f $(DESTDIR)$(PREFIX)/$$dir/$$filename || $(INSTALL) $$dir/$$filename $(DESTDIR)$(PREFIX)/$$dir; \ - done ; + done + +samples: samples-conf samples-htdocs + +install-data-local: + @echo Installing $(NAME) + @for x in mod db log log/xml_cdr bin scripts grammar ; do \ + $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \ + done + test -d $(DESTDIR)$(prefix)/conf || $(MAKE) samples-conf + test -d $(DESTDIR)$(prefix)/htdocs || $(MAKE) samples-htdocs .version: touch .version

1 0

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

18 Dec '07

Author: mikej Date: Tue Dec 18 15:34:19 2007 New Revision: 6876 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: avoid deref if NULL, var scope masking. 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 18 15:34:19 2007 @@ -1120,8 +1120,8 @@ } 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); + char *tls_bindurl = profile->tls_bindurl; + profile->tls_bindurl = switch_core_sprintf(profile->pool, "%s;%s", tls_bindurl, profile->tls_bind_params); } if (!profile->tls_cert_dir) { @@ -2346,17 +2346,45 @@ nua_handle_bind(nh, tech_pvt->sofia_private); tech_pvt->nh = nh; - if (switch_core_session_thread_launch(session) == SWITCH_STATUS_SUCCESS) { - const char *to_user = switch_str_nil(sip->sip_to->a_url->url_user); - const char *to_host = switch_str_nil(sip->sip_to->a_url->url_host); - const char *dialog_from_user = switch_str_nil(sip->sip_from->a_url->url_user); - const char *dialog_from_host = switch_str_nil(sip->sip_from->a_url->url_host); - const char *contact_user = switch_str_nil(sip->sip_contact->m_url->url_user); - const char *contact_host = switch_str_nil(sip->sip_contact->m_url->url_host); - const char *user_agent = switch_str_nil(sip->sip_user_agent->g_string); - const char *call_id = switch_str_nil(sip->sip_call_id->i_id); + if (sip && switch_core_session_thread_launch(session) == SWITCH_STATUS_SUCCESS) { + const char *dialog_from_user = "", *dialog_from_host = "", *to_user = "", *to_host = "", *contact_user = "", *contact_host = ""; + const char *user_agent = "", *call_id = ""; + url_t *from = NULL, *to = NULL, *contact = NULL; char *sql = NULL; + if (sip->sip_to) { + to = sip->sip_to->a_url; + } + if (sip->sip_from) { + from = sip->sip_from->a_url; + } + if (sip->sip_contact) { + contact = sip->sip_contact->m_url; + } + + if (sip->sip_user_agent) { + user_agent = switch_str_nil(sip->sip_user_agent->g_string); + } + + if (sip->sip_call_id) { + call_id = switch_str_nil(sip->sip_call_id->i_id); + } + + if (to) { + to_user = switch_str_nil(to->url_user); + to_host = switch_str_nil(to->url_host); + } + + if (from) { + dialog_from_user = switch_str_nil(from->url_user); + dialog_from_host = switch_str_nil(from->url_host); + } + + if (contact) { + contact_user = switch_str_nil(contact->url_user); + contact_host = switch_str_nil(contact->url_host); + } + sql = switch_mprintf( "insert into sip_dialogs values('%q','%q','%q','%q','%q','%q','%q','%q','%q','%q','%q')", call_id,

1 0

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

18 Dec '07

Author: brian Date: Tue Dec 18 14:15:08 2007 New Revision: 6875 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: remove extra paren 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 18 14:15:08 2007 @@ -457,7 +457,7 @@ if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", - (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : "")); + (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : ""); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "module_name", "%s", "mod_sofia");

1 0

[commit] r6874 - in freeswitch/trunk: conf/sip_profiles libs/sofia-sip/libsofia-sip-ua/tport src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: anthm Date: Tue Dec 18 14:12:45 2007 New Revision: 6874 Modified: freeswitch/trunk/conf/sip_profiles/default.xml freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.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 Log: update sofia Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Tue Dec 18 14:12:45 2007 @@ -42,6 +42,15 @@ <param name="inbound-codec-negotiation" value="generous"/>   + +  +  +  +  +  +  +  +    Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_sctp.c Tue Dec 18 14:12:45 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) 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 Tue Dec 18 14:12:45 2007 @@ -71,6 +71,7 @@ #define SOFIA_SIP_HEADER_PREFIX "sip_h_" #define SOFIA_SIP_HEADER_PREFIX_T "~sip_h_" #define SOFIA_DEFAULT_PORT "5060" +#define SOFIA_DEFAULT_TLS_PORT "5061" #include <sofia-sip/nua.h> #include <sofia-sip/sip_status.h> @@ -113,7 +114,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 { @@ -220,13 +222,18 @@ char *username; char *url; char *bindurl; + char *tls_url; + char *tls_bindurl; char *sipdomain; char *timer_name; char *hold_music; char *bind_params; + char *tls_bind_params; + char *tls_cert_dir; char *reg_domain; char *user_agent; int sip_port; + int tls_sip_port; char *codec_string; int running; int dtmf_duration; @@ -369,6 +376,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);\ @@ -469,7 +484,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, @@ -521,4 +536,14 @@ \ if(_session) break; \ } while(!_session) - + + +/* + * Transport handling helper functions + */ +sofia_transport_t sofia_glue_via2transport(const sip_via_t *via); +sofia_transport_t sofia_glue_url2transport(const url_t *url); + +const char *sofia_glue_transport2str(const sofia_transport_t tp); + +int sofia_glue_transport_has_tls(const sofia_transport_t tp); 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 18 14:12:45 2007 @@ -385,9 +385,14 @@ } 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_IF(tportlog,TPTAG_LOG(1)), 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(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)), + NTATAG_UDP_MTU(65536), + 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); @@ -451,11 +456,18 @@ gateway_loops = GATEWAY_SECONDS; if (switch_event_create(&s_event, SWITCH_EVENT_PUBLISH) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp"); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", + (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : "")); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "module_name", "%s", "mod_sofia"); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_name", "%s", profile->name); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_uri", "%s", profile->url); + + if (sofia_test_pflag(profile, PFLAG_TLS)) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "tls_port", "%d", profile->tls_sip_port); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_tls_uri", "%s", profile->tls_url); + } switch_event_fire(&s_event); } @@ -498,11 +510,18 @@ switch_mutex_unlock(profile->ireg_mutex); if (switch_event_create(&s_event, SWITCH_EVENT_UNPUBLISH) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp"); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "service", "_sip._udp,_sip._tcp,_sip._sctp%s", + (sofia_test_pflag(profile, PFLAG_TLS)) ? ",_sips._tcp" : ""); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "port", "%d", profile->sip_port); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "module_name", "%s", "mod_sofia"); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_name", "%s", profile->name); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_uri", "%s", profile->url); + + if (sofia_test_pflag(profile, PFLAG_TLS)) { + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "tls_port", "%d", profile->tls_sip_port); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile_tls_uri", "%s", profile->tls_url); + } switch_event_fire(&s_event); } @@ -1013,7 +1032,21 @@ } 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)) { + sofia_set_pflag(profile, 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); + } else if (!strcasecmp(var, "tls-cert-dir")) { + profile->tls_cert_dir = switch_core_strdup(profile->pool, val); + } } if (!profile->cng_pt) { @@ -1070,13 +1103,38 @@ profile->bindurl = switch_core_sprintf(profile->pool, "%s;%s", bindurl, profile->bind_params); } + /* + * handle TLS params #2 + */ + if (sofia_test_pflag(profile, PFLAG_TLS)) { + if (!profile->tls_sip_port) { + profile->tls_sip_port = atoi(SOFIA_DEFAULT_TLS_PORT); + } + + if (profile->extsipip) { + profile->tls_url = switch_core_sprintf(profile->pool, "sip:mod_sofia@%s:%d", profile->extsipip, profile->tls_sip_port); + 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_url = switch_core_sprintf(profile->pool, "sip:mod_sofia@%s:%d", profile->sipip, profile->tls_sip_port); + 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->tls_cert_dir) { + profile->tls_cert_dir = switch_core_sprintf(profile->pool, "%s/ssl", SWITCH_GLOBAL_dirs.conf_dir); + } + } } if (profile) { switch_xml_t aliases_tag, alias_tag; if ((gateways_tag = switch_xml_child(xprofile, "registrations"))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, - "The <registrations> syntax has been discontinued, please see the new syntax in the default configuration examples\n"); + "The <registrations> syntax has been discontinued, please see the new syntax in the default configuration examples\n"); } else if ((gateways_tag = switch_xml_child(xprofile, "gateways"))) { parse_gateways(profile, gateways_tag); } @@ -2083,12 +2141,25 @@ } if (sip->sip_to && sip->sip_to->a_url) { - const char *val; - char *transport = (my_addrinfo->ai_socktype == SOCK_STREAM) ? "tcp" : "udp"; - + const char *host, *user; + int port; + sofia_transport_t transport = sofia_glue_url2transport(sip->sip_contact->m_url); + url_set_chanvars(session, sip->sip_to->a_url, sip_to); - if ((val = switch_channel_get_variable(channel, "sip_to_uri"))) { - tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s;transport=%s", val, transport); + if (switch_channel_get_variable(channel, "sip_to_uri")) { + + host = switch_channel_get_variable(channel, "sip_to_host"); + user = switch_channel_get_variable(channel, "sip_to_user"); + + if (sip->sip_contact->m_url->url_port) { + port = atoi(sip->sip_contact->m_url->url_port); + } else { + port = sofia_glue_transport_has_tls(transport) ? profile->tls_sip_port : profile->sip_port; + } + + tech_pvt->to_uri = switch_core_session_sprintf(session, "sip:%s@%s:%d;transport=%s", + user, host, port, sofia_glue_transport2str(transport)); + if (profile->ndlb & PFLAG_NDLB_TO_IN_200_CONTACT) { if (strchr(tech_pvt->to_uri, '>')) { tech_pvt->reply_contact = tech_pvt->to_uri; @@ -2096,17 +2167,21 @@ tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s>", tech_pvt->to_uri); } } else { - if (strchr(profile->url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, transport); + const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; + + if (strchr(url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, transport); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); } } } else { - if (strchr(profile->url, '>')) { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", profile->url, transport); + const char *url = (sofia_glue_transport_has_tls(transport)) ? profile->tls_url : profile->url; + + if (strchr(url, '>')) { + tech_pvt->reply_contact = switch_core_session_sprintf(session, "%s;transport=%s", url, sofia_glue_transport2str(transport)); } else { - tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", profile->url, transport); + tech_pvt->reply_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", url, sofia_glue_transport2str(transport)); } } } 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 Tue Dec 18 14:12:45 2007 @@ -453,20 +453,139 @@ 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; +} + +sofia_transport_t sofia_glue_url2transport(const url_t *url) +{ + char *ptr = NULL; + int tls = 0; + + if(!url) + return SOFIA_TRANSPORT_UNKNOWN; + + if (url->url_scheme && !strcasecmp(url->url_scheme, "sips")) { + 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++; + } + + return (tls) ? SOFIA_TRANSPORT_TCP_TLS : SOFIA_TRANSPORT_UDP; +} + +sofia_transport_t sofia_glue_via2transport(const sip_via_t *via) +{ + char *ptr = NULL; + int tls = 0; + + if (!via || !via->v_protocol) + return SOFIA_TRANSPORT_UNKNOWN; + + if (!strncasecmp(via->v_protocol, "sips", 4)) { + tls++; + } + + if ((ptr = strrchr(via->v_protocol, '/'))) { + ptr++; + + 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; + } + } + + return SOFIA_TRANSPORT_UNKNOWN; +} + +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"; + } +} + +int sofia_glue_transport_has_tls(const sofia_transport_t tp) +{ + switch(tp) { + case SOFIA_TRANSPORT_TCP_TLS: + return 1; + + default: + return 0; + } +} + +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) { + if (switch_stristr("port=", stripped)) { new_uri = switch_core_session_sprintf(session, "%s%s%s", uri_only ? "" : "<", 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&transport=%s%s", uri_only ? "" : "<", 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;transport=%s%s", uri_only ? "" : "<", stripped, sofia_glue_transport2str(transport), uri_only ? "" : ">"); } } } else { @@ -543,8 +662,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"; @@ -553,7 +673,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); return SWITCH_STATUS_FALSE; } - + if ((d_url = sofia_glue_get_url_from_contact(tech_pvt->dest, 1))) { url = d_url; } else { @@ -562,16 +682,12 @@ url_str = url; - if (switch_strlen_zero(tech_pvt->invite_contact)) { - tech_pvt->invite_contact = tech_pvt->profile->url; - } - if (!switch_strlen_zero(tech_pvt->gateway_from_str)) { use_from_str = tech_pvt->gateway_from_str; } else { use_from_str = tech_pvt->from_str; } - + rpid_domain = switch_core_session_strdup(session, use_from_str); sofia_glue_get_url_from_contact(rpid_domain, 0); if ((rpid_domain = strchr(rpid_domain, '@'))) { @@ -586,21 +702,30 @@ } if (switch_stristr("port=tcp", url)) { - transport = "tcp"; + 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; } } } + if (switch_strlen_zero(tech_pvt->invite_contact)) { + if (sofia_glue_transport_has_tls(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); - 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, or did he just suggest it to make our lives miserable? */

1 0

[commit] r6873 - freeswitch/trunk/src
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: mikej Date: Tue Dec 18 13:31:38 2007 New Revision: 6873 Modified: freeswitch/trunk/src/switch_ivr.c Log: whoops Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Dec 18 13:31:38 2007 @@ -449,7 +449,7 @@ sendlen = read_codec->implementation->bytes_per_frame; memset(decoded, 255, sendlen); sendbuf = decoded; - status = SWITCH_STATUS_SUCCESS; + tstatus = SWITCH_STATUS_SUCCESS; } else { if (switch_test_flag(conninfo, SUF_NATIVE)) { tstatus = SWITCH_STATUS_NOOP;

1 0

[commit] r6872 - freeswitch/trunk/src
by Freeswitch SVN 18 Dec '07

18 Dec '07

Author: mikej Date: Tue Dec 18 13:30:04 2007 New Revision: 6872 Modified: freeswitch/trunk/src/switch_xml.cpp Log: check unlink return Modified: freeswitch/trunk/src/switch_xml.cpp ============================================================================== --- freeswitch/trunk/src/switch_xml.cpp (original) +++ freeswitch/trunk/src/switch_xml.cpp Tue Dec 18 13:30:04 2007 @@ -1700,7 +1700,9 @@ if (xml->free_path) { if (!switch_stristr("freeswitch.xml.fsxml", xml->free_path)) { - unlink(xml->free_path); + if (unlink(xml->free_path) != 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "failed to delete file [%s]\n", xml->free_path); + } } switch_safe_free(xml->free_path); }

1 0

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

18 Dec '07

Author: anthm Date: Tue Dec 18 13:27:56 2007 New Revision: 6871 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: tweak 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 18 13:27:56 2007 @@ -62,7 +62,7 @@ char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]) { - if (status == 481 && sip) { + if (status >= 300 && sip) { const char *call_id = sip->sip_call_id->i_id; char *sql; switch_core_hash_delete(profile->sub_hash, call_id);

1 0