Move test source to a tests directory, add a new test for nonblocking mode.
This commit is contained in:
parent
6e5e19e7f8
commit
8f6096fd01
44
Makefile.in
44
Makefile.in
|
@ -123,14 +123,28 @@ HDR = $(PUBHDR) \
|
||||||
sf-pcap-ng.h \
|
sf-pcap-ng.h \
|
||||||
sunatmpos.h
|
sunatmpos.h
|
||||||
|
|
||||||
|
TESTS = \
|
||||||
|
filtertest \
|
||||||
|
findalldevstest \
|
||||||
|
nonblocktest \
|
||||||
|
opentest \
|
||||||
|
selpolltest
|
||||||
|
|
||||||
|
TESTS_SRC = \
|
||||||
|
tests/filtertest.c \
|
||||||
|
tests/findalldevstest.c \
|
||||||
|
tests/nonblocktest.c \
|
||||||
|
tests/opentest.c \
|
||||||
|
tests/selpolltest.c
|
||||||
|
|
||||||
GENHDR = \
|
GENHDR = \
|
||||||
scanner.h tokdefs.h version.h
|
scanner.h tokdefs.h version.h
|
||||||
|
|
||||||
TAGFILES = \
|
TAGFILES = \
|
||||||
$(SRC) $(HDR)
|
$(SRC) $(HDR)
|
||||||
|
|
||||||
CLEANFILES = $(OBJ) libpcap.* filtertest findalldevstest selpolltest \
|
CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
|
||||||
opentest $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
|
$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
|
||||||
lex.yy.c pcap-config
|
lex.yy.c pcap-config
|
||||||
|
|
||||||
MAN1 = pcap-config.1
|
MAN1 = pcap-config.1
|
||||||
|
@ -199,6 +213,7 @@ MANMISC = \
|
||||||
pcap-linktype.manmisc.in
|
pcap-linktype.manmisc.in
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
$(TESTS_SRC) \
|
||||||
CHANGES \
|
CHANGES \
|
||||||
ChmodBPF/ChmodBPF \
|
ChmodBPF/ChmodBPF \
|
||||||
ChmodBPF/StartupParameters.plist \
|
ChmodBPF/StartupParameters.plist \
|
||||||
|
@ -237,8 +252,6 @@ EXTRA_DIST = \
|
||||||
fad-null.c \
|
fad-null.c \
|
||||||
fad-sita.c \
|
fad-sita.c \
|
||||||
fad-win32.c \
|
fad-win32.c \
|
||||||
filtertest.c \
|
|
||||||
findalldevstest.c \
|
|
||||||
grammar.y \
|
grammar.y \
|
||||||
install-sh \
|
install-sh \
|
||||||
lbl/os-aix4.h \
|
lbl/os-aix4.h \
|
||||||
|
@ -263,7 +276,6 @@ EXTRA_DIST = \
|
||||||
msdos/pktdrvr.c \
|
msdos/pktdrvr.c \
|
||||||
msdos/pktdrvr.h \
|
msdos/pktdrvr.h \
|
||||||
msdos/readme.dos \
|
msdos/readme.dos \
|
||||||
opentest.c \
|
|
||||||
org.tcpdump.chmod_bpf.plist \
|
org.tcpdump.chmod_bpf.plist \
|
||||||
packaging/pcap.spec.in \
|
packaging/pcap.spec.in \
|
||||||
pcap-bpf.c \
|
pcap-bpf.c \
|
||||||
|
@ -299,7 +311,6 @@ EXTRA_DIST = \
|
||||||
pcap-win32.c \
|
pcap-win32.c \
|
||||||
runlex.sh \
|
runlex.sh \
|
||||||
scanner.l \
|
scanner.l \
|
||||||
selpolltest.c \
|
|
||||||
Win32/Include/Gnuc.h \
|
Win32/Include/Gnuc.h \
|
||||||
Win32/Include/addrinfo.h \
|
Win32/Include/addrinfo.h \
|
||||||
Win32/Include/bittypes.h \
|
Win32/Include/bittypes.h \
|
||||||
|
@ -485,17 +496,22 @@ pcap-config: $(srcdir)/pcap-config.in
|
||||||
#
|
#
|
||||||
# Test programs - not built by default, and not installed.
|
# Test programs - not built by default, and not installed.
|
||||||
#
|
#
|
||||||
filtertest: filtertest.c libpcap.a
|
tests: $(TESTS)
|
||||||
$(CC) $(CFLAGS) -I. -L. -o filtertest $(srcdir)/filtertest.c libpcap.a $(LIBS)
|
|
||||||
|
|
||||||
findalldevstest: findalldevstest.c libpcap.a
|
filtertest: tests/filtertest.c libpcap.a
|
||||||
$(CC) $(CFLAGS) -I. -L. -o findalldevstest $(srcdir)/findalldevstest.c libpcap.a $(LIBS)
|
$(CC) $(CFLAGS) -I. -L. -o filtertest $(srcdir)/tests/filtertest.c libpcap.a $(LIBS)
|
||||||
|
|
||||||
selpolltest: selpolltest.c libpcap.a
|
findalldevstest: tests/findalldevstest.c libpcap.a
|
||||||
$(CC) $(CFLAGS) -I. -L. -o selpolltest $(srcdir)/selpolltest.c libpcap.a $(LIBS)
|
$(CC) $(CFLAGS) -I. -L. -o findalldevstest $(srcdir)/tests/findalldevstest.c libpcap.a $(LIBS)
|
||||||
|
|
||||||
opentest: opentest.c libpcap.a
|
nonblocktest: tests/nonblocktest.c libpcap.a
|
||||||
$(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/opentest.c libpcap.a $(LIBS)
|
$(CC) $(CFLAGS) -I. -L. -o nonblocktest $(srcdir)/tests/nonblocktest.c libpcap.a $(LIBS)
|
||||||
|
|
||||||
|
opentest: tests/opentest.c libpcap.a
|
||||||
|
$(CC) $(CFLAGS) -I. -L. -o opentest $(srcdir)/tests/opentest.c libpcap.a $(LIBS)
|
||||||
|
|
||||||
|
selpolltest: tests/selpolltest.c libpcap.a
|
||||||
|
$(CC) $(CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS)
|
||||||
|
|
||||||
install: install-shared install-archive pcap-config
|
install: install-shared install-archive pcap-config
|
||||||
[ -d $(DESTDIR)$(libdir) ] || \
|
[ -d $(DESTDIR)$(libdir) ] || \
|
||||||
|
|
|
@ -0,0 +1,226 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
|
||||||
|
* 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
|
||||||
|
static const char copyright[] =
|
||||||
|
"@(#) 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";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <pcap.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <poll.h>
|
||||||
|
|
||||||
|
char *program_name;
|
||||||
|
|
||||||
|
/* Forwards */
|
||||||
|
static void countme(u_char *, const struct pcap_pkthdr *, const u_char *);
|
||||||
|
static void usage(void) __attribute__((noreturn));
|
||||||
|
static void error(const char *, ...);
|
||||||
|
static void warning(const char *, ...);
|
||||||
|
static char *copy_argv(char **);
|
||||||
|
|
||||||
|
static pcap_t *pd;
|
||||||
|
|
||||||
|
extern int optind;
|
||||||
|
extern int opterr;
|
||||||
|
extern char *optarg;
|
||||||
|
|
||||||
|
int
|
||||||
|
main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
register int op;
|
||||||
|
bpf_u_int32 localnet, netmask;
|
||||||
|
register char *cp, *cmdbuf, *device;
|
||||||
|
struct bpf_program fcode;
|
||||||
|
char ebuf[PCAP_ERRBUF_SIZE];
|
||||||
|
int status;
|
||||||
|
int packet_count;
|
||||||
|
|
||||||
|
device = NULL;
|
||||||
|
if ((cp = strrchr(argv[0], '/')) != NULL)
|
||||||
|
program_name = cp + 1;
|
||||||
|
else
|
||||||
|
program_name = argv[0];
|
||||||
|
|
||||||
|
opterr = 0;
|
||||||
|
while ((op = getopt(argc, argv, "i:")) != -1) {
|
||||||
|
switch (op) {
|
||||||
|
|
||||||
|
case 'i':
|
||||||
|
device = optarg;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
usage();
|
||||||
|
/* NOTREACHED */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (device == NULL) {
|
||||||
|
device = pcap_lookupdev(ebuf);
|
||||||
|
if (device == NULL)
|
||||||
|
error("%s", ebuf);
|
||||||
|
}
|
||||||
|
*ebuf = '\0';
|
||||||
|
pd = pcap_open_live(device, 65535, 0, 1000, ebuf);
|
||||||
|
if (pd == NULL)
|
||||||
|
error("%s", ebuf);
|
||||||
|
else if (*ebuf)
|
||||||
|
warning("%s", ebuf);
|
||||||
|
if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
|
||||||
|
localnet = 0;
|
||||||
|
netmask = 0;
|
||||||
|
warning("%s", ebuf);
|
||||||
|
}
|
||||||
|
cmdbuf = copy_argv(&argv[optind]);
|
||||||
|
|
||||||
|
if (pcap_compile(pd, &fcode, cmdbuf, 1, netmask) < 0)
|
||||||
|
error("%s", pcap_geterr(pd));
|
||||||
|
|
||||||
|
if (pcap_setfilter(pd, &fcode) < 0)
|
||||||
|
error("%s", pcap_geterr(pd));
|
||||||
|
if (pcap_setnonblock(pd, 1, ebuf) == -1)
|
||||||
|
error("pcap_setnonblock failed: %s", ebuf);
|
||||||
|
printf("Listening on %s\n", device);
|
||||||
|
for (;;) {
|
||||||
|
packet_count = 0;
|
||||||
|
status = pcap_dispatch(pd, -1, countme,
|
||||||
|
(u_char *)&packet_count);
|
||||||
|
if (status < 0)
|
||||||
|
break;
|
||||||
|
if (status != 0) {
|
||||||
|
printf("%d packets seen, %d packets counted after pcap_dispatch returns\n",
|
||||||
|
status, packet_count);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (status == -2) {
|
||||||
|
/*
|
||||||
|
* We got interrupted, so perhaps we didn't
|
||||||
|
* manage to finish a line we were printing.
|
||||||
|
* Print an extra newline, just in case.
|
||||||
|
*/
|
||||||
|
putchar('\n');
|
||||||
|
}
|
||||||
|
(void)fflush(stdout);
|
||||||
|
if (status == -1) {
|
||||||
|
/*
|
||||||
|
* Error. Report it.
|
||||||
|
*/
|
||||||
|
(void)fprintf(stderr, "%s: pcap_loop: %s\n",
|
||||||
|
program_name, pcap_geterr(pd));
|
||||||
|
}
|
||||||
|
pcap_close(pd);
|
||||||
|
exit(status == -1 ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
countme(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
|
||||||
|
{
|
||||||
|
int *counterp = (int *)user;
|
||||||
|
|
||||||
|
(*counterp)++;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
usage(void)
|
||||||
|
{
|
||||||
|
(void)fprintf(stderr, "Usage: %s [ -sptn ] [ -i interface ] [expression]\n",
|
||||||
|
program_name);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* VARARGS */
|
||||||
|
static void
|
||||||
|
error(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
(void)fprintf(stderr, "%s: ", program_name);
|
||||||
|
va_start(ap, fmt);
|
||||||
|
(void)vfprintf(stderr, fmt, ap);
|
||||||
|
va_end(ap);
|
||||||
|
if (*fmt) {
|
||||||
|
fmt += strlen(fmt);
|
||||||
|
if (fmt[-1] != '\n')
|
||||||
|
(void)fputc('\n', stderr);
|
||||||
|
}
|
||||||
|
exit(1);
|
||||||
|
/* NOTREACHED */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* VARARGS */
|
||||||
|
static void
|
||||||
|
warning(const char *fmt, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
(void)fprintf(stderr, "%s: WARNING: ", program_name);
|
||||||
|
va_start(ap, fmt);
|
||||||
|
(void)vfprintf(stderr, fmt, ap);
|
||||||
|
va_end(ap);
|
||||||
|
if (*fmt) {
|
||||||
|
fmt += strlen(fmt);
|
||||||
|
if (fmt[-1] != '\n')
|
||||||
|
(void)fputc('\n', stderr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copy arg vector into a new buffer, concatenating arguments with spaces.
|
||||||
|
*/
|
||||||
|
static char *
|
||||||
|
copy_argv(register char **argv)
|
||||||
|
{
|
||||||
|
register char **p;
|
||||||
|
register u_int len = 0;
|
||||||
|
char *buf;
|
||||||
|
char *src, *dst;
|
||||||
|
|
||||||
|
p = argv;
|
||||||
|
if (*p == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
while (*p)
|
||||||
|
len += strlen(*p++) + 1;
|
||||||
|
|
||||||
|
buf = (char *)malloc(len);
|
||||||
|
if (buf == NULL)
|
||||||
|
error("copy_argv: malloc");
|
||||||
|
|
||||||
|
p = argv;
|
||||||
|
dst = buf;
|
||||||
|
while ((src = *p++) != NULL) {
|
||||||
|
while ((*dst++ = *src++) != '\0')
|
||||||
|
;
|
||||||
|
dst[-1] = ' ';
|
||||||
|
}
|
||||||
|
dst[-1] = '\0';
|
||||||
|
|
||||||
|
return buf;
|
||||||
|
}
|
Reference in New Issue