#define HALLO_BEACON_SCALING_FACTOR 900
#define DEBUG_wlan GNUNET_NO
+#define DEBUG_wlan_retransmission GNUNET_NO
#define MESSAGE_LENGHT_UNKNOWN -1
//#define NO_MESSAGE_OR_MESSAGE_FINISHED -2
struct GNUNET_SERVER_MessageStreamTokenizer * suid_tokenizer;
/**
- * encapsulation of packets received
+ * encapsulation of packets received from the wlan helper
*/
struct GNUNET_SERVER_MessageStreamTokenizer * data_tokenizer;
+ /**
+ * encapsulation of packets received
+ */
+ struct GNUNET_SERVER_MessageStreamTokenizer * fragment_tokenizer;
/**
* stdout pipe handle for the gnunet-wlan-helper process
* Sessions currently pending for transmission
* to this peer, if any.
*/
- struct Sessionqueue * pending_Sessions;
+ struct Sessionqueue * pending_Sessions_head;
/**
* Sessions currently pending for transmission
/**
* Messages in the fragmentation queue, head
*/
- struct FragmentMessage * pending_Fragment_Messages_head;
-
- /**
- * Messages in the fragmentation queue, tail
- */
- struct FragmentMessage * pending_Fragment_Messages_tail;
-
- /**
- * number of pending fragment message
- */
- unsigned int pending_fragment_messages;
+ struct GNUNET_CONTAINER_Heap * pending_Fragment_Messages;
/**
* Messages in the in Queue, head
char * msgheader;
struct GNUNET_MessageHeader * msgstart;
ssize_t size;
+ struct GNUNET_TIME_Absolute next_send;
};
/**
* Queue of sessions, for the general session queue and the pending session queue
*/
-
+//TODO DOXIGEN
struct Sessionqueue
{
struct Sessionqueue * next;
/**
* Queue for the fragments received
*/
+//TODO DOXIGEN
struct Receive_Fragment_Queue
{
struct Receive_Fragment_Queue * next;
struct Radiotap_rx rxinfo;
};
+//TODO DOXIGEN
+struct Session_id_fragment_triple
+{
+ struct Session * session;
+ uint32_t message_id;
+ struct FragmentMessage * fm;
+};
+
+//TODO DOXIGEN
+struct Plugin_Session_pair
+{
+ struct Plugin * plugin;
+ struct Session * session;
+};
/**
* Queue for the fragments received
/**
* Queue for acks to send for fragments recived
*/
-//TODO comments
struct AckSendQueue
{
+ /**
+ * next ack in the ack send queue
+ */
struct AckSendQueue * next;
+ /**
+ * previous ack in the ack send queue
+ */
struct AckSendQueue * prev;
-
+ /**
+ * pointer to the session this ack belongs to
+ */
struct Session * session;
/**
* ID of message, to distinguish between the messages, picked randomly.
struct FragmentMessage
{
+ /**
+ * heap pointer of this message
+ */
+ struct GNUNET_CONTAINER_HeapNode * node;
+
/**
* Session this message belongs to
*/
*/
char *msg;
+ /**
+ * 0 if not in ack queue
+ * 1 if in ack queue
+ */
+
+ char in_ack_queue;
+
/**
* Timeout value for the pending message.
*/
};
static void
-do_transmit(void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
+do_transmit(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
/**
* Sets a bit active in the bitArray. Increment bit-specific
bitArray[arraySlot] |= targetBit;
}
-
/**
* Checks if a bit is active in the bitArray
*
static uint32_t
get_next_message_id()
{
- return GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
+ return GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
}
-
/**
* search for a session with the addr
*
* @return returns the session
*/
static struct Session *
-search_session(struct Plugin *plugin,
- const struct MacAddress *addr)
+search_session(struct Plugin *plugin, const struct MacAddress *addr)
{
struct Sessionqueue * queue = plugin->sessions;
while (queue != NULL)
{
GNUNET_assert (queue->content != NULL);
- if (memcmp(addr, &queue->content->addr, sizeof (struct MacAddress)) == 0)
- return queue->content; /* session found */
+ if (memcmp(addr, &queue->content->addr, sizeof(struct MacAddress)) == 0)
+ return queue->content; /* session found */
queue = queue->next;
}
return NULL;
}
+/**
+ * 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)
+{
+ static char ret[40];
+ const struct MacAddress *mac;
+
+ if (addrlen != sizeof(struct MacAddress))
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ mac = addr;
+ GNUNET_snprintf(ret, sizeof(ret), "%s Mac-Address %X:%X:%X:%X:%X:%X",
+ PROTOCOL_PREFIX, mac->mac[0], mac->mac[1], mac->mac[2], mac->mac[3],
+ mac->mac[4], mac->mac[5]);
+ return ret;
+}
+
/**
* create a new session
*
*/
static struct Session *
-create_session(struct Plugin *plugin,
- const struct MacAddress * addr)
+create_session(struct Plugin *plugin, const struct MacAddress * addr)
{
struct Sessionqueue * queue = GNUNET_malloc (sizeof (struct Sessionqueue));
return queue->content;
}
-
/**
* Get session from address, create if no session exists
*
* @return returns the session
*/
static struct Session *
-get_Session (struct Plugin *plugin,
- const struct MacAddress *addr)
+get_session(struct Plugin *plugin, const struct MacAddress *addr)
{
struct Session * session = search_session(plugin, addr);
if (session != NULL)
return create_session(plugin, addr);
}
-
/**
* Queue the session to send data
+ * checks if there is a message pending
+ * checks if this session is not allready in the queue
+ * @param plugin pointer to the plugin
+ * @param session pointer to the session to add
*/
-//TODO doxigen
static void
-queue_Session(struct Plugin *plugin, struct Session * session)
+queue_session(struct Plugin *plugin, struct Session * session)
{
- struct Sessionqueue * queue = plugin->pending_Sessions;
- struct Sessionqueue * lastitem = NULL;
+ struct Sessionqueue * queue = plugin->pending_Sessions_head;
- while (queue != NULL)
+ if (session->pending_message != NULL)
{
- // content is never NULL
- GNUNET_assert (queue->content != NULL);
- // is session already in queue?
- if (session == queue->content)
+ while (queue != NULL)
{
- return;
+ // content is never NULL
+ GNUNET_assert (queue->content != NULL);
+ // is session already in queue?
+ if (session == queue->content)
+ {
+ return;
+ }
+ // try next
+ queue = queue->next;
}
- // try next
- lastitem = queue;
- queue = queue->next;
- }
- // Session is not in the queue
+ // Session is not in the queue
- queue = GNUNET_malloc (sizeof (struct Sessionqueue));
- queue->content = session;
+ queue = GNUNET_malloc (sizeof (struct Sessionqueue));
+ queue->content = session;
- //insert at the tail
- GNUNET_CONTAINER_DLL_insert_after (plugin->pending_Sessions,
- plugin->pending_Sessions_tail,
- plugin->pending_Sessions_tail, queue);
- plugin->pendingsessions++;
+ //insert at the tail
+ GNUNET_CONTAINER_DLL_insert_tail(plugin->pending_Sessions_head,
+ plugin->pending_Sessions_tail, queue);
+ plugin->pendingsessions++;
+ }
}
-//TODO doxigen
/**
* Function to schedule the write task, executed after a delay
+ * @param cls pointer to the plugin struct
+ * @param tc GNUNET_SCHEDULER_TaskContext pointer
*/
static void
delay_fragment_task(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
struct Plugin * plugin = cls;
plugin->server_write_delay_task = GNUNET_SCHEDULER_NO_TASK;
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
// GNUNET_TIME_UNIT_FOREVER_REL is needed to clean up old msg
}
}
-//TODO doxigen
/**
* Function to calculate the time of the next periodic "hello-beacon"
+ * @param plugin pointer to the plugin struct
*/
+
static void
set_next_beacon_time(struct Plugin * const plugin)
{
}
}
-//TODO doxigen
-static struct GNUNET_TIME_Relative
-get_next_frag_timeout(struct FragmentMessage * fm)
-{
- return GNUNET_TIME_relative_min(GNUNET_TIME_absolute_get_remaining(
- fm->next_ack), GNUNET_TIME_absolute_get_remaining(fm->timeout));
-}
-
-//TODO doxigen
/**
* Function to get the timeout value for acks for this session
+ * @param fm pointer to the FragmentMessage to get the next timeout
+ * @return time until the next ack should be received, in GNUNET_TIME_Relative
*/
-
static struct GNUNET_TIME_Relative
get_ack_timeout(struct FragmentMessage * fm)
{
* Function to set the timer for the next timeout of the fragment queue
* @param plugin the handle to the plugin struct
*/
+
static void
-check_next_fragment_timeout(struct Plugin * const plugin)
+set_next_send(struct Plugin * const plugin)
{
struct FragmentMessage * fm;
struct GNUNET_TIME_Relative next_send;
+ struct GNUNET_TIME_Absolute next_send_tmp;
//cancel old task
if (plugin->server_write_delay_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel(plugin->server_write_delay_task);
plugin->server_write_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
- fm = plugin->pending_Fragment_Messages_head;
- GNUNET_assert(plugin->server_write_delay_task == GNUNET_SCHEDULER_NO_TASK);
+ fm = GNUNET_CONTAINER_heap_peek(plugin->pending_Fragment_Messages);
//check if some acks are in the queue
if (plugin->ack_send_queue_head != NULL)
{
next_send = GNUNET_TIME_UNIT_ZERO;
}
+
//check if there are some fragments in the queue
else
{
next_send = GNUNET_TIME_absolute_get_remaining(plugin->beacon_time);
if (fm != NULL)
{
+ next_send_tmp.abs_value = GNUNET_CONTAINER_heap_node_get_cost(
+ fm->node);
next_send = GNUNET_TIME_relative_min(next_send,
- get_next_frag_timeout(fm));
+ GNUNET_TIME_absolute_get_remaining(next_send_tmp));
+
+ }
+ }
+
+#if DEBUG_wlan
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Next packet is send in: %u\n",
+ next_send.rel_value);
+
+#endif
+
+ if (next_send.rel_value == GNUNET_TIME_UNIT_ZERO.rel_value)
+ {
+ if (plugin->server_write_task == GNUNET_SCHEDULER_NO_TASK)
+ {
+ plugin->server_write_task = GNUNET_SCHEDULER_add_write_file(
+ GNUNET_TIME_UNIT_FOREVER_REL, plugin->server_stdin_handle,
+ &do_transmit, plugin);
}
}
- plugin->server_write_delay_task = GNUNET_SCHEDULER_add_delayed(next_send,
- &delay_fragment_task, plugin);
+ else
+ {
+ plugin->server_write_delay_task
+ = GNUNET_SCHEDULER_add_delayed(next_send,
+ &delay_fragment_task, plugin);
+ }
}
-//TODO doxigen
/**
* Function to get the next queued Session, removes the session from the queue
+ * @param plugin pointer to the plugin struct
+ * @return pointer to the session found, returns NULL if there is now session in the queue
*/
-
static struct Session *
-get_next_queue_Session(struct Plugin * plugin)
+get_next_queue_session(struct Plugin * plugin)
{
struct Session * session;
struct Sessionqueue * sessionqueue;
struct Sessionqueue * sessionqueue_alt;
struct PendingMessage * pm;
- sessionqueue = plugin->pending_Sessions;
+ sessionqueue = plugin->pending_Sessions_head;
+
while (sessionqueue != NULL)
{
session = sessionqueue->content;
+ GNUNET_assert(session != NULL);
pm = session->pending_message;
+
+
+#if DEBUG_wlan
if (pm == NULL)
{
-#if DEBUG_wlan
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"pending message is empty, should not happen. session %p\n",
session);
-#endif
}
+#endif
+
GNUNET_assert(pm != NULL);
//check for message timeout
< FRAGMENT_QUEUE_MESSAGES_OUT_PER_SESSION)
{
plugin->pendingsessions--;
- GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions,
+ GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head,
plugin->pending_Sessions_tail, sessionqueue);
GNUNET_free(sessionqueue);
sessionqueue_alt = sessionqueue;
sessionqueue = sessionqueue->next;
plugin->pendingsessions--;
- GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions,
+ GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head,
plugin->pending_Sessions_tail, sessionqueue_alt);
GNUNET_free(sessionqueue_alt);
return NULL;
}
-/**
- * Function to sort the message into the message fragment queue
- * @param plugin the plugin struct
- * @param fm message to sort into the queue
- */
-static void
-sort_fragment_into_queue(struct Plugin * plugin, struct FragmentMessage * fm)
-{
- struct FragmentMessage * fm2;
- //sort into the list at the right position
-
- fm2 = plugin->pending_Fragment_Messages_head;
-
- while (fm2 != NULL)
- {
- if (GNUNET_TIME_absolute_get_difference(fm2->next_ack, fm->next_ack).rel_value
- == 0)
- {
- GNUNET_CONTAINER_DLL_insert_before(plugin->pending_Fragment_Messages_head,
- plugin->pending_Fragment_Messages_tail,fm2,fm);
- return;
- }
- else
- {
- fm2 = fm2->next;
- }
- }
-
- GNUNET_CONTAINER_DLL_insert_tail(plugin->pending_Fragment_Messages_head,
- plugin->pending_Fragment_Messages_tail,fm);
-}
-
/**
* frees the space of a message in the fragment queue (send queue)
* @param plugin the plugin struct
static void
free_fragment_message(struct Plugin * plugin, struct FragmentMessage * fm)
{
+ struct Session * session = fm->session;
+
if (fm != NULL)
{
- (fm->session->fragment_messages_out_count)--;
+ (session->fragment_messages_out_count)--;
GNUNET_free_non_null(fm->msg);
- GNUNET_CONTAINER_DLL_remove (plugin->pending_Fragment_Messages_head,
- plugin->pending_Fragment_Messages_tail, fm);
+ GNUNET_CONTAINER_heap_remove_node(fm->node);
GNUNET_free(fm);
- plugin->pending_fragment_messages--;
+ queue_session(plugin, session);
#if DEBUG_wlan
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"free pending fragment messages, pending messages remaining %u\n",
- plugin->pending_fragment_messages);
+ GNUNET_CONTAINER_heap_get_size(plugin->pending_Fragment_Messages));
#endif
}
}
struct PendingMessage * pm;
- if (plugin->pending_fragment_messages < FRAGMENT_QUEUE_SIZE)
+ if (GNUNET_CONTAINER_heap_get_size(plugin->pending_Fragment_Messages)
+ < FRAGMENT_QUEUE_SIZE)
{
- session = get_next_queue_Session(plugin);
+ session = get_next_queue_session(plugin);
if (session != NULL)
{
pm = session->pending_message;
fm->next_ack = GNUNET_TIME_absolute_get();
fm->message_id_out = get_next_message_id();
fm->ack_bitfield = 0;
+ fm->node = GNUNET_CONTAINER_heap_insert(
+ plugin->pending_Fragment_Messages, fm,
+ GNUNET_TIME_absolute_get().abs_value);
- sort_fragment_into_queue(plugin, fm);
- plugin->pending_fragment_messages++;
+ GNUNET_assert(session !=NULL);
if (pm->transmit_cont != NULL)
{
session->pending_message = session->pending_message2;
session->pending_message2 = NULL;
//requeue session
- queue_Session(plugin, session);
+ queue_session(plugin, session);
}
- //check if timeout changed
- check_next_fragment_timeout(plugin);
}
}
+
+ //check if timeout changed
+ set_next_send(plugin);
}
/**
#if DEBUG_wlan
if (maxack != 63)
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Test bitfields %X and %X, maxack is %u, fm size %u\n",
- fm->ack_bitfield, tmpfield, maxack, fm->message_size);
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Test bitfields %X and %X, maxack is %u, fm size %u\n",
+ fm->ack_bitfield, tmpfield, maxack, fm->message_size);
#endif
if (fm->ack_bitfield == tmpfield)
{
- free_fragment_message(plugin, fm);
-
-#if DEBUG_wlan
+#if DEBUG_wlan_retransmission
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Finished sending and got all acks for a fragmented message\n");
+ "Finished sending and got all acks; message_id %u\n",
+ fm->message_id_out);
#endif
- check_next_fragment_timeout(plugin);
+ free_fragment_message(plugin, fm);
+
check_fragment_queue(plugin);
}
*/
static void
-set_next_message_fragment_pos(struct FragmentMessage * fm)
+set_next_message_fragment_pos(struct Plugin * plugin,
+ struct FragmentMessage * fm)
{
+ fm->message_pos++;
+
//check if retransmit is needed
if (GNUNET_TIME_absolute_get_remaining(fm->next_ack).rel_value == 0)
{
// find first missing fragment
fm->message_pos = 0;
+
+ GNUNET_CONTAINER_heap_update_cost(plugin->pending_Fragment_Messages,
+ fm->node, 0);
+
+#if DEBUG_wlan_retransmission
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "Retransmit; message_id %u; fragment number %i, size: %u\n",
+ fm->message_id_out, fm->message_pos, fm->message_size);
+#endif
}
//test if ack 0 (or X) was already received
}
+//TODO DOXIGEN
static int
getRadiotapHeader(struct Plugin * plugin, struct Session * session,
struct Radiotap_Send * header)
return GNUNET_YES;
}
-
/**
* function to generate the wlan hardware header for one packet
* @param Header address to write the header to
* @return GNUNET_YES if there was no error
*/
static int
-getWlanHeader(struct ieee80211_frame * Header,
- const struct MacAddress * to_mac_addr,
- struct Plugin * plugin)
+getWlanHeader(struct ieee80211_frame * Header,
+ const struct MacAddress * to_mac_addr, struct Plugin * plugin,
+ unsigned int size)
{
- Header->i_fc[0] = 0x80;
+ uint16_t * tmp16;
+ const int rate = 11000000;
+
+ Header->i_fc[0] = 0x08;
Header->i_fc[1] = 0x00;
memcpy(&Header->i_addr3, &mac_bssid, sizeof(mac_bssid));
memcpy(&Header->i_addr2, plugin->mac_address.mac, sizeof(plugin->mac_address));
- memcpy(&Header->i_addr1, to_mac_addr, sizeof(plugin->mac_address));
+ memcpy(&Header->i_addr1, to_mac_addr, sizeof(struct MacAddress));
+
+ tmp16 = (uint16_t*) Header->i_dur;
+ *tmp16 = (uint16_t) htole16((size * 1000000) / rate + 290);
+
return GNUNET_YES;
}
return 0;
}
-
+//TODO DOXIGEN
static void
send_hello_beacon(struct Plugin * plugin)
{
uint16_t size;
ssize_t bytes;
+ uint16_t hallo_size;
struct GNUNET_MessageHeader * msgheader;
struct ieee80211_frame * ieeewlanheader;
struct Radiotap_Send * radioHeader;
struct GNUNET_MessageHeader * msgheader2;
- GNUNET_assert(sizeof(struct WlanHeader) + GNUNET_HELLO_size(
- *(plugin->env->our_hello)) <= WLAN_MTU);
+ hallo_size = GNUNET_HELLO_size(*(plugin->env->our_hello));
+ GNUNET_assert(sizeof(struct WlanHeader) + hallo_size <= WLAN_MTU);
size = sizeof(struct GNUNET_MessageHeader) + sizeof(struct Radiotap_Send)
+ sizeof(struct ieee80211_frame) + sizeof(struct GNUNET_MessageHeader)
- + GNUNET_HELLO_size(*(plugin->env->our_hello));
+ + hallo_size;
msgheader = GNUNET_malloc(size);
msgheader->size = htons(size);
radioHeader = (struct Radiotap_Send*) &msgheader[1];
getRadiotapHeader(plugin, NULL, radioHeader);
ieeewlanheader = (struct ieee80211_frame*) &radioHeader[1];
- getWlanHeader(ieeewlanheader, &bc_all_mac, plugin);
+ getWlanHeader(ieeewlanheader, &bc_all_mac, plugin, size);
msgheader2 = (struct GNUNET_MessageHeader*) &ieeewlanheader[1];
msgheader2->size = htons(GNUNET_HELLO_size(*(plugin->env->our_hello))
+ sizeof(struct GNUNET_MessageHeader));
msgheader2->type = htons(GNUNET_MESSAGE_TYPE_WLAN_ADVERTISEMENT);
- memcpy(&msgheader2[1], *plugin->env->our_hello, GNUNET_HELLO_size(
- *(plugin->env->our_hello)));
+ memcpy(&msgheader2[1], *plugin->env->our_hello, hallo_size);
bytes = GNUNET_DISK_file_write(plugin->server_stdin_handle, msgheader, size);
GNUNET_free(msgheader);
set_next_beacon_time(plugin);
- check_next_fragment_timeout(plugin);
+ set_next_send(plugin);
}
+//TODO DOXIGEN
static void
send_ack(struct Plugin * plugin, struct AckSendQueue * ack)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Sending ack for message_id %u with fragment field %u, size %u\n",
ack->message_id, ack->fragments_field, size
- - sizeof(struct Radiotap_Send));
+ - sizeof(struct Radiotap_Send));
#endif
msgheader = GNUNET_malloc(size);
radioHeader = (struct Radiotap_Send*) &msgheader[1];
getRadiotapHeader(plugin, ack->session, radioHeader);
ieeewlanheader = (struct ieee80211_frame*) &radioHeader[1];
- getWlanHeader(ieeewlanheader, &ack->session->addr, plugin);
+ getWlanHeader(ieeewlanheader, &ack->session->addr, plugin, size);
msgheader2 = (struct FragmentationAckHeader*) &ieeewlanheader[1];
msgheader2->header.size = htons(sizeof(struct FragmentationAckHeader));
GNUNET_assert(bytes != GNUNET_SYSERR);
GNUNET_assert(bytes == size);
GNUNET_free(msgheader);
- check_next_fragment_timeout(plugin);
+ set_next_send(plugin);
}
+//TODO DOXIGEN
static void
-finish_sending(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+finish_sending(void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct Finish_send * finish;
+ struct Finish_send * finish = cls;
struct Plugin * plugin;
ssize_t bytes;
- finish = cls;
plugin = finish->plugin;
-
plugin->server_write_task = GNUNET_SCHEDULER_NO_TASK;
- bytes = GNUNET_DISK_file_write(plugin->server_stdin_handle,
- finish->msgheader, finish->size);
- GNUNET_assert(bytes != GNUNET_SYSERR);
+ if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
+ {
+ GNUNET_free (finish->msgstart);
+ GNUNET_free (finish);
+ return;
+ }
+ bytes = GNUNET_DISK_file_write (plugin->server_stdin_handle,
+ finish->msgheader,
+ finish->size);
+ GNUNET_assert (bytes != GNUNET_SYSERR);
- GNUNET_assert(plugin->server_write_task == GNUNET_SCHEDULER_NO_TASK);
if (bytes != finish->size)
{
-
finish->msgheader = finish->msgheader + bytes;
finish->size = finish->size - bytes;
- plugin->server_write_task = GNUNET_SCHEDULER_add_write_file(
- GNUNET_TIME_UNIT_FOREVER_REL, plugin->server_stdin_handle,
- &finish_sending, finish);
+ plugin->server_write_task
+ = GNUNET_SCHEDULER_add_write_file(GNUNET_TIME_UNIT_FOREVER_REL,
+ plugin->server_stdin_handle,
+ &finish_sending, finish);
}
else
{
GNUNET_free(finish->msgstart);
GNUNET_free(finish);
- check_next_fragment_timeout(plugin);
+ set_next_send(plugin);
}
-
}
-
-
/**
* Function called when wlan helper is ready to get some data
*
static void
do_transmit(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
-
struct Plugin * plugin = cls;
- plugin->server_write_task = GNUNET_SCHEDULER_NO_TASK;
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ plugin->server_write_task = GNUNET_SCHEDULER_NO_TASK;
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- struct Session * session = NULL;
- struct FragmentMessage * fm = NULL;
- struct ieee80211_frame * ieeewlanheader = NULL;
- struct Radiotap_Send * radioHeader = NULL;
- struct GNUNET_MessageHeader * msgheader = NULL;
-
+ struct Session * session;
+ struct FragmentMessage * fm;
+ struct ieee80211_frame * ieeewlanheader;
+ struct Radiotap_Send * radioHeader;
+ struct GNUNET_MessageHeader * msgheader;
struct FragmentationHeader fragheader;
- struct FragmentationHeader * fragheaderptr = NULL;
- struct Finish_send * finish = NULL;
+ struct FragmentationHeader * fragheaderptr;
+ struct Finish_send * finish;
struct AckSendQueue * ack;
- uint16_t size = 0;
+ uint16_t size;
ssize_t bytes;
- const char * copystart = NULL;
- uint16_t copysize = 0;
- uint copyoffset = 0;
+ const char * copystart;
+ uint16_t copysize;
+ uint copyoffset;
+ struct GNUNET_TIME_Absolute next_send;
if (plugin->ack_send_queue_head != NULL)
{
if (GNUNET_TIME_absolute_get_remaining(plugin->beacon_time).rel_value == 0)
{
send_hello_beacon(plugin);
-
return;
-
}
- fm = plugin->pending_Fragment_Messages_head;
+ fm = GNUNET_CONTAINER_heap_peek(plugin->pending_Fragment_Messages);
+
if (fm != NULL)
{
session = fm->session;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "message timeout\n");
#endif
- check_fragment_queue(plugin);
free_fragment_message(plugin, fm);
+ check_fragment_queue(plugin);
}
else
// {
size = sizeof(struct FragmentationHeader);
- set_next_message_fragment_pos(fm);
+ set_next_message_fragment_pos(plugin, fm);
copyoffset = (WLAN_MTU - sizeof(struct FragmentationHeader))
* fm->message_pos;
-
-
fragheader.fragment_off_or_num = htons(fm->message_pos);
fragheader.message_id = htonl(fm->message_id_out);
copystart = fm->msg + copyoffset;
GNUNET_ERROR_TYPE_DEBUG,
"Sending GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT with message_id %u with fragment number %i, size: %u, offset %u, time until timeout %u\n",
fm->message_id_out, fm->message_pos, copysize
- + sizeof(struct FragmentationHeader), copyoffset,
+ + sizeof(struct FragmentationHeader), copyoffset,
GNUNET_TIME_absolute_get_remaining(fm->timeout));
#endif
fm->message_pos);
}
GNUNET_assert(copyoffset < fm->message_size);
- //FIXME remove later
- GNUNET_assert(copystart < fm->msg + fm->message_size);
fragheader.header.size = htons(copysize
+ sizeof(struct FragmentationHeader));
fragheader.header.type = htons(GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT);
- /* }
- else
- {
- // there is no need to split
- copystart = fm->msg;
- copysize = fm->message_size;
- }*/
-
size += copysize;
size += sizeof(struct Radiotap_Send) + sizeof(struct ieee80211_frame)
+ sizeof(struct GNUNET_MessageHeader);
getRadiotapHeader(plugin, session, radioHeader);
ieeewlanheader = (struct ieee80211_frame *) &radioHeader[1];
- getWlanHeader(ieeewlanheader, &fm->session->addr, plugin);
+ getWlanHeader(ieeewlanheader, &(fm->session->addr), plugin, size);
//could be faster if content is just send and not copyed before
//fragmentheader is needed
- //if (fm->message_size > WLAN_MTU)
- // {
fragheader.message_crc = htons(getcrc16(copystart, copysize));
memcpy(&ieeewlanheader[1], &fragheader,
sizeof(struct FragmentationHeader));
fragheaderptr = (struct FragmentationHeader *) &ieeewlanheader[1];
memcpy(&fragheaderptr[1], copystart, copysize);
- /* }
- else
- {
- memcpy(&ieeewlanheader[1], copystart, copysize);
- }*/
bytes = GNUNET_DISK_file_write(plugin->server_stdin_handle,
msgheader, size);
}
GNUNET_assert(bytes != GNUNET_SYSERR);
+ //check if this was the last fragment of this message, if true then queue at the end of the list
+ if (copysize + copyoffset >= fm->message_size)
+ {
+ GNUNET_assert(copysize + copyoffset == fm->message_size);
+
+ GNUNET_CONTAINER_heap_update_cost(
+ plugin->pending_Fragment_Messages, fm->node, MIN(
+ fm->timeout.abs_value, fm->next_ack.abs_value));
+ // if fragments have opimized timeouts
+ //sort_fragment_into_queue(plugin,fm);
+
+
+#if DEBUG_wlan_retransmission
+ GNUNET_log(
+ GNUNET_ERROR_TYPE_DEBUG,
+ "Finished sending all fragments waiting for acks; message_id %u; message_id %u; fragment number %i, size: %u, time until timeout %u\n",
+ fm->message_id_out, fm->message_id_out, fm->message_pos,
+ fm->message_size, GNUNET_TIME_absolute_get_remaining(
+ fm->timeout));
+#endif
+ }
+ else
+ {
+ GNUNET_CONTAINER_heap_update_cost(
+ plugin->pending_Fragment_Messages, fm->node,
+ GNUNET_TIME_absolute_get().abs_value);
+ }
+
if (bytes != size)
{
finish = GNUNET_malloc(sizeof( struct Finish_send));
finish->msgheader = (char *) msgheader + bytes;
finish->size = size - bytes;
finish->msgstart = msgheader;
+ finish ->next_send = next_send;
GNUNET_assert(plugin->server_write_task == GNUNET_SCHEDULER_NO_TASK);
}
else
{
- GNUNET_assert(bytes == size);
-
GNUNET_free(msgheader);
- check_next_fragment_timeout(plugin);
- }
-
- //check if this was the last fragment of this message, if true then queue at the end of the list
- if (copysize + copyoffset >= fm->message_size)
- {
- GNUNET_assert(copysize + copyoffset == fm->message_size);
-
- GNUNET_CONTAINER_DLL_remove (plugin->pending_Fragment_Messages_head,
- plugin->pending_Fragment_Messages_tail, fm);
-
- GNUNET_CONTAINER_DLL_insert_tail(plugin->pending_Fragment_Messages_head,
- plugin->pending_Fragment_Messages_tail, fm);
- // if fragments have opimized timeouts
- //sort_fragment_into_queue(plugin,fm);
-
+ set_next_send(plugin);
}
}
return;
}
+
GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
"do_transmit did nothing, should not happen!\n");
}
-
/**
* Another peer has suggested an address for this
* peer and transport plugin. Check that this could be a valid
return GNUNET_SYSERR;
}
-
-
/**
* Function that can be used by the transport service to transmit
* a message using the plugin.
* @param priority how important is the message
* @param msgbuf the message to transmit
* @param msgbuf_size number of bytes in 'msgbuf'
- * @param timeout when should we time out
+ * @param timeout when should we time out
* @param session which session must be used (or NULL for "any")
* @param addr the address to use (can be NULL if the plugin
* is "on its own" (i.e. re-use existing TCP connection))
GNUNET_TRANSPORT_TransmitContinuation cont, void *cont_cls)
{
struct Plugin * plugin = cls;
- struct PendingMessage * newmsg = NULL;
- struct WlanHeader * wlanheader = NULL;
+ struct PendingMessage * newmsg;
+ struct WlanHeader * wlanheader;
//check if msglen > 0
GNUNET_assert(msgbuf_size > 0);
{
if (wlan_plugin_address_suggested(plugin, addr, addrlen) == GNUNET_OK)
{
- session = get_Session(plugin, addr);
+ session = get_session(plugin, addr);
}
else
{
#endif
//queue session
- queue_Session(plugin, session);
+ queue_session(plugin, session);
check_fragment_queue(plugin);
//FIXME not the correct size
}
/**
- * function to get the first message in the fragement queue (out) of a session
- * @param session pointer to the session
- * @return pointer to the struct FragmentMessage
+ * Iterate over the fragment messages of the given session.
+ *
+ * @param cls argument to give to iterator
+ * @param node node to iterate over
+ * @param element value stored at the node
+ * @param cost cost associated with the node
+ * @return GNUNET_YES if we should continue to iterate,
+ * GNUNET_NO if not.
*/
-static struct FragmentMessage *
-get_fragment_message_from_session(struct Session * session)
+static int
+free_fragment_message_from_session(void *cls,
+ struct GNUNET_CONTAINER_HeapNode *node, void *element,
+ GNUNET_CONTAINER_HeapCostType cost)
{
- struct FragmentMessage * fm = session->plugin->pending_Fragment_Messages_head;
- while (fm != NULL)
+ struct Plugin_Session_pair * pair = (struct Plugin_Session_pair *) cls;
+ struct FragmentMessage * fm = (struct FragmentMessage*) element;
+
+ if (fm->session == pair->session)
{
- if (fm->session == session)
- {
- return fm;
- }
- fm = fm->next;
+
+ free_fragment_message(pair->plugin, fm);
}
- return NULL;
+ return GNUNET_YES;
+
+}
+
+/**
+ * Search for fragment message with given id and session
+ *
+ * @param cls argument to give to iterator
+ * @param node node to iterate over
+ * @param element value stored at the node
+ * @param cost cost associated with the node
+ * @return GNUNET_YES if we should continue to iterate,
+ * GNUNET_NO if not.
+ */
+static int
+search_fragment_message_from_session_and_id(void *cls,
+ struct GNUNET_CONTAINER_HeapNode *node, void *element,
+ GNUNET_CONTAINER_HeapCostType cost)
+{
+ struct Session_id_fragment_triple * triple =
+ (struct Session_id_fragment_triple *) cls;
+ struct FragmentMessage * fm = (struct FragmentMessage*) element;
+
+ if ((fm->session == triple->session) && (fm->message_id_out
+ == triple->message_id))
+ {
+ triple->fm = fm;
+ return GNUNET_NO;
+ }
+ return GNUNET_YES;
+
}
/**
* @return pointer to the struct FragmentMessage
*/
static struct FragmentMessage *
-get_fragment_message_from_session_and_id(struct Session * session,
- uint32_t message_id)
+get_fragment_message_from_session_and_id(struct Plugin * plugin,
+ struct Session * session, uint32_t message_id)
{
- struct FragmentMessage * fm = session->plugin->pending_Fragment_Messages_head;
- while (fm != NULL)
- {
- if ((fm->session == session) && (fm->message_id_out == message_id))
- {
- return fm;
- }
- fm = fm->next;
- }
- return NULL;
+ struct Session_id_fragment_triple triple;
+ triple.session = session;
+ triple.message_id = message_id;
+ GNUNET_CONTAINER_heap_iterate(plugin->pending_Fragment_Messages,
+ &search_fragment_message_from_session_and_id, &triple);
+ return triple.fm;
}
-
/**
* function to get the receive message of a session
* @param plugin pointer to the plugin struct
* @param session session this fragment belongs to
*/
-struct Receive_Message_Queue *
+static struct Receive_Message_Queue *
get_receive_message_from_session(struct Plugin * plugin,
struct Session * session)
{
return NULL;
}
-
/**
* Function to dispose the fragments received for a message and the message
* @param plugin pointer to the plugin struct
GNUNET_free(rx_message);
}
+/**
+ * function to get the receive message of a session
+ * @param plugin pointer to the plugin struct
+ * @param session session this fragment belongs to
+ */
+static void
+check_receive_message_timeouts(struct Plugin * plugin, struct Session * session)
+{
+ struct Receive_Message_Queue * rec_message = plugin->receive_messages_head;
+ while (rec_message != NULL)
+ {
+ if (GNUNET_TIME_absolute_get_remaining(rec_message->timeout).rel_value
+ == 0)
+ {
+ free_receive_message(plugin, rec_message);
+ }
+ rec_message = rec_message->next;
+ }
+
+}
+
+//TODO DOXIGEN
+static void
+free_session(struct Plugin * plugin, struct Sessionqueue * queue)
+{
+ struct Sessionqueue * pendingsession;
+ struct Sessionqueue * pendingsession_tmp;
+ struct PendingMessage * pm;
+ struct Receive_Message_Queue * receive_queue;
+ struct Plugin_Session_pair pair;
+ int check = 0;
+
+ GNUNET_assert(queue != NULL);
+ GNUNET_assert(queue->content != NULL);
+
+ //session found
+ //is this session pending for send
+ pendingsession = plugin->pending_Sessions_head;
+ while (pendingsession != NULL)
+ {
+ pendingsession_tmp = pendingsession->next;
+ if (pendingsession->content == queue->content)
+ {
+ plugin->pendingsessions--;
+ GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head,
+ plugin->pending_Sessions_tail,
+ pendingsession);
+ GNUNET_free(pendingsession);
+
+ GNUNET_assert (check == 0);
+ check = 1;
+ }
+ pendingsession = pendingsession_tmp;
+ }
+
+ //is something of this session in the fragment queue?
+ pair.plugin = plugin;
+ pair.session = queue->content;
+ GNUNET_CONTAINER_heap_iterate(plugin->pending_Fragment_Messages,
+ &free_fragment_message_from_session, &pair);
+
+ //dispose all received fragments
+ receive_queue = get_receive_message_from_session(plugin, queue->content);
+ while (receive_queue != NULL)
+ {
+ free_receive_message(plugin, receive_queue);
+ receive_queue = get_receive_message_from_session(plugin, queue->content);
+ }
+
+ // remove PendingMessage
+ pm = queue->content->pending_message;
+ if (pm != NULL)
+ {
+ GNUNET_free_non_null(pm->msg);
+ GNUNET_free(pm);
+ }
+
+ // remove PendingMessage
+ pm = queue->content->pending_message2;
+ if (pm != NULL)
+ {
+ GNUNET_free_non_null(pm->msg);
+ GNUNET_free(pm);
+ }
+
+ GNUNET_CONTAINER_DLL_remove(plugin->sessions,
+ plugin->sessions_tail,
+ queue);
+ GNUNET_free(queue->content);
+ GNUNET_free(queue);
+ plugin->session_count--;
+ check_fragment_queue(plugin);
+}
/**
* Function that can be used to force the plugin to disconnect
{
struct Plugin *plugin = cls;
struct Sessionqueue * queue = plugin->sessions;
- struct Sessionqueue * pendingsession = plugin->pending_Sessions;
- struct PendingMessage * pm = NULL;
- struct FragmentMessage * fm;
- struct Receive_Message_Queue * receive_queue;
// just look at all the session for the needed one
while (queue != NULL)
if (memcmp(target, &(queue->content->target),
sizeof(struct GNUNET_PeerIdentity)) == 0)
{
- //session found
- //is this session pending for send
- while (pendingsession != NULL)
- {
- if (pendingsession->content == queue->content)
- {
- plugin->pendingsessions--;
- GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions,
- plugin->pending_Sessions_tail, pendingsession);
- GNUNET_free(pendingsession);
- break;
- }
- pendingsession = pendingsession->next;
- }
-
- //is something of this session in the fragment queue?
- fm = get_fragment_message_from_session(queue->content);
- while (fm != NULL)
- {
- free_fragment_message(plugin, fm);
- fm = get_fragment_message_from_session(queue->content);
- }
- check_next_fragment_timeout(plugin);
-
- //dispose all received fragments
- receive_queue = get_receive_message_from_session(plugin,
- queue->content);
- while (receive_queue != NULL)
- {
- free_receive_message(plugin, receive_queue);
- receive_queue = get_receive_message_from_session(plugin,
- queue->content);
- }
-
- // remove PendingMessage
- pm = queue->content->pending_message;
- if (pm != NULL)
- {
- GNUNET_free_non_null(pm->msg);
- GNUNET_free(pm);
- }
-
- GNUNET_free(queue->content);
- GNUNET_CONTAINER_DLL_remove(plugin->sessions, plugin->sessions_tail, queue);
- GNUNET_free(queue);
- plugin->session_count--;
-
+ free_session(plugin, queue);
return;
}
// try next
}
-
-/**
- * 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)
-{
- static char ret[40];
- const struct MacAddress *mac;
-
- if (addrlen != sizeof(struct MacAddress))
- {
- GNUNET_break (0);
- return NULL;
- }
- mac = addr;
- GNUNET_snprintf(ret, sizeof(ret), "%s Mac-Address %X:%X:%X:%X:%X:%X",
- PROTOCOL_PREFIX, mac->mac[0], mac->mac[1], mac->mac[2], mac->mac[3],
- mac->mac[4], mac->mac[5]);
- return ret;
-}
-
-/**
- * function to check if bitfield is representation of fragments of the message
- * @param rec_message message to check
- */
-
-void
-check_message_fragment_bitfield(struct Receive_Message_Queue * rec_message)
-{
- uint64_t checkfragments = 0;
- struct Receive_Fragment_Queue * rec_queue = rec_message->frag_head;
-
- while (rec_queue != NULL)
- {
- setBit((char*) &checkfragments, rec_queue->num);
- rec_queue = rec_queue->next;
-
- }
- GNUNET_assert(checkfragments == rec_message->received_fragments);
-}
-
/**
* Function to test if fragment number already exists in the fragments received
*
* @param fh Fragmentheader of the fragment
* @return GNUNET_YES if fragment exists already, GNUNET_NO if it does not exists in the queue of the session
*/
-
-static const int
-is_double_msg(struct Receive_Message_Queue * rec_message,
+static int
+is_double_msg(struct Receive_Message_Queue * rx_msg,
struct FragmentationHeader * fh)
{
//test if bitfield is okay
#if DEBUG_wlan
- check_message_fragment_bitfield(rec_message);
+ check_message_fragment_bitfield(rx_msg);
#endif
- return testBit((char *) &rec_message->received_fragments, ntohs(
+ return testBit((char *) &rx_msg->received_fragments, ntohs(
fh->fragment_off_or_num));
}
* @param session session the fragment belongs to
* @param rec_queue fragment to add
*/
-
static void
insert_fragment_in_queue(struct Receive_Message_Queue * rx_message,
struct Receive_Fragment_Queue * rx_frag)
GNUNET_assert(rx_frag != NULL);
struct Receive_Fragment_Queue * rx_frag2 = rx_message->frag_head;
- struct WlanHeader * wlanheader = NULL;
-
+ struct WlanHeader * wlanheader;
//this is the first fragment of the message (fragment id 0)
if (rx_frag->num == 0)
setBit((char *) &rx_message->received_fragments, rx_frag->num);
}
-
-
-
-
/**
* handels the data after all fragments are put together
* @param plugin
* @param hdr pointer to the data
*/
static void
-wlan_data_massage_handler(struct Plugin * plugin,
- struct Session_light * session_light,
- const struct GNUNET_MessageHeader * hdr)
+wlan_data_message_handler(void *cls, void *client,
+ const struct GNUNET_MessageHeader *hdr)
{
- struct WlanHeader * wlanheader = NULL;
- struct Session * session = NULL;
- const char * tempmsg = NULL;
- const struct GNUNET_MessageHeader * temp_hdr = NULL;
+ struct Plugin * plugin = (struct Plugin*) cls;
+ struct Session_light * session_light = (struct Session_light *) client;
+ struct WlanHeader * wlanheader;
+ struct Session * session;
+ const char * tempmsg;
+ const struct GNUNET_MessageHeader * temp_hdr;
struct GNUNET_PeerIdentity tmptarget;
if (ntohs(hdr->type) == GNUNET_MESSAGE_TYPE_WLAN_DATA)
#if DEBUG_wlan
GNUNET_log(
GNUNET_ERROR_TYPE_DEBUG,
- "Func wlan_data_massage_handler got GNUNET_MESSAGE_TYPE_WLAN_DATA size: %u\n",
+ "Func wlan_data_message_handler got GNUNET_MESSAGE_TYPE_WLAN_DATA size: %u\n",
ntohs(hdr->size));
#endif
else
{
GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
- "wlan_data_massage_handler got wrong message type\n");
+ "wlan_data_message_handler got wrong message type\n");
return;
}
}
-
-
/**
* Function to check if all fragments of a message have been received
* @param plugin the plugin handle
*/
static void
-check_rec_finished_msg(struct Plugin* plugin,
+check_rx_finished_msg(struct Plugin* plugin,
struct Session_light * session_light, struct Session * session,
struct Receive_Message_Queue * rx_message)
{
struct Receive_Fragment_Queue * rx_frag = rx_message->frag_head;
int packetsize = rx_message->rec_size;
- int sum = 0;
- int aktnum = 0;
+ int sum;
+ //TODO CLEANUP
+ //int aktnum;
uint64_t bitfield = 0;
- char * msg;
+ //char * msg;
//check if first fragment is present
if (packetsize == MESSAGE_LENGHT_UNKNOWN)
return;
}
// test if message has at least the size of the WlanHeader and a GNUNET_MessageHeader
+
else if (packetsize < sizeof(struct WlanHeader)
+ sizeof(struct GNUNET_MessageHeader))
{
bitfield = bitfield >> (63 - rx_message->frag_tail->num);
if (rx_message->received_fragments == bitfield)
{
-
+ sum = 0;
while (rx_frag != NULL)
{
sum += rx_frag->size;
"check_rec_finished_msg: A message for %p is complete\n", session);
#endif
- //TODO use mst
+ //TODO cleanup
+
//copy fragments together
- msg = GNUNET_malloc(packetsize);
+ //msg = GNUNET_malloc(packetsize);
rx_frag = rx_message->frag_head;
- aktnum = 0;
+ //aktnum = 0;
+ /*while (rx_frag != NULL)
+ {
+ //TODO SAVE SOME COPY OPS AND CHECK CRC WITHOUT COPY
+ memcpy(msg + aktnum, rx_frag->msg, rx_frag->size);
+ aktnum += rx_frag->size;
+ rx_frag = rx_frag->next;
+ }*/
+
while (rx_frag != NULL)
{
- //TODO SAVE SOME COPY OPS AND CHECK CRC WITHOUT COPY
- memcpy(msg + aktnum, rx_frag->msg, rx_frag->size);
- aktnum += rx_frag->size;
+ if (rx_frag->next != NULL)
+ {
+ GNUNET_SERVER_mst_receive(plugin->fragment_tokenizer,
+ session_light, rx_frag->msg, rx_frag->size, GNUNET_NO,
+ GNUNET_NO);
+ }
+ else
+ {
+ //if it is the last fragment just kill all leftover
+ GNUNET_SERVER_mst_receive(plugin->fragment_tokenizer,
+ session_light, rx_frag->msg, rx_frag->size, GNUNET_YES,
+ GNUNET_NO);
+ }
rx_frag = rx_frag->next;
}
-
free_receive_message(plugin, rx_message);
//call wlan_process_helper to process the message
- wlan_data_massage_handler(plugin, session_light,
- (struct GNUNET_MessageHeader*) msg);
+ //wlan_data_message_handler(plugin, session_light,
+ // (struct GNUNET_MessageHeader*) msg);
//wlan_data_helper (plugin, session_light, (struct GNUNET_MessageHeader*) msg);
- GNUNET_free(msg);
+ //GNUNET_free(msg);
}
}
// }
}
+//TODO DOXIGEN
static void
process_data(void *cls, void *client, const struct GNUNET_MessageHeader *hdr)
{
#if DEBUG_wlan
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Calling plugin->env->receive for session %p; %s; size: %u\n", session,
- wlan_plugin_address_to_string(NULL, session->addr, 6), htons(hdr->size));
+ wlan_plugin_address_to_string(NULL, session->addr.mac, 6), htons(
+ hdr->size));
#endif
plugin->env->receive(plugin->env->cls, &(session->target), hdr,
- (const struct GNUNET_TRANSPORT_ATS_Information *) &distance, 2, session,
- (const char*) &session->addr, sizeof(session->addr));
+ (const struct GNUNET_TRANSPORT_ATS_Information *) &distance, 2, session,
+ (const char*) &session->addr, sizeof(session->addr));
}
/**
return NULL;
}
-
-
/**
* function to insert a received fragment into the right fragment queue of the right message
* @param plugin pointer to the plugin struct
if (rx_message == NULL)
{
+ if (session->fragment_messages_in_count < MESSAGES_IN_QUEUE_PER_SESSION)
+ {
+ check_receive_message_timeouts(plugin, session);
+ }
+
if (session->fragment_messages_in_count < MESSAGES_IN_QUEUE_PER_SESSION)
{
rx_message->message_id_in = ntohl(fh->message_id);
rx_message->rec_size = MESSAGE_LENGHT_UNKNOWN;
rx_message->session = session;
- rx_message->timeout = GNUNET_TIME_absolute_add(
- GNUNET_TIME_absolute_get(), MESSAGE_IN_TIMEOUT);
rx_message->received_fragments = 0;
GNUNET_CONTAINER_DLL_insert(plugin->receive_messages_head, plugin->receive_messages_teil, rx_message);
GNUNET_log(
GNUNET_ERROR_TYPE_INFO,
- "WLAN fragment message_id and session message_id do not exist, max MESSAGES_IN_QUEUE_PER_SESSION reached\n");
+ "WLAN fragment message_id and session message_id do not exist, max MESSAGES_IN_QUEUE_PER_SESSION reached, akt in message_id %u\n",
+ get_receive_message_from_session(plugin, session)->message_id_in);
setBit((char *) &retval, ntohs(fh->fragment_off_or_num));
return retval;
}
}
+ //reset timeout
+ rx_message->timeout = GNUNET_TIME_absolute_add(
+ GNUNET_TIME_absolute_get(),
+ MESSAGE_IN_TIMEOUT);
+
if (is_double_msg(rx_message, fh) != GNUNET_YES)
{
-
//report size
rx_frag = GNUNET_malloc(sizeof (struct Receive_Fragment_Queue) +
ntohs(fh->header.size) - sizeof(struct FragmentationHeader));
rx_message->received_fragments, session);
#endif
- check_rec_finished_msg(plugin, session_light, session, rx_message);
+ check_rx_finished_msg(plugin, session_light, session, rx_message);
}
else
{
const struct GNUNET_MessageHeader * hdr, const struct Radiotap_rx * rxinfo)
{
struct Plugin *plugin = cls;
- struct Session * session = NULL;
+ struct Session * session;
- struct FragmentationHeader * fh = NULL;
- struct FragmentationAckHeader * fah = NULL;
- struct FragmentMessage * fm = NULL;
+ struct FragmentationHeader * fh;
+ struct FragmentationAckHeader * fah;
+ struct FragmentMessage * fm;
- const char * tempmsg = NULL;
+ const char * tempmsg;
uint64_t fragment_bitfield = 0;
GNUNET_ERROR_TYPE_DEBUG,
"Func wlan_data_helper got GNUNET_MESSAGE_TYPE_WLAN_ADVERTISEMENT size: %u; %s\n",
ntohs(hdr->size), wlan_plugin_address_to_string(NULL,
- session_light->addr, 6));
+ session_light->addr.mac, 6));
#endif
if (session_light->session == NULL)
{
- session_light->session = get_Session(plugin, &session_light->addr);
+ session_light->session = get_session(plugin, &session_light->addr);
}
GNUNET_assert(GNUNET_HELLO_get_id(
(const struct GNUNET_HELLO_Message *) &hdr[1],
}
//FRAGMENT
+
else if (ntohs(hdr->type) == GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT)
{
"Func wlan_data_helper got GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT with message_id %u with fragment number %i, size: %u; %s\n",
ntohl(fh->message_id), ntohs(fh->fragment_off_or_num), ntohs(
hdr->size), wlan_plugin_address_to_string(NULL,
- session_light->addr, 6));
+ session_light->addr.mac, 6));
#endif
if (getcrc16(tempmsg, ntohs(fh->header.size)) != ntohs(fh->message_crc))
GNUNET_ERROR_TYPE_INFO,
"WLAN client not in session list, fragment num %u, message id %u\n",
ntohs(fh->fragment_off_or_num), ntohl(fh->message_id));
- wlan_data_massage_handler(plugin, session_light,
- (struct GNUNET_MessageHeader *) tempmsg);
+
+ GNUNET_SERVER_mst_receive(plugin->fragment_tokenizer, session_light,
+ tempmsg, ntohs(hdr->size) - sizeof(struct FragmentationHeader),
+ GNUNET_YES, GNUNET_NO);
+ //wlan_data_message_handler(plugin, session_light,
+ // (struct GNUNET_MessageHeader *) tempmsg);
session = session_light->session;
//test if a session was created
if (session == NULL)
}
add_ack_for_send(plugin, session, fragment_bitfield, fh);
- check_next_fragment_timeout(plugin);
+ set_next_send(plugin);
}
//ACK
+
else if (ntohs(hdr->type) == GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT_ACK)
{
GNUNET_ERROR_TYPE_DEBUG,
"Func wlan_data_helper got GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT_ACK size: %u; %s\n",
ntohs(hdr->size), wlan_plugin_address_to_string(NULL,
- session_light->addr, 6));
+ session_light->addr.mac, 6));
#endif
GNUNET_assert(session_light != NULL);
}
session = session_light->session;
fah = (struct FragmentationAckHeader *) hdr;
- fm = get_fragment_message_from_session_and_id(session, ntohl(
+ fm = get_fragment_message_from_session_and_id(plugin, session, ntohl(
fah->message_id));
+
if (fm != NULL)
{
- fm->ack_bitfield = fm->ack_bitfield | GNUNET_ntohll(fah->fragment_field);
+ fm->ack_bitfield = fm->ack_bitfield | GNUNET_ntohll(
+ fah->fragment_field);
+ fm->next_ack = GNUNET_TIME_relative_to_absolute(get_ack_timeout(fm));
+
+#if DEBUG_wlan_retransmission
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Got ack for: %u; %u\n",
+ fm->message_id_out, fm->ack_bitfield);
+#endif
check_finished_fragment(plugin, fm);
+ set_next_send(plugin);
+
}
else
{
GNUNET_ERROR_TYPE_INFO,
"WLAN packet inside the WLAN helper packet has not the right type: %u size: %u\n",
ntohs(hdr->type), ntohs(hdr->size));
- GNUNET_assert(0);
+ GNUNET_break(0);
return;
}
}
+//TODO DOXIGEN
const char *
macprinter(const u_int8_t * mac)
{
const struct GNUNET_MessageHeader * temp_hdr = NULL;
int datasize = 0;
- int pos = 0;
+ int pos;
switch (ntohs(hdr->type))
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Size of packet is too small; size: %u min size: %u\n", ntohs(
hdr->size), sizeof(struct ieee80211_frame)
- + sizeof(struct GNUNET_MessageHeader));
+ + sizeof(struct GNUNET_MessageHeader));
#endif
- GNUNET_break (0);
+ //GNUNET_break (0);
/* FIXME: restart SUID process */
return;
}
//process only if it is an broadcast or for this computer both with the gnunet bssid
//check for bssid
- if (memcmp(&(wlanIeeeHeader->i_addr3), &mac_bssid, sizeof(struct MacAddress))
- == 0)
+ if (memcmp(&(wlanIeeeHeader->i_addr3), &mac_bssid,
+ sizeof(struct MacAddress)) == 0)
{
//check for broadcast or mac
if (memcmp(&(wlanIeeeHeader->i_addr1), &bc_all_mac,
session_light = GNUNET_malloc(sizeof(struct Session_light));
memcpy(&session_light->addr, &(wlanIeeeHeader->i_addr2),
- sizeof(struct MacAddress));
+ sizeof(struct MacAddress));
//session_light->session = search_session(plugin,session_light->addr);
pos = 0;
- temp_hdr = (struct GNUNET_MessageHeader *) &wlanIeeeHeader[1];
while (pos < datasize)
{
temp_hdr = (struct GNUNET_MessageHeader *) &wlanIeeeHeader[1]
struct Plugin *plugin = cls;
plugin->server_read_task = GNUNET_SCHEDULER_NO_TASK;
- /*
- #if DEBUG_wlan
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Start reading from STDIN\n");
- #endif
- */
- if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
+ if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
char mybuf[WLAN_MTU + sizeof(struct GNUNET_MessageHeader)];
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ struct Sessionqueue * queue = plugin->sessions;
+ struct Sessionqueue * queue_next;
+ struct FragmentMessage * fm;
#if DEBUG_wlan
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"libgnunet_plugin_transport_wlan_done started\n");
#endif
- GNUNET_assert(cls !=NULL);
+
+ GNUNET_OS_process_close(plugin->server_proc);
+ GNUNET_DISK_pipe_close(plugin->server_stdout);
+ GNUNET_DISK_pipe_close(plugin->server_stdin);
+
+ GNUNET_assert (cls !=NULL);
+ //free sessions
+ while (queue != NULL)
+ {
+ queue_next = queue->next;
+ free_session(plugin, queue);
+ queue = queue_next;
+
+ }
+ if (plugin->server_write_delay_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->server_write_delay_task);
+ plugin->server_write_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (plugin->server_write_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->server_write_task);
+ plugin->server_write_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (plugin->server_read_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel(plugin->server_read_task);
+ plugin->server_read_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
if (plugin->suid_tokenizer != NULL)
GNUNET_SERVER_mst_destroy(plugin->suid_tokenizer);
if (plugin->data_tokenizer != NULL)
GNUNET_SERVER_mst_destroy(plugin->data_tokenizer);
+ if (plugin->fragment_tokenizer != NULL)
+ GNUNET_SERVER_mst_destroy(plugin->fragment_tokenizer);
+
+ fm = (struct FragmentMessage *) GNUNET_CONTAINER_heap_peek(
+ plugin->pending_Fragment_Messages);
+
+ while (fm != NULL)
+ {
+ free_fragment_message(plugin, fm);
+ fm = (struct FragmentMessage *) GNUNET_CONTAINER_heap_peek(
+ plugin->pending_Fragment_Messages);
+ }
+
GNUNET_free_non_null(plugin->interface);
+ GNUNET_CONTAINER_heap_destroy(plugin->pending_Fragment_Messages);
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
plugin->server_write_task = GNUNET_SCHEDULER_NO_TASK;
plugin->server_read_task = GNUNET_SCHEDULER_NO_TASK;
plugin->server_write_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ plugin->pending_Fragment_Messages = GNUNET_CONTAINER_heap_create(
+ GNUNET_CONTAINER_HEAP_ORDER_MIN);
plugin->suid_tokenizer = GNUNET_SERVER_mst_create(&wlan_process_helper,
plugin);
plugin->data_tokenizer = GNUNET_SERVER_mst_create(&process_data, plugin);
+ plugin->fragment_tokenizer = GNUNET_SERVER_mst_create(
+ &wlan_data_message_handler, plugin);
//plugin->sessions = GNUNET_malloc (sizeof (struct Sessionqueue));
- //plugin->pending_Sessions = GNUNET_malloc (sizeof (struct Sessionqueue));
+ //plugin->pending_Sessions_head = GNUNET_malloc (sizeof (struct Sessionqueue));
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = plugin;
projects / oweals / gnunet.git / blobdiff