提交 f473997b authored 作者: Jonas Gauffin's avatar Jonas Gauffin

Bugfixes and a fix when FS reports incorrect content-length.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk/contrib@16212 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 5a7e1f39
...@@ -79,22 +79,18 @@ namespace FreeSwitch.EventSocket ...@@ -79,22 +79,18 @@ namespace FreeSwitch.EventSocket
_text.Append(_piecesToAppend.Dequeue()); _text.Append(_piecesToAppend.Dequeue());
} }
if (_text.Length == 0)
return null;
PlainEventMsg plainEvent; PlainEventMsg plainEvent;
lock (_text) lock (_text)
{ {
int i = 0; int i = 0;
IgnoreLineBreaks(ref i);
_text.Remove(0, i);
// find complete header i = FindEmptyLine(i);
bool found = false; if (i == -1)
for (; i < _text.Length - 1; ++i)
{
if (_text[i] == '\n' && _text[i + 1] == '\n')
{
found = true;
break;
}
}
if (!found)
return null; return null;
// extract header // extract header
...@@ -114,7 +110,7 @@ namespace FreeSwitch.EventSocket ...@@ -114,7 +110,7 @@ namespace FreeSwitch.EventSocket
// this will eat that kind of header. // this will eat that kind of header.
if (_text.Length >= BugWorkaround.Length + i) if (_text.Length >= BugWorkaround.Length + i)
{ {
found = true; bool found = true;
for (int index = 0; index < BugWorkaround.Length; ++index) for (int index = 0; index < BugWorkaround.Length; ++index)
{ {
if (_text[index + i] != BugWorkaround[index]) if (_text[index + i] != BugWorkaround[index])
...@@ -137,6 +133,16 @@ namespace FreeSwitch.EventSocket ...@@ -137,6 +133,16 @@ namespace FreeSwitch.EventSocket
return null; return null;
// extract body // extract body
// since Freeswitch report false sizes sometimes,
// we need to go through all lines to find contents.
int endOfBody = FindEmptyLine(i) + 2; // include the first and last \n
if (endOfBody-i != plainEvent.ContentLength)
{
Console.WriteLine("Invalid content length, actual length: " + (endOfBody - i) + ", reported length: " +
plainEvent.ContentLength);
plainEvent.ContentLength = endOfBody - i;
}
chars = new char[plainEvent.ContentLength]; chars = new char[plainEvent.ContentLength];
_text.CopyTo(i, chars, 0, plainEvent.ContentLength); _text.CopyTo(i, chars, 0, plainEvent.ContentLength);
plainEvent.Body = new string(chars); plainEvent.Body = new string(chars);
...@@ -175,6 +181,16 @@ namespace FreeSwitch.EventSocket ...@@ -175,6 +181,16 @@ namespace FreeSwitch.EventSocket
return plainEvent; return plainEvent;
} }
private int FindEmptyLine(int i)
{
for (; i < _text.Length - 1; ++i)
{
if (_text[i] == '\n' && _text[i + 1] == '\n')
return i;
}
return -1;
}
public void Append(string text) public void Append(string text)
{ {
......
...@@ -14,29 +14,32 @@ namespace FreeSwitch.EventSocket ...@@ -14,29 +14,32 @@ namespace FreeSwitch.EventSocket
{ {
#region Delegates #region Delegates
public delegate void EventSocketHandler(EventSocket client);
public delegate void DataHandler(string data); public delegate void DataHandler(string data);
public delegate void EventSocketHandler(EventSocket client);
#endregion #endregion
private LogWriterHandler _logWriter; private const int RetryTimeout = 5000;
private readonly Queue<CmdBase> _commands = new Queue<CmdBase>(); private readonly Queue<CmdBase> _commands = new Queue<CmdBase>();
private readonly object _lockobj = new object();
private readonly ManualResetEvent _parseEvent = new ManualResetEvent(false);
private readonly EventParser _parser = new EventParser();
private readonly Thread _parseThread;
private readonly byte[] _readBuffer = new byte[8192];
private bool _authed;
private bool _autoConnect = true; private bool _autoConnect = true;
private Events _events; private Events _events;
private string _hostName; private string _hostName;
private readonly EventParser _parser = new EventParser(); private bool _isRunning = true;
public event DataHandler DataReceived; private LogWriterHandler _logWriter;
private bool _parsing;
private string _password = "ClueCon"; private string _password = "ClueCon";
private int _port = 8021; private int _port = 8021;
private readonly object _lockobj = new object();
private readonly byte[] _readBuffer = new byte[8192];
private Socket _socket; private Socket _socket;
private NetworkStream _stream; private NetworkStream _stream;
private Timer _timer; private Timer _timer;
private bool _authed;
const int RetryTimeout = 5000;
private bool _parsing;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="EventSocket"/> class. /// Initializes a new instance of the <see cref="EventSocket"/> class.
...@@ -46,13 +49,9 @@ namespace FreeSwitch.EventSocket ...@@ -46,13 +49,9 @@ namespace FreeSwitch.EventSocket
{ {
LogWriter = logWriter ?? NullWriter.Write; LogWriter = logWriter ?? NullWriter.Write;
CreateSocket(); CreateSocket();
} _parseThread = new Thread(OnParseMessages);
_parseThread.IsBackground = true;
private void CreateSocket() _parseThread.Start();
{
_socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
_socket.NoDelay = true;
_socket.ReceiveBufferSize = 65535;
} }
/// <summary> /// <summary>
...@@ -82,20 +81,61 @@ namespace FreeSwitch.EventSocket ...@@ -82,20 +81,61 @@ namespace FreeSwitch.EventSocket
set { _logWriter = value ?? NullWriter.Write; } set { _logWriter = value ?? NullWriter.Write; }
} }
public event DataHandler DataReceived;
private void CreateSocket()
{
_socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
_socket.NoDelay = true;
_socket.ReceiveBufferSize = 65535;
}
public void Stop()
{
_isRunning = false;
_parseEvent.Set();
_autoConnect = false;
_parseThread.Join(1000);
_socket.Close();
}
private void OnParseMessages()
{
while (true)
{
_parseEvent.WaitOne();
_parseEvent.Reset();
if (!_isRunning)
break;
try
{
ParseMessages();
}
catch (Exception err)
{
LogWriter(LogPrio.Warning,
"Failed to parse event message." + Environment.NewLine + "Exception: " + err +
Environment.NewLine + _parser.Text);
HandleDisconnect();
}
}
}
/// <summary> /// <summary>
/// A event have been received /// A event have been received
/// </summary> /// </summary>
public event MessageHandler MessageReceived = delegate{}; public event MessageHandler MessageReceived = delegate { };
/// <summary> /// <summary>
/// Socket got disconnected (due to remote peer) /// Socket got disconnected (due to remote peer)
/// </summary> /// </summary>
public event EventSocketHandler Disconnected = delegate{}; public event EventSocketHandler Disconnected = delegate { };
/// <summary> /// <summary>
/// Socket is now connected /// Socket is now connected
/// </summary> /// </summary>
public event EventSocketHandler Connected = delegate{}; public event EventSocketHandler Connected = delegate { };
/// <summary> /// <summary>
/// Connect to FreeSWITCH /// Connect to FreeSWITCH
...@@ -131,7 +171,7 @@ namespace FreeSwitch.EventSocket ...@@ -131,7 +171,7 @@ namespace FreeSwitch.EventSocket
TryConnect(); TryConnect();
LogWriter(LogPrio.Debug, "Connected to freeswitch."); LogWriter(LogPrio.Debug, "Connected to freeswitch.");
} }
catch(InvalidOperationException err) catch (InvalidOperationException err)
{ {
LogWriter(LogPrio.Debug, "Failed to connect to freeswitch, reason: " + err.Message); LogWriter(LogPrio.Debug, "Failed to connect to freeswitch, reason: " + err.Message);
HandleDisconnect(); HandleDisconnect();
...@@ -167,7 +207,7 @@ namespace FreeSwitch.EventSocket ...@@ -167,7 +207,7 @@ namespace FreeSwitch.EventSocket
{ {
ReceiveWrapper(ar); ReceiveWrapper(ar);
} }
catch(Exception err) catch (Exception err)
{ {
_logWriter(LogPrio.Error, err.ToString()); _logWriter(LogPrio.Error, err.ToString());
} }
...@@ -203,24 +243,7 @@ namespace FreeSwitch.EventSocket ...@@ -203,24 +243,7 @@ namespace FreeSwitch.EventSocket
if (!string.IsNullOrEmpty(inbuffer)) if (!string.IsNullOrEmpty(inbuffer))
DataReceived(inbuffer); DataReceived(inbuffer);
try _parseEvent.Set();
{
ParseMessages();
}
catch (InvalidDataException err)
{
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." + Environment.NewLine + "Exception: " + err +
Environment.NewLine + _parser.Text);
HandleDisconnect();
}
} }
/// <summary> /// <summary>
...@@ -255,18 +278,8 @@ namespace FreeSwitch.EventSocket ...@@ -255,18 +278,8 @@ namespace FreeSwitch.EventSocket
_stream.Write(bytes, 0, bytes.Length); _stream.Write(bytes, 0, bytes.Length);
} }
static readonly object locker = new object(); // Should ONLY be called from the parsing thread.
private void ParseMessages() private void ParseMessages()
{
lock (locker)
{
if (_parsing)
return;
_parsing = true;
}
try
{ {
PlainEventMsg msg = _parser.ParseOne(); PlainEventMsg msg = _parser.ParseOne();
while (msg != null) while (msg != null)
...@@ -276,7 +289,7 @@ namespace FreeSwitch.EventSocket ...@@ -276,7 +289,7 @@ namespace FreeSwitch.EventSocket
{ {
case "auth/request": case "auth/request":
{ {
AuthCommand cmd = new AuthCommand(_password); var cmd = new AuthCommand(_password);
cmd.ReplyReceived += OnAuthed; cmd.ReplyReceived += OnAuthed;
_commands.Enqueue(cmd); _commands.Enqueue(cmd);
Write(cmd + "\n\n"); Write(cmd + "\n\n");
...@@ -299,12 +312,6 @@ namespace FreeSwitch.EventSocket ...@@ -299,12 +312,6 @@ namespace FreeSwitch.EventSocket
msg = _parser.ParseOne(); msg = _parser.ParseOne();
} }
} }
finally
{
lock (locker)
_parsing = false;
}
}
private void OnAuthed(CmdBase command, CommandReply reply) private void OnAuthed(CmdBase command, CommandReply reply)
{ {
...@@ -347,7 +354,7 @@ namespace FreeSwitch.EventSocket ...@@ -347,7 +354,7 @@ namespace FreeSwitch.EventSocket
tmr.Change(Timeout.Infinite, Timeout.Infinite); tmr.Change(Timeout.Infinite, Timeout.Infinite);
tmr.Dispose(); tmr.Dispose();
} }
catch(Exception err) catch (Exception err)
{ {
if (!(err is SocketException)) if (!(err is SocketException))
LogWriter(LogPrio.Error, "Unexpected exception in try connect: " + err); LogWriter(LogPrio.Error, "Unexpected exception in try connect: " + err);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑!
请 注册 或者 后发表评论