From e6e751b066f8f45bb708a2e4fd69890496b943f0 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Mon, 1 Feb 2016 17:59:07 +0000 Subject: [PATCH] Make names of ARP script actions consistent. --- man/dnsmasq.8 | 8 ++++---- src/arp.c | 2 +- src/dnsmasq.h | 2 +- src/helper.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 index b6fe6b4..7183265 100644 --- a/man/dnsmasq.8 +++ b/man/dnsmasq.8 @@ -1552,7 +1552,7 @@ with an "old" event. There are four further actions which may appear as the first argument -to the script, "init", "arp", "arp-old" and "tftp". More may be added in the future, so +to the script, "init", "arp-add", "arp-del" and "tftp". More may be added in the future, so scripts should be written to ignore unknown actions. "init" is described below in .B --leasefile-ro @@ -1560,10 +1560,10 @@ The "tftp" action is invoked when a TFTP file transfer completes: the arguments are the file size in bytes, the address to which the file was sent, and the complete pathname of the file. -The "arp" and "arp-old" actions are only called if enabled with +The "arp-add" and "arp-del" actions are only called if enabled with .B --script-arp -They are are supplied with a MAC address and IP address as arguments. "arp" indicates -the arrival of a new entry in the ARP or neighbour table, and arp-old indicates the deletion of same. +They are are supplied with a MAC address and IP address as arguments. "arp-add" indicates +the arrival of a new entry in the ARP or neighbour table, and "arp-del" indicates the deletion of same. .TP .B --dhcp-luascript= diff --git a/src/arp.c b/src/arp.c index d837ea3..3e347ae 100644 --- a/src/arp.c +++ b/src/arp.c @@ -216,7 +216,7 @@ int do_arp_script_run(void) { #ifdef HAVE_SCRIPT if (option_bool(OPT_SCRIPT_ARP)) - queue_arp(ACTION_ARP_OLD, old->hwaddr, old->hwlen, old->family, &old->addr); + queue_arp(ACTION_ARP_DEL, old->hwaddr, old->hwlen, old->family, &old->addr); #endif arp = old; old = arp->next; diff --git a/src/dnsmasq.h b/src/dnsmasq.h index 9d4d6b3..549ef55 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -637,7 +637,7 @@ struct frec { #define ACTION_ADD 4 #define ACTION_TFTP 5 #define ACTION_ARP 6 -#define ACTION_ARP_OLD 7 +#define ACTION_ARP_DEL 7 #define LEASE_NEW 1 /* newly created */ #define LEASE_CHANGED 2 /* modified */ diff --git a/src/helper.c b/src/helper.c index 6ee21bd..0afee46 100644 --- a/src/helper.c +++ b/src/helper.c @@ -221,12 +221,12 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd) } else if (data.action == ACTION_ARP) { - action_str = "arp"; + action_str = "arp-add"; is6 = (data.flags != AF_INET); } - else if (data.action == ACTION_ARP_OLD) + else if (data.action == ACTION_ARP_DEL) { - action_str = "arp-old"; + action_str = "arp-del"; is6 = (data.flags != AF_INET); data.action = ACTION_ARP; } -- 2.47.3