First part of ARCnet support.
Matching for anything won't work (as we need to teach the stuff about variable length link level headers), but printing is fine.
This commit is contained in:
is
parent
88a4e0db3c
commit
a7c7586cf6
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: gencode.c,v 1.17 1999/07/25 05:52:16 itojun Exp $ */
|
||||
/* $NetBSD: gencode.c,v 1.18 1999/10/05 20:37:23 is Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
static const char rcsid[] =
|
||||
"@(#) Header: gencode.c,v 1.93 97/06/12 14:22:47 leres Exp (LBL)";
|
||||
#else
|
||||
__RCSID("$NetBSD: gencode.c,v 1.17 1999/07/25 05:52:16 itojun Exp $");
|
||||
__RCSID("$NetBSD: gencode.c,v 1.18 1999/10/05 20:37:23 is Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -491,6 +491,11 @@ init_linktype(type)
|
|||
|
||||
switch (type) {
|
||||
|
||||
case DLT_ARCNET:
|
||||
off_linktype = 3;
|
||||
off_nl = 6; /* XXX in reality, variable! */
|
||||
return;
|
||||
|
||||
case DLT_EN10MB:
|
||||
off_linktype = 12;
|
||||
off_nl = 14;
|
||||
|
|
@ -582,7 +587,7 @@ init_linktype(type)
|
|||
off_nl = 0;
|
||||
return;
|
||||
}
|
||||
bpf_error("unknown data link type 0x%x", linktype);
|
||||
bpf_error("libpcap: unknown data link type 0x%x", linktype);
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.16 1999/09/30 14:49:12 sjg Exp $
|
||||
# $NetBSD: Makefile,v 1.17 1999/10/05 20:37:21 is Exp $
|
||||
|
||||
PROG= tcpdump
|
||||
MAN= tcpdump.8
|
||||
|
|
@ -22,7 +22,7 @@ print-ip.c print-igrp.c print-icmp.c print-gre.c print-fddi.c print-ether.c \
|
|||
print-egp.c print-dvmrp.c print-domain.c print-decnet.c print-bootp.c print-atm.c \
|
||||
print-hdlc.c print-token.c \
|
||||
print-atalk.c print-arp.c parsenfsfh.c machdep.c gmt2local.c bpf_dump.c \
|
||||
addrtoname.c print-mobile.c
|
||||
addrtoname.c print-mobile.c print-arcnet.c
|
||||
SRCS+= print-ah.c print-esp.c print-frag6.c print-icmp6.c print-ip6.c \
|
||||
print-ip6opts.c print-ipcomp.c print-isakmp.c print-ospf6.c \
|
||||
print-ripng.c print-rt6.c
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: interface.h,v 1.10 1999/09/30 14:49:12 sjg Exp $ */
|
||||
/* $NetBSD: interface.h,v 1.11 1999/10/05 20:37:22 is Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
|
||||
|
|
@ -216,6 +216,8 @@ extern void default_print(const u_char *, u_int);
|
|||
extern void default_print_unaligned(const u_char *, u_int);
|
||||
extern void dvmrp_print(const u_char *, u_int);
|
||||
extern void egp_print(const u_char *, u_int, const u_char *);
|
||||
extern void arcnet_if_print(u_char *, const struct pcap_pkthdr *,
|
||||
const u_char *);
|
||||
extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
|
||||
const u_char *);
|
||||
extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,278 @@
|
|||
/* $NetBSD: print-arcnet.c,v 1.1 1999/10/05 20:37:22 is Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1989, 1990, 1991, 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.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
#if 0
|
||||
static const char rcsid[] =
|
||||
"@(#) Header: print-ether.c,v 1.44 97/05/26 17:18:13 leres Exp (LBL)";
|
||||
#else
|
||||
__RCSID("$NetBSD: print-arcnet.c,v 1.1 1999/10/05 20:37:22 is Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#if __STDC__
|
||||
struct mbuf;
|
||||
struct rtentry;
|
||||
#endif
|
||||
#include <net/if.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
#ifdef __NetBSD__
|
||||
#include <net/if_arc.h>
|
||||
#else
|
||||
Error: ARCnet support only available on NetBSD
|
||||
#endif
|
||||
#include <netinet/in_systm.h>
|
||||
#include <netinet/ip.h>
|
||||
#include <netinet/ip_var.h>
|
||||
#include <netinet/udp.h>
|
||||
#include <netinet/udp_var.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <netinet/tcpip.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <pcap.h>
|
||||
|
||||
#include "interface.h"
|
||||
#include "addrtoname.h"
|
||||
#include "ethertype.h"
|
||||
|
||||
const u_char *packetp;
|
||||
const u_char *snapend;
|
||||
|
||||
int arcnet_encap_print(u_char arctype, const u_char *p,
|
||||
u_int length, u_int caplen);
|
||||
|
||||
struct arctype_map {
|
||||
const int arctype;
|
||||
char * const name;
|
||||
} arctypemap[] = {
|
||||
{ ARCTYPE_IP_OLD, "oldip" },
|
||||
{ ARCTYPE_ARP_OLD, "oldarp" },
|
||||
{ ARCTYPE_IP, "ip" },
|
||||
{ ARCTYPE_ARP, "arp" },
|
||||
{ ARCTYPE_REVARP, "rarp" },
|
||||
{ ARCTYPE_ATALK, "atalk" },
|
||||
{ ARCTYPE_BANIAN, "banyan" },
|
||||
{ ARCTYPE_IPX, "ipx" },
|
||||
{ ARCTYPE_INET6, "ipv6" },
|
||||
{ ARCTYPE_DIAGNOSE, "diag" },
|
||||
{ 0, 0 }
|
||||
};
|
||||
|
||||
static inline void
|
||||
arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid)
|
||||
{
|
||||
const struct arc_header *ap;
|
||||
struct arctype_map *atmp;
|
||||
char *arctypename;
|
||||
char typebuf[3];
|
||||
|
||||
|
||||
ap = (const struct arc_header *)bp;
|
||||
|
||||
|
||||
if (qflag) {
|
||||
(void)printf("%02x %02x %d: ",
|
||||
ap->arc_shost,
|
||||
ap->arc_dhost,
|
||||
length);
|
||||
return;
|
||||
}
|
||||
|
||||
for (arctypename = NULL, atmp = arctypemap; atmp->arctype; atmp++) {
|
||||
if (atmp->arctype == ap->arc_type) {
|
||||
arctypename = atmp->name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!arctypename) {
|
||||
arctypename = typebuf;
|
||||
(void)snprintf(typebuf, sizeof(typebuf), "%02x", ap->arc_type);
|
||||
}
|
||||
|
||||
if (!phds) {
|
||||
(void)printf("%02x %02x %s %d: ",
|
||||
ap->arc_shost, ap->arc_dhost, arctypename,
|
||||
length);
|
||||
return;
|
||||
}
|
||||
|
||||
if (flag == 0) {
|
||||
(void)printf("%02x %02x %s seqid %04x %d: ",
|
||||
ap->arc_shost, ap->arc_dhost, arctypename, seqid,
|
||||
length);
|
||||
return;
|
||||
}
|
||||
|
||||
if (flag & 1)
|
||||
(void)printf("%02x %02x %s seqid %04x "
|
||||
"(first of %d fragments) %d: ",
|
||||
ap->arc_shost, ap->arc_dhost, arctypename, seqid,
|
||||
(flag + 3) / 2, length);
|
||||
else
|
||||
(void)printf("%02x %02x %s seqid %04x "
|
||||
"(fragment %d) %d: ",
|
||||
ap->arc_shost, ap->arc_dhost, arctypename, seqid,
|
||||
flag/2 + 1, length);
|
||||
}
|
||||
|
||||
/*
|
||||
* This is the top level routine of the printer. 'p' is the points
|
||||
* to the ether header of the packet, 'tvp' is the timestamp,
|
||||
* 'length' is the length of the packet off the wire, and 'caplen'
|
||||
* is the number of bytes actually captured.
|
||||
*/
|
||||
void
|
||||
arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
|
||||
{
|
||||
u_int caplen = h->caplen;
|
||||
u_int length = h->len;
|
||||
struct arc_header *ap;
|
||||
|
||||
int phds, flag, archdrlen;
|
||||
u_int seqid;
|
||||
u_char arc_type;
|
||||
|
||||
ts_print(&h->ts);
|
||||
|
||||
if (caplen < ARC_HDRLEN) {
|
||||
printf("[|arcnet]");
|
||||
goto out;
|
||||
}
|
||||
|
||||
ap = (struct arc_header *)p;
|
||||
arc_type = ap->arc_type;
|
||||
|
||||
switch(arc_type) {
|
||||
default:
|
||||
phds = 1;
|
||||
break;
|
||||
case ARCTYPE_IP_OLD:
|
||||
case ARCTYPE_ARP_OLD:
|
||||
case ARCTYPE_DIAGNOSE:
|
||||
phds = 0;
|
||||
archdrlen = ARC_HDRLEN;
|
||||
break;
|
||||
}
|
||||
|
||||
if (phds) {
|
||||
if (caplen < ARC_HDRNEWLEN) {
|
||||
arcnet_print(p, length, 0, 0, 0);
|
||||
printf("[|phds]");
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (ap->arc_flag == 0xff) {
|
||||
if (caplen < ARC_HDRNEWLEN_EXC) {
|
||||
arcnet_print(p, length, 0, 0, 0);
|
||||
printf("[|phds extended]");
|
||||
goto out;
|
||||
}
|
||||
flag = ap->arc_flag2;
|
||||
seqid = ap->arc_seqid2;
|
||||
archdrlen = ARC_HDRNEWLEN_EXC;
|
||||
} else {
|
||||
flag = ap->arc_flag;
|
||||
seqid = ap->arc_seqid;
|
||||
archdrlen = ARC_HDRNEWLEN;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (eflag)
|
||||
arcnet_print(p, length, phds, flag, seqid);
|
||||
|
||||
/*
|
||||
* Some printers want to get back at the ethernet addresses,
|
||||
* and/or check that they're not walking off the end of the packet.
|
||||
* Rather than pass them all the way down, we set these globals.
|
||||
*/
|
||||
packetp = p;
|
||||
snapend = p + caplen;
|
||||
|
||||
length -= archdrlen;
|
||||
caplen -= archdrlen;
|
||||
p += archdrlen;
|
||||
|
||||
if (phds && flag && (flag & 1) == 0)
|
||||
goto out2;
|
||||
|
||||
if (!arcnet_encap_print(arc_type, p, length, caplen)) {
|
||||
default_print(p, caplen);
|
||||
goto out;
|
||||
}
|
||||
|
||||
out2:
|
||||
if (xflag)
|
||||
default_print(p, caplen);
|
||||
|
||||
out:
|
||||
putchar('\n');
|
||||
}
|
||||
|
||||
/*
|
||||
* Prints the packet encapsulated in an ARCnet data field,
|
||||
* given the ARCnet system code.
|
||||
*
|
||||
* Returns non-zero if it can do so, zero if the system code is unknown.
|
||||
*/
|
||||
|
||||
|
||||
int
|
||||
arcnet_encap_print(u_char arctype, const u_char *p,
|
||||
u_int length, u_int caplen)
|
||||
{
|
||||
switch (arctype) {
|
||||
|
||||
case ARCTYPE_IP_OLD:
|
||||
case ARCTYPE_IP:
|
||||
ip_print(p, length);
|
||||
return (1);
|
||||
|
||||
#ifdef INET6
|
||||
case ARCTYPE_INET6:
|
||||
ip6_print(p, length);
|
||||
return (1);
|
||||
#endif /*INET6*/
|
||||
|
||||
case ARCTYPE_ARP_OLD:
|
||||
case ARCTYPE_ARP:
|
||||
case ARCTYPE_REVARP:
|
||||
arp_print(p, length, caplen);
|
||||
return (1);
|
||||
|
||||
case ARCTYPE_ATALK: /* XXX was this ever used? */
|
||||
if (vflag)
|
||||
fputs("et1 ", stdout);
|
||||
atalk_print(p, length);
|
||||
return (1);
|
||||
|
||||
default:
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: tcpdump.c,v 1.12 1999/09/30 14:49:13 sjg Exp $ */
|
||||
/* $NetBSD: tcpdump.c,v 1.13 1999/10/05 20:37:22 is Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
|
||||
|
|
@ -29,7 +29,7 @@ static const char rcsid[] =
|
|||
#else
|
||||
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
|
||||
The Regents of the University of California. All rights reserved.\n");
|
||||
__RCSID("$NetBSD: tcpdump.c,v 1.12 1999/09/30 14:49:13 sjg Exp $");
|
||||
__RCSID("$NetBSD: tcpdump.c,v 1.13 1999/10/05 20:37:22 is Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -98,6 +98,7 @@ struct printer {
|
|||
};
|
||||
|
||||
static struct printer printers[] = {
|
||||
{ arcnet_if_print, DLT_ARCNET },
|
||||
{ ether_if_print, DLT_EN10MB },
|
||||
{ token_if_print, DLT_IEEE802 },
|
||||
{ sl_if_print, DLT_SLIP },
|
||||
|
|
@ -122,7 +123,7 @@ lookup_printer(int type)
|
|||
if (type == p->type)
|
||||
return p->f;
|
||||
|
||||
error("unknown data link type 0x%x", type);
|
||||
error("lookup_printer: unknown data link type 0x%x", type);
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue