Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.sbin/tcpdump sync cisco hdlc packet printer with tcpdump...
details: https://anonhg.NetBSD.org/src/rev/32e4329dd018
branches: trunk
changeset: 504393:32e4329dd018
user: itojun <itojun%NetBSD.org@localhost>
date: Thu Mar 01 15:13:31 2001 +0000
description:
sync cisco hdlc packet printer with tcpdump.org.
diffstat:
usr.sbin/tcpdump/Makefile | 4 +-
usr.sbin/tcpdump/chdlc.h | 29 ++++++
usr.sbin/tcpdump/interface.h | 6 +-
usr.sbin/tcpdump/print-chdlc.c | 174 +++++++++++++++++++++++++++++++++++++++++
usr.sbin/tcpdump/print-hdlc.c | 104 ------------------------
usr.sbin/tcpdump/tcpdump.c | 6 +-
6 files changed, 211 insertions(+), 112 deletions(-)
diffs (truncated from 384 to 300 lines):
diff -r f2ea56892700 -r 32e4329dd018 usr.sbin/tcpdump/Makefile
--- a/usr.sbin/tcpdump/Makefile Thu Mar 01 14:37:35 2001 +0000
+++ b/usr.sbin/tcpdump/Makefile Thu Mar 01 15:13:31 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/01/19 09:10:13 kleink Exp $
+# $NetBSD: Makefile,v 1.21 2001/03/01 15:13:31 itojun Exp $
PROG= tcpdump
MAN= tcpdump.8
@@ -20,7 +20,7 @@
print-nfs.c print-netbios.c print-llc.c print-krb.c print-isoclns.c print-ipx.c \
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-chdlc.c print-token.c \
print-atalk.c print-arp.c parsenfsfh.c machdep.c gmt2local.c bpf_dump.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 \
diff -r f2ea56892700 -r 32e4329dd018 usr.sbin/tcpdump/chdlc.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/tcpdump/chdlc.h Thu Mar 01 15:13:31 2001 +0000
@@ -0,0 +1,29 @@
+/* $NetBSD: chdlc.h,v 1.1 2001/03/01 15:13:31 itojun Exp $ */
+
+/* @(#) Header: /tcpdump/master/tcpdump/chdlc.h,v 1.1 2000/09/18 05:11:43 guy Exp (LBL) */
+/*
+ * 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.
+ */
+
+#define CHDLC_HDRLEN 4
+#define CHDLC_UNICAST 0x0f
+#define CHDLC_BCAST 0x8f
+#define CHDLC_TYPE_SLARP 0x8035
+#define CHDLC_TYPE_CDP 0x2000
diff -r f2ea56892700 -r 32e4329dd018 usr.sbin/tcpdump/interface.h
--- a/usr.sbin/tcpdump/interface.h Thu Mar 01 14:37:35 2001 +0000
+++ b/usr.sbin/tcpdump/interface.h Thu Mar 01 15:13:31 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interface.h,v 1.17 2001/01/28 10:05:05 itojun Exp $ */
+/* $NetBSD: interface.h,v 1.18 2001/03/01 15:13:31 itojun Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -258,8 +258,8 @@
extern void udp_print(const u_char *, u_int, const u_char *, int);
extern void vrrp_print(const u_char *, u_int, const u_char *);
extern void wb_print(const void *, u_int);
-extern void hdlc_if_print(u_char *, const struct pcap_pkthdr *,
- const u_char *);
+extern void chdlc_if_print(u_char *, const struct pcap_pkthdr *,
+ const u_char *);
extern int ah_print(register const u_char *, register const u_char *);
extern int esp_print(register const u_char *, register const u_char *, int *);
extern void isakmp_print(const u_char *, u_int, const u_char *);
diff -r f2ea56892700 -r 32e4329dd018 usr.sbin/tcpdump/print-chdlc.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/tcpdump/print-chdlc.c Thu Mar 01 15:13:31 2001 +0000
@@ -0,0 +1,174 @@
+/* $NetBSD: print-chdlc.c,v 1.1 2001/03/01 15:13:31 itojun Exp $ */
+
+/* maybe it should be merged into print-ppp.c */
+/*
+ * 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.
+ */
+
+#ifndef lint
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: print-chdlc.c,v 1.1 2001/03/01 15:13:31 itojun Exp $");
+#endif
+
+#include <sys/param.h>
+#include <sys/time.h>
+
+#include <netinet/in.h>
+
+#include <ctype.h>
+#include <netdb.h>
+#include <pcap.h>
+#include <stdio.h>
+
+#include "interface.h"
+#include "addrtoname.h"
+
+#include <net/ethertypes.h>
+#include <net/ppp_defs.h>
+#include "chdlc.h"
+
+static void chdlc_slarp_print(const u_char *, u_int);
+
+/* Standard CHDLC printer */
+void
+chdlc_if_print(u_char *user, const struct pcap_pkthdr *h,
+ register const u_char *p)
+{
+ register u_int length = h->len;
+ register u_int caplen = h->caplen;
+ const struct ip *ip;
+ u_int proto;
+
+ ts_print(&h->ts);
+
+ if (caplen < CHDLC_HDRLEN) {
+ printf("[|chdlc]");
+ goto out;
+ }
+
+ /*
+ * Some printers want to get back at the link level 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.
+ */
+ proto = ntohs(*(u_short *)&p[2]);
+ packetp = p;
+ snapend = p + caplen;
+
+ if (eflag) {
+ switch (p[0]) {
+ case CHDLC_UNICAST:
+ printf("unicast ");
+ break;
+ case CHDLC_BCAST:
+ printf("bcast ");
+ break;
+ default:
+ printf("0x%02x ", p[0]);
+ break;
+ }
+ printf("%d %04x: ", length, proto);
+ }
+
+ length -= CHDLC_HDRLEN;
+ ip = (struct ip *)(p + CHDLC_HDRLEN);
+ switch (proto) {
+ case ETHERTYPE_IP:
+ ip_print((const u_char *)ip, length);
+ break;
+#ifdef INET6
+ case ETHERTYPE_IPV6:
+ ip6_print((const u_char *)ip, length);
+ break;
+#endif
+ case CHDLC_TYPE_SLARP:
+ chdlc_slarp_print((const u_char *)ip, length);
+ break;
+#if 0
+ case CHDLC_TYPE_CDP:
+ chdlc_cdp_print((const u_char *)ip, length);
+ break;
+#endif
+ }
+ if (xflag)
+ default_print((const u_char *)ip, caplen - CHDLC_HDRLEN);
+out:
+ putchar('\n');
+}
+
+struct cisco_slarp {
+ u_int32_t code;
+#define SLARP_REQUEST 0
+#define SLARP_REPLY 1
+#define SLARP_KEEPALIVE 2
+ union {
+ struct {
+ struct in_addr addr;
+ struct in_addr mask;
+ u_int16_t unused[3];
+ } addr;
+ struct {
+ u_int32_t myseq;
+ u_int32_t yourseq;
+ u_int16_t rel;
+ u_int16_t t1;
+ u_int16_t t2;
+ } keep;
+ } un;
+};
+
+#define SLARP_LEN 18
+
+static void
+chdlc_slarp_print(const u_char *cp, u_int length)
+{
+ struct cisco_slarp *slarp;
+
+ if (length < SLARP_LEN) {
+ printf("[|slarp]");
+ return;
+ }
+
+ slarp = (struct cisco_slarp *)cp;
+ switch (ntohl(slarp->code)) {
+ case SLARP_REQUEST:
+ printf("slarp-request");
+ break;
+ case SLARP_REPLY:
+ printf("slarp-reply %s/%s",
+ ipaddr_string(&slarp->un.addr.addr),
+ ipaddr_string(&slarp->un.addr.mask));
+ break;
+ case SLARP_KEEPALIVE:
+ printf("slarp-keepalive my=0x%x your=0x%x ",
+ (u_int32_t)ntohl(slarp->un.keep.myseq),
+ (u_int32_t)ntohl(slarp->un.keep.yourseq));
+ printf("reliability=0x%04x t1=%d.%d",
+ ntohs(slarp->un.keep.rel), ntohs(slarp->un.keep.t1),
+ ntohs(slarp->un.keep.t2));
+ break;
+ default:
+ printf("slarp-0x%x unknown", (u_int32_t)ntohl(slarp->code));
+ break;
+ }
+
+ if (SLARP_LEN < length && vflag)
+ printf("(trailing junk: %d bytes)", length - SLARP_LEN);
+}
diff -r f2ea56892700 -r 32e4329dd018 usr.sbin/tcpdump/print-hdlc.c
--- a/usr.sbin/tcpdump/print-hdlc.c Thu Mar 01 14:37:35 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/* $NetBSD: print-hdlc.c,v 1.3 1999/09/04 03:36:41 itojun Exp $ */
-
-/*
- * Copyright (c) 1990, 1991, 1993, 1994
- * 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.
- */
-
-#ifndef lint
-#include <sys/cdefs.h>
-__RCSID("$NetBSD: print-hdlc.c,v 1.3 1999/09/04 03:36:41 itojun Exp $");
-#endif
-
-#ifdef HAVE_HDLC
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <pcap.h>
-#include <signal.h>
-#include <stdio.h>
Home |
Main Index |
Thread Index |
Old Index