[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14972 - in gnunet/src/transport: . wlan
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r14972 - in gnunet/src/transport: . wlan |
|
Date: |
Wed, 13 Apr 2011 01:33:44 +0200 |
Author: brodski
Date: 2011-04-13 01:33:44 +0200 (Wed, 13 Apr 2011)
New Revision: 14972
Modified:
gnunet/src/transport/gnunet-transport-wlan-helper.c
gnunet/src/transport/plugin_transport_wlan.c
gnunet/src/transport/wlan/loopback_helper.c
Log:
Big cleanup and heap used for fragments send and with the timeouts
Modified: gnunet/src/transport/gnunet-transport-wlan-helper.c
===================================================================
--- gnunet/src/transport/gnunet-transport-wlan-helper.c 2011-04-12 23:32:17 UTC
(rev 14971)
+++ gnunet/src/transport/gnunet-transport-wlan-helper.c 2011-04-12 23:33:44 UTC
(rev 14972)
@@ -92,7 +92,6 @@
#define ARPHRD_IEEE80211_PRISM 802
#define ARPHRD_IEEE80211_FULL 803
-int first;
int closeprog;
#include "wlan/helper_common.h"
@@ -130,125 +129,129 @@
struct sendbuf *write_pout;
int fd_in, arptype_in;
- int fd_out, arptype_out;
- int fd_main;
- int fd_rtc;
+ int fd_out;
+ //int arptype_out;
+ //int fd_main;
+ //int fd_rtc;
DRIVER_TYPE drivertype; /* inited to DT_UNKNOWN on allocation by wi_alloc */
- FILE *f_cap_in;
+ //FILE *f_cap_in;
- struct pcap_file_header pfh_in;
+ //struct pcap_file_header pfh_in;
- int sysfs_inject;
- int channel;
- int freq;
- int rate;
- int tx_power;
- char *wlanctlng; /* XXX never set */
- char *iwpriv;
- char *iwconfig;
- char *ifconfig;
+ //int sysfs_inject;
+ //int channel;
+ //int freq;
+ //int rate;
+ //int tx_power;
+ //char *wlanctlng; /* XXX never set */
+ //char *iwpriv;
+ //char *iwconfig;
+ //char *ifconfig;
char *iface;
- char *main_if;
+ //char *main_if;
unsigned char pl_mac[6];
- int inject_wlanng;
+//int inject_wlanng;
};
//#include "radiotap.h"
// mac of this node
-char mac[] =
- { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 };
-
+/*char mac[] =
+ { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 };
+ */
/* wifi bitrate to use in 500kHz units */
-static const u8 u8aRatesToUse[] =
- {
+/*
+ static const u8 u8aRatesToUse[] =
+ {
- 54 * 2, 48 * 2, 36 * 2, 24 * 2, 18 * 2, 12 * 2, 9 * 2, 11 * 2, 11, // 5.5
- 2 * 2, 1 * 2 };
+ 54 * 2, 48 * 2, 36 * 2, 24 * 2, 18 * 2, 12 * 2, 9 * 2, 11 * 2, 11, // 5.5
+ 2 * 2, 1 * 2 };
-#define OFFSET_FLAGS 0x10
-#define OFFSET_RATE 0x11
-
+ #define OFFSET_FLAGS 0x10
+ #define OFFSET_RATE 0x11
+ */
// this is where we store a summary of the
// information from the radiotap header
-typedef struct
-{
- int m_nChannel;
- int m_nChannelFlags;
- int m_nRate;
- int m_nAntenna;
- int m_nRadiotapFlags;
-}__attribute__((packed)) PENUMBRA_RADIOTAP_DATA;
-
+/*
+ typedef struct
+ {
+ int m_nChannel;
+ int m_nChannelFlags;
+ int m_nRate;
+ int m_nAntenna;
+ int m_nRadiotapFlags;
+ }__attribute__((packed)) PENUMBRA_RADIOTAP_DATA;
+ */
static void
sigfunc_hw(int sig)
{
closeprog = 1;
}
-void
-Dump(u8 * pu8, int nLength)
-{
- char sz[256], szBuf[512], szChar[17], *buf, fFirst = 1;
- unsigned char baaLast[2][16];
- uint n, nPos = 0, nStart = 0, nLine = 0, nSameCount = 0;
+/*
+ void
+ Dump(u8 * pu8, int nLength)
+ {
+ char sz[256], szBuf[512], szChar[17], *buf, fFirst = 1;
+ unsigned char baaLast[2][16];
+ uint n, nPos = 0, nStart = 0, nLine = 0, nSameCount = 0;
- buf = szBuf;
- szChar[0] = '\0';
+ buf = szBuf;
+ szChar[0] = '\0';
- for (n = 0; n < nLength; n++)
- {
- baaLast[(nLine & 1) ^ 1][n & 0xf] = pu8[n];
- if ((pu8[n] < 32) || (pu8[n] >= 0x7f))
- szChar[n & 0xf] = '.';
- else
- szChar[n & 0xf] = pu8[n];
- szChar[(n & 0xf) + 1] = '\0';
- nPos += sprintf(&sz[nPos], "%02X ", baaLast[(nLine & 1) ^ 1][n & 0xf]);
- if ((n & 15) != 15)
- continue;
- if ((memcmp(baaLast[0], baaLast[1], 16) == 0) && (!fFirst))
- {
- nSameCount++;
- }
- else
- {
- if (nSameCount)
- buf += sprintf(buf, "(repeated %d times)\n", nSameCount);
- buf += sprintf(buf, "%04x: %s %s\n", nStart, sz, szChar);
- nSameCount = 0;
- printf("%s", szBuf);
- buf = szBuf;
- }
- nPos = 0;
- nStart = n + 1;
- nLine++;
- fFirst = 0;
- sz[0] = '\0';
- szChar[0] = '\0';
- }
- if (nSameCount)
- buf += sprintf(buf, "(repeated %d times)\n", nSameCount);
+ for (n = 0; n < nLength; n++)
+ {
+ baaLast[(nLine & 1) ^ 1][n & 0xf] = pu8[n];
+ if ((pu8[n] < 32) || (pu8[n] >= 0x7f))
+ szChar[n & 0xf] = '.';
+ else
+ szChar[n & 0xf] = pu8[n];
+ szChar[(n & 0xf) + 1] = '\0';
+ nPos += sprintf(&sz[nPos], "%02X ", baaLast[(nLine & 1) ^ 1][n & 0xf]);
+ if ((n & 15) != 15)
+ continue;
+ if ((memcmp(baaLast[0], baaLast[1], 16) == 0) && (!fFirst))
+ {
+ nSameCount++;
+ }
+ else
+ {
+ if (nSameCount)
+ buf += sprintf(buf, "(repeated %d times)\n", nSameCount);
+ buf += sprintf(buf, "%04x: %s %s\n", nStart, sz, szChar);
+ nSameCount = 0;
+ printf("%s", szBuf);
+ buf = szBuf;
+ }
+ nPos = 0;
+ nStart = n + 1;
+ nLine++;
+ fFirst = 0;
+ sz[0] = '\0';
+ szChar[0] = '\0';
+ }
+ if (nSameCount)
+ buf += sprintf(buf, "(repeated %d times)\n", nSameCount);
- buf += sprintf(buf, "%04x: %s", nStart, sz);
- if (n & 0xf)
- {
- *buf++ = ' ';
- while (n & 0xf)
- {
- buf += sprintf(buf, " ");
- n++;
- }
- }
- buf += sprintf(buf, "%s\n", szChar);
- printf("%s", szBuf);
-}
-
-void
+ buf += sprintf(buf, "%04x: %s", nStart, sz);
+ if (n & 0xf)
+ {
+ *buf++ = ' ';
+ while (n & 0xf)
+ {
+ buf += sprintf(buf, " ");
+ n++;
+ }
+ }
+ buf += sprintf(buf, "%s\n", szChar);
+ printf("%s", szBuf);
+ }
+ */
+static void
usage()
{
printf("Usage: interface-name options\n"
@@ -259,7 +262,7 @@
exit(1);
}
-unsigned long
+static unsigned long
calc_crc_osdep(unsigned char * buf, int len)
{
unsigned long crc = 0xFFFFFFFF;
@@ -272,7 +275,7 @@
/* CRC checksum verification routine */
-int
+static int
check_crc_buf_osdep(unsigned char *buf, int len)
{
unsigned long crc;
@@ -287,83 +290,86 @@
}
/* Search a file recursively */
-static char *
-searchInside(const char * dir, const char * filename)
-{
- char * ret;
- char * curfile;
- struct stat sb;
- int len, lentot;
- DIR *dp;
- struct dirent *ep;
+/*
+ static char *
+ searchInside(const char * dir, const char * filename)
+ {
+ char * ret;
+ char * curfile;
+ struct stat sb;
+ int len, lentot;
+ DIR *dp;
+ struct dirent *ep;
- dp = opendir(dir);
- if (dp == NULL)
- {
- return NULL;
- }
+ dp = opendir(dir);
+ if (dp == NULL)
+ {
+ return NULL;
+ }
- len = strlen(filename);
- lentot = strlen(dir) + 256 + 2;
- curfile = (char *) calloc(1, lentot);
+ len = strlen(filename);
+ lentot = strlen(dir) + 256 + 2;
+ curfile = (char *) calloc(1, lentot);
- while ((ep = readdir(dp)) != NULL)
- {
+ while ((ep = readdir(dp)) != NULL)
+ {
- memset(curfile, 0, lentot);
- sprintf(curfile, "%s/%s", dir, ep->d_name);
+ memset(curfile, 0, lentot);
+ sprintf(curfile, "%s/%s", dir, ep->d_name);
- //Checking if it's the good file
- if ((int) strlen(ep->d_name) == len && !strcmp(ep->d_name, filename))
- {
- (void) closedir(dp);
- return curfile;
- }
- lstat(curfile, &sb);
+ //Checking if it's the good file
+ if ((int) strlen(ep->d_name) == len && !strcmp(ep->d_name, filename))
+ {
+ (void) closedir(dp);
+ return curfile;
+ }
+ lstat(curfile, &sb);
- //If it's a directory and not a link, try to go inside to search
- if (S_ISDIR(sb.st_mode) && !S_ISLNK(sb.st_mode))
- {
- //Check if the directory isn't "." or ".."
- if (strcmp(".", ep->d_name) && strcmp("..", ep->d_name))
- {
- //Recursive call
- ret = searchInside(curfile, filename);
- if (ret != NULL)
- {
- (void) closedir(dp);
- free(curfile);
- return ret;
- }
- }
- }
- }
- (void) closedir(dp);
- free(curfile);
- return NULL;
-}
-
+ //If it's a directory and not a link, try to go inside to search
+ if (S_ISDIR(sb.st_mode) && !S_ISLNK(sb.st_mode))
+ {
+ //Check if the directory isn't "." or ".."
+ if (strcmp(".", ep->d_name) && strcmp("..", ep->d_name))
+ {
+ //Recursive call
+ ret = searchInside(curfile, filename);
+ if (ret != NULL)
+ {
+ (void) closedir(dp);
+ free(curfile);
+ return ret;
+ }
+ }
+ }
+ }
+ (void) closedir(dp);
+ free(curfile);
+ return NULL;
+ }
+ */
/* Search a wireless tool and return its path */
-static char *
-wiToolsPath(const char * tool)
-{
- char * path;
- int i, nbelems;
- static const char * paths[] =
- { "/sbin", "/usr/sbin", "/usr/local/sbin", "/bin", "/usr/bin",
- "/usr/local/bin", "/tmp" };
+/*
+ static char *
+ wiToolsPath(const char * tool)
+ {
+ char * path;
+ int i, nbelems;
+ static const char * paths[] =
+ { "/sbin", "/usr/sbin", "/usr/local/sbin", "/bin", "/usr/bin",
+ "/usr/local/bin", "/tmp" };
- nbelems = sizeof(paths) / sizeof(char *);
+ nbelems = sizeof(paths) / sizeof(char *);
- for (i = 0; i < nbelems; i++)
- {
- path = searchInside(paths[i], tool);
- if (path != NULL)
- return path;
- }
+ for (i = 0; i < nbelems; i++)
+ {
+ path = searchInside(paths[i], tool);
+ if (path != NULL)
+ return path;
+ }
- return NULL;
-}
+ return NULL;
+ }
+ */
static int
linux_get_channel(struct Hardware_Infos *dev)
@@ -374,15 +380,17 @@
memset(&wrq, 0, sizeof(struct iwreq));
- if (dev->main_if)
- strncpy(wrq.ifr_name, dev->main_if, IFNAMSIZ );
- else
- strncpy(wrq.ifr_name, dev->iface, IFNAMSIZ );
+ /*
+ if (dev->main_if)
+ strncpy(wrq.ifr_name, dev->main_if, IFNAMSIZ );
+ else*/
+ strncpy(wrq.ifr_name, dev->iface, IFNAMSIZ );
fd = dev->fd_in;
- if (dev->drivertype == DT_IPW2200)
- fd = dev->fd_main;
-
+ /*
+ if (dev->drivertype == DT_IPW2200)
+ fd = dev->fd_main;
+ */
if (ioctl(fd, SIOCGIWFREQ, &wrq) < 0)
return (-1);
@@ -770,43 +778,45 @@
wlaninit(struct Hardware_Infos * dev, char *iface)
{
- char *iwpriv;
+ //char *iwpriv;
char strbuf[512];
- dev->inject_wlanng = 1;
- dev->rate = 2; /* default to 1Mbps if nothing is set */
+ //dev->inject_wlanng = 1;
+ //dev->rate = 2; /* default to 1Mbps if nothing is set */
/* open raw socks */
- dev->fd_in = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
- if (0 > dev->fd_in)
- {
- perror("socket(PF_PACKET) failed at fd_in");
- if (getuid() != 0)
- fprintf(stderr, "This program requires root privileges.\n");
- return (1);
- }
-
- dev->fd_main = socket(PF_PACKET, SOCK_RAW, htons( ETH_P_ALL ) );
- if (0 > dev->fd_main)
- {
- perror("socket(PF_PACKET) failed at fd_main");
- if (getuid() != 0)
- fprintf(stderr, "This program requires root privileges.\n");
- return (1);
- }
-
+ /*
+ dev->fd_in = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+ if (0 > dev->fd_in)
+ {
+ perror("socket(PF_PACKET) failed at fd_in");
+ if (getuid() != 0)
+ fprintf(stderr, "This program requires root privileges.\n");
+ return (1);
+ }
+ */
+ /*
+ dev->fd_main = socket(PF_PACKET, SOCK_RAW, htons( ETH_P_ALL ) );
+ if (0 > dev->fd_main)
+ {
+ perror("socket(PF_PACKET) failed at fd_main");
+ if (getuid() != 0)
+ fprintf(stderr, "This program requires root privileges.\n");
+ return (1);
+ }
+ */
/* Check iwpriv existence */
+ /*
+ iwpriv = wiToolsPath("iwpriv");
+ dev->iwpriv = iwpriv;
+ dev->iwconfig = wiToolsPath("iwconfig");
+ dev->ifconfig = wiToolsPath("ifconfig");
- iwpriv = wiToolsPath("iwpriv");
- dev->iwpriv = iwpriv;
- dev->iwconfig = wiToolsPath("iwconfig");
- dev->ifconfig = wiToolsPath("ifconfig");
-
- if (!iwpriv)
- {
- fprintf(stderr, "Can't find wireless tools, exiting.\n");
- goto close_in;
- }
-
+ if (!iwpriv)
+ {
+ fprintf(stderr, "Can't find wireless tools, exiting.\n");
+ goto close_in;
+ }
+ */
dev->fd_out = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
if (0 > dev->fd_out)
{
@@ -836,6 +846,7 @@
else
{
// At the moment only mac80211 tested
+ fprintf(stderr, "only mac80211 stack supported, exiting.\n");
return 1;
}
@@ -844,14 +855,16 @@
szaDriverTypes[dev->drivertype]);
#endif
- if (openraw(dev, iface, dev->fd_out, &dev->arptype_out, dev->pl_mac) != 0)
+ if (openraw(dev, iface, dev->fd_out, &dev->arptype_in, dev->pl_mac) != 0)
{
goto close_out;
}
dev->fd_in = dev->fd_out;
+ dev->iface = GNUNET_malloc(sizeof(char) *6);
+ strncpy(dev->iface, iface, sizeof(char) * 6);
- dev->arptype_in = dev->arptype_out;
+ //dev->arptype_out = dev->arptype_in;
return 0;
close_out: close(dev->fd_out);
@@ -961,7 +974,7 @@
+ sizeof(struct Radiotap_Send) + sizeof(struct GNUNET_MessageHeader),
sendsize);
- wlanheader = write_pout->buf + sizeof(u8aRadiotap);
+ wlanheader = write_pout->buf + sizeof(u8aRadiotap);
mac_set(wlanheader, dev);
sendsize += sizeof(u8aRadiotap);
@@ -974,7 +987,7 @@
write_pout->size = sendsize;
}
-int
+static int
maketest(unsigned char * buf, struct Hardware_Infos * dev)
{
uint16_t * tmp16;
@@ -1024,8 +1037,8 @@
//0x00, 0x1f, 0x3f, 0xd1, 0x8e, 0xe6, // mac1 - in this case receiver
0x00, 0x1d, 0xe0, 0xb0, 0x17, 0xdf, // mac1 - in this case receiver
0xC0, 0x3F, 0x0E, 0x44, 0x2D, 0x51, // mac2 - in this case sender
- 0x02, 0x1d, 0xe0, 0x00, 0x01, 0xc4,
- //0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac3 - in this case bssid
+ //0x02, 0x1d, 0xe0, 0x00, 0x01, 0xc4,
+ 0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac3 - in this case bssid
0x10, 0x86, //Sequence Control
};
if (first == 0)
@@ -1117,7 +1130,7 @@
write_pout.size = maketest(write_pout.buf, &dev);
tv.tv_sec = 2;
tv.tv_usec = 0;
- retval = select(0, NULL, NULL, NULL, &tv);
+ select(0, NULL, NULL, NULL, &tv);
maxfd = 0;
@@ -1172,7 +1185,7 @@
{
closeprog = 1;
fprintf(stderr, "Write ERROR to STDOUT\n");
- exit(1);
+ goto end;
}
else
{
@@ -1276,6 +1289,9 @@
GNUNET_SERVER_mst_destroy(stdin_mst);
return 0;
+ end: GNUNET_SERVER_mst_destroy(stdin_mst);
+ return 1;
+
}
int
Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c 2011-04-12 23:32:17 UTC
(rev 14971)
+++ gnunet/src/transport/plugin_transport_wlan.c 2011-04-12 23:33:44 UTC
(rev 14972)
@@ -61,6 +61,7 @@
#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
@@ -194,19 +195,9 @@
/**
* Messages in the fragmentation queue, head
*/
- struct FragmentMessage * pending_Fragment_Messages_head;
+ struct GNUNET_CONTAINER_Heap * pending_Fragment_Messages;
/**
- * Messages in the fragmentation queue, tail
- */
- struct FragmentMessage * pending_Fragment_Messages_tail;
-
- /**
- * number of pending fragment message
- */
- unsigned int pending_fragment_messages;
-
- /**
* Messages in the in Queue, head
*/
struct Receive_Message_Queue * receive_messages_head;
@@ -247,6 +238,7 @@
char * msgheader;
struct GNUNET_MessageHeader * msgstart;
ssize_t size;
+ struct GNUNET_TIME_Absolute next_send;
};
/**
@@ -273,7 +265,18 @@
struct Radiotap_rx rxinfo;
};
+struct Session_id_pair
+{
+ struct Session * session;
+ uint32_t message_id;
+};
+struct Plugin_Session_pair
+{
+ struct Plugin * plugin;
+ struct Session * session;
+};
+
/**
* Queue for the fragments received
*/
@@ -477,6 +480,11 @@
struct FragmentMessage
{
/**
+ * heap pointer of this message
+ */
+ struct GNUNET_CONTAINER_HeapNode * node;
+
+ /**
* Session this message belongs to
*/
@@ -498,6 +506,13 @@
char *msg;
/**
+ * 0 if not in ack queue
+ * 1 if in ack queue
+ */
+
+ char in_ack_queue;
+
+ /**
* Timeout value for the pending message.
*/
struct GNUNET_TIME_Absolute timeout;
@@ -550,12 +565,11 @@
};
+static struct FragmentMessage * return_val;
+
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
* usage counter on disk only if below 4bit max (==15).
@@ -574,7 +588,6 @@
bitArray[arraySlot] |= targetBit;
}
-
/**
* Checks if a bit is active in the bitArray
*
@@ -602,10 +615,9 @@
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
*
@@ -614,22 +626,50 @@
* @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
*
* @param plugin pointer to the plugin struct
@@ -638,8 +678,7 @@
*/
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));
@@ -661,7 +700,6 @@
return queue->content;
}
-
/**
* Get session from address, create if no session exists
*
@@ -670,8 +708,7 @@
* @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)
@@ -679,41 +716,45 @@
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;
- 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
+ lastitem = queue;
+ 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,
+ plugin->pending_Sessions_tail, queue);
+ plugin->pendingsessions++;
+ }
}
@@ -792,11 +833,12 @@
* 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_Relative next_send = GNUNET_TIME_UNIT_FOREVER_REL;
//cancel old task
if (plugin->server_write_delay_task != GNUNET_SCHEDULER_NO_TASK)
@@ -804,36 +846,52 @@
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 = GNUNET_TIME_relative_min(next_send,
- get_next_frag_timeout(fm));
+ if (GNUNET_CONTAINER_node_get_cost(fm->node) != 0)
+ {
+ next_send = GNUNET_TIME_relative_min(next_send,
+ get_next_frag_timeout(fm));
+ }
+ else
+ {
+ next_send = GNUNET_TIME_UNIT_ZERO;
+ }
}
}
+
+#if DEBUG_wlan
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Next packet is send in: %u\n",
+ next_send.rel_value);
+
+#endif
+
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;
@@ -845,14 +903,15 @@
session = sessionqueue->content;
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
- }
GNUNET_assert(pm != NULL);
//check for message timeout
@@ -905,38 +964,6 @@
}
/**
- * 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
* @param fm message to free
@@ -944,19 +971,20 @@
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
}
}
@@ -976,9 +1004,10 @@
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;
@@ -995,10 +1024,9 @@
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, 0);
- sort_fragment_into_queue(plugin, fm);
- plugin->pending_fragment_messages++;
-
if (pm->transmit_cont != NULL)
{
pid = session->target;
@@ -1022,13 +1050,14 @@
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);
}
/**
@@ -1056,14 +1085,16 @@
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);
}
@@ -1075,9 +1106,12 @@
*/
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)
{
@@ -1087,6 +1121,15 @@
// 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
@@ -1118,7 +1161,6 @@
return GNUNET_YES;
}
-
/**
* function to generate the wlan hardware header for one packet
* @param Header address to write the header to
@@ -1127,9 +1169,8 @@
* @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)
{
Header->i_fc[0] = 0x80;
Header->i_fc[1] = 0x00;
@@ -1171,7 +1212,6 @@
return 0;
}
-
static void
send_hello_beacon(struct Plugin * plugin)
{
@@ -1182,16 +1222,17 @@
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);
@@ -1207,8 +1248,7 @@
+ 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);
@@ -1224,7 +1264,7 @@
GNUNET_free(msgheader);
set_next_beacon_time(plugin);
- check_next_fragment_timeout(plugin);
+ set_next_send(plugin);
}
static void
@@ -1276,7 +1316,7 @@
GNUNET_assert(bytes != GNUNET_SYSERR);
GNUNET_assert(bytes == size);
GNUNET_free(msgheader);
- check_next_fragment_timeout(plugin);
+ set_next_send(plugin);
}
static void
@@ -1295,7 +1335,6 @@
finish->msgheader, finish->size);
GNUNET_assert(bytes != GNUNET_SYSERR);
- GNUNET_assert(plugin->server_write_task == GNUNET_SCHEDULER_NO_TASK);
if (bytes != finish->size)
{
@@ -1309,13 +1348,13 @@
{
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
*
@@ -1332,21 +1371,22 @@
if (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)
{
@@ -1367,7 +1407,8 @@
}
- fm = plugin->pending_Fragment_Messages_head;
+ fm = GNUNET_CONTAINER_heap_peek(plugin->pending_Fragment_Messages);
+
if (fm != NULL)
{
session = fm->session;
@@ -1380,8 +1421,8 @@
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "message timeout\n");
#endif
+ free_fragment_message(plugin, fm);
check_fragment_queue(plugin);
- free_fragment_message(plugin, fm);
}
else
@@ -1391,13 +1432,11 @@
// {
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;
@@ -1478,6 +1517,27 @@
}
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
+ }
+
if (bytes != size)
{
finish = GNUNET_malloc(sizeof( struct Finish_send));
@@ -1485,6 +1545,7 @@
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);
@@ -1496,26 +1557,10 @@
else
{
GNUNET_assert(bytes == size);
-
GNUNET_free(msgheader);
- check_next_fragment_timeout(plugin);
+ set_next_send(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);
-
- }
-
}
return;
}
@@ -1523,7 +1568,6 @@
"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
@@ -1556,8 +1600,6 @@
return GNUNET_SYSERR;
}
-
-
/**
* Function that can be used by the transport service to transmit
* a message using the plugin.
@@ -1567,7 +1609,7 @@
* @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))
@@ -1592,8 +1634,8 @@
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);
@@ -1603,7 +1645,7 @@
{
if (wlan_plugin_address_suggested(plugin, addr, addrlen) == GNUNET_OK)
{
- session = get_Session(plugin, addr);
+ session = get_session(plugin, addr);
}
else
{
@@ -1677,7 +1719,7 @@
#endif
//queue session
- queue_Session(plugin, session);
+ queue_session(plugin, session);
check_fragment_queue(plugin);
//FIXME not the correct size
@@ -1686,48 +1728,78 @@
}
/**
- * 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_pair * pair = (struct Session_id_pair *) cls;
+ struct FragmentMessage * fm = (struct FragmentMessage*) element;
+
+ if ((fm->session == pair->session)
+ && (fm->message_id_out == pair->message_id))
+ {
+ return_val = fm;
+ return GNUNET_NO;
+ }
+ return GNUNET_YES;
+
+}
+
+/**
* function to get the message in the fragement queue (out) of a session with
a specific id
* @param session pointer to the session
* @param message_id id of the message
* @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_pair pair;
+ pair.session = session;
+ pair.message_id = message_id;
+ GNUNET_CONTAINER_heap_iterate(plugin->pending_Fragment_Messages,
+ &search_fragment_message_from_session_and_id, &pair);
+ return return_val;
}
-
/**
* function to get the receive message of a session
* @param plugin pointer to the plugin struct
@@ -1749,7 +1821,6 @@
return NULL;
}
-
/**
* Function to dispose the fragments received for a message and the message
* @param plugin pointer to the plugin struct
@@ -1780,7 +1851,68 @@
GNUNET_free(rx_message);
}
+static void
+free_session(struct Plugin * plugin, struct Sessionqueue * queue)
+{
+ struct Sessionqueue * pendingsession = plugin->pending_Sessions;
+ struct PendingMessage * pm;
+ struct Receive_Message_Queue * receive_queue;
+ struct Plugin_Session_pair pair;
+ //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?
+ 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_free(queue->content);
+ GNUNET_CONTAINER_DLL_remove(plugin->sessions, plugin->sessions_tail, queue);
+ GNUNET_free(queue);
+ plugin->session_count--;
+
+ check_fragment_queue(plugin);
+
+}
+
/**
* Function that can be used to force the plugin to disconnect
* from the given peer and cancel all previous transmissions
@@ -1794,10 +1926,6 @@
{
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)
@@ -1807,53 +1935,7 @@
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
@@ -1899,55 +1981,24 @@
asc(asc_cls, ret);
}
-
-
/**
- * 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)
+check_message_fragment_bitfield(struct Receive_Message_Queue * rx_msg)
{
uint64_t checkfragments = 0;
- struct Receive_Fragment_Queue * rec_queue = rec_message->frag_head;
+ struct Receive_Fragment_Queue * rx_frag = rx_msg->frag_head;
- while (rec_queue != NULL)
+ while (rx_frag != NULL)
{
- setBit((char*) &checkfragments, rec_queue->num);
- rec_queue = rec_queue->next;
+ setBit((char*) &checkfragments, rx_frag->num);
+ rx_frag = rx_frag->next;
}
- GNUNET_assert(checkfragments == rec_message->received_fragments);
+ GNUNET_assert(checkfragments == rx_msg->received_fragments);
}
/**
@@ -1959,15 +2010,15 @@
*/
static const int
-is_double_msg(struct Receive_Message_Queue * rec_message,
+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));
}
@@ -1986,9 +2037,8 @@
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)
{
@@ -2015,10 +2065,6 @@
setBit((char *) &rx_message->received_fragments, rx_frag->num);
}
-
-
-
-
/**
* handels the data after all fragments are put together
* @param plugin
@@ -2026,14 +2072,14 @@
* @param hdr pointer to the data
*/
static void
-wlan_data_massage_handler(struct Plugin * plugin,
+wlan_data_message_handler(struct Plugin * plugin,
struct Session_light * session_light,
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 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)
@@ -2042,7 +2088,7 @@
#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
@@ -2136,13 +2182,11 @@
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
@@ -2152,7 +2196,7 @@
*/
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)
{
@@ -2160,8 +2204,8 @@
struct Receive_Fragment_Queue * rx_frag = rx_message->frag_head;
int packetsize = rx_message->rec_size;
- int sum = 0;
- int aktnum = 0;
+ int sum;
+ int aktnum;
uint64_t bitfield = 0;
char * msg;
@@ -2171,6 +2215,7 @@
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))
{
@@ -2191,7 +2236,7 @@
bitfield = bitfield >> (63 - rx_message->frag_tail->num);
if (rx_message->received_fragments == bitfield)
{
-
+ sum = 0;
while (rx_frag != NULL)
{
sum += rx_frag->size;
@@ -2222,7 +2267,7 @@
free_receive_message(plugin, rx_message);
//call wlan_process_helper to process the message
- wlan_data_massage_handler(plugin, session_light,
+ wlan_data_message_handler(plugin, session_light,
(struct GNUNET_MessageHeader*) msg);
//wlan_data_helper (plugin, session_light, (struct
GNUNET_MessageHeader*) msg);
@@ -2250,12 +2295,13 @@
#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));
}
/**
@@ -2310,8 +2356,6 @@
return NULL;
}
-
-
/**
* function to insert a received fragment into the right fragment queue of the
right message
* @param plugin pointer to the plugin struct
@@ -2369,7 +2413,8 @@
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;
}
@@ -2378,7 +2423,6 @@
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));
@@ -2401,7 +2445,7 @@
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
{
@@ -2425,13 +2469,13 @@
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;
@@ -2448,12 +2492,12 @@
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],
@@ -2462,6 +2506,7 @@
}
//FRAGMENT
+
else if (ntohs(hdr->type) == GNUNET_MESSAGE_TYPE_WLAN_FRAGMENT)
{
@@ -2481,7 +2526,7 @@
"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))
@@ -2504,7 +2549,7 @@
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,
+ wlan_data_message_handler(plugin, session_light,
(struct GNUNET_MessageHeader *) tempmsg);
session = session_light->session;
//test if a session was created
@@ -2516,11 +2561,12 @@
}
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)
{
@@ -2529,7 +2575,7 @@
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);
@@ -2540,13 +2586,23 @@
}
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
{
@@ -2564,7 +2620,7 @@
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;
}
@@ -2603,7 +2659,7 @@
const struct GNUNET_MessageHeader * temp_hdr = NULL;
int datasize = 0;
- int pos = 0;
+ int pos;
switch (ntohs(hdr->type))
{
@@ -2635,8 +2691,8 @@
//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,
@@ -2654,11 +2710,10 @@
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]
@@ -2836,6 +2891,8 @@
{
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
+ struct Sessionqueue * queue = plugin->sessions;
+ struct FragmentMessage * fm;
#if DEBUG_wlan
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -2850,7 +2907,21 @@
if (plugin->data_tokenizer != NULL)
GNUNET_SERVER_mst_destroy(plugin->data_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);
+ }
+
+ //free sessions
+ while (queue != NULL)
+ {
+ free_session(plugin, queue);
+ }
+
GNUNET_free_non_null(plugin->interface);
+ GNUNET_CONTAINER_heap_destroy(plugin->pending_Fragment_Messages);
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
@@ -2880,6 +2951,8 @@
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);
Modified: gnunet/src/transport/wlan/loopback_helper.c
===================================================================
--- gnunet/src/transport/wlan/loopback_helper.c 2011-04-12 23:32:17 UTC (rev
14971)
+++ gnunet/src/transport/wlan/loopback_helper.c 2011-04-12 23:33:44 UTC (rev
14972)
@@ -27,7 +27,7 @@
#include "loopback_helper.h"
#include "helper_common.h"
-extern int first;
+int first;
static void
sigfunc(int sig)
@@ -114,8 +114,8 @@
struct stat st;
int erg;
- FILE *fpin;
- FILE *fpout;
+ FILE *fpin = NULL;
+ FILE *fpout = NULL;
int fdpin;
int fdpout;
@@ -165,13 +165,13 @@
if (NULL == fpin)
{
fprintf(stderr, "fopen of read FIFO_FILE1\n");
- goto end2;
+ goto end;
}
fpout = fopen(FIFO_FILE2, "w");
if (NULL == fpout)
{
fprintf(stderr, "fopen of write FIFO_FILE2\n");
- goto end1;
+ goto end;
}
}
@@ -183,34 +183,35 @@
if (NULL == fpout)
{
fprintf(stderr, "fopen of write FIFO_FILE1\n");
- goto end1;
+ goto end;
}
fpin = fopen(FIFO_FILE2, "r");
if (NULL == fpin)
{
fprintf(stderr, "fopen of read FIFO_FILE2\n");
- goto end1;
+ goto end;
}
-
}
fdpin = fileno(fpin);
+ GNUNET_assert(fpin >= 0);
+
if (fdpin >= FD_SETSIZE)
{
fprintf(stderr, "File fdpin number too large (%d > %u)\n", fdpin,
(unsigned int) FD_SETSIZE);
- close(fdpin);
- return -1;
+ goto end;
}
fdpout = fileno(fpout);
+ GNUNET_assert(fdpout >= 0 );
+
if (fdpout >= FD_SETSIZE)
{
fprintf(stderr, "File fdpout number too large (%d > %u)\n", fdpout,
(unsigned int) FD_SETSIZE);
- close(fdpout);
- return -1;
+ goto end;
}
@@ -300,7 +301,7 @@
//wait
tv.tv_sec = 2;
tv.tv_usec = 0;
- retval = select(0, NULL, NULL, NULL, &tv);
+ select(0, NULL, NULL, NULL, &tv);
while (0 == closeprog)
{
@@ -346,7 +347,8 @@
if (0 > retval)
{
fprintf(stderr, "select failed: %s\n", strerror(errno));
- exit(1);
+ closeprog = 1;
+ break;
}
if (FD_ISSET(STDOUT_FILENO, &wfds))
@@ -358,7 +360,7 @@
{
closeprog = 1;
fprintf(stderr, "Write ERROR to STDOUT\n");
- exit(1);
+ break;
}
else
{
@@ -424,7 +426,7 @@
{
closeprog = 1;
fprintf(stderr, "Read ERROR to fdpin: %s\n", strerror(errno));
- closeprog = 1;
+ break;
}
else if (0 < readsize)
{
@@ -445,9 +447,12 @@
GNUNET_SERVER_mst_destroy(stdin_mst);
GNUNET_SERVER_mst_destroy(file_in_mst);
- end1: fclose(fpout);
- end2: fclose(fpin);
+ end: if (fpout != NULL)
+ fclose(fpout);
+ if (fpin != NULL)
+ fclose(fpin);
+
if (1 == first)
{
unlink(FIFO_FILE1);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14972 - in gnunet/src/transport: . wlan,
gnunet <=