- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5712 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: mikej Date: Wed Sep 19 11:05:55 2007 New Revision: 5712 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: merge patch from MODENDP-24, add to-domain param to gateway that overrides the proxy domain for the to header 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 Wed Sep 19 11:05:55 2007 @@ -500,7 +500,8 @@ *context = "default", *expire_seconds = "3600", *retry_seconds = "30", - *from_domain = ""; + *from_domain = "", + *to_domain = ""; gateway->pool = profile->pool; gateway->profile = profile; @@ -536,9 +537,15 @@ retry_seconds = val; } else if (!strcmp(var, "from-domain")) { from_domain = val; + } else if (!strcmp(var, "to-domain")) { + to_domain = val; } } + if (switch_strlen_zero(to_domain)) { + to_domain = proxy; + } + if (switch_strlen_zero(realm)) { realm = name; } @@ -586,12 +593,12 @@ gateway->register_contact = switch_core_sprintf(gateway->pool, "sip:%s@%s:%d", extension, profile->extsipip ? profile->extsipip : profile->sipip, profile->sip_port); - if (!strncasecmp(proxy, "sip:", 4)) { + if (!strncasecmp(to_domain, "sip:", 4)) { gateway->register_proxy = switch_core_strdup(gateway->pool, proxy); - gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy + 4); + gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, to_domain + 4); } else { gateway->register_proxy = switch_core_sprintf(gateway->pool, "sip:%s", proxy); - gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, proxy); + gateway->register_to = switch_core_sprintf(gateway->pool, "sip:%s@%s", username, to_domain); } gateway->expires_str = switch_core_strdup(gateway->pool, expire_seconds);

1 0

[commit] r5711 - freeswitch/trunk/build
by Freeswitch SVN 19 Sep '07

19 Sep '07

Author: mikej Date: Wed Sep 19 10:58:40 2007 New Revision: 5711 Modified: freeswitch/trunk/build/fixautomake.sh freeswitch/trunk/build/fixlibtool.sh Log: use newer versions Modified: freeswitch/trunk/build/fixautomake.sh ============================================================================== --- freeswitch/trunk/build/fixautomake.sh (original) +++ freeswitch/trunk/build/fixautomake.sh Wed Sep 19 10:58:40 2007 @@ -1,9 +1,9 @@ cd /tmp mkdir fix_automake cd fix_automake -wget http://mirrors.kernel.org/gnu/automake/automake-1.9.tar.gz -tar -zxvf automake-1.9.tar.gz -cd automake-1.9 +wget http://mirrors.kernel.org/gnu/automake/automake-1.10.tar.gz +tar -zxvf automake-1.10.tar.gz +cd automake-1.10 ./configure --prefix=/usr make make install Modified: freeswitch/trunk/build/fixlibtool.sh ============================================================================== --- freeswitch/trunk/build/fixlibtool.sh (original) +++ freeswitch/trunk/build/fixlibtool.sh Wed Sep 19 10:58:40 2007 @@ -1,9 +1,9 @@ cd /tmp mkdir fix_libtool cd fix_libtool -wget http://mirrors.kernel.org/gnu/libtool/libtool-1.5.22.tar.gz -tar -zxvf libtool-1.5.22.tar.gz -cd libtool-1.5.22 +wget http://mirrors.kernel.org/gnu/libtool/libtool-1.5.24.tar.gz +tar -zxvf libtool-1.5.24.tar.gz +cd libtool-1.5.24 if test "`uname -s`" = "Darwin"; then ./configure --prefix=/usr --program-prefix=g else

1 0

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

18 Sep '07

