diff options
| author | nneul <nneul@f5534014-38df-0310-8fa8-9805f1628bb7> | 1999-12-10 00:45:15 +0000 |
|---|---|---|
| committer | nneul <nneul@f5534014-38df-0310-8fa8-9805f1628bb7> | 1999-12-10 00:45:15 +0000 |
| commit | 48ffd90b45832778182b9165d12a95edae55f398 (patch) | |
| tree | f0aa38c55e59256ff6f3383e6703c94f20317aea /packet-aarp.c | |
| parent | 17e406d6dac69c79723f36f38a97da92f81e88c3 (diff) | |
added hack for aarp to deal with linux kernel byteswapping misfeature
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1271 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-aarp.c')
| -rw-r--r-- | packet-aarp.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/packet-aarp.c b/packet-aarp.c index ab669620f7..49af2ede28 100644 --- a/packet-aarp.c +++ b/packet-aarp.c @@ -1,7 +1,7 @@ /* packet-aarp.c * Routines for Appletalk ARP packet disassembly * - * $Id: packet-aarp.c,v 1.15 1999/12/08 18:12:06 nneul Exp $ + * $Id: packet-aarp.c,v 1.16 1999/12/10 00:45:15 nneul Exp $ * * Simon Wilkinson <sxw@dcs.ed.ac.uk> * @@ -56,10 +56,19 @@ static gint ett_aarp = -1; #define AARP_PROBE 0x0003 #endif +/* The following is screwed up shit to deal with the fact that + the linux kernel edits the packet inline. */ +#define AARP_REQUEST_SWAPPED 0x0100 +#define AARP_REPLY_SWAPPED 0x0200 +#define AARP_PROBE_SWAPPED 0x0300 + static const value_string op_vals[] = { {AARP_REQUEST, "request" }, {AARP_REPLY, "reply" }, {AARP_PROBE, "probe" }, + {AARP_REQUEST_SWAPPED, "request" }, + {AARP_REPLY_SWAPPED, "reply" }, + {AARP_PROBE_SWAPPED, "probe" }, {0, NULL } }; /* AARP protocol HARDWARE identifiers. */ @@ -163,12 +172,15 @@ dissect_aarp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree) { if (check_col(fd, COL_INFO)) { switch (ar_op) { case AARP_REQUEST: + case AARP_REQUEST_SWAPPED: col_add_fstr(fd, COL_INFO, "Who has %s? Tell %s", tpa_str, spa_str); break; case AARP_REPLY: + case AARP_REPLY_SWAPPED: col_add_fstr(fd, COL_INFO, "%s is at %s", spa_str, sha_str); break; case AARP_PROBE: + case AARP_PROBE_SWAPPED: col_add_fstr(fd, COL_INFO, "Is there a %s", tpa_str); break; default: |