added send_fail/send_ok/get_fail/get_ok.

fixed some bufferproblems

2 files changed, 107 insertions, 10 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
index 0d0f075..dcdc16b 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
@@ -1,88 +1,179 @@
 /*
  * Communication protocol
  *
  * $Id$
  */
 
 #include "wl_types.hh"
 #include "wl_proto.hh"
 #include "wl_log.hh"
 #include "wl_sock.hh"
 
 /* Adds a field to the buffer */
-int add_field(char *buffer, const char *string, int len)
+unsigned int add_field(char *buffer, const char *string, int len)
 {
   char newlen[5];
   
   /* 3 Byte = Length */
   memset(newlen, 0, sizeof(newlen));
   snprintf(newlen, sizeof(newlen) - 1, "%.3d", len);
   memcpy(buffer, newlen, 3);
   
   /* Length bytes = Value */
   memcpy(buffer + 3, string, atoi(newlen));
   
   /* Return length of attached field */
   return (atoi(newlen) + 3);
 }
 
-int get_field(const char *buffer, char *out, int maxlen)
+unsigned int get_field(const char *buffer, char *out, int maxlen)
 {
   char len[5];
 
   /* Get length of value */
   memset(len, 0, sizeof(len));
   memcpy(len, buffer, 3);
 
   /* Copy buffer to out pointer */
   memset(out, 0, maxlen);
   if(atoi(len) > maxlen -1)
     memcpy(out, buffer + 3, maxlen - 1);
   else
     memcpy(out, buffer + 3, atoi(len));
 
   /* Return length of whole field (including 3 byte length) */
   return (atoi(len) + 3);
 }
 
+/* Send ok message */
+int send_ok(const char *guihost, int guiport, int code)
+{
+  unsigned int len = 0;
+  char buffer[128], temp[5];
+
+  memset(buffer, 0, sizeof(buffer));
+
+  memset(temp, 0, sizeof(temp));
+  snprintf(temp, sizeof(temp) - 1, "%.2d", CMD_OK);
+  memcpy(buffer, temp, 2);
+  len += 2;
+
+  memset(temp, 0, sizeof(temp));
+  snprintf(temp, sizeof(temp) - 1, "%.2d", code);
+  len += add_field(buffer + len, temp, 2);
+
+  /* Send prepared buffer to UI */
+#ifdef DEBUG
+  wl_loginfo("Sent ok to UI: '%s'", buffer);
+#endif
+
+  return ((!wl_send(guihost, guiport, buffer)) ? 0 : 1);
+}
+
+/* Send fail message */
+int send_fail(const char *guihost, int guiport,
+	      int code, const char *errstr)
+{
+  unsigned int len = 0;
+  char buffer[128], temp[5];
+
+  memset(buffer, 0, sizeof(buffer));
+
+  memset(temp, 0, sizeof(temp));
+  snprintf(temp, sizeof(temp) - 1, "%.2d", CMD_FAIL);
+  memcpy(buffer, temp, 2);
+  len += 2;
+
+  memset(temp, 0, sizeof(temp));
+  snprintf(temp, sizeof(temp) - 1, "%.2d", code);
+  len += add_field(buffer + len, temp, 2);
+
+  len += add_field(buffer + len, errstr, strlen(errstr));
+
+  /* Send prepared buffer to UI */
+#ifdef DEBUG
+  wl_loginfo("Send CMD_FAIL to UI: '%s'", buffer);
+#endif
+
+  return ((!wl_send(guihost, guiport, buffer)) ? 0 : 1);
+}
+
+int get_ok(const char *buffer)
+{
+  char temp[5];
+  unsigned int len = 0;
+
+  /* packet type already determined, skip check */
+  len += 2;
+
+  /* what is ok for? */
+  memset(temp, 0, sizeof(temp));
+  len += get_field(buffer + len, temp, sizeof(temp));
+
+  return atoi(temp);
+}
+
+/* put failmessage into buffer */
+int get_fail(char *out, const char *buffer, size_t len)
+{
+  char temp[5];
+  int error=0;
+  unsigned int len = 0;
+
+  /* packet type already determined, skip check */
+  len += 2;
+
+  /* what is fail for? */
+  memset(temp, 0, sizeof(temp));
+  len += get_field(buffer + len, temp, sizeof(temp));
+  error=atoi(temp);
+
+  /* get errorstring and fill into buffer */
+  memset(out, 0, len);
+  len += get_field(buffer + len, out, len - 1);
+
+  return error;
+}
+
+
 /* Send found network to UI */
 int send_network_found (const char *guihost, int guiport, void *structure)
 {
   wl_network_t *ptr;
   char buffer[2048], temp[5];
   unsigned int len = 0;
 
   ptr = (wl_network_t *)structure;
 
   memset(buffer,0,sizeof(buffer));
   /* Type = Found new net (without length field) */
   memset(temp, 0, sizeof(temp));
-  snprintf(temp, sizeof(temp), "%.2d", WL_NETFOUND);
+  snprintf(temp, sizeof(temp) - 1, "%.2d", WL_NETFOUND);
   memcpy(buffer, temp, 2);
   len += 2;
 
   /* Set Net-type */
   memset(temp, 0, sizeof(temp));
-  snprintf(temp, sizeof(temp), "%d", ptr->net_type);
+  snprintf(temp, sizeof(temp) - 1, "%d", ptr->net_type);
   len += add_field(buffer + len, temp, 1);
 
   /* Set channel */
   memset(temp, 0, sizeof(temp));
-  snprintf(temp, sizeof(temp), "%.2d", ptr->channel);
+  snprintf(temp, sizeof(temp) - 1, "%.2d", ptr->channel);
   len += add_field(buffer + len, temp, 2); 
 
   /* Set WEP y/n */
   memset(temp, 0, sizeof(temp));
-  snprintf(temp, sizeof(temp), "%d", ptr->wep);
+  snprintf(temp, sizeof(temp) - 1, "%d", ptr->wep);
   len += add_field(buffer + len, temp, 1);
 
   /* Set Mac */
   len += add_field(buffer + len, ptr->mac, 17);
 
   /* Set ssid */
   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 */
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh
index 46ef8e5..63ac53b 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.hh
@@ -1,21 +1,27 @@
 /* $Id$ */
 
 #ifndef WLPROTO_HH
 #define WLPROTO_HH
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 /* Type definitions, to be continued */
-#define NETFOUND 01
-#define NETLOST  02
+#define NETFOUND  01
+#define NETLOST   02
+#define CMD_FAIL  50
+#define CMD_OK    51
 #define STARTSNIFF 98
 #define STOPSNIFF  99
 
-int add_field(char *, const char *, int);
-int get_field(const char *, char *, int);
+unsigned int add_field(char *, const char *, int);
+unsigned int get_field(const char *, char *, int);
+int send_ok(const char *, int, int);
+int get_ok(const char *);
+int send_fail(const char *, int, int, const char *);
+int get_fail(char *, const char *, size_t);
 int send_network_found (const char *, int, void *);
 int get_network_found (void *, const char *);
 
 #endif /* WLPROTO_HH */