Replace patch with new variable serverpublicip

Author: TheAssassin

doc/examples/servinit.cfg

@@ -27,6 +27,7 @@ if (= $rehashing 0) [
     // servertype 3 // type of server, 1 = private (does not register with masterserver), 2 = public, 3 = dedicated
     // serveruprate 0 // maximum upload speed; cmdline: -suN
     // serverip "127.0.0.1" // host which server binds to; cmdline: -siN
+    // serverpublicip "127.0.0.1" // host the server advertises to the master server (useful if behind NAT, e.g., in Docker); cmdline: -sjN
     // servermaster "master.blue-nebula.org" // host server tries to use as master by default; cmdline: -smS
     // serverport 28801 // port which server binds to (you must open this port [UDP] and this plus one, default 28801 and 28802); cmdline: -spN
     // servermasterport 28800 // master server port which server *connects* to; cmdline: -saN

docker/Dockerfile

@@ -14,11 +14,8 @@ COPY data/ /blue-nebula/data
 
 COPY CMakeLists.txt /blue-nebula/
 COPY README.md /blue-nebula/
-COPY docker/serverip.patch /serverip.patch
 
-RUN git apply < /serverip.patch && \
-    ls -al && \
-    mkdir build && \
+RUN mkdir build && \
     cd build && \
     # TODO: server-only build configuration
     cmake .. -DCMAKE_BUILD_TYPE=Release -G Ninja -DCMAKE_INSTALL_PREFIX=/blue-nebula/install -DBUILD_CLIENT=OFF && \

docker/serverip.patch

@@ -275,6 +275,7 @@ VAR(0, serveruprate, 0, 0, VAR_MAX);
 VAR(0, serverport, 1, SERVER_PORT, VAR_MAX);
 VAR(0, serverlanport, 0, LAN_PORT, VAR_MAX);
 SVAR(0, serverip, "");
+SVAR(0, serverpublicip, "");
 
 bool filterword(char *src, const char *list)
 {
@@ -1415,10 +1416,22 @@ void changeservertype()
 void setupserver()
 {
     server::changemap(load && *load ? load : NULL);
-    if(!servertype) return;
+
+    if (servertype <= 0) {
+        return;
+    }
+
     setupmaster();
+
     conoutf("loading server (%s:%d)..", *serverip ? serverip : "*", serverport);
-    if(setupserversockets() && verbose) conoutf("game server started");
+    if (*serverpublicip != '\0') {
+        conoutf("public server IP is %s", serverpublicip);
+    }
+
+    if (setupserversockets() && verbose) {
+        conoutf("game server started");
+    }
+
 #ifndef STANDALONE
     if(servertype >= 3) serverloop();
 #endif
@@ -1470,6 +1483,7 @@ bool serveroption(char *opt)
             {
                 case 'u': setvar("serveruprate", atoi(opt+3)); return true;
                 case 'i': setsvar("serverip", opt+3); return true;
+                case 'j': setsvar("serverpublicip", opt+3); return true;
                 case 'm': setsvar("servermaster", opt+3); return true;
                 case 'l': load = opt+3; return true;
                 case 's': setvar("servertype", atoi(opt+3)); return true;

src/engine/server.cpp

@@ -438,7 +438,16 @@ namespace auth
             conoutf("Updating master server");
             // the position of the 0 was used to signalize support for the global stats system, which has been removed
             // to retain compatibility, we just send a 0, pretending it was simply disabled by the administrator
-            requestmasterf("server %d %s %d %s 0 %s\n", serverport, *serverip ? serverip : "*", CUR_VERSION, escapestring(limitstring(G(serverdesc), MAXSDESCLEN+1)), escapestring(versionbranch));
+            const char *advertisedIp;
+            if (*serverpublicip != '\0') {
+                advertisedIp = serverpublicip;
+            } else if (*serverip != '\0') {
+                advertisedIp = serverip;
+            } else {
+                advertisedIp = "*";
+            }
+
+            requestmasterf("server %d %s %d %s 0 %s\n", serverport, advertisedIp, CUR_VERSION, escapestring(limitstring(G(serverdesc), MAXSDESCLEN+1)), escapestring(versionbranch));
         }
         reqserverauth();
     }

src/game/auth.h

@@ -7321,6 +7321,7 @@ namespace server
         {
             case 'P': setsvar("adminpass", &arg[3]); return true;
             case 'k': setsvar("serverpass", &arg[3]); return true;
+            case 'j': setsvar("serverpublicip", &arg[3]); return true;
             default: break;
         }
         return false;

src/game/server.cpp

@@ -6,7 +6,7 @@ extern int verbose, curtime, lastmillis, totalmillis, timescale, paused;
 extern uint totalsecs;
 extern time_t clocktime, currenttime, clockoffset;
 extern int servertype, serverport, serverlanport, servermasterport;
-extern char *servermaster, *serverip;
+extern char *servermaster, *serverip, *serverpublicip;
 #ifdef STANDALONE
 #define ifserver(x) if(x)
 #define ifnserver(x) if(x)