diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2009-03-21 18:30:25 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2009-03-21 18:30:25 +0000 |
| commit | a5779b6e02d0404232959eede5a5d3a5c699adaf (patch) | |
| tree | 9e93e51a04c09c3b9b900ef6611b8bbd1290f26f /contrib/tcpdump/print-bootp.c | |
| parent | 6b6e256ae1f5d69b5e217c61109e55a30c30f81f (diff) | |
| parent | 0ea0e7ad03dff03bb5448f640640d7904c01c8d4 (diff) | |
| download | src-a5779b6e02d0404232959eede5a5d3a5c699adaf.tar.gz src-a5779b6e02d0404232959eede5a5d3a5c699adaf.zip | |
Merge tcpdump 4.0.0 from the vendor branch.
Notes
Notes:
svn path=/head/; revision=190207
Diffstat (limited to 'contrib/tcpdump/print-bootp.c')
| -rw-r--r-- | contrib/tcpdump/print-bootp.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/contrib/tcpdump/print-bootp.c b/contrib/tcpdump/print-bootp.c index b7e2cda8c4b6..0715eb16c57f 100644 --- a/contrib/tcpdump/print-bootp.c +++ b/contrib/tcpdump/print-bootp.c @@ -24,7 +24,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.78.2.9 2007/08/21 22:02:08 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.88 2007-09-20 15:04:45 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -354,9 +354,13 @@ static struct tok dhcp_msg_values[] = { { 0, NULL } }; -#define AGENT_SUBOPTION_CIRCUIT_ID 1 +#define AGENT_SUBOPTION_CIRCUIT_ID 1 /* RFC 3046 */ +#define AGENT_SUBOPTION_REMOTE_ID 2 /* RFC 3046 */ +#define AGENT_SUBOPTION_SUBSCRIBER_ID 6 /* RFC 3993 */ static struct tok agent_suboption_values[] = { { AGENT_SUBOPTION_CIRCUIT_ID, "Circuit-ID" }, + { AGENT_SUBOPTION_REMOTE_ID, "Remote-ID" }, + { AGENT_SUBOPTION_SUBSCRIBER_ID, "Subscriber-ID" }, { 0, NULL } }; @@ -688,9 +692,11 @@ rfc1048_print(register const u_char *bp) suboptlen); switch (subopt) { - case AGENT_SUBOPTION_CIRCUIT_ID: - fn_printn(bp, suboptlen, NULL); - break; + case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */ + case AGENT_SUBOPTION_REMOTE_ID: + case AGENT_SUBOPTION_SUBSCRIBER_ID: + fn_printn(bp, suboptlen, NULL); + break; default: print_unknown_data(bp, "\n\t\t", suboptlen); |