Author: anthm Date: Tue Sep 18 13:31:36 2007 New Revision: 5710 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_reg.c Log: add register-gateway variable to directory users to allow inbound reg to trigger an outbound one 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 Tue Sep 18 13:31:36 2007 @@ -942,9 +942,11 @@ "TRYING", "REGISTER", "REGED", + "UNREGISTER", "FAILED", "EXPIRED", - "NOREG" }; + "NOREG", + NULL}; struct cb_helper { sofia_profile_t *profile; @@ -1169,6 +1171,34 @@ } + if (!strcasecmp(argv[1], "unregister")) { + char *gname = argv[2]; + sofia_gateway_t *gateway_ptr; + + if (switch_strlen_zero(gname)) { + stream->write_function(stream, "No gateway name provided!\n"); + goto done; + } + + if (!strcasecmp(gname, "all")) { + for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { + gateway_ptr->retry = 0; + gateway_ptr->state = REG_STATE_UNREGISTER; + } + stream->write_function(stream, "+OK\n"); + } else if ((gateway_ptr = sofia_reg_find_gateway(gname))) { + gateway_ptr->retry = 0; + gateway_ptr->state = REG_STATE_UNREGISTER; + stream->write_function(stream, "+OK\n"); + sofia_reg_release_gateway(gateway_ptr); + } else { + stream->write_function(stream, "Invalid gateway!\n"); + } + + goto done; + } + + if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { int rsec = 3; int diff = (int) (time(NULL) - profile->started); 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 Sep 18 13:31:36 2007 @@ -174,6 +174,7 @@ REG_STATE_TRYING, REG_STATE_REGISTER, REG_STATE_REGED, + REG_STATE_UNREGISTER, REG_STATE_FAILED, REG_STATE_EXPIRED, REG_STATE_NOREG, @@ -432,7 +433,7 @@ 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); + const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime); void sofia_reg_handle_sip_r_challenge(int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]); 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 Sep 18 13:31:36 2007 @@ -87,7 +87,7 @@ 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, - (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL); + (char *) sip->sip_request->rq_method_name, tech_pvt->key, strlen(tech_pvt->key), network_ip, NULL, 0); } if (auth_res != AUTH_OK) { 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 Tue Sep 18 13:31:36 2007 @@ -70,6 +70,16 @@ gateway_ptr->expires = now + gateway_ptr->freq; gateway_ptr->state = REG_STATE_REGED; break; + + case REG_STATE_UNREGISTER: + nua_unregister(gateway_ptr->nh, + SIPTAG_FROM_STR(gateway_ptr->register_from), + SIPTAG_CONTACT_STR(gateway_ptr->register_contact), + SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), + NUTAG_REGISTRAR(gateway_ptr->register_proxy), + NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); + gateway_ptr->state = REG_STATE_NOREG; + break; case REG_STATE_UNREGED: if ((gateway_ptr->nh = nua_handle(gateway_ptr->profile->nua, NULL, NUTAG_URL(gateway_ptr->register_proxy), @@ -322,6 +332,7 @@ const char *rpid = "unknown"; const char *display = "\"user\""; char network_ip[80]; + char *register_gateway = NULL; int network_port; int cd = 0; @@ -390,25 +401,30 @@ 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)) == AUTH_STALE) { + if ((auth_res = sofia_reg_parse_auth(profile, authorization, sip->sip_request->rq_method_name, key, keylen, network_ip, v_event, exptime)) + == AUTH_STALE) { stale = 1; } - if (v_event && *v_event && (v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { - if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { - if (contact->m_url->url_params) { - 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); + if (v_event && *v_event) { + register_gateway = switch_event_get_header(*v_event, "register-gateway"); + + if ((v_contact_str = switch_event_get_header(*v_event, "force-contact"))) { + if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction")) { + if (contact->m_url->url_params) { + 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 { + snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); + } + cd = 1; } else { - snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); - } - cd = 1; - } else { - char *p; - switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); - for(p = contact_str; p && *p; p++) { - if (*p == '\'' || *p == '[' || *p == ']') { - *p = '"'; + char *p; + switch_copy_string(contact_str, v_contact_str, sizeof(contact_str)); + for(p = contact_str; p && *p; p++) { + if (*p == '\'' || *p == '[' || *p == ']') { + *p = '"'; + } } } } @@ -438,12 +454,11 @@ if (regtype != REG_REGISTER) { return 0; } - + if (exptime) { if (!sofia_reg_find_reg_url(profile, to_user, to_host, buf, sizeof(buf))) { sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','%q', '%q', %ld)", to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", rpid, (long) time(NULL) + (long) exptime * 2); - } else { sql = switch_mprintf @@ -716,7 +731,7 @@ } 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) + const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime) { int indexnum; const char *cur; @@ -829,9 +844,59 @@ for (param = switch_xml_child(xparams, "variable"); param; param = param->next) { const char *var = switch_xml_attr_soft(param, "name"); const char *val = switch_xml_attr_soft(param, "value"); - + sofia_gateway_t *gateway_ptr = NULL; + if (!switch_strlen_zero(var) && !switch_strlen_zero(val)) { switch_event_add_header(*v_event, SWITCH_STACK_BOTTOM, var, "%s", val); + + if (!strcasecmp(var, "register-gateway")) { + if (!strcasecmp(val, "all")) { + switch_xml_t gateways_tag, gateway_tag; + if ((gateways_tag = switch_xml_child(user, "gateways"))) { + for (gateway_tag = switch_xml_child(gateways_tag, "gateway"); gateway_tag; gateway_tag = gateway_tag->next) { + char *name = (char *) switch_xml_attr_soft(gateway_tag, "name"); + if (switch_strlen_zero(name)) { + name = "anonymous"; + } + + if ((gateway_ptr = sofia_reg_find_gateway(name))) { + gateway_ptr->retry = 0; + if (exptime) { + gateway_ptr->state = REG_STATE_UNREGED; + } else { + gateway_ptr->state = REG_STATE_UNREGISTER; + } + sofia_reg_release_gateway(gateway_ptr); + } + + } + } + } else { + int x, argc; + char *mydata, *argv[50]; + + mydata = strdup(val); + assert(mydata != NULL); + + argc = switch_separate_string(mydata, ',', argv, (sizeof(argv) / sizeof(argv[0]))); + + for (x = 0; x < argc; x++) { + if ((gateway_ptr = sofia_reg_find_gateway((char *)argv[x]))) { + gateway_ptr->retry = 0; + if (exptime) { + gateway_ptr->state = REG_STATE_UNREGED; + } else { + gateway_ptr->state = REG_STATE_UNREGISTER; + } + sofia_reg_release_gateway(gateway_ptr); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Gateway '%s' not found.\n", argv[x]); + } + } + + free(mydata); + } + } } } }

1 0

[commit] r5709 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 16 Sep '07

16 Sep '07

Author: trixter Date: Sun Sep 16 13:36:06 2007 New Revision: 5709 Added: freeswitch/trunk/scripts/contrib/trixter/call-progress.pl (contents, props changed) Log: perl script using event socket to monitor ring/answer/hangup events and issue commands when it gets them Added: freeswitch/trunk/scripts/contrib/trixter/call-progress.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/call-progress.pl Sun Sep 16 13:36:06 2007 @@ -0,0 +1,153 @@ +#!/usr/bin/perl +# -*- mode:cperl; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- +use FreeSWITCH::Client; +use POSIX ':signal_h'; # used for alarm to ensure we get heartbeats +use Data::Dumper; # used to print out myhash debug info + + +# configure these +my $password = "ClueCon"; # the password for event socket +my $host = "localhost"; # the hostname to connect to +my $port = 8021; # the port to connect to +my $timeout = 30; # seconds to expect a heartbeat event or reconnect +my $conntime = 30; # seconds to wait between connection attempts +my $CIDNAME = "its me"; # name to use when originating a call +my $CIDNUM = "1234567890"; # number to use when originating a call +my $TIMEOUT = 30; # timeout to wait for answer + +# array of the regexps for channels that match, useful if you dont want to do this for +# all calls on your switch +my @channels = ( + '^sofia\/mydomain.com\/\d+\(a)192.168.0.6$', + '^sofia/external/888(a)conference.freeswitch.org$', +); + +## +# dont touch these +## +my $fs; +my $lastheartbeat; +my $lastconnect; + + +sub watchedChannel($) { + my $channame = shift; + +print "Checking $channame\n"; + + + foreach $regexp (@channels) { + if($channame =~ /$regexp/) { + return 1; + } + } + return undef; +} + + +sub do_ring($) { + my $myhash = shift; + + print "Got RING for $myhash->{'channel-name'} - $myhash->{'unique-id'}\n"; + + # here we are going to just hang it up since its just a silly example + # but for variety lets wait 2 seconds before it dies + $fs->sendmsg({'command' => "api sched_hangup +2 $myhash->{'unique-id'}"}); +} + + +sub do_answer($) { + my $myhash = shift; + + print "Got ANSWER for $myhash->{'channel-name'}\n"; + + # here we are going to just hang it up since its just a silly example + $fs->sendmsg({'command' => "api killchan $myhash->{'unique-id'}"}); +} + + + +sub do_hangup($) { + my $myhash = shift; + + print "Got HANGUP for $myhash->{'channel-name'} $myhash->{'unique-id'}\n"; + + # hey it was a hangup, lets call someone now! + $cmd = "api originate sofia/mydomain.com/123\@192.168.0.6 &playback(/sounds/conf-enter.raw) XML default \"$CIDNAME\" \"$CIDNUM\""; + $fs->sendmsg({'command' => $cmd}); +} + + + +# this connects to the event socket +sub es_connect() { + if(! defined $lastconnect) { + $lastconnect = time - $conntime; + } + + if($lastconnect <= (time - $conntime)) { + $lastconnect = time; + print "Connecting to $host:$port\n"; + eval { + $fs = init FreeSWITCH::Client {-password => $password, -host => $host, -port => $port}; + if(defined $fs) { + $fs->sendmsg({'command' => 'event plain CHANNEL_STATE CHANNEL_ANSWER heartbeat CHANNEL_HANGUP all'}); + $lastheartbeat = time; + } + } or do { + print "Error connecting - waiting for retry\n"; + } + } + + } + + +sigaction SIGALRM, new POSIX::SigAction sub { + if ($lastheartbeat < (time - $timeout)) { + print "Did not receive a heartbeat in the specified timeout\n"; + if (defined $fs) { + $fs->disconnect(); + undef $fs; + } + es_connect(); + } + + # reset the alarm + alarm $timeout; +} or die "Error setting SIGALRM handler: $!\n"; + + + +es_connect(); +alarm $timeout; + +while (1) { + if(defined $fs) { + my $reply = $fs->readhash(undef); + if ($reply->{socketerror}) { + es_connect(); + } + + if ($reply->{body}) { + $myhash = $reply->{event}; + + if ($myhash->{'event-name'} eq "HEARTBEAT") { ## Deal with heartbeats + $lastheartbeat = time; + print "Got a heartbeat\n"; + + } elsif (watchedChannel($myhash->{'channel-name'})) { + if ($myhash->{'event-name'} eq "CHANNEL_ANSWER") { ## deal with answers + do_answer($myhash); + } elsif ($myhash->{'event-name'} eq "CHANNEL_STATE" && $myhash->{'channel-state'} eq "CS_RING") { + do_ring($myhash); + } elsif ($myhash->{'event-name'} eq "CHANNEL_HANGUP") { ## last thing done on a channel + do_hangup($myhash); + } else { ## Unknown event + print Dumper $myhash; + # print "$reply->{body}\n"; # print out what was sent, myhash is translated by Client.pm + } + } # end channel-name filter + } + } +} +

1 0

[commit] r5708 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 16 Sep '07

16 Sep '07

Author: trixter Date: Sun Sep 16 13:35:27 2007 New Revision: 5708 Added: freeswitch/trunk/scripts/contrib/trixter/README Log: index of the files in my contrib dir Added: freeswitch/trunk/scripts/contrib/trixter/README ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/README Sun Sep 16 13:35:27 2007 @@ -0,0 +1,102 @@ +These are examples written by Bret McDanel <trixter AT 0xdecafbad.com> +In general, web apps are written in PHP, event socket apps are written +in perl. The perl examples use FreeSWITCH::Client which is located in +svn root scripts/socket. + +Most of these examples are not useful in their current state, and require +some modification to make them useful. They are to provide implementation +references for various tasks. For example, xml-cdr will read the CDR records +from FreeSWITCH[tm] but does not process them because there is no way to +know how you will want them stored. You would be required to implement +whatever database system (mysql, flat file, CSV, etc) and store the records +yourself, but it shows how you can receive the CDR records and manipulate +them. + + +== LICENSE == +All of these scripts are licensed under a public domain license unless +otherwise stated within the individual files. What this means that I +still maintain the copyright but you are totally free to do whatever +with the programs whether commercial or FOSS. + + + +== FILE LIST == + +asyncsock.pl + Perl app utilizing EVENT SOCKET that will bind to a port and + is called via the dialplan 'socket' application. It will read + DTMF building a string of DTMF after an interdigit timeout or + total timeout. + + +callcredit.pl + Perl app utilizing EVENT SOCKET that pings a webserver for each + call in progress checking to see if credit still remains. Can + form the basis for a prepaid calling platform where instead of + reserving large amounts of credit, not allowing credit updates + mid-call, or allowing customers to go negative by placing multiple + concurrent calls. + + +calls.pl + Perl app utilizing EVENT SOCKET that relays new call and hangup + events to a webserver so that you can monitor in realtime calls + that are active on a given switch. All properties are relayed. + + +conf-dtmf.pl + Perl app that will read DTMF events from a conference and play + a sound file. Could be used as the basis for advanced custom + menus from within a conference. You need to bind the DTMF key + to 'event' within conference.conf.xml to be sent to event socket. + uses EVENT SOCKET + + +disa.js + Javascript app that will enable DISA functionality + with black/white lists, pins and other goodies + + +faxlib.jm + Javascript class that integrates faxing - DEPRECATED + this has litle use now that dptools has a fax detect and transfer + to a given extension app + + +call-progress.pl + PERL app utilizing EVENT SOCKET that will monitor RING/ANSWER/HANGUP + events and issue a command at that time. + + +makecombinedfsxml.pl + PERL app that makes freeswitch-combined.xml from a freeswitch.xml + + +regexptest.pl + PERL app that tests regexps in CLI mode + + +softphone.pl + PERL/TK app that functions like a softphone which lets you place + calls from port audio. Uses EVENT SOCKET + + +xml-cdr + PHP xml-cdr web app that receives CDR entries enabling a web based + CDR tracking facility in realtime + + +xml-curl + PHP xml-curl web app that will deliver configuration files, dialplans + and other goodies to FreeSWITCH[tm] + + +xml-rpc + PHP xml-rpc web app that will let you monitor calls, confs and execute + some commands to control conference members + + +vile + This is vile's stuff, he didn't have his own directory when they were + added and they are not yet moved into his repository

1 0

[commit] r5707 - in freeswitch/trunk/src: . mod/applications/mod_conference
by Freeswitch SVN 14 Sep '07

14 Sep '07

Author: anthm Date: Fri Sep 14 16:00:26 2007 New Revision: 5707 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_buffer.c freeswitch/trunk/src/switch_core_speech.c Log: fix small problem in speech stuff Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Sep 14 16:00:26 2007 @@ -2246,7 +2246,7 @@ if (!member->sh) { memset(&member->lsh, 0, sizeof(member->lsh)); if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice, - conference->rate, conference->interval, &flags, fnode->pool) != + conference->rate, conference->interval, &flags, switch_core_session_get_pool(member->session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); return SWITCH_STATUS_FALSE; Modified: freeswitch/trunk/src/switch_buffer.c ============================================================================== --- freeswitch/trunk/src/switch_buffer.c (original) +++ freeswitch/trunk/src/switch_buffer.c Fri Sep 14 16:00:26 2007 @@ -266,12 +266,13 @@ SWITCH_DECLARE(void) switch_buffer_destroy(switch_buffer_t **buffer) { - if (*buffer && switch_test_flag((*buffer), SWITCH_BUFFER_FLAG_DYNAMIC)) { - free((*buffer)->data); - free(*buffer); + if (buffer && *buffer) { + if ((switch_test_flag((*buffer), SWITCH_BUFFER_FLAG_DYNAMIC))) { + switch_safe_free((*buffer)->data); + free(*buffer); + } + *buffer = NULL; } - - *buffer = NULL; } /* For Emacs: Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Fri Sep 14 16:00:26 2007 @@ -122,5 +122,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_close(switch_speech_handle_t *sh, switch_speech_flag_t *flags) { - return sh->speech_interface->speech_close(sh, flags); + switch_status_t status = sh->speech_interface->speech_close(sh, flags); + + if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_FREE_POOL)) { + switch_core_destroy_memory_pool(&sh->memory_pool); + } + + return status; }

1 0

[commit] r5706 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '07

12 Sep '07

Author: anthm Date: Wed Sep 12 18:37:28 2007 New Revision: 5706 Modified: freeswitch/trunk/src/switch_core_session.c Log: fix backlash from profile clone change -without debugging line Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Sep 12 18:37:28 2007 @@ -305,7 +305,6 @@ if (session && (cloned_profile = switch_caller_profile_clone(session, peer_profile)) != 0) { switch_channel_set_originatee_caller_profile(channel, cloned_profile); } - printf("XXXXXXXXXXWTF [%s] [%s] [%s]\n", profile->uuid, peer_profile->uuid, cloned_profile->uuid); } }

1 0

[commit] r5705 - freeswitch/trunk/src
by Freeswitch SVN 12 Sep '07

12 Sep '07

Author: anthm Date: Wed Sep 12 18:36:26 2007 New Revision: 5705 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c Log: fix backlash from profile clone change Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Sep 12 18:36:26 2007 @@ -836,21 +836,24 @@ SWITCH_DECLARE(void) switch_channel_set_caller_profile(switch_channel_t *channel, switch_caller_profile_t *caller_profile) { + char *uuid = NULL; assert(channel != NULL); assert(channel->session != NULL); switch_mutex_lock(channel->profile_mutex); assert(caller_profile != NULL); - - if (!caller_profile->uuid) { - caller_profile->uuid = switch_core_session_strdup(channel->session, switch_core_session_get_uuid(channel->session)); + + uuid = switch_core_session_get_uuid(channel->session); + + if (!caller_profile->uuid || strcasecmp(caller_profile->uuid, uuid)) { + caller_profile->uuid = switch_core_session_strdup(channel->session, uuid); } - if (!caller_profile->chan_name) { + if (!caller_profile->chan_name || strcasecmp(caller_profile->chan_name, channel->name)) { caller_profile->chan_name = switch_core_session_strdup(channel->session, channel->name); } if (!caller_profile->context) { - caller_profile->chan_name = switch_core_session_strdup(channel->session, "default"); + caller_profile->context = switch_core_session_strdup(channel->session, "default"); } if (!channel->caller_profile) { Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Sep 12 18:36:26 2007 @@ -300,11 +300,12 @@ switch_channel_set_originator_caller_profile(peer_channel, cloned_profile); } } - + if (peer_profile) { if (session && (cloned_profile = switch_caller_profile_clone(session, peer_profile)) != 0) { switch_channel_set_originatee_caller_profile(channel, cloned_profile); } + printf("XXXXXXXXXXWTF [%s] [%s] [%s]\n", profile->uuid, peer_profile->uuid, cloned_profile->uuid); } }

1 0

[commit] r5704 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: tport url
by Freeswitch SVN 12 Sep '07

12 Sep '07

Author: mikej Date: Tue Sep 11 20:10:39 2007 New Revision: 5704 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c Log: fix sofia windows build. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tcp.c Tue Sep 11 20:10:39 2007 @@ -313,7 +313,7 @@ if (i + self->tp_ping >= 4) tport_tcp_pong(self); else - self->tp_ping += i; + self->tp_ping += (unsigned short)i; if (i == iovec->siv_len && veclen == 1) { SU_DEBUG_7(("%s(%p): received %u bytes of keepalive\n", Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/url.c Tue Sep 11 20:10:39 2007 @@ -801,8 +801,8 @@ if (s && !url_canonize(s, s, SIZE_MAX, /* Allow all URI characters but ? */ /* Allow unescaped /;?@, - but do not convert */ - SYN33('/') | SYN33(';') | SYN33('=') | SYN33('@') | - SYN33(','), + (unsigned)(SYN33('/') | SYN33(';') | SYN33('=') | SYN33('@') | + SYN33(',')), /* Convert escaped :&+$ to unescaped */ ":&+$")) return -1; @@ -811,7 +811,7 @@ if (s && !url_canonize(s, s, SIZE_MAX, /* Allow all URI characters but ? */ /* Allow unescaped ;=@, - but do not convert */ - SYN33(';') | SYN33('=') | SYN33('@') | SYN33(','), + (unsigned)(SYN33(';') | SYN33('=') | SYN33('@') | SYN33(',')), /* Convert escaped /:&+$ to unescaped */ "/:&+$")) return -1;

1 0

[commit] r5703 - freeswitch/trunk
by Freeswitch SVN 11 Sep '07

11 Sep '07

Author: mikej Date: Tue Sep 11 19:50:29 2007 New Revision: 5703 Modified: freeswitch/trunk/Freeswitch.sln Log: add mod_spidermonkey_socket to windows solution (MODLANG-21) Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Tue Sep 11 19:50:29 2007 @@ -638,6 +638,14 @@ {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" + ProjectSection(ProjectDependencies) = postProject + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -1200,6 +1208,12 @@ {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Release|Win32.ActiveCfg = Release|Win32 {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Release|Win32.Build.0 = Release|Win32 {E7116F50-2B10-472F-92BD-C8667AA9C1AE}.Release|x64.ActiveCfg = Release|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.ActiveCfg = Debug|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|Win32.Build.0 = Debug|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Debug|x64.ActiveCfg = Debug|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.ActiveCfg = Release|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Release|Win32.Build.0 = Release|Win32 + {028C7278-05D7-4E18-82FE-BE231B844F41}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1279,6 +1293,7 @@ {8F992C49-6C51-412F-B2A3-34EAB708EB65} = {0C808854-54D1-4230-BFF5-77B5FD905000} {D6C82F86-2B05-4A7F-8CC6-D2592E66FBB9} = {0C808854-54D1-4230-BFF5-77B5FD905000} {0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {028C7278-05D7-4E18-82FE-BE231B844F41} = {0C808854-54D1-4230-BFF5-77B5FD905000} {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} {E7116F50-2B10-472F-92BD-C8667AA9C1AE} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} {1C453396-D912-4213-89FD-9B489162B7B5} = {A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}

1 0