/**
- * Copyright (C) 2012 Steven Barth <steven@midlink.org>
+ * Copyright (C) 2012-2013 Steven Barth <steven@midlink.org>
*
* 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
}
}
+enum entry_type {
+ ENTRY_ADDRESS,
+ ENTRY_HOST,
+ ENTRY_ROUTE,
+ ENTRY_PREFIX
+};
-static void entry_to_env(const char *name, const void *data, size_t len, bool host, bool route)
+static void entry_to_env(const char *name, const void *data, size_t len, enum entry_type type)
{
size_t buf_len = strlen(name);
const struct odhcp6c_entry *e = data;
for (size_t i = 0; i < len / sizeof(*e); ++i) {
inet_ntop(AF_INET6, &e[i].target, &buf[buf_len], INET6_ADDRSTRLEN);
buf_len += strlen(&buf[buf_len]);
- if (!host) {
+ if (type != ENTRY_HOST) {
buf_len += snprintf(&buf[buf_len], 6, "/%hhu", e[i].length);
- if (route) {
+ if (type == ENTRY_ROUTE) {
buf[buf_len++] = ',';
if (!IN6_IS_ADDR_UNSPECIFIED(&e[i].router)) {
inet_ntop(AF_INET6, &e[i].router, &buf[buf_len], INET6_ADDRSTRLEN);
} else {
buf_len += snprintf(&buf[buf_len], 24, ",%u,%u", e[i].preferred, e[i].valid);
}
+
+ if (type == ENTRY_PREFIX && e[i].priority) {
+ // priority and router are abused for prefix exclusion
+ buf[buf_len++] = ',';
+ inet_ntop(AF_INET6, &e[i].router, &buf[buf_len], INET6_ADDRSTRLEN);
+ buf_len += strlen(&buf[buf_len]);
+ buf_len += snprintf(&buf[buf_len], 24, "/%u", e[i].priority);
+ }
}
buf[buf_len++] = ' ';
}
void script_call(const char *status)
{
- syslog(LOG_WARNING, "State for %s changed to %s", argv[1], status);
size_t dns_len, search_len, custom_len, sntp_ip_len, sntp_dns_len;
size_t sip_ip_len, sip_fqdn_len;
fqdn_to_env("SNTP_FQDN", sntp_dns, sntp_dns_len);
fqdn_to_env("SIP_DOMAIN", sip_fqdn, sip_fqdn_len);
bin_to_env(custom, custom_len);
- entry_to_env("PREFIXES", prefix, prefix_len, false, false);
- entry_to_env("ADDRESSES", address, address_len, false, false);
- entry_to_env("RA_ADDRESSES", ra_pref, ra_pref_len, false, false);
- entry_to_env("RA_ROUTES", ra_route, ra_route_len, false, true);
- entry_to_env("RA_DNS", ra_dns, ra_dns_len, true, false);
+ entry_to_env("PREFIXES", prefix, prefix_len, ENTRY_PREFIX);
+ entry_to_env("ADDRESSES", address, address_len, ENTRY_ADDRESS);
+ entry_to_env("RA_ADDRESSES", ra_pref, ra_pref_len, ENTRY_ADDRESS);
+ entry_to_env("RA_ROUTES", ra_route, ra_route_len, ENTRY_ROUTE);
+ entry_to_env("RA_DNS", ra_dns, ra_dns_len, ENTRY_HOST);
argv[2] = (char*)status;
execv(argv[0], argv);