From b13153254a5ee55d3cd8ebf5468e9142bbcacd19 Mon Sep 17 00:00:00 2001 From: David Brodski Date: Thu, 17 Mar 2011 09:54:37 +0000 Subject: [PATCH] Fixed warning and mac to string function --- src/transport/Makefile.am | 4 ++-- src/transport/plugin_transport_wlan.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 339e58bed..cafdcdc31 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -34,12 +34,12 @@ endif 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 diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 4f6b514f3..c23377a0c 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -2064,7 +2064,7 @@ wlan_plugin_address_to_string(void *cls, const void *addr, size_t addrlen) } 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 @@ insert_fragment_in_in_message_queue(struct Plugin * plugin, 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; -- 2.25.1