 +
 +public:
 +  static UPNPControl* Instance();
-+  void forwardPort(int port);
++  int forwardPort(quint16 port);
 +protected:
 +  UPNPControl();
 +private:

   torcontrol
   util
 )
Index: config/serversettings.cpp
===================================================================
--- config/serversettings.cpp	(revision 2473)
+++ config/serversettings.cpp	(working copy)
@@ -20,6 +20,7 @@
 
 #include "serversettings.h"

+	sprintf(port_str, "%d", port);
+	UPNP_DeletePortMapping(urls.controlURL, data.servicetype, port_str, "TCP");
+}
Index: src/vidalia/config/upnpcontrol.h
===================================================================
--- src/vidalia/config/upnpcontrol.h	(revision 0)
+++ src/vidalia/config/upnpcontrol.h	(revision 0)
@@ -0,0 +1,48 @@
+/*
+**  This file is part of Vidalia, and is subject to the license terms in the
