git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk/scripts/contrib@12881 d0543943-73ff-0310-b7d9-9358b9ac24b2

verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/HoldCmd.cs

@@ -13,7 +13,7 @@ namespace FreeSwitch.EventSocket.Commands
 
         public override string Command
         {
-            get { return "hold"; }
+            get { return "uuid_hold"; }
         }
 
         public override string Arguments

verifier/EventSocket/trunk/FreeSwitchEventSocket/Commands/Originate.cs

@@ -22,7 +22,7 @@ namespace FreeSwitch.EventSocket.Commands
     {
         private SofiaSipAddress _caller;
         private Address _destination;
-        private readonly IList<ChannelVariable> _variables = new List<ChannelVariable>();
+        private readonly IList<CallVariable> _variables = new List<CallVariable>();
         private string _callerIdName;
         private string _callerIdNumber;
         private bool _varsAdded;
@@ -49,7 +49,7 @@ namespace FreeSwitch.EventSocket.Commands
             set { _destination = value; }
         }
 
-        public IList<ChannelVariable> Variables
+        public IList<CallVariable> Variables
         {
             get { return _variables; }
         }
@@ -77,22 +77,35 @@ namespace FreeSwitch.EventSocket.Commands
             {
                 if (!_varsAdded)
                 {
-                    _variables.Add(new ChannelVariable("origination_caller_id_name", CallerIdName ?? _caller.Extension));
+                    string name = CallerIdName ?? _caller.Extension;
+                    _variables.Add(new CallVariable("origination_caller_id_name", "'" + name + "'"));
                     if (!string.IsNullOrEmpty(_callerIdNumber))
-                        _variables.Add(new ChannelVariable("origination_caller_id_number", _callerIdNumber));
+                        _variables.Add(new CallVariable("origination_caller_id_number", _callerIdNumber));
                     _varsAdded = true;
 
                     if (_autoAnswer)
-                        _variables.Add(new ChannelVariable("sip_auto_answer", "true"));
+                    {
+                        _variables.Add(new CallLegVariable("sip_invite_params", "intercom=true"));
+                        _variables.Add(new CallLegVariable("sip_h_Call-Info", "<sip:$${domain}>;answer-after=0"));
+                        _variables.Add(new CallLegVariable("sip_auto_answer", "true"));
+                    }
                 }
 
                 string variables = string.Empty;
-                foreach (ChannelVariable var in _variables)
-                    variables += var + ",";
+                string legVariables = string.Empty;
+                foreach (CallVariable var in _variables)
+                {
+                    if (var is CallLegVariable)
+                        legVariables += var + ",";
+                    else
+                        variables += var + ",";
+                }
                 if (variables.Length > 0)
                     variables = "{" + variables.Remove(variables.Length - 1, 1) + "}";
+                if (legVariables.Length > 0)
+                    legVariables = "[" + legVariables.Remove(legVariables.Length - 1, 1) + "]";
 
-                return variables + Caller + " " + Destination;
+                return variables + legVariables + Caller + " " + Destination;
             }
         }
 

verifier/EventSocket/trunk/FreeSwitchEventSocket/EventManager.cs

@@ -73,8 +73,8 @@ namespace FreeSwitch.EventSocket
         public void Start(string hostname)
         {
             _socket.MessageReceived += OnMessage;
-            _socket.Connect(hostname);
             _socket.DataReceived += OnData;
+            _socket.Connect(hostname);
         }
 
         private void OnData(string data)

verifier/EventSocket/trunk/FreeSwitchEventSocket/EventParser.cs

@@ -141,18 +141,22 @@ namespace FreeSwitch.EventSocket
                     _text.CopyTo(i, chars, 0, plainEvent.ContentLength);
                     plainEvent.Body = new string(chars);
 
-                    // check for errors.
-                    int pos = plainEvent.Body.IndexOf("\n\n");
-                    if (pos < plainEvent.Body.Length - 2)
+                    // api/response is buggy for originate, no \n\n are appended at the end.
+                    if (plainEvent.ContentType != "api/response")
                     {
-                        Console.WriteLine("Invalid event");
-                        Console.WriteLine("Header");
-                        Console.WriteLine(headers);
-                        Console.WriteLine("Body");
-                        Console.WriteLine(plainEvent.Body);
-                        Console.WriteLine("=========================== EVERYTHING in _text ==============================");
-                        Console.WriteLine(_text);
-                        throw new InvalidDataException("Invalid event: " + _text);
+                        // check for errors.
+                        int pos = plainEvent.Body.IndexOf("\n\n");
+                        if (pos < plainEvent.Body.Length - 2)
+                        {
+                            Console.WriteLine("Invalid event");
+                            Console.WriteLine("Header");
+                            Console.WriteLine(headers);
+                            Console.WriteLine("Body");
+                            Console.WriteLine(plainEvent.Body);
+                            Console.WriteLine("=========================== EVERYTHING unparsed ==============================");
+                            Console.WriteLine(_text);
+                            throw new InvalidDataException("Invalid event: " + _text);
+                        }
                     }
 
                     if (plainEvent.Body.Length < plainEvent.ContentLength)

