return 0;
}
+int sd_dhcp_lease_get_ntp(sd_dhcp_lease *lease, struct in_addr **addr, size_t *addr_size) {
+ assert_return(lease, -EINVAL);
+ assert_return(addr, -EINVAL);
+ assert_return(addr_size, -EINVAL);
+
+ if (lease->ntp_size) {
+ *addr_size = lease->ntp_size;
+ *addr = lease->ntp;
+ } else
+ return -ENOENT;
+
+ return 0;
+}
+
int sd_dhcp_lease_get_domainname(sd_dhcp_lease *lease, const char **domainname) {
assert_return(lease, -EINVAL);
assert_return(domainname, -EINVAL);
assert_return(lease, -EINVAL);
assert_return(addr, -EINVAL);
- addr->s_addr = lease->router;
+ if (lease->router != INADDR_ANY)
+ addr->s_addr = lease->router;
+ else
+ return -ENOENT;
return 0;
}
case DHCP_OPTION_DOMAIN_NAME_SERVER:
if (len && !(len % 4)) {
- unsigned i;
-
lease->dns_size = len / 4;
free(lease->dns);
- lease->dns = new0(struct in_addr, lease->dns_size);
+ lease->dns = newdup(struct in_addr, option, lease->dns_size);
if (!lease->dns)
return -ENOMEM;
+ }
+
+ break;
+
+ case DHCP_OPTION_NTP_SERVER:
+ if (len && !(len % 4)) {
+ lease->ntp_size = len / 4;
- for (i = 0; i < lease->dns_size; i++) {
- memcpy(&lease->dns[i].s_addr, option + 4 * i, 4);
- }
+ free(lease->ntp);
+ lease->ntp = newdup(struct in_addr, option, lease->ntp_size);
+ if (!lease->ntp)
+ return -ENOMEM;
}
break;
}
int dhcp_lease_new(sd_dhcp_lease **ret) {
- _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
+ sd_dhcp_lease *lease;
lease = new0(sd_dhcp_lease, 1);
if (!lease)
return -ENOMEM;
+ lease->router = INADDR_ANY;
lease->n_ref = REFCNT_INIT;
*ret = lease;
- lease = NULL;
+ return 0;
+}
+
+static void serialize_addresses(FILE *f, const char *key, struct in_addr *addresses, size_t size) {
+ unsigned i;
+
+ assert(key);
+ assert(addresses);
+ assert(size);
+
+ fputs("DNS=", f);
+
+ for (i = 0; i < size; i++)
+ fprintf(f, "%s%s", inet_ntoa(addresses[i]),
+ (i < (size - 1)) ? " ": "");
+
+ fputs("\n", f);
+}
+
+static int deserialize_addresses(struct in_addr **addresses, size_t *size, const char *string) {
+ char *word, *state;
+ size_t len;
+
+ FOREACH_WORD(word, len, string, state) {
+ struct in_addr *new_addresses;
+ int r;
+
+ new_addresses = realloc(*addresses, (*size + 1) * sizeof(struct in_addr));
+ if (!new_addresses)
+ return -ENOMEM;
+ else
+ *addresses = new_addresses;
+
+ r = inet_aton(word, &(new_addresses[*size]));
+ if (r < 0)
+ continue;
+
+ (*size)++;
+ }
return 0;
}
int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) {
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
- char buf[INET_ADDRSTRLEN];
struct in_addr address;
+ struct in_addr *addresses;
+ size_t addresses_size;
const char *string;
uint16_t mtu;
int r;
if (r < 0)
goto finish;
- string = inet_ntop(AF_INET, &address, buf, INET_ADDRSTRLEN);
- if (!string) {
- r = -errno;
- goto finish;
- }
-
fprintf(f,
"# This is private data. Do not parse.\n"
- "ADDRESS=%s\n", string);
-
- r = sd_dhcp_lease_get_router(lease, &address);
- if (r < 0)
- goto finish;
-
- string = inet_ntop(AF_INET, &address, buf, INET_ADDRSTRLEN);
- if (!string) {
- r = -errno;
- goto finish;
- }
-
- fprintf(f,
- "ROUTER=%s\n", string);
+ "ADDRESS=%s\n", inet_ntoa(address));
r = sd_dhcp_lease_get_netmask(lease, &address);
if (r < 0)
goto finish;
- string = inet_ntop(AF_INET, &address, buf, INET_ADDRSTRLEN);
- if (!string) {
- r = -errno;
- goto finish;
- }
+ fprintf(f, "NETMASK=%s\n", inet_ntoa(address));
- fprintf(f,
- "NETMASK=%s\n", string);
+ r = sd_dhcp_lease_get_router(lease, &address);
+ if (r >= 0)
+ fprintf(f, "ROUTER=%s\n", inet_ntoa(address));
r = sd_dhcp_lease_get_server_identifier(lease, &address);
- if (r >= 0) {
- string = inet_ntop(AF_INET, &address, buf, INET_ADDRSTRLEN);
- if (!string) {
- r = -errno;
- goto finish;
- }
-
- fprintf(f,
- "SERVER_ADDRESS=%s\n", string);
- }
+ if (r >= 0)
+ fprintf(f, "SERVER_ADDRESS=%s\n",
+ inet_ntoa(address));
r = sd_dhcp_lease_get_next_server(lease, &address);
- if (r >= 0) {
- string = inet_ntop(AF_INET, &address, buf, INET_ADDRSTRLEN);
- if (!string) {
- r = -errno;
- goto finish;
- }
-
- fprintf(f,
- "NEXT_SERVER=%s\n", string);
- }
+ if (r >= 0)
+ fprintf(f, "NEXT_SERVER=%s\n", inet_ntoa(address));
r = sd_dhcp_lease_get_mtu(lease, &mtu);
if (r >= 0)
fprintf(f, "MTU=%" PRIu16 "\n", mtu);
-/* TODO: DNS. See resolv.conf writing in network-manager.c */
+ r = sd_dhcp_lease_get_dns(lease, &addresses, &addresses_size);
+ if (r >= 0)
+ serialize_addresses(f, "DNS", addresses, addresses_size);
+
+ r = sd_dhcp_lease_get_ntp(lease, &addresses, &addresses_size);
+ if (r >= 0)
+ serialize_addresses(f, "NTP", addresses, addresses_size);
r = sd_dhcp_lease_get_domainname(lease, &string);
if (r >= 0)
_cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL;
_cleanup_free_ char *address = NULL, *router = NULL, *netmask = NULL,
*server_address = NULL, *next_server = NULL,
- *mtu = NULL;
+ *dns = NULL, *ntp = NULL, *mtu = NULL;
struct in_addr addr;
int r;
"NETMASK", &netmask,
"SERVER_IDENTIFIER", &server_address,
"NEXT_SERVER", &next_server,
+ "DNS", &dns,
+ "NTP", &ntp,
"MTU", &mtu,
"DOMAINNAME", &lease->domainname,
"HOSTNAME", &lease->hostname,
lease->address = addr.s_addr;
- r = inet_pton(AF_INET, router, &addr);
- if (r < 0)
- return r;
+ if (router) {
+ r = inet_pton(AF_INET, router, &addr);
+ if (r < 0)
+ return r;
- lease->router = addr.s_addr;
+ lease->router = addr.s_addr;
+ }
r = inet_pton(AF_INET, netmask, &addr);
if (r < 0)
lease->next_server = addr.s_addr;
}
+ if (dns) {
+ r = deserialize_addresses(&lease->dns, &lease->dns_size, dns);
+ if (r < 0)
+ return r;
+ }
+
+ if (ntp) {
+ r = deserialize_addresses(&lease->ntp, &lease->ntp_size, dns);
+ if (r < 0)
+ return r;
+ }
+
if (mtu) {
uint16_t u;
if (sscanf(mtu, "%" SCNu16, &u) > 0)
return 0;
}
+
+int dhcp_lease_set_default_subnet_mask(sd_dhcp_lease *lease) {
+ uint32_t address;
+
+ assert(lease);
+ assert(lease->address != INADDR_ANY);
+
+ address = be32toh(lease->address);
+
+ /* fall back to the default subnet masks based on address class */
+
+ if ((address >> 31) == 0x0)
+ /* class A, leading bits: 0 */
+ lease->subnet_mask = htobe32(0xff000000);
+ else if ((address >> 30) == 0x2)
+ /* class B, leading bits 10 */
+ lease->subnet_mask = htobe32(0xffff0000);
+ else if ((address >> 29) == 0x6)
+ /* class C, leading bits 110 */
+ lease->subnet_mask = htobe32(0xffffff00);
+ else
+ /* class D or E, no default mask. give up */
+ return -ERANGE;
+
+ return 0;
+}