[GNUnet-SVN] r3207 - in GNUnet/src: applications/advertising application

gnunet-svn

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r3207 - in GNUnet/src: applications/advertising application

From:	durner
Subject:	[GNUnet-SVN] r3207 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/getoption applications/stats applications/topology_default applications/traffic include transports util/crypto util/os
Date:	Wed, 2 Aug 2006 11:52:36 -0700 (PDT)

Author: durner
Date: 2006-08-02 11:52:24 -0700 (Wed, 02 Aug 2006)
New Revision: 3207

Modified:
   GNUnet/src/applications/advertising/Makefile.am
   GNUnet/src/applications/bootstrap_http/Makefile.am
   GNUnet/src/applications/getoption/Makefile.am
   GNUnet/src/applications/stats/Makefile.am
   GNUnet/src/applications/topology_default/Makefile.am
   GNUnet/src/applications/traffic/Makefile.am
   GNUnet/src/include/gnunet_util_error.h
   GNUnet/src/transports/ip.c
   GNUnet/src/util/crypto/Makefile.am
   GNUnet/src/util/os/console.c
   GNUnet/src/util/os/daemon.c
   GNUnet/src/util/os/dso.c
Log:
fix MinGW

Modified: GNUnet/src/applications/advertising/Makefile.am
===================================================================
--- GNUnet/src/applications/advertising/Makefile.am     2006-08-01 20:40:29 UTC 
(rev 3206)
+++ GNUnet/src/applications/advertising/Makefile.am     2006-08-02 18:52:24 UTC 
(rev 3207)
@@ -10,6 +10,8 @@
   bootstrap.c \
   bootstrap.h
 libgnunetmodule_advertising_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/util/crypto/libgnunetutil_crypto.la \
+ $(top_builddir)/src/util/cron/libgnunetutil_cron.la
 libgnunetmodule_advertising_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: GNUnet/src/applications/bootstrap_http/Makefile.am
===================================================================
--- GNUnet/src/applications/bootstrap_http/Makefile.am  2006-08-01 20:40:29 UTC 
(rev 3206)
+++ GNUnet/src/applications/bootstrap_http/Makefile.am  2006-08-02 18:52:24 UTC 
(rev 3207)
@@ -8,6 +8,7 @@
 libgnunetmodule_bootstrap_la_SOURCES = \
   http.c 
 libgnunetmodule_bootstrap_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/util/crypto/libgnunetutil_crypto.la
 libgnunetmodule_bootstrap_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: GNUnet/src/applications/getoption/Makefile.am
===================================================================
--- GNUnet/src/applications/getoption/Makefile.am       2006-08-01 20:40:29 UTC 
(rev 3206)
+++ GNUnet/src/applications/getoption/Makefile.am       2006-08-02 18:52:24 UTC 
(rev 3207)
@@ -12,11 +12,12 @@
 libgnunetgetoption_api_la_SOURCES = \
   clientapi.c 
 libgnunetgetoption_api_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la
 
 libgnunetmodule_getoption_la_SOURCES = \
   getoption.c getoption.h
 libgnunetmodule_getoption_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmodule_getoption_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: GNUnet/src/applications/stats/Makefile.am
===================================================================
--- GNUnet/src/applications/stats/Makefile.am   2006-08-01 20:40:29 UTC (rev 
3206)
+++ GNUnet/src/applications/stats/Makefile.am   2006-08-02 18:52:24 UTC (rev 
3207)
@@ -26,7 +26,8 @@
 libgnunetstats_api_la_SOURCES = \
   clientapi.c 
 libgnunetstats_api_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la
 
 libgnunetmodule_stats_la_SOURCES = \
   statistics.c \

