[GNUnet-SVN] r14668 - gnunet/src/transport

[gnunet]

Author: brodski
Date: 2011-03-17 10:54:37 +0100 (Thu, 17 Mar 2011)
New Revision: 14668

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/plugin_transport_wlan.c
Log:
Fixed warning and mac to string function

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2011-03-16 15:11:42 UTC (rev 14667)
+++ gnunet/src/transport/Makefile.am    2011-03-17 09:54:37 UTC (rev 14668)
@@ -34,14 +34,14 @@
 
 if HAVE_PCAP
 if LINUX
-#if HAVE_EXPERIMENTAL
+if HAVE_EXPERIMENTAL
  WANBIN = gnunet-transport-wlan-helper
  WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la
  WLAN_API_TEST = test_transport_api_wlan
  WLAN_REL_TEST = test_transport_api_reliability_wlan
-#endif
 endif
 endif
+endif
 
 if LINUX
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la

Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c        2011-03-16 15:11:42 UTC 
(rev 14667)
+++ gnunet/src/transport/plugin_transport_wlan.c        2011-03-17 09:54:37 UTC 
(rev 14668)
@@ -2064,7 +2064,7 @@
     }
   input = (const unsigned char*) addr;
   GNUNET_snprintf(ret, sizeof(ret),
-      "%s Mac-Address %.2X:%.2X:%.2X:%.2X:%.2X:%.2X", PROTOCOL_PREFIX,
+      "%s Mac-Address %02X:%02X:%02X:%02X:%02X:%02X", PROTOCOL_PREFIX,
       input[0], input[1], input[2], input[3], input[4], input[5]);
   return ret;
 }
@@ -2540,7 +2540,7 @@
       rec_queue->num = ntohs(fh->fragment_off_or_num);
       rec_queue->msg = (char*) &(rec_queue[1]);
       //copy msg to buffer
-      memcpy(rec_queue->msg, tempmsg, rec_queue->size);
+      memcpy((char *)rec_queue->msg, tempmsg, rec_queue->size);
       insert_fragment_in_queue(rec_message, rec_queue);
       //save bitfield
       retval = rec_message->received_fragments;