Wireshark · Ethereal-dev: [Ethereal-dev] again two patches

[Lars.Roland@xxxxxxx]

Hello,

attached are two small patches.

packet-ieee80211.c can't be compiled with uint and bcmp() using MSVC.
use guint and memcmp() instead.

Please check in.

Best Regards,

Lars

Index: ethereal/packet-ieee80211.c
===================================================================
RCS file: /cvsroot/ethereal/packet-ieee80211.c,v
retrieving revision 1.90
diff -u -r1.90 packet-ieee80211.c
--- ethereal/packet-ieee80211.c	3 Jun 2003 01:20:14 -0000	1.90
+++ ethereal/packet-ieee80211.c	5 Jun 2003 21:12:52 -0000
@@ -680,7 +680,7 @@
 };
 
 static char *
-wpa_cipher_idx2str(uint idx)
+wpa_cipher_idx2str(guint idx)
 {
   if (idx < sizeof(wpa_cipher_str)/sizeof(wpa_cipher_str[0]))
     return wpa_cipher_str[idx];
@@ -695,7 +695,7 @@
 };
 
 static char *
-wpa_keymgmt_idx2str(uint idx)
+wpa_keymgmt_idx2str(guint idx)
 {
   if (idx < sizeof(wpa_keymgmt_str)/sizeof(wpa_keymgmt_str[0]))
     return wpa_keymgmt_str[idx];
@@ -723,7 +723,7 @@
       proto_tree_add_uint(tree, tag_length, tvb, offset, 1, tag_len);
       offset += 1;
 
-      if (tag_val_off + 6 <= tag_len && !bcmp(tag_val, WPA_OUI"\x01", 4)) {
+      if (tag_val_off + 6 <= tag_len && !memcmp(tag_val, WPA_OUI"\x01", 4)) {
         snprintf(out_buff, SHORT_STR, "WPA IE, type %u, version %u",
                   tag_val[tag_val_off + 3], pletohs(&tag_val[tag_val_off + 4]));
         proto_tree_add_string(tree, tag_interpretation, tvb, offset, 6, out_buff);
@@ -731,7 +731,7 @@
         tag_val_off += 6;
         if (tag_val_off + 4 <= tag_len) {
           /* multicast cipher suite */
-          if (!bcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
+          if (!memcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
             snprintf(out_buff, SHORT_STR, "Multicast cipher suite: %s", 
                       wpa_cipher_idx2str(tag_val[tag_val_off + 3]));
             proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
@@ -746,7 +746,7 @@
               tag_val_off += 2;
               i = 1;
               while (tag_val_off + 4 <= tag_len) {
-                if (!bcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
+                if (!memcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
                   snprintf(out_buff, SHORT_STR, "Unicast cipher suite %u: %s", 
                             i, wpa_cipher_idx2str(tag_val[tag_val_off + 3]));
                   proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);
@@ -766,7 +766,7 @@
                 tag_val_off += 2;
                 i = 1;
                 while (tag_val_off + 4 <= tag_len) {
-                  if (!bcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
+                  if (!memcmp(&tag_val[tag_val_off], WPA_OUI, 3)) {
                     snprintf(out_buff, SHORT_STR, "auth key management suite %u: %s", 
                               i, wpa_keymgmt_idx2str(tag_val[tag_val_off + 3]));
                     proto_tree_add_string(tree, tag_interpretation, tvb, offset, 4, out_buff);

Index: ethereal/packaging/nsis/ethereal.nsi
===================================================================
RCS file: /cvsroot/ethereal/packaging/nsis/ethereal.nsi,v
retrieving revision 1.14
diff -u -r1.14 ethereal.nsi
--- ethereal/packaging/nsis/ethereal.nsi	3 Jun 2003 02:32:55 -0000	1.14
+++ ethereal/packaging/nsis/ethereal.nsi	3 Jun 2003 20:36:08 -0000
@@ -76,7 +76,7 @@
 File "${COMMON_FILES_GNU}\gmodule-1.3.dll"
 File "${COMMON_FILES_GNU}\gnu-intl.dll"
 File "${COMMON_FILES_GNU}\zlib.dll"
-File "${COMMON_FILES_GNU}\adns_dll.dll
+File "${COMMON_FILES_GNU}\adns_dll.dll"
 File "..\..\FAQ"
 File "..\..\README"
 File "..\..\README.win32"