From: Steven Barth Date: Tue, 18 Jun 2013 12:44:43 +0000 (+0200) Subject: Allow overriding the interface-identifier for public addresses X-Git-Tag: debian/1.1+git20160131-1~139 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=eaf3a11cad8a5dd389d5f52cc76e424e0242074b;p=odhcp6c.git Allow overriding the interface-identifier for public addresses --- diff --git a/src/odhcp6c.c b/src/odhcp6c.c index 4fefcd7..df89eb9 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "odhcp6c.h" #include "ra.h" @@ -55,11 +56,12 @@ int main(_unused int argc, char* const argv[]) char *optpos; uint16_t opttype; enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY; + static struct in6_addr ifid = IN6ADDR_ANY_INIT; bool help = false, daemonize = false; int logopt = LOG_PID; int c, request_pd = 0; - while ((c = getopt(argc, argv, "S::N:P:c:r:s:khedp:")) != -1) { + while ((c = getopt(argc, argv, "S::N:P:c:i:r:s:khedp:")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -98,6 +100,11 @@ int main(_unused int argc, char* const argv[]) } break; + case 'i': + if (inet_pton(AF_INET6, optarg, &ifid) != 1) + help = true; + break; + case 'r': optpos = optarg; while (optpos[0]) { @@ -151,7 +158,7 @@ int main(_unused int argc, char* const argv[]) signal(SIGUSR2, sighandler); if ((urandom_fd = open("/dev/urandom", O_CLOEXEC | O_RDONLY)) < 0 || - init_dhcpv6(ifname, request_pd) || ra_init(ifname) || + init_dhcpv6(ifname, request_pd) || ra_init(ifname, &ifid) || script_init(script, ifname)) { syslog(LOG_ERR, "failed to initialize: %s", strerror(errno)); return 3; @@ -314,6 +321,7 @@ static int usage(void) " -N Mode for requesting addresses [try|force|none]\n" " -P Request IPv6-Prefix (0 = auto)\n" " -c Override client-ID (base-16 encoded)\n" + " -i Use a custom interface identifier for RA handling\n" " -r Options to be requested (comma-separated)\n" " -s