Merge pull request #2014 from frennkie/re-create-port-mappings

Re-create forwardings after externalIP change

nat/pmp.go

@@ -65,10 +65,6 @@ func (p *PMP) AddPortMapping(port uint16) error {
 	p.forwardedPortsMtx.Lock()
 	defer p.forwardedPortsMtx.Unlock()
 
-	if _, exists := p.forwardedPorts[port]; exists {
-		return nil
-	}
-
 	_, err := p.client.AddPortMapping("tcp", int(port), int(port), 0)
 	if err != nil {
 		return err

nat/upnp.go

@@ -62,10 +62,6 @@ func (u *UPnP) AddPortMapping(port uint16) error {
 	u.forwardedPortsMtx.Lock()
 	defer u.forwardedPortsMtx.Unlock()
 
-	if _, exists := u.forwardedPorts[port]; exists {
-		return nil
-	}
-
 	if err := u.device.Forward(port, ""); err != nil {
 		return err
 	}

server.go

@@ -1371,6 +1371,21 @@ out:
 				continue
 			}
 
+			// Periodically renew the NAT port forwarding.
+			for _, port := range forwardedPorts {
+				err := s.natTraversal.AddPortMapping(port)
+				if err != nil {
+					srvrLog.Warnf("Unable to automatically "+
+						"re-create port forwarding using %s: %v",
+						s.natTraversal.Name(), err)
+				} else {
+					srvrLog.Debugf("Automatically re-created "+
+						"forwarding for port %d using %s to "+
+						"advertise external IP",
+						port, s.natTraversal.Name())
+				}
+			}
+
 			if ip.Equal(s.lastDetectedIP) {
 				continue
 			}