macaddress-fix

1 files changed, 19 insertions, 4 deletions

diff --git a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
index 81eccab..3c227ab 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
+++ b/noncore/net/wellenreiter/libwellenreiter/source/sniff.cc
@@ -146,73 +146,88 @@ void process_packets(const struct pcap_pkthdr *pkthdr, const unsigned char *pack
 
   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);
   
   /* Get the sender, bssid and dest mac address */
   etheraddr_string(mgthdr->bssid,ppinfo->bssid);
   etheraddr_string(mgthdr->da,ppinfo->desthwaddr);
   etheraddr_string(mgthdr->sa,ppinfo->sndhwaddr);
   ppinfo->fc_wep = FC_WEP(mgthdr->fc);
   return 0;
 }
 
 
 void etheraddr_string(register const u_char *ep, char *text)
 {
   static char hex[] = "0123456789abcdef";
   register unsigned int i, j;
   register char *cp;
-  char buf[sizeof("00:00:00:00:00:00")];
+  char buf[sizeof("00:00:00:00:00:00\0")];
   cp = buf;
   if ((j = *ep >> 4) != 0)
-    *cp++ = hex[j];
+  {
+  	*cp++ = hex[j];
+  }
+  else
+  {
+  	*cp++ = '0';
+  }
   *cp++ = hex[*ep++ & 0xf];
-  for (i = 5; (int)--i >= 0;) {
+  
+  for (i = 5; (int)--i >= 0;) 
+  {
     *cp++ = ':';
     if ((j = *ep >> 4) != 0)
-      *cp++ = hex[j];
+    {
+    	*cp++ = hex[j];
+    }
+    else
+    {
+    	*cp++ = '0';
+    }
+  
     *cp++ = hex[*ep++ & 0xf];
   }
   *cp = '\0';
   strcpy(text,buf);
 }
 
 /* beacon handler */
 int handle_beacon(u_int16_t fc, const u_char *p,struct packetinfo *ppinfo)
 {
   struct mgmt_body_t pbody;
   int offset = 0;
   
   /* Get the static informations out of the packet */
   memset(&pbody, 0, sizeof(pbody));
   memcpy(&pbody.timestamp, p, 8);
   offset += 8;
   pbody.beacon_interval = EXTRACT_LE_16BITS(p+offset);
   offset += 2;
   pbody.capability_info = EXTRACT_LE_16BITS(p+offset);
   offset += 2;
   
   /* Gets the different flags out of the capabilities */
   ppinfo->cap_ESS = CAPABILITY_ESS(pbody.capability_info);
   ppinfo->cap_IBSS = CAPABILITY_IBSS(pbody.capability_info);
   ppinfo->cap_WEP = CAPABILITY_PRIVACY(pbody.capability_info);
   
   /* Gets the tagged elements out of the packets */
   while (offset + 1 < ppinfo->pktlen)
   {
       switch (*(p + offset)) 
       {
 	case E_SSID: