- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9537 - in freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk: EventWatcher FreeSwitch.EventSocket.Test FreeSwitchEventSocket IvrSocket
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: verifier Date: Fri Sep 12 11:24:28 2008 New Revision: 9537 Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/LogWriterHandler.cs Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Form1.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/EventSocket.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Program.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/IvrSocket/Program.cs Log: Improved documentation and added a logging delegate to let you handle logs in your favorite logging framework. Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs Fri Sep 12 11:24:28 2008 @@ -9,7 +9,7 @@ { public partial class ChannelWatcher : Form { - private EventManager _mgr = new EventManager(); + private EventManager _mgr = new EventManager(null); private Color _currentColor = 0; StringBuilder sb = new StringBuilder(); Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Form1.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Form1.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Form1.cs Fri Sep 12 11:24:28 2008 @@ -17,7 +17,7 @@ public Form1() { InitializeComponent(); - _eventMgr = new EventManager(); + _eventMgr = new EventManager(null); _callMgr = new CallManager(_eventMgr); _callMgr.OnCallState += OnCallState; _callMgr.ExtensionAdded += OnExtensionAdded; Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/EventSocket.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/EventSocket.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/EventSocket.cs Fri Sep 12 11:24:28 2008 @@ -9,7 +9,7 @@ { class EventSocket { - private FreeSwitch.EventSocket.EventSocket m_es = new FreeSwitch.EventSocket.EventSocket(); + private FreeSwitch.EventSocket.EventSocket m_es = new FreeSwitch.EventSocket.EventSocket(null); public void Setup() { 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 Fri Sep 12 11:24:28 2008 @@ -5,41 +5,71 @@ namespace FreeSwitch.EventSocket { + /// <summary> + /// Delegate used to receive a parsed event. + /// </summary> + /// <param name="receivedEvent">the event.</param> public delegate void EventHandler(EventBase receivedEvent); + /// <summary> + /// Delegate used to receive unparsed event messages + /// </summary> + /// <param name="text">text received from FreeSWITCH.</param> public delegate void EventsWriter(string text); + /// <summary> + /// Takes care of the event socket and parses the incoming events. + /// </summary> public class EventManager { - private readonly EventSocket _socket = new EventSocket(); - public event EventHandler EventReceived; + private readonly EventSocket _socket; + /// <summary> + /// An event have been received from freeswitch. + /// </summary> + public event EventHandler EventReceived = delegate{}; private readonly EventsWriter _writer; - private readonly TextWriter _rawLog; - private object _logLocker = new object(); + private readonly object _logLocker = new object(); + private readonly LogWriterHandler _logWriter; + /// <summary> + /// FreeSWITCH password, default is "ClueCon". + /// </summary> public string Password { set { _socket.Password = value; } } - public EventManager() + /// <summary> + /// Initializes a new instance of the <see cref="EventManager"/> class. + /// </summary> + /// <param name="logWriter">Can be used for logging.</param> + public EventManager(LogWriterHandler logWriter) { - _writer = RawWriter; - _rawLog = new StreamWriter(new FileStream("C:\\temp\\WatcherRaw.log", FileMode.Create, FileAccess.Write, FileShare.ReadWrite)); + _logWriter = logWriter ?? NullWriter.Write; + _socket = new EventSocket(_logWriter); + _writer = VoidWriter; } - private void RawWriter(string text) + private static void VoidWriter(string text) { - _rawLog.Write(text); - _rawLog.Flush(); } - - public EventManager(EventsWriter writer) + /// <summary> + /// Initializes a new instance of the <see cref="EventManager"/> class. + /// </summary> + /// <param name="logWriter">Used to receive loggings.</param> + /// <param name="writer">Used to receive unparsed event messages.</param> + public EventManager(LogWriterHandler logWriter, EventsWriter writer) { + _logWriter = logWriter ?? NullWriter.Write; + _socket = new EventSocket(_logWriter); _writer = writer; } + /// <summary> + /// Starts event manger and connect to freeswitch. + /// </summary> + /// <param name="hostname">hostname/ipaddress colon port</param> public void Start(string hostname) { _socket.MessageReceived += OnMessage; @@ -65,6 +95,10 @@ _socket.Send(cmd); } + /// <summary> + /// Sends the SendMsg command to FreeSWITCH + /// </summary> + /// <param name="cmd">The CMD.</param> public void Send(SendMsg cmd) { _socket.Send(cmd); @@ -77,10 +111,9 @@ if (eventName == null) return; - if (string.Compare(parameters["event-name"], "custom", true) == 0) - eventName = parameters["event-subclass"]; - else - eventName = parameters["event-name"]; + eventName = string.Compare(parameters["event-name"], "custom", true) == 0 + ? parameters["event-subclass"] + : parameters["event-name"]; //Quickhack for Sofia::Register (convert to sofia_register) eventName = eventName.Replace("::", "_"); @@ -94,51 +127,25 @@ { eb.SetParameters(parameters); eb.Parse(parameters); - if (EventReceived != null) - EventReceived(eb); - - /* - EventChannelState channel = eb as EventChannelState; - if (channel != null) - { - Console.WriteLine("[" + eb.Name + "/" + channel.ChannelInfo.State + "] (uid: " + - channel.UniqueId + ")"); - Console.WriteLine(" ChannelInfo:"); - Console.WriteLine(" Name: " + channel.ChannelInfo.Name); - Console.WriteLine(" State: " + channel.ChannelInfo.State); - if (channel.Caller != null) - { - Console.WriteLine(" CallerInfo:"); - Console.WriteLine(" Id: " + channel.Caller.UniqueId); - Console.WriteLine(" UserName: " + channel.Caller.UserName); - Console.WriteLine(" CallerId: " + channel.Caller.CallerIdName + "/" + - channel.Caller.CallerIdNumber); - Console.WriteLine(" ChannelName: " + channel.Caller.ChannelName); - Console.WriteLine(" DestinationNumber: " + channel.Caller.DestinationNumber); - } - - if (channel.Originator != null) - { - Console.WriteLine(" Originator:"); - Console.WriteLine(" Id: " + channel.Originator.UniqueId); - Console.WriteLine(" UserName: " + channel.Originator.UserName); - Console.WriteLine(" CallerId: " + channel.Originator.CallerIdName + "/" + - channel.Originator.CallerIdNumber); - Console.WriteLine(" ChannelName: " + channel.Originator.ChannelName); - Console.WriteLine(" DestinationNumber: " + channel.Originator.DestinationNumber); - } - } - //}*/ + EventReceived(eb); } else - Console.WriteLine("* Failed to load '" + eventName + "'."); + _logWriter(LogPrio.Warning, "Failed to load '" + eventName + "'."); } + /// <summary> + /// Subscribes the specified events. + /// </summary> + /// <param name="events">The events.</param> public void Subscribe(Events events) { _socket.Subscribe(events); } + /// <summary> + /// Subscribes the specified events. + /// </summary> + /// <param name="events">The events.</param> public void Subscribe(params Event[] events) { _socket.Subscribe(new Events(events)); 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 Fri Sep 12 11:24:28 2008 @@ -20,6 +20,7 @@ #endregion + private LogWriterHandler _logWriter; private readonly Queue<CmdBase> _commands = new Queue<CmdBase>(); private bool _autoConnect = true; private Events _events; @@ -33,12 +34,17 @@ private Socket _socket; private NetworkStream _stream; private Timer _timer; - private bool _authed = false; + private bool _authed; const int RetryTimeout = 5000; - private bool _parsing = false; + private bool _parsing; - public EventSocket() + /// <summary> + /// Initializes a new instance of the <see cref="EventSocket"/> class. + /// </summary> + /// <param name="logWriter">The log writer.</param> + public EventSocket(LogWriterHandler logWriter) { + LogWriter = logWriter ?? NullWriter.Write; CreateSocket(); } @@ -49,23 +55,55 @@ _socket.ReceiveBufferSize = 65535; } + /// <summary> + /// Used to authenticate towards FreeSWITCH. + /// </summary> + /// <remarks> + /// Default is "ClueCon" + /// </remarks> public string Password { get { return _password; } set { _password = value; } } + /// <summary> + /// Connect automatically again if socket is disconnected. + /// </summary> public bool AutoConnect { get { return _autoConnect; } set { _autoConnect = value; } } - public event MessageHandler MessageReceived; + public LogWriterHandler LogWriter + { + get { return _logWriter; } + set { _logWriter = value ?? NullWriter.Write; } + } + + /// <summary> + /// A event have been received + /// </summary> + public event MessageHandler MessageReceived = delegate{}; + + /// <summary> + /// Socket got disconnected (due to remote peer) + /// </summary> + public event EventSocketHandler Disconnected = delegate{}; - public event EventSocketHandler Disconnected; - public event EventSocketHandler Connected; + /// <summary> + /// Socket is now connected + /// </summary> + public event EventSocketHandler Connected = delegate{}; + /// <summary> + /// Connect to FreeSWITCH + /// </summary> + /// <param name="server">hostname/ipaddress colon port</param> + /// <example> + /// <code>eventSocket.Connect("localhost:1234");</code> + /// </example> public void Connect(string server) { int pos = server.IndexOf(':'); @@ -80,6 +118,9 @@ Connect(); } + /// <summary> + /// Connect to the previously specified host. + /// </summary> public void Connect() { if (_hostName == null) @@ -88,9 +129,11 @@ try { TryConnect(); + LogWriter(LogPrio.Debug, "Connected to freeswitch."); } - catch (SocketException) + catch (SocketException err) { + LogWriter(LogPrio.Debug, "Failed to connect to freeswitch, reason: " + err.Message); HandleDisconnect(); } } @@ -103,17 +146,14 @@ if (_stream == null) _stream = new NetworkStream(_socket, false); - if (Connected != null) - Connected(this); + Connected(this); BeginRead(); - if (_timer != null) - { - Timer tmr = _timer; - _timer = null; - tmr.Change(Timeout.Infinite, Timeout.Infinite); - tmr.Dispose(); - } + if (_timer == null) return; + Timer tmr = _timer; + _timer = null; + tmr.Change(Timeout.Infinite, Timeout.Infinite); + tmr.Dispose(); } } @@ -133,6 +173,7 @@ int bytesRead = _stream.EndRead(ar); if (bytesRead == 0) { + LogWriter(LogPrio.Error, "Got disconnected (0 bytes read)."); HandleDisconnect(); return; } @@ -140,27 +181,29 @@ _parser.Append(inbuffer); BeginRead(); } - catch (IOException) + catch (IOException err) { + LogWriter(LogPrio.Debug, "IO exception during read: " + err.Message); // Remote end disconnected. HandleDisconnect(); return; } - if (DataReceived != null && !string.IsNullOrEmpty(inbuffer)) + if (!string.IsNullOrEmpty(inbuffer)) DataReceived(inbuffer); try { ParseMessages(); } - catch (InvalidDataException) + catch (InvalidDataException err) { + LogWriter(LogPrio.Warning, "Failed to parse event message (" + err.Message + "): " + Environment.NewLine + _parser.Text); HandleDisconnect(); } - catch (ArgumentException) + catch (ArgumentException err) { - Console.WriteLine(_parser.Text); + LogWriter(LogPrio.Warning, "Failed to parse event message ("+err.Message+"): " + Environment.NewLine + _parser.Text); HandleDisconnect(); } } @@ -191,6 +234,7 @@ try { TryConnect(); + LogWriter(LogPrio.Info, "We've connected again"); } catch (SocketException) { @@ -216,37 +260,35 @@ try { PlainEventMsg msg = _parser.ParseOne(); + LogWriter(LogPrio.Trace, "MessageType: " + msg.ContentType); while (msg != null) { - if (msg.ContentType == "auth/request") - { - AuthCommand cmd = new AuthCommand(_password); - cmd.ReplyReceived += OnAuthed; - _commands.Enqueue(cmd); - Write(cmd + "\n\n"); - } - else if (msg.ContentType == "command/reply" - || msg.ContentType == "api/response") - { - if (_commands.Count > 0) - { - CmdBase cmd = _commands.Dequeue(); - cmd.HandleReply(cmd.CreateReply(msg.Body.Trim())); - } - else - { - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine("Got command reply or api response, but no actual command/api: " + msg.Body); - Console.ForegroundColor = ConsoleColor.Gray; - } - } - else + switch (msg.ContentType) { - if (MessageReceived != null) + case "auth/request": + { + AuthCommand cmd = new AuthCommand(_password); + cmd.ReplyReceived += OnAuthed; + _commands.Enqueue(cmd); + Write(cmd + "\n\n"); + } + break; + case "api/response": + case "command/reply": + if (_commands.Count > 0) + { + CmdBase cmd = _commands.Dequeue(); + cmd.HandleReply(cmd.CreateReply(msg.Body.Trim())); + } + else + LogWriter(LogPrio.Debug, "Got command reply or api response, but no actual command/api: " + msg.Body); + break; + default: MessageReceived(msg); + break; } msg = _parser.ParseOne(); - } + } } finally { @@ -257,6 +299,7 @@ private void OnAuthed(CmdBase command, CommandReply reply) { + LogWriter(LogPrio.Trace, "We have not authenticated."); _authed = true; RequestEvents(); } @@ -273,13 +316,10 @@ _stream = null; } - if (Disconnected != null) - Disconnected.Invoke(this); - if (AutoConnect && _timer == null) - { - Console.WriteLine("EventSocket: Launching timer."); - _timer = new Timer(TryConnect, this, RetryTimeout, RetryTimeout); - } + Disconnected(this); + if (!AutoConnect || _timer != null) return; + LogWriter(LogPrio.Info, "Launching autoconnect timer."); + _timer = new Timer(TryConnect, this, RetryTimeout, RetryTimeout); } private void RequestEvents() @@ -309,7 +349,10 @@ public void Send(CmdBase command) { if (!_socket.Connected) + { + LogWriter(LogPrio.Debug, "Tried to send command when we are not connected: " + command); throw new IOException("Socket is not connected."); + } _commands.Enqueue(command); @@ -317,13 +360,13 @@ Write(command + "\n\n"); } - private static void TryConnect(object state) + private void TryConnect(object state) { EventSocket client = (EventSocket) state; try { client.TryConnect(); - Console.WriteLine("EventSocket.Timer: Connected."); + LogWriter(LogPrio.Info, "Connected again."); } catch (SocketException) {} 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 Fri Sep 12 11:24:28 2008 @@ -74,6 +74,7 @@ <Compile Include="Ivr\IvrInterface.cs" /> <Compile Include="Ivr\IvrQueue.cs" /> <Compile Include="Ivr\PrivateWaitDtmf.cs" /> + <Compile Include="LogWriterHandler.cs" /> <Compile Include="PlainEventMsg.cs" /> <Compile Include="EventParser.cs" /> <Compile Include="Events.cs" /> Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/LogWriterHandler.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/LogWriterHandler.cs Fri Sep 12 11:24:28 2008 @@ -0,0 +1,59 @@ +namespace FreeSwitch.EventSocket +{ + /// <summary> + /// Determines how important the log message is. + /// </summary> + public enum LogPrio + { + /// <summary> + /// Not important at all, used to follow the flow of the program + /// </summary> + Trace, + + /// <summary> + /// Messages useful when debugging + /// </summary> + Debug, + + /// <summary> + /// States etc have changed. + /// </summary> + Info, + + /// <summary> + /// Something did not go as we expected, but we can handle it. + /// </summary> + Warning, + + /// <summary> + /// Something went wrong, we can't really handle it, but the program can continue to live + /// </summary> + Error, + + /// <summary> + /// Some went really wrong, and the program should really be shut down. + /// </summary> + Fatal + } + + /// <summary> + /// Used to retreive logging messages from the event socket framework. + /// </summary> + /// <param name="prio">importance of the log message</param> + /// <param name="message">the message</param> + public delegate void LogWriterHandler(LogPrio prio, string message); + + /// <summary> + /// Used as default logwriter + /// </summary> + internal class NullWriter + { + /// <summary> + /// Used to log to void. + /// </summary> + /// <param name="prio"></param> + /// <param name="message"></param> + public static void Write(LogPrio prio, string message) + {} + } +} Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Program.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Program.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Program.cs Fri Sep 12 11:24:28 2008 @@ -25,7 +25,7 @@ Program p = new Program(); /// Create a new FreeSwitch event socket. - EventManager eventManager = new EventManager(); + EventManager eventManager = new EventManager(null); // Hook all events to the same delegate. Can also provide one delegate per event. eventManager.EventReceived += p.HandleEvent; Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/IvrSocket/Program.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/IvrSocket/Program.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/IvrSocket/Program.cs Fri Sep 12 11:24:28 2008 @@ -10,7 +10,7 @@ private static EventManager mgr; static void Main(string[] args) { - mgr = new EventManager(); + mgr = new EventManager(null); mgr.EventReceived += IvrManager; mgr.Subscribe(Event.All); mgr.Start("localhost");

1 0

[commit] r9536 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: anthm Date: Fri Sep 12 10:57:44 2008 New Revision: 9536 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update 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 Fri Sep 12 10:57:44 2008 @@ -2864,7 +2864,7 @@ if ((a_session = switch_core_session_locate(br_a))) { const char *port = NULL; - char *glued; + char *param_string = "", *headers = ""; int count = 0, bytes = 0; if (refer_to && refer_to->r_url && refer_to->r_url->url_port) { @@ -2874,27 +2874,39 @@ if (switch_strlen_zero(port)) { port = "5060"; } - + channel = switch_core_session_get_channel(a_session); - for (count = 0; refer_to->r_params[count] ; count++) { - bytes += strlen(refer_to->r_params[count]) + 1; - } - bytes++; + if (refer_to->r_params) { + for (count = 0; refer_to->r_params[count] ; count++) { + bytes += strlen(refer_to->r_params[count]) + 1; + } + + if (bytes) { + bytes += 2; + + param_string = switch_core_session_alloc(session, bytes); + *param_string = ';'; + for (count = 0; refer_to->r_params[count] ; count++) { + switch_snprintf(param_string + strlen(param_string), bytes - strlen(param_string), "%s;", refer_to->r_params[count]); + } - glued = switch_core_session_alloc(session, bytes); - for (count = 0; refer_to->r_params[count] ; count++) { - switch_snprintf(glued + strlen(glued), bytes - strlen(glued), "%s;", refer_to->r_params[count]); + if (end_of(param_string) == ';') { + end_of(param_string) = '\0'; + } + } } - - if (end_of(glued) == ';') { - end_of(glued) = '\0'; + + if (refer_to->r_url && refer_to->r_url->url_headers) { + headers = switch_core_session_sprintf(session, "?%s", refer_to->r_url->url_headers); } - - exten = switch_core_session_sprintf(session, "sofia/%s/sip:%s@%s:%s;%s?%s", + + + exten = switch_core_session_sprintf(session, "sofia/%s/sip:%s@%s:%s%s%s", profile->name, refer_to->r_url->url_user, - refer_to->r_url->url_host, port, glued, refer_to->r_url->url_headers); + refer_to->r_url->url_host, port, param_string, headers); + switch_core_new_memory_pool(&npool); nightmare_xfer_helper = switch_core_alloc(npool, sizeof(*nightmare_xfer_helper)); nightmare_xfer_helper->exten = switch_core_strdup(npool, exten);

1 0

[commit] r9535 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: brian Date: Fri Sep 12 10:46:08 2008 New Revision: 9535 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: add dynamic conf with bridge example Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Sep 12 10:46:08 2008 @@ -258,6 +258,13 @@ </condition> </extension> +  + <extension name="dyanmic conference"> + <condition field="destination_number" expression="^5001$"> + <action application="conference" data="bridge:mydynaconf:sofia/${use_profile}/1234@conference.freeswitch.org"/> + </condition> + </extension> + <extension name="rtp_multicast_page"> <condition field="destination_number" expression="^pagegroup$|^7243"> <action application="answer"/>

1 0

[commit] r9534 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: brian Date: Fri Sep 12 10:40:02 2008 New Revision: 9534 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: example of using mod_conference to auto call out on entry. You can add multipe conference_set_auto_outcall's as needed Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Fri Sep 12 10:40:02 2008 @@ -230,6 +230,25 @@ </condition> </extension> +  + <extension name="0911"> + <condition field="destination_number" expression="0911"> + +  + <action application="set" data="conference_auto_outcall_caller_id_name=Mad Boss"/> + <action application="set" data="conference_auto_outcall_caller_id_number=0911"/> + <action application="set" data="conference_auto_outcall_timeout=60"/> + <action application="set" data="conference_auto_outcall_flags=none"/> +  + +  + <action application="conference_set_auto_outcall" data="sofia/gateway/asterlink.com/19184238080"/> + <action application="conference_set_auto_outcall" data="sofia/default/42(a)conference.freeswitch.org"/> + + <action application="conference" data="cool@default"/> + </condition> + </extension> +  <extension name="ivr_demo"> <condition field="destination_number" expression="^5000$">

1 0

[commit] r9533 - freeswitch/trunk/libs/libsndfile
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: mikej Date: Fri Sep 12 01:37:06 2008 New Revision: 9533 Modified: freeswitch/trunk/libs/libsndfile/acinclude.m4 Log: (LBSNDF-5) fix for autoconf 2.62 Modified: freeswitch/trunk/libs/libsndfile/acinclude.m4 ============================================================================== --- freeswitch/trunk/libs/libsndfile/acinclude.m4 (original) +++ freeswitch/trunk/libs/libsndfile/acinclude.m4 Fri Sep 12 01:37:06 2008 @@ -266,11 +266,6 @@ ac_cv_c_big_endian=0 ac_cv_c_little_endian=0 - AC_MSG_WARN([[*****************************************************************]]) - AC_MSG_WARN([[*** Not able to determine endian-ness of target processor. ]]) - AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in ]]) - AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]]) - AC_MSG_WARN([[*****************************************************************]]) fi )# AC_C_FIND_ENDIAN

1 0

[commit] r9531 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 12 Sep '08

12 Sep '08

Author: mikej Date: Thu Sep 11 20:05:09 2008 New Revision: 9531 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add more error case handling to crazy transfer support Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Sep 11 20:05:09 2008 @@ -2636,21 +2636,24 @@ status = switch_ivr_originate(a_session, &tsession, &cause, nhelper->exten, timeout, NULL, NULL, NULL, NULL, SOF_NONE); - if (status != SWITCH_STATUS_SUCCESS || cause != SWITCH_CAUSE_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", nhelper->exten); - nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("messsage/sipfrag"), - NUTAG_SUBSTATE(nua_substate_terminated), - SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); - status = SWITCH_STATUS_FALSE; - } else { + if ((switch_channel_get_state(channel_a) < CS_HANGUP)) { + + if (status != SWITCH_STATUS_SUCCESS || cause != SWITCH_CAUSE_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", nhelper->exten); + nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("messsage/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), + SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); + status = SWITCH_STATUS_FALSE; + } else { - tuuid_str = switch_core_session_get_uuid(tsession); - switch_ivr_uuid_bridge(nhelper->bridge_to_uuid, tuuid_str); - switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); - nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), - NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); - switch_core_session_rwunlock(tsession); + tuuid_str = switch_core_session_get_uuid(tsession); + switch_ivr_uuid_bridge(nhelper->bridge_to_uuid, tuuid_str); + switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); + switch_core_session_rwunlock(tsession); + } } switch_core_session_rwunlock(session); }

1 0

[commit] r9530 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: anthm Date: Thu Sep 11 19:40:57 2008 New Revision: 9530 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: add crazy transfer support Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Thu Sep 11 19:40:57 2008 @@ -1956,7 +1956,9 @@ *dest_to++ = '\0'; } - if ((host = strchr(dest, '%'))) { + if (!strncasecmp(dest, "sip:", 4) || !strncasecmp(dest, "sips:", 5)) { + tech_pvt->dest = switch_core_session_strdup(nsession, dest); + } else if ((host = strchr(dest, '%'))) { char buf[128]; *host = '@'; tech_pvt->e_dest = switch_core_session_strdup(nsession, dest); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Thu Sep 11 19:40:57 2008 @@ -2607,6 +2607,76 @@ return; } + +typedef struct { + char *exten; + char *event; + char *reply_uuid; + char *bridge_to_uuid; + switch_memory_pool_t *pool; +} nightmare_xfer_helper_t; + + +void *SWITCH_THREAD_FUNC nightmare_xfer_thread_run(switch_thread_t *thread, void *obj) +{ + nightmare_xfer_helper_t *nhelper = (nightmare_xfer_helper_t *) obj; + switch_memory_pool_t *pool; + switch_status_t status; + switch_core_session_t *session, *a_session; + + if ((a_session = switch_core_session_locate(nhelper->bridge_to_uuid))) { + switch_core_session_t *tsession; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + uint32_t timeout = 60; + char *tuuid_str; + + if ((session = switch_core_session_locate(nhelper->reply_uuid))) { + private_object_t *tech_pvt = switch_core_session_get_private(session); + switch_channel_t *channel_a = switch_core_session_get_channel(session); + + status = switch_ivr_originate(a_session, &tsession, &cause, nhelper->exten, timeout, NULL, NULL, NULL, NULL, SOF_NONE); + + if (status != SWITCH_STATUS_SUCCESS || cause != SWITCH_CAUSE_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", nhelper->exten); + nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("messsage/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), + SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); + status = SWITCH_STATUS_FALSE; + } else { + + tuuid_str = switch_core_session_get_uuid(tsession); + switch_ivr_uuid_bridge(nhelper->bridge_to_uuid, tuuid_str); + switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); + switch_set_flag_locked(tech_pvt, TFLAG_BYE); + nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), + NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(nhelper->event), TAG_END()); + switch_core_session_rwunlock(tsession); + } + switch_core_session_rwunlock(session); + } + + switch_core_session_rwunlock(a_session); + } + + pool = nhelper->pool; + switch_core_destroy_memory_pool(&pool); + + return NULL; +} + +static void launch_nightmare_xfer(nightmare_xfer_helper_t *nhelper) +{ + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + + switch_threadattr_create(&thd_attr, nhelper->pool); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_threadattr_priority_increase(thd_attr); + switch_thread_create(&thread, thd_attr, nightmare_xfer_thread_run, nhelper, nhelper->pool); +} + + /*---------------------------------------*/ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]) { @@ -2621,6 +2691,8 @@ su_home_t *home = NULL; char *full_ref_by = NULL; char *full_ref_to = NULL; + nightmare_xfer_helper_t *nightmare_xfer_helper; + switch_memory_pool_t *npool; if (!(profile->mflags & MFLAG_REFER)) { nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); @@ -2646,7 +2718,7 @@ full_ref_to = sip_header_as_string(home, (void *) sip->sip_refer_to); if (profile->pflags & PFLAG_FULL_ID) { - exten = switch_mprintf("%s@%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host); + exten = switch_core_session_sprintf(session, "%s@%s", (char *) refer_to->r_url->url_user, (char *) refer_to->r_url->url_host); } else { exten = (char *) refer_to->r_url->url_user; } @@ -2788,12 +2860,9 @@ switch_channel_t *channel = switch_core_session_get_channel(session); if ((a_session = switch_core_session_locate(br_a))) { - switch_core_session_t *tsession; - switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; - uint32_t timeout = 60; - char *tuuid_str; const char *port = NULL; - switch_status_t status; + char *glued; + int count = 0, bytes = 0; if (refer_to && refer_to->r_url && refer_to->r_url->url_port) { port = refer_to->r_url->url_port; @@ -2802,37 +2871,50 @@ if (switch_strlen_zero(port)) { port = "5060"; } - channel = switch_core_session_get_channel(a_session); - exten = switch_mprintf("sofia/%s/%s@%s:%s", profile->name, refer_to->r_url->url_user, refer_to->r_url->url_host, port); + channel = switch_core_session_get_channel(a_session); + + for (count = 0; refer_to->r_params[count] ; count++) { + bytes += strlen(refer_to->r_params[count]) + 1; + } + bytes++; + + glued = switch_core_session_alloc(session, bytes); + for (count = 0; refer_to->r_params[count] ; count++) { + switch_snprintf(glued + strlen(glued), bytes - strlen(glued), "%s;", refer_to->r_params[count]); + } + + if (end_of(glued) == ';') { + end_of(glued) = '\0'; + } + + exten = switch_core_session_sprintf(session, "sofia/%s/sip:%s@%s:%s;%s?%s", + profile->name, refer_to->r_url->url_user, + refer_to->r_url->url_host, port, glued, refer_to->r_url->url_headers); + + switch_core_new_memory_pool(&npool); + nightmare_xfer_helper = switch_core_alloc(npool, sizeof(*nightmare_xfer_helper)); + nightmare_xfer_helper->exten = switch_core_strdup(npool, exten); + nightmare_xfer_helper->event = switch_core_strdup(npool, etmp); + nightmare_xfer_helper->reply_uuid = switch_core_strdup(npool, switch_core_session_get_uuid(session)); + nightmare_xfer_helper->bridge_to_uuid = switch_core_strdup(npool, br_a); + nightmare_xfer_helper->pool = npool; switch_channel_set_variable(channel, SOFIA_REPLACES_HEADER, rep); + if (!switch_strlen_zero(full_ref_by)) { switch_channel_set_variable(channel, SOFIA_SIP_HEADER_PREFIX "Referred-By", full_ref_by); } + if (!switch_strlen_zero(full_ref_to)) { switch_channel_set_variable(channel, SOFIA_REFER_TO_VARIABLE, full_ref_to); } - status = switch_ivr_originate(a_session, &tsession, &cause, exten, timeout, &noop_state_handler, NULL, NULL, NULL, SOF_NONE); - - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel! [%s]\n", exten); - nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("messsage/sipfrag"), - NUTAG_SUBSTATE(nua_substate_terminated), - SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Good Luck, you'll need it......\n"); + launch_nightmare_xfer(nightmare_xfer_helper); + switch_core_session_rwunlock(a_session); - if (status != SWITCH_STATUS_SUCCESS) { - goto done; - } - - tuuid_str = switch_core_session_get_uuid(tsession); - switch_ivr_uuid_bridge(br_a, tuuid_str); - switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER"); - switch_set_flag_locked(tech_pvt, TFLAG_BYE); - nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"), - NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END()); - switch_core_session_rwunlock(tsession); } else { goto error; } @@ -2898,9 +2980,6 @@ home = NULL; } - if (exten && strchr(exten, '@')) { - switch_safe_free(exten); - } if (etmp) { switch_safe_free(etmp); }

1 0

[commit] r9529 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: greenlizard Date: Thu Sep 11 18:25:35 2008 New Revision: 9529 Modified: freeswitch/trunk/scripts/socket/freepy/README Log: improve docs Modified: freeswitch/trunk/scripts/socket/freepy/README ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/README (original) +++ freeswitch/trunk/scripts/socket/freepy/README Thu Sep 11 18:25:35 2008 @@ -9,6 +9,12 @@ See INSTALL +Using/Examples +============== + +The WikiPBX project uses this lib heavily, so looking at that code (wikipbx.org) is a good example until more docs are added. + + Debugging =========

1 0

[commit] r9528 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: greenlizard Date: Thu Sep 11 17:12:43 2008 New Revision: 9528 Modified: freeswitch/trunk/scripts/socket/freepy/fseventlistener.py Log: set field so the protocol object can easily get factor instance. add ability to add observers for specific events and dispatch events to observers. still more work needed there, since there is no relation between observers and what events are subscribed from freeswitch Modified: freeswitch/trunk/scripts/socket/freepy/fseventlistener.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/fseventlistener.py (original) +++ freeswitch/trunk/scripts/socket/freepy/fseventlistener.py Thu Sep 11 17:12:43 2008 @@ -140,7 +140,7 @@ def eventReceived(self, event_xml_str): """ - should be overridden by subclasses + should be overridden by subclasses. """ raise Exception("This is an abstract class, should be overridden " "in a subclass") @@ -153,6 +153,9 @@ should be a subclass of a FreeswitchEventListener """ + # dictionary of observers. key: event name, value: list of observers + self.event2observer = {} + self.protoclass=protoclass if host: @@ -166,12 +169,33 @@ self.connection_deferred = None self.num_attempts = 0 + def addobserver(self, event_name, observer): + """ + @param event_name, eg "CHANNEL_ANSWER" + @param observer (instance of object that has an eventReceived() method + """ + observers = self.event2observer.get(event_name, []) + observers.append(observer) + self.event2observer[event_name] = observers + + def dispatch2observers(self, event_name, event_xml_str, event_dom): + """ + called back by the underlying protocol upon receiving an + event from freeswitch. Currently subclasses must explicitly + call this method from their eventReceived method for observers + to get the message. TODO: move this call to FreeswitchEventListener + and use observer pattern instead of any subclassing. + """ + observers = self.event2observer.get(event_name, []) + for observer in observers: + observer.eventReceived(event_name, event_xml_str, event_dom) + def reset(self): self.protocol = None self.connection_deferred = None def connect(self): - + if self.protocol: # if we have a protocol object, we are connected (since we always # null it upon any disconnection) @@ -191,6 +215,7 @@ def conncb(self, protocol): self.protocol = protocol + self.protocol.__dict__["factory"] = self deferred2callback = self.connection_deferred self.connection_deferred = None deferred2callback.callback(self.protocol)

1 0

[commit] r9527 - freeswitch/trunk/src/mod/loggers/mod_console
by Freeswitch SVN 11 Sep '08

11 Sep '08

Author: mikej Date: Thu Sep 11 15:56:57 2008 New Revision: 9527 Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Log: fix shutdown crash Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Thu Sep 11 15:56:57 2008 @@ -342,7 +342,9 @@ { switch_log_unbind_logger(switch_console_logger); - switch_core_hash_destroy(&log_hash); + if (log_hash) { + switch_core_hash_destroy(&log_hash); + } RUNNING = 0; return SWITCH_STATUS_UNLOAD;

1 0