53 lines
1.8 KiB
Text
53 lines
1.8 KiB
Text
$NetBSD: patch-ab,v 1.2 2006/01/20 01:06:22 joerg Exp $
|
|
|
|
--- arpd.c.orig 2003-02-09 04:20:40.000000000 +0000
|
|
+++ arpd.c
|
|
@@ -33,7 +33,7 @@
|
|
#define ARPD_MAX_ACTIVE 600
|
|
#define ARPD_MAX_INACTIVE 300
|
|
|
|
-#define PIDFILE "/var/run/arpd.pid"
|
|
+#define PIDFILE "/var/run/honeyd-arpd.pid"
|
|
|
|
struct arp_req {
|
|
struct addr pa;
|
|
@@ -265,7 +265,7 @@ arpd_send(eth_t *eth, int op,
|
|
spa->addr_ip, tha->addr_eth, tpa->addr_ip);
|
|
|
|
if (op == ARP_OP_REQUEST) {
|
|
- syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
|
|
+ syslog(LOG_DEBUG, "%s: who-has %s tell %s", __FUNCTION__,
|
|
addr_ntoa(tpa), addr_ntoa(spa));
|
|
} else if (op == ARP_OP_REPLY) {
|
|
syslog(LOG_INFO, "arp reply %s is-at %s",
|
|
@@ -282,7 +282,7 @@ arpd_lookup(struct addr *addr)
|
|
int error;
|
|
|
|
if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
|
|
- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
|
|
+ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
|
|
addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
|
|
return (0);
|
|
}
|
|
@@ -291,10 +291,10 @@ arpd_lookup(struct addr *addr)
|
|
error = arp_get(arpd_arp, &arpent);
|
|
|
|
if (error == -1) {
|
|
- syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
|
|
+ syslog(LOG_DEBUG, "%s: no entry for %s", __FUNCTION__,
|
|
addr_ntoa(addr));
|
|
} else {
|
|
- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
|
|
+ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
|
|
addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
|
|
}
|
|
return (error);
|
|
@@ -423,7 +423,7 @@ arpd_recv_cb(u_char *u, const struct pca
|
|
if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
|
|
addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
|
|
ethip->ar_sha, ETH_ADDR_LEN);
|
|
- syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
|
|
+ syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
|
|
addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
|
|
|
|
/* This address is claimed */
|