arpd/arpd.patch

changeset 714
119553d296d2
child 715
c10fb90893b9
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/arpd/arpd.patch	Thu Oct 04 20:26:02 2012 +0200
     1.3 @@ -0,0 +1,56 @@
     1.4 +--- arpd.c.dist	2003-07-02 16:49:31.000000000 +0200
     1.5 ++++ arpd.c	2003-07-02 16:53:25.000000000 +0200
     1.6 +@@ -111,9 +111,11 @@
     1.7 + 			struct in_addr in;
     1.8 + 			ip_addr_t istart, iend;
     1.9 + 
    1.10 +-			second = p;
    1.11 ++            first  = p;
    1.12 ++            second = strchr(p, '-');
    1.13 ++            if (second != NULL)
    1.14 ++                *second++ = '\0';
    1.15 + 
    1.16 +-			first = strsep(&second, "-");
    1.17 + 			if (second == NULL)
    1.18 + 				errx(1, "%s: Invalid network range: %s",
    1.19 + 				    __func__, p);
    1.20 +@@ -267,7 +267,7 @@
    1.21 + 	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);
    1.22 + 	
    1.23 + 	if (op == ARP_OP_REQUEST) {
    1.24 +-		syslog(LOG_DEBUG, __FUNCTION__ ": who-has %s tell %s",
    1.25 ++		syslog(LOG_DEBUG, "%s: who-has %s tell %s", __FUNCTION__,
    1.26 + 		    addr_ntoa(tpa), addr_ntoa(spa));
    1.27 + 	} else if (op == ARP_OP_REPLY) {
    1.28 + 		syslog(LOG_INFO, "arp reply %s is-at %s",
    1.29 +@@ -284,7 +284,7 @@
    1.30 + 	int error;
    1.31 + 
    1.32 + 	if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
    1.33 +-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
    1.34 ++		syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
    1.35 + 		    addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
    1.36 + 		return (0);
    1.37 + 	}
    1.38 +@@ -293,10 +293,10 @@
    1.39 + 	error = arp_get(arpd_arp, &arpent);
    1.40 + 	
    1.41 + 	if (error == -1) {
    1.42 +-		syslog(LOG_DEBUG, __FUNCTION__ ": no entry for %s",
    1.43 ++		syslog(LOG_DEBUG, "%s: no entry for %s", __FUNCTION__,
    1.44 + 		    addr_ntoa(addr));
    1.45 + 	} else {
    1.46 +-		syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
    1.47 ++		syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
    1.48 + 		    addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
    1.49 + 	}
    1.50 + 	return (error);
    1.51 +@@ -425,7 +425,7 @@
    1.52 + 		if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
    1.53 + 			addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
    1.54 + 			    ethip->ar_sha, ETH_ADDR_LEN);
    1.55 +-			syslog(LOG_DEBUG, __FUNCTION__ ": %s at %s",
    1.56 ++			syslog(LOG_DEBUG, "%s: %s at %s", __FUNCTION__,
    1.57 + 			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
    1.58 + 			
    1.59 + 			/* This address is claimed */

mercurial