"@(#) 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[] =
- "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.182 2002-08-03 23:16:57 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.189 2002-12-12 07:28:36 guy Exp $ (LBL)";
#endif
/*
static RETSIGTYPE cleanup(int);
static void usage(void) __attribute__((noreturn));
-static void dump_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
+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 *);
#ifdef SIGINFO
RETSIGTYPE requestinfo(int);
#endif
#ifdef DLT_SUNATM
{ sunatm_if_print, DLT_SUNATM },
+#endif
+#ifdef DLT_IP_OVER_FC
+ { ipfc_if_print, DLT_IP_OVER_FC },
+#endif
+#ifdef DLT_PRISM_HEADER
+ { prism_if_print, DLT_PRISM_HEADER },
+#endif
+#ifdef DLT_IEEE802_11_RADIO
+ { ieee802_11_radio_if_print, DLT_IEEE802_11_RADIO },
#endif
{ NULL, 0 },
};
int devnum;
#endif
#ifdef WIN32
- int ii;
DWORD dwVersion;
DWORD dwWindowsMajorVersion;
u_int UserBufferSize=1000000;
opterr = 0;
while (
#ifdef WIN32
- (op = getopt(argc, argv, "aB:c:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+ (op = getopt(argc, argv, "aAB:c:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
#else /* WIN32 */
#ifdef HAVE_PCAP_FINDALLDEVS
- (op = getopt(argc, argv, "ac:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+ (op = getopt(argc, argv, "aAc:C:dDeE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
#else /* HAVE_PCAP_FINDALLDEVS */
- (op = getopt(argc, argv, "ac:C:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
+ (op = getopt(argc, argv, "aAc:C:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)
#endif /* HAVE_PCAP_FINDALLDEVS */
#endif /* WIN32 */
switch (op) {
++Xflag;
break;
-#ifdef YYDEBUG
+#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
case 'Y':
{
/* Undocumented flag */
+#ifdef HAVE_PCAP_DEBUG
+ extern int pcap_debug;
+ pcap_debug = 1;
+#else
extern int yydebug;
yydebug = 1;
+#endif
}
break;
#endif
error("%s", ebuf);
}
#ifdef WIN32
- else
- {
- if (!(dwVersion >= 0x80000000 && dwWindowsMajorVersion >= 4)) /* Windows '95 */
- {
- if(device[1]!=0)
- device=(char*)SChar2WChar(device);
- }
- else{
- for (ii=0;ii<(signed)strlen(device);ii++)
- for (ii=strlen(device)-1;ii>0&&(device[ii]==' '||device[ii]=='\t');ii--)device[ii]='\0';
- for (ii=0;ii<(signed)strlen(device)&&(device[ii]==' '||device[ii]=='\t');ii++);
- strcpy(device,device+ii);
- }
- }
- PrintCapBegins (program_name,device);
+ PrintCapBegins(program_name,device);
#endif /* WIN32 */
*ebuf = '\0';
pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
error("%s", pcap_geterr(pd));
if (dflag) {
bpf_dump(&fcode, dflag);
-#ifdef WIN32
- pcap_close(pd);
-#endif /* WIN32 */
+ pcap_close(pd);
exit(0);
}
init_addrtoname(localnet, netmask);
if (p == NULL)
error("%s", pcap_geterr(pd));
if (Cflag != 0) {
- printer = dump_and_trunc;
+ printer = dump_packet_and_trunc;
dumpinfo.WFileName = WFileName;
dumpinfo.pd = pd;
dumpinfo.p = p;
pcap_userdata = (u_char *)&dumpinfo;
} else {
- printer = pcap_dump;
+ printer = dump_packet;
pcap_userdata = (u_char *)p;
}
} else {
printer = lookup_printer(pcap_datalink(pd));
pcap_userdata = 0;
+ }
#ifdef SIGINFO
- (void)setsignal(SIGINFO, requestinfo);
+ (void)setsignal(SIGINFO, requestinfo);
#endif
- }
#ifndef WIN32
if (RFileName == NULL) {
(void)fprintf(stderr, "%s: listening on %s\n",
}
static void
-dump_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
{
- struct dump_info *info;
+ struct dump_info *dump_info;
static uint cnt = 2;
char *name;
- info = (struct dump_info *)user;
+ ++infodelay;
+
+ dump_info = (struct dump_info *)user;
/*
* XXX - this won't prevent capture files from getting
* larger than Cflag - the last packet written to the
* file could put it over Cflag.
*/
- if (ftell((FILE *)info->p) > Cflag) {
- name = (char *) malloc(strlen(info->WFileName) + 4);
+ if (ftell((FILE *)dump_info->p) > Cflag) {
+ name = (char *) malloc(strlen(dump_info->WFileName) + 4);
if (name == NULL)
- error("dump_and_trunc: malloc");
- strcpy(name, info->WFileName);
- swebitoa(cnt, name + strlen(info->WFileName));
+ error("dump_packet_and_trunc: malloc");
+ strcpy(name, dump_info->WFileName);
+ swebitoa(cnt, name + strlen(dump_info->WFileName));
cnt++;
- pcap_dump_close(info->p);
- info->p = pcap_dump_open(info->pd, name);
+ pcap_dump_close(dump_info->p);
+ dump_info->p = pcap_dump_open(dump_info->pd, name);
free(name);
- if (info->p == NULL)
+ if (dump_info->p == NULL)
error("%s", pcap_geterr(pd));
}
- pcap_dump((u_char *)info->p, h, sp);
+ pcap_dump((u_char *)dump_info->p, h, sp);
+
+ --infodelay;
+ if (infoprint)
+ info(0);
+}
+
+static void
+dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
+{
+ ++infodelay;
+
+ pcap_dump(user, h, sp);
+
+ --infodelay;
+ if (infoprint)
+ info(0);
}
/* Like default_print() but data need not be aligned */
}
#ifdef WIN32
+ /*
+ * XXX - there should really be libpcap calls to get the version
+ * number as a string (the string would be generated from #defines
+ * at run time, so that it's not generated from string constants
+ * in the library, as, on many UNIX systems, those constants would
+ * be statically linked into the application executable image, and
+ * would thus reflect the version of libpcap on the system on
+ * which the application was *linked*, not the system on which it's
+ * *running*.
+ *
+ * That routine should be documented, unlike the "version[]"
+ * string, so that UNIX vendors providing their own libpcaps
+ * don't omit it (as a couple of vendors have...).
+ *
+ * Packet.dll should perhaps also export a routine to return the
+ * version number of the Packet.dll code, to supply the
+ * "Wpcap_version" information on Windows.
+ */
char WDversion[]="current-cvs.tcpdump.org";
char version[]="current-cvs.tcpdump.org";
char pcap_version[]="current-cvs.tcpdump.org";
}
#ifdef SIGINFO
-RETSIGTYPE requestinfo(int signo)
+RETSIGTYPE requestinfo(int signo _U_)
{
if (infodelay)
++infoprint;
usage(void)
{
extern char version[];
+#if defined(WIN32) || defined(HAVE_PCAP_VERSION)
extern char pcap_version[];
+#else
+ static char pcap_version[] = "unknown";
+#endif
#ifdef WIN32
(void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);
#endif /* WIN32 */
(void)fprintf(stderr,
#ifdef WIN32
-"Usage: %s [-adDeflnNOpqStuvxX] [-B size] [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdDeflnNOpqRStuvxX] [-B size] [-c count] [ -C file_size ]\n", program_name);
#else /* WIN32 */
#ifdef HAVE_PCAP_FINDALLDEVS
-"Usage: %s [-adDeflnNOpqStuvxX] [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdDeflnNOpqRStuvxX] [-c count] [ -C file_size ]\n", program_name);
#else /* HAVE_PCAP_FINDALLDEVS */
-"Usage: %s [-adeflnNOpqStuvxX] [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAdeflnNOpqRStuvxX] [-c count] [ -C file_size ]\n", program_name);
#endif /* HAVE_PCAP_FINDALLDEVS */
#endif /* WIN32 */
(void)fprintf(stderr,
projects / tcpdump / blobdiff