Make names of ARP script actions consistent.

This commit is contained in:
Simon Kelley
2016-02-01 17:59:07 +00:00
parent 8de875f0fb
commit e6e751b066
4 changed files with 9 additions and 9 deletions

View File

@@ -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;

View File

@@ -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 */

View File

@@ -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;
}