cleanup

4 files changed, 19 insertions, 19 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
index c29f4d0..7362f14 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.cc
@@ -1,77 +1,74 @@
 /* 
  * Set card modes for sniffing
  *
  * $Id$
  */
 
 #include "cardmode.hh"
 #include "wl_log.hh"
 
 /* main card into monitor function */
 int card_into_monitormode (pcap_t **orighandle, char *device, int cardtype)
 {
   char CiscoRFMON[35] = "/proc/driver/aironet/";
   FILE *CISCO_CONFIG_FILE;
 
   /* Checks if we have a device to sniff on */
   if(device == NULL)
   {
       wl_logerr("No device given");
       return 0;
   }
   
-  /* Setting the prmiscous and up flag to the interface */
+  /* Setting the promiscous and up flag to the interface */
   if (!card_set_promisc_up(device))
   {
     wl_logerr("Cannot set interface to promisc mode: %s", strerror(errno));
     return 0;
   } 
   wl_loginfo("Interface set to promisc mode");
   
   /* Check the cardtype and executes the commands to go into monitor mode */
   if (cardtype == CARD_TYPE_CISCO)
   {
       /* bring the sniffer into rfmon  mode */
       snprintf(CiscoRFMON, sizeof(CiscoRFMON) - 1, DEFAULT_PATH, device);
       if((CISCO_CONFIG_FILE = fopen(CiscoRFMON,"w")) == NULL)
       {
           wl_logerr("Cannot open config file: %s", strerror(errno));
           return 0;
       }
       fputs ("Mode: r",CISCO_CONFIG_FILE);
       fputs ("Mode: y",CISCO_CONFIG_FILE);
       fputs ("XmitPower: 1",CISCO_CONFIG_FILE);
       fclose(CISCO_CONFIG_FILE);
   }
   else if (cardtype == CARD_TYPE_NG)
   {
       char wlanngcmd[62];
       snprintf(wlanngcmd, sizeof(wlanngcmd) - 1, "%s %s lnxreq_wlansniff channel=1 enable=true", WLANCTL_PATH, device);
       if (system(wlanngcmd) != 0)
       {
           wl_logerr("Could not set %s in raw mode, check cardtype", device);
           return 0;
       }
   }
   else if (cardtype == CARD_TYPE_HOSTAP)
   {
       wl_logerr("Got a host-ap card, nothing is implemented now");
   }
    
   return 1;
 }
 
 /* Set card into promisc mode */
 int card_set_promisc_up (const char *device)
 {
-  char ifconfigcmd[32];
+  char ifconfigcmd[48];
   int retval=0;
 
   snprintf(ifconfigcmd, sizeof(ifconfigcmd) - 1, SBIN_PATH, device);
   retval = system(ifconfigcmd);
 
-  if(retval != 0)
-    return 0;
-  
-return 1;
+  return (retval ? 0 : 1);
 }
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
index e2169ca..9b4e360 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
@@ -95,65 +95,69 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack
               }
 
               /* Here should be the infos to the gui issued */
               if (pinfoptr->cap_ESS == 1 &&pinfoptr->cap_IBSS ==0)
                 {
                   wl_loginfo("Found an access point");
                   wl_net.net_type=1;
                 }
               else if(pinfoptr->cap_ESS == 0 && pinfoptr->cap_IBSS == 2) 
                 {
                   wl_loginfo("Found an ad-hoc network");
                   wl_net.net_type=2;
                 }
 
               if (strcmp (pinfoptr->ssid,NONBROADCASTING) ==0)
                   wl_loginfo("Net is a non-broadcasting network");
               else
                   wl_loginfo("SSID is: %s", pinfoptr->ssid);
 
               wl_loginfo("SSID is: %s", pinfoptr->ssid);
               memcpy(wl_net.bssid, pinfoptr->ssid, sizeof(wl_net.bssid)-1);
 
               wl_loginfo("SSID length is: %d", pinfoptr->ssid_len);
               wl_net.ssid_len=pinfoptr->ssid_len;
             
               wl_loginfo("Channel is: %d", pinfoptr->channel);
               wl_net.channel=pinfoptr->channel;
               wl_net.wep=pinfoptr->cap_WEP;
 
               wl_loginfo("Mac is: %s", pinfoptr->sndhwaddr);
               memcpy(wl_net.mac, pinfoptr->sndhwaddr, sizeof(wl_net.mac)-1);;
               
