|
 |
ea9e61 |
--- a/arpwatch.8 2016-01-26 10:13:58.344326599 +0100
|
|
|
ea9e61 |
+++ b/arpwatch.8 2016-01-26 09:59:46.620048949 +0100
|
|
|
ea9e61 |
@@ -27,7 +27,7 @@ arpwatch - keep track of ethernet/ip add
|
|
|
ea9e61 |
.na
|
|
|
ea9e61 |
.B arpwatch
|
|
|
ea9e61 |
[
|
|
|
ea9e61 |
-.B -dN
|
|
|
ea9e61 |
+.B -dNp
|
|
|
ea9e61 |
] [
|
|
|
ea9e61 |
.B -f
|
|
|
ea9e61 |
.I datafile
|
|
|
ea9e61 |
@@ -70,6 +70,10 @@ background and emailing the reports. Ins
|
|
|
ea9e61 |
.IR stderr .
|
|
|
ea9e61 |
.LP
|
|
|
ea9e61 |
The
|
|
|
ea9e61 |
+.B -p
|
|
|
ea9e61 |
+flag disables promiscous mode.
|
|
|
ea9e61 |
+.LP
|
|
|
ea9e61 |
+The
|
|
|
ea9e61 |
.B -f
|
|
|
ea9e61 |
flag is used to set the ethernet/ip address database filename.
|
|
|
ea9e61 |
The default is
|
|
|
ea9e61 |
diff -rup arpwatch-2.1a15/arpwatch.c arpwatch-2.1a15-new/arpwatch.c
|
|
|
ea9e61 |
--- a/arpwatch.c 2016-01-26 10:13:58.356326563 +0100
|
|
|
ea9e61 |
+++ b/arpwatch.c 2016-01-26 10:13:37.273390029 +0100
|
|
|
ea9e61 |
@@ -162,7 +162,7 @@ void dropprivileges(const char* user)
|
|
|
ea9e61 |
}
|
|
|
ea9e61 |
|
|
|
ea9e61 |
char *
|
|
|
ea9e61 |
-try_dev(char *interface, pcap_t **pd, int *linktype, char *errbuf)
|
|
|
ea9e61 |
+try_dev(char *interface, pcap_t **pd, int *linktype, int promisc, char *errbuf)
|
|
|
ea9e61 |
{
|
|
|
ea9e61 |
register int snaplen, timeout;
|
|
|
ea9e61 |
|
|
|
ea9e61 |
@@ -170,7 +170,7 @@ try_dev(char *interface, pcap_t **pd, in
|
|
|
ea9e61 |
sizeof(struct fddi_header)) + sizeof(struct ether_arp);
|
|
|
ea9e61 |
timeout = 1000;
|
|
|
ea9e61 |
|
|
|
ea9e61 |
- *pd = pcap_open_live(interface, snaplen, 1, timeout, errbuf);
|
|
|
ea9e61 |
+ *pd = pcap_open_live(interface, snaplen, promisc, timeout, errbuf);
|
|
|
ea9e61 |
if (NULL == *pd) {
|
|
|
ea9e61 |
syslog(LOG_ERR, "pcap open %s: %s", interface, errbuf);
|
|
|
ea9e61 |
return NULL;
|
|
|
ea9e61 |
@@ -187,14 +187,14 @@ try_dev(char *interface, pcap_t **pd, in
|
|
|
ea9e61 |
}
|
|
|
ea9e61 |
|
|
|
ea9e61 |
char *
|
|
|
ea9e61 |
-iterate_dev(char *arginterface, pcap_t **pd, int *linktype, char *errbuf)
|
|
|
ea9e61 |
+iterate_dev(char *arginterface, pcap_t **pd, int *linktype, int promisc, char *errbuf)
|
|
|
ea9e61 |
{
|
|
|
ea9e61 |
static char interface[64 + 1];
|
|
|
ea9e61 |
pcap_if_t *alldevs;
|
|
|
ea9e61 |
pcap_if_t *dev;
|
|
|
ea9e61 |
|
|
|
ea9e61 |
if (NULL != arginterface) {
|
|
|
ea9e61 |
- return try_dev(arginterface, pd, linktype, errbuf);
|
|
|
ea9e61 |
+ return try_dev(arginterface, pd, linktype, promisc, errbuf);
|
|
|
ea9e61 |
} else {
|
|
|
ea9e61 |
if (pcap_findalldevs(&alldevs, errbuf) == -1) {
|
|
|
ea9e61 |
(void)fprintf(stderr, "%s: lookup_device: %s\n",
|
|
|
ea9e61 |
@@ -203,7 +203,7 @@ iterate_dev(char *arginterface, pcap_t *
|
|
|
ea9e61 |
}
|
|
|
ea9e61 |
for (dev = alldevs; dev && (arginterface == NULL); dev = dev->next) {
|
|
|
ea9e61 |
strncpy(interface, dev->name, strlen(dev->name)+1);
|
|
|
ea9e61 |
- arginterface = try_dev(interface, pd, linktype, errbuf);
|
|
|
ea9e61 |
+ arginterface = try_dev(interface, pd, linktype, promisc, errbuf);
|
|
|
ea9e61 |
}
|
|
|
ea9e61 |
pcap_freealldevs(alldevs);
|
|
|
ea9e61 |
return arginterface;
|
|
|
ea9e61 |
@@ -224,6 +224,7 @@ main(int argc, char **argv)
|
|
|
ea9e61 |
struct bpf_program code;
|
|
|
ea9e61 |
char errbuf[PCAP_ERRBUF_SIZE];
|
|
|
ea9e61 |
char* serveruser = NULL;
|
|
|
ea9e61 |
+ int promisc = 1;
|
|
|
ea9e61 |
|
|
|
ea9e61 |
if (argv[0] == NULL)
|
|
|
ea9e61 |
prog = "arpwatch";
|
|
|
ea9e61 |
@@ -242,7 +243,7 @@ main(int argc, char **argv)
|
|
|
ea9e61 |
linktype = -1;
|
|
|
ea9e61 |
rfilename = NULL;
|
|
|
ea9e61 |
pd = NULL;
|
|
|
ea9e61 |
- while ((op = getopt(argc, argv, "df:i:n:Nr:u:e:s:")) != EOF)
|
|
|
ea9e61 |
+ while ((op = getopt(argc, argv, "df:i:n:Nr:u:e:s:p")) != EOF)
|
|
|
ea9e61 |
switch (op) {
|
|
|
ea9e61 |
|
|
|
ea9e61 |
case 'd':
|
|
|
ea9e61 |
@@ -304,6 +305,10 @@ main(int argc, char **argv)
|
|
|
ea9e61 |
}
|
|
|
ea9e61 |
break;
|
|
|
ea9e61 |
|
|
|
ea9e61 |
+ case 'p':
|
|
|
ea9e61 |
+ promisc = 0;
|
|
|
ea9e61 |
+ break;
|
|
|
ea9e61 |
+
|
|
|
ea9e61 |
default:
|
|
|
ea9e61 |
usage();
|
|
|
ea9e61 |
}
|
|
|
ea9e61 |
@@ -317,7 +322,7 @@ main(int argc, char **argv)
|
|
|
ea9e61 |
} else {
|
|
|
ea9e61 |
|
|
|
ea9e61 |
/* Determine interface if not specified */
|
|
|
ea9e61 |
- interface = iterate_dev(interface, &pd, &linktype, errbuf);
|
|
|
ea9e61 |
+ interface = iterate_dev(interface, &pd, &linktype, promisc, errbuf);
|
|
|
ea9e61 |
if (interface == NULL) {
|
|
|
ea9e61 |
(void)fprintf(stderr, "%s: lookup_device: no suitable interface found\n",
|
|
|
ea9e61 |
prog);
|