snow/asternet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #243 from mech-dia/InvalidCastToCommandResponseFix

Browse source 
Fix: Invalid Cast Exception #194
This commit is contained in:
Deantwo 2020-09-20 20:52:15 +02:00 committed by GitHub
parent 747a68c7cf 3667c2d115
commit 7d07b8b2e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Asterisk.2013/Asterisk.NET/Manager/ManagerReader.cs
View file

@ -273,11 +273,10 @@ namespace AsterNET.Manager
if (processingCommandResult) if (processingCommandResult)
{ {
string lineLower = line.ToLower(Helper.CultureInfo); string lineLower = line.ToLower(Helper.CultureInfo);
if (lineLower == "--end command--") if (lineLower == "--end command--" || lineLower == "")
{ {
var commandResponse = new CommandResponse(); var commandResponse = new CommandResponse();
Helper.SetAttributes(commandResponse, packet); Helper.SetAttributes(commandResponse, packet);
commandList.Add(line);
commandResponse.Result = commandList; commandResponse.Result = commandList;
processingCommandResult = false; processingCommandResult = false;
packet.Clear(); packet.Clear();
@ -308,11 +307,11 @@ namespace AsterNET.Manager
mrConnector.DispatchEvent(connectEvent); mrConnector.DispatchEvent(connectEvent);
continue; continue;
} }
if (line.Trim().ToLower(Helper.CultureInfo) == "response: follows") if (line.Trim().ToLower(Helper.CultureInfo) == "response: follows"
|| line.Trim().ToLower(Helper.CultureInfo).EndsWith("command output follows"))
{ {
// Switch to wait "--END COMMAND--" mode // Switch to wait "--END COMMAND--"/"" mode
processingCommandResult = true; processingCommandResult = true;
packet.Clear();
commandList.Clear(); commandList.Clear();
Helper.AddKeyValue(packet, line); Helper.AddKeyValue(packet, line);
continue; continue;