diff options
| author |   SUZUKI, Shinsuke <suz@kame.net> | 2007-02-27 14:47:11 +0000 |
|---|---|---|
| committer |   Bjørn Mork <bjorn@mork.no> | 2010-08-06 15:37:36 +0200 |
| commit | fc15adcff189d5fb96a9802307f8b82866e12ac7 (patch) | |
| tree | 9795f2174138334f799ac987c2545791f98589c2 /dhcp6relay.c | |
| parent | fe2c74572f875332b461ba2a17a594a7ee4eb2d3 (diff) | |
supported script execution for dhcp6relay (contributed by Bruno STEVANT)
Diffstat (limited to 'dhcp6relay.c')
| -rw-r--r-- | dhcp6relay.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/dhcp6relay.c b/dhcp6relay.c index 78d18df..c06db45 100644 --- a/dhcp6relay.c +++ b/dhcp6relay.c @@ -75,6 +75,7 @@ static u_long sig_flags = 0; static char *relaydevice; static char *boundaddr; static char *serveraddr = DH6ADDR_ALLSERVER; +static char *scriptpath; static char *rmsgctlbuf; static socklen_t rmsgctllen; @@ -117,13 +118,16 @@ static void relay_to_server __P((struct dhcp6 *, ssize_t, struct sockaddr_in6 *, char *, unsigned int)); static void relay_to_client __P((struct dhcp6_relay *, ssize_t, struct sockaddr *)); +extern int relay6_script __P((char *, struct sockaddr_in6 *, + struct dhcp6 *, int)); + static void usage() { fprintf(stderr, "usage: dhcp6relay [-dDf] [-b boundaddr] [-H hoplim] " - "[-r relay-IF] [-s serveraddr] [-p pidfile] IF ...\n"); + "[-r relay-IF] [-s serveraddr] [-p pidfile] [-S script] IF ...\n"); exit(0); } @@ -142,7 +146,7 @@ main(argc, argv) else progname++; - while((ch = getopt(argc, argv, "b:dDfH:r:s:p:")) != -1) { + while((ch = getopt(argc, argv, "b:dDfH:r:s:S:p:")) != -1) { switch(ch) { case 'b': boundaddr = optarg; @@ -174,6 +178,9 @@ main(argc, argv) case 's': serveraddr = optarg; break; + case 'S': + scriptpath = optarg; + break; case 'p': pid_file = optarg; break; @@ -916,6 +923,8 @@ relay_to_client(dh6relay, len, from) unsigned int ifid; char ifnamebuf[IFNAMSIZ]; int cc; + int relayed = 0; + struct dhcp6 *dh6; struct msghdr mh; struct in6_pktinfo pktinfo; static struct iovec iov[2]; @@ -997,6 +1006,10 @@ relay_to_client(dh6relay, len, from) } peer = sa6_client; + dh6 = (struct dhcp6 *) optinfo.relaymsg_msg; + if (dh6->dh6_msgtype != DH6_RELAY_REPLY) { + relayed++; + } memcpy(&peer.sin6_addr, &dh6relay->dh6relay_peeraddr, sizeof (peer.sin6_addr)); if (IN6_IS_ADDR_LINKLOCAL(&peer.sin6_addr)) @@ -1033,6 +1046,9 @@ relay_to_client(dh6relay, len, from) addr2str((struct sockaddr *)&peer)); } + if (relayed && scriptpath != NULL) + relay6_script(scriptpath, &peer, dh6, optinfo.relaymsg_len); + out: dhcp6_clear_options(&optinfo); return; |