mirror of
https://github.com/the-tcpdump-group/tcpdump.git
synced 2024-12-04 23:44:50 +08:00
c177cb3800
Always print the SNPA, and flag it as such; only print it as a MAC address if it's 6 bytes long. Identify the NET as such. This fixes a buffer over-read discovered by Bhargava Shastry, SecT/TU Berlin. Add tests using the capture files supplied by the reporter(s), modified so the capture files won't be rejected as an invalid capture.
63 lines
2.8 KiB
C
63 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 1990, 1992, 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.
|
|
*/
|
|
|
|
/*
|
|
* Definitions to let us compile most of the IPv6 code even on systems
|
|
* without IPv6 support.
|
|
*/
|
|
#ifndef INET6_ADDRSTRLEN
|
|
#define INET6_ADDRSTRLEN 46
|
|
#endif
|
|
|
|
/* Name to address translation routines. */
|
|
|
|
enum {
|
|
LINKADDR_ETHER,
|
|
LINKADDR_FRELAY,
|
|
LINKADDR_IEEE1394,
|
|
LINKADDR_ATM,
|
|
LINKADDR_OTHER
|
|
};
|
|
|
|
#define BUFSIZE 128
|
|
|
|
extern const char *linkaddr_string(netdissect_options *, const u_char *, const unsigned int, const unsigned int);
|
|
extern const char *etheraddr_string(netdissect_options *, const u_char *);
|
|
extern const char *le64addr_string(netdissect_options *, const u_char *);
|
|
extern const char *etherproto_string(netdissect_options *, u_short);
|
|
extern const char *tcpport_string(netdissect_options *, u_short);
|
|
extern const char *udpport_string(netdissect_options *, u_short);
|
|
extern const char *isonsap_string(netdissect_options *, const u_char *, register u_int);
|
|
extern const char *dnaddr_string(netdissect_options *, u_short);
|
|
extern const char *protoid_string(netdissect_options *, const u_char *);
|
|
extern const char *ipxsap_string(netdissect_options *, u_short);
|
|
extern const char *getname(netdissect_options *, const u_char *);
|
|
extern const char *getname6(netdissect_options *, const u_char *);
|
|
extern const char *intoa(uint32_t);
|
|
|
|
extern void init_addrtoname(netdissect_options *, uint32_t, uint32_t);
|
|
extern struct hnamemem *newhnamemem(netdissect_options *);
|
|
extern struct h6namemem *newh6namemem(netdissect_options *);
|
|
extern const char * ieee8021q_tci_string(const uint16_t);
|
|
|
|
#define ipaddr_string(ndo, p) getname(ndo, (const u_char *)(p))
|
|
#define ip6addr_string(ndo, p) getname6(ndo, (const u_char *)(p))
|