[GNUnet-SVN] r3705 - in GNUnet: contrib src/applications/transport

[grothoff]

Author: grothoff
Date: 2006-11-11 14:33:15 -0800 (Sat, 11 Nov 2006)
New Revision: 3705

Modified:
   GNUnet/contrib/hostlist.cgi
   GNUnet/contrib/hostlist.php
   GNUnet/contrib/report.sh
   GNUnet/src/applications/transport/transport.c
Log:
contrib updates

Modified: GNUnet/contrib/hostlist.cgi
===================================================================
--- GNUnet/contrib/hostlist.cgi 2006-11-11 22:28:57 UTC (rev 3704)
+++ GNUnet/contrib/hostlist.cgi 2006-11-11 22:33:15 UTC (rev 3705)
@@ -2,4 +2,4 @@
 # This is a CGI script to generate the host list on-demand.
 # by Michael Wensley, with minor improvements by Christian Grothoff
 echo -ne "Content-Type: application/octet-stream\r\n\r\n"
-cat /var/lib/GNUnet/data/hosts/*.{6,8,12,17,23,25}
+cat /var/lib/GNUnet/data/hosts/*.{2,3,4,5,6,8,12,17,23,25}

Modified: GNUnet/contrib/hostlist.php
===================================================================
--- GNUnet/contrib/hostlist.php 2006-11-11 22:28:57 UTC (rev 3704)
+++ GNUnet/contrib/hostlist.php 2006-11-11 22:33:15 UTC (rev 3705)
@@ -3,7 +3,7 @@
 // Author: "Krasko Oleksandr" <address@hidden>
 // Minor improvements by Christian Grothoff <address@hidden>
 header("Content-Type: application/octet-stream\r\n\r\n");
-$extmas = array('6','8','12','17','23','25');
+$extmas = array('2','3','4','5','6','8','12','17','23','25');
 $path = '/var/lib/GNUnet/data/hosts/'; // adjust as necessary
 $dir = opendir($path);
 if (! $dir)

Modified: GNUnet/contrib/report.sh
===================================================================
--- GNUnet/contrib/report.sh    2006-11-11 22:28:57 UTC (rev 3704)
+++ GNUnet/contrib/report.sh    2006-11-11 22:33:15 UTC (rev 3705)
@@ -160,7 +160,25 @@
 fi
 
 
+TEST=`$WHICH guile 2> /dev/null`
+if test -n "$TEST"; then
+  guile --version | head -n1 2> /dev/null | \
+    awk '{print "Guile          : "$2}'
+else
+  echo "Guile          : Not found"
+fi
 
 
+TEST=`$WHICH curl-config 2> /dev/null`
+if test -n "$TEST"; then
+  curl-config --version | head -n1 2> /dev/null | \
+    awk '{print "libcurl        : "$2}'
+else
+  echo "libcurl        : Not found"
+fi
 
+
+
+
+
 echo "--------------------------------------------------------------"

Modified: GNUnet/src/applications/transport/transport.c
===================================================================
--- GNUnet/src/applications/transport/transport.c       2006-11-11 22:28:57 UTC 
(rev 3704)
+++ GNUnet/src/applications/transport/transport.c       2006-11-11 22:33:15 UTC 
(rev 3705)
@@ -112,6 +112,10 @@
     GROW(tapis,
         tapis_count,
         tapi->protocolNumber+1);
+  if (tapis[tapi->protocolNumber] != NULL) {
+    GE_BREAK(ectx, 0);
+    return SYSERR;
+  }
   tapis[tapi->protocolNumber] = tapi;
   tapi->helo = NULL;
   cron_add_job(coreAPI->cron,
@@ -638,11 +642,22 @@
       }
       tapi->libHandle = lib;
       tapi->transName = STRDUP(pos);
-      addTransport(tapi);
-      GE_LOG(ectx,
-            GE_INFO | GE_USER | GE_BULK,
-            _("Loaded transport `%s'\n"),
-            pos);
+      if (OK != addTransport(tapi)) {
+       void (*ptr)();
+
+       FREE(tapi->transName);
+       ptr = os_plugin_resolve_function(lib,
+                                        "donetransport_",
+                                        NO);
+       if (ptr != NULL)
+         ptr();
+       os_plugin_unload(lib);  
+      } else {
+       GE_LOG(ectx,
+              GE_INFO | GE_USER | GE_BULK,
+              _("Loaded transport `%s'\n"),
+              pos);
+      }
     } while (next != NULL);
   }
   FREE(dso);