Skip to content

Ephemeral ports #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nSwann09 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ephemeral ports #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e77012
Allowing port 0, returning port number from TcpListner if port is ini…
nSwann09 Sep 12, 2017
c2c9caf
IsPortNumber returns true for port 0
nSwann09 Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion websocket-sharp/Ext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ internal static bool IsData (this Opcode opcode)

internal static bool IsPortNumber (this int value)
{
return value > 0 && value < 65536;
return value > -1 && value < 65536;
}

internal static bool IsReserved (this ushort code)
Expand Down
11 changes: 8 additions & 3 deletions websocket-sharp/Server/WebSocketServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public WebSocketServer ()
/// on which to listen.
/// </param>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is less than 1 or greater than 65535.
/// <paramref name="port"/> is less than 0 or greater than 65535.
/// </exception>
public WebSocketServer (int port)
: this (port, port == 443)
Expand Down Expand Up @@ -213,12 +213,12 @@ public WebSocketServer (string url)
/// secure connections; otherwise, <c>false</c>.
/// </param>
/// <exception cref="ArgumentOutOfRangeException">
/// <paramref name="port"/> is less than 1 or greater than 65535.
/// <paramref name="port"/> is less than 0 or greater than 65535.
/// </exception>
public WebSocketServer (int port, bool secure)
{
if (!port.IsPortNumber ()) {
var msg = "Less than 1 or greater than 65535.";
var msg = "Less than 0 or greater than 65535.";
throw new ArgumentOutOfRangeException ("port", msg);
}

Expand Down Expand Up @@ -965,6 +965,11 @@ private void startReceiving ()
_receiveThread = new Thread (new ThreadStart (receiveRequest));
_receiveThread.IsBackground = true;
_receiveThread.Start ();

if (_port == 0)
{
_port = ((System.Net.IPEndPoint)_listener.LocalEndpoint).Port;
}
}

private void stop (ushort code, string reason)
Expand Down