X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=src%2Fodhcp6c.c;h=dbe15ffd29b6c809ad459baad15334228b305882;hb=49305e6847efa43e008d0bebdc176e1833120947;hp=a14c22ef0dd1dffcf3d2f2f282d1b9ee005e64f9;hpb=c638c3400fd043c68e80513313708ce93c83ae28;p=project%2Fodhcp6c.git diff --git a/src/odhcp6c.c b/src/odhcp6c.c index a14c22e..dbe15ff 100644 --- a/src/odhcp6c.c +++ b/src/odhcp6c.c @@ -1,6 +1,6 @@ /** * Copyright (C) 2012-2014 Steven Barth - * Copyright (C) 2017 Hans Dedecker + * Copyright (C) 2017-2018 Hans Dedecker * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License v2 as published by @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include #include @@ -40,9 +42,15 @@ ((((__const uint32_t *) (a))[0] & htonl (0xfe000000)) \ == htonl (0xfc000000)) #endif +#define ARRAY_SEP " ,\t" static void sighandler(int signal); static int usage(void); +static int add_opt(const uint16_t code, const uint8_t *data, + const uint16_t len); +static int parse_opt_data(const char *data, uint8_t **dst, + const unsigned int type, const bool array); +static int parse_opt(const char *opt); static uint8_t *state_data[_STATE_MAX] = {NULL}; static size_t state_len[_STATE_MAX] = {0}; @@ -60,6 +68,101 @@ static char *ifname = NULL; static unsigned int script_sync_delay = 10; static unsigned int script_accu_delay = 1; +static struct odhcp6c_opt opts[] = { + { .code = DHCPV6_OPT_CLIENTID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_SERVERID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_IA_NA, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str= NULL }, + { .code = DHCPV6_OPT_IA_TA, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_IA_ADDR, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ORO, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_PREF, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ELAPSED, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_RELAY_MSG, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_AUTH, .flags = OPT_U8 | OPT_NO_PASSTHRU, .str = "authentication" }, + { .code = DHCPV6_OPT_UNICAST, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_STATUS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_RAPID_COMMIT, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_USER_CLASS, .flags = OPT_USER_CLASS | OPT_ARRAY, .str = "userclass" }, + { .code = DHCPV6_OPT_VENDOR_CLASS, .flags = OPT_U8, .str = "vendorclass" }, + { .code = DHCPV6_OPT_INTERFACE_ID, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_RECONF_MESSAGE, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_RECONF_ACCEPT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_SIP_SERVER_D, .flags = OPT_DNS_STR | OPT_ORO, .str = "sipserver_d" }, + { .code = DHCPV6_OPT_SIP_SERVER_A, .flags = OPT_IP6 | OPT_ARRAY | OPT_ORO, .str = "sipserver_a" }, + { .code = DHCPV6_OPT_DNS_SERVERS, .flags = OPT_IP6 | OPT_ARRAY | OPT_ORO, .str = "dns" }, + { .code = DHCPV6_OPT_DNS_DOMAIN, .flags = OPT_DNS_STR | OPT_ORO, .str = "search" }, + { .code = DHCPV6_OPT_IA_PD, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_IA_PREFIX, .flags = OPT_INTERNAL, .str = NULL }, + { .code = DHCPV6_OPT_SNTP_SERVERS, .flags = OPT_IP6 | OPT_ARRAY | OPT_ORO, .str = "sntpservers" }, + { .code = DHCPV6_OPT_INFO_REFRESH, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO | OPT_ORO_STATELESS, .str = NULL }, + { .code = DHCPV6_OPT_REMOTE_ID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_SUBSCRIBER_ID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_FQDN, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO, .str = NULL }, + { .code = DHCPV6_OPT_ERO, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_LQ_QUERY, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_CLIENT_DATA, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_CLT_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_LQ_RELAY_DATA, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_LQ_CLIENT_LINK, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_RELAY_ID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_NTP_SERVER, .flags = OPT_U8 | OPT_ORO, .str = "ntpserver" }, + { .code = DHCPV6_OPT_CLIENT_ARCH_TYPE, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_AFTR_NAME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO, .str = NULL }, + { .code = DHCPV6_OPT_RSOO, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_PD_EXCLUDE, .flags = OPT_INTERNAL | OPT_ORO | OPT_ORO_STATEFUL, .str = NULL }, + { .code = DHCPV6_OPT_VSS, .flags = OPT_U8, .str = "vss" }, + { .code = DHCPV6_OPT_LINK_LAYER_ADDRESS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_LINK_ADDRESS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_RADIUS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_SOL_MAX_RT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO | OPT_ORO_SOLICIT, .str = NULL }, + { .code = DHCPV6_OPT_INF_MAX_RT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO | OPT_ORO_STATELESS, .str = NULL }, +#ifdef EXT_CER_ID + { .code = DHCPV6_OPT_CER_ID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, +#endif + { .code = DHCPV6_OPT_DHCPV4_MSG, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_S46_RULE, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_S46_BR, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_S46_DMR, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_S46_V4V6BIND, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_S46_PORTPARAMS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_S46_CONT_MAPE, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO, .str = NULL }, + { .code = DHCPV6_OPT_S46_CONT_MAPT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO, .str = NULL }, + { .code = DHCPV6_OPT_S46_CONT_LW, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU | OPT_ORO, .str = NULL }, + { .code = DHCPV6_OPT_LQ_BASE_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_LQ_START_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_LQ_END_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ANI_ATT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ANI_NETWORK_NAME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ANI_AP_NAME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ANI_AP_BSSID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ANI_OPERATOR_ID, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_ANI_OPERATOR_REALM, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_MUD_URL_V6, .flags = OPT_STR | OPT_NO_PASSTHRU, .str = "mud_url_v6" }, + { .code = DHCPV6_OPT_F_BINDING_STATUS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_CONNECT_FLAGS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_DNS_REMOVAL_INFO, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_DNS_HOST_NAME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_DNS_ZONE_NAME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_DNS_FLAGS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_EXPIRATION_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_MAX_UNACKED_BNDUPD, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_MCLT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_PARTNER_LIFETIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_PARTNER_LIFETIME_SENT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_PARTNER_DOWN_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_PARTNER_RAW_CLT_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_PROTOCOL_VERSION, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_KEEPALIVE_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_RECONFIGURE_DATA, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_RELATIONSHIP_NAME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_SERVER_FLAGS, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_SERVER_STATE, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_START_TIME_OF_STATE, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_F_STATE_EXPIRATION_TIME, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = DHCPV6_OPT_RELAY_PORT, .flags = OPT_INTERNAL | OPT_NO_PASSTHRU, .str = NULL }, + { .code = 0, .flags = 0, .str = NULL }, +}; + int main(_unused int argc, char* const argv[]) { static struct in6_addr ifid = IN6ADDR_ANY_INIT; @@ -67,23 +170,23 @@ int main(_unused int argc, char* const argv[]) const char *pidfile = NULL; const char *script = "/usr/sbin/odhcp6c-update"; ssize_t l; - uint8_t buf[134]; + uint8_t buf[134], *o_data; char *optpos; uint16_t opttype; - uint16_t optlen; enum odhcp6c_ia_mode ia_na_mode = IA_MODE_TRY; enum odhcp6c_ia_mode ia_pd_mode = IA_MODE_NONE; + struct odhcp6c_opt *opt; int ia_pd_iaid_index = 0; int sol_timeout = DHCPV6_SOL_MAX_RT; int verbosity = 0; bool help = false, daemonize = false; int logopt = LOG_PID; - int c; + int c, res; unsigned int client_options = DHCPV6_CLIENT_FQDN | DHCPV6_ACCEPT_RECONFIGURE; unsigned int ra_options = RA_RDNSS_DEFAULT_LIFETIME; unsigned int ra_holdoff_interval = RA_MIN_ADV_INTERVAL; - while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:s:kt:m:Lhedp:fav")) != -1) { + while ((c = getopt(argc, argv, "S::N:V:P:FB:c:i:r:Ru:Ux:s:kt:m:Lhedp:fav")) != -1) { switch (c) { case 'S': allow_slaac_only = (optarg) ? atoi(optarg) : -1; @@ -102,11 +205,27 @@ int main(_unused int argc, char* const argv[]) break; case 'V': - l = script_unhexlify(buf, sizeof(buf), optarg); - if (!l) + opt = odhcp6c_find_opt(DHCPV6_OPT_VENDOR_CLASS); + if (!opt) { + syslog(LOG_ERR, "Failed to set vendor-class option"); + return 1; + } + + o_data = NULL; + res = parse_opt_data(optarg, &o_data, opt->flags & OPT_MASK_SIZE, + (opt->flags & OPT_ARRAY) == OPT_ARRAY); + if (res > 0) { + res = add_opt(opt->code, o_data, res); + if (res) { + if (res > 0) + return 1; + + help = true; + } + } else help = true; - odhcp6c_add_state(STATE_VENDORCLASS, buf, l); + free(o_data); break; case 'P': @@ -134,7 +253,10 @@ int main(_unused int argc, char* const argv[]) else prefix.iaid = htonl(++ia_pd_iaid_index); - odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix)); + if (odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix))) { + syslog(LOG_ERR, "Failed to set request IPv6-Prefix"); + return 1; + } break; case 'F': @@ -149,7 +271,10 @@ int main(_unused int argc, char* const argv[]) buf[1] = DHCPV6_OPT_CLIENTID; buf[2] = 0; buf[3] = l; - odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4); + if (odhcp6c_add_state(STATE_CLIENT_ID, buf, l + 4)) { + syslog(LOG_ERR, "Failed to override client-ID"); + return 1; + } } else help = true; break; @@ -168,7 +293,10 @@ int main(_unused int argc, char* const argv[]) else if (optpos[0]) optarg = &optpos[1]; - odhcp6c_add_state(STATE_ORO, &opttype, 2); + if (odhcp6c_add_state(STATE_ORO, &opttype, 2)) { + syslog(LOG_ERR, "Failed to add requested option"); + return 1; + } } break; @@ -177,9 +305,31 @@ int main(_unused int argc, char* const argv[]) break; case 'u': - optlen = htons(strlen(optarg)); - odhcp6c_add_state(STATE_USERCLASS, &optlen, 2); - odhcp6c_add_state(STATE_USERCLASS, optarg, strlen(optarg)); + opt = odhcp6c_find_opt(DHCPV6_OPT_USER_CLASS); + if (!opt) { + syslog(LOG_ERR, "Failed to set user-class option"); + return 1; + } + + o_data = NULL; + res = parse_opt_data(optarg, &o_data, opt->flags & OPT_MASK_SIZE, + (opt->flags & OPT_ARRAY) == OPT_ARRAY); + if (res > 0) { + res = add_opt(opt->code, o_data, res); + if (res) { + if (res > 0) + return 1; + + help = true; + } + } else + help = true; + + free(o_data); + break; + + case 'U': + client_options |= DHCPV6_IGNORE_OPT_UNICAST; break; case 's': @@ -226,6 +376,16 @@ int main(_unused int argc, char* const argv[]) ++verbosity; break; + case 'x': + res = parse_opt(optarg); + if (res) { + if (res > 0) + return res; + + help = true; + } + break; + default: help = true; break; @@ -255,14 +415,15 @@ int main(_unused int argc, char* const argv[]) init_dhcpv6(ifname, client_options, sol_timeout) || ra_init(ifname, &ifid, ra_options, ra_holdoff_interval) || script_init(script, ifname)) { - syslog(LOG_ERR, "failed to initialize: %m"); + syslog(LOG_ERR, "failed to initialize: %s", strerror(errno)); return 3; } if (daemonize) { openlog("odhcp6c", LOG_PID, LOG_DAEMON); // Disable LOG_PERROR if (daemon(0, 0)) { - syslog(LOG_ERR, "Failed to daemonize: %m"); + syslog(LOG_ERR, "Failed to daemonize: %s", + strerror(errno)); return 4; } @@ -305,7 +466,7 @@ int main(_unused int argc, char* const argv[]) continue; do { - int res = dhcpv6_request(mode == DHCPV6_STATELESS ? + res = dhcpv6_request(mode == DHCPV6_STATELESS ? DHCPV6_MSG_INFO_REQ : DHCPV6_MSG_REQUEST); bool signalled = odhcp6c_signal_process(); @@ -331,7 +492,7 @@ int main(_unused int argc, char* const argv[]) signal_usr1 = false; script_call("informed", script_sync_delay, true); - int res = dhcpv6_poll_reconfigure(); + res = dhcpv6_poll_reconfigure(); odhcp6c_signal_process(); if (res > 0) @@ -363,7 +524,7 @@ int main(_unused int argc, char* const argv[]) while (!signal_usr2 && !signal_term) { // Renew Cycle // Wait for T1 to expire or until we get a reconfigure - int res = dhcpv6_poll_reconfigure(); + res = dhcpv6_poll_reconfigure(); odhcp6c_signal_process(); if (res > 0) { script_call("updated", 0, false); @@ -446,6 +607,12 @@ static int usage(void) " -F Force IPv6-Prefix\n" " -V Set vendor-class option (base-16 encoded)\n" " -u Set user-class option string\n" + " -x : Add option opt (with value val) in sent packets (cumulative)\n" + " Examples of IPv6 address, string and base-16 encoded options:\n" + " -x dns:2001:2001::1,2001:2001::2 - option 23\n" + " -x 15:office - option 15 (userclass)\n" + " -x 0x1f4:ABBA - option 500\n" + " -x 202:'\"file\"' - option 202\n" " -c Override client-ID (base-16 encoded 16-bit type + value)\n" " -i Use a custom interface identifier for RA handling\n" " -r Options to be requested (comma-separated)\n" @@ -457,6 +624,7 @@ static int usage(void) " -t Maximum timeout for DHCPv6-SOLICIT (120)\n" " -m Minimum time between accepting RA updates (3)\n" " -L Ignore default lifetime for RDNSS records\n" + " -U Ignore Server Unicast option\n" "\nInvocation options:\n" " -p Set pidfile (/var/run/odhcp6c.pid)\n" " -d Daemonize\n" @@ -471,8 +639,9 @@ static int usage(void) // Don't want to pull-in librt and libpthread just for a monotonic clock... uint64_t odhcp6c_get_milli_time(void) { - struct timespec t = {0, 0}; - syscall(SYS_clock_gettime, CLOCK_MONOTONIC, &t); + struct timespec t; + + clock_gettime(CLOCK_MONOTONIC, &t); return ((uint64_t)t.tv_sec) * 1000 + ((uint64_t)t.tv_nsec) / 1000000; } @@ -522,12 +691,16 @@ void odhcp6c_clear_state(enum odhcp6c_state state) state_len[state] = 0; } -void odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len) +int odhcp6c_add_state(enum odhcp6c_state state, const void *data, size_t len) { uint8_t *n = odhcp6c_resize_state(state, len); - if (n) - memcpy(n, data, len); + if (!n) + return -1; + + memcpy(n, data, len); + + return 0; } int odhcp6c_insert_state(enum odhcp6c_state state, size_t offset, const void *data, size_t len) @@ -620,8 +793,8 @@ bool odhcp6c_update_entry(enum odhcp6c_state state, struct odhcp6c_entry *new, x->t1 = new->t1; x->t2 = new->t2; x->iaid = new->iaid; - } else - odhcp6c_add_state(state, new, odhcp6c_entry_size(new)); + } else if (odhcp6c_add_state(state, new, odhcp6c_entry_size(new))) + return false; } else if (x) odhcp6c_remove_state(state, ((uint8_t*)x) - start, odhcp6c_entry_size(x)); @@ -665,6 +838,20 @@ static void odhcp6c_expire_list(enum odhcp6c_state state, uint32_t elapsed) } } +static uint8_t *odhcp6c_state_find_opt(const uint16_t code) +{ + size_t opts_len; + uint8_t *odata, *opts = odhcp6c_get_state(STATE_OPTS, &opts_len); + uint16_t otype, olen; + + dhcpv6_for_each_option(opts, &opts[opts_len], otype, olen, odata) { + if (otype == code) + return &odata[-4]; + } + + return NULL; +} + void odhcp6c_expire(void) { time_t now = odhcp6c_get_milli_time() / 1000; @@ -699,6 +886,7 @@ bool odhcp6c_addr_in_scope(const struct in6_addr *addr) { FILE *fd = fopen("/proc/net/if_inet6", "r"); int len; + bool ret = false; char buf[256]; if (fd == NULL) @@ -713,13 +901,13 @@ bool odhcp6c_addr_in_scope(const struct in6_addr *addr) len = strlen(buf); if ((len <= 0) || buf[len - 1] != '\n') - return false; + break; buf[--len] = '\0'; if (sscanf(buf, "%s %x %x %x %x %s", addr_buf, &dummy, &dummy, &dummy, &flags, name) != 6) - return false; + break; if (strcmp(name, ifname) || (flags & (IFA_F_DADFAILED | IFA_F_TENTATIVE | IFA_F_DEPRECATED))) @@ -727,7 +915,7 @@ bool odhcp6c_addr_in_scope(const struct in6_addr *addr) for (i = 0; i < strlen(addr_buf); i++) { if (!isxdigit(addr_buf[i]) || isupper(addr_buf[i])) - return false; + break; } memset(&inet6_addr, 0, sizeof(inet6_addr)); @@ -740,11 +928,14 @@ bool odhcp6c_addr_in_scope(const struct in6_addr *addr) } if ((IN6_IS_ADDR_LINKLOCAL(&inet6_addr) == IN6_IS_ADDR_LINKLOCAL(addr)) && - (IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr))) - return true; + (IN6_IS_ADDR_UNIQUELOCAL(&inet6_addr) == IN6_IS_ADDR_UNIQUELOCAL(addr))) { + ret = true; + break; + } } - return false; + fclose(fd); + return ret; } static void sighandler(int signal) @@ -758,3 +949,310 @@ static void sighandler(int signal) else signal_term = true; } + +static int add_opt(const uint16_t code, const uint8_t *data, const uint16_t len) +{ + struct { + uint16_t code; + uint16_t len; + } opt_hdr = { htons(code), htons(len) }; + + if (odhcp6c_state_find_opt(code)) + return -1; + + if (odhcp6c_add_state(STATE_OPTS, &opt_hdr, sizeof(opt_hdr)) || + odhcp6c_add_state(STATE_OPTS, data, len)) { + syslog(LOG_ERR, "Failed to add option %hu", code); + return 1; + } + + return 0; +} + +struct odhcp6c_opt *odhcp6c_find_opt(const uint16_t code) +{ + struct odhcp6c_opt *opt = opts; + + while (opt->code) { + if (opt->code == code) + return opt; + + opt++; + } + + return NULL; +} + +static struct odhcp6c_opt *odhcp6c_find_opt_by_name(const char *name) +{ + struct odhcp6c_opt *opt = opts; + + if (!name || !strlen(name)) + return NULL; + + while (opt->code && (!opt->str || strcmp(opt->str, name))) + opt++; + + return (opt->code > 0 ? opt : NULL); +} + +/* Find first occurrence of any character in the string + * within the string + * */ +static char *get_sep_pos(const char *haystack, const char *needles) +{ + unsigned int i; + char *first = NULL; + + for (i = 0; i < strlen(needles); i++) { + char *found = strchr(haystack, needles[i]); + if (found && ((found < first) || (first == NULL))) + first = found; + } + + return first; +} + +static int parse_opt_u8(const char *src, uint8_t **dst) +{ + int len = strlen(src); + + *dst = realloc(*dst, len/2); + if (!*dst) + return -1; + + return script_unhexlify(*dst, len, src); +} + +static int parse_opt_string(const char *src, uint8_t **dst, const bool array) +{ + int o_len = 0; + char *sep = get_sep_pos(src, ARRAY_SEP); + + if (sep && !array) + return -1; + + do { + if (sep) { + *sep = 0; + sep++; + } + + int len = strlen(src); + + *dst = realloc(*dst, o_len + len); + if (!*dst) + return -1; + + memcpy(&((*dst)[o_len]), src, len); + + o_len += len; + src = sep; + + if (sep) + sep = get_sep_pos(src, ARRAY_SEP); + } while (src); + + return o_len; +} + +static int parse_opt_dns_string(const char *src, uint8_t **dst, const bool array) +{ + int o_len = 0; + char *sep = get_sep_pos(src, ARRAY_SEP); + + if (sep && !array) + return -1; + + do { + uint8_t tmp[256]; + + if (sep) { + *sep = 0; + sep++; + } + + int len = dn_comp(src, tmp, sizeof(tmp), NULL, NULL); + if (len < 0) + return -1; + + *dst = realloc(*dst, o_len + len); + if (!*dst) + return -1; + + memcpy(&((*dst)[o_len]), tmp, len); + + o_len += len; + src = sep; + + if (sep) + sep = get_sep_pos(src, ARRAY_SEP); + } while (src); + + return o_len; +} + +static int parse_opt_ip6(const char *src, uint8_t **dst, const bool array) +{ + int o_len = 0; + char *sep = get_sep_pos(src, ARRAY_SEP); + + if (sep && !array) + return -1; + + do { + int len = sizeof(struct in6_addr); + + if (sep) { + *sep = 0; + sep++; + } + + *dst = realloc(*dst, o_len + len); + if (!*dst) + return -1; + + if (inet_pton(AF_INET6, src, &((*dst)[o_len])) < 1) + return -1; + + o_len += len; + src = sep; + + if (sep) + sep = get_sep_pos(src, ARRAY_SEP); + } while (src); + + return o_len; +} + +static int parse_opt_user_class(const char *src, uint8_t **dst, const bool array) +{ + int o_len = 0; + char *sep = get_sep_pos(src, ARRAY_SEP); + + if (sep && !array) + return -1; + + do { + if (sep) { + *sep = 0; + sep++; + } + uint16_t str_len = strlen(src); + + *dst = realloc(*dst, o_len + str_len + 2); + if (!*dst) + return -1; + + struct user_class { + uint16_t len; + uint8_t data[]; + } *e = (struct user_class *)&((*dst)[o_len]); + + e->len = ntohs(str_len); + memcpy(e->data, src, str_len); + + o_len += str_len + 2; + src = sep; + + if (sep) + sep = get_sep_pos(src, ARRAY_SEP); + } while (src); + + return o_len; +} + +static int parse_opt_data(const char *data, uint8_t **dst, const unsigned int type, + const bool array) +{ + int ret = 0; + + switch (type) { + case OPT_U8: + ret = parse_opt_u8(data, dst); + break; + + case OPT_STR: + ret = parse_opt_string(data, dst, array); + break; + + case OPT_DNS_STR: + ret = parse_opt_dns_string(data, dst, array); + break; + + case OPT_IP6: + ret = parse_opt_ip6(data, dst, array); + break; + + case OPT_USER_CLASS: + ret = parse_opt_user_class(data, dst, array); + break; + + default: + ret = -1; + break; + } + + return ret; +} + +static int parse_opt(const char *opt) +{ + uint32_t optn; + char *data; + uint8_t *payload = NULL; + int payload_len; + unsigned int type = OPT_U8; + bool array = false; + struct odhcp6c_opt *dopt = NULL; + int ret = -1; + + data = get_sep_pos(opt, ":"); + if (!data) + return -1; + + *data = '\0'; + data++; + + if (strlen(opt) == 0 || strlen(data) == 0) + return -1; + + dopt = odhcp6c_find_opt_by_name(opt); + if (!dopt) { + char *e; + optn = strtoul(opt, &e, 0); + if (*e || e == opt || optn > USHRT_MAX) + return -1; + + dopt = odhcp6c_find_opt(optn); + } else + optn = dopt->code; + + /* Check if the type for the content is well-known */ + if (dopt) { + /* Refuse internal options */ + if (dopt->flags & OPT_INTERNAL) + return -1; + + type = dopt->flags & OPT_MASK_SIZE; + array = ((dopt->flags & OPT_ARRAY) == OPT_ARRAY) ? true : false; + } else if (data[0] == '"' || data[0] == '\'') { + char *end = strrchr(data + 1, data[0]); + + if (end && (end == (data + strlen(data) - 1))) { + /* Raw option is specified as a string */ + type = OPT_STR; + data++; + *end = '\0'; + } + + } + + payload_len = parse_opt_data(data, &payload, type, array); + if (payload_len > 0) + ret = add_opt(optn, payload, payload_len); + + free(payload); + + return ret; +}