head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.104 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.102 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.100 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.98 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.96 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.94 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.92 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.90 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.88 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.86 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.84 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.82 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.80 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.78 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.76 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.74 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.72 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.70 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.68 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.66 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.64 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.62 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.60 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.56 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.36 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.58 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.54 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.52 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.50 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.48 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.46 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.44 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.42 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.40 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.38 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.34 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.32 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.30 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.28 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.26 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.24 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.22 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.20 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.18 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.16 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.14 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.12 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.10 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.8 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.6 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.4 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.2 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.2.0.62 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.60 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.58 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.56 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.54 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.52 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.50 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.46 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.44 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.42 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.40 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.38 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.34 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.32 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.30 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.28 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.26 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.24 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.22 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.20 pkgsrc-2008Q1:1.2.0.18 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.16 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.14 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.12 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.10 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.8 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.6 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.4 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.2 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.1.1.1.0.14 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.12 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.10 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.8 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.6 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.4 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.2 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2013.05.23.15.46.11; author christos; state Exp; branches; next 1.2; commitid MM6VvseoZjw0PLQw; 1.2 date 2006.01.20.01.06.22; author joerg; state Exp; branches; next 1.1; 1.1 date 2004.04.20.09.15.53; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.04.20.09.15.53; author xtraeme; state Exp; branches; next ; desc @@ 1.3 log @avoid deprecated event_gotsig and friends. @ text @$NetBSD: patch-ab,v 1.2 2006/01/20 01:06:22 joerg Exp $ --- arpd.c.orig 2003-02-08 23:20:40.000000000 -0500 +++ arpd.c 2013-05-23 11:43:08.000000000 -0400 @@@@ -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; @@@@ -65,7 +65,6 @@@@ static arp_t *arpd_arp; static eth_t *arpd_eth; static struct intf_entry arpd_ifent; -static int arpd_sig; static void usage(void) @@@@ -265,7 +264,7 @@@@ 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 +281,7 @@@@ 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 +290,10 @@@@ 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 +422,7 @@@@ 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 */ @@@@ -442,22 +441,23 @@@@ syslog(LOG_ERR, "pcap_dispatch: %s", pcap_geterr(arpd_pcap)); } -void -terminate_handler(int sig) -{ - extern int event_gotsig; - - event_gotsig = 1; - arpd_sig = sig; -} +static void +arpd_signal(evutil_socket_t fd, short what, void *arg) -int -arpd_signal(void) { + int arpd_sig; + recv(fd, &arpd_sig, sizeof(arpd_sig), 0); syslog(LOG_INFO, "exiting on signal %d", arpd_sig); arpd_exit(0); - /* NOTREACHED */ - return (-1); +} + +static void +addsignal(int sig) { + struct event sig_ev; + int got; + + evsignal_set(&sig_ev, sig, arpd_signal, &got); + evsignal_add(&sig_ev, NULL); } int @@@@ -516,16 +516,9 @@@@ event_add(&recv_ev, NULL); /* Setup signal handler */ - if (signal(SIGINT, terminate_handler) == SIG_ERR) { - perror("signal"); - return (-1); - } - if (signal(SIGTERM, terminate_handler) == SIG_ERR) { - perror("signal"); - return (-1); - } - event_sigcb = arpd_signal; - + addsignal(SIGINT); + addsignal(SIGTERM); + event_dispatch(); return (0); @ 1.2 log @Fix GCC 3.4+: __FUNCTION__ doesn't permit string concat, like __func__. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- arpd.c.orig 2003-02-09 04:20:40.000000000 +0000 +++ arpd.c d14 9 a22 1 @@@@ -265,7 +265,7 @@@@ arpd_send(eth_t *eth, int op, d31 1 a31 1 @@@@ -282,7 +282,7 @@@@ arpd_lookup(struct addr *addr) d40 1 a40 1 @@@@ -291,10 +291,10 @@@@ arpd_lookup(struct addr *addr) d53 1 a53 1 @@@@ -423,7 +423,7 @@@@ arpd_recv_cb(u_char *u, const struct pca d62 56 @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- arpd.c.orig Fri Jun 6 21:47:35 2003 +++ arpd.c Fri Jun 6 21:48:13 2003 d14 40 @ 1.1.1.1 log @Initial import of honeyd-arpd-2.0, from pkgsrc-wip packaged by Adrian Portelli. This is the ARP daemon for honeyd. @ text @@