Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass the remote address (or broadcast addres) to the up/down scripts as 

well. This is very usefull for setting up the right routes ;-)

Thanks to Bjoern Labitzke for pointing out this missing feature.
This commit is contained in:
martin 2002-01-10 19:38:51 +00:00
parent 5457974230
commit 0f93714245
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/ifwatchd/ifwatchd.8
View File

@ -1,4 +1,4 @@
.\" $NetBSD: ifwatchd.8,v 1.4 2001/12/10 15:04:51 wiz Exp $
.\" $NetBSD: ifwatchd.8,v 1.5 2002/01/10 19:38:51 martin Exp $
.\"
.\" Copyright (C) 2001 by Martin Husemann
.\" All rights reserved.
@ -98,8 +98,8 @@ Events for other interfaces are ignored.
# ifwatchd -u /etc/ppp/ip-up -d /etc/ppp/ip-down pppoe0
.Ed
.Sh PARAMETERS PASSED TO SCRIPTS
The invoked scripts get three parameters passed:
.Bl -tag -width address
The invoked scripts get four parameters passed:
.Bl -tag -width destination
.It Ar ifname
The name of the interface this change is for (this allows to share the same
script for multiple interfaces watched and dispatching on the interface name
@ -116,6 +116,9 @@ if this is a down event.
.Pp
The format of the address depends on the address family, for IPv4 it is the
usual dotted quad notation, for IPv6 the colon separated standard notation.
.It Ar destination
For point to point interfaces, this is the remote address of the interface.
For other interfaces it is the broadcast address.
.El
.Sh SEE ALSO
.Xr route 4 ,

33
usr.sbin/ifwatchd/ifwatchd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifwatchd.c,v 1.3 2001/12/10 14:54:09 martin Exp $ */
/* $NetBSD: ifwatchd.c,v 1.4 2002/01/10 19:38:51 martin Exp $ */
/*
* Copyright (c) 2001 Martin Husemann <martin@duskware.de>
@ -47,7 +47,7 @@
static void usage(void);
static void dispatch(void*, size_t);
static void check_addrs(char *cp, int addrs, int is_up);
static void invoke_script(struct sockaddr *sa, int is_up, int ifindex);
static void invoke_script(struct sockaddr *sa, struct sockaddr *dst, int is_up, int ifindex);
static void list_interfaces(const char *ifnames);
static void rescan_interfaces(void);
static void free_interfaces(void);
@ -200,7 +200,7 @@ check_addrs(cp, addrs, is_up)
char *cp;
int addrs, is_up;
{
struct sockaddr *sa;
struct sockaddr *sa, *ifa = NULL, *brd = NULL;
int ifndx = 0, i;
if (addrs == 0)
@ -217,21 +217,27 @@ check_addrs(cp, addrs, is_up)
return;
}
} else if (i == RTA_IFA) {
invoke_script(sa, is_up, ifndx);
ifa = sa;
} else if (i == RTA_BRD) {
brd = sa;
}
ADVANCE(cp, sa);
}
}
if (ifa != NULL)
invoke_script(ifa, brd, is_up, ifndx);
}
static void
invoke_script(sa, is_up, ifindex)
struct sockaddr *sa;
invoke_script(sa, dest, is_up, ifindex)
struct sockaddr *sa, *dest;
int is_up, ifindex;
{
char addr[NI_MAXHOST], ifname_buf[IFNAMSIZ], *ifname, *cmd;
char addr[NI_MAXHOST], daddr[NI_MAXHOST], ifname_buf[IFNAMSIZ],
*ifname, *cmd;
const char *script;
daddr[0] = 0;
ifname = if_indextoname(ifindex, ifname_buf);
if (sa->sa_len == 0) {
fprintf(stderr, "illegal socket address (sa_len == 0)\n");
@ -243,12 +249,19 @@ invoke_script(sa, is_up, ifindex)
printf("getnameinfo failed\n");
return; /* this address can not be handled */
}
if (dest != NULL) {
if (getnameinfo(dest, dest->sa_len, daddr, sizeof daddr, NULL, 0, NI_NUMERICHOST)) {
if (verbose)
printf("getnameinfo failed\n");
return; /* this address can not be handled */
}
}
script = is_up? up_script : down_script;
if (script == NULL) return;
asprintf(&cmd, "%s \"%s\" %s \"%s\"", script, ifname,
is_up?"up":"down", addr);
asprintf(&cmd, "%s \"%s\" %s \"%s\" \"%s\"", script, ifname,
is_up?"up":"down", addr, daddr);
if (cmd == NULL) {
fprintf(stderr, "out of memory\n");
return;
@ -326,7 +339,7 @@ static void run_initial_ups()
continue;
SLIST_FOREACH(ifd, &ifs, next) {
if (strcmp(ifd->ifname, p->ifa_name) == 0) {
invoke_script(p->ifa_addr, 1, ifd->index);
invoke_script(p->ifa_addr, p->ifa_dstaddr, 1, ifd->index);
break;
}
}