Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make names of ARP script actions consistent.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
man/dnsmasq.8
View File

@@ -1552,7 +1552,7 @@ with an "old" event.
There are four further actions which may appear as the first argument 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 scripts should be written to ignore unknown actions. "init" is
described below in described below in
.B --leasefile-ro .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 arguments are the file size in bytes, the address to which the file
was sent, and the complete pathname of 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 .B --script-arp
They are are supplied with a MAC address and IP address as arguments. "arp" indicates 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-old indicates the deletion of same. the arrival of a new entry in the ARP or neighbour table, and "arp-del" indicates the deletion of same.
.TP .TP
.B --dhcp-luascript=<path> .B --dhcp-luascript=<path>

2
src/arp.c
View File

@@ -216,7 +216,7 @@ int do_arp_script_run(void)
{ {
#ifdef HAVE_SCRIPT #ifdef HAVE_SCRIPT
if (option_bool(OPT_SCRIPT_ARP)) 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 #endif
arp = old; arp = old;
old = arp->next; old = arp->next;

2
src/dnsmasq.h
View File

@@ -637,7 +637,7 @@ struct frec {
#define ACTION_ADD 4 #define ACTION_ADD 4
#define ACTION_TFTP 5 #define ACTION_TFTP 5
#define ACTION_ARP 6 #define ACTION_ARP 6
#define ACTION_ARP_OLD 7 #define ACTION_ARP_DEL 7
#define LEASE_NEW 1 /* newly created */ #define LEASE_NEW 1 /* newly created */
#define LEASE_CHANGED 2 /* modified */ #define LEASE_CHANGED 2 /* modified */

6
src/helper.c
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) else if (data.action == ACTION_ARP)
{ {
action_str = "arp"; action_str = "arp-add";
is6 = (data.flags != AF_INET); 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); is6 = (data.flags != AF_INET);
data.action = ACTION_ARP; data.action = ACTION_ARP;
} }