1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517
|
Description: add option -a to allow monitoring bogons
Author: KELEMEN Péter <fuji@debian.org>
Patch updated by Lukas Schwaighofer <lukas@schwaighofer.name> to
improve the description of the -a flag in the man page
--- a/arpsnmp.c
+++ b/arpsnmp.c
@@ -63,7 +63,7 @@
/* Forwards */
int main(int, char **);
int readsnmp(char *);
-int snmp_add(u_int32_t, u_char *, time_t, char *);
+int snmp_add(u_int32_t, u_char *, time_t, char *, char *);
__dead void usage(void) __attribute__((volatile));
char *prog;
@@ -149,22 +149,24 @@
static time_t now;
int
-snmp_add(register u_int32_t a, register u_char *e, time_t t, register char *h)
+snmp_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
+ char *interface)
{
/* Watch for ethernet broadcast */
if (MEMCMP(e, zero, 6) == 0 || MEMCMP(e, allones, 6) == 0) {
- dosyslog(LOG_INFO, "ethernet broadcast", a, e, NULL);
+ dosyslog(LOG_INFO, "ethernet broadcast", a, e, NULL,
+ interface);
return (1);
}
/* Watch for some ip broadcast addresses */
if (a == 0 || a == 1) {
- dosyslog(LOG_INFO, "ip broadcast", a, e, NULL);
+ dosyslog(LOG_INFO, "ip broadcast", a, e, NULL, interface);
return (1);
}
/* Use current time (although it would be nice to subtract idle time) */
- return (ent_add(a, e, now, h));
+ return (ent_add(a, e, now, h, interface));
}
/* Process an snmp file */
--- a/arpwatch.8
+++ b/arpwatch.8
@@ -78,6 +78,13 @@
]
.\" **
.\" **
+.br
+.ti +8
+[
+.B -a
+]
+.\" **
+.\" **
.ad
.SH DESCRIPTION
.B Arpwatch
@@ -162,6 +169,20 @@
.\" **
.\" **
.LP
+(Debian)
+.B -a
+By default,
+.B arpwatch
+only logs bogons but otherwise ignores them. If this option is specified,
+.B arpwatch
+will perform normal processing with bogon packets and send reports about
+detected events. This option can be combined with
+.B -N
+to disable the report of the packet being a bogon (processing will still be
+done).
+.\" **
+.\" **
+.LP
Note that an empty
.I arp.dat
file must be created before the first time you run
--- a/arpwatch.c
+++ b/arpwatch.c
@@ -142,6 +142,8 @@
int sanity_fddi(struct fddi_header *, struct ether_arp *, int);
__dead void usage(void) __attribute__((volatile));
+static char *interface;
+
int
main(int argc, char **argv)
{
@@ -151,7 +153,7 @@
register int fd;
#endif
register pcap_t *pd;
- register char *interface, *rfilename;
+ register char *rfilename;
struct bpf_program code;
char errbuf[PCAP_ERRBUF_SIZE];
char options[] =
@@ -179,6 +181,9 @@
"p"
/**/
/**/
+ "a"
+ /**/
+ /**/
;
if (argv[0] == NULL)
@@ -200,6 +205,10 @@
while ((op = getopt(argc, argv, options)) != EOF)
switch (op) {
+ case 'a':
+ ++allsubnets;
+ break;
+
case 'd':
++debug;
#ifndef DEBUG
@@ -418,29 +427,31 @@
/* Watch for bogons */
if (isbogon(sia)) {
- dosyslog(LOG_INFO, "bogon", sia, sea, sha);
- return;
+ dosyslog(LOG_INFO, "bogon", sia, sea, sha, interface);
+ if (!allsubnets) return;
}
/* Watch for ethernet broadcast */
if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 ||
MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) {
- dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha);
+ dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha,
+ interface);
return;
}
/* Double check ethernet addresses */
if (MEMCMP(sea, sha, 6) != 0) {
- dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha);
+ dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha,
+ interface);
return;
}
/* Got a live one */
t = h->ts.tv_sec;
can_checkpoint = 0;
- if (!ent_add(sia, sea, t, NULL))
- syslog(LOG_ERR, "ent_add(%s, %s, %ld) failed",
- intoa(sia), e2str(sea), t);
+ if (!ent_add(sia, sea, t, NULL, interface))
+ syslog(LOG_ERR, "ent_add(%s, %s, %ld, %s) failed",
+ intoa(sia), e2str(sea), t, interface);
can_checkpoint = 1;
}
@@ -567,29 +578,31 @@
/* Watch for bogons */
if (isbogon(sia)) {
- dosyslog(LOG_INFO, "bogon", sia, sea, sha);
- return;
+ dosyslog(LOG_INFO, "bogon", sia, sea, sha, interface);
+ if (!allsubnets) return;
}
/* Watch for ethernet broadcast */
if (MEMCMP(sea, zero, 6) == 0 || MEMCMP(sea, allones, 6) == 0 ||
MEMCMP(sha, zero, 6) == 0 || MEMCMP(sha, allones, 6) == 0) {
- dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha);
+ dosyslog(LOG_INFO, "ethernet broadcast", sia, sea, sha,
+ interface);
return;
}
/* Double check ethernet addresses */
if (MEMCMP(sea, sha, 6) != 0) {
- dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha);
+ dosyslog(LOG_INFO, "ethernet mismatch", sia, sea, sha,
+ interface);
return;
}
/* Got a live one */
t = h->ts.tv_sec;
can_checkpoint = 0;
- if (!ent_add(sia, sea, t, NULL))
- syslog(LOG_ERR, "ent_add(%s, %s, %ld) failed",
- intoa(sia), e2str(sea), t);
+ if (!ent_add(sia, sea, t, NULL, interface))
+ syslog(LOG_ERR, "ent_add(%s, %s, %ld, %s) failed",
+ intoa(sia), e2str(sea), t, interface);
can_checkpoint = 1;
}
@@ -808,6 +821,9 @@
"[-p] "
/**/
/**/
+ "[-a] "
+ /**/
+ /**/
"\n"
;
--- a/db.c
+++ b/db.c
@@ -64,6 +64,7 @@
u_char e[6]; /* ether address */
char h[34]; /* simple hostname */
time_t t; /* timestamp */
+ char i[16]; /* interface */
};
/* Address info */
@@ -80,13 +81,14 @@
static void alist_alloc(struct ainfo *);
int cmpeinfo(const void *, const void *);
-static struct einfo *elist_alloc(u_int32_t, u_char *, time_t, char *);
+static struct einfo *elist_alloc(u_int32_t, u_char *, time_t, char *, char *);
static struct ainfo *ainfo_find(u_int32_t);
static void check_hname(struct ainfo *);
struct ainfo *newainfo(void);
int
-ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h)
+ent_add(register u_int32_t a, register u_char *e, time_t t, register char *h,
+ char *interface)
{
register struct ainfo *ap;
register struct einfo *ep;
@@ -103,7 +105,8 @@
ep = ap->elist[0];
if (MEMCMP(e, ep->e, 6) == 0) {
if (t - ep->t > NEWACTIVITY_DELTA) {
- report("new activity", a, e, NULL, &t, &ep->t);
+ report("new activity", a, e, NULL, &t, &ep->t,
+ interface);
check_hname(ap);
}
ep->t = t;
@@ -114,8 +117,8 @@
/* Check for a virgin ainfo record */
if (ap->ecount == 0) {
ap->ecount = 1;
- ap->elist[0] = elist_alloc(a, e, t, h);
- report("new station", a, e, NULL, &t, NULL);
+ ap->elist[0] = elist_alloc(a, e, t, h, interface);
+ report("new station", a, e, NULL, &t, NULL, interface);
return (1);
}
@@ -133,9 +136,11 @@
if (t - t2 < FLIPFLIP_DELTA &&
(isdecnet(e) || isdecnet(e2)))
dosyslog(LOG_INFO,
- "suppressed DECnet flip flop", a, e, e2);
+ "suppressed DECnet flip flop", a, e, e2,
+ interface);
else
- report("flip flop", a, e, e2, &t, &t2);
+ report("flip flop", a, e, e2, &t, &t2,
+ interface);
ap->elist[1] = ap->elist[0];
ap->elist[0] = ep;
ep->t = t;
@@ -151,7 +156,7 @@
e2 = ap->elist[0]->e;
t2 = ap->elist[0]->t;
dosyslog(LOG_NOTICE, "reused old ethernet address",
- a, e, e2);
+ a, e, e2, interface);
/* Shift entries down */
len = i * sizeof(ap->elist[0]);
BCOPY(&ap->elist[0], &ap->elist[1], len);
@@ -165,12 +170,12 @@
/* New ether address */
e2 = ap->elist[0]->e;
t2 = ap->elist[0]->t;
- report("changed ethernet address", a, e, e2, &t, &t2);
+ report("changed ethernet address", a, e, e2, &t, &t2, interface);
/* Make room at head of list */
alist_alloc(ap);
len = ap->ecount * sizeof(ap->elist[0]);
BCOPY(&ap->elist[0], &ap->elist[1], len);
- ap->elist[0] = elist_alloc(a, e, t, h);
+ ap->elist[0] = elist_alloc(a, e, t, h, interface);
++ap->ecount;
return (1);
}
@@ -227,7 +232,7 @@
for (ap = &ainfo_table[i]; ap != NULL; ap = ap->next)
for (j = 0; j < ap->ecount; ++j) {
ep = ap->elist[j];
- (*fn)(ap->a, ep->e, ep->t, ep->h);
+ (*fn)(ap->a, ep->e, ep->t, ep->h, ep->i);
++n;
}
return (n);
@@ -259,7 +264,7 @@
/* Allocate and initialize a elist struct */
static struct einfo *
elist_alloc(register u_int32_t a, register u_char *e, register time_t t,
- register char *h)
+ register char *h, char *interface)
{
register struct einfo *ep;
register u_int size;
@@ -286,6 +291,10 @@
if (h != NULL && !isdigit((int)*h))
strcpy(ep->h, h);
ep->t = t;
+ if (interface != NULL) {
+ strncpy(ep->i, interface, 16);
+ ep->i[15] = '\0';
+ }
return (ep);
}
--- a/db.h
+++ b/db.h
@@ -1,10 +1,10 @@
/* @(#) $Header: db.h,v 1.8 96/06/04 22:39:29 leres Exp $ (LBL) */
-typedef void (*ent_process)(u_int32_t, u_char *, time_t, char *);
+typedef void (*ent_process)(u_int32_t, u_char *, time_t, char *, char *);
#ifdef DEBUG
void debugdump(void);
#endif
-int ent_add(u_int32_t, u_char *, time_t, char *);
+int ent_add(u_int32_t, u_char *, time_t, char *, char *);
int ent_loop(ent_process);
void sorteinfo(void);
--- a/file.c
+++ b/file.c
@@ -69,6 +69,7 @@
u_int32_t a;
register time_t t;
register struct hostent *hp;
+ char *interface;
char line[1024];
u_char e[6];
@@ -117,6 +118,7 @@
if (cp2 == NULL) {
t = 0;
h = NULL;
+ interface = NULL;
} else {
t = atoi(cp2);
h = strchr(cp2, '\t');
@@ -126,11 +128,18 @@
while (*cp2 != '\n' && *cp2 != '\t' &&
*cp2 != '\0')
++cp2;
+ if (*cp2 == '\t') {
+ *cp2++ = '\0';
+ while (*cp2 != '\n' && *cp2 != '\t' &&
+ *cp2 != '\0') ++cp2;
+ } else {
+ interface = NULL;
+ }
*cp2 = '\0';
}
}
- if (!(*fn)(a, e, t, h))
+ if (!(*fn)(a, e, t, h, interface))
return(0);
}
--- a/file.h
+++ b/file.h
@@ -1,5 +1,5 @@
/* @(#) $Header: file.h,v 1.4 99/01/17 17:46:03 leres Exp $ (LBL) */
-typedef int (*file_process)(u_int32_t, u_char *, time_t, char *);
+typedef int (*file_process)(u_int32_t, u_char *, time_t, char *, char *);
int file_loop(FILE *, file_process, const char *);
--- a/report.c
+++ b/report.c
@@ -233,7 +233,8 @@
void
report(register char *title, register u_int32_t a, register u_char *e1,
- register u_char *e2, register time_t *t1p, register time_t *t2p)
+ register u_char *e2, register time_t *t1p, register time_t *t2p,
+ char *interface)
{
extern char *path_sendmail;
register char *cp, *hn;
@@ -254,7 +255,7 @@
if (debug) {
if (debug > 1) {
- dosyslog(LOG_NOTICE, title, a, e1, e2);
+ dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
return;
}
f = stdout;
@@ -271,7 +272,7 @@
}
/* Syslog this event too */
- dosyslog(LOG_NOTICE, title, a, e1, e2);
+ dosyslog(LOG_NOTICE, title, a, e1, e2, interface);
/* Update child depth */
++cdepth;
@@ -303,16 +304,19 @@
(void)fprintf(f, "From: %s\n", watchee);
(void)fprintf(f, "To: %s\n", watcher);
+ if (interface == NULL) interface = ""; /* shouldn't happen */
hn = gethname(a);
if (!isdigit(*hn))
- (void)fprintf(f, "Subject: %s (%s)\n", title, hn);
+ (void)fprintf(f, "Subject: %s (%s) %s\n", title, hn,
+ interface);
else {
- (void)fprintf(f, "Subject: %s\n", title);
+ (void)fprintf(f, "Subject: %s %s\n", title, interface);
hn = unknown;
}
(void)putc('\n', f);
(void)fprintf(f, fmt, "hostname", hn);
(void)fprintf(f, fmt, "ip address", intoa(a));
+ (void)fprintf(f, fmt, "interface", interface);
(void)fprintf(f, fmt, "ethernet address", e2str(e1));
if ((cp = ec_find(e1)) == NULL)
cp = unknown;
--- a/report.h
+++ b/report.h
@@ -1,3 +1,3 @@
/* @(#) $Header: report.h,v 1.3 96/06/04 22:40:53 leres Exp $ (LBL) */
-void report(char *, u_int32_t, u_char *, u_char *, time_t *, time_t *);
+void report(char *, u_int32_t, u_char *, u_char *, time_t *, time_t *, char *);
--- a/util.c
+++ b/util.c
@@ -66,11 +66,14 @@
int nopromisc = 0; /* don't activate promisc mode */
/**/
/**/
+int allsubnets = 0; /* watch all attached subnets */
+/**/
+/**/
/* syslog() helper routine */
void
dosyslog(register int p, register char *s, register u_int32_t a,
- register u_char *ea, register u_char *ha)
+ register u_char *ea, register u_char *ha, char *interface)
{
char xbuf[64];
@@ -87,23 +90,21 @@
}
if (debug)
- fprintf(stderr, "%s: %s %s %s\n", prog, s, intoa(a), xbuf);
+ fprintf(stderr, "%s: %s %s %s %s\n", prog, s, intoa(a),
+ xbuf, interface);
else
- syslog(p, "%s %s %s", s, intoa(a), xbuf);
+ syslog(p, "%s %s %s %s", s, intoa(a), xbuf, interface);
}
static FILE *dumpf;
void
dumpone(register u_int32_t a, register u_char *e, register time_t t,
- register char *h)
+ register char *h, char *interface)
{
- (void)fprintf(dumpf, "%s\t%s", e2str(e), intoa(a));
- if (t != 0 || h != NULL)
- (void)fprintf(dumpf, "\t%u", (u_int32_t)t);
- if (h != NULL && *h != '\0')
- (void)fprintf(dumpf, "\t%s", h);
- (void)putc('\n', dumpf);
+ (void)fprintf(dumpf, "%s\t%s\t%u\t%s\t%s\n", e2str(e), intoa(a),
+ (u_int32_t)t, ((h != NULL)?h:""),
+ ((interface != NULL)?interface:""));
}
int
--- a/util.h
+++ b/util.h
@@ -1,8 +1,8 @@
/* @(#) $Header: util.h,v 1.2 96/10/06 03:22:13 leres Exp $ (LBL) */
-void dosyslog(int, char *, u_int32_t, u_char *, u_char *);
+void dosyslog(int, char *, u_int32_t, u_char *, u_char *, char *);
int dump(void);
-void dumpone(u_int32_t, u_char *, time_t, char *);
+void dumpone(u_int32_t, u_char *, time_t, char *, char *);
int readdata(void);
char *savestr(const char *);
@@ -22,3 +22,6 @@
extern int nopromisc;
/**/
/**/
+extern int allsubnets;
+/**/
+/**/
|