[GNUnet-SVN] r9731 - in gnunet/src: fs transport

[gnunet]

Author: grothoff
Date: 2009-12-11 15:31:33 +0100 (Fri, 11 Dec 2009)
New Revision: 9731

Modified:
   gnunet/src/fs/gnunet-directory.c
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/transport.h
Log:
fixing compile errors

Modified: gnunet/src/fs/gnunet-directory.c
===================================================================
--- gnunet/src/fs/gnunet-directory.c    2009-12-11 12:22:20 UTC (rev 9730)
+++ gnunet/src/fs/gnunet-directory.c    2009-12-11 14:31:33 UTC (rev 9731)
@@ -105,7 +105,7 @@
   const char *filename;
   int i;
 
-  if (NULL == argv[0])
+  if (NULL == args[0])
     {
       fprintf (stderr,
               _("You must specify a filename to inspect."));

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2009-12-11 12:22:20 UTC 
(rev 9730)
+++ gnunet/src/transport/gnunet-service-transport.c     2009-12-11 14:31:33 UTC 
(rev 9731)
@@ -2475,7 +2475,7 @@
  * @param message the actual message
  */
 static void
-handle_addressLookUp (void *cls,
+handle_address_lookup (void *cls,
                       struct GNUNET_SERVER_Client *client,
                       const struct GNUNET_MessageHeader *message)
 {
@@ -2484,7 +2484,6 @@
        const char *nameTransport;
        const char *address;
        uint16_t size;
-       struct GNUNET_MessageHeader reply;
        struct GNUNET_SERVER_TransmitContext *tc;
 
        size = ntohs (message->size);
@@ -2503,14 +2502,14 @@
                return;
        }
        address = (const char *)&alum[1];
-       nameTransport = (const char*)&addr[addressLen];
+       nameTransport = (const char*)&address[addressLen];
        if (nameTransport [size - sizeof (struct AddressLookupMessage) - 
addressLen -1] != '\0')
        {
                GNUNET_break_op (0);
                GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
                return;
        }
-       struct GNUNET_TIME_Absolute timeout= 
GNUNET_TIME_absolute_ntoh(bbalum->timeout);
+       struct GNUNET_TIME_Absolute timeout= 
GNUNET_TIME_absolute_ntoh(alum->timeout);
        struct GNUNET_TIME_Relative rtimeout = 
GNUNET_TIME_absolute_get_remaining(timeout);
        lsPlugin = find_transport(nameTransport);
        if (NULL == lsPlugin)
@@ -2522,7 +2521,7 @@
        }
        tc = GNUNET_SERVER_transmit_context_create (client);
        lsPlugin->api->address_pretty_printer(cls, nameTransport,
-                               addr, alum->addrlen, GNUNET_YES, rtimeout, 
&transmit_address_to_client, tc);
+                               address, addressLen, GNUNET_YES, rtimeout, 
&transmit_address_to_client, tc);
 }
 
 /**
@@ -2541,6 +2540,9 @@
   {&handle_try_connect, NULL,
    GNUNET_MESSAGE_TYPE_TRANSPORT_TRY_CONNECT,
    sizeof (struct TryConnectMessage)},
+  {&handle_address_lookup, NULL,
+   GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_LOOKUP,
+   0 },
   {NULL, NULL, 0, 0}
 };
 

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2009-12-11 12:22:20 UTC (rev 9730)
+++ gnunet/src/transport/transport.h    2009-12-11 14:31:33 UTC (rev 9731)
@@ -249,7 +249,7 @@
   /**
    * timeout to give up.
    */
-  struct GNUNET_TIME_AbosluteNBO tiemout;
+  struct GNUNET_TIME_AbsoluteNBO timeout;
 
   /**
    * Length of the (binary) address in bytes, in big-endian.