verifier/EventSocket/trunk/FreeSwitchEventSocket/EventSocket.cs

@@ -198,12 +198,16 @@ namespace FreeSwitch.EventSocket
             }
             catch (InvalidDataException err)
             {
-                LogWriter(LogPrio.Warning, "Failed to parse event message (" + err.Message + "): " + Environment.NewLine + _parser.Text);
+                LogWriter(LogPrio.Warning,
+                          "Failed to parse event message." + Environment.NewLine + "Exception: " + err +
+                          Environment.NewLine + _parser.Text);
                 HandleDisconnect();
             }
             catch (ArgumentException err)
             {
-                LogWriter(LogPrio.Warning, "Failed to parse event message ("+err.Message+"): " + Environment.NewLine +  _parser.Text);
+                LogWriter(LogPrio.Warning,
+                          "Failed to parse event message." + Environment.NewLine + "Exception: " + err +
+                          Environment.NewLine + _parser.Text);
                 HandleDisconnect();
             }
         }
@@ -260,10 +264,10 @@ namespace FreeSwitch.EventSocket
             try
             {
                 PlainEventMsg msg = _parser.ParseOne();
-                LogWriter(LogPrio.Trace, "MessageType: " + msg.ContentType);
                 while (msg != null)
                 {
-                    switch (msg.ContentType)
+					LogWriter(LogPrio.Trace, "MessageType: " + msg.ContentType);
+					switch (msg.ContentType)
                     {
                         case "auth/request":
                             {

verifier/EventSocket/trunk/FreeSwitchEventSocket/FreeSwitch.EventSocket.csproj

@@ -70,6 +70,7 @@
     <Compile Include="Commands\SleepCmd.cs" />
     <Compile Include="EventManager.cs" />
     <Compile Include="ChannelEvents\EventDtmfStatus.cs" />
+    <Compile Include="General\CallVariable.cs" />
     <Compile Include="Ivr\DtmfEventArgs.cs" />
     <Compile Include="Ivr\IvrInterface.cs" />
     <Compile Include="Ivr\IvrQueue.cs" />
@@ -90,7 +91,7 @@
     <Compile Include="Events\EventHeartbeat.cs" />
     <Compile Include="Events\EventReSchedule.cs" />
     <Compile Include="General\Address.cs" />
-    <Compile Include="General\ChannelVariable.cs" />
+    <Compile Include="General\CallLegVariable.cs" />
     <Compile Include="General\SipAddress.cs" />
     <Compile Include="General\SofiaSipAddress.cs" />
     <Compile Include="PartyInfo.cs" />
@@ -103,6 +104,7 @@
     <Compile Include="SipEvents\EventPresenceProbe.cs" />
     <Compile Include="SipEvents\EventRoster.cs" />
     <Compile Include="Events\EventMessageWaiting.cs" />
+    <Compile Include="SipEvents\EventSofiaUnregister.cs" />
     <Compile Include="SipEvents\SipEvent.cs" />
     <Compile Include="SipEvents\EventPresence.cs" />
     <Compile Include="SipEvents\EventSofiaExpire.cs" />

verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallLegVariable.cs

+namespace FreeSwitch.EventSocket.General
+{
+    /// <summary>
+    /// Variable stored only for a specific leg.
+    /// </summary>
+    /// <remarks>
+    /// Channel variables are used in FreeSWITCH to store information
+    /// that can be used by JavaScript programs.
+    /// </remarks>
+    public class CallLegVariable : CallVariable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CallLegVariable"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="value">The value.</param>
+        public CallLegVariable(string name, string value) : base(name, value)
+        {
+        }
+
+    }
+}

verifier/EventSocket/trunk/FreeSwitchEventSocket/General/CallVariable.cs

+namespace FreeSwitch.EventSocket.General
+{
+    /// <summary>
+    /// Variable that applies to both legs in a call.
+    /// </summary>
+    /// <remarks>
+    /// Variables can be access from FreeSWITCH with the name
+    /// "variable_[name]"
+    /// </remarks>
+    public class CallVariable
+    {
+        private readonly string _name;
+        private readonly string _value;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CallVariable"/> class.
+        /// </summary>
+        /// <param name="name">Name of variable.</param>
+        /// <param name="value">Value.</param>
+        public CallVariable(string name, string value)
+        {
+            _name = name;
+            _value = value;
+        }
+
+        public string Name
+        {
+            get { return _name; }
+        }
+
+        public string Value
+        {
+            get { return _value; }
+        }
+
+        public override string ToString()
+        {
+            return _name + "=" + _value;
+        }
+    }
+}

verifier/EventSocket/trunk/FreeSwitchEventSocket/General/SofiaSipAddress.cs

 namespace FreeSwitch.EventSocket.General
 {
+    /// <summary>
+    /// Destination as a FreeSWITCH Sofia sip address.
+    /// </summary>
     public class SofiaSipAddress : Address
     {
-        private readonly string _domain;
+        private readonly string _profileName;
 
-        public SofiaSipAddress(string domain, string userName)
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SofiaSipAddress"/> class.
+        /// </summary>
+        /// <param name="profileName">Profile (context) name.</param>
+        /// <param name="userName">User name (and if needed, IP address / domain name).</param>
+        public SofiaSipAddress(string profileName, string userName)
         {
             Extension = userName;
-            _domain = domain;
+            _profileName = profileName;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SofiaSipAddress"/> class.
+        /// </summary>
+        /// <param name="address">Another address.</param>
         public SofiaSipAddress(SipAddress address)
         {
-            _domain = address.Domain;
+            _profileName = address.Domain;
             Extension = address.Extension;
         }
 
         public override string ToString()
         {
-            return "sofia/mydomain.com/" + Extension + "%" + _domain;
+            return "sofia/" + _profileName + "/" + Extension;
         }
 
         public static SofiaSipAddress Parse(string fullAddress)
         {
             string[] parts = fullAddress.Split('@');
             if (parts.Length == 2)
-            {
                 return new SofiaSipAddress(parts[1], parts[0]);
-            }
-            else
-            {
-                parts = fullAddress.Split('/');
-                if (parts.Length == 3)
-                {
-                    return new SofiaSipAddress(parts[1], parts[2]);
-                }
-            }
 
-            return null;
-            
+            parts = fullAddress.Split('/');
+            return parts.Length == 3 ? new SofiaSipAddress(parts[1], parts[2]) : null;
         }
     }
 }

verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs

@@ -95,14 +95,8 @@ namespace FreeSwitch.EventSocket
                             Caller = new PartyInfo();
                         return Caller.Parse(name.Substring(7), value);
                     }
-                    else
-                    {
-                        if (base.ParseCommand(name, value))
-                            return true;
-                        else
-                            return res;
-                    }
-                        
+
+                    return base.ParseCommand(name, value) || res;
             }
             return true;
         }

verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaExpire.cs

+using System;
+
 namespace FreeSwitch.EventSocket
 {
     public class EventSofiaExpire : EventPresence
     {
+        private static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1);
         private string _profileName;
         private string _userName;
         private string _domain;
         private string _userAgent;
+        private DateTime _expires;
 
         public string ProfileName
         {
@@ -31,6 +35,12 @@ namespace FreeSwitch.EventSocket
             set { _userAgent = value; }
         }
 
+        public DateTime Expires
+        {
+            get { return _expires; }
+            set { _expires = value; }
+        }
+
         /*
 				switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", argv[6]);
 			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "user", "%s", argv[1]);
@@ -50,6 +60,11 @@ namespace FreeSwitch.EventSocket
                 case "host":
                     _domain = value;
                     break;
+                case "expires":
+                    int seconds;
+                    if (int.TryParse(value, out seconds))
+                        _expires = UnixEpoch.AddSeconds(seconds);
+                    break;
                 case "user-agent":
                     _userAgent = value;
                     break;

verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventSofiaUnregister.cs

+namespace FreeSwitch.EventSocket.SipEvents
+{
+    public class EventSofiaUnregister : EventBase
+{
+        private string _domain;
+        private string _profileName;
+        private string _user;
+        private string _contact;
+        private string _callId;
+        private int _expires;
+
+        public string ProfileName
+        {
+            get { return _profileName; }
+            set { _profileName = value; }
+        }
+
+        public string UserName
+        {
+            get { return _user; }
+            set { _user = value; }
+        }
+
+        public string Domain
+        {
+            get { return _domain; }
+            set { _domain = value; }
+        }
+
+        public string Contact
+        {
+            get { return _contact; }
+            set { _contact = value; }
+        }
+
+        public string CallId
+        {
+            get { return _callId; }
+            set { _callId = value; }
+        }
+
+        public int Expires
+        {
+            get { return _expires; }
+            set { _expires = value; }
+        }
+
+        /*
+			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name);
+			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-user", "%s", to_user);
+			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "from-host", "%s", to_host);
+			switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "rpid", "%s", rpid);
+        */        
+        public override bool ParseCommand(string name, string value)
+        {
+            switch (name)
+            {
+                case "profile-name":
+                    _profileName = value;
+                    break;
+                case "from-user":
+                    _user = value;
+                    break;
+                case "from-host":
+                    _domain = value;
+                    break;
+                case "contact":
+                    _contact = value;
+                    break;
+                case "call-id":
+                    _callId = value;
+                    break;
+                case "expires":
+                    int.TryParse(value, out _expires);
+                    break;
+                default:
+                    return base.ParseCommand(name, value);
+            }
+            return true;
+        }
+
+        public override string ToString()
+        {
+            return "SofiaUnregister(" + _user + "@" + _domain + ", " + _expires + ")." + base.ToString();
+        }
+    }
+}