3 files changed, 23 insertions, 31 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
index 5317f52..ae6d406 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
@@ -42,13 +42,10 @@ int get_field(const char *buffer, char *out)
 /* Send found network to UI */
 int send_network_found (const char *guihost, int guiport, void *structure)
 {
   wl_network_t *ptr;
-  char buffer[2048];
-  char temp[128];
-  int retval=0, len=0;
-
-  memset(temp, 0, sizeof(temp));
+  char buffer[2048], temp[5];
+  int len = 0;
 
   ptr = (wl_network_t *)structure;
 
   /* Type = Found new net (without length field) */
@@ -59,29 +56,28 @@ int send_network_found (const char *guihost, int guiport, void *structure)
 
   /* Set Net-type */
   memset(temp, 0, sizeof(temp));
   snprintf(temp, sizeof(temp), "%d", ptr->net_type);
-  retval = add_field(buffer + len, temp, 1);
-  len += retval;
+  len += add_field(buffer + len, temp, 1);
 
   /* Set channel */
   memset(temp, 0, sizeof(temp));
   snprintf(temp, sizeof(temp), "%.2d", ptr->channel);
-  retval = add_field(buffer + len, temp, 2); 
-  len += retval;
+  len += add_field(buffer + len, temp, 2); 
 
   /* Set WEP y/n */
   memset(temp, 0, sizeof(temp));
   snprintf(temp, sizeof(temp), "%d", ptr->wep);
-  retval = add_field(buffer + len, temp, 1);
-  len += retval;
+  len += add_field(buffer + len, temp, 1);
 
   /* Set Mac */
-  retval = add_field(buffer + len, ptr->mac, 17);
-  len += retval;
+  len += add_field(buffer + len, ptr->mac, 17);
 
   /* Set ssid */
-  retval = add_field(buffer + len, ptr->bssid, ptr->ssid_len);
+  if(len + ptr->ssid_len < sizeof(buffer) - 1)
+    len += add_field(buffer + len, ptr->bssid, ptr->ssid_len);
+  else
+    len += add_field(buffer + len, ptr->bssid, sizeof(buffer) - len - 1);
 
   /* Send prepared buffer to UI */
 #ifdef DEBUG
   wl_loginfo("Sending network to UI: '%s'", buffer);
@@ -93,39 +89,35 @@ int send_network_found (const char *guihost, int guiport, void *structure)
 /* Fill buffer into structur */
 int get_network_found (void *structure, const char *buffer)
 {
   wl_network_t *ptr;
-  char temp[512];
-  int retval=0, len=0;
+  char temp[5];
+  int len = 0;
 
   ptr = (wl_network_t *)structure;
   
-  /* packet type already determined */
+  /* packet type already determined, skip check */
   len += 2;
 
-  /* Get net type */
+  /* Get net type (accesspoint || ad-hoc || ...) */
   memset(temp, 0, sizeof(temp));
-  retval = get_field(buffer + len, temp);
-  len += retval;
+  len += get_field(buffer + len, temp);
   ptr->net_type = atoi(temp); 
    
   /* Get channel */
   memset(temp, 0, sizeof(temp));
-  retval = get_field(buffer + len, temp);
-  len += retval;
+  len += get_field(buffer + len, temp);
   ptr->channel = atoi(temp);
 
   /* Set WEP y/n */
   memset(temp, 0, sizeof(temp));
-  retval = get_field(buffer + len, temp);
-  len += retval;
+  len += get_field(buffer + len, temp);
   ptr->wep = atoi(temp);
 
   /* Set MAC address */
-  retval = get_field(buffer + len, ptr->mac);
-  len += retval;
+  len += get_field(buffer + len, ptr->mac);
 
   /* Set BSSID */
-  retval = get_field(buffer + len, ptr->bssid);
+  len += get_field(buffer + len, ptr->bssid);
 
   return 1;
 }
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh
index f755589..a196091 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh
@@ -21,8 +21,8 @@ typedef struct {
   int ssid_len;    /* Length of SSID                 */
   int channel;     /* Channel                        */
   int wep;         /* 1 = WEP enabled ; 0 = disabled */
   char mac[64];    /* MAC address of Accesspoint     */
-  char bssid[128]; /* BSSID of Accesspoint           */
+  char bssid[128]; /* BSSID of Net                   */
 } wl_network_t;
 
 #endif /* WLPROTO_HH */
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc
index 4942fba..db6b7b8 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc
@@ -12,9 +12,9 @@ int wl_setupsock(const char *host, int port)
 {
   struct sockaddr_in saddr;
   int sock;
 
-  if((sock=socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+  if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
   {
     wl_logerr("Cannot set up socket: %s", strerror(errno));
     return -1;
   }
@@ -52,9 +52,9 @@ int wl_send(const char *host, int port, const char *string, ...)
   saddr.sin_port = htons(port);
   saddr.sin_addr.s_addr = inet_addr(host);
 
   /* Setup socket */
-  if((sock=socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+  if((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
   {
     wl_logerr("Cannot set up socket: %s", strerror(errno));
     return 0;
   }
@@ -75,9 +75,9 @@ int wl_send(const char *host, int port, const char *string, ...)
 /* Check for new messages on commsock */
 int wl_recv(int *sock, char *out, int maxlen)
 {
   struct sockaddr_in *cliaddr;
-  socklen_t len=sizeof(struct sockaddr);
+  socklen_t len = sizeof(struct sockaddr);
   char retval[3];
 
   memset(out, 0, maxlen);
   if(recvfrom(*sock, out, maxlen - 1, 0, (struct sockaddr *)cliaddr, &len) < 0)