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

Modified ServerState enum values to PascalCase values

Browse Source
This commit is contained in:
sta 2014-02-27 20:31:47 +09:00
parent 9dfa3539cf
commit 291397a738
6 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
websocket-sharp/Ext.cs
View File

@ -223,20 +223,20 @@ namespace WebSocketSharp
internal static string CheckIfStart (this ServerState state) internal static string CheckIfStart (this ServerState state)
{ {
return state == ServerState.READY return state == ServerState.Ready
? "The server hasn't started yet." ? "The server hasn't yet started."
: state == ServerState.SHUTDOWN : state == ServerState.ShuttingDown
? "The server is shutting down." ? "The server is shutting down."
: state == ServerState.STOP : state == ServerState.Stop
? "The server has already stopped." ? "The server has already stopped."
: null; : null;
} }
internal static string CheckIfStartable (this ServerState state) internal static string CheckIfStartable (this ServerState state)
{ {
return state == ServerState.START return state == ServerState.Start
? "The server has already started." ? "The server has already started."
: state == ServerState.SHUTDOWN : state == ServerState.ShuttingDown
? "The server is shutting down." ? "The server is shutting down."
: null; : null;
} }

24
websocket-sharp/Server/HttpServer.cs
View File

@ -142,7 +142,7 @@ namespace WebSocketSharp.Server
_listener = new HttpListener (); _listener = new HttpListener ();
_logger = new Logger (); _logger = new Logger ();
_services = new WebSocketServiceManager (_logger); _services = new WebSocketServiceManager (_logger);
_state = ServerState.READY; _state = ServerState.Ready;
_sync = new object (); _sync = new object ();
var os = Environment.OSVersion; var os = Environment.OSVersion;
@ -208,7 +208,7 @@ namespace WebSocketSharp.Server
/// </value> /// </value>
public bool IsListening { public bool IsListening {
get { get {
return _state == ServerState.START; return _state == ServerState.Start;
} }
} }
@ -406,14 +406,14 @@ namespace WebSocketSharp.Server
if (!IsListening) if (!IsListening)
return; return;
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
_services.Stop ( _services.Stop (
((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true); ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true);
_listener.Abort (); _listener.Abort ();
_state = ServerState.STOP; _state = ServerState.Stop;
} }
private void acceptHttpRequest (HttpListenerContext context) private void acceptHttpRequest (HttpListenerContext context)
@ -535,7 +535,7 @@ namespace WebSocketSharp.Server
private bool canSet (string property) private bool canSet (string property)
{ {
if (_state == ServerState.START || _state == ServerState.SHUTDOWN) { if (_state == ServerState.Start || _state == ServerState.ShuttingDown) {
_logger.Error ( _logger.Error (
String.Format ( String.Format (
"Set operation of {0} isn't available because the server has already started.", "Set operation of {0} isn't available because the server has already started.",
@ -720,7 +720,7 @@ namespace WebSocketSharp.Server
_listener.Start (); _listener.Start ();
startReceiving (); startReceiving ();
_state = ServerState.START; _state = ServerState.Start;
} }
} }
@ -736,13 +736,13 @@ namespace WebSocketSharp.Server
return; return;
} }
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
_services.Stop (new byte [0], true); _services.Stop (new byte [0], true);
stopListener (5000); stopListener (5000);
_state = ServerState.STOP; _state = ServerState.Stop;
} }
/// <summary> /// <summary>
@ -770,13 +770,13 @@ namespace WebSocketSharp.Server
return; return;
} }
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
_services.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
stopListener (5000); stopListener (5000);
_state = ServerState.STOP; _state = ServerState.Stop;
} }
/// <summary> /// <summary>
@ -802,13 +802,13 @@ namespace WebSocketSharp.Server
return; return;
} }
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
_services.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
stopListener (5000); stopListener (5000);
_state = ServerState.STOP; _state = ServerState.Stop;
} }
#endregion #endregion

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

