X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/791d0e8bb742d7d860125a596aa21eba3d296aab..41f87a79787f53df8a36796b7029e6c642cb1e23:/tcpdump.c diff --git a/tcpdump.c b/tcpdump.c index 07249654..704f6159 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -30,7 +30,7 @@ static const char copyright[] _U_ = "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\ The Regents of the University of California. All rights reserved.\n"; static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.244 2004-06-15 23:05:05 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.5 2005-05-23 06:28:56 hannes Exp $ (LBL)"; #endif /* @@ -90,7 +90,8 @@ netdissect_options *gndo = &Gndo; #define MAX_CFLAG 1000000 #define MAX_CFLAG_CHARS 6 -int Lflag; /* list available data link types and exit */ +int dflag; /* print filter code */ +int Lflag; /* list available data link types and exit */ static int infodelay; static int infoprint; @@ -105,6 +106,7 @@ static void usage(void) __attribute__((noreturn)); static void show_dlts_and_exit(pcap_t *pd) __attribute__((noreturn)); static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *); +static void ndo_default_print(netdissect_options *, const u_char *, u_int); static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *); static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *); static void droproot(const char *, const char *); @@ -154,6 +156,9 @@ static struct printer printers[] = { { sl_bsdos_if_print, DLT_SLIP_BSDOS }, #endif { ppp_if_print, DLT_PPP }, +#ifdef DLT_PPP_WITHDIRECTION + { ppp_if_print, DLT_PPP_WITHDIRECTION }, +#endif #ifdef DLT_PPP_BSDOS { ppp_bsdos_if_print, DLT_PPP_BSDOS }, #endif @@ -214,6 +219,39 @@ static struct printer printers[] = { #endif #ifdef DLT_APPLE_IP_OVER_IEEE1394 { ap1394_if_print, DLT_APPLE_IP_OVER_IEEE1394 }, +#endif +#ifdef DLT_JUNIPER_ATM1 + { juniper_atm1_print, DLT_JUNIPER_ATM1 }, +#endif +#ifdef DLT_JUNIPER_ATM2 + { juniper_atm2_print, DLT_JUNIPER_ATM2 }, +#endif +#ifdef DLT_JUNIPER_MFR + { juniper_mfr_print, DLT_JUNIPER_MFR }, +#endif +#ifdef DLT_JUNIPER_MLFR + { juniper_mlfr_print, DLT_JUNIPER_MLFR }, +#endif +#ifdef DLT_JUNIPER_MLPPP + { juniper_mlppp_print, DLT_JUNIPER_MLPPP }, +#endif +#ifdef DLT_JUNIPER_PPPOE + { juniper_pppoe_print, DLT_JUNIPER_PPPOE }, +#endif +#ifdef DLT_JUNIPER_PPPOE_ATM + { juniper_pppoe_atm_print, DLT_JUNIPER_PPPOE_ATM }, +#endif +#ifdef DLT_JUNIPER_GGSN + { juniper_ggsn_print, DLT_JUNIPER_GGSN }, +#endif +#ifdef DLT_JUNIPER_ES + { juniper_es_print, DLT_JUNIPER_ES }, +#endif +#ifdef DLT_JUNIPER_MONITOR + { juniper_monitor_print, DLT_JUNIPER_MONITOR }, +#endif +#ifdef DLT_JUNIPER_SERVICES + { juniper_services_print, DLT_JUNIPER_SERVICES }, #endif { NULL, 0 }, }; @@ -388,7 +426,7 @@ static int tcpdump_printf(netdissect_options *ndo _U_, va_end(args); return ret; -}; +} int main(int argc, char **argv) @@ -421,6 +459,7 @@ main(int argc, char **argv) gndo->ndo_Oflag=1; gndo->ndo_Rflag=1; gndo->ndo_dlt=-1; + gndo->ndo_default_print=ndo_default_print; gndo->ndo_printf=tcpdump_printf; gndo->ndo_error=ndo_error; gndo->ndo_warning=ndo_warning; @@ -699,7 +738,6 @@ main(int argc, char **argv) break; case 'X': - ++xflag; ++Xflag; break; @@ -746,6 +784,15 @@ main(int argc, char **argv) case 4: /* Default + Date*/ thiszone = gmt2local(0); break; + + case 1: /* No time stamp */ + case 2: /* Unix timeval style */ + case 3: /* Microseconds since previous packet */ + break; + + default: /* Not supported */ + error("only -t, -tt, -ttt, and -tttt are supported"); + break; } #ifdef WITH_CHROOT @@ -1185,7 +1232,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) /* * Include the link-layer header. */ - default_print(sp, h->caplen); + hex_print("\n\t", sp, h->caplen); } else { /* * Don't include the link-layer header - and if @@ -1193,7 +1240,26 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) * print nothing. */ if (h->caplen > hdrlen) - default_print(sp + hdrlen, + hex_print("\n\t", sp + hdrlen, + h->caplen - hdrlen); + } + } else if (Xflag) { + /* + * Print the raw packet data. + */ + if (Xflag > 1) { + /* + * Include the link-layer header. + */ + ascii_print("\n\t", sp, h->caplen); + } else { + /* + * Don't include the link-layer header - and if + * we have nothing past the link-layer header, + * print nothing. + */ + if (h->caplen > hdrlen) + ascii_print("\n\t", sp + hdrlen, h->caplen - hdrlen); } } @@ -1235,10 +1301,16 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp) /* * By default, print the specified data out in hex. */ +static void +ndo_default_print(netdissect_options *ndo _U_, const u_char *bp, u_int length) +{ + ascii_print("\n\t", bp, length); /* pass on lf and identation string */ +} + void -default_print(register const u_char *bp, register u_int length) +default_print(const u_char *bp, u_int length) { - ascii_print("\n\t", bp, length); /* pass on lf and identation string */ + ndo_default_print(gndo, bp, length); } #ifdef SIGINFO @@ -1307,9 +1379,9 @@ usage(void) (void)fprintf(stderr, "\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -M secret ]\n"); (void)fprintf(stderr, -"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ] [ -W filecount ]\n"); +"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ]\n"); (void)fprintf(stderr, -"\t\t[ -y datalinktype ] [ -Z user ]\n"); +"\t\t[ -W filecount ] [ -y datalinktype ] [ -Z user ]\n"); (void)fprintf(stderr, "\t\t[ expression ]\n"); exit(1); @@ -1318,7 +1390,7 @@ usage(void) /* VARARGS */ -void +static void ndo_error(netdissect_options *ndo _U_, const char *fmt, ...) { va_list ap; @@ -1337,7 +1409,7 @@ ndo_error(netdissect_options *ndo _U_, const char *fmt, ...) } /* VARARGS */ -void +static void ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...) { va_list ap;