[GNUnet-SVN] r4097 - GNUnet/src/transports/upnp

[grothoff]

Author: grothoff
Date: 2006-12-29 02:37:28 -0800 (Fri, 29 Dec 2006)
New Revision: 4097

Modified:
   GNUnet/src/transports/upnp/todo
   GNUnet/src/transports/upnp/upnp.c
Log:
stuff

Modified: GNUnet/src/transports/upnp/todo
===================================================================
--- GNUnet/src/transports/upnp/todo     2006-12-29 10:03:33 UTC (rev 4096)
+++ GNUnet/src/transports/upnp/todo     2006-12-29 10:37:28 UTC (rev 4097)
@@ -1,7 +1,4 @@
-1) Add code to determine internal IP
-2) change init to periodically re-add port mappings / rediscover
-   (use cron jobs for this).
-3) Look into upnp shutdown sequence!
-4) adjust configure to check for libxml2
-5) integrate with transports
-
+1) Look into upnp shutdown sequence (fix gaim_timeout_add!)
+2) adjust configure to check for libxml2
+3) integrate with transports -- tricky bit: making it optional!
+4) remove glib dependency from upnp code!

Modified: GNUnet/src/transports/upnp/upnp.c
===================================================================
--- GNUnet/src/transports/upnp/upnp.c   2006-12-29 10:03:33 UTC (rev 4096)
+++ GNUnet/src/transports/upnp/upnp.c   2006-12-29 10:37:28 UTC (rev 4097)
@@ -28,6 +28,7 @@
 #include "util.h"
 #include "upnp.h"
 #include "error.h"
+#include "ip.h"
 
 #include <curl/curl.h>
 
@@ -684,15 +685,16 @@
                              const gchar* protocol) {
   const gchar * action_name;
   gchar * action_params;
-  const gchar * internal_ip;
+  char * internal_ip;
   char * proxy;
   int ret;
     
   if (control_info.status != GAIM_UPNP_STATUS_DISCOVERED) 
     return NO; 
   if (do_add) {
-    internal_ip = gaim_upnp_get_internal_ip();
-    if(internal_ip == NULL) {
+    internal_ip = gaim_upnp_get_internal_ip(cfg,
+                                           ectx);
+    if (internal_ip == NULL) {
       gaim_debug_error("upnp",
                       "gaim_upnp_set_port_mapping(): couldn't get local ip\n");
       return NO;
@@ -703,6 +705,7 @@
                                    protocol,
                                    portmap,
                                    internal_ip);
+    FREE(internal_ip);
   } else {
     action_name = "DeletePortMapping";
     action_params = g_strdup_printf(DELETE_PORT_MAPPING_PARAMS,