Modified: GNUnet/src/applications/topology_default/Makefile.am
===================================================================
--- GNUnet/src/applications/topology_default/Makefile.am        2006-08-01 
20:40:29 UTC (rev 3206)
+++ GNUnet/src/applications/topology_default/Makefile.am        2006-08-02 
18:52:24 UTC (rev 3207)
@@ -8,6 +8,8 @@
 libgnunetmodule_topology_default_la_SOURCES = \
   topology.c 
 libgnunetmodule_topology_default_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la 
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/util/crypto/libgnunetutil_crypto.la \
+ $(top_builddir)/src/util/cron/libgnunetutil_cron.la
 libgnunetmodule_topology_default_la_LDFLAGS = \
   -export-dynamic -avoid-version -module

Modified: GNUnet/src/applications/traffic/Makefile.am
===================================================================
--- GNUnet/src/applications/traffic/Makefile.am 2006-08-01 20:40:29 UTC (rev 
3206)
+++ GNUnet/src/applications/traffic/Makefile.am 2006-08-02 18:52:24 UTC (rev 
3207)
@@ -12,7 +12,8 @@
 libgnunetmodule_traffic_api_la_SOURCES = \
   clientapi.c 
 libgnunetmodule_traffic_api_la_LIBADD = \
-  $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/util/network_client/libgnunetutil_network_client.la
 
 
 libgnunetmodule_traffic_la_SOURCES = \

Modified: GNUnet/src/include/gnunet_util_error.h
===================================================================
--- GNUnet/src/include/gnunet_util_error.h      2006-08-01 20:40:29 UTC (rev 
3206)
+++ GNUnet/src/include/gnunet_util_error.h      2006-08-02 18:52:24 UTC (rev 
3207)
@@ -203,7 +203,14 @@
  */
 #define GE_LOG_STRERROR_FILE(ctx, level, cmd, filename) do { GE_LOG(ctx, 
level, _("`%s' failed on file `%s' at %s:%d in %s with error: %s\n"), cmd, 
filename,__FILE__, __LINE__, __FUNCTION__, STRERROR(errno)); } while(0);
 
+/**
+ * Die with an error message that indicates
+ * a failure of the command 'cmd' on file 'filename'
+ * with the message given by strerror(errno).
+ */
+#define GE_DIE_STRERROR_FILE(ctx, level, cmd, filename) do { GE_LOG(ctx, 
level, _("`%s' failed on file `%s' at %s:%d in %s with error: %s\n"), cmd, 
filename,__FILE__, __LINE__, __FUNCTION__, STRERROR(errno)); abort(); } 
while(0);
 
+
 #if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif

