sean-m
/
wifi-sitter
mirror of https://github.com/sean-m/wifi-sitter.git
1
0
Fork 0
Code Issues Releases Activity

Fixed bug in server not prepending client identity in first response message frame.

zmq
MCARDLE Sean M 2016-11-30 00:40:24 -08:00
parent 307a31714a
commit fa393971b0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WifiSitter/WifiSitter.cs
View File

@ -379,6 +379,7 @@ namespace WifiSitter
while (true) { // TODO need to signal stop while (true) { // TODO need to signal stop
var clientMessage = server.ReceiveMultipartMessage(); var clientMessage = server.ReceiveMultipartMessage();
var clientAddress = clientMessage[0];
if (clientMessage.FrameCount > 2) { if (clientMessage.FrameCount > 2) {
@ -394,7 +395,7 @@ namespace WifiSitter
if (_msg != null) { if (_msg != null) {
switch (_msg.Request) { switch (_msg.Request) {
case "get_netstate": case "get_netstate":
LogLine("Sending netstate to: {0}", _msg.Requestor); LogLine("Sending netstate to: {0}", clientAddress.ConvertToString());
if (_paused && netstate.CheckNet) { if (_paused && netstate.CheckNet) {
netstate.UpdateNics(DiscoverAllNetworkDevices(netstate.Nics)); netstate.UpdateNics(DiscoverAllNetworkDevices(netstate.Nics));
netstate.StateChecked(); netstate.StateChecked();
@ -428,8 +429,9 @@ namespace WifiSitter
server.Options.Identity.ToString(), server.Options.Identity.ToString(),
"resuming").ToJsonString(); "resuming").ToJsonString();
// Send response // Send response
var t_clientAddress = clientAddress;
var t_responseMessage = new NetMQMessage(); var t_responseMessage = new NetMQMessage();
t_responseMessage.Append(server.Options.Identity); t_responseMessage.Append(t_clientAddress);
t_responseMessage.AppendEmptyFrame(); t_responseMessage.AppendEmptyFrame();
t_responseMessage.Append(t_response); t_responseMessage.Append(t_response);
server.SendMultipartMessage(t_responseMessage); server.SendMultipartMessage(t_responseMessage);
@ -448,7 +450,7 @@ namespace WifiSitter
// Send response // Send response
var responseMessage = new NetMQMessage(); var responseMessage = new NetMQMessage();
responseMessage.Append(server.Options.Identity); responseMessage.Append(clientAddress);
responseMessage.AppendEmptyFrame(); responseMessage.AppendEmptyFrame();
responseMessage.Append(response); responseMessage.Append(response);
server.SendMultipartMessage(responseMessage); server.SendMultipartMessage(responseMessage);