- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8820 - in freeswitch/trunk/src: . include
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 12:31:09 2008 New Revision: 8820 Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/switch_cpp.cpp Log: add inter digit timeout to swigged embedded languages getDigits method. (MODLANG-65) Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Jun 23 12:31:09 2008 @@ -234,7 +234,7 @@ * receiving dtmf digits. For that, use collectDigits. */ SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout); - + SWITCH_DECLARE(char *) getDigits(int maxdigits, char *terminators, int timeout, int interdigit = 0); SWITCH_DECLARE(int) transfer(char *extensions, char *dialplan, char *context); Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Jun 23 12:31:09 2008 @@ -583,9 +583,15 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_DECLARE(char *) CoreSession::getDigits(int maxdigits, char *terminators, int timeout) +{ + return getDigits(maxdigits, terminators, timeout, 0); +} + SWITCH_DECLARE(char *) CoreSession::getDigits(int maxdigits, char *terminators, - int timeout) + int timeout, + int interdigit) { switch_status_t status; this_check((char *)""); @@ -600,7 +606,7 @@ maxdigits, terminators, &terminator, - (uint32_t) timeout, 0, 0); + (uint32_t) timeout, (uint32_t)interdigit, 0); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "getDigits dtmf_buf: %s\n", dtmf_buf); end_allow_threads();

1 0

[commit] r8819 - freeswitch/trunk/src/mod/say/mod_say_zh
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 12:00:44 2008 New Revision: 8819 Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Log: update zh say module to implement some special rules (MODLANG-64) Modified: freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c (original) +++ freeswitch/trunk/src/mod/say/mod_say_zh/mod_say_zh.c Mon Jun 23 12:00:44 2008 @@ -315,7 +315,15 @@ } if (hours) { - say_num(hours, SSM_PRONOUNCED); + + if (hours == 2) + { + say_file("time/specialtwo.wav"); + } + else + { + say_num(hours, SSM_PRONOUNCED); + } if (hours == 1) { say_file("time/hour.wav"); } else { @@ -375,12 +383,16 @@ } if (say_date) { - say_file("time/day-%d.wav", tm.tm_wday); + say_num(tm.tm_year + 1900, SSM_ITERATED); + say_file("time/year.wav"); say_file("time/mon-%d.wav", tm.tm_mon); - say_num(tm.tm_mday, SSM_COUNTED); - say_num(tm.tm_year + 1900, SSM_PRONOUNCED); + say_num(tm.tm_mday, SSM_PRONOUNCED); + say_file("time/day.wav"); + say_file("time/day-%d.wav", tm.tm_wday); + } + if (say_time) { int32_t hour = tm.tm_hour, pm = 0; @@ -394,18 +406,14 @@ pm = 0; } - say_num(hour, SSM_PRONOUNCED); + say_file("time/%s.wav", pm ? "p-m" : "a-m"); - if (tm.tm_min > 9) { - say_num(tm.tm_min, SSM_PRONOUNCED); - } else if (tm.tm_min) { - say_file("time/oh.wav"); - say_num(tm.tm_min, SSM_PRONOUNCED); - } else { - say_file("time/oclock.wav"); - } + say_num(hour, SSM_PRONOUNCED); + say_file("time/clock-hour.wav"); + say_num(tm.tm_min, SSM_PRONOUNCED); + say_file("time/clock-minute.wav"); - say_file("time/%s.wav", pm ? "p-m" : "a-m"); + } return SWITCH_STATUS_SUCCESS;

1 0

[commit] r8818 - freeswitch/trunk/src
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 11:56:24 2008 New Revision: 8818 Modified: freeswitch/trunk/src/switch_apr.c Log: attempt to fix MODEVENT-25 (WSAWOULDBLOCK error on socket send in windows) Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Jun 23 11:56:24 2008 @@ -564,9 +564,10 @@ switch_size_t req = *len, wrote = 0, need = *len; int to_count = 0; - while ((wrote < req && status == SWITCH_STATUS_SUCCESS) || (need == 0 && status == SWITCH_STATUS_BREAK)) { + while ((wrote < req && status == SWITCH_STATUS_SUCCESS) || (need == 0 && status == SWITCH_STATUS_BREAK) || status == 730035) { need = req - wrote; - if ((status = apr_socket_send(sock, buf + wrote, &need)) == SWITCH_STATUS_BREAK) { + status = apr_socket_send(sock, buf + wrote, &need); + if (status == SWITCH_STATUS_BREAK || status == 730035) { if (++to_count > 10000) { status = SWITCH_STATUS_FALSE; break;

1 0

[commit] r8817 - in freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk: EventWatcher FreeSwitch.EventSocket.Test FreeSwitchEventSocket FreeSwitchEventSocket/ChannelEvents FreeSwitchEventSocket/Commands FreeSwitchEventSocket/Events FreeSwitchEventSocket/SipEvents
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: verifier Date: Mon Jun 23 11:53:51 2008 New Revision: 8817 Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.Designer.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.resx freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelPark.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventSessionCrash.cs Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Program.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/Program.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/ChannelEvent.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelAnswer.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelApplication.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelBridge.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelCreate.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelDestroy.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecute.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecuteComplete.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelHangup.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOriginate.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOutgoing.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelProgress.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelState.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnbridge.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnpark.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventCodec.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmf.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmfStatus.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.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/Events/EventBase.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PartyInfo.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PlainEventMsg.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventRoster.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaExpire.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaRegister.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/SipEvent.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/StringParser.cs Log: Completed EventWatcher, added ToString to most of the events (now showing relevant info). Recoded EventParser to be thread safe. EventParser/EventSocket now queues up all incoming data and parses it as soon as possible (true async handling) Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.Designer.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.Designer.cs Mon Jun 23 11:53:51 2008 @@ -0,0 +1,129 @@ +namespace EventWatcher +{ + partial class ChannelWatcher + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.tv = new System.Windows.Forms.TreeView(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.tb = new System.Windows.Forms.RichTextBox(); + this.toolStrip1.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(961, 25); + this.toolStrip1.TabIndex = 3; + this.toolStrip1.Text = "toolStrip1"; + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 25); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.tb); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.tv); + this.splitContainer1.Size = new System.Drawing.Size(961, 622); + this.splitContainer1.SplitterDistance = 307; + this.splitContainer1.TabIndex = 4; + // + // tv + // + this.tv.Dock = System.Windows.Forms.DockStyle.Fill; + this.tv.FullRowSelect = true; + this.tv.Location = new System.Drawing.Point(0, 0); + this.tv.Name = "tv"; + this.tv.ShowLines = false; + this.tv.ShowPlusMinus = false; + this.tv.ShowRootLines = false; + this.tv.Size = new System.Drawing.Size(961, 311); + this.tv.TabIndex = 2; + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(37, 22); + this.toolStripLabel1.Text = "Rensa"; + this.toolStripLabel1.Click += new System.EventHandler(this.toolStripLabel1_Click); + // + // tb + // + this.tb.Dock = System.Windows.Forms.DockStyle.Fill; + this.tb.Location = new System.Drawing.Point(0, 0); + this.tb.Name = "tb"; + this.tb.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.ForcedBoth; + this.tb.Size = new System.Drawing.Size(961, 307); + this.tb.TabIndex = 0; + this.tb.Text = ""; + this.tb.WordWrap = false; + // + // ChannelWatcher + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(961, 647); + this.Controls.Add(this.splitContainer1); + this.Controls.Add(this.toolStrip1); + this.Name = "ChannelWatcher"; + this.Text = "ChannelWatcher"; + this.Load += new System.EventHandler(this.ChannelWatcher_Load); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TreeView tv; + private System.Windows.Forms.RichTextBox tb; + + } +} \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.cs Mon Jun 23 11:53:51 2008 @@ -0,0 +1,160 @@ +using System; +using System.Drawing; +using System.Runtime.InteropServices; +using System.Text; +using System.Windows.Forms; +using FreeSwitch.EventSocket; + +namespace EventWatcher +{ + public partial class ChannelWatcher : Form + { + private EventManager _mgr = new EventManager(); + private Color _currentColor = 0; + StringBuilder sb = new StringBuilder(); + + public ChannelWatcher() + { + InitializeComponent(); + } + + private void ChannelWatcher_Load(object sender, EventArgs e) + { + _mgr.Start("localhost"); + _mgr.Subscribe(Event.All); + _mgr.EventReceived += OnPreSwitchEvent; + ClearTb(); + // AddText("bajs"); + } + + private void OnPreSwitchEvent(EventBase theEvent) + { + if (tv.InvokeRequired) + BeginInvoke((MethodInvoker)delegate { OnSwitchEvent(theEvent); }); + else + OnSwitchEvent(theEvent); + } + + private void ClearTb() + { + /* +{\rtf1\ansi\ansicpg1252\deff0\deflang1053 + {\colortbl ;\red128\green0\blue0;\red0\green128\blue0;\red0\green0\blue255;\red0\green0\blue255;} + {\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}} +\viewkind4\uc1\pard\f0\fs17 Hello\cf1\b <\cf3\b0 (Wor"ld")\cf1\b >\cf0\b0 \par +} + */ + sb.Length = 0; + sb.Append( + @"{\rtf1\ansi\ansicpg1252\deff0\deflang1053" + + @"{\colortbl ;\red0\green0\blue0;\red128\green0\blue0;\red0\green128\blue0;\red0\green0\blue255;\red0\green0\blue255;}" + + @"{\fonttbl{\f0\fnil\fcharset0 Microsoft Sans Serif;}}" + + @"\viewkind4\uc1\pard\f0\fs20\par \par}"); + tb.Rtf = sb.ToString(); + } + + public enum Color + { + None, + Black, + Red, + Green, + Blue + } + + + + [DllImport("user32.dll")] + public static extern bool LockWindowUpdate(IntPtr hWndLock); + + private void AddText(string text) + { + text = text.Replace("\\", "\\\\").Replace("{", "\\{").Replace("}", "\\}"); + string colored = string.Empty; + bool inQ = false; + bool bold = false; + foreach (char ch in text) + { + Color color = Color.None; + if (inQ) + { + if (ch == '"') + { + inQ = false; + color = Color.Black; + } + } + else if (char.IsLetter(ch)) + color = Color.Black; + else if (Char.IsDigit(ch)) + color = Color.Blue; + else if (ch == '"') + { + inQ = true; + color = Color.Green; + } + else + { + bold = true; + color = Color.Red; + } + + if (color != Color.None) + SetColor(ref colored, color, bold); + + if (ch == ')') + colored += ' '; + colored += ch; + if (ch == ')') + colored += ' '; + } + sb.Length = sb.Length - 5; + sb.AppendLine(colored); + sb.Append("\\par\\par}"); + LockWindowUpdate(tb.Handle); + tb.Rtf = sb.ToString(); + tb.SelectionStart = tb.Text.Length; + tb.ScrollToCaret(); + LockWindowUpdate(IntPtr.Zero); + //ScrollToEnd(tb); + + } + + private void SetColor(ref string text, Color color, bool bold) + { + if (color != _currentColor) + { + text += "\\cf" + (int) color; + //if (bold) + // text += "\\b"; + text += " "; + _currentColor = color; + } + } + + private void OnSwitchEvent(EventBase theEvent) + { + AddText(theEvent.ToString()); + + ChannelEvent evt = theEvent as ChannelEvent; + if (evt == null) + return; + + TreeNode node = tv.Nodes[evt.UniqueId]; + if (node == null) + { + tv.Nodes.Add(evt.UniqueId, evt.ToString()); + node = tv.Nodes[evt.UniqueId]; + node.Tag = evt; + node.ToolTipText = evt.ToString().Replace(".", "\r\n"); + } + node.Nodes.Add(new TreeNode(evt.ToString())); + } + + private void toolStripLabel1_Click(object sender, EventArgs e) + { + tv.Nodes.Clear(); + ClearTb(); + } + } +} \ No newline at end of file Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.resx ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/ChannelWatcher.resx Mon Jun 23 11:53:51 2008 @@ -0,0 +1,123 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> +</root> \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/EventWatcher.csproj Mon Jun 23 11:53:51 2008 @@ -40,6 +40,12 @@ <Compile Include="Call.cs" /> <Compile Include="CallManager.cs" /> <Compile Include="CallStateEvent.cs" /> + <Compile Include="ChannelWatcher.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="ChannelWatcher.Designer.cs"> + <DependentUpon>ChannelWatcher.cs</DependentUpon> + </Compile> <Compile Include="Extension.cs" /> <Compile Include="Form1.cs"> <SubType>Form</SubType> @@ -52,6 +58,10 @@ </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <EmbeddedResource Include="ChannelWatcher.resx"> + <SubType>Designer</SubType> + <DependentUpon>ChannelWatcher.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Form1.resx"> <SubType>Designer</SubType> <DependentUpon>Form1.cs</DependentUpon> Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Program.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Program.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/Program.cs Mon Jun 23 11:53:51 2008 @@ -14,7 +14,7 @@ { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new ChannelWatcher()); } } } \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/Program.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/Program.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitch.EventSocket.Test/Program.cs Mon Jun 23 11:53:51 2008 @@ -1,8 +1,7 @@ using System; -using System.Collections.Generic; +using System.Collections.Specialized; using System.IO; -using System.Reflection; -using System.Text; +using System.Threading; namespace FreeSwitch.EventSocket.Test { @@ -10,18 +9,70 @@ { static void Main(string[] args) { - EventManager mgr = new EventManager(); + /*EventManager mgr = new EventManager(); mgr.Subscribe(Events.GetChannelEvents()); mgr.Start("localhost"); Console.ReadLine(); + */ + Program p = new Program(); + p.Test(); - string buffer = File.ReadAllText("..\\..\\..\\watcherRaw.log"); - int bufLen = buffer.Length; + } + + private int _counter; + private EventParser _parser; + Random _rand = new Random((int)DateTime.Now.Ticks); + + public void Test() + { + _parser = new EventParser(); + string text = File.ReadAllText("C:\\mymsgs.txt"); + Thread[] threads = new Thread[5]; + for (int i = 0; i < 5; ++i) + threads[i] = new Thread(FeedStream); + + while (StreamFeeder(ref text)) ; + //Parse(text); +/* + Parse(File.ReadAllText("C:\\events1.txt")); + Parse(File.ReadAllText("C:\\events2.txt")); + Parse(File.ReadAllText("C:\\events3.txt")); +*/ + } + + public void FeedStream() + { + + } + public bool StreamFeeder(ref string text) + { + int length; + if (text.Length < 5) + length = text.Length; + else + length = _rand.Next(text.Length / 2); + + string myText = text.Substring(0, length); + Parse(myText); + text = text.Remove(0, length); + return text.Length > 0; + } + + public void Parse(string text) + { + _parser.Append(text); + PlainEventMsg msg = _parser.ParseOne(); + while (msg != null) + { + ++_counter; + + NameValueCollection pars = msg.ParseBody(true); + Console.WriteLine(pars["event-name"]); + + msg = _parser.ParseOne(); + } - EventParser ep = new EventParser(buffer); - //int cnt = 0; - EventSocket es = new EventSocket(); - es.Setup(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/ChannelEvent.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/ChannelEvent.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/ChannelEvent.cs Mon Jun 23 11:53:51 2008 @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class ChannelEvent : EventBase @@ -62,5 +58,12 @@ return true; } + + public override string ToString() + { + return + "ChannelEvent(" + _uniqueId + " [" + _callDirection + "] " + _answerState + + ", channelInfo{" + _channelInfo + "})"; + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelAnswer.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelAnswer.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelAnswer.cs Mon Jun 23 11:53:51 2008 @@ -2,5 +2,9 @@ { public class EventChannelAnswer : EventChannelState { + public override string ToString() + { + return "ChannelAnswer." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelApplication.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelApplication.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelApplication.cs Mon Jun 23 11:53:51 2008 @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelApplication : EventChannelState { + public override string ToString() + { + return "ChannelApplication." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelBridge.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelBridge.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelBridge.cs Mon Jun 23 11:53:51 2008 @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelBridge : EventChannelState { + public override string ToString() + { + return "ChannelBridge." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelCreate.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelCreate.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelCreate.cs Mon Jun 23 11:53:51 2008 @@ -2,5 +2,9 @@ { public class EventChannelCreate : ChannelEvent { + public override string ToString() + { + return "ChannelCreate." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelDestroy.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelDestroy.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelDestroy.cs Mon Jun 23 11:53:51 2008 @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelDestroy : EventChannelState { + public override string ToString() + { + return "ChannelDestroy." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecute.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecute.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecute.cs Mon Jun 23 11:53:51 2008 @@ -28,5 +28,10 @@ return true; } + + public override string ToString() + { + return "EventChannelExecute(" + _appName + ", '" + _arguments + "')." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecuteComplete.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecuteComplete.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelExecuteComplete.cs Mon Jun 23 11:53:51 2008 @@ -28,6 +28,11 @@ return true; } + + public override string ToString() + { + return "ExecuteComplete(" + _appName + ", '" + _arguments + "')." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelHangup.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelHangup.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelHangup.cs Mon Jun 23 11:53:51 2008 @@ -33,6 +33,10 @@ return true; } + public override string ToString() + { + return "ChannelHangup(" + _hangupCause + ")." + base.ToString(); + } } public enum HangupCause Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOriginate.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOriginate.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOriginate.cs Mon Jun 23 11:53:51 2008 @@ -1,11 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelOriginate : ChannelEvent { - + public override string ToString() + { + return "ChannelOriginate." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOutgoing.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOutgoing.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelOutgoing.cs Mon Jun 23 11:53:51 2008 @@ -1,11 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelOutgoing : EventChannelState { - + public override string ToString() + { + return "ChannelOutgoing." + base.ToString(); + } } } Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelPark.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelPark.cs Mon Jun 23 11:53:51 2008 @@ -0,0 +1,10 @@ +namespace FreeSwitch.EventSocket +{ + public class EventChannelPark : EventChannelState + { + public override string ToString() + { + return "ChannelPark." + base.ToString(); + } + } +} Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelProgress.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelProgress.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelProgress.cs Mon Jun 23 11:53:51 2008 @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelProgress : EventChannelState { + public override string ToString() + { + return "ChannelProgress" + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelState.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelState.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelState.cs Mon Jun 23 11:53:51 2008 @@ -2,8 +2,15 @@ { public class EventChannelState : ChannelEvent { - private PartyInfo _caller = new PartyInfo(); - private PartyInfo _originator = new PartyInfo(); + private const string Yes = "yes"; + private const string CallerTag = "caller-"; + private const string OriginatorTag = "originator-"; + private const string OriginateeTag = "originatee-"; + private const string OtherLegTag = "other-leg-"; + private const string ScreenBitTag = "screen-bit"; + private PartyInfo _caller = PartyInfo.Empty; + private PartyInfo _originator = PartyInfo.Empty; + private PartyInfo _otherLeg = PartyInfo.Empty; private bool _screenBit = false; /// <summary> @@ -34,30 +41,58 @@ set { _screenBit = value; } } + /// <summary> + /// Other leg of call. + /// </summary> + public PartyInfo OtherLeg + { + get { return _otherLeg; } + set { _otherLeg = value; } + } + public override bool ParseCommand(string name, string value) { - if (name == "screen-bit") + if (name == ScreenBitTag) { - ScreenBit = value == "yes"; + ScreenBit = value == Yes; return true; } - else if (name.Length > 11 && name.Substring(0, 11) == "originator-" - || name.Length > 11 && name.Substring(0, 11) == "originatee-") + else if (name.Length > 11 && name.Substring(0, 11) == OriginatorTag + || name.Length > 11 && name.Substring(0, 11) == OriginateeTag) { - if (_originator == null) + if (_originator == PartyInfo.Empty) _originator = new PartyInfo(); return _originator.Parse(name.Substring(11), value); } - else if (name.Length > 7 && name.Substring(0, 7) == "caller-") + else if (name.Length > 7 && name.Substring(0, 7) == CallerTag) { - if (_caller == null) + if (_caller == PartyInfo.Empty) _caller = new PartyInfo(); return _caller.Parse(name.Substring(7), value); } + else if (name.Length > 10 && name.Substring(0, 10) == OtherLegTag) + { + if (_otherLeg == PartyInfo.Empty) + _otherLeg = new PartyInfo(); + + return _otherLeg.Parse(name.Substring(10), value); + } else return base.ParseCommand(name, value); } + + public override string ToString() + { + string temp = "ChannelState("; + if (Caller != PartyInfo.Empty) + temp += " Caller{" + Caller + "}"; + if (Originator != PartyInfo.Empty) + temp += " Originator{" + Originator + "}"; + if (OtherLeg != PartyInfo.Empty) + temp += " OtherLeg{" + OtherLeg + "}"; + return temp + ")." + base.ToString(); + } } } \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnbridge.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnbridge.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnbridge.cs Mon Jun 23 11:53:51 2008 @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelUnbridge : EventChannelState { + public override string ToString() + { + return "ChannelUnbridge." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnpark.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnpark.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventChannelUnpark.cs Mon Jun 23 11:53:51 2008 @@ -1,10 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class EventChannelUnpark : EventChannelState { + public override string ToString() + { + return "ChannelUnpark." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventCodec.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventCodec.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventCodec.cs Mon Jun 23 11:53:51 2008 @@ -2,5 +2,9 @@ { public class EventCodec : EventChannelState { + public override string ToString() + { + return "Codec." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmf.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmf.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmf.cs Mon Jun 23 11:53:51 2008 @@ -31,5 +31,10 @@ return base.ParseCommand(name, value); } + + public override string ToString() + { + return "Dtmf(" + _digit + ")." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmfStatus.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmfStatus.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventDtmfStatus.cs Mon Jun 23 11:53:51 2008 @@ -27,5 +27,10 @@ return base.ParseCommand(name, value); } + + public override string ToString() + { + return "DtmfStatus." + base.ToString(); + } } } Added: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventSessionCrash.cs ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelEvents/EventSessionCrash.cs Mon Jun 23 11:53:51 2008 @@ -0,0 +1,10 @@ +namespace FreeSwitch.EventSocket.ChannelEvents +{ + public class EventSessionCrash : ChannelEvent + { + public override string ToString() + { + return "SessionCrash." + base.ToString(); + } + } +} Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Mon Jun 23 11:53:51 2008 @@ -9,8 +9,10 @@ SoftExecute, // Channel is in a passive transmit state Execute, // Channel is executing it's dialplan ExchangeMedia, // Channel is exchanging media + Park, ConsumeMedia, // Channel is consuming media Hibernate, // Channel is in a sleep state + Reset, Hangup, // Channel is flagged for hangup and ready to end Done, // Channel is ready to be destroyed and out of the state machine Unknown @@ -21,9 +23,9 @@ { private ChannelState _state; private int _stateNumber; - private string _profile; - private string _address; - private string _hostName; + private string _profile = string.Empty; + private string _address = string.Empty; + private string _hostName = string.Empty; private string _protocol = string.Empty; private string _readCodecName; private int _readCodecRate; @@ -209,10 +211,12 @@ case "CS_SOFT_EXECUTE": return ChannelState.SoftExecute; case "CS_EXECUTE": return ChannelState.Execute; case "CS_EXCHANGE_MEDIA": return ChannelState.ExchangeMedia; + case "CS_PARK": return ChannelState.Park; case "CS_CONSUME_MEDIA": return ChannelState.ConsumeMedia; case "CS_HIBERNATE": return ChannelState.Hibernate; case "CS_HANGUP": return ChannelState.Hangup; case "CS_DONE": return ChannelState.Done; + case "CS_RESET": return ChannelState.Reset; default: return ChannelState.Unknown; } } @@ -221,5 +225,10 @@ { return "Unknown"; } + + public override string ToString() + { + return _address + "@" + _hostName + ": " + _state; + } } } 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 Mon Jun 23 11:53:51 2008 @@ -25,6 +25,7 @@ private readonly IList<ChannelVariable> _variables = new List<ChannelVariable>(); private string _callerIdName = null; private string _callerIdNumber = null; + private bool _varsAdded = false; public Originate() {} @@ -73,9 +74,13 @@ { get { - _variables.Add(new ChannelVariable("origination_caller_id_name", CallerIdName ?? _caller.Extension)); - if (!string.IsNullOrEmpty(_callerIdNumber)) - _variables.Add(new ChannelVariable("origination_caller_id_number", _callerIdNumber)); + if (!_varsAdded) + { + _variables.Add(new ChannelVariable("origination_caller_id_name", CallerIdName ?? _caller.Extension)); + if (!string.IsNullOrEmpty(_callerIdNumber)) + _variables.Add(new ChannelVariable("origination_caller_id_number", _callerIdNumber)); + _varsAdded = true; + } string variables = string.Empty; foreach (ChannelVariable var in _variables) 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 Mon Jun 23 11:53:51 2008 @@ -13,8 +13,8 @@ { private readonly EventSocket _socket = new EventSocket(); public event EventHandler EventReceived; - private EventsWriter _writer; - private TextWriter _myWriter; + private readonly EventsWriter _writer; + private readonly TextWriter _rawLog; public string Password { set { _socket.Password = value; } @@ -22,13 +22,14 @@ public EventManager() { - _writer = MyWriter; - _myWriter = new StreamWriter(new FileStream("C:\\temp\\WatcherRow.log", FileMode.Create, FileAccess.Write, FileShare.ReadWrite)); + _writer = RawWriter; + _rawLog = new StreamWriter(new FileStream("C:\\temp\\WatcherRaw.log", FileMode.Create, FileAccess.Write, FileShare.ReadWrite)); } - private void MyWriter(string text) + private void RawWriter(string text) { - _myWriter.Write(text); + _rawLog.Write(text); + _rawLog.Flush(); } @@ -68,7 +69,7 @@ protected void OnMessage(PlainEventMsg msg) { - NameValueCollection parameters = msg.BodyToNameValue(true); + NameValueCollection parameters = msg.ParseBody(true); string eventName = parameters["event-name"]; if (eventName == null) return; 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 Mon Jun 23 11:53:51 2008 @@ -1,99 +1,190 @@ -using EventSocketParser; +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; namespace FreeSwitch.EventSocket { public class EventParser { - private PlainEventMsg _msg; - private readonly StringParser _parser; + private static readonly char[] BugWorkaround = {'C', 'o', 'n', 't', 'e', 'n', 't', '-'}; + private readonly StringBuilder _text = new StringBuilder(); + private readonly Queue<string> _piecesToAppend = new Queue<string>(); - public EventParser(string text) + public string Text { - _parser = new StringParser(text); + get { return _text.ToString(); } } - public PlainEventMsg ParseMessage() + internal static void ParseHeaders(PlainEventMsg msg, string header) { - _parser.ClearSavedPositions(); - _msg = new PlainEventMsg(); - - // Save pos if we cant parse the whole message - _parser.SavePos(); - - ReadHeader(); - if (!_msg.ValidateHeader()) - { - _parser.RestorePos(); - return null; - } - - // skip empty line between body and header - _parser.ReadLine(true); - - // we got no body. - if (_msg.ContentLength == -1) - return _msg; - - // Unfortunately, \n\n doesnt appear after all content. - if (_msg.ContentLength != 0) - _msg.Body = _parser.Read(_msg.ContentLength); - else - _msg.Body = _parser.ReadToEmptyLine(); - - // assume that we have not got a complete packet yet. - if (!_msg.Validate()) - { - _parser.RestorePos(); - return null; - } - - return _msg; - } - - public bool ReadHeader() - { - // skip empty lines - while (!_parser.EOF && _parser.PeekWord(true, true) == string.Empty) - _parser.ReadLine(false); - - if (_parser.EOF) - return false; - - string name = _parser.Read(':', true); + StringParser parser = new StringParser(header); + string name = parser.Read(':', true); while (name != string.Empty) { switch (name) { case "Content-Length": - _msg.ContentLength = int.Parse(_parser.ReadLine(true)); + msg.ContentLength = int.Parse(parser.ReadLine(true)); break; case "Content-Type": - _msg.ContentType = _parser.ReadLine(true); + msg.ContentType = parser.ReadLine(true); break; case "Reply-Text": - _msg.Body = _parser.ReadLine(); + msg.Body = parser.ReadLine(true); break; } // empty line == end of header - if (_parser.EOL) + if (parser.EOL) break; - name = _parser.Read(':', true); + name = parser.Read(':', true); } + } + /* + private int IsLineBreaks(int pos) + { + if (pos > 0 && Text[pos] == '\n' && Text[pos - 1] == '\n') + return 1; + if (pos > 3 && Text[pos] == '\n' && Text[pos - 1] == '\r' + && Text[pos - 2] == '\n' && Text[pos - 3] == '\r') + return 3; + return 0; + } + */ + public void Clear() + { + lock (Text) + _text.Length = 0; + } - return _msg.ContentType != string.Empty; + private void IgnoreLineBreaks(ref int i) + { + while (i < Text.Length && (Text[i] == '\n' || Text[i] == '\r')) + ++i; } - public void Append(string value) + /// <summary> + /// + /// </summary> + /// <returns></returns> + /// <exception cref="InvalidDataException">If parsing failed due to invalid format.</exception> + public PlainEventMsg ParseOne() { - _parser.RemoveUsedContent(); - _parser.Append(value); + // Move queue to text + lock (_piecesToAppend) + { + while (_piecesToAppend.Count > 0) + _text.Append(_piecesToAppend.Dequeue()); + } + + PlainEventMsg plainEvent; + lock (Text) + { + int i = 0; + + // find complete header + bool found = false; + for (; i < Text.Length - 1; ++i) + { + if (Text[i] == '\n' && Text[i+1] == '\n') + { + found = true; + break; + } + } + if (!found) + return null; + + // extract header + char[] chars = new char[i]; + Text.CopyTo(0, chars, 0, i); + string headers = new string(chars); +#if DEBUG + Console.WriteLine("===================================="); + Console.WriteLine("Headers: "); + Console.WriteLine(headers); +#endif + IgnoreLineBreaks(ref i); + + plainEvent = new PlainEventMsg(); + ParseHeaders(plainEvent, headers); + + // we got a body? + if (plainEvent.ContentLength > 0) + { + // Start of Empty header bugfix + // FS seems to send a header with content-length without sending an actual body + // this will eat that kind of header. + if (Text.Length >= BugWorkaround.Length + i) + { + found = true; + for (int index = 0; index < BugWorkaround.Length; ++index) + { + if (Text[index + i] != BugWorkaround[index]) + { + found = false; + break; + } + } + if (found) + { + Text.Remove(0, i); + Console.WriteLine("Removing empty content header."); + return null; + } + } + // end of bugfix. + + // not enough data for body. + if (plainEvent.ContentLength + i > Text.Length) + return null; + + // extract body + chars = new char[plainEvent.ContentLength]; + 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) + { + Console.WriteLine("Fucked up 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("Fucked up event: " + Text); + } + +#if DEBUG + Console.WriteLine("Body:"); + Console.WriteLine(plainEvent.Body); +#endif + if (plainEvent.Body.Length < plainEvent.ContentLength) + throw new InvalidDataException("Body contents are too small!"); + + // Move forward to next header + i += plainEvent.ContentLength; + IgnoreLineBreaks(ref i); + } + + + // remove header( + body) from buffer + Text.Remove(0, i); + } + + return plainEvent; } - public void Clear() + + public void Append(string text) { - _parser.Clear(); + lock (_piecesToAppend) + _piecesToAppend.Enqueue(text); } } } \ No newline at end of file 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 Mon Jun 23 11:53:51 2008 @@ -24,18 +24,30 @@ private bool _autoConnect = true; private Events _events; private string _hostName; - private readonly EventParser _parser = new EventParser(string.Empty); + private readonly EventParser _parser = new EventParser(); public event DataHandler DataReceived; private string _password = "ClueCon"; private int _port = 8021; - private object _lockobj = new object(); + private readonly object _lockobj = new object(); private readonly byte[] _readBuffer = new byte[8192]; - private string _temp = string.Empty; - private Socket _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + private Socket _socket; private NetworkStream _stream; private Timer _timer; private bool _authed = false; const int RetryTimeout = 5000; + private bool _parsing = false; + + public EventSocket() + { + CreateSocket(); + } + + private void CreateSocket() + { + _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + _socket.NoDelay = true; + _socket.ReceiveBufferSize = 65535; + } public string Password { @@ -112,15 +124,18 @@ private void OnReadCompleted(IAsyncResult ar) { - int bytesRead; + string inbuffer; try { - bytesRead = _stream.EndRead(ar); + int bytesRead = _stream.EndRead(ar); if (bytesRead == 0) { HandleDisconnect(); return; } + inbuffer = Encoding.ASCII.GetString(_readBuffer, 0, bytesRead); + _parser.Append(inbuffer); + BeginRead(); } catch (IOException) { @@ -129,14 +144,22 @@ return; } - string text = Encoding.ASCII.GetString(_readBuffer, 0, bytesRead); if (DataReceived != null) - DataReceived(text); - _temp += text; - _parser.Append(text); - ParseMessages(); + DataReceived(inbuffer); - _stream.BeginRead(_readBuffer, 0, _readBuffer.Length, OnReadCompleted, null); + try + { + ParseMessages(); + } + catch (InvalidDataException) + { + HandleDisconnect(); + } + catch (ArgumentException) + { + Console.WriteLine(_parser.Text); + HandleDisconnect(); + } } /// <summary> @@ -176,39 +199,56 @@ _stream.Write(bytes, 0, bytes.Length); } + static readonly object locker = new object(); private void ParseMessages() { - PlainEventMsg msg = _parser.ParseMessage(); - while (msg != null) + + lock (locker) { - 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 (_parsing) + return; + _parsing = true; + } + + try + { + PlainEventMsg msg = _parser.ParseOne(); + while (msg != null) { - if (_commands.Count > 0) + if (msg.ContentType == "auth/request") { - CmdBase cmd = _commands.Dequeue(); - cmd.HandleReply(cmd.CreateReply(msg.Body)); + 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 { - Console.ForegroundColor = ConsoleColor.Red; - Console.WriteLine("Got command reply or api response, but no actual command/api: " + msg.Body); - Console.ForegroundColor = ConsoleColor.Gray; + if (MessageReceived != null) + MessageReceived(msg); } - } - else - { - if (MessageReceived != null) - MessageReceived(msg); - } - msg = _parser.ParseMessage(); + msg = _parser.ParseOne(); + } + } + finally + { + lock (locker) + _parsing = false; } } @@ -223,7 +263,7 @@ _parser.Clear(); _authed = false; _socket.Close(); - _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + CreateSocket(); if (_stream != null) { _stream.Dispose(); Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Events/EventBase.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Events/EventBase.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/Events/EventBase.cs Mon Jun 23 11:53:51 2008 @@ -155,5 +155,10 @@ } return true; } + + public override string ToString() + { + return "Base(" + m_name + ")"; + } } } \ No newline at end of file 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 Mon Jun 23 11:53:51 2008 @@ -43,10 +43,12 @@ <Compile Include="ChannelEvents\EventChannelBridge.cs" /> <Compile Include="ChannelEvents\ChannelEvent.cs" /> <Compile Include="ChannelEvents\EventChannelAnswer.cs" /> + <Compile Include="ChannelEvents\EventChannelPark.cs" /> <Compile Include="ChannelEvents\EventChannelProgress.cs" /> <Compile Include="ChannelEvents\EventChannelUnbridge.cs" /> <Compile Include="ChannelEvents\EventChannelUnpark.cs" /> <Compile Include="ChannelEvents\EventCodec.cs" /> + <Compile Include="ChannelEvents\EventSessionCrash.cs" /> <Compile Include="ChannelInfo.cs" /> <Compile Include="Commands\AnyCommand.cs"> </Compile> Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PartyInfo.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PartyInfo.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PartyInfo.cs Mon Jun 23 11:53:51 2008 @@ -1,12 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { public class PartyInfo { - private string m_userName = string.Empty; + public static PartyInfo Empty = new PartyInfo(); + private string _userName = string.Empty; private string m_dialplan = string.Empty; private string m_callerIdName = string.Empty; private string m_callerIdNumber = string.Empty; @@ -14,14 +11,14 @@ private string m_uniqueId = string.Empty; private string m_source = string.Empty; private string m_context = string.Empty; - private string m_channelName = string.Empty; + private string _channelName = string.Empty; private bool m_screenBit; private bool m_privacyHideName; private bool m_privacyHideNumber; public PartyInfo() { - m_userName = string.Empty; + _userName = string.Empty; m_dialplan = string.Empty; m_callerIdName = string.Empty; } @@ -70,8 +67,8 @@ public string ChannelName { - get { return m_channelName; } - set { m_channelName = value; } + get { return _channelName; } + set { _channelName = value; } } public bool ScreenBit @@ -94,8 +91,8 @@ public string UserName { - get { return m_userName; } - set { m_userName = value; } + get { return _userName; } + set { _userName = value; } } public bool Parse(string name, string value) @@ -103,7 +100,7 @@ switch (name) { case "username": - m_userName = value; + _userName = value; break; case "dialplan": Dialplan = value; @@ -146,5 +143,11 @@ } + public override string ToString() + { + return _channelName + "(" + CallerIdName + "/" + CallerIdNumber + ") id: "+UniqueId+", destination: " + DestinationNumber; + + } + } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PlainEventMsg.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PlainEventMsg.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/PlainEventMsg.cs Mon Jun 23 11:53:51 2008 @@ -1,6 +1,5 @@ using System; using System.Collections.Specialized; -using EventSocketParser; namespace FreeSwitch.EventSocket { @@ -50,7 +49,7 @@ } - public NameValueCollection BodyToNameValue(bool urlDecodeValues) + public NameValueCollection ParseBody(bool urlDecodeValues) { NameValueCollection items = new NameValueCollection(); StringParser parser = new StringParser(_body); @@ -64,7 +63,7 @@ { items.Add(name.ToLower(), Uri.UnescapeDataString(value)); } - catch (UriFormatException) + catch (UriFormatException) { // add the value unformatted items.Add(name.ToLower(), value); @@ -77,4 +76,4 @@ return items; } } -} +} \ No newline at end of file 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 Mon Jun 23 11:53:51 2008 @@ -10,7 +10,7 @@ //private string _expires; //not "presencein/register", "presenceout/register" private string _eventType = string.Empty; private string _login = string.Empty; - private EventChannelState _channelState; + private EventChannelState _channelState = new EventChannelState(); public string Login { @@ -71,6 +71,7 @@ * */ public override bool ParseCommand(string name, string value) { + bool res = _channelState.ParseCommand(name, value); switch (name) { case "status": @@ -87,6 +88,7 @@ break; default: + if (name.Length > 7 && name.Substring(0, 7) == "caller-") { if (Caller == null) @@ -98,15 +100,16 @@ if (base.ParseCommand(name, value)) return true; else - { - if (_channelState == null) - _channelState = new EventChannelState(); - return _channelState.ParseCommand(name, value); - } + return res; } } return true; } + + public override string ToString() + { + return "Presence(" + _login + ", " + _status + ")." + _channelState + "." + base.ToString(); + } } } \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceIn.cs Mon Jun 23 11:53:51 2008 @@ -2,5 +2,9 @@ { public class EventPresenceIn : EventPresence { + public override string ToString() + { + return "PresenceIn." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceOut.cs Mon Jun 23 11:53:51 2008 @@ -2,7 +2,11 @@ { public class EventPresenceOut : EventPresence { - + public override string ToString() + { + return "PresenceOut." + base.ToString(); + } + } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresenceProbe.cs Mon Jun 23 11:53:51 2008 @@ -6,5 +6,11 @@ { class EventPresenceProbe : EventPresence { + public override string ToString() + { + return "PresenceProbe." + base.ToString(); + } + } + } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventRoster.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventRoster.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventRoster.cs Mon Jun 23 11:53:51 2008 @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Text; - namespace FreeSwitch.EventSocket { class EventRoster : SipEvent 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 Mon Jun 23 11:53:51 2008 @@ -59,5 +59,10 @@ return true; } + + public override string ToString() + { + return "SofiaExpire(" + _userName + "@" + _domain + ")." + base.ToString(); + } } } Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaRegister.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaRegister.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaRegister.cs Mon Jun 23 11:53:51 2008 @@ -88,5 +88,12 @@ } return true; } + + public override string ToString() + { + return "SofiaRegister(" + _user + "@" + _domain + ", " + _expires + ")." + base.ToString(); + } } + + } \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/SipEvent.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/SipEvent.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/SipEvent.cs Mon Jun 23 11:53:51 2008 @@ -35,5 +35,10 @@ } return true; } + + public override string ToString() + { + return "Sip(" + _from + ")." + base.ToString(); + } } } \ No newline at end of file Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/StringParser.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/StringParser.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/StringParser.cs Mon Jun 23 11:53:51 2008 @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EventSocketParser +namespace FreeSwitch.EventSocket { internal class StringParser { @@ -44,12 +44,8 @@ public void RestorePos() { - _pos = _savedPositions.Pop(); - } - - public void RemoveSavedPos() - { - _savedPositions.Pop(); + if (_savedPositions.Count > 0) + _pos = _savedPositions.Pop(); } public void ClearSavedPositions() @@ -59,17 +55,19 @@ private bool IsEOF(int pos) { - return pos >= _text.Length - 1; + return pos >= _text.Length; } public bool IsEmptyLine(bool skipWhitespaces) { if (EOF) return false; - else if (_pos == _text.Length - 1) + else if (_pos < _text.Length - 1) return _text[_pos] == '\n'; - else + else if (_pos < _text.Length - 2) return _text[_pos] == '\r' && _text[_pos + 1] == '\n'; + + return false; } public string PeekWord(bool skipWS, bool stopAtEOL) @@ -126,10 +124,10 @@ int endpos = _pos; _pos = pos; - // Move to after new line chars - if (_text[_pos] == '\r') - _pos += 2; - else + // Move to after new line chars + if (!EOF && _text[_pos] == '\r') + ++_pos; + if (!EOF && _text[_pos] == '\n') ++_pos; // .. and the result is line without whitespaces at the end and without new line chars. @@ -196,6 +194,9 @@ private int TrimEnd() { + if (EOF) + return _pos; + int pos = _pos; while (IsWS(_text[pos])) --pos; @@ -216,7 +217,9 @@ private bool IsEOL() { - if (_text[_pos] == '\r' && _text[_pos + 1] == '\n') + if (EOF) + return true; + if (_text[_pos] == '\r') return true; else if (_text[_pos] == '\n') return true;

1 0

[commit] r8816 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 23 Jun '08

23 Jun '08

Author: mikej Date: Mon Jun 23 11:43:27 2008 New Revision: 8816 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add count optional arg to show calls and show channels (MODAPP-103) Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Jun 23 11:43:27 2008 @@ -1789,6 +1789,7 @@ int print_title; switch_xml_t xml; int rows; + int justcount; }; static int show_as_xml_callback(void *pArg, int argc, char **argv, char **columnNames) @@ -1803,7 +1804,12 @@ return -1; } } - + + if (holder->justcount) { + holder->count++; + return 0; + } + if (!(row = switch_xml_add_child_d(holder->xml, "row", holder->rows++))) { return -1; } @@ -1836,7 +1842,12 @@ { struct holder *holder = (struct holder *) pArg; int x; - + + if (holder->justcount) { + holder->count++; + return 0; + } + if (holder->print_title && holder->count == 0) { if (holder->http) { holder->stream->write_function(holder->stream, "\n<tr>"); @@ -1911,7 +1922,7 @@ return SWITCH_STATUS_SUCCESS; } -#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls|channels|aliases|complete" +#define SHOW_SYNTAX "codec|application|api|dialplan|file|timer|calls [count]|channels [count]|aliases|complete" SWITCH_STANDARD_API(show_function) { char sql[1024]; @@ -1929,13 +1940,16 @@ } db = switch_core_db_handle(); - + + holder.justcount = 0; + if (cmd && (mydata = strdup(cmd))) { argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); command = argv[0]; if (argv[2] && !strcasecmp(argv[1], "as")) { as = argv[2]; } + } if (stream->param_event) { @@ -1962,8 +1976,20 @@ sprintf(sql, "select name, description, syntax from interfaces where type = '%s' and description != '' order by type,name", command); } else if (!strcasecmp(command, "calls")) { sprintf(sql, "select * from calls order by created_epoch"); + if (argv[1] && !strcasecmp(argv[1],"count")) { + holder.justcount = 1; + if (argv[3] && !strcasecmp(argv[2], "as")) { + as = argv[3]; + } + } } else if (!strcasecmp(command, "channels")) { sprintf(sql, "select * from channels order by created_epoch"); + if (argv[1] && !strcasecmp(argv[1],"count")) { + holder.justcount = 1; + if (argv[3] && !strcasecmp(argv[2], "as")) { + as = argv[3]; + } + } } else if (!strcasecmp(command, "aliases")) { sprintf(sql, "select * from aliases order by alias"); } else if (!strcasecmp(command, "complete")) {

1 0

[commit] r8815 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by Freeswitch SVN 22 Jun '08

22 Jun '08

Author: anthm Date: Sat Jun 21 20:38:39 2008 New Revision: 8815 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/http.c freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c Log: fix missing initilization Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/http.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/http.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/http.c Sat Jun 21 20:38:39 2008 @@ -868,9 +868,11 @@ -----------------------------------------------------------------------------*/ bool endOfHeaders; - assert(!sessionP->validRequest); - /* Calling us doesn't make sense if there is already a valid request */ - + /* Calling us doesn't make sense if there is already a valid request */ + if (sessionP->validRequest) { + return; + } + *httpErrorCodeP = 0; /* initial assumption */ endOfHeaders = false; /* Caller assures us there is at least one header */ Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c Sat Jun 21 20:38:39 2008 @@ -529,7 +529,7 @@ uint32_t const timeout, bool * const keepAliveP) { - TSession session; + TSession session = {0}; /* initilization, an afforadble alternative to random memory being misinterpreted! */ RequestInit(&session, connectionP);

1 0

[commit] r8814 - freeswitch/trunk/conf/autoload_configs
by Freeswitch SVN 19 Jun '08

19 Jun '08

Author: brian Date: Thu Jun 19 11:54:03 2008 New Revision: 8814 Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Log: remove this module Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Thu Jun 19 11:54:03 2008 @@ -19,7 +19,6 @@ <load module="mod_cdr_csv"/>  <load module="mod_event_socket"/> -

1 0

[commit] r8813 - freeswitch/trunk
by Freeswitch SVN 19 Jun '08

19 Jun '08

Author: cypromis Date: Wed Jun 18 20:33:10 2008 New Revision: 8813 Modified: freeswitch/trunk/freeswitch.spec Log: Update freeswitch.spec for mod_perl dependencies Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Wed Jun 18 20:33:10 2008 @@ -35,6 +35,8 @@ BuildRequires: pkgconfig BuildRequires: termcap BuildRequires: unixODBC-devel +BuildRequires: gdbm-devel +BuildRequires: db4-devel %if %{?suse_version:1}0 %if 0%{?suse_version} > 910 @@ -170,7 +172,7 @@ MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES" export MODULES=$MYMODULES -rm modules.conf +rm -f modules.conf touch modules.conf for i in $MODULES; do echo $i >> modules.conf; done export VERBOSE=yes

1 0

[commit] r8812 - in freeswitch/trunk/src/mod: applications/mod_conference applications/mod_fifo applications/mod_voicemail endpoints/mod_dingaling event_handlers/mod_cdr_csv event_handlers/mod_event_multicast event_handlers/mod_event_socket event_handlers/mod_zeroconf languages/mod_spidermonkey loggers/mod_logfile
by Freeswitch SVN 18 Jun '08

18 Jun '08

Author: brian Date: Wed Jun 18 14:42:21 2008 New Revision: 8812 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Log: MODLANG-67 part2 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 Wed Jun 18 14:42:21 2008 @@ -5258,7 +5258,7 @@ switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); /* Subscribe to presence request events */ - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Jun 18 14:42:21 2008 @@ -1182,7 +1182,7 @@ } /* Subscribe to presence request events */ - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't subscribe to presence request events!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Jun 18 14:42:21 2008 @@ -2913,7 +2913,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_APP(app_interface, "voicemail", "Voicemail", VM_DESC, voicemail_function, VM_USAGE, SAF_NONE); - if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) + if (switch_event_bind(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Wed Jun 18 14:42:21 2008 @@ -1755,22 +1755,22 @@ return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_PRESENCE_IN, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_PRESENCE_PROBE, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_PRESENCE_OUT, SWITCH_EVENT_SUBCLASS_ANY, pres_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_ROSTER, SWITCH_EVENT_SUBCLASS_ANY, roster_event_handler, NULL) + if (switch_event_bind(modname, SWITCH_EVENT_ROSTER, SWITCH_EVENT_SUBCLASS_ANY, roster_event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Wed Jun 18 14:42:21 2008 @@ -363,7 +363,7 @@ { switch_status_t status = SWITCH_STATUS_SUCCESS; - if (switch_event_bind((char *) modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c Wed Jun 18 14:42:21 2008 @@ -231,7 +231,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); switch_socket_close(globals.udp_socket); return SWITCH_STATUS_GENERR; Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Wed Jun 18 14:42:21 2008 @@ -1357,7 +1357,7 @@ listen_list.ready = 1; - if (switch_event_bind((char *) modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_ALL, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/mod_zeroconf.c Wed Jun 18 14:42:21 2008 @@ -218,12 +218,12 @@ return SWITCH_STATUS_MEMERR; } } else if (!strcasecmp(var, "publish") && !strcasecmp(val, "yes")) { - if (switch_event_bind((char *) modname, SWITCH_EVENT_PUBLISH, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_PUBLISH, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_UNPUBLISH, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_UNPUBLISH, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Jun 18 14:42:21 2008 @@ -3564,7 +3564,7 @@ return status; } - if (switch_event_bind((char *) modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) + if (switch_event_bind(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Wed Jun 18 14:42:21 2008 @@ -341,7 +341,7 @@ } switch_core_hash_init(&profile_hash, module_pool); - if (switch_event_bind((char *) modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { + if (switch_event_bind(modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); return SWITCH_STATUS_GENERR; }

1 0

[commit] r8811 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 18 Jun '08

18 Jun '08

Author: brian Date: Wed Jun 18 14:42:03 2008 New Revision: 8811 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Log: MODLANG-67 part1 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Wed Jun 18 14:42:03 2008 @@ -363,11 +363,38 @@ return SWITCH_STATUS_SUCCESS; } +static void message_query_handler(switch_event_t *event) +{ + char *account = switch_event_get_header(event, "message-account"); + + if (account) { + char *path, *cmd; + + path = switch_mprintf("%s%smwi.lua", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR); + switch_assert(path != NULL); + + if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) { + cmd = switch_mprintf("%s %s", path, account); + switch_assert(cmd != NULL); + lua_thread(cmd); + switch_safe_free(cmd); + } + + switch_safe_free(path); + } +} + SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load) { switch_api_interface_t *api_interface; switch_application_interface_t *app_interface; + if (switch_event_bind(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL) + != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + return SWITCH_STATUS_GENERR; + } + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname);

1 0