-              send_network_found((char *)guihost, guiport, &wl_net);
+              if(!send_network_found((char *)guihost, guiport, &wl_net))
+              {
+                wl_logerr("Error sending data to UI: %s", strerror(errno));
+                break;
+              }
               wl_loginfo("Sent network to GUI '%s:%d'", guihost, guiport);
             }
                   break;
 
         default:
           wl_logerr("Unknown IEEE802.11 frame subtype (%d)", FC_SUBTYPE(fc));
                   break;
         } /* End of switch over different mgt frame types */
       
       break;
   
   case T_CTRL:
     wl_loginfo("Received control frame, not implemented yet");
     break;
 
   case T_DATA:
     wl_loginfo("Received date frame, not implemented yet");
     break;
 
   default:
     wl_logerr("Unknown IEEE802.11 frame type (%d)", FC_TYPE(fc));
     break;
     }
 }
 
 /* This decodes the 802.11b frame header out of the 802.11b packet 
            all the infos is placed into the packetinfo structure                 */
 int decode_80211b_hdr(const u_char *p,struct packetinfo *ppinfo)
 {
   const struct mgmt_header_t *mgthdr = (const struct mgmt_header_t *) p;
   ppinfo->fcsubtype = FC_SUBTYPE(mgthdr->fc);
   
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
index f15523f..5317f52 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_proto.cc
@@ -6,118 +6,117 @@
 
 #include "wl_proto.hh"
 #include "wl_log.hh"
 #include "wl_sock.hh"
 
 /* Adds a field to the buffer */
 int add_field(char *buffer, char *string, int len)
 {
   char newlen[5];
   
   /* 3 Byte = Length */
   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)
 {
   char len[5];
 
   /* Get length of value */
   memcpy(len, buffer, 3);
 
   /* Copy buffer to out pointer */
   memset(out, 0, atoi(len) + 1);
   memcpy(out, buffer + 3, atoi(len));
 
-  return atoi(len) + 3;
+  /* Return length of whole field (including 3 byte length) */
+  return (atoi(len) + 3);
 }
 
-/* Send found network to GUI */
+/* 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));
 
   ptr = (wl_network_t *)structure;
 
   /* Type = Found new net (without length field) */
   memset(temp, 0, sizeof(temp));
   snprintf(temp, sizeof(temp), "%.2d", NETFOUND);
   memcpy(buffer, temp, 2);
   len += 2;
 
   /* 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;
 
   /* Set channel */
   memset(temp, 0, sizeof(temp));
   snprintf(temp, sizeof(temp), "%.2d", ptr->channel);
   retval = add_field(buffer + len, temp, 2); 
   len += retval;
 
   /* 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;
 
   /* Set Mac */
-  retval = add_field(buffer + len, (char *)ptr->mac, 17);
+  retval = add_field(buffer + len, ptr->mac, 17);
   len += retval;
 
   /* Set ssid */
-  retval = add_field(buffer + len, (char *)ptr->bssid, ptr->ssid_len);
+  retval = add_field(buffer + len, ptr->bssid, ptr->ssid_len);
 
-  /* Send prepared buffer to GUI */
+  /* Send prepared buffer to UI */
 #ifdef DEBUG
-  wl_loginfo("Sending network to GUI: '%s'", buffer);
+  wl_loginfo("Sending network to UI: '%s'", buffer);
 #endif
 
-  wl_send(guihost, guiport, buffer);
-
-  return 1;
+  return ((!wl_send(guihost, guiport, buffer)) ? 0 : 1);
 }
 
 /* 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;
 
   ptr = (wl_network_t *)structure;
   
   /* packet type already determined */
   len += 2;
 
   /* Get net type */
   memset(temp, 0, sizeof(temp));
   retval = get_field(buffer + len, temp);
   len += retval;
   ptr->net_type = atoi(temp); 
    
   /* Get channel */
   memset(temp, 0, sizeof(temp));
   retval = get_field(buffer + len, temp);
   len += retval;
   ptr->channel = atoi(temp);
 
   /* Set WEP y/n */
   memset(temp, 0, sizeof(temp));
   retval = get_field(buffer + len, temp);
   len += retval;
   ptr->wep = atoi(temp);
 
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc
index 5714afb..4942fba 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/wl_sock.cc
@@ -27,65 +27,65 @@ int wl_setupsock(const char *host, int port)
   if(bind(sock,(struct sockaddr *)&saddr, sizeof(saddr)) < 0)
   {
     wl_logerr("Cannot bind socket: %s", strerror(errno));
     close(sock);
     return -1;
   }
 
   return sock;
 }
 
 /* Send a string to commsock */
 int wl_send(const char *host, int port, const char *string, ...) 
 {
   int sock;
   char buffer[4096];
   struct sockaddr_in saddr;
   va_list ap;
 
   /* Generate string */
   memset(buffer, 0, sizeof(buffer));
   va_start(ap, string);
   vsnprintf(buffer, sizeof(buffer)-1, string, ap);
   va_end(ap);
 
   saddr.sin_family = AF_INET;
   saddr.sin_port = htons(port);
   saddr.sin_addr.s_addr = inet_addr(host);
 
   /* Setup socket */
   if((sock=socket(AF_INET, SOCK_DGRAM, 0)) < 0)
   {
     wl_logerr("Cannot set up socket: %s", strerror(errno));
-    return -1;
+    return 0;
   }
 
   if(sendto(sock, buffer, sizeof(buffer), 0, (struct sockaddr *)&saddr, sizeof(saddr)) < 0)
   {
     wl_logerr("Cannot write to socket: %s", strerror(errno));
     close(sock);
-    return -1;
+    return 0;
   }
 
   if(close(sock) < 0)
     wl_logerr("Cannot close socket: %s", strerror(errno));
 
-  return 0;
+  return 1;
 }
 
 /* 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);
   char retval[3];
 
   memset(out, 0, maxlen);
   if(recvfrom(*sock, out, maxlen - 1, 0, (struct sockaddr *)cliaddr, &len) < 0)
     return -1;
 
   /* Get packet type and return it */
   memset(retval, 0, sizeof(retval));
   memcpy(retval, out, 2);
 
   return atoi(retval);
 }