Johannes Segitz
3ef94ebe8f
- Update to version 3.1 (bsc#1185939)
* Dropped
+ arpwatch-2.1a11-emailaddr.dif, this is now supported upstream.
Incompatible change: Flags change from -e and -s to -w and -W
+ arpwatch-2.1a11-hname-overflow.dif: included upstream
+ arpwatch-2.1a11-tokenring.diff: Dropped token ring support
+ arpwatch-2.1a15-massagevendor.patch: new python version
is available
+ arpwatch-MAC.patch: Fix is upstream
+ getnameinfo.patch
* Refreshed
+ 0001-Ignore-802.1Q-frames.patch
+ arp2ethers.patch
* Notable upstream changes:
+ Add python 2 compatibility to massagevendor (for pfsense <= 2.4.4).
+ Add -Z (zero pad) and -C (compact) flags to arpwatch and arpsnmp to allow
run time selection of zero padded or compact ethernet addresses in arp.dat.
+ arpsnmp errors now go to stderr instead of syslog.
+ Add arpwatch directory flag (-D)
+ Added the -x flag which is like -n but excludes cidrs
OBS-URL: https://build.opensuse.org/request/show/916671
OBS-URL: https://build.opensuse.org/package/show/security/arpwatch?expand=0&rev=44
56 lines
1.5 KiB
Diff
56 lines
1.5 KiB
Diff
Index: arpwatch-3.1/arpsnmp.c
|
|
===================================================================
|
|
--- arpwatch-3.1.orig/arpsnmp.c
|
|
+++ arpwatch-3.1/arpsnmp.c
|
|
@@ -77,6 +77,7 @@ void usage(void) __attribute__((noreturn
|
|
|
|
/* Globals */
|
|
char *prog;
|
|
+char *interface;
|
|
int quiet;
|
|
int suppress;
|
|
const char *watcher = WATCHER;
|
|
Index: arpwatch-3.1/arpwatch.c
|
|
===================================================================
|
|
--- arpwatch-3.1.orig/arpwatch.c
|
|
+++ arpwatch-3.1/arpwatch.c
|
|
@@ -123,6 +123,7 @@ struct rtentry;
|
|
|
|
/* Globals */
|
|
char *prog;
|
|
+char *interface;
|
|
int quiet;
|
|
int suppress;
|
|
const char *watcher = WATCHER;
|
|
@@ -244,7 +245,7 @@ main(int argc, char **argv)
|
|
pcap_t *pd;
|
|
FILE *fp;
|
|
pcap_if_t *alldevs;
|
|
- char *interface, *rfilename;
|
|
+ char *rfilename;
|
|
struct bpf_program code;
|
|
char errbuf[PCAP_ERRBUF_SIZE];
|
|
char *serveruser = NULL;
|
|
Index: arpwatch-3.1/report.c
|
|
===================================================================
|
|
--- arpwatch-3.1.orig/report.c
|
|
+++ arpwatch-3.1/report.c
|
|
@@ -78,6 +78,8 @@ struct rtentry;
|
|
|
|
#define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
|
|
|
|
+extern char *interface;
|
|
+
|
|
static int cdepth; /* number of outstanding children */
|
|
|
|
static char *fmtdate(time_t);
|
|
@@ -354,6 +356,8 @@ report(const char *title, u_int32_t a, c
|
|
(void)fprintf(f, fmt, "previous timestamp", fmtdate(*t2p));
|
|
if (t1p && t2p && *t1p && *t2p)
|
|
(void)fprintf(f, fmt, "delta", fmtdelta(*t1p - *t2p));
|
|
+ if (interface)
|
|
+ (void)fprintf(f, fmt, "interface", interface);
|
|
|
|
if (debug) {
|
|
fflush(f);
|