#define LOG(kind,...) GNUNET_log_from (kind, "transport-wlan",__VA_ARGS__)
+#define PLUGIN_NAME "wlan"
+
/**
* Max size of packet (that we give to the WLAN driver for transmission)
*/
/**
* Header for messages which need fragmentation. This is the format of
* a message we obtain AFTER defragmentation. We then need to check
- * the CRC and then tokenize the payload and pass it to the
+ * the CRC and then tokenize the payload and pass it to the
* 'receive' callback.
*/
struct WlanHeader
multiple messages! */
};
+
+
+struct WlanAddress
+{
+ uint32_t options GNUNET_PACKED;
+
+ struct GNUNET_TRANSPORT_WLAN_MacAddress mac;
+};
+
+
GNUNET_NETWORK_STRUCT_END
*/
GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+ int inbound;
+
};
/**
* peer mac address
*/
- struct GNUNET_TRANSPORT_WLAN_MacAddress addr;
+ struct WlanAddress addr;
+
+ /**
+ * Inbound or outbound session
+ */
+ int inbound;
+
+ /**
+ * Message delay for fragmentation context
+ */
+ struct GNUNET_TIME_Relative msg_delay;
+
+ /**
+ * ACK delay for fragmentation context
+ */
+ struct GNUNET_TIME_Relative ack_delay;
/**
* Desired transmission power for this MAC
/**
* Handle to helper process for priviledged operations.
- */
+ */
struct GNUNET_HELPER_Handle *suid_helper;
/**
*/
int have_mac;
+ /**
+ * Options for addresses
+ */
+ uint32_t options;
};
struct MacEndpoint *endpoint;
};
+/**
+ * Function called for a quick conversion of the binary address to
+ * a numeric address. Note that the caller must not free the
+ * address and that the next call to this function is allowed
+ * to override the address again.
+ *
+ * @param cls closure
+ * @param addr binary address
+ * @param addrlen length of the address
+ * @return string representing the same address
+ */
+static const char *
+wlan_plugin_address_to_string (void *cls, const void *addr, size_t addrlen);
/**
* Print MAC addresses nicely.
{
static char macstr[20];
- GNUNET_snprintf (macstr, sizeof (macstr), "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X", mac->mac[0], mac->mac[1],
+ GNUNET_snprintf (macstr, sizeof (macstr), "%.2X:%.2X:%.2X:%.2X:%.2X:%.2X",
+ mac->mac[0], mac->mac[1],
mac->mac[2], mac->mac[3], mac->mac[4], mac->mac[5]);
return macstr;
}
static void
get_wlan_header (struct Plugin *plugin,
struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *header,
- const struct GNUNET_TRANSPORT_WLAN_MacAddress *to_mac_addr,
+ const struct GNUNET_TRANSPORT_WLAN_MacAddress *to_mac_addr,
unsigned int size)
{
const int rate = 11000000;
size_t size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) + msize;
char buf[size];
+ if (NULL == endpoint)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
return;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending ACK to helper\n");
radio_header = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) buf;
get_radiotap_header (endpoint, radio_header, size);
get_wlan_header (endpoint->plugin,
- &radio_header->frame,
- &endpoint->addr,
+ &radio_header->frame,
+ &endpoint->addr.mac,
size);
memcpy (&radio_header[1], hdr, msize);
if (NULL !=
GNUNET_HELPER_send (endpoint->plugin->suid_helper,
&radio_header->header,
GNUNET_NO /* dropping ACKs is bad */,
- NULL, NULL))
+ NULL, NULL))
GNUNET_STATISTICS_update (endpoint->plugin->env->stats, _("# WLAN ACKs sent"),
1, GNUNET_NO);
}
GNUNET_NO);
mas.session = NULL;
mas.endpoint = endpoint;
- (void) GNUNET_SERVER_mst_receive (plugin->fragment_data_tokenizer,
+ (void) GNUNET_SERVER_mst_receive (plugin->fragment_data_tokenizer,
&mas,
(const char *) hdr,
ntohs (hdr->size),
{
struct MacEndpoint *endpoint = session->mac;
struct PendingMessage *pm;
-
+
endpoint->plugin->env->session_end (endpoint->plugin->env->cls,
&session->target,
session);
GNUNET_free (pm->msg);
GNUNET_free (pm);
}
- GNUNET_CONTAINER_DLL_remove (endpoint->sessions_head,
+ GNUNET_CONTAINER_DLL_remove (endpoint->sessions_head,
endpoint->sessions_tail,
session);
if (session->timeout_task != GNUNET_SCHEDULER_NO_TASK)
session->timeout_task = GNUNET_SCHEDULER_NO_TASK;
timeout = GNUNET_TIME_absolute_get_remaining (session->timeout);
- if (0 == timeout.rel_value)
+ if (0 == timeout.rel_value_us)
{
free_session (session);
return;
}
+
/**
- * Create a new session
+ * Lookup a new session
*
* @param endpoint pointer to the mac endpoint of the peer
* @param peer peer identity to use for this session
- * @return returns the session
+ * @return returns the session or NULL
*/
static struct Session *
-create_session (struct MacEndpoint *endpoint,
- const struct GNUNET_PeerIdentity *peer)
+lookup_session (struct MacEndpoint *endpoint,
+ const struct GNUNET_PeerIdentity *peer,
+ int inbound)
{
struct Session *session;
for (session = endpoint->sessions_head; NULL != session; session = session->next)
- if (0 == memcmp (peer, &session->target,
- sizeof (struct GNUNET_PeerIdentity)))
+ if (0 == memcmp (peer, &session->target, sizeof (struct GNUNET_PeerIdentity)) &&
+ (session->inbound == inbound))
{
session->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
return session;
}
+ return NULL;
+}
+
+/**
+ * Create a new session
+ *
+ * @param endpoint pointer to the mac endpoint of the peer
+ * @param peer peer identity to use for this session
+ * @return returns the session or NULL
+ */
+static struct Session *
+create_session (struct MacEndpoint *endpoint,
+ const struct GNUNET_PeerIdentity *peer, int inbound)
+{
+ struct Session *session;
+
GNUNET_STATISTICS_update (endpoint->plugin->env->stats, _("# WLAN sessions allocated"), 1,
GNUNET_NO);
session = GNUNET_malloc (sizeof (struct Session));
GNUNET_CONTAINER_DLL_insert_tail (endpoint->sessions_head,
endpoint->sessions_tail,
session);
+ session->inbound = inbound;
session->mac = endpoint;
session->target = *peer;
session->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
session->timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, &session_timeout, session);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Created new session for peer `%s' with endpoint %s\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Created new %s session %p for peer `%s' with endpoint %s\n",
+ (GNUNET_YES == inbound) ? "inbound" : "outbound",
+ session,
GNUNET_i2s (peer),
- mac_to_string (&endpoint->addr));
+ mac_to_string (&endpoint->addr.mac));
+
return session;
}
+/**
+ * Look up a session for a peer and create a new session if none is found
+ *
+ * @param endpoint pointer to the mac endpoint of the peer
+ * @param peer peer identity to use for this session
+ * @return returns the session
+ */
+static struct Session *
+get_session (struct MacEndpoint *endpoint,
+ const struct GNUNET_PeerIdentity *peer,
+ int inbound)
+{
+ struct Session *session;
+ if (NULL != (session = lookup_session (endpoint, peer, inbound)))
+ return session;
+ return create_session (endpoint, peer, inbound);
+}
+
+
/**
* Function called once we have successfully given the fragment
* message to the SUID helper process and we are thus ready for
* the next fragment.
*
- * @param cls the 'struct FragmentMessage'
+ * @param cls the 'struct FragmentMessage'
* @param result result of the operation (GNUNET_OK on success, GNUNET_NO if the helper died, GNUNET_SYSERR
* if the helper was stopped)
*/
* Transmit a fragment of a message.
*
* @param cls 'struct FragmentMessage' this fragment message belongs to
- * @param hdr pointer to the start of the fragment message
+ * @param hdr pointer to the start of the fragment message
*/
static void
transmit_fragment (void *cls,
size_t size;
uint16_t msize;
+ if (NULL == endpoint)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
msize = ntohs (hdr->size);
size = sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage) + msize;
{
radio_header = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage *) buf;
get_radiotap_header (endpoint, radio_header, size);
get_wlan_header (endpoint->plugin,
- &radio_header->frame,
- &endpoint->addr,
+ &radio_header->frame,
+ &endpoint->addr.mac,
size);
memcpy (&radio_header[1], hdr, msize);
GNUNET_assert (NULL == fm->sh);
{
struct MacEndpoint *endpoint = fm->macendpoint;
- GNUNET_STATISTICS_update (endpoint->plugin->env->stats, _("# WLAN messages pending (with fragmentation)"),
+ GNUNET_STATISTICS_update (endpoint->plugin->env->stats, _("# WLAN messages pending (with fragmentation)"),
-1, GNUNET_NO);
GNUNET_CONTAINER_DLL_remove (endpoint->sending_messages_head,
endpoint->sending_messages_tail, fm);
GNUNET_HELPER_send_cancel (fm->sh);
fm->sh = NULL;
}
- GNUNET_FRAGMENT_context_destroy (fm->fragcontext);
+ GNUNET_FRAGMENT_context_destroy (fm->fragcontext,
+ &endpoint->msg_delay,
+ &endpoint->ack_delay);
if (fm->timeout_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (fm->timeout_task);
static void
send_with_fragmentation (struct MacEndpoint *endpoint,
struct GNUNET_TIME_Relative timeout,
- const struct GNUNET_PeerIdentity *target,
+ const struct GNUNET_PeerIdentity *target,
const struct GNUNET_MessageHeader *msg,
size_t payload_size,
GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
fm->timeout = GNUNET_TIME_relative_to_absolute (timeout);
fm->cont = cont;
fm->cont_cls = cont_cls;
+ /* 1 MBit/s typical data rate, 1430 byte fragments => ~100 ms per message */
fm->fragcontext =
GNUNET_FRAGMENT_context_create (plugin->env->stats, WLAN_MTU,
&plugin->tracker,
- GNUNET_TIME_UNIT_SECONDS,
+ endpoint->msg_delay,
+ endpoint->ack_delay,
msg,
&transmit_fragment, fm);
fm->timeout_task =
- GNUNET_SCHEDULER_add_delayed (timeout,
+ GNUNET_SCHEDULER_add_delayed (timeout,
&fragmentmessage_timeout, fm);
GNUNET_CONTAINER_DLL_insert_tail (endpoint->sending_messages_head,
endpoint->sending_messages_tail,
/**
* Free a MAC endpoint.
- *
+ *
* @param endpoint pointer to the MacEndpoint to free
*/
static void
free_session (session);
while (NULL != (fm = endpoint->sending_messages_head))
free_fragment_message (fm);
- GNUNET_CONTAINER_DLL_remove (plugin->mac_head,
- plugin->mac_tail,
+ GNUNET_CONTAINER_DLL_remove (plugin->mac_head,
+ plugin->mac_tail,
endpoint);
if (NULL != endpoint->defrag)
endpoint->timeout_task = GNUNET_SCHEDULER_NO_TASK;
timeout = GNUNET_TIME_absolute_get_remaining (endpoint->timeout);
- if (0 == timeout.rel_value)
+ if (0 == timeout.rel_value_us)
{
free_macendpoint (endpoint);
return;
*/
static struct MacEndpoint *
create_macendpoint (struct Plugin *plugin,
- const struct GNUNET_TRANSPORT_WLAN_MacAddress *addr)
+ const struct WlanAddress *addr)
{
struct MacEndpoint *pos;
for (pos = plugin->mac_head; NULL != pos; pos = pos->next)
- if (0 == memcmp (addr, &pos->addr, sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)))
- return pos;
+ if (0 == memcmp (addr, &pos->addr, sizeof (struct WlanAddress)))
+ return pos;
pos = GNUNET_malloc (sizeof (struct MacEndpoint));
pos->addr = *addr;
pos->plugin = plugin;
pos->defrag =
GNUNET_DEFRAGMENT_context_create (plugin->env->stats, WLAN_MTU,
MESSAGES_IN_DEFRAG_QUEUE_PER_MAC,
- pos,
+ pos,
&wlan_data_message_handler,
&send_ack);
+
+ pos->msg_delay = GNUNET_TIME_UNIT_MILLISECONDS;
+ pos->ack_delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ 100);
pos->timeout = GNUNET_TIME_relative_to_absolute (MACENDPOINT_TIMEOUT);
pos->timeout_task =
GNUNET_SCHEDULER_add_delayed (MACENDPOINT_TIMEOUT, &macendpoint_timeout,
plugin->mac_count++;
GNUNET_STATISTICS_update (plugin->env->stats, _("# WLAN MAC endpoints allocated"),
1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"New MAC endpoint `%s'\n",
- mac_to_string (addr));
+ wlan_plugin_address_to_string(NULL, addr, sizeof (struct WlanAddress)));
return pos;
}
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+wlan_get_network (void *cls,
+ struct Session *session)
+{
+ GNUNET_assert (NULL != session);
+ return GNUNET_ATS_NET_WLAN;
+}
+
+
/**
* Creates a new outbound session the transport service will use to send data to the
* peer
if (NULL == address)
return NULL;
- if (sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress) != address->address_length)
+ if (sizeof (struct WlanAddress) != address->address_length)
{
GNUNET_break (0);
return NULL;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Service asked to create session for peer `%s' with MAC `%s'\n",
GNUNET_i2s (&address->peer),
- mac_to_string (address->address));
+ wlan_plugin_address_to_string(NULL, address->address, address->address_length));
endpoint = create_macendpoint (plugin, address->address);
- return create_session (endpoint, &address->peer);
+ return get_session (endpoint, &address->peer, GNUNET_NO);
}
size_t size = msgbuf_size + sizeof (struct WlanHeader);
char buf[size] GNUNET_ALIGN;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting %u bytes of payload to peer `%s' (starting with %u byte message of type %u)\n",
msgbuf_size,
GNUNET_i2s (&session->target),
struct Plugin *plugin = cls;
struct MacAndSession *mas = client;
struct MacAndSession xmas;
-#define NUM_ATS 2
- struct GNUNET_ATS_Information ats[NUM_ATS]; /* FIXME: do better here */
+ struct GNUNET_ATS_Information ats;
struct FragmentMessage *fm;
struct GNUNET_PeerIdentity tmpsource;
const struct WlanHeader *wlanheader;
int ret;
uint16_t msize;
- ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
- ats[0].value = htonl (1);
- ats[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats[1].value = htonl (GNUNET_ATS_NET_WLAN);
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.value = htonl (GNUNET_ATS_NET_WLAN);
msize = ntohs (hdr->size);
GNUNET_STATISTICS_update (plugin->env->stats,
switch (ntohs (hdr->type))
{
case GNUNET_MESSAGE_TYPE_HELLO:
- if (GNUNET_OK !=
+ if (GNUNET_OK !=
GNUNET_HELLO_get_id ((const struct GNUNET_HELLO_Message *) hdr, &tmpsource))
{
GNUNET_break_op (0);
break;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Processing %u bytes of HELLO from peer `%s' at MAC %s\n",
(unsigned int) msize,
GNUNET_i2s (&tmpsource),
- mac_to_string (&mas->endpoint->addr));
+ wlan_plugin_address_to_string (NULL, &mas->endpoint->addr, sizeof (struct WlanAddress)));
GNUNET_STATISTICS_update (plugin->env->stats,
_("# HELLO messages received via WLAN"), 1,
GNUNET_NO);
- plugin->env->receive (plugin->env->cls,
+ plugin->env->receive (plugin->env->cls,
&tmpsource,
- hdr,
- ats, NUM_ATS,
+ hdr,
mas->session,
(mas->endpoint == NULL) ? NULL : (const char *) &mas->endpoint->addr,
- (mas->endpoint == NULL) ? 0 : sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress));
+ (mas->endpoint == NULL) ? 0 : sizeof (struct WlanAddress));
+ plugin->env->update_address_metrics (plugin->env->cls,
+ &tmpsource,
+ (mas->endpoint == NULL) ? NULL : (const char *) &mas->endpoint->addr,
+ (mas->endpoint == NULL) ? 0 : sizeof (struct WlanAddress),
+ mas->session,
+ &ats, 1);
break;
case GNUNET_MESSAGE_TYPE_FRAGMENT:
if (NULL == mas->endpoint)
GNUNET_break (0);
break;
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Processing %u bytes of FRAGMENT from MAC %s\n",
(unsigned int) msize,
- mac_to_string (&mas->endpoint->addr));
+ wlan_plugin_address_to_string (NULL, &mas->endpoint->addr, sizeof (struct WlanAddress)));
GNUNET_STATISTICS_update (plugin->env->stats,
_("# fragments received via WLAN"), 1, GNUNET_NO);
(void) GNUNET_DEFRAGMENT_process_fragment (mas->endpoint->defrag,
ret = GNUNET_FRAGMENT_process_ack (fm->fragcontext, hdr);
if (GNUNET_OK == ret)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Got last ACK, finished message transmission to `%s' (%p)\n",
- mac_to_string (&mas->endpoint->addr),
+ wlan_plugin_address_to_string (NULL, &mas->endpoint->addr, sizeof (struct WlanAddress)),
fm);
mas->endpoint->timeout = GNUNET_TIME_relative_to_absolute (MACENDPOINT_TIMEOUT);
if (NULL != fm->cont)
}
if (GNUNET_NO == ret)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Got an ACK, message transmission to `%s' not yet finished\n",
- mac_to_string (&mas->endpoint->addr));
+ wlan_plugin_address_to_string (NULL, &mas->endpoint->addr, sizeof (struct WlanAddress)));
break;
}
}
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"ACK not matched against any active fragmentation with MAC `%s'\n",
- mac_to_string (&mas->endpoint->addr));
+ wlan_plugin_address_to_string (NULL, &mas->endpoint->addr, sizeof (struct WlanAddress)));
break;
case GNUNET_MESSAGE_TYPE_WLAN_DATA:
if (NULL == mas->endpoint)
{
GNUNET_break (0);
break;
- }
+ }
wlanheader = (const struct WlanHeader *) hdr;
if (0 != memcmp (&wlanheader->target,
plugin->env->my_identity,
sizeof (struct GNUNET_PeerIdentity)))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"WLAN data for `%s', not for me, ignoring\n",
GNUNET_i2s (&wlanheader->target));
break;
break;
}
xmas.endpoint = mas->endpoint;
- xmas.session = create_session (mas->endpoint, &wlanheader->sender);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Processing %u bytes of WLAN DATA from peer `%s'\n",
+ if (NULL == (xmas.session = lookup_session (mas->endpoint, &wlanheader->sender, GNUNET_YES)))
+ {
+ xmas.session = create_session (mas->endpoint, &wlanheader->sender, GNUNET_YES);
+ plugin->env->session_start (NULL, &wlanheader->sender,
+ PLUGIN_NAME, NULL, 0, xmas.session, NULL, 0);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Notifying transport about peer `%s''s new inbound session %p \n",
+ GNUNET_i2s (&wlanheader->sender), xmas.session);
+ }
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Processing %u bytes of WLAN DATA from peer `%s'\n",
(unsigned int) msize,
GNUNET_i2s (&wlanheader->sender));
- (void) GNUNET_SERVER_mst_receive (plugin->wlan_header_payload_tokenizer,
+ (void) GNUNET_SERVER_mst_receive (plugin->wlan_header_payload_tokenizer,
&xmas,
(const char *) &wlanheader[1],
msize - sizeof (struct WlanHeader),
- GNUNET_YES, GNUNET_NO);
+ GNUNET_YES, GNUNET_NO);
break;
default:
if (NULL == mas->endpoint)
(unsigned int) msize,
(unsigned int) ntohs (hdr->type),
GNUNET_i2s (&mas->session->target));
- plugin->env->receive (plugin->env->cls,
+ plugin->env->receive (plugin->env->cls,
&mas->session->target,
- hdr,
- ats, NUM_ATS,
+ hdr,
mas->session,
(mas->endpoint == NULL) ? NULL : (const char *) &mas->endpoint->addr,
- (mas->endpoint == NULL) ? 0 : sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress));
+ (mas->endpoint == NULL) ? 0 : sizeof (struct WlanAddress));
+ plugin->env->update_address_metrics (plugin->env->cls,
+ &mas->session->target,
+ (mas->endpoint == NULL) ? NULL : (const char *) &mas->endpoint->addr,
+ (mas->endpoint == NULL) ? 0 : sizeof (struct WlanAddress),
+ mas->session,
+ &ats, 1);
break;
}
return GNUNET_OK;
}
-#undef NUM_ATS
/**
struct Plugin *plugin = cls;
const struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage *rxinfo;
const struct GNUNET_TRANSPORT_WLAN_HelperControlMessage *cm;
+ struct WlanAddress wa;
struct MacAndSession mas;
uint16_t msize;
sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress)))
break; /* no change */
/* remove old address */
+ memset (&wa, 0, sizeof (struct WlanAddress));
+ wa.mac = plugin->mac_address;
+ wa.options = htonl(plugin->options);
plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
- &plugin->mac_address,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress),
+ &wa,
+ sizeof (wa),
"wlan");
}
plugin->mac_address = cm->mac;
plugin->have_mac = GNUNET_YES;
+ memset (&wa, 0, sizeof (struct WlanAddress));
+ wa.mac = plugin->mac_address;
+ wa.options = htonl(plugin->options);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received WLAN_HELPER_CONTROL message with MAC address `%s' for peer `%s'\n",
mac_to_string (&cm->mac),
GNUNET_i2s (plugin->env->my_identity));
plugin->env->notify_address (plugin->env->cls, GNUNET_YES,
- &plugin->mac_address,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress),
+ &wa,
+ sizeof (struct WlanAddress),
"wlan");
break;
case GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER:
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Got data message from helper with %u bytes\n",
msize);
GNUNET_STATISTICS_update (plugin->env->stats,
/* packet is FROM us, thus not FOR us */
break;
}
-
+
GNUNET_STATISTICS_update (plugin->env->stats,
_("# WLAN DATA messages processed"),
1, GNUNET_NO);
"Receiving %u bytes of data from MAC `%s'\n",
(unsigned int) (msize - sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage)),
mac_to_string (&rxinfo->frame.addr2));
- mas.endpoint = create_macendpoint (plugin, &rxinfo->frame.addr2);
+ wa.mac = rxinfo->frame.addr2;
+ wa.options = htonl (0);
+ mas.endpoint = create_macendpoint (plugin, &wa);
mas.session = NULL;
- (void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer,
+ (void) GNUNET_SERVER_mst_receive (plugin->helper_payload_tokenizer,
&mas,
(const char*) &rxinfo[1],
msize - sizeof (struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage),
break;
default:
GNUNET_break (0);
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Unexpected message of type %u (%u bytes)",
ntohs (hdr->type), ntohs (hdr->size));
break;
{
char buf[size] GNUNET_ALIGN;
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Sending %u byte HELLO beacon\n",
(unsigned int) size);
radioHeader = (struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage*) buf;
wlan_plugin_address_suggested (void *cls, const void *addr, size_t addrlen)
{
struct Plugin *plugin = cls;
+ struct WlanAddress *wa = (struct WlanAddress *) addr;
- if (addrlen != sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress))
- {
+ if (addrlen != sizeof (struct WlanAddress))
+ {
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
if (GNUNET_YES != plugin->have_mac)
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Rejecting MAC `%s': I don't know my MAC!\n",
mac_to_string (addr));
return GNUNET_NO; /* don't know my MAC */
}
- if (0 != memcmp (addr,
+ if (0 != memcmp (&wa->mac,
&plugin->mac_address,
- addrlen))
+ sizeof (wa->mac)))
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Rejecting MAC `%s': not my MAC!\n",
mac_to_string (addr));
return GNUNET_NO; /* not my MAC */
wlan_plugin_address_to_string (void *cls, const void *addr, size_t addrlen)
{
const struct GNUNET_TRANSPORT_WLAN_MacAddress *mac;
+ static char macstr[36];
- if (sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress) != addrlen)
+ if (sizeof (struct WlanAddress) != addrlen)
{
GNUNET_break (0);
return NULL;
}
- mac = addr;
- return mac_to_string (mac);
+ mac = &((struct WlanAddress *) addr)->mac;
+ GNUNET_snprintf (macstr, sizeof (macstr), "%s.%u.%s",
+ PLUGIN_NAME, ntohl (((struct WlanAddress *) addr)->options),
+ mac_to_string (mac));
+ return macstr;
}
GNUNET_TRANSPORT_AddressStringCallback asc,
void *asc_cls)
{
- const struct GNUNET_TRANSPORT_WLAN_MacAddress *mac;
char *ret;
- if (sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress) != addrlen)
+ if (sizeof (struct WlanAddress) != addrlen)
{
/* invalid address */
LOG (GNUNET_ERROR_TYPE_WARNING,
asc (asc_cls, NULL);
return;
}
- mac = addr;
- ret = GNUNET_strdup (mac_to_string (mac));
+ ret = GNUNET_strdup (wlan_plugin_address_to_string(NULL, addr, addrlen));
asc (asc_cls, ret);
GNUNET_free (ret);
asc (asc_cls, NULL);
/**
- * Exit point from the plugin.
+ * Exit point from the plugin.
*
* @param cls pointer to the api struct
*/
void *
libgnunet_plugin_transport_wlan_done (void *cls)
{
+ struct WlanAddress wa;
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
struct MacEndpoint *endpoint;
if (GNUNET_YES == plugin->have_mac)
{
+ memset (&wa, 0, sizeof (wa));
+ wa.options = htonl (plugin->options);
+ wa.mac = plugin->mac_address;
plugin->env->notify_address (plugin->env->cls, GNUNET_NO,
- &plugin->mac_address,
- sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress),
+ &wa,
+ sizeof (struct WlanAddress),
"wlan");
plugin->have_mac = GNUNET_NO;
}
}
if (NULL != plugin->suid_helper)
{
- GNUNET_HELPER_stop (plugin->suid_helper);
+ GNUNET_HELPER_stop (plugin->suid_helper, GNUNET_NO);
plugin->suid_helper = NULL;
}
endpoint_next = plugin->mac_head;
wlan_string_to_address (void *cls, const char *addr, uint16_t addrlen,
void **buf, size_t *added)
{
- struct GNUNET_TRANSPORT_WLAN_MacAddress *mac;
+ struct WlanAddress *wa;
unsigned int a[6];
unsigned int i;
+ char plugin[5];
+ uint32_t options;
if ((NULL == addr) || (addrlen == 0))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- if (6 != SSCANF (addr,
- "%X:%X:%X:%X:%X:%X",
+
+ if (8 != SSCANF (addr,
+ "%4s.%u.%X:%X:%X:%X:%X:%X",
+ plugin, &options,
&a[0], &a[1], &a[2], &a[3], &a[4], &a[5]))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- mac = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress));
+ wa = GNUNET_malloc (sizeof (struct WlanAddress));
for (i=0;i<6;i++)
- mac->mac[i] = a[i];
- *buf = mac;
- *added = sizeof (struct GNUNET_TRANSPORT_WLAN_MacAddress);
+ wa->mac.mac[i] = a[i];
+ wa->options = htonl (0);
+ *buf = wa;
+ *added = sizeof (struct WlanAddress);
return GNUNET_OK;
}
struct Plugin *plugin;
char *interface;
unsigned long long testmode;
+ char *binary;
/* check for 'special' mode */
if (NULL == env->receive)
testmode = 0;
/* check configuration */
- if ( (GNUNET_YES ==
+ if ( (GNUNET_YES ==
GNUNET_CONFIGURATION_have_value (env->cfg, "transport-wlan", "TESTMODE")) &&
( (GNUNET_SYSERR ==
GNUNET_CONFIGURATION_get_value_number (env->cfg, "transport-wlan",
"transport-wlan", "TESTMODE");
return NULL;
}
+ binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-transport-wlan");
if ( (0 == testmode) &&
- (GNUNET_YES != GNUNET_OS_check_helper_binary ("gnunet-helper-transport-wlan")) )
+ (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) )
{
LOG (GNUNET_ERROR_TYPE_ERROR,
_("Helper binary `%s' not SUID, cannot run WLAN transport\n"),
"gnunet-helper-transport-wlan");
+ GNUNET_free (binary);
return NULL;
}
+ GNUNET_free (binary);
if (GNUNET_YES !=
GNUNET_CONFIGURATION_get_value_string
(env->cfg, "transport-wlan", "INTERFACE",
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"transport-wlan", "INTERFACE");
- return NULL;
+ return NULL;
}
plugin = GNUNET_malloc (sizeof (struct Plugin));
plugin->fragment_data_tokenizer = GNUNET_SERVER_mst_create (&process_data, plugin);
plugin->wlan_header_payload_tokenizer = GNUNET_SERVER_mst_create (&process_data, plugin);
plugin->helper_payload_tokenizer = GNUNET_SERVER_mst_create (&process_data, plugin);
- plugin->beacon_task = GNUNET_SCHEDULER_add_now (&send_hello_beacon,
+ plugin->beacon_task = GNUNET_SCHEDULER_add_now (&send_hello_beacon,
plugin);
- switch (testmode)
+
+ plugin->options = 0;
+
+ /* some compilers do not like switch on 'long long'... */
+ switch ((unsigned int) testmode)
{
- case 0: /* normal */
+ case 0: /* normal */
plugin->helper_argv[0] = (char *) "gnunet-helper-transport-wlan";
plugin->helper_argv[1] = interface;
plugin->helper_argv[2] = NULL;
api->check_address = &wlan_plugin_address_suggested;
api->address_to_string = &wlan_plugin_address_to_string;
api->string_to_address = &wlan_string_to_address;
+ api->get_network = &wlan_get_network;
return api;
}
projects / oweals / gnunet.git / blobdiff