mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
63ea6b5d47
tcpdump/print-bootp.c

1043 lines
28 KiB
C
Raw Normal View History

Initial revision
1999-10-08 07:47:09 +08:00
/*
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code distributions
* retain the above copyright notice and this paragraph in its entirety, (2)
* distributions including binary code include the above copyright notice and
* this paragraph in its entirety in the documentation or other materials
* provided with the distribution, and (3) all advertising materials mentioning
* features or use of this software display the following acknowledgement:
* ``This product includes software developed by the University of California,
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
* the University nor the names of its contributors may be used to endorse
* or promote products derived from this software without specific prior
* written permission.
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
Switch to config.h instead of passing defines in DEFS.
1999-11-21 17:36:43 +08:00
Move the printer summaries from INSTALL.txt to each printer with the tag '\summary:' for greping. Remark: Currently some printers have no summary line. Moreover: Summarize all printers with a single line in INSTALL.txt
2016-08-14 21:42:19 +08:00
/* \summary: BOOTP and IPv4 DHCP printer */
Switch to config.h instead of passing defines in DEFS.
1999-11-21 17:36:43 +08:00
#ifdef HAVE_CONFIG_H
Always include <config.h> rather than "config.h". This can prevent bizarre failures if, for example, you've done a configuration in the top-level source directory, leaving behind one config.h file, and then do an out-of-tree build in another directory, with different configuration options. This way, we always pick up the same config.h, in the build directory.
2018-01-22 04:27:08 +08:00
#include <config.h>
Initial revision
1999-10-08 07:47:09 +08:00
#endif
Use quoted include netdissect-stdinc.h instead of angle-bracketed one
2018-01-20 22:59:49 +08:00
#include "netdissect-stdinc.h"
Initial revision
1999-10-08 07:47:09 +08:00
#include <string.h>
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
#define ND_LONGJMP_FROM_TCHECK
Printers must include 'netdissect.h', not 'interface.h'
2015-09-06 05:35:58 +08:00
#include "netdissect.h"
Initial revision
1999-10-08 07:47:09 +08:00
#include "addrtoname.h"
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
#include "extract.h"
Initial revision
1999-10-08 07:47:09 +08:00
make consistent use of the "tstr" idiom For each decoder that has more than one instance of truncation signaling and prints the same string in each instance make sure that the string is declared as "static const char tstr[]" right after the initial includes block. Where necessary, replace fputs(s, stdout) with equivalent printf("%s", s).
2013-12-26 22:08:06 +08:00
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
/*
* Bootstrap Protocol (BOOTP). RFC951 and RFC1048.
*
* This file specifies the "implementation-independent" BOOTP protocol
* information which is common to both client and server.
*
* Copyright 1988 by Carnegie Mellon.
*
* Permission to use, copy, modify, and distribute this program for any
* purpose and without fee is hereby granted, provided that this copyright
* and permission notice appear on all copies and supporting documentation,
* the name of Carnegie Mellon not be used in advertising or publicity
* pertaining to distribution of the program without specific prior
* permission, and notice be given in supporting documentation that copying
* and distribution is by permission of Carnegie Mellon and Stanford
* University. Carnegie Mellon makes no representations about the
* suitability of this software for any purpose. It is provided "as is"
* without express or implied warranty.
*/
struct bootp {
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
nd_uint8_t bp_op; /* packet opcode type */
nd_uint8_t bp_htype; /* hardware addr type */
nd_uint8_t bp_hlen; /* hardware addr length */
nd_uint8_t bp_hops; /* gateway hops */
nd_uint32_t bp_xid; /* transaction ID */
nd_uint16_t bp_secs; /* seconds since boot began */
nd_uint16_t bp_flags; /* flags - see bootp_flag_values[]
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
in print-bootp.c */
Use nd_ipv4 rather than struct in_addr. This ensures that we have no purportedly-aligned-but-not-necessarily- unaligned values that we access; we have to use EXTRACT_ macros/functions to get at IPv4 address values.
2018-01-31 06:39:15 +08:00
nd_ipv4 bp_ciaddr; /* client IP address */
nd_ipv4 bp_yiaddr; /* 'your' IP address */
nd_ipv4 bp_siaddr; /* server IP address */
nd_ipv4 bp_giaddr; /* gateway IP address */
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
nd_byte bp_chaddr[16]; /* client hardware address */
nd_byte bp_sname[64]; /* server host name */
nd_byte bp_file[128]; /* boot file name */
nd_byte bp_vend[64]; /* vendor-specific area */
Get rid of ND_UNALIGNED. Structures that describe packet formats now all use nd_ types, none of which require more than 1-byte alignment, so compilers shouldn't assume that anything in those structures is aligned on any particular boundary, even without a "this is unaligned" hint.
2018-02-15 06:03:41 +08:00
};
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
#define BOOTPREPLY 2
#define BOOTPREQUEST 1
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
/*
* Vendor magic cookie (v_magic) for CMU
*/
#define VM_CMU "CMU"
/*
* Vendor magic cookie (v_magic) for RFC1048
*/
#define VM_RFC1048 { 99, 130, 83, 99 }
/*
* RFC1048 tag values used to specify what information is being supplied in
* the vendor field of the packet.
*/
#define TAG_PAD ((uint8_t) 0)
#define TAG_SUBNET_MASK ((uint8_t) 1)
#define TAG_TIME_OFFSET ((uint8_t) 2)
#define TAG_GATEWAY ((uint8_t) 3)
#define TAG_TIME_SERVER ((uint8_t) 4)
#define TAG_NAME_SERVER ((uint8_t) 5)
#define TAG_DOMAIN_SERVER ((uint8_t) 6)
#define TAG_LOG_SERVER ((uint8_t) 7)
#define TAG_COOKIE_SERVER ((uint8_t) 8)
#define TAG_LPR_SERVER ((uint8_t) 9)
#define TAG_IMPRESS_SERVER ((uint8_t) 10)
#define TAG_RLP_SERVER ((uint8_t) 11)
#define TAG_HOSTNAME ((uint8_t) 12)
#define TAG_BOOTSIZE ((uint8_t) 13)
#define TAG_END ((uint8_t) 255)
/* RFC1497 tags */
#define TAG_DUMPPATH ((uint8_t) 14)
#define TAG_DOMAINNAME ((uint8_t) 15)
#define TAG_SWAP_SERVER ((uint8_t) 16)
#define TAG_ROOTPATH ((uint8_t) 17)
#define TAG_EXTPATH ((uint8_t) 18)
/* RFC2132 */
#define TAG_IP_FORWARD ((uint8_t) 19)
#define TAG_NL_SRCRT ((uint8_t) 20)
#define TAG_PFILTERS ((uint8_t) 21)
#define TAG_REASS_SIZE ((uint8_t) 22)
#define TAG_DEF_TTL ((uint8_t) 23)
#define TAG_MTU_TIMEOUT ((uint8_t) 24)
#define TAG_MTU_TABLE ((uint8_t) 25)
#define TAG_INT_MTU ((uint8_t) 26)
#define TAG_LOCAL_SUBNETS ((uint8_t) 27)
#define TAG_BROAD_ADDR ((uint8_t) 28)
#define TAG_DO_MASK_DISC ((uint8_t) 29)
#define TAG_SUPPLY_MASK ((uint8_t) 30)
#define TAG_DO_RDISC ((uint8_t) 31)
#define TAG_RTR_SOL_ADDR ((uint8_t) 32)
#define TAG_STATIC_ROUTE ((uint8_t) 33)
#define TAG_USE_TRAILERS ((uint8_t) 34)
#define TAG_ARP_TIMEOUT ((uint8_t) 35)
#define TAG_ETH_ENCAP ((uint8_t) 36)
#define TAG_TCP_TTL ((uint8_t) 37)
#define TAG_TCP_KEEPALIVE ((uint8_t) 38)
#define TAG_KEEPALIVE_GO ((uint8_t) 39)
#define TAG_NIS_DOMAIN ((uint8_t) 40)
#define TAG_NIS_SERVERS ((uint8_t) 41)
#define TAG_NTP_SERVERS ((uint8_t) 42)
#define TAG_VENDOR_OPTS ((uint8_t) 43)
#define TAG_NETBIOS_NS ((uint8_t) 44)
#define TAG_NETBIOS_DDS ((uint8_t) 45)
#define TAG_NETBIOS_NODE ((uint8_t) 46)
#define TAG_NETBIOS_SCOPE ((uint8_t) 47)
#define TAG_XWIN_FS ((uint8_t) 48)
#define TAG_XWIN_DM ((uint8_t) 49)
#define TAG_NIS_P_DOMAIN ((uint8_t) 64)
#define TAG_NIS_P_SERVERS ((uint8_t) 65)
#define TAG_MOBILE_HOME ((uint8_t) 68)
#define TAG_SMPT_SERVER ((uint8_t) 69)
#define TAG_POP3_SERVER ((uint8_t) 70)
#define TAG_NNTP_SERVER ((uint8_t) 71)
#define TAG_WWW_SERVER ((uint8_t) 72)
#define TAG_FINGER_SERVER ((uint8_t) 73)
#define TAG_IRC_SERVER ((uint8_t) 74)
#define TAG_STREETTALK_SRVR ((uint8_t) 75)
#define TAG_STREETTALK_STDA ((uint8_t) 76)
/* DHCP options */
#define TAG_REQUESTED_IP ((uint8_t) 50)
#define TAG_IP_LEASE ((uint8_t) 51)
#define TAG_OPT_OVERLOAD ((uint8_t) 52)
#define TAG_TFTP_SERVER ((uint8_t) 66)
#define TAG_BOOTFILENAME ((uint8_t) 67)
#define TAG_DHCP_MESSAGE ((uint8_t) 53)
#define TAG_SERVER_ID ((uint8_t) 54)
#define TAG_PARM_REQUEST ((uint8_t) 55)
#define TAG_MESSAGE ((uint8_t) 56)
#define TAG_MAX_MSG_SIZE ((uint8_t) 57)
#define TAG_RENEWAL_TIME ((uint8_t) 58)
#define TAG_REBIND_TIME ((uint8_t) 59)
#define TAG_VENDOR_CLASS ((uint8_t) 60)
#define TAG_CLIENT_ID ((uint8_t) 61)
/* RFC 2241 */
#define TAG_NDS_SERVERS ((uint8_t) 85)
#define TAG_NDS_TREE_NAME ((uint8_t) 86)
#define TAG_NDS_CONTEXT ((uint8_t) 87)
/* RFC 2242 */
#define TAG_NDS_IPDOMAIN ((uint8_t) 62)
#define TAG_NDS_IPINFO ((uint8_t) 63)
/* RFC 2485 */
#define TAG_OPEN_GROUP_UAP ((uint8_t) 98)
/* RFC 2563 */
#define TAG_DISABLE_AUTOCONF ((uint8_t) 116)
/* RFC 2610 */
#define TAG_SLP_DA ((uint8_t) 78)
#define TAG_SLP_SCOPE ((uint8_t) 79)
/* RFC 2937 */
#define TAG_NS_SEARCH ((uint8_t) 117)
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
/* RFC 3004 - The User Class Option for DHCP */
#define TAG_USER_CLASS ((uint8_t) 77)
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
/* RFC 3011 */
#define TAG_IP4_SUBNET_SELECT ((uint8_t) 118)
/* RFC 3442 */
#define TAG_CLASSLESS_STATIC_RT ((uint8_t) 121)
#define TAG_CLASSLESS_STA_RT_MS ((uint8_t) 249)
DHCP: decoder for the TFTP Server Address option (RFC5859)
2014-12-01 23:56:30 +08:00
/* RFC 5859 - TFTP Server Address Option for DHCPv4 */
#define TAG_TFTP_SERVER_ADDRESS ((uint8_t) 150)
Update for messages and TLVs defined in RFC4388
2020-09-15 11:16:14 +08:00
/* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml */
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
#define TAG_SLP_NAMING_AUTH ((uint8_t) 80)
#define TAG_CLIENT_FQDN ((uint8_t) 81)
#define TAG_AGENT_CIRCUIT ((uint8_t) 82)
#define TAG_AGENT_REMOTE ((uint8_t) 83)
#define TAG_TZ_STRING ((uint8_t) 88)
#define TAG_FQDN_OPTION ((uint8_t) 89)
#define TAG_AUTH ((uint8_t) 90)
Update for messages and TLVs defined in RFC4388
2020-09-15 11:16:14 +08:00
#define TAG_CLIENT_LAST_TRANSACTION_TIME ((uint8_t) 91)
#define TAG_ASSOCIATED_IP ((uint8_t) 92)
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
#define TAG_CLIENT_ARCH ((uint8_t) 93)
#define TAG_CLIENT_NDI ((uint8_t) 94)
#define TAG_CLIENT_GUID ((uint8_t) 97)
#define TAG_LDAP_URL ((uint8_t) 95)
Updated print-bootp.c with corrected options for TZ and added option for MUDURL. Updated print-dhcpv6.c to process TZ options as well as MUDURL.
2016-12-08 21:18:24 +08:00
/* RFC 4833, TZ codes */
#define TAG_TZ_PCODE ((uint8_t) 100)
#define TAG_TZ_TCODE ((uint8_t) 101)
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
#define TAG_NETINFO_PARENT ((uint8_t) 112)
#define TAG_NETINFO_PARENT_TAG ((uint8_t) 113)
#define TAG_URL ((uint8_t) 114)
Updated print-bootp.c with corrected options for TZ and added option for MUDURL. Updated print-dhcpv6.c to process TZ options as well as MUDURL.
2016-12-08 21:18:24 +08:00
#define TAG_MUDURL ((uint8_t) 161)
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
/* DHCP Message types (values for TAG_DHCP_MESSAGE option) */
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
#define DHCPDISCOVER 1
#define DHCPOFFER 2
#define DHCPREQUEST 3
#define DHCPDECLINE 4
#define DHCPACK 5
#define DHCPNAK 6
#define DHCPRELEASE 7
#define DHCPINFORM 8
Update for messages and TLVs defined in RFC4388
2020-09-15 11:16:14 +08:00
/* Defined in RFC4388 */
#define DHCPLEASEQUERY 10
#define DHCPLEASEUNASSIGNED 11
#define DHCPLEASEUNKNOWN 12
#define DHCPLEASEACTIVE 13
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
/*
* "vendor" data permitted for CMU bootp clients.
*/
struct cmu_vend {
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
nd_byte v_magic[4]; /* magic number */
nd_uint32_t v_flags; /* flags/opcodes, etc. */
Use nd_ipv4 rather than struct in_addr. This ensures that we have no purportedly-aligned-but-not-necessarily- unaligned values that we access; we have to use EXTRACT_ macros/functions to get at IPv4 address values.
2018-01-31 06:39:15 +08:00
nd_ipv4 v_smask; /* Subnet mask */
nd_ipv4 v_dgate; /* Default gateway */
nd_ipv4 v_dns1, v_dns2; /* Domain name servers */
nd_ipv4 v_ins1, v_ins2; /* IEN-116 name servers */
nd_ipv4 v_ts1, v_ts2; /* Time servers */
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
nd_byte v_unused[24]; /* currently unused */
Get rid of ND_UNALIGNED. Structures that describe packet formats now all use nd_ types, none of which require more than 1-byte alignment, so compilers shouldn't assume that anything in those structures is aligned on any particular boundary, even without a "this is unaligned" hint.
2018-02-15 06:03:41 +08:00
};
merge bootp.h into print-bootp.c
2014-08-14 02:06:25 +08:00
/* v_flags values */
#define VF_SMASK 1 /* Subnet mask field contains valid data */
/* RFC 4702 DHCP Client FQDN Option */
#define CLIENT_FQDN_FLAGS_S 0x01
#define CLIENT_FQDN_FLAGS_O 0x02
#define CLIENT_FQDN_FLAGS_E 0x04
#define CLIENT_FQDN_FLAGS_N 0x08
/* end of original bootp.h */
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
static const struct tok fqdn_flags_bm[] = {
{ CLIENT_FQDN_FLAGS_S, "S" },
{ CLIENT_FQDN_FLAGS_O, "O" },
{ CLIENT_FQDN_FLAGS_E, "E" },
{ CLIENT_FQDN_FLAGS_N, "N" },
{ 0, NULL }
};
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
static void rfc1048_print(netdissect_options *, const u_char *);
static void cmu_print(netdissect_options *, const u_char *);
Initial revision
1999-10-08 07:47:09 +08:00
Move the definitions of "bootp_flag_values[]" and "bootp_op_values[]" out of "bootp.h" into "print-bootp.c", so we don't get unused copies of them in files other than "print-bootp.c" that include "bootp.h", and so we don't get warnings from GCC 3.3 about those unused copies.
2003-07-02 03:16:06 +08:00
static const struct tok bootp_flag_values[] = {
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ 0x8000, "Broadcast" },
{ 0, NULL}
Move the definitions of "bootp_flag_values[]" and "bootp_op_values[]" out of "bootp.h" into "print-bootp.c", so we don't get unused copies of them in files other than "print-bootp.c" that include "bootp.h", and so we don't get warnings from GCC 3.3 about those unused copies.
2003-07-02 03:16:06 +08:00
};
static const struct tok bootp_op_values[] = {
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ BOOTPREQUEST, "Request" },
{ BOOTPREPLY, "Reply" },
{ 0, NULL}
Move the definitions of "bootp_flag_values[]" and "bootp_op_values[]" out of "bootp.h" into "print-bootp.c", so we don't get unused copies of them in files other than "print-bootp.c" that include "bootp.h", and so we don't get warnings from GCC 3.3 about those unused copies.
2003-07-02 03:16:06 +08:00
};
Initial revision
1999-10-08 07:47:09 +08:00
/*
* Print bootp requests
*/
void
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
bootp_print(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *cp, u_int length)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const struct bootp *bp;
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
static const u_char vm_cmu[4] = VM_CMU;
static const u_char vm_rfc1048[4] = VM_RFC1048;
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
uint8_t bp_op, bp_htype, bp_hlen;
Initial revision
1999-10-08 07:47:09 +08:00
Add the ndo_protocol field in the netdissect_options structure Update this field in printer entry functions. It will be used for some printings.
2018-03-14 23:54:17 +08:00
ndo->ndo_protocol = "bootp";
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
bp = (const struct bootp *)cp;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
bp_op = GET_U_1(bp->bp_op);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("BOOTP/DHCP, %s",
tok2str(bootp_op_values, "unknown (0x%02x)", bp_op));
per bill fenners suggestion: lets print a little more useful information in non-verbose mode like - Request/Reply indication - hardware adress
2003-04-28 15:43:03 +08:00
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
bp_htype = GET_U_1(bp->bp_htype);
bp_hlen = GET_U_1(bp->bp_hlen);
Spell most remaining MAC_ADDR_LEN instances. [skip ci]
2020-10-04 20:22:00 +08:00
if (bp_htype == 1 && bp_hlen == MAC_ADDR_LEN && bp_op == BOOTPREQUEST) {
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT(" from %s", GET_ETHERADDR_STRING(bp->bp_chaddr));
Initial revision
1999-10-08 07:47:09 +08:00
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(", length %u", length);
per bill fenners suggestion: lets print a little more useful information in non-verbose mode like - Request/Reply indication - hardware adress
2003-04-28 15:43:03 +08:00
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (!ndo->ndo_vflag)
return;
per bill fenners suggestion: lets print a little more useful information in non-verbose mode like - Request/Reply indication - hardware adress
2003-04-28 15:43:03 +08:00
BOOTP: Use more ND_TCHECK_n() macros
2018-01-08 04:01:13 +08:00
ND_TCHECK_2(bp->bp_secs);
Initial revision
1999-10-08 07:47:09 +08:00
/* The usual hardware address type is 1 (10Mb Ethernet) */
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
if (bp_htype != 1)
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(", htype %u", bp_htype);
Initial revision
1999-10-08 07:47:09 +08:00
/* The usual length for 10Mb Ethernet address is 6 bytes */
Spell most remaining MAC_ADDR_LEN instances. [skip ci]
2020-10-04 20:22:00 +08:00
if (bp_htype != 1 || bp_hlen != MAC_ADDR_LEN)
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(", hlen %u", bp_hlen);
Initial revision
1999-10-08 07:47:09 +08:00
/* Only print interesting fields */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_U_1(bp->bp_hops))
ND_PRINT(", hops %u", GET_U_1(bp->bp_hops));
if (GET_BE_U_4(bp->bp_xid))
ND_PRINT(", xid 0x%x", GET_BE_U_4(bp->bp_xid));
if (GET_BE_U_2(bp->bp_secs))
ND_PRINT(", secs %u", GET_BE_U_2(bp->bp_secs));
per bill fenners suggestion: lets print a little more useful information in non-verbose mode like - Request/Reply indication - hardware adress
2003-04-28 15:43:03 +08:00
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(", Flags [%s]",
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
bittok2str(bootp_flag_values, "none", GET_BE_U_2(bp->bp_flags)));
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (ndo->ndo_vflag > 1)
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT(" (0x%04x)", GET_BE_U_2(bp->bp_flags));
Initial revision
1999-10-08 07:47:09 +08:00
/* Client's ip address */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_ciaddr))
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("\n\t Client-IP %s", GET_IPADDR_STRING(bp->bp_ciaddr));
Initial revision
1999-10-08 07:47:09 +08:00
/* 'your' ip address (bootp client) */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_yiaddr))
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("\n\t Your-IP %s", GET_IPADDR_STRING(bp->bp_yiaddr));
Initial revision
1999-10-08 07:47:09 +08:00
/* Server's ip address */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_siaddr))
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("\n\t Server-IP %s", GET_IPADDR_STRING(bp->bp_siaddr));
Initial revision
1999-10-08 07:47:09 +08:00
/* Gateway's ip address */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_IPV4_TO_NETWORK_ORDER(bp->bp_giaddr))
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("\n\t Gateway-IP %s", GET_IPADDR_STRING(bp->bp_giaddr));
Initial revision
1999-10-08 07:47:09 +08:00
/* Client's Ethernet address */
Spell most remaining MAC_ADDR_LEN instances. [skip ci]
2020-10-04 20:22:00 +08:00
if (bp_htype == 1 && bp_hlen == MAC_ADDR_LEN) {
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("\n\t Client-Ethernet-Address %s", GET_ETHERADDR_STRING(bp->bp_chaddr));
Initial revision
1999-10-08 07:47:09 +08:00
}
Remove many (762) now redundant ND_TCHECK_n() calls ND_TCHECK_n(e), n in { 1, 2, 3, 4, 8 }. They are redundant because they are followed by a GET_.*_n(e) call, same n, same e, which do the bounds check. Remove unused 'trunc' labels and most associated codes. Update the outputs of some tests accordingly.
2020-09-06 01:40:32 +08:00
if (GET_U_1(bp->bp_sname)) { /* get first char only */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t sname \"");
Rename the fn_printX() functions to nd_printX() The functions are: nd_print, nd_printztn, nd_printn and nd_printzp. Trying to make it clearer that they currently have to be used only on part of the packet buffer. Update some comments.
2018-04-30 18:52:10 +08:00
if (nd_printztn(ndo, bp->bp_sname, (u_int)sizeof(bp->bp_sname),
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
NULL) == 0) {
/* Within the buffer, but not NUL-terminated. */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
goto invalid;
Initial revision
1999-10-08 07:47:09 +08:00
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Initial revision
1999-10-08 07:47:09 +08:00
}
Remove many (762) now redundant ND_TCHECK_n() calls ND_TCHECK_n(e), n in { 1, 2, 3, 4, 8 }. They are redundant because they are followed by a GET_.*_n(e) call, same n, same e, which do the bounds check. Remove unused 'trunc' labels and most associated codes. Update the outputs of some tests accordingly.
2020-09-06 01:40:32 +08:00
if (GET_U_1(bp->bp_file)) { /* get first char only */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t file \"");
Rename the fn_printX() functions to nd_printX() The functions are: nd_print, nd_printztn, nd_printn and nd_printzp. Trying to make it clearer that they currently have to be used only on part of the packet buffer. Update some comments.
2018-04-30 18:52:10 +08:00
if (nd_printztn(ndo, bp->bp_file, (u_int)sizeof(bp->bp_file),
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
NULL) == 0) {
/* Ditto. */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
goto invalid;
Initial revision
1999-10-08 07:47:09 +08:00
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Initial revision
1999-10-08 07:47:09 +08:00
}
/* Decode the vendor buffer */
BOOTP: Use more ND_TCHECK_n() macros
2018-02-12 21:36:00 +08:00
ND_TCHECK_4(bp->bp_vend);
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
if (memcmp((const char *)bp->bp_vend, vm_rfc1048,
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
sizeof(uint32_t)) == 0)
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
rfc1048_print(ndo, bp->bp_vend);
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
else if (memcmp((const char *)bp->bp_vend, vm_cmu,
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
sizeof(uint32_t)) == 0)
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cmu_print(ndo, bp->bp_vend);
Initial revision
1999-10-08 07:47:09 +08:00
else {
u_intN_t is dead, long live uintN_t. And, as we require at least autoconf 2.61, and as autoconf 2.61 and later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to define the uintN_t and intN_t macros if the system doesn't define them for us. This lets us get rid of bitypes.h as well.
2014-04-23 15:20:40 +08:00
uint32_t ul;
Initial revision
1999-10-08 07:47:09 +08:00
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ul = GET_BE_U_4(bp->bp_vend);
Initial revision
1999-10-08 07:47:09 +08:00
if (ul != 0)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t Vendor-#0x%x", ul);
Initial revision
1999-10-08 07:47:09 +08:00
}
return;
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
invalid:
nd_print_invalid(ndo);
Initial revision
1999-10-08 07:47:09 +08:00
}
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
/*
* The first character specifies the format to print:
* i - ip address (32 bits)
* p - ip address pairs (32 bits + 32 bits)
* l - long (32 bits)
* L - unsigned long (32 bits)
* s - short (16 bits)
Fix some spelling in comments. [skip ci]
2018-08-01 21:06:33 +08:00
* b - period-separated decimal bytes (variable length)
* x - colon-separated hex bytes (variable length)
spell ASCII in uppercase
2017-08-10 16:52:46 +08:00
* a - ASCII string (variable length)
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
* B - on/off (8 bits)
* $ - special (explicit code to handle)
*/
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
static const struct tok tag2str[] = {
Initial revision
1999-10-08 07:47:09 +08:00
/* RFC1048 tags */
{ TAG_PAD, " PAD" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_SUBNET_MASK, "iSubnet-Mask" }, /* subnet mask (RFC950) */
{ TAG_TIME_OFFSET, "LTime-Zone" }, /* seconds from UTC */
{ TAG_GATEWAY, "iDefault-Gateway" }, /* default gateway */
{ TAG_TIME_SERVER, "iTime-Server" }, /* time servers (RFC868) */
{ TAG_NAME_SERVER, "iIEN-Name-Server" }, /* IEN name servers (IEN116) */
{ TAG_DOMAIN_SERVER, "iDomain-Name-Server" }, /* domain name (RFC1035) */
Initial revision
1999-10-08 07:47:09 +08:00
{ TAG_LOG_SERVER, "iLOG" }, /* MIT log servers */
{ TAG_COOKIE_SERVER, "iCS" }, /* cookie servers (RFC865) */
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_LPR_SERVER, "iLPR-Server" }, /* lpr server (RFC1179) */
Initial revision
1999-10-08 07:47:09 +08:00
{ TAG_IMPRESS_SERVER, "iIM" }, /* impress servers (Imagen) */
{ TAG_RLP_SERVER, "iRL" }, /* resource location (RFC887) */
spell ASCII in uppercase
2017-08-10 16:52:46 +08:00
{ TAG_HOSTNAME, "aHostname" }, /* ASCII hostname */
Initial revision
1999-10-08 07:47:09 +08:00
{ TAG_BOOTSIZE, "sBS" }, /* 512 byte blocks */
{ TAG_END, " END" },
/* RFC1497 tags */
{ TAG_DUMPPATH, "aDP" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_DOMAINNAME, "aDomain-Name" },
Initial revision
1999-10-08 07:47:09 +08:00
{ TAG_SWAP_SERVER, "iSS" },
{ TAG_ROOTPATH, "aRP" },
{ TAG_EXTPATH, "aEP" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
/* RFC2132 tags */
{ TAG_IP_FORWARD, "BIPF" },
{ TAG_NL_SRCRT, "BSRT" },
{ TAG_PFILTERS, "pPF" },
{ TAG_REASS_SIZE, "sRSZ" },
{ TAG_DEF_TTL, "bTTL" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_MTU_TIMEOUT, "lMTU-Timeout" },
{ TAG_MTU_TABLE, "sMTU-Table" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_INT_MTU, "sMTU" },
{ TAG_LOCAL_SUBNETS, "BLSN" },
{ TAG_BROAD_ADDR, "iBR" },
{ TAG_DO_MASK_DISC, "BMD" },
{ TAG_SUPPLY_MASK, "BMS" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_DO_RDISC, "BRouter-Discovery" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_RTR_SOL_ADDR, "iRSA" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_STATIC_ROUTE, "pStatic-Route" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_USE_TRAILERS, "BUT" },
{ TAG_ARP_TIMEOUT, "lAT" },
{ TAG_ETH_ENCAP, "BIE" },
{ TAG_TCP_TTL, "bTT" },
{ TAG_TCP_KEEPALIVE, "lKI" },
{ TAG_KEEPALIVE_GO, "BKG" },
{ TAG_NIS_DOMAIN, "aYD" },
{ TAG_NIS_SERVERS, "iYS" },
{ TAG_NTP_SERVERS, "iNTP" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_VENDOR_OPTS, "bVendor-Option" },
{ TAG_NETBIOS_NS, "iNetbios-Name-Server" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_NETBIOS_DDS, "iWDD" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_NETBIOS_NODE, "$Netbios-Node" },
{ TAG_NETBIOS_SCOPE, "aNetbios-Scope" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_XWIN_FS, "iXFS" },
{ TAG_XWIN_DM, "iXDM" },
{ TAG_NIS_P_DOMAIN, "sN+D" },
{ TAG_NIS_P_SERVERS, "iN+S" },
{ TAG_MOBILE_HOME, "iMH" },
{ TAG_SMPT_SERVER, "iSMTP" },
{ TAG_POP3_SERVER, "iPOP3" },
{ TAG_NNTP_SERVER, "iNNTP" },
{ TAG_WWW_SERVER, "iWWW" },
{ TAG_FINGER_SERVER, "iFG" },
{ TAG_IRC_SERVER, "iIRC" },
{ TAG_STREETTALK_SRVR, "iSTS" },
{ TAG_STREETTALK_STDA, "iSTDA" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_REQUESTED_IP, "iRequested-IP" },
{ TAG_IP_LEASE, "lLease-Time" },
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
{ TAG_OPT_OVERLOAD, "$OO" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_TFTP_SERVER, "aTFTP" },
{ TAG_BOOTFILENAME, "aBF" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_DHCP_MESSAGE, " DHCP-Message" },
{ TAG_SERVER_ID, "iServer-ID" },
{ TAG_PARM_REQUEST, "bParameter-Request" },
now prints DHCP options
1999-10-18 07:35:46 +08:00
{ TAG_MESSAGE, "aMSG" },
{ TAG_MAX_MSG_SIZE, "sMSZ" },
{ TAG_RENEWAL_TIME, "lRN" },
{ TAG_REBIND_TIME, "lRB" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_VENDOR_CLASS, "aVendor-Class" },
{ TAG_CLIENT_ID, "$Client-ID" },
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
/* RFC 2485 */
{ TAG_OPEN_GROUP_UAP, "aUAP" },
/* RFC 2563 */
{ TAG_DISABLE_AUTOCONF, "BNOAUTO" },
/* RFC 2610 */
{ TAG_SLP_DA, "bSLP-DA" }, /*"b" is a little wrong */
{ TAG_SLP_SCOPE, "bSLP-SCOPE" }, /*"b" is a little wrong */
/* RFC 2937 */
{ TAG_NS_SEARCH, "sNSSEARCH" }, /* XXX 's' */
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
/* RFC 3004 - The User Class Option for DHCP */
{ TAG_USER_CLASS, "$User-Class" },
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
/* RFC 3011 */
{ TAG_IP4_SUBNET_SELECT, "iSUBNET" },
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
/* RFC 3442 */
{ TAG_CLASSLESS_STATIC_RT, "$Classless-Static-Route" },
From Francois-Xavier Le Bail: decode DCHP option 249 (Microsoft's Classless Static Route option) the same way as option 121 (RFC 3442's Classless Static Route option).
2007-08-22 05:59:11 +08:00
{ TAG_CLASSLESS_STA_RT_MS, "$Classless-Static-Route-Microsoft" },
DHCP: decoder for the TFTP Server Address option (RFC5859)
2014-12-01 23:56:30 +08:00
/* RFC 5859 - TFTP Server Address Option for DHCPv4 */
{ TAG_TFTP_SERVER_ADDRESS, "iTFTP-Server-Address" },
Use more HTTPS in URLs [skip ci]
2019-08-05 21:11:50 +08:00
/* https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-parameters.xhtml#options */
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
{ TAG_SLP_NAMING_AUTH, "aSLP-NA" },
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
{ TAG_CLIENT_FQDN, "$FQDN" },
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
{ TAG_AGENT_CIRCUIT, "$Agent-Information" },
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
{ TAG_AGENT_REMOTE, "bARMT" },
{ TAG_TZ_STRING, "aTZSTR" },
{ TAG_FQDN_OPTION, "bFQDNS" }, /* XXX 'b' */
{ TAG_AUTH, "bAUTH" }, /* XXX 'b' */
Update for messages and TLVs defined in RFC4388
2020-09-15 11:16:14 +08:00
{ TAG_CLIENT_LAST_TRANSACTION_TIME, "LLast-Transaction-Time" },
{ TAG_ASSOCIATED_IP, "iAssociated-IP" },
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
{ TAG_CLIENT_ARCH, "sARCH" },
{ TAG_CLIENT_NDI, "bNDI" }, /* XXX 'b' */
{ TAG_CLIENT_GUID, "bGUID" }, /* XXX 'b' */
{ TAG_LDAP_URL, "aLDAP" },
Updated print-bootp.c with corrected options for TZ and added option for MUDURL. Updated print-dhcpv6.c to process TZ options as well as MUDURL.
2016-12-08 21:18:24 +08:00
{ TAG_TZ_PCODE, "aPOSIX-TZ" },
{ TAG_TZ_TCODE, "aTZ-Name" },
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
{ TAG_NETINFO_PARENT, "iNI" },
{ TAG_NETINFO_PARENT_TAG, "aNITAG" },
{ TAG_URL, "aURL" },
Updated print-bootp.c with corrected options for TZ and added option for MUDURL. Updated print-dhcpv6.c to process TZ options as well as MUDURL.
2016-12-08 21:18:24 +08:00
{ TAG_MUDURL, "aMUD-URL" },
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ 0, NULL }
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
};
Initial revision
1999-10-08 07:47:09 +08:00
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
/* DHCP "options overload" types */
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
static const struct tok oo2str[] = {
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ 1, "file" },
{ 2, "sname" },
{ 3, "file+sname" },
{ 0, NULL }
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
};
/* NETBIOS over TCP/IP node type options */
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
static const struct tok nbo2str[] = {
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ 0x1, "b-node" },
{ 0x2, "p-node" },
{ 0x4, "m-node" },
{ 0x8, "h-node" },
{ 0, NULL }
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
};
/* ARP Hardware types, for Client-ID option */
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
static const struct tok arp2str[] = {
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ 0x1, "ether" },
{ 0x6, "ieee802" },
{ 0x7, "arcnet" },
{ 0xf, "frelay" },
{ 0x17, "strip" },
{ 0x18, "ieee1394" },
{ 0, NULL }
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
};
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
static const struct tok dhcp_msg_values[] = {
Update for messages and TLVs defined in RFC4388
2020-09-15 11:16:14 +08:00
{ DHCPDISCOVER, "Discover" },
{ DHCPOFFER, "Offer" },
{ DHCPREQUEST, "Request" },
{ DHCPDECLINE, "Decline" },
{ DHCPACK, "ACK" },
{ DHCPNAK, "NACK" },
{ DHCPRELEASE, "Release" },
{ DHCPINFORM, "Inform" },
{ DHCPLEASEQUERY, "LeaseQuery" },
{ DHCPLEASEUNASSIGNED, "LeaseUnassigned" },
{ DHCPLEASEUNKNOWN, "LeaseUnknown" },
{ DHCPLEASEACTIVE, "LeaseActive" },
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ 0, NULL }
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
};
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
#define AGENT_SUBOPTION_CIRCUIT_ID 1 /* RFC 3046 */
#define AGENT_SUBOPTION_REMOTE_ID 2 /* RFC 3046 */
#define AGENT_SUBOPTION_SUBSCRIBER_ID 6 /* RFC 3993 */
justify declarations of struct tok arrays Make sure all of them are declared const and most of them -- static. Proper declaration of token arrays is a common review point for new code that is based on existing decoders. Thus fix the issue at its root.
2013-09-25 00:46:24 +08:00
static const struct tok agent_suboption_values[] = {
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{ AGENT_SUBOPTION_CIRCUIT_ID, "Circuit-ID" },
{ AGENT_SUBOPTION_REMOTE_ID, "Remote-ID" },
{ AGENT_SUBOPTION_SUBSCRIBER_ID, "Subscriber-ID" },
{ 0, NULL }
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
};
Initial revision
1999-10-08 07:47:09 +08:00
static void
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
rfc1048_print(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *bp)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
uint16_t tag;
u_int len;
const char *cp;
char c;
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
int first, idx;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
uint8_t subopt, suboptlen;
Initial revision
1999-10-08 07:47:09 +08:00
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t Vendor-rfc1048 Extensions");
Initial revision
1999-10-08 07:47:09 +08:00
/* Step over magic cookie */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("\n\t Magic Cookie 0x%08x", GET_BE_U_4(bp));
Initial revision
1999-10-08 07:47:09 +08:00
bp += sizeof(int32_t);
/* Loop while we there is a tag left in the buffer */
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
while (ND_TTEST_1(bp)) {
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
tag = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (tag == TAG_PAD && ndo->ndo_vflag < 3)
Initial revision
1999-10-08 07:47:09 +08:00
continue;
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (tag == TAG_END && ndo->ndo_vflag < 3)
Initial revision
1999-10-08 07:47:09 +08:00
return;
DHCP: Make option printing format more consistent. rfc1048_print() used to print DHCP options in a few different formats depending on the context (see GH issue #866): * at the top of an RFC 1048 block: * known options: [string] name and [decimal] tag * unknown options: tag twice * inside a Parameter Request (55) block: * known options: name * unknown options: tag Change it to use the "Name (tag)" format (as in TCP, BGP, etc) in all contexts. Update output for 8 tests.
2020-08-08 02:00:06 +08:00
cp = tok2str(tag2str, "?Unknown", tag);
Initial revision
1999-10-08 07:47:09 +08:00
c = *cp++;
From Kevin Steves: 0) use TTEST/TCHECK macros vs. snapend comparisons 1) when -vvv display PAD and END options (multiple PAD options are summarized) 2) change a trunc string from bootp to rfc1048 because I think that is what is intended (matches trunc label)
2007-01-15 05:29:22 +08:00
if (tag == TAG_PAD || tag == TAG_END)
len = 0;
else {
/* Get the length; check for truncation */
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
len = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
Initial revision
1999-10-08 07:47:09 +08:00
}
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
DHCP: Make option printing format more consistent. rfc1048_print() used to print DHCP options in a few different formats depending on the context (see GH issue #866): * at the top of an RFC 1048 block: * known options: [string] name and [decimal] tag * unknown options: tag twice * inside a Parameter Request (55) block: * known options: name * unknown options: tag Change it to use the "Name (tag)" format (as in TCP, BGP, etc) in all contexts. Update output for 8 tests.
2020-08-08 02:00:06 +08:00
ND_PRINT("\n\t %s (%u), length %u%s", cp, tag, len,
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
len > 0 ? ": " : "");
From Kevin Steves: 0) use TTEST/TCHECK macros vs. snapend comparisons 1) when -vvv display PAD and END options (multiple PAD options are summarized) 2) change a trunc string from bootp to rfc1048 because I think that is what is intended (matches trunc label)
2007-01-15 05:29:22 +08:00
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
if (tag == TAG_PAD && ndo->ndo_vflag > 2) {
From Kevin Steves: 0) use TTEST/TCHECK macros vs. snapend comparisons 1) when -vvv display PAD and END options (multiple PAD options are summarized) 2) change a trunc string from bootp to rfc1048 because I think that is what is intended (matches trunc label)
2007-01-15 05:29:22 +08:00
u_int ntag = 1;
Rename ND_TCHECK_/ND_TTEST_ macros Now all the macros have a name meaning a count in bytes. e.g.: ND_TCHECK_32BITS -> ND_TCHECK_4 ND_TTEST_32BITS -> ND_TTEST_4
2017-11-23 04:58:44 +08:00
while (ND_TTEST_1(bp) &&
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
GET_U_1(bp) == TAG_PAD) {
From Kevin Steves: 0) use TTEST/TCHECK macros vs. snapend comparisons 1) when -vvv display PAD and END options (multiple PAD options are summarized) 2) change a trunc string from bootp to rfc1048 because I think that is what is intended (matches trunc label)
2007-01-15 05:29:22 +08:00
bp++;
ntag++;
}
if (ntag > 1)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(", occurs %u", ntag);
From Kevin Steves: 0) use TTEST/TCHECK macros vs. snapend comparisons 1) when -vvv display PAD and END options (multiple PAD options are summarized) 2) change a trunc string from bootp to rfc1048 because I think that is what is intended (matches trunc label)
2007-01-15 05:29:22 +08:00
}
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
Add a nd_print_trunc() call Moreover: Replace a ND_TTEST_*() with ND_TCHECK_*().
2018-05-18 19:55:46 +08:00
ND_TCHECK_LEN(bp, len);
Initial revision
1999-10-08 07:47:09 +08:00
now prints DHCP options
1999-10-18 07:35:46 +08:00
if (tag == TAG_DHCP_MESSAGE && len == 1) {
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%s",
tok2str(dhcp_msg_values, "Unknown (%u)", GET_U_1(bp)));
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
continue;
now prints DHCP options
1999-10-18 07:35:46 +08:00
}
if (tag == TAG_PARM_REQUEST) {
From Kevin Steves: fix the printing of options in a parameter request list.
2007-01-15 05:22:05 +08:00
idx = 0;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
while (len > 0) {
DHCP: Make option printing format more consistent. rfc1048_print() used to print DHCP options in a few different formats depending on the context (see GH issue #866): * at the top of an RFC 1048 block: * known options: [string] name and [decimal] tag * unknown options: tag twice * inside a Parameter Request (55) block: * known options: name * unknown options: tag Change it to use the "Name (tag)" format (as in TCP, BGP, etc) in all contexts. Update output for 8 tests.
2020-08-08 02:00:06 +08:00
uint8_t innertag = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
len--;
DHCP: Make option printing format more consistent. rfc1048_print() used to print DHCP options in a few different formats depending on the context (see GH issue #866): * at the top of an RFC 1048 block: * known options: [string] name and [decimal] tag * unknown options: tag twice * inside a Parameter Request (55) block: * known options: name * unknown options: tag Change it to use the "Name (tag)" format (as in TCP, BGP, etc) in all contexts. Update output for 8 tests.
2020-08-08 02:00:06 +08:00
cp = tok2str(tag2str, "?Unknown", innertag);
From Kevin Steves: fix the printing of options in a parameter request list.
2007-01-15 05:22:05 +08:00
if (idx % 4 == 0)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t ");
From Kevin Steves: fix the printing of options in a parameter request list.
2007-01-15 05:22:05 +08:00
else
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(", ");
DHCP: Make option printing format more consistent. rfc1048_print() used to print DHCP options in a few different formats depending on the context (see GH issue #866): * at the top of an RFC 1048 block: * known options: [string] name and [decimal] tag * unknown options: tag twice * inside a Parameter Request (55) block: * known options: name * unknown options: tag Change it to use the "Name (tag)" format (as in TCP, BGP, etc) in all contexts. Update output for 8 tests.
2020-08-08 02:00:06 +08:00
ND_PRINT("%s (%u)", cp + 1, innertag);
From Kevin Steves: fix the printing of options in a parameter request list.
2007-01-15 05:22:05 +08:00
idx++;
Update for new RFC's and IANA assignments. Many special-format options are printed as binary strings. Any of these that are in common use can get their own printers.
2000-12-04 07:42:23 +08:00
}
continue;
}
From Kevin Steves: fix the printing of options in a parameter request list.
2007-01-15 05:22:05 +08:00
Initial revision
1999-10-08 07:47:09 +08:00
/* Print data */
if (c == '?') {
/* Base default formats for unknown tags on data size */
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
if (len & 1)
Initial revision
1999-10-08 07:47:09 +08:00
c = 'b';
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
else if (len & 2)
Initial revision
1999-10-08 07:47:09 +08:00
c = 's';
else
c = 'l';
}
first = 1;
switch (c) {
case 'a':
spell ASCII in uppercase
2017-08-10 16:52:46 +08:00
/* ASCII strings */
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Replace the (void)nd_printn(..., NULL) calls by nd_printjn() calls Moreover: Remove a now useless comment.
2021-01-08 23:21:39 +08:00
nd_printjn(ndo, bp, len);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
Initial revision
1999-10-08 07:47:09 +08:00
break;
case 'i':
case 'l':
Patch sent to Debian by Roderick Schertler <roderick@argon.org> to print the time zone offset as a signed 32-bit integer (as RFC 1533 says it is) rather than as an unsigned 32-bit integer.
2000-10-28 07:26:30 +08:00
case 'L':
Initial revision
1999-10-08 07:47:09 +08:00
/* ip addresses/32-bit words */
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
while (len >= 4) {
Initial revision
1999-10-08 07:47:09 +08:00
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
if (c == 'i')
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("%s", GET_IPADDR_STRING(bp));
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
else if (c == 'L')
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%d", GET_BE_S_4(bp));
Initial revision
1999-10-08 07:47:09 +08:00
else
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%u", GET_BE_U_4(bp));
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
bp += 4;
len -= 4;
Initial revision
1999-10-08 07:47:09 +08:00
first = 0;
}
break;
now prints DHCP options
1999-10-18 07:35:46 +08:00
case 'p':
/* IP address pairs */
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
while (len >= 2*4) {
now prints DHCP options
1999-10-18 07:35:46 +08:00
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("(%s:", GET_IPADDR_STRING(bp));
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
bp += 4;
len -= 4;
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT("%s)", GET_IPADDR_STRING(bp));
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
bp += 4;
len -= 4;
now prints DHCP options
1999-10-18 07:35:46 +08:00
first = 0;
}
break;
Initial revision
1999-10-08 07:47:09 +08:00
case 's':
/* shorts */
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
while (len >= 2) {
Initial revision
1999-10-08 07:47:09 +08:00
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%u", GET_BE_U_2(bp));
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
bp += 2;
len -= 2;
Initial revision
1999-10-08 07:47:09 +08:00
first = 0;
}
break;
now prints DHCP options
1999-10-18 07:35:46 +08:00
case 'B':
/* boolean */
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
while (len > 0) {
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
uint8_t bool_value;
now prints DHCP options
1999-10-18 07:35:46 +08:00
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
bool_value = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
switch (bool_value) {
now prints DHCP options
1999-10-18 07:35:46 +08:00
case 0:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("N");
now prints DHCP options
1999-10-18 07:35:46 +08:00
break;
case 1:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("Y");
now prints DHCP options
1999-10-18 07:35:46 +08:00
break;
default:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%u?", bool_value);
now prints DHCP options
1999-10-18 07:35:46 +08:00
break;
}
++bp;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
--len;
now prints DHCP options
1999-10-18 07:35:46 +08:00
first = 0;
}
break;
Initial revision
1999-10-08 07:47:09 +08:00
case 'b':
print client-identifier in hex, from "Gisle Vanem" <gvanem@eunet.no>
2000-07-01 11:56:43 +08:00
case 'x':
Initial revision
1999-10-08 07:47:09 +08:00
default:
/* Bytes */
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
while (len > 0) {
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
uint8_t byte_value;
Initial revision
1999-10-08 07:47:09 +08:00
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(c == 'x' ? ":" : ".");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
byte_value = GET_U_1(bp);
constify/printf audit changes from netbsd.
2001-02-21 13:59:37 +08:00
if (c == 'x')
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%02x", byte_value);
constify/printf audit changes from netbsd.
2001-02-21 13:59:37 +08:00
else
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%u", byte_value);
Initial revision
1999-10-08 07:47:09 +08:00
++bp;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
--len;
Initial revision
1999-10-08 07:47:09 +08:00
first = 0;
}
break;
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
case '$':
/* Guys we can't handle with one of the usual cases */
switch (tag) {
case TAG_NETBIOS_NODE:
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
/* this option should be at least 1 byte long */
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
if (len < 1) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: length < 1 bytes]");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
break;
}
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
tag = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
++bp;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
--len;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%s", tok2str(nbo2str, NULL, tag));
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
break;
case TAG_OPT_OVERLOAD:
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
/* this option should be at least 1 byte long */
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
if (len < 1) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: length < 1 bytes]");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
break;
}
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
tag = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
++bp;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
--len;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%s", tok2str(oo2str, NULL, tag));
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
break;
case TAG_CLIENT_FQDN:
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
/* this option should be at least 3 bytes long */
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
if (len < 3) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: length < 3 bytes]");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
From: alex medvedev <alexm@pycckue.org> catch a segfault: option 81 min size should be 4 bytes: http://sunsite.uakom.sk/doc/rfc/bootp-dhcp-option-81
2004-03-02 15:38:10 +08:00
break;
Put in some missing brackets.
2005-04-20 18:30:52 +08:00
}
DHCP: Fix the option 81 flags field printing The first nibble of the option 81 flags field must be zero. The current flags are in the second nibble. From RFC 4702: 2.1. The Flags Field The format of the 1-octet Flags field is: 0 1 2 3 4 5 6 7 +-+-+-+-+-+-+-+-+ | MBZ |N|E|O|S| +-+-+-+-+-+-+-+-+ [...] The remaining bits in the Flags field are reserved for future assignment. DHCP clients and servers that send the Client FQDN option MUST clear the MBZ bits, and they MUST ignore these bits.
2020-05-11 05:13:27 +08:00
if (GET_U_1(bp) & 0xf0) {
ND_PRINT("[ERROR: MBZ nibble 0x%x != 0] ",
(GET_U_1(bp) & 0xf0) >> 4);
}
if (GET_U_1(bp) & 0x0f)
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("[%s] ",
BOOTP: Modernize packet parsing style. Enable ND_LONGJMP_FROM_TCHECK. Report invalid packets as invalid. Have nd_printn() and nd_printztn() guard the snapshot end. Replace client_fqdn_flags() with bittok2str_nosep().
2021-01-08 11:23:26 +08:00
bittok2str_nosep(fqdn_flags_bm, "", (GET_U_1(bp))));
From Kevin Steves: in the client FQDN option: 0) fix off by one (4 vs. 3) 1) print flag bits 2) print rcode fields if either is non-zero
2007-01-30 04:55:01 +08:00
bp++;
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_U_1(bp) || GET_U_1(bp + 1))
ND_PRINT("%u/%u ", GET_U_1(bp),
GET_U_1(bp + 1));
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
bp += 2;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Replace the (void)nd_printn(..., NULL) calls by nd_printjn() calls Moreover: Remove a now useless comment.
2021-01-08 23:21:39 +08:00
nd_printjn(ndo, bp, len - 3);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len - 3;
len = 0;
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
break;
case TAG_CLIENT_ID:
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{
BOOTP/DHCP: fix "Unchecked return value" found by Coverity Add a bounds check Fix spaces
2014-12-10 02:42:31 +08:00
int type;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
/* this option should be at least 1 byte long */
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
if (len < 1) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: length < 1 bytes]");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
break;
}
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
type = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
len--;
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
if (type == 0) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Replace the (void)nd_printn(..., NULL) calls by nd_printjn() calls Moreover: Remove a now useless comment.
2021-01-08 23:21:39 +08:00
nd_printjn(ndo, bp, len);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
break;
} else {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("%s ", tok2str(arp2str, "hardware-type %u,", type));
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
while (len > 0) {
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(":");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%02x", GET_U_1(bp));
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
++bp;
--len;
first = 0;
}
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
}
break;
}
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
case TAG_AGENT_CIRCUIT:
while (len >= 2) {
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
subopt = GET_U_1(bp);
suboptlen = GET_U_1(bp + 1);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp += 2;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
len -= 2;
if (suboptlen > len) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t %s SubOption %u, length %u: length goes past end of option",
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
tok2str(agent_suboption_values, "Unknown", subopt),
subopt,
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
suboptlen);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
break;
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t %s SubOption %u, length %u: ",
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
tok2str(agent_suboption_values, "Unknown", subopt),
subopt,
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
suboptlen);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
switch (subopt) {
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
case AGENT_SUBOPTION_CIRCUIT_ID: /* fall through */
case AGENT_SUBOPTION_REMOTE_ID:
case AGENT_SUBOPTION_SUBSCRIBER_ID:
Replace the (void)nd_printn(..., NULL) calls by nd_printjn() calls Moreover: Remove a now useless comment.
2021-01-08 23:21:39 +08:00
nd_printjn(ndo, bp, suboptlen);
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
break;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
default:
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
print_unknown_data(ndo, bp, "\n\t\t", suboptlen);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
}
len -= suboptlen;
bp += suboptlen;
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
}
break;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
case TAG_CLASSLESS_STATIC_RT:
From Francois-Xavier Le Bail: decode DCHP option 249 (Microsoft's Classless Static Route option) the same way as option 121 (RFC 3442's Classless Static Route option).
2007-08-22 05:59:11 +08:00
case TAG_CLASSLESS_STA_RT_MS:
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
u_int mask_width, significant_octets, i;
/* this option should be at least 5 bytes long */
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
if (len < 5) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: length < 5 bytes]");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
break;
}
while (len > 0) {
if (!first)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(",");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
mask_width = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
len--;
/* mask_width <= 32 */
if (mask_width > 32) {
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT("[ERROR: Mask width (%u) > 32]", mask_width);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
break;
}
significant_octets = (mask_width + 7) / 8;
/* significant octets + router(4) */
if (len < significant_octets + 4) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("[ERROR: Remaining length (%u) < %u bytes]", len, significant_octets + 4);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
break;
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("(");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
if (mask_width == 0)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("default");
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
else {
for (i = 0; i < significant_octets ; i++) {
if (i > 0)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(".");
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
ND_PRINT("%u",
GET_U_1(bp));
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
}
for (i = significant_octets ; i < 4 ; i++)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(".0");
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT("/%u", mask_width);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
}
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT(":%s)", GET_IPADDR_STRING(bp));
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
bp += 4;
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
len -= (significant_octets + 4);
first = 0;
}
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
break;
}
clean up the bootp printer: -print option/tag numbers and len -change the tokenstring such that the most common options are human-readable -add support for option 82 (Agent-ID) suboptions -make more use ok tok2str() rather thane private lookalives
2006-02-14 02:59:29 +08:00
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
case TAG_USER_CLASS:
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
{
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
u_int suboptnumber = 1;
first = 1;
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
if (len < 2) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: length < 2 bytes]");
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
bp += len;
len = 0;
break;
}
while (len > 0) {
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
suboptlen = GET_U_1(bp);
More EXTRACT_8BITS() changes. Use ND_CHECK_nBITS() more as well.
2017-11-20 09:59:51 +08:00
bp++;
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
len--;
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t ");
ND_PRINT("instance#%u: ", suboptnumber);
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
if (suboptlen == 0) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: suboption length must be non-zero]");
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
bp += len;
len = 0;
break;
}
if (len < suboptlen) {
DHCP: Harmonize error messages printing
2020-05-13 16:19:43 +08:00
ND_PRINT("[ERROR: invalid option]");
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
bp += len;
len = 0;
break;
}
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Replace the (void)nd_printn(..., NULL) calls by nd_printjn() calls Moreover: Remove a now useless comment.
2021-01-08 23:21:39 +08:00
nd_printjn(ndo, bp, suboptlen);
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\"");
Clean up signed vs. unsigned.
2018-01-12 03:52:30 +08:00
ND_PRINT(", length %u", suboptlen);
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
suboptnumber++;
len -= suboptlen;
bp += suboptlen;
}
BOOTP/DHCP: fix some spaces/tabs and indentation
2014-12-01 21:17:39 +08:00
break;
}
DHCP: decoder for the User Class option (RFC3004)
2014-11-28 18:10:24 +08:00
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
default:
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("[unknown special tag %u, size %u]",
tag, len);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
len = 0;
Add "$" format, meaning to escape to a special printer (from LBL) Add "$" printers for NetBIOS Node Type (WNT), DHCP Option Overload (OO), Client Identifier (CID), Client FQDN (FQDN) Change Vendor Class (VC) from decimal string to ASCII string
2001-07-05 05:18:12 +08:00
break;
}
break;
Initial revision
1999-10-08 07:47:09 +08:00
}
/* Data left over? */
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
if (len) {
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT("\n\t trailing data length %u", len);
From Francois-Xavier Le Bail: suport for the DHCP Classless Static Route option (RFC 3442). Just modify the "len" variable as we parse an option - no need for a separate variable representing the amount of data left (I suspect that's why the wrong variable appears to have been used in the "trailing data length" message; I'd expect that message to indicate how much *extra* data there was in the option, not how much *total* data there was in the option). Add checks for too-short options in some cases where they were missing. In the check for the Client FQDN option, skip past what data there is in the option if it's too short, so it doesn't show up as extra data in the option. For the Agent Circuit option, for each suboption: check to make sure the suboption length doesn't go past what's left in the option; don't reject options with an option type or length of 0 (neither are forbidden by RFC 3046, and, in fact, RFC 3046 says "a sub-option length may be zero"); use fn_printn() to print the Agent Circuit ID suboption, rather than doing the equivalent ourselves with a safeputchar() loop.
2007-07-25 01:28:56 +08:00
bp += len;
Print the length in the truncation message if we know it. Fix the CID parser for type=0 (ASCII text) client IDs. Make the overall parser a little more robust to buggy parsers like the CID one by incrementing bp when there are bytes left over.
2003-03-13 03:25:40 +08:00
}
Initial revision
1999-10-08 07:47:09 +08:00
}
}
Remove some unneeded '&' when getting a pointer to a nd_ type Moreover: Remove some unneeded casts.
2019-04-22 02:21:06 +08:00
#define PRINTCMUADDR(m, s) { ND_TCHECK_4(cmu->m); \
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
if (GET_IPV4_TO_NETWORK_ORDER(cmu->m) != 0) \
More bounds checking when fetching addresses and converting to strings. Replace more calls to ipaddr_string()/ip6addr_string() with calls to GET_IPADDR_STRING()/GET_IP6ADDR_STRING() macros performing bounds checking. Add similar bounds-checking inline functions and macros to wrap linkaddr_string(), etheraddr_string(), and isonsap_string() and convert calls to them to use the macros as well. Shuffle the inline functions in addrtoname.h around a bit, so that the inline functions, external declarations, and macros are all in the same order.
2020-01-20 11:55:38 +08:00
ND_PRINT(" %s:%s", s, GET_IPADDR_STRING(cmu->m)); }
BOOTP: Move macro define/undef outsite functions This avoid some Coccinelle warnings: CPP-DEFINE: inside function, I treat it as comment CPP-UNDEF: inside function, I treat it as comment This also makes the code a bit clearer.
2018-01-05 00:09:41 +08:00
Initial revision
1999-10-08 07:47:09 +08:00
static void
NDOize BOOTP, DHCPv6, DNS, PIM and sFlow decoders Also add/remove tabs in a few involved functions to justify indentation.
2014-03-25 19:05:59 +08:00
cmu_print(netdissect_options *ndo,
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const u_char *bp)
Initial revision
1999-10-08 07:47:09 +08:00
{
Remove all storage class specifier 'register' Let the compiler do the optimizations (or not) based on build options. Avoid 'value has been optimized out' messages in gdb using '-O0'.
2017-12-14 02:17:47 +08:00
const struct cmu_vend *cmu;
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
uint8_t v_flags;
Initial revision
1999-10-08 07:47:09 +08:00
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" vend-cmu");
Eliminate some unused parameters. Use const more. Use EXTRACT_* macros more. Use TCHECK* more. Use tok2str() to replace some home-grown workalikes. smb: - Get rid of private types, use tcpdump-defined types - Rename fdata and fdata1 to smb_fdata and smb_fdata1 to avoid conflict with IRIX library function.
2001-09-18 05:57:50 +08:00
cmu = (const struct cmu_vend *)bp;
Initial revision
1999-10-08 07:47:09 +08:00
/* Only print if there are unknown bits */
BOOTP: Use more ND_TCHECK_n() macros
2018-01-08 04:01:13 +08:00
ND_TCHECK_4(cmu->v_flags);
Use the new GET_ macros instead of the EXTRACT_ ones The exceptions are currently: Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer. An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer pointer.
2018-06-16 23:23:21 +08:00
v_flags = GET_U_1(cmu->v_flags);
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
if ((v_flags & ~(VF_SMASK)) != 0)
Update ND_PRINT() as a variadic macro
2018-01-07 18:47:30 +08:00
ND_PRINT(" F:0x%x", v_flags);
Initial revision
1999-10-08 07:47:09 +08:00
PRINTCMUADDR(v_dgate, "DG");
Use nd_ types, add EXTRACT_, fix a bounds check.
2017-12-30 11:26:24 +08:00
PRINTCMUADDR(v_smask, v_flags & VF_SMASK ? "SM" : "SM*");
Initial revision
1999-10-08 07:47:09 +08:00
PRINTCMUADDR(v_dns1, "NS1");
PRINTCMUADDR(v_dns2, "NS2");
PRINTCMUADDR(v_ins1, "IEN1");
PRINTCMUADDR(v_ins2, "IEN2");
PRINTCMUADDR(v_ts1, "TS1");
PRINTCMUADDR(v_ts2, "TS2");
}
From Kevin Steves: in the client FQDN option: 0) fix off by one (4 vs. 3) 1) print flag bits 2) print rcode fields if either is non-zero
2007-01-30 04:55:01 +08:00
BOOTP: Move macro define/undef outsite functions This avoid some Coccinelle warnings: CPP-DEFINE: inside function, I treat it as comment CPP-UNDEF: inside function, I treat it as comment This also makes the code a bit clearer.
2018-01-05 00:09:41 +08:00
#undef PRINTCMUADDR
Reference in New Issue Copy Permalink