diff options
author | Evan Huus <eapache@gmail.com> | 2014-08-09 09:33:23 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-08-09 17:30:44 +0000 |
commit | a4a94af0f7c223c95eb1601054b62ecd0e16c61a (patch) | |
tree | 75278c1e4445aab03ff9ca46892f95fbeeff7679 /epan/addr_resolv.c | |
parent | ddeac70a5a21e890a815d70930ea2decf95a1b8c (diff) | |
download | wireshark-a4a94af0f7c223c95eb1601054b62ecd0e16c61a.tar.gz wireshark-a4a94af0f7c223c95eb1601054b62ecd0e16c61a.tar.bz2 wireshark-a4a94af0f7c223c95eb1601054b62ecd0e16c61a.zip |
Fix regression introduced by gf3b631668b
I made a stupid when simplifying the bit-twiddling, and accidentally reversed
two of the bytes which completely broke MAC address name resolution.
Bug: 10344
Change-Id: I0720755fb290423150e4d84da9d45cb0b76341e4
Reviewed-on: https://code.wireshark.org/review/3522
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/addr_resolv.c')
-rw-r--r-- | epan/addr_resolv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 7e1420976c..79d3d2ed96 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1283,7 +1283,7 @@ add_manuf_name(const guint8 *addr, unsigned int mask, gchar *name) /* manuf needs only the 3 most significant octets of the ethernet address */ manuf_key = (int *)g_new(int, 1); - *manuf_key = (int)((addr[2] << 16) + (addr[1] << 8) + addr[0]); + *manuf_key = (int)((addr[0] << 16) + (addr[1] << 8) + addr[2]); g_hash_table_insert(manuf_hashtable, manuf_key, g_strdup(name)); return; |