diff options
author | Gerald Combs <gerald@wireshark.org> | 2004-06-06 14:29:07 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2004-06-06 14:29:07 +0000 |
commit | 4a0a8b7e72424ee27fbbb0aa534eff64b59bff9b (patch) | |
tree | d8dd0933717ff6071c0baa6c4cbdd3b8479af42c /packet-ieee80211.c | |
parent | d9c70dcdf6999ebea7380f8202aab4ee746517b8 (diff) | |
download | wireshark-4a0a8b7e72424ee27fbbb0aa534eff64b59bff9b.tar.gz wireshark-4a0a8b7e72424ee27fbbb0aa534eff64b59bff9b.tar.bz2 wireshark-4a0a8b7e72424ee27fbbb0aa534eff64b59bff9b.zip |
Add a "force_separators" parameter to hex_str_to_bytes so that it's
possible to paste in WEP keys without any separators.
Add doxygen comments to strutil.h.
svn path=/trunk/; revision=11123
Diffstat (limited to 'packet-ieee80211.c')
-rw-r--r-- | packet-ieee80211.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 455e9e6ce8..98ea595d63 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.108 2004/05/24 02:25:18 guy Exp $ + * $Id: packet-ieee80211.c,v 1.109 2004/06/06 14:29:06 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -3012,7 +3012,7 @@ static void init_wepkeys(void) { g_free(wep_keys[i]); } - res = hex_str_to_bytes(tmp, bytes); + res = hex_str_to_bytes(tmp, bytes, FALSE); if (res && bytes->len > 0) { if (bytes->len > 32) { bytes->len = 32; @@ -3026,6 +3026,9 @@ static void init_wepkeys(void) { printf("%d: %s\n", i, bytes_to_str(bytes->data, bytes->len)); #endif } else { +#if 0 + printf("res: %d bytes->len: %d\n", res, bytes->len); +#endif g_warning("Could not parse WEP key %d: %s", i + 1, tmp); } } |