@ -4,8 +4,8 @@
* *
* The MIT License * The MIT License
* *
* Copyright (c) 2013 sta.blockhead * Copyright (c) 2014 sta.blockhead
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights * in the Software without restriction, including without limitation the rights
@ -15,7 +15,7 @@
* *
* The above copyright notice and this permission notice shall be included in * The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software. * all copies or substantial portions of the Software.
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@ -32,9 +32,9 @@ namespace WebSocketSharp.Server
{ {
internal enum ServerState internal enum ServerState
{ {
READY, Ready,
START, Start,
SHUTDOWN, ShuttingDown,
STOP Stop
} }
} }

24
websocket-sharp/Server/WebSocketServer.cs
View File

@ -334,7 +334,7 @@ namespace WebSocketSharp.Server
/// </value> /// </value>
public bool IsListening { public bool IsListening {
get { get {
return _state == ServerState.START; return _state == ServerState.Start;
} }
} }
@ -461,14 +461,14 @@ namespace WebSocketSharp.Server
if (!IsListening) if (!IsListening)
return; return;
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
_listener.Stop (); _listener.Stop ();
_services.Stop ( _services.Stop (
((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true); ((ushort) CloseStatusCode.SERVER_ERROR).ToByteArrayInternally (ByteOrder.BIG), true);
_state = ServerState.STOP; _state = ServerState.Stop;
} }
private void acceptRequestAsync (TcpClient client) private void acceptRequestAsync (TcpClient client)
@ -551,7 +551,7 @@ namespace WebSocketSharp.Server
private bool canSet (string property) private bool canSet (string property)
{ {
if (_state == ServerState.START || _state == ServerState.SHUTDOWN) { if (_state == ServerState.Start || _state == ServerState.ShuttingDown) {
_logger.Error ( _logger.Error (
String.Format ( String.Format (
"Set operation of {0} isn't available because the server has already started.", "Set operation of {0} isn't available because the server has already started.",
@ -576,7 +576,7 @@ namespace WebSocketSharp.Server
_listener = new TcpListener (_address, _port); _listener = new TcpListener (_address, _port);
_logger = new Logger (); _logger = new Logger ();
_services = new WebSocketServiceManager (_logger); _services = new WebSocketServiceManager (_logger);
_state = ServerState.READY; _state = ServerState.Ready;
_sync = new object (); _sync = new object ();
} }
@ -738,7 +738,7 @@ namespace WebSocketSharp.Server
_listener.Start (); _listener.Start ();
startReceiving (); startReceiving ();
_state = ServerState.START; _state = ServerState.Start;
} }
} }
@ -754,13 +754,13 @@ namespace WebSocketSharp.Server
return; return;
} }
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
stopListener (5000); stopListener (5000);
_services.Stop (new byte [0], true); _services.Stop (new byte [0], true);
_state = ServerState.STOP; _state = ServerState.Stop;
} }
/// <summary> /// <summary>
@ -788,13 +788,13 @@ namespace WebSocketSharp.Server
return; return;
} }
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
stopListener (5000); stopListener (5000);
_services.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
_state = ServerState.STOP; _state = ServerState.Stop;
} }
/// <summary> /// <summary>
@ -820,13 +820,13 @@ namespace WebSocketSharp.Server
return; return;
} }
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
} }
stopListener (5000); stopListener (5000);
_services.Stop (data, !code.IsReserved ()); _services.Stop (data, !code.IsReserved ());
_state = ServerState.STOP; _state = ServerState.Stop;
} }
#endregion #endregion

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