Modified: GNUnet/src/transports/ip.c
===================================================================
--- GNUnet/src/transports/ip.c  2006-08-01 20:40:29 UTC (rev 3206)
+++ GNUnet/src/transports/ip.c  2006-08-02 18:52:24 UTC (rev 3207)
@@ -268,7 +268,7 @@
     if (CONNECT(s, 
                (SOCKADDR *) &theHost, 
                sizeof(theHost)) == SOCKET_ERROR) {
-      LOG_STRERROR(LOG_ERROR, 
+      GE_LOG_STRERROR(ectx, GE_ERROR | GE_BULK | GE_USER,
                   "connect");
       return SYSERR;
     }
@@ -277,7 +277,7 @@
     if (GETSOCKNAME(s,
                    (SOCKADDR *) &theHost, 
                    &i) == SOCKET_ERROR) {
-      LOG_STRERROR(LOG_ERROR, 
+      GE_LOG_STRERROR(ectx, GE_ERROR | GE_BULK | GE_USER, 
                   "getsockname");
       return SYSERR;
     }    

Modified: GNUnet/src/util/crypto/Makefile.am
===================================================================
--- GNUnet/src/util/crypto/Makefile.am  2006-08-01 20:40:29 UTC (rev 3206)
+++ GNUnet/src/util/crypto/Makefile.am  2006-08-02 18:52:24 UTC (rev 3207)
@@ -10,6 +10,8 @@
  $(GCLIBADD) \
  $(top_builddir)/src/util/libgnunetutil.la 
 
+libgnunetutil_crypto_la_LDFLAGS = $(LIBGCRYPT_LIBS) -lgmp
+
 libgnunetutil_crypto_la_SOURCES = \
  crc32.c \
  hashing.c \

Modified: GNUnet/src/util/os/console.c
===================================================================
--- GNUnet/src/util/os/console.c        2006-08-01 20:40:29 UTC (rev 3206)
+++ GNUnet/src/util/os/console.c        2006-08-02 18:52:24 UTC (rev 3207)
@@ -53,6 +53,7 @@
     return SYSERR;
   }
 
+#ifndef MINGW
   PIPE(filedes);
   pid = fork();
   if (pid < 0) {
@@ -113,12 +114,16 @@
     GE_LOG_STRERROR(ectx,
                    GE_ERROR | GE_USER | GE_ADMIN | GE_IMMEDIATE,
                    "setsid");
+#else
+  FreeConsole();
+#endif
   return OK;
 }
 
 void os_terminal_detach_complete(struct GE_Context * ectx,
                                 int * filedes,
                                 int success) {
+#ifndef MINGW
   char c = '.';
   
   if (! success)
@@ -130,5 +135,6 @@
     GE_LOG_STRERROR(ectx,
                    GE_WARNING | GE_USER | GE_ADMIN | GE_IMMEDIATE,
                    "close");
+#endif
 }
 

Modified: GNUnet/src/util/os/daemon.c
===================================================================
--- GNUnet/src/util/os/daemon.c 2006-08-01 20:40:29 UTC (rev 3206)
+++ GNUnet/src/util/os/daemon.c 2006-08-02 18:52:24 UTC (rev 3207)
@@ -177,8 +177,8 @@
     args[0] = "-d";
     idx = 1;
     
-    cp = getConfigurationString("GNUNET",
-                               "GNUNETD-CONFIG");
+    cp = GC_get_configuration_value_string(cfg, "GNUNET", "GNUNETD-CONFIG",
+      NULL, &cp);
     if (cp) {
       args[1] = "-c";
       args[2] = cp;

Modified: GNUnet/src/util/os/dso.c
===================================================================
--- GNUnet/src/util/os/dso.c    2006-08-01 20:40:29 UTC (rev 3206)
+++ GNUnet/src/util/os/dso.c    2006-08-02 18:52:24 UTC (rev 3207)
@@ -38,11 +38,8 @@
 
 static char * old_dlsearchpath;
 
-/* NILS: this method will need to be
-   ported for Win32 and other non-linux
-   systems */
+static char * getPluginPath() {
 #if LINUX
-static char * getPluginPath() {
   char * fn;
   char * lnk;
   size_t size;
@@ -82,8 +79,23 @@
   lnk[--size] = 'i';
   lnk[--size] = 'l';
   return lnk;
+#elif WINDOWS
+  char *path, *idx;
+  
+  path = MALLOC(4097);
+  GetModuleFileName(NULL, path, 4096);
+  idx = path + strlen(idx);
+  while(idx > path && path != '\\' && path != '/')
+    idx++;
+  *idx = 0;
+  
+  return path;  
+#else
+/* FIXME/PORTME to other platforms */
+#error Missing port: getPluginPath()
+  Missing port: getPluginPath();
+#endif
 }
-#endif
 
 /* using libtool, needs init! */
 void __attribute__ ((constructor)) gnc_ltdl_init(void) {

[Prev in Thread]

Current Thread

[Next in Thread]

[GNUnet-SVN] r3207 - in GNUnet/src: applications/advertising applications/bootstrap_http applications/getoption applications/stats applications/topology_default applications/traffic include transports util/crypto util/os, durner <=

Prev by Date: [GNUnet-SVN] r3206 - in GNUnet/src/util: . getopt os string
Next by Date: [GNUnet-SVN] r3208 - GNUnet/src/applications/vpn
Previous by thread: [GNUnet-SVN] r3206 - in GNUnet/src/util: . getopt os string
Next by thread: [GNUnet-SVN] r3208 - GNUnet/src/applications/vpn
Index(es):
- Date
- Thread