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

[grothoff]

Author: grothoff
Date: 2006-12-27 09:56:05 -0800 (Wed, 27 Dec 2006)
New Revision: 4078

Added:
   GNUnet/src/transports/upnp/todo
Modified:
   GNUnet/src/transports/upnp/Makefile.am
   GNUnet/src/transports/upnp/util.c
   GNUnet/src/transports/upnp/util.h
   GNUnet/src/transports/upnp/xmlnode.c
Log:
ts

Modified: GNUnet/src/transports/upnp/Makefile.am
===================================================================
--- GNUnet/src/transports/upnp/Makefile.am      2006-12-27 17:51:35 UTC (rev 
4077)
+++ GNUnet/src/transports/upnp/Makefile.am      2006-12-27 17:56:05 UTC (rev 
4078)
@@ -12,17 +12,19 @@
 
 libgnunetupnp_la_SOURCES = \
  error.c error.h \
- upnp.c upnp.h \
  util.c util.h \
- xmlnode.c xmlnode.h
+ xmlnode.c xmlnode.h \
+ upnp.c upnp.h 
 
 libgnunetupnp_la_LDFLAGS = \
  $(GTK_LIBS) @EXT_LIB_PATH@ @EXT_LIBS@ \
  -export-dynamic \
  -version-info 0:0:0
 
+# FIXME: detect libxml2 path properly!
 libgnunetupnp_la_CFLAGS = \
  -I$(top_scrdir)/include \
+ -I/usr/include/libxml2 \
  @GNUNETGTK_CFLAGS@ \
  @GTK_CFLAGS@ 
 

Added: GNUnet/src/transports/upnp/todo
===================================================================
--- GNUnet/src/transports/upnp/todo     2006-12-27 17:51:35 UTC (rev 4077)
+++ GNUnet/src/transports/upnp/todo     2006-12-27 17:56:05 UTC (rev 4078)
@@ -0,0 +1,7 @@
+1) figure out which external GNUnet API we want to have
+2) figure out how control should work
+   (replace gaim_timeout/input_add/remove with
+    GNUnet-ish constructs)
+3) adjust configure to check for libxml2
+4) integrate with transports
+

Modified: GNUnet/src/transports/upnp/util.c
===================================================================
--- GNUnet/src/transports/upnp/util.c   2006-12-27 17:51:35 UTC (rev 4077)
+++ GNUnet/src/transports/upnp/util.c   2006-12-27 17:56:05 UTC (rev 4078)
@@ -184,6 +184,7 @@
 }
 
 
+gboolean
 gaim_str_has_prefix(const char *s, const char *p)
 {
 #if GLIB_CHECK_VERSION(2,2,0)

Modified: GNUnet/src/transports/upnp/util.h
===================================================================
--- GNUnet/src/transports/upnp/util.h   2006-12-27 17:51:35 UTC (rev 4077)
+++ GNUnet/src/transports/upnp/util.h   2006-12-27 17:56:05 UTC (rev 4078)
@@ -29,6 +29,8 @@
 #define _GAIM_UTIL_H_
 
 #include <stdio.h>
+#include <string.h>
+#include <glib.h>
 
 #ifdef __cplusplus
 extern "C" {

Modified: GNUnet/src/transports/upnp/xmlnode.c
===================================================================
--- GNUnet/src/transports/upnp/xmlnode.c        2006-12-27 17:51:35 UTC (rev 
4077)
+++ GNUnet/src/transports/upnp/xmlnode.c        2006-12-27 17:56:05 UTC (rev 
4078)
@@ -29,9 +29,6 @@
 
 #include "platform.h"
 
-#include <libxml/parser.h>
-#include <string.h>
-#include <glib.h>
 #include "xmlnode.h"
 #include "util.h"