re-instate port forward and firewall opening commands

Rawwar13 · Sep 16, 2011 · ed8880e · ed8880e
1 parent 5194b3f
commit ed8880e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/Source/YAMS-Library/Functions/Networking.cs b/Source/YAMS-Library/Functions/Networking.cs
@@ -80,10 +80,10 @@ public static bool CloseFirewallPort(int intPortNumber)
         public static bool OpenUPnP(int intPortNumber, string strFriendlyName)
         {
             //First check if there is a upnp device to talk to
-            if (SharpUPnP.SharpUPnP.Discover())
+            if (UPnP.Discover())
             {
                 try {
-                    SharpUPnP.SharpUPnP.ForwardPort(intPortNumber, System.Net.Sockets.ProtocolType.Tcp, strFriendlyName);
+                    UPnP.CreateForwardingRule(intPortNumber, System.Net.Sockets.ProtocolType.Tcp, strFriendlyName);
                     Database.AddLog("Forwarded port " + intPortNumber + " for " + strFriendlyName, "networking");
                     return true;
                 }
@@ -107,11 +107,11 @@ public static bool OpenUPnP(int intPortNumber, string strFriendlyName)
         public static bool CloseUPnP(int intPortNumber)
         {
             //First check if there is a upnp device to talk to
-            if (SharpUPnP.SharpUPnP.Discover())
+            if (UPnP.Discover())
             {
                 try
                 {
-                    SharpUPnP.SharpUPnP.DeleteForwardingRule(intPortNumber, System.Net.Sockets.ProtocolType.Tcp);
+                    UPnP.DeleteForwardingRule(intPortNumber, System.Net.Sockets.ProtocolType.Tcp);
                     Database.AddLog("Un-forwarded port " + intPortNumber, "networking");
                     return true;
                 }

diff --git a/Source/YAMS-Library/Objects/Server.cs b/Source/YAMS-Library/Objects/Server.cs
@@ -183,8 +183,8 @@ public void Start()
                 Database.AddLog("Server Started: " + strArgs, "server", "info", false, this.ServerID);
 
                 //Try and open the firewall port
-                //Networking.OpenFirewallPort(this.Port, this.ServerTitle);
-                //Networking.OpenUPnP(this.Port, this.ServerTitle);
+                Networking.OpenFirewallPort(this.Port, this.ServerTitle);
+                Networking.OpenUPnP(this.Port, this.ServerTitle);
 
                 //Save the process ID so we can kill if there is a crash
                 this.PID = this.prcMinecraft.Id;
@@ -201,8 +201,8 @@ public void Stop()
         {
             if (!Running) return;
             //Close firewall
-            //Networking.CloseFirewallPort(this.Port);
-            //Networking.CloseUPnP(this.Port);
+            Networking.CloseFirewallPort(this.Port);
+            Networking.CloseUPnP(this.Port);
 
             this.SafeStop = true;
             this.Send("stop");

diff --git a/Source/YAMS-Library/Web/WebServer.cs b/Source/YAMS-Library/Web/WebServer.cs
@@ -81,10 +81,10 @@ public static void Init()
             publicServerThread.Start();
 
             //Open firewall ports and forward via UPnP
-            //Networking.OpenFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")), "YAMS - Admin website");
-            //Networking.OpenFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")), "YAMS - Public website");
-            //Networking.OpenUPnP(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")), "YAMS - Admin website");
-            //Networking.OpenUPnP(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")), "YAMS - Public website");
+            Networking.OpenFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")), "YAMS - Admin website");
+            Networking.OpenFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")), "YAMS - Public website");
+            Networking.OpenUPnP(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")), "YAMS - Admin website");
+            Networking.OpenUPnP(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")), "YAMS - Public website");
         }
 
         static void myServer_ErrorPageRequested(object sender, ErrorPageEventArgs e)
@@ -154,10 +154,10 @@ public static void StartPublic()
         public static void Stop()
         {
             //Close firewall ports and forward via UPnP
-            //Networking.CloseFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")));
-            //Networking.CloseFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")));
-            //Networking.CloseUPnP(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")));
-            //Networking.CloseUPnP(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")));
+            Networking.CloseFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")));
+            Networking.CloseFirewallPort(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")));
+            Networking.CloseUPnP(Convert.ToInt32(YAMS.Database.GetSetting("AdminListenPort", "YAMS")));
+            Networking.CloseUPnP(Convert.ToInt32(YAMS.Database.GetSetting("PublicListenPort", "YAMS")));
 
             adminServerThread.Abort();
             publicServerThread.Abort();