@ -64,7 +64,7 @@ namespace WebSocketSharp.Server
_hosts = new Dictionary<string, WebSocketServiceHost> (); _hosts = new Dictionary<string, WebSocketServiceHost> ();
_keepClean = true; _keepClean = true;
_state = ServerState.READY; _state = ServerState.Ready;
_sync = new object (); _sync = new object ();
} }
@ -170,7 +170,7 @@ namespace WebSocketSharp.Server
get { get {
var count = 0; var count = 0;
foreach (var host in Hosts) { foreach (var host in Hosts) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
count += host.Sessions.Count; count += host.Sessions.Count;
@ -189,7 +189,7 @@ namespace WebSocketSharp.Server
var cache = new Dictionary<CompressionMethod, byte []> (); var cache = new Dictionary<CompressionMethod, byte []> ();
try { try {
foreach (var host in Hosts) { foreach (var host in Hosts) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
host.Sessions.Broadcast (opcode, data, cache); host.Sessions.Broadcast (opcode, data, cache);
@ -211,7 +211,7 @@ namespace WebSocketSharp.Server
var cache = new Dictionary<CompressionMethod, Stream> (); var cache = new Dictionary<CompressionMethod, Stream> ();
try { try {
foreach (var host in Hosts) { foreach (var host in Hosts) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
host.Sessions.Broadcast (opcode, stream, cache); host.Sessions.Broadcast (opcode, stream, cache);
@ -248,7 +248,7 @@ namespace WebSocketSharp.Server
{ {
var result = new Dictionary<string, Dictionary<string, bool>> (); var result = new Dictionary<string, Dictionary<string, bool>> ();
foreach (var host in Hosts) { foreach (var host in Hosts) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
result.Add (host.Path, host.Sessions.Broadping (frame, millisecondsTimeout)); result.Add (host.Path, host.Sessions.Broadping (frame, millisecondsTimeout));
@ -272,7 +272,7 @@ namespace WebSocketSharp.Server
return; return;
} }
if (_state == ServerState.START) if (_state == ServerState.Start)
host.Sessions.Start (); host.Sessions.Start ();
_hosts.Add (path, host); _hosts.Add (path, host);
@ -293,7 +293,7 @@ namespace WebSocketSharp.Server
_hosts.Remove (path); _hosts.Remove (path);
} }
if (host.Sessions.State == ServerState.START) if (host.Sessions.State == ServerState.Start)
host.Sessions.Stop ( host.Sessions.Stop (
((ushort) CloseStatusCode.AWAY).ToByteArrayInternally (ByteOrder.BIG), true); ((ushort) CloseStatusCode.AWAY).ToByteArrayInternally (ByteOrder.BIG), true);
@ -306,14 +306,14 @@ namespace WebSocketSharp.Server
foreach (var host in _hosts.Values) foreach (var host in _hosts.Values)
host.Sessions.Start (); host.Sessions.Start ();
_state = ServerState.START; _state = ServerState.Start;
} }
} }
internal void Stop (byte [] data, bool send) internal void Stop (byte [] data, bool send)
{ {
lock (_sync) { lock (_sync) {
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
var payload = new PayloadData (data); var payload = new PayloadData (data);
var args = new CloseEventArgs (payload); var args = new CloseEventArgs (payload);
@ -325,7 +325,7 @@ namespace WebSocketSharp.Server
host.Sessions.Stop (args, frameAsBytes); host.Sessions.Stop (args, frameAsBytes);
_hosts.Clear (); _hosts.Clear ();
_state = ServerState.STOP; _state = ServerState.Stop;
} }
} }

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

@ -81,7 +81,7 @@ namespace WebSocketSharp.Server
_forSweep = new object (); _forSweep = new object ();
_keepClean = true; _keepClean = true;
_sessions = new Dictionary<string, IWebSocketSession> (); _sessions = new Dictionary<string, IWebSocketSession> ();
_state = ServerState.READY; _state = ServerState.Ready;
_sync = new object (); _sync = new object ();
setSweepTimer (60000); setSweepTimer (60000);
@ -138,7 +138,7 @@ namespace WebSocketSharp.Server
/// </value> /// </value>
public IEnumerable<string> IDs { public IEnumerable<string> IDs {
get { get {
if (_state == ServerState.SHUTDOWN) if (_state == ServerState.ShuttingDown)
return _emptySessions.Keys; return _emptySessions.Keys;
lock (_sync) { lock (_sync) {
@ -199,7 +199,7 @@ namespace WebSocketSharp.Server
return; return;
_keepClean = value; _keepClean = value;
if (_state == ServerState.START) if (_state == ServerState.Start)
_sweepTimer.Enabled = value; _sweepTimer.Enabled = value;
} }
} }
@ -213,7 +213,7 @@ namespace WebSocketSharp.Server
/// </value> /// </value>
public IEnumerable<IWebSocketSession> Sessions { public IEnumerable<IWebSocketSession> Sessions {
get { get {
if (_state == ServerState.SHUTDOWN) if (_state == ServerState.ShuttingDown)
return _emptySessions.Values; return _emptySessions.Values;
lock (_sync) { lock (_sync) {
@ -304,7 +304,7 @@ namespace WebSocketSharp.Server
internal string Add (IWebSocketSession session) internal string Add (IWebSocketSession session)
{ {
lock (_sync) { lock (_sync) {
if (_state != ServerState.START) if (_state != ServerState.Start)
return null; return null;
var id = createID (); var id = createID ();
@ -318,7 +318,7 @@ namespace WebSocketSharp.Server
Opcode opcode, byte [] data, Dictionary<CompressionMethod, byte []> cache) Opcode opcode, byte [] data, Dictionary<CompressionMethod, byte []> cache)
{ {
foreach (var session in Sessions) { foreach (var session in Sessions) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
session.Context.WebSocket.Send (opcode, data, cache); session.Context.WebSocket.Send (opcode, data, cache);
@ -329,7 +329,7 @@ namespace WebSocketSharp.Server
Opcode opcode, Stream stream, Dictionary <CompressionMethod, Stream> cache) Opcode opcode, Stream stream, Dictionary <CompressionMethod, Stream> cache)
{ {
foreach (var session in Sessions) { foreach (var session in Sessions) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
session.Context.WebSocket.Send (opcode, stream, cache); session.Context.WebSocket.Send (opcode, stream, cache);
@ -340,7 +340,7 @@ namespace WebSocketSharp.Server
{ {
var result = new Dictionary<string, bool> (); var result = new Dictionary<string, bool> ();
foreach (var session in Sessions) { foreach (var session in Sessions) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
result.Add ( result.Add (
@ -360,7 +360,7 @@ namespace WebSocketSharp.Server
internal void Start () internal void Start ()
{ {
_sweepTimer.Enabled = _keepClean; _sweepTimer.Enabled = _keepClean;
_state = ServerState.START; _state = ServerState.Start;
} }
internal void Stop (byte [] data, bool send) internal void Stop (byte [] data, bool send)
@ -377,13 +377,13 @@ namespace WebSocketSharp.Server
internal void Stop (CloseEventArgs args, byte [] frame) internal void Stop (CloseEventArgs args, byte [] frame)
{ {
lock (_sync) { lock (_sync) {
_state = ServerState.SHUTDOWN; _state = ServerState.ShuttingDown;
_sweepTimer.Enabled = false; _sweepTimer.Enabled = false;
foreach (var session in _sessions.Values.ToList ()) foreach (var session in _sessions.Values.ToList ())
session.Context.WebSocket.Close (args, frame, 1000); session.Context.WebSocket.Close (args, frame, 1000);
_state = ServerState.STOP; _state = ServerState.Stop;
} }
} }
@ -798,13 +798,13 @@ namespace WebSocketSharp.Server
/// </summary> /// </summary>
public void Sweep () public void Sweep ()
{ {
if (_state != ServerState.START || _sweeping || Count == 0) if (_state != ServerState.Start || _sweeping || Count == 0)
return; return;
lock (_forSweep) { lock (_forSweep) {
_sweeping = true; _sweeping = true;
foreach (var id in InactiveIDs) { foreach (var id in InactiveIDs) {
if (_state != ServerState.START) if (_state != ServerState.Start)
break; break;
lock (_sync) { lock (_sync) {