[GNUnet-SVN] r9576 - in GNUnet/src/applications: rpc tracekit vpn

[gnunet]

Author: grothoff
Date: 2009-11-18 05:54:34 -0700 (Wed, 18 Nov 2009)
New Revision: 9576

Modified:
   GNUnet/src/applications/rpc/rpc.c
   GNUnet/src/applications/tracekit/gnunet-tracekit.c
   GNUnet/src/applications/vpn/vpn.c
Log:
fixes

Modified: GNUnet/src/applications/rpc/rpc.c
===================================================================
--- GNUnet/src/applications/rpc/rpc.c   2009-11-18 12:49:49 UTC (rev 9575)
+++ GNUnet/src/applications/rpc/rpc.c   2009-11-18 12:54:34 UTC (rev 9576)
@@ -685,14 +685,16 @@
   reply = NULL;
   error = ntohl (res->functionNameLength);
   if (error == GNUNET_RPC_ERROR_OK)
-    reply = GNUNET_RPC_parameters_deserialize ((char *) &res[1],
-                                               ntohs (message->size) -
-                                               sizeof (P2P_rpc_MESSAGE));
-  if (ntohl (res->argumentCount) != GNUNET_RPC_parameters_count (reply))
     {
-      GNUNET_RPC_parameters_destroy (reply);
-      reply = NULL;
-      error = GNUNET_RPC_ERROR_REPLY_MALFORMED;
+      reply = GNUNET_RPC_parameters_deserialize ((char *) &res[1],
+                                                ntohs (message->size) -
+                                                sizeof (P2P_rpc_MESSAGE));
+      if (ntohl (res->argumentCount) != GNUNET_RPC_parameters_count (reply))
+       {
+         GNUNET_RPC_parameters_destroy (reply);
+         reply = NULL;
+         error = GNUNET_RPC_ERROR_REPLY_MALFORMED;
+       }
     }
   if (pos->callback != NULL)
     {

Modified: GNUnet/src/applications/tracekit/gnunet-tracekit.c
===================================================================
--- GNUnet/src/applications/tracekit/gnunet-tracekit.c  2009-11-18 12:49:49 UTC 
(rev 9575)
+++ GNUnet/src/applications/tracekit/gnunet-tracekit.c  2009-11-18 12:54:34 UTC 
(rev 9576)
@@ -213,6 +213,7 @@
       break;
     default:
       GNUNET_GE_BREAK (NULL, 0);
+      return NULL;
     }
   GNUNET_TRACEKIT_run (sock, depth, priority, report, NULL);
   /* final processing loop */

Modified: GNUnet/src/applications/vpn/vpn.c
===================================================================
--- GNUnet/src/applications/vpn/vpn.c   2009-11-18 12:49:49 UTC (rev 9575)
+++ GNUnet/src/applications/vpn/vpn.c   2009-11-18 12:54:34 UTC (rev 9576)
@@ -292,7 +292,7 @@
   if (fd < 0)
     {
       GNUNET_GE_LOG (ectx, GNUNET_GE_ERROR | GNUNET_GE_BULK | GNUNET_GE_USER,
-                     _("Cannot open tunnel device: %s"), strerror (fd));
+                     _("Cannot open tunnel device: %s"), strerror (errno));
       GNUNET_GE_DIE_STRERROR (ectx,
                               GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
                               GNUNET_GE_BULK, "open");