April 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12882 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 02 Apr '09

02 Apr '09

Author: rupa Date: Thu Apr 2 07:32:18 2009 New Revision: 12882 Log: set channel vars for rate, carrier, and codec for each route Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Apr 2 07:32:18 2009 @@ -1070,8 +1070,15 @@ } if (lcr_do_lookup(&routes) == SWITCH_STATUS_SUCCESS) { for (cur_route = routes.head; cur_route; cur_route = cur_route->next) { - switch_snprintf(vbuf, sizeof(vbuf), "lcr_route_%d", cnt++); + switch_snprintf(vbuf, sizeof(vbuf), "lcr_route_%d", cnt); switch_channel_set_variable(channel, vbuf, cur_route->dialstring); + switch_snprintf(vbuf, sizeof(vbuf), "lcr_rate_%d", cnt); + switch_channel_set_variable(channel, vbuf, cur_route->rate_str); + switch_snprintf(vbuf, sizeof(vbuf), "lcr_carrier_%d", cnt); + switch_channel_set_variable(channel, vbuf, cur_route->carrier_name); + switch_snprintf(vbuf, sizeof(vbuf), "lcr_codec_%d", cnt); + switch_channel_set_variable(channel, vbuf, cur_route->codec); + cnt++; switch_snprintf(rbp, rbl, "%s|", cur_route->dialstring); last_delim = end_of_p(rbp); l = strlen(cur_route->dialstring) + 1;

1 0

[commit] r12881 - in freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket: . Commands General SipEvents
by FreeSWITCH SVN 02 Apr '09

02 Apr '09

Author: verifier Date: Thu Apr 2 05:08:41 2009 New Revision: 12881 Log: Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallLegVariable.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallVariable.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaUnregister.cs Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.pfx freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/SofiaSipAddress.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaExpire.cs Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs Thu Apr 2 05:08:41 2009 @@ -13,7 +13,7 @@ public override string Command { - get { return "hold"; } + get { return "uuid_hold"; } } public override string Arguments Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs Thu Apr 2 05:08:41 2009 @@ -22,7 +22,7 @@ { private SofiaSipAddress _caller; private Address _destination; - private readonly IList<ChannelVariable> _variables = new List<ChannelVariable>(); + private readonly IList<CallVariable> _variables = new List<CallVariable>(); private string _callerIdName; private string _callerIdNumber; private bool _varsAdded; @@ -49,7 +49,7 @@ set { _destination = value; } } - public IList<ChannelVariable> Variables + public IList<CallVariable> Variables { get { return _variables; } } @@ -77,22 +77,35 @@ { if (!_varsAdded) { - _variables.Add(new ChannelVariable("origination_caller_id_name", CallerIdName ?? _caller.Extension)); + string name = CallerIdName ?? _caller.Extension; + _variables.Add(new CallVariable("origination_caller_id_name", "'" + name + "'")); if (!string.IsNullOrEmpty(_callerIdNumber)) - _variables.Add(new ChannelVariable("origination_caller_id_number", _callerIdNumber)); + _variables.Add(new CallVariable("origination_caller_id_number", _callerIdNumber)); _varsAdded = true; if (_autoAnswer) - _variables.Add(new ChannelVariable("sip_auto_answer", "true")); + { + _variables.Add(new CallLegVariable("sip_invite_params", "intercom=true")); + _variables.Add(new CallLegVariable("sip_h_Call-Info", "<sip:$${domain}>;answer-after=0")); + _variables.Add(new CallLegVariable("sip_auto_answer", "true")); + } } string variables = string.Empty; - foreach (ChannelVariable var in _variables) - variables += var + ","; + string legVariables = string.Empty; + foreach (CallVariable var in _variables) + { + if (var is CallLegVariable) + legVariables += var + ","; + else + variables += var + ","; + } if (variables.Length > 0) variables = "{" + variables.Remove(variables.Length - 1, 1) + "}"; + if (legVariables.Length > 0) + legVariables = "[" + legVariables.Remove(legVariables.Length - 1, 1) + "]"; - return variables + Caller + " " + Destination; + return variables + legVariables + Caller + " " + Destination; } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs Thu Apr 2 05:08:41 2009 @@ -73,8 +73,8 @@ public void Start(string hostname) { _socket.MessageReceived += OnMessage; - _socket.Connect(hostname); _socket.DataReceived += OnData; + _socket.Connect(hostname); } private void OnData(string data) Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs Thu Apr 2 05:08:41 2009 @@ -141,18 +141,22 @@ _text.CopyTo(i, chars, 0, plainEvent.ContentLength); plainEvent.Body = new string(chars); - // check for errors. - int pos = plainEvent.Body.IndexOf("\n\n"); - if (pos < plainEvent.Body.Length - 2) + // api/response is buggy for originate, no \n\n are appended at the end. + if (plainEvent.ContentType != "api/response") { - Console.WriteLine("Invalid event"); - Console.WriteLine("Header"); - Console.WriteLine(headers); - Console.WriteLine("Body"); - Console.WriteLine(plainEvent.Body); - Console.WriteLine("=========================== EVERYTHING in _text =============================="); - Console.WriteLine(_text); - throw new InvalidDataException("Invalid event: " + _text); + // check for errors. + int pos = plainEvent.Body.IndexOf("\n\n"); + if (pos < plainEvent.Body.Length - 2) + { + Console.WriteLine("Invalid event"); + Console.WriteLine("Header"); + Console.WriteLine(headers); + Console.WriteLine("Body"); + Console.WriteLine(plainEvent.Body); + Console.WriteLine("=========================== EVERYTHING unparsed =============================="); + Console.WriteLine(_text); + throw new InvalidDataException("Invalid event: " + _text); + } } if (plainEvent.Body.Length < plainEvent.ContentLength) Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs Thu Apr 2 05:08:41 2009 @@ -198,12 +198,16 @@ } catch (InvalidDataException err) { - LogWriter(LogPrio.Warning, "Failed to parse event message (" + err.Message + "): " + Environment.NewLine + _parser.Text); + LogWriter(LogPrio.Warning, + "Failed to parse event message." + Environment.NewLine + "Exception: " + err + + Environment.NewLine + _parser.Text); HandleDisconnect(); } catch (ArgumentException err) { - LogWriter(LogPrio.Warning, "Failed to parse event message ("+err.Message+"): " + Environment.NewLine + _parser.Text); + LogWriter(LogPrio.Warning, + "Failed to parse event message." + Environment.NewLine + "Exception: " + err + + Environment.NewLine + _parser.Text); HandleDisconnect(); } } @@ -260,10 +264,10 @@ try { PlainEventMsg msg = _parser.ParseOne(); - LogWriter(LogPrio.Trace, "MessageType: " + msg.ContentType); while (msg != null) { - switch (msg.ContentType) + LogWriter(LogPrio.Trace, "MessageType: " + msg.ContentType); + switch (msg.ContentType) { case "auth/request": { Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.pfx ============================================================================== Binary files. No diff available. Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj Thu Apr 2 05:08:41 2009 @@ -70,6 +70,7 @@ <Compile Include="Commands\SleepCmd.cs" /> <Compile Include="EventManager.cs" /> <Compile Include="ChannelEvents\EventDtmfStatus.cs" /> + <Compile Include="General\CallVariable.cs" /> <Compile Include="Ivr\DtmfEventArgs.cs" /> <Compile Include="Ivr\IvrInterface.cs" /> <Compile Include="Ivr\IvrQueue.cs" /> @@ -90,7 +91,7 @@ <Compile Include="Events\EventHeartbeat.cs" /> <Compile Include="Events\EventReSchedule.cs" /> <Compile Include="General\Address.cs" /> - <Compile Include="General\ChannelVariable.cs" /> + <Compile Include="General\CallLegVariable.cs" /> <Compile Include="General\SipAddress.cs" /> <Compile Include="General\SofiaSipAddress.cs" /> <Compile Include="PartyInfo.cs" /> @@ -103,6 +104,7 @@ <Compile Include="SipEvents\EventPresenceProbe.cs" /> <Compile Include="SipEvents\EventRoster.cs" /> <Compile Include="Events\EventMessageWaiting.cs" /> + <Compile Include="SipEvents\EventSofiaUnregister.cs" /> <Compile Include="SipEvents\SipEvent.cs" /> <Compile Include="SipEvents\EventPresence.cs" /> <Compile Include="SipEvents\EventSofiaExpire.cs" /> Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallLegVariable.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallLegVariable.cs Thu Apr 2 05:08:41 2009 @@ -0,0 +1,22 @@ +namespace FreeSwitch.EventSocket.General +{ + /// <summary> + /// Variable stored only for a specific leg. + /// </summary> + /// <remarks> + /// Channel variables are used in FreeSWITCH to store information + /// that can be used by JavaScript programs. + /// </remarks> + public class CallLegVariable : CallVariable + { + /// <summary> + /// Initializes a new instance of the <see cref="CallLegVariable"/> class. + /// </summary> + /// <param name="name">The name.</param> + /// <param name="value">The value.</param> + public CallLegVariable(string name, string value) : base(name, value) + { + } + + } +} Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallVariable.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallVariable.cs Thu Apr 2 05:08:41 2009 @@ -0,0 +1,41 @@ +namespace FreeSwitch.EventSocket.General +{ + /// <summary> + /// Variable that applies to both legs in a call. + /// </summary> + /// <remarks> + /// Variables can be access from FreeSWITCH with the name + /// "variable_[name]" + /// </remarks> + public class CallVariable + { + private readonly string _name; + private readonly string _value; + + /// <summary> + /// Initializes a new instance of the <see cref="CallVariable"/> class. + /// </summary> + /// <param name="name">Name of variable.</param> + /// <param name="value">Value.</param> + public CallVariable(string name, string value) + { + _name = name; + _value = value; + } + + public string Name + { + get { return _name; } + } + + public string Value + { + get { return _value; } + } + + public override string ToString() + { + return _name + "=" + _value; + } + } +} Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/SofiaSipAddress.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/SofiaSipAddress.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/General/SofiaSipAddress.cs Thu Apr 2 05:08:41 2009 @@ -1,44 +1,46 @@ namespace FreeSwitch.EventSocket.General { + /// <summary> + /// Destination as a FreeSWITCH Sofia sip address. + /// </summary> public class SofiaSipAddress : Address { - private readonly string _domain; + private readonly string _profileName; - public SofiaSipAddress(string domain, string userName) + /// <summary> + /// Initializes a new instance of the <see cref="SofiaSipAddress"/> class. + /// </summary> + /// <param name="profileName">Profile (context) name.</param> + /// <param name="userName">User name (and if needed, IP address / domain name).</param> + public SofiaSipAddress(string profileName, string userName) { Extension = userName; - _domain = domain; + _profileName = profileName; } + /// <summary> + /// Initializes a new instance of the <see cref="SofiaSipAddress"/> class. + /// </summary> + /// <param name="address">Another address.</param> public SofiaSipAddress(SipAddress address) { - _domain = address.Domain; + _profileName = address.Domain; Extension = address.Extension; } public override string ToString() { - return "sofia/mydomain.com/" + Extension + "%" + _domain; + return "sofia/" + _profileName + "/" + Extension; } public static SofiaSipAddress Parse(string fullAddress) { string[] parts = fullAddress.Split('@'); if (parts.Length == 2) - { return new SofiaSipAddress(parts[1], parts[0]); - } - else - { - parts = fullAddress.Split('/'); - if (parts.Length == 3) - { - return new SofiaSipAddress(parts[1], parts[2]); - } - } - return null; - + parts = fullAddress.Split('/'); + return parts.Length == 3 ? new SofiaSipAddress(parts[1], parts[2]) : null; } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs Thu Apr 2 05:08:41 2009 @@ -95,14 +95,8 @@ Caller = new PartyInfo(); return Caller.Parse(name.Substring(7), value); } - else - { - if (base.ParseCommand(name, value)) - return true; - else - return res; - } - + + return base.ParseCommand(name, value) || res; } return true; } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaExpire.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaExpire.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaExpire.cs Thu Apr 2 05:08:41 2009 @@ -1,11 +1,15 @@ +using System; + namespace FreeSwitch.EventSocket { public class EventSofiaExpire : EventPresence { + private static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1); private string _profileName; private string _userName; private string _domain; private string _userAgent; + private DateTime _expires; public string ProfileName { @@ -31,6 +35,12 @@ set { _userAgent = value; } } + public DateTime Expires + { + get { return _expires; } + set { _expires = value; } + } + /* switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[6]); switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[1]); @@ -50,6 +60,11 @@ case "host": _domain = value; break; + case "expires": + int seconds; + if (int.TryParse(value, out seconds)) + _expires = UnixEpoch.AddSeconds(seconds); + break; case "user-agent": _userAgent = value; break; Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaUnregister.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaUnregister.cs Thu Apr 2 05:08:41 2009 @@ -0,0 +1,87 @@ +namespace FreeSwitch.EventSocket.SipEvents +{ + public class EventSofiaUnregister : EventBase +{ + private string _domain; + private string _profileName; + private string _user; + private string _contact; + private string _callId; + private int _expires; + + public string ProfileName + { + get { return _profileName; } + set { _profileName = value; } + } + + public string UserName + { + get { return _user; } + set { _user = value; } + } + + public string Domain + { + get { return _domain; } + set { _domain = value; } + } + + public string Contact + { + get { return _contact; } + set { _contact = value; } + } + + public string CallId + { + get { return _callId; } + set { _callId = value; } + } + + public int Expires + { + get { return _expires; } + set { _expires = value; } + } + + /* + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host); + switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid); + */ + public override bool ParseCommand(string name, string value) + { + switch (name) + { + case "profile-name": + _profileName = value; + break; + case "from-user": + _user = value; + break; + case "from-host": + _domain = value; + break; + case "contact": + _contact = value; + break; + case "call-id": + _callId = value; + break; + case "expires": + int.TryParse(value, out _expires); + break; + default: + return base.ParseCommand(name, value); + } + return true; + } + + public override string ToString() + { + return "SofiaUnregister(" + _user + "@" + _domain + ", " + _expires + ")." + base.ToString(); + } + } +}

1 0

[commit] r12880 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: brian Date: Wed Apr 1 18:38:04 2009 New Revision: 12880 Log: This is way more bettah! /b Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Apr 1 18:38:04 2009 @@ -74,14 +74,26 @@ static char limit_sql[] = "CREATE TABLE limit_data (\n" - " hostname VARCHAR(255),\n" " realm VARCHAR(255),\n" " id VARCHAR(255),\n" " uuid VARCHAR(255)\n" ");\n"; + " hostname VARCHAR(255),\n" + " realm VARCHAR(255),\n" + " id VARCHAR(255),\n" + " uuid VARCHAR(255)\n" + ");\n"; static char db_sql[] = "CREATE TABLE db_data (\n" - " hostname VARCHAR(255),\n" " realm VARCHAR(255),\n" " data_key VARCHAR(255),\n" " data VARCHAR(255)\n" ");\n"; + " hostname VARCHAR(255),\n" + " realm VARCHAR(255),\n" + " data_key VARCHAR(255),\n" + " data VARCHAR(255)\n" + ");\n"; static char group_sql[] = - "CREATE TABLE group_data (\n" " hostname VARCHAR(255),\n" " groupname VARCHAR(255),\n" " url VARCHAR(255)\n" ");\n"; + "CREATE TABLE group_data (\n" + " hostname VARCHAR(255),\n" + " groupname VARCHAR(255),\n" + " url VARCHAR(255)\n" + ");\n"; static switch_status_t limit_execute_sql(char *sql, switch_mutex_t *mutex) {

1 0

[commit] r12879 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: mrene Date: Wed Apr 1 18:28:29 2009 New Revision: 12879 Log: Attempt to fix limit counter bug Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Wed Apr 1 18:28:29 2009 @@ -315,7 +315,7 @@ switch_channel_state_t state = switch_channel_get_state(channel); char *sql = NULL; - if (state == CS_HANGUP || state == CS_ROUTING) { + if (state >= CS_HANGUP || state == CS_ROUTING) { sql = switch_mprintf("delete from limit_data where uuid='%q';", switch_core_session_get_uuid(session)); limit_execute_sql(sql, globals.mutex); @@ -334,7 +334,7 @@ limit_hash_private_t *pvt = switch_channel_get_private(channel, "limit_hash"); /* The call is either hung up, or is going back into the dialplan, decrement appropriate couters */ - if (state == CS_HANGUP || state == CS_ROUTING) { + if (state >= CS_HANGUP || state == CS_ROUTING) { switch_hash_index_t *hi; switch_mutex_lock(globals.limit_hash_mutex);

1 0

[commit] r12878 - in freeswitch/trunk: conf/autoload_configs src/mod/endpoints/mod_opal
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: robertj Date: Wed Apr 1 18:10:52 2009 New Revision: 12878 Log: Added gatekeeper support. Modified: freeswitch/trunk/conf/autoload_configs/opal.conf.xml freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/conf/autoload_configs/opal.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/opal.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/opal.conf.xml Wed Apr 1 18:10:52 2009 @@ -4,6 +4,9 @@ <param name="context" value="default"/> <param name="dialplan" value="XML"/> <param name="codec-prefs" value="PCMU"/> + <param name="gk-address" value=""/>  + <param name="gk-identifer" value=""/>  + <param name="gk-interface" value=""/>  </settings> <listeners> <listener name="default"> Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp Wed Apr 1 18:10:52 2009 @@ -25,6 +25,7 @@ #include "mod_opal.h" #include <opal/patch.h> #include <h323/h323pdu.h> +#include <h323/gkclient.h> SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_codec_string, mod_opal_globals.codec_string); SWITCH_DECLARE_GLOBAL_STRING_FUNC(set_global_context, mod_opal_globals.context); @@ -364,6 +365,18 @@ } } + if (!m_gkAddress.IsEmpty()) { + if (m_h323ep->UseGatekeeper(m_gkAddress, m_gkIdentifer, m_gkInterface)) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Started gatekeeper: %s\n", + (const char *)m_h323ep->GetGatekeeper()->GetName()); + else + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Could not start gatekeeper: addr=\"%s\", id=\"%s\", if=\"%s\"\n", + (const char *)m_gkAddress, + (const char *)m_gkIdentifer, + (const char *)m_gkInterface); + } + return TRUE; } @@ -391,39 +404,44 @@ if (xml == NULL) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); return SWITCH_STATUS_FALSE; - } else { - switch_xml_t xmlSettings = switch_xml_child(cfg, "settings"); - if (xmlSettings) { - for (switch_xml_t xmlParam = switch_xml_child(xmlSettings, "param"); xmlParam != NULL; xmlParam = xmlParam->next) { - const char *var = switch_xml_attr_soft(xmlParam, "name"); - const char *val = switch_xml_attr_soft(xmlParam, "value"); + } - if (!strcasecmp(var, "trace-level")) { - int level = atoi(val); - if (level > 0) { - mod_opal_globals.trace_level = level; - } - } else if (!strcasecmp(var, "context")) { - set_global_context(val); - } else if (!strcasecmp(var, "dialplan")) { - set_global_dialplan(val); - } else if (!strcasecmp(var, "codec-prefs")) { - set_global_codec_string(val); - } else if (!strcasecmp(var, "jitter-size")) { - char * next; - unsigned minJitter = strtoul(val, &next, 10); - if (minJitter >= 10) { - unsigned maxJitter = minJitter; - if (*next == ',') - maxJitter = atoi(next+1); - SetAudioJitterDelay(minJitter, maxJitter); // In milliseconds - } + switch_xml_t xmlSettings = switch_xml_child(cfg, "settings"); + if (xmlSettings) { + for (switch_xml_t xmlParam = switch_xml_child(xmlSettings, "param"); xmlParam != NULL; xmlParam = xmlParam->next) { + const char *var = switch_xml_attr_soft(xmlParam, "name"); + const char *val = switch_xml_attr_soft(xmlParam, "value"); + + if (!strcasecmp(var, "trace-level")) { + int level = atoi(val); + if (level > 0) { + mod_opal_globals.trace_level = level; } + } else if (!strcasecmp(var, "context")) { + set_global_context(val); + } else if (!strcasecmp(var, "dialplan")) { + set_global_dialplan(val); + } else if (!strcasecmp(var, "codec-prefs")) { + set_global_codec_string(val); + } else if (!strcasecmp(var, "jitter-size")) { + char * next; + unsigned minJitter = strtoul(val, &next, 10); + if (minJitter >= 10) { + unsigned maxJitter = minJitter; + if (*next == ',') + maxJitter = atoi(next+1); + SetAudioJitterDelay(minJitter, maxJitter); // In milliseconds + } + } else if (!strcasecmp(var, "gk-address")) { + m_gkAddress = val; + } else if (!strcasecmp(var, "gk-identifer")) { + m_gkIdentifer = val; + } else if (!strcasecmp(var, "gk-interface")) { + m_gkInterface = val; } } } - switch_xml_t xmlListeners = switch_xml_child(cfg, "listeners"); if (xmlListeners != NULL) { for (switch_xml_t xmlListener = switch_xml_child(xmlListeners, "listener"); xmlListener != NULL; xmlListener = xmlListener->next) { Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Wed Apr 1 18:10:52 2009 @@ -111,7 +111,11 @@ H323EndPoint *m_h323ep; IAX2EndPoint *m_iaxep; - FSEndPoint *m_fsep; + FSEndPoint *m_fsep; + + PString m_gkAddress; + PString m_gkIdentifer; + PString m_gkInterface; list < FSListener > m_listeners; };

1 0

[commit] r12877 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: rupa Date: Wed Apr 1 16:27:31 2009 New Revision: 12877 Log: use switch_goto_status (neato) Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 1 16:27:31 2009 @@ -141,6 +141,7 @@ SWITCH_STANDARD_API(memcache_function) { + switch_status_t status; char *argv[5] = { 0 }; int argc; char *subcmd = NULL; @@ -301,22 +302,21 @@ goto usage; } } + switch_goto_status(SWITCH_STATUS_SUCCESS, done); - if (memcached) { - memcached_quit(memcached); - memcached_free(memcached); - } - switch_safe_free(mydata); - switch_safe_free(stat); - return SWITCH_STATUS_SUCCESS; usage: + stream->write_function(stream, "-ERR\n%s\n", SYNTAX); + switch_goto_status(SWITCH_STATUS_SUCCESS, done); + +done: if (memcached) { memcached_quit(memcached); memcached_free(memcached); } switch_safe_free(mydata); - stream->write_function(stream, "-ERR\n%s\n", SYNTAX); - return SWITCH_STATUS_SUCCESS; + switch_safe_free(stat); + + return status; } /* Macro expands to: switch_status_t mod_memcache_load(switch_loadable_module_interface_t **module_interface, switch_memory_pool_t *pool) */

1 0

[commit] r12876 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: rupa Date: Wed Apr 1 15:56:06 2009 New Revision: 12876 Log: document get in syntax Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 1 15:56:06 2009 @@ -45,7 +45,7 @@ SWITCH_MODULE_DEFINITION(mod_memcache, mod_memcache_load, mod_memcache_shutdown, NULL); static char *SYNTAX = "memcache <set|replace|add> <key> <value> [expiration [flags]]\n" - "memcache <getflags> <key>\n" + "memcache <get|getflags> <key>\n" "memcache <delete> <key>\n" "memcache <increment|decrement> <key> [offset]\n" "memcache <flush>\n"

1 0

[commit] r12875 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: rupa Date: Wed Apr 1 15:37:13 2009 New Revision: 12875 Log: small stress script Added: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache_stress.rb (contents, props changed) Added: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache_stress.rb ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache_stress.rb Wed Apr 1 15:37:13 2009 @@ -0,0 +1,28 @@ +#! /usr/bin/ruby + +#require "ESL" +require "../../../../libs/esl/ruby/ESL" +tries=10000 + +con = ESL::ESLconnection.new("localhost", "8021", "ClueCon") +e = con.sendRecv("api load mod_memcache") +puts e.getBody() +e = con.sendRecv("api reload mod_memcache") +puts e.getBody() +puts "Calling various memcache apis #{tries} times" +tries.times do |try| + if (try % 100 == 0) then + puts try + end + e = con.sendRecv("api memcache add foo a#{try}") + e = con.sendRecv("api memcache set foo s#{try}") + e = con.sendRecv("api memcache replace foo r#{try}") + e = con.sendRecv("api memcache get foo #{try}") + e = con.sendRecv("api memcache increment foo") + e = con.sendRecv("api memcache decrement foo") + e = con.sendRecv("api memcache delete foo") +end + +e = con.sendRecv("api memcache flush") +e = con.sendRecv("api memcache status verbose") +puts e.getBody()

1 0

[commit] r12874 - freeswitch/trunk/src/mod/applications/mod_memcache
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: rupa Date: Wed Apr 1 15:36:47 2009 New Revision: 12874 Log: refactor config loading. Fix small memory leak. Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Modified: freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c (original) +++ freeswitch/trunk/src/mod/applications/mod_memcache/mod_memcache.c Wed Apr 1 15:36:47 2009 @@ -58,6 +58,7 @@ static switch_status_t config_callback_memcached(switch_xml_config_item_t *data, switch_config_callback_type_t callback_type, switch_bool_t changed) { + switch_status_t status = SWITCH_STATUS_SUCCESS; memcached_server_st *memcached_server = NULL; memcached_st *newmemcached = NULL; memcached_st *oldmemcached = NULL; @@ -73,7 +74,7 @@ memcached_server = memcached_servers_parse(memcached_str); if (!memcached_server) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to initialize memcached data structure (server_list).\n"); - goto error; + switch_goto_status(SWITCH_STATUS_GENERR, end); } if ((servercount = memcached_server_list_count(memcached_server)) == 0) { @@ -86,12 +87,12 @@ newmemcached = memcached_create(NULL); if (!newmemcached) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Unable to initialize memcached data structure (memcached_st).\n"); - goto error; + switch_goto_status(SWITCH_STATUS_GENERR, end); } rc = memcached_server_push(newmemcached, memcached_server); if (rc != MEMCACHED_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memcache error adding server list: %s\n", memcached_strerror(newmemcached, rc)); - goto error; + switch_goto_status(SWITCH_STATUS_GENERR, end); } /* memcached_behavior_set(newmemcached, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); */ @@ -101,18 +102,10 @@ newmemcached = NULL; } - if (memcached_server) { - memcached_server_list_free(memcached_server); - } - if (newmemcached) { - memcached_free(newmemcached); - } - if (oldmemcached) { - memcached_free(oldmemcached); - } - return SWITCH_STATUS_SUCCESS; + switch_goto_status(SWITCH_STATUS_SUCCESS, end); + -error: +end: if (memcached_server) { memcached_server_list_free(memcached_server); } @@ -122,10 +115,10 @@ if (oldmemcached) { memcached_free(oldmemcached); } - return SWITCH_STATUS_GENERR; + return status; } -static switch_xml_config_string_options_t config_opt_memcache_servers = {NULL, 0, ".*"}; /* anything is ok here */ +static switch_xml_config_string_options_t config_opt_memcache_servers = {NULL, 0, NULL}; /* anything is ok here */ static switch_xml_config_item_t instructions[] = { /* parameter name type reloadable pointer default value options structure */ @@ -136,25 +129,13 @@ static switch_status_t do_config(switch_bool_t reload) { - switch_xml_t cfg, xml, settings; - memset(&globals, 0, sizeof(globals)); - - if (!(xml = switch_xml_open_cfg("memcache.conf", &cfg, NULL))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Could not open memcache.conf\n"); - return SWITCH_STATUS_FALSE; - } - - if ((settings = switch_xml_child(cfg, "settings"))) { - if (switch_xml_config_parse(switch_xml_child(settings, "param"), 0, instructions) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,"Config parsed ok!\n"); - } - } - if (xml) { - switch_xml_free(xml); + if (switch_xml_config_parse_module_settings("memcache.conf", SWITCH_FALSE, instructions) != SWITCH_STATUS_SUCCESS) { + return SWITCH_STATUS_GENERR; } + return SWITCH_STATUS_SUCCESS; } @@ -230,6 +211,7 @@ } else { stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); } + switch_safe_free(val); } else if (!strcasecmp(subcmd, "getflags") && argc > 1) { key = argv[1]; @@ -239,6 +221,7 @@ } else { stream->write_function(stream, "-ERR Error while running command %s: %s\n", subcmd, memcached_strerror(memcached, rc)); } + switch_safe_free(val); } else if ((!strcasecmp(subcmd, "increment") || !strcasecmp(subcmd, "decrement")) && argc > 1) { key = argv[1]; uint64_t ivalue;

1 0

[commit] r12873 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by FreeSWITCH SVN 01 Apr '09

01 Apr '09

Author: anthm Date: Wed Apr 1 15:11:36 2009 New Revision: 12873 Log: FSCORE-347 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_ivr_play_say.c 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 Wed Apr 1 15:11:36 2009 @@ -385,6 +385,7 @@ switch_safe_free(e_data.uuid_list[x]); } + free(sql); switch_core_db_close(db); } else { Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Wed Apr 1 15:11:36 2009 @@ -1113,8 +1113,8 @@ const char *from_id = switch_str_nil(switch_event_get_header(helper->event, "Other-Leg-Caller-ID-Number")); const char *to_user = switch_str_nil(switch_event_get_header(helper->event, "variable_sip_to_user")); const char *from_user = switch_str_nil(switch_event_get_header(helper->event, "variable_sip_from_user")); - const char *clean_to_user = NULL; - const char *clean_from_user = NULL; + char *clean_to_user = NULL; + char *clean_from_user = NULL; const char *p_to_user = switch_str_nil(switch_event_get_header(helper->event, "to-user")); #if 0 char *buf; @@ -1221,6 +1221,9 @@ stream.write_function(&stream, "</remote>\n"); } } + + switch_safe_free(clean_to_user); + switch_safe_free(clean_from_user); } if (is_dialog) { stream.write_function(&stream, "</dialog>\n"); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed Apr 1 15:11:36 2009 @@ -276,7 +276,7 @@ status = switch_ivr_play_file(session, NULL, odata, args); } else if (!strcasecmp(func, "break")) { done = 1; - break; + /* must allow the switch_safe_free below to execute or we leak - do not break here */ } else if (!strcasecmp(func, "execute")) { switch_application_interface_t *app; char *cmd, *cmd_args;

1 0