DevWiki/websocket-sharp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed WsFrame.cs to WebSocketFrame.cs

Browse Source
This commit is contained in:
sta
2014-06-12 19:59:27 +09:00
parent bb45e3b479
commit c20f4804c7
6 changed files with 97 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
websocket-sharp/Server/WebSocketServiceManager.cs
View File

@@ -317,9 +317,8 @@ namespace WebSocketSharp.Server
var payload = new PayloadData (data);
var args = new CloseEventArgs (payload);
var frameAsBytes = send
? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray ()
: null;
var frameAsBytes =
send ? WebSocketFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray () : null;
foreach (var host in _hosts.Values)
host.Sessions.Stop (args, frameAsBytes);
@@ -517,7 +516,7 @@ namespace WebSocketSharp.Server
return null;
}
return broadping (WsFrame.EmptyUnmaskPingData, 1000);
return broadping (WebSocketFrame.EmptyUnmaskPingData, 1000);
}
/// <summary>
@@ -547,7 +546,7 @@ namespace WebSocketSharp.Server
return null;
}
return broadping (WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
return broadping (WebSocketFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
}
/// <summary>

14
websocket-sharp/Server/WebSocketSessionManager.cs
View File

@@ -110,7 +110,7 @@ namespace WebSocketSharp.Server
/// </value>
public IEnumerable<string> ActiveIDs {
get {
foreach (var result in Broadping (WsFrame.EmptyUnmaskPingData, 1000))
foreach (var result in Broadping (WebSocketFrame.EmptyUnmaskPingData, 1000))
if (result.Value)
yield return result.Key;
}
@@ -156,7 +156,7 @@ namespace WebSocketSharp.Server
/// </value>
public IEnumerable<string> InactiveIDs {
get {
foreach (var result in Broadping (WsFrame.EmptyUnmaskPingData, 1000))
foreach (var result in Broadping (WebSocketFrame.EmptyUnmaskPingData, 1000))
if (!result.Value)
yield return result.Key;
}
@@ -367,9 +367,8 @@ namespace WebSocketSharp.Server
{
var payload = new PayloadData (data);
var args = new CloseEventArgs (payload);
var frameAsBytes = send
? WsFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray ()
: null;
var frameAsBytes =
send ? WebSocketFrame.CreateCloseFrame (Mask.Unmask, payload).ToByteArray () : null;
Stop (args, frameAsBytes);
}
@@ -556,7 +555,7 @@ namespace WebSocketSharp.Server
return null;
}
return Broadping (WsFrame.EmptyUnmaskPingData, 1000);
return Broadping (WebSocketFrame.EmptyUnmaskPingData, 1000);
}
/// <summary>
@@ -584,8 +583,7 @@ namespace WebSocketSharp.Server
return null;
}
return Broadping (
WsFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
return Broadping (WebSocketFrame.CreatePingFrame (Mask.Unmask, data).ToByteArray (), 1000);
}
/// <summary>