Ticket #1931: listening_port_warning.patch

deluge/ui/gtkui/gtkui.py

@@ -306 +306 @@
                 ed.addCallback(on_ed_response)
             else:
                 component.start()
+
+                # Check to warn user if deluge is using an invalid listening port if fixed listening ports are required
+                if not config["random_port"]:
+                    self.core_config = {}
+                    def _on_get_config(config):
+                        # Current configuration obtained - saving and fetching the actual listening port in use
+                        self.core_config = config
+                        client.core.get_listen_port().addCallback(_on_get_listen_port)
+
+                    def _on_get_listen_port(port):
+                        # Listening port obtained - warning user if it is not as configured
+                        if not port in range(self.core_config["listen_ports"][0], self.core_config["listen_ports"][1] + 1):
+                            dialogs.ErrorDialog(
+                                _("Listening Port Warning"),
+                                _("%d is in use however the range %d-%d has been configured.\n\nIf the specified range has been forwarded through a NAT and/or firewall then you will receive no incoming connections.") % (port, self.core_config["listen_ports"][0], self.core_config["listen_ports"][1]),
+                                details=_("This likely occurred as libtorrent was unable to bind a listening port\nin the range given - make sure no other programs are using these ports.\nIf this occurred after deluge was restarted then the network stack\nmay think the chosen port is still in use - please shutdown deluge, wait\n10 seconds then start up again. If this still fails, please define a broader\nlistening port range.")
+                            ).run()
+
+                        # Cleaning up
+                        del self.core_config
+
+                    # Obtaining current configuration
+                    client.core.get_config().addCallback(_on_get_config)
+
                 return
 
         else:

deluge/ui/gtkui/preferences.py

@@ -853 +853 @@
                 _("You must now restart the deluge UI")
             )
             dialog.run()
+        else:
+            # No major GUI changes
+            # Checking whether the listening port range has been changed (including when the listening interface changes)
+            if not new_core_config["random_port"] and ("listen_interface" in config_to_set or "listen_ports" in config_to_set):
+                # Change detected - need to verify listening port has been set properly
+                from twisted.internet import reactor
+                reactor.callLater(0.5, lambda: client.core.get_listen_port().addCallback(_on_get_listen_port))
+
+                def _on_get_listen_port(port):
+                    # Listening port obtained - warning user if it is not as configured
+                    if not port in range(self.core_config["listen_ports"][0], self.core_config["listen_ports"][1] + 1):
+                        dialogs.ErrorDialog(
+                            _("Listening Port Warning"),
+                            _("%d is in use however the range %d-%d has been configured.\n\nIf the specified range has been forwarded through a NAT and/or firewall then you will receive no incoming connections.") % (port, self.core_config["listen_ports"][0], self.core_config["listen_ports"][1]),
+                            details=_("This likely occurred as libtorrent was unable to bind a listening port\nin the range given - make sure no other programs are using these ports.\nIf this occurred after deluge was restarted then the network stack\nmay think the chosen port is still in use - please shutdown deluge, wait\n10 seconds then start up again. If this still fails, please define a broader\nlistening port range.")
+                        ).run()
 
     def hide(self):
         self.builder.get_object("port_img").hide()