Skip to content

Commit 26e534c

Browse files
GitHubProUser67GitHubProUser67
committed
[NetworkLibrary] - Opens port 65535 to allow the auto IP discovery to work on docker, fixes minor timing bug in DirtySocks async message loop.
Also changes the fallback IP to 0.0.0.0 (minor but is best that way). We also apply the 100ms delay before processing before any async message (some super buggy clients WANTS the async message to arrive a little bit later).
1 parent b251e9e commit 26e534c

File tree

10 files changed

+14
-12
lines changed

10 files changed

+14
-12
lines changed

Diff for: ‎BackendServices/NetworkLibrary/Extension/InternetProtocolUtils.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public static Task<bool> TryGetServerIP(out string extractedIP, bool allowipv6 =
210210
}
211211
catch
212212
{
213-
ServerIP = "127.0.0.1";
213+
ServerIP = "0.0.0.0";
214214
}
215215
finally
216216
{

Diff for: ‎Servers/ApacheNet/ApacheNet.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFramework>net6.0</TargetFramework>
66
<Nullable>enable</Nullable>
77
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
8-
<DockerfileRunArguments>-p 443:443</DockerfileRunArguments>
8+
<DockerfileRunArguments>-p 443:443 -p 65535:65535</DockerfileRunArguments>
99
<ApplicationIcon>ApacheNet.ico</ApplicationIcon>
1010
<ServerGarbageCollection>true</ServerGarbageCollection>
1111
<PublishSingleFile>false</PublishSingleFile> <!-- Single mode cannot load plugins due to no assembly loading support. -->

Diff for: ‎Servers/Horizon/Horizon.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
9-
<DockerfileRunArguments>-p 61920:61920 -p 50100:50100 -p 10075:10075 -p 10076:10076 -p 10077:10077 -p 10073:10073 -p 50000:50000 -p 10070:10070 -p 3101:3101 -p 2222:2222 -p 10373:10373 -p 10372:10372 -p 10071:10071 -p 10072:10072 -p 10079:10079 -p 10078:10078 -p 10080:10080</DockerfileRunArguments>
9+
<DockerfileRunArguments>-p 61920:61920 -p 50100:50100 -p 10075:10075 -p 10076:10076 -p 10077:10077 -p 10073:10073 -p 50000:50000 -p 10070:10070 -p 3101:3101 -p 2222:2222 -p 10373:10373 -p 10372:10372 -p 10071:10071 -p 10072:10072 -p 10079:10079 -p 10078:10078 -p 10080:10080 -p 65535:65535</DockerfileRunArguments>
1010
<ApplicationIcon>Horizon.ico</ApplicationIcon>
1111
<ServerGarbageCollection>true</ServerGarbageCollection>
1212
<PublishSingleFile>false</PublishSingleFile> <!-- Single mode cannot load plugins due to no assembly loading support. -->

Diff for: ‎Servers/MitmDNS/MitmDNS.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net6.0</TargetFramework>
66
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
7-
<DockerfileRunArguments>-p 53:53</DockerfileRunArguments>
7+
<DockerfileRunArguments>-p 53:53 -p 65535:65535</DockerfileRunArguments>
88
<ApplicationIcon>DNS.ico</ApplicationIcon>
99
<ServerGarbageCollection>true</ServerGarbageCollection>
1010
<DockerfileContext>..\..</DockerfileContext>

Diff for: ‎Servers/MultiSocks/Aries/AriesClient.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,11 @@ private Task DequeueAsyncMessage()
183183
{
184184
while (AsyncMessageQueue.TryDequeue(out AbstractMessage? msg))
185185
{
186-
if (msg != null && SendImmediateMessage(msg.GetData()))
187-
// Some games not like when async msgs are sent too close to each others (MOH).
188-
Thread.Sleep(100);
186+
// Some games not like when async msgs are sent too close to each others (MOH).
187+
Thread.Sleep(100);
188+
189+
if (msg != null)
190+
SendImmediateMessage(msg.GetData());
189191
}
190192
}
191193
finally

Diff for: ‎Servers/MultiSocks/MultiSocks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
9-
<DockerfileRunArguments>-p 11000-11000 -p 11050-11050 -p 11051-11051 -p 11100-11100 -p 11101-11101 -p 11140-11140 -p 18700-18700 -p 21850-21850 -p 21851-21851 -p 21870-21870 -p 21871-21871</DockerfileRunArguments>
9+
<DockerfileRunArguments>-p 11000-11000 -p 11050-11050 -p 11051-11051 -p 11100-11100 -p 11101-11101 -p 11140-11140 -p 18700-18700 -p 21850-21850 -p 21851-21851 -p 21870-21870 -p 21871-21871 -p 65535:65535</DockerfileRunArguments>
1010
<ApplicationIcon>MultiSocks.ico</ApplicationIcon>
1111
<ServerGarbageCollection>true</ServerGarbageCollection>
1212
<DockerfileContext>..\..</DockerfileContext>

Diff for: ‎Servers/MultiSpy/MultiSpy.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DockerDefaultTargetOS>Windows</DockerDefaultTargetOS>
9-
<DockerfileRunArguments>-p 29900:29900 -p 29901:29901 -p 29910:29910 -p 27900:27900 -p 28910:28910 -p 27901:27901 -p 6667:6667</DockerfileRunArguments>
9+
<DockerfileRunArguments>-p 29900:29900 -p 29901:29901 -p 29910:29910 -p 27900:27900 -p 28910:28910 -p 27901:27901 -p 6667:6667 -p 65535:65535</DockerfileRunArguments>
1010
<ApplicationIcon>MultiSpy.ico</ApplicationIcon>
1111
<ServerGarbageCollection>true</ServerGarbageCollection>
1212
<DockerfileContext>..\..</DockerfileContext>

Diff for: ‎Servers/QuazalServer/QuazalServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
9-
<DockerfileRunArguments>-p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128</DockerfileRunArguments>
9+
<DockerfileRunArguments>-p 21032:21032 -p 30160:30160 -p 30161:30161 -p 30200:30200 -p 30201:30201 -p 30560:30560 -p 30561:30561 -p 60001:60001 -p 60105:60105 -p 60106:60106 -p 60115:60115 -p 60116:60116 -p 61110:61110 -p 61111:61111 -p 61120:61120 -p 61121:61121 -p 61125:61125 -p 61126:61126 -p 61127:61127 -p 61128:61128 -p 61129:61129 -p 61130:61130 -p 61131:61131 -p 61132:61132 -p 61133:61133 -p 61134:61134 -p 61135:61135 -p 61136:61136 -p 61137:61137 -p 61138:61138 -p 62110:62110 -p 62111:62111 -p 62125:62125 -p 62126:62126 -p 62127:62127 -p 62128:62128 -p 65535:65535</DockerfileRunArguments>
1010
<ApplicationIcon>QuazalServer.ico</ApplicationIcon>
1111
<ServerGarbageCollection>true</ServerGarbageCollection>
1212
<DockerfileContext>..\..</DockerfileContext>

Diff for: ‎Servers/SSFWServer/SSFWServer.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
9-
<DockerfileRunArguments>-p 8080:8080 -p 10443:10443</DockerfileRunArguments>
9+
<DockerfileRunArguments>-p 8080:8080 -p 10443:10443 -p 65535:65535</DockerfileRunArguments>
1010
<ApplicationIcon>SSFW.ico</ApplicationIcon>
1111
<ServerGarbageCollection>true</ServerGarbageCollection>
1212
<DockerfileContext>..\..</DockerfileContext>

Diff for: ‎Servers/SVO/SVO.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
9-
<DockerfileRunArguments>-p 10058:10058 -p 10060:10060 -p 10061:10061 -p 10062:10062</DockerfileRunArguments>
9+
<DockerfileRunArguments>-p 10058:10058 -p 10060:10060 -p 10061:10061 -p 10062:10062 -p 65535:65535</DockerfileRunArguments>
1010
<ApplicationIcon>SVO.ico</ApplicationIcon>
1111
<ServerGarbageCollection>true</ServerGarbageCollection>
1212
<DockerfileContext>..\..</DockerfileContext>

0 commit comments

Comments
 (0)