X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-network%2Fsd-dhcp-lease.c;h=bfd1b0cd1840fd06af11607fac9999b112135ef5;hb=8f077bf94e129fa1b6f0159e3140c4326f1066cf;hp=2ec45ca949b01c89ea888599b9d818aa5dddba69;hpb=e140ae58f1c10bbd75ef94afc07d07b82323b506;p=elogind.git diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 2ec45ca94..bfd1b0cd1 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -47,6 +47,15 @@ int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) { return 0; } +int sd_dhcp_lease_get_lifetime(sd_dhcp_lease *lease, uint32_t *lifetime) { + assert_return(lease, -EINVAL); + assert_return(lease, -EINVAL); + + *lifetime = lease->lifetime; + + return 0; +} + int sd_dhcp_lease_get_mtu(sd_dhcp_lease *lease, uint16_t *mtu) { assert_return(lease, -EINVAL); assert_return(mtu, -EINVAL); @@ -59,28 +68,26 @@ int sd_dhcp_lease_get_mtu(sd_dhcp_lease *lease, uint16_t *mtu) { return 0; } -int sd_dhcp_lease_get_dns(sd_dhcp_lease *lease, struct in_addr **addr, size_t *addr_size) { +int sd_dhcp_lease_get_dns(sd_dhcp_lease *lease, const struct in_addr **addr) { assert_return(lease, -EINVAL); assert_return(addr, -EINVAL); - assert_return(addr_size, -EINVAL); if (lease->dns_size) { - *addr_size = lease->dns_size; *addr = lease->dns; + return lease->dns_size; } else return -ENOENT; return 0; } -int sd_dhcp_lease_get_ntp(sd_dhcp_lease *lease, struct in_addr **addr, size_t *addr_size) { +int sd_dhcp_lease_get_ntp(sd_dhcp_lease *lease, const struct in_addr **addr) { 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; + return lease->ntp_size; } else return -ENOENT; @@ -162,6 +169,20 @@ int sd_dhcp_lease_get_next_server(sd_dhcp_lease *lease, struct in_addr *addr) { return 0; } +int sd_dhcp_lease_get_routes(sd_dhcp_lease *lease, struct sd_dhcp_route **routes) { + + assert_return(lease, -EINVAL); + assert_return(routes, -EINVAL); + + if (lease->static_route_size) { + *routes = lease->static_route; + return lease->static_route_size; + } else + return -ENOENT; + + return 0; +} + sd_dhcp_lease *sd_dhcp_lease_ref(sd_dhcp_lease *lease) { if (lease) assert_se(REFCNT_INC(lease->n_ref) >= 2); @@ -175,6 +196,7 @@ sd_dhcp_lease *sd_dhcp_lease_unref(sd_dhcp_lease *lease) { free(lease->domainname); free(lease->dns); free(lease->ntp); + free(lease->static_route); free(lease); } @@ -196,6 +218,10 @@ static void lease_parse_u32(const uint8_t *option, size_t len, uint32_t *ret, ui } } +static void lease_parse_s32(const uint8_t *option, size_t len, int32_t *ret) { + lease_parse_u32(option, len, (uint32_t *)ret, 0); +} + static void lease_parse_u16(const uint8_t *option, size_t len, uint16_t *ret, uint16_t min) { be16_t val; @@ -219,6 +245,26 @@ static void lease_parse_be32(const uint8_t *option, size_t len, be32_t *ret) { memcpy(ret, option, 4); } +static void lease_parse_bool(const uint8_t *option, size_t len, bool *ret) { + assert(option); + assert(ret); + + if (len == 1) + *ret = !!(*option); +} + +static void lease_parse_u8(const uint8_t *option, size_t len, uint8_t *ret, uint8_t min) { + assert(option); + assert(ret); + + if (len == 1) { + *ret = *option; + + if (*ret < min) + *ret = min; + } +} + static int lease_parse_string(const uint8_t *option, size_t len, char **ret) { assert(option); assert(ret); @@ -237,12 +283,12 @@ static int lease_parse_string(const uint8_t *option, size_t len, char **ret) { return 0; } -static int lease_parse_in_addrs(const uint8_t *option, size_t len, struct in_addr **ret, size_t *ret_size) { +static int lease_parse_in_addrs_aux(const uint8_t *option, size_t len, struct in_addr **ret, size_t *ret_size, size_t mult) { assert(option); assert(ret); assert(ret_size); - if (len && !(len % 4)) { + if (len && !(len % (4 * mult))) { size_t size; struct in_addr *addresses; @@ -260,6 +306,119 @@ static int lease_parse_in_addrs(const uint8_t *option, size_t len, struct in_add return 0; } +static int lease_parse_in_addrs(const uint8_t *option, size_t len, struct in_addr **ret, size_t *ret_size) { + return lease_parse_in_addrs_aux(option, len, ret, ret_size, 1); +} + +static int lease_parse_in_addrs_pairs(const uint8_t *option, size_t len, struct in_addr **ret, size_t *ret_size) { + return lease_parse_in_addrs_aux(option, len, ret, ret_size, 2); +} + +static int class_prefixlen(uint8_t msb_octet, uint8_t *ret) { + if (msb_octet < 128) + /* Class A */ + *ret = 8; + else if (msb_octet < 192) + /* Class B */ + *ret = 16; + else if (msb_octet < 224) + /* Class C */ + *ret = 24; + else + /* Class D or E -- no subnet mask */ + return -ERANGE; + + return 0; +} + +static int lease_parse_routes(const uint8_t *option, size_t len, struct sd_dhcp_route **routes, + size_t *routes_size, size_t *routes_allocated) { + + struct in_addr addr; + + assert(option); + assert(routes); + assert(routes_size); + assert(routes_allocated); + + if (!len) + return 0; + + if (len % 8 != 0) + return -EINVAL; + + if (!GREEDY_REALLOC(*routes, *routes_allocated, *routes_size + (len / 8))) + return -ENOMEM; + + while (len >= 8) { + struct sd_dhcp_route *route = *routes + *routes_size; + + if (class_prefixlen(*option, &route->dst_prefixlen) < 0) { + log_error("Failed to determine destination prefix length from class based IP, ignoring"); + continue; + } + + lease_parse_be32(option, 4, &addr.s_addr); + route->dst_addr = inet_makeaddr(inet_netof(addr), 0); + option += 4; + + lease_parse_be32(option, 4, &route->gw_addr.s_addr); + option += 4; + + len -= 8; + (*routes_size)++; + } + + return 0; +} + +/* parses RFC3442 Classless Static Route Option */ +static int lease_parse_classless_routes(const uint8_t *option, size_t len, struct sd_dhcp_route **routes, + size_t *routes_size, size_t *routes_allocated) { + + assert(option); + assert(routes); + assert(routes_size); + assert(routes_allocated); + + /* option format: (subnet-mask-width significant-subnet-octets gateway-ip)* */ + + while (len > 0) { + uint8_t dst_octets; + struct sd_dhcp_route *route; + + if (!GREEDY_REALLOC(*routes, *routes_allocated, *routes_size + 1)) + return -ENOMEM; + + route = *routes + *routes_size; + + dst_octets = (*option == 0 ? 0 : ((*option - 1) / 8) + 1); + route->dst_prefixlen = *option; + option++; + len--; + + /* can't have more than 4 octets in IPv4 */ + if (dst_octets > 4 || len < dst_octets) + return -EINVAL; + + route->dst_addr.s_addr = 0; + memcpy(&route->dst_addr.s_addr, option, dst_octets); + option += dst_octets; + len -= dst_octets; + + if (len < 4) + return -EINVAL; + + lease_parse_be32(option, 4, &route->gw_addr.s_addr); + option += 4; + len -= 4; + + (*routes_size)++; + } + + return 0; +} + int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option, void *user_data) { sd_dhcp_lease *lease = user_data; @@ -269,6 +428,16 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option, switch(code) { + case DHCP_OPTION_TIME_OFFSET: + lease_parse_s32(option, len, &lease->time_offset); + + break; + + case DHCP_OPTION_INTERFACE_MTU_AGING_TIMEOUT: + lease_parse_u32(option, len, &lease->mtu_aging_timeout, 0); + + break; + case DHCP_OPTION_IP_ADDRESS_LEASE_TIME: lease_parse_u32(option, len, &lease->lifetime, 1); @@ -284,6 +453,11 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option, break; + case DHCP_OPTION_BROADCAST: + lease_parse_be32(option, len, &lease->broadcast); + + break; + case DHCP_OPTION_ROUTER: lease_parse_be32(option, len, &lease->router); @@ -303,11 +477,41 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option, break; + case DHCP_OPTION_POLICY_FILTER: + r = lease_parse_in_addrs_pairs(option, len, &lease->policy_filter, &lease->policy_filter_size); + if (r < 0) + return r; + + break; + + case DHCP_OPTION_STATIC_ROUTE: + r = lease_parse_routes(option, len, &lease->static_route, &lease->static_route_size, + &lease->static_route_allocated); + if (r < 0) + return r; + + break; + case DHCP_OPTION_INTERFACE_MTU: lease_parse_u16(option, len, &lease->mtu, 68); break; + case DHCP_OPTION_INTERFACE_MDR: + lease_parse_u16(option, len, &lease->mdr, 576); + + break; + + case DHCP_OPTION_INTERFACE_TTL: + lease_parse_u8(option, len, &lease->ttl, 1); + + break; + + case DHCP_OPTION_BOOT_FILE_SIZE: + lease_parse_u16(option, len, &lease->boot_file_size, 0); + + break; + case DHCP_OPTION_DOMAIN_NAME: r = lease_parse_string(option, len, &lease->domainname); if (r < 0) @@ -338,6 +542,24 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const uint8_t *option, lease_parse_u32(option, len, &lease->t2, 1); break; + + case DHCP_OPTION_ENABLE_IP_FORWARDING: + lease_parse_bool(option, len, &lease->ip_forward); + + break; + + case DHCP_OPTION_ENABLE_IP_FORWARDING_NL: + lease_parse_bool(option, len, &lease->ip_forward_non_local); + + break; + + case DHCP_OPTION_CLASSLESS_STATIC_ROUTE: + r = lease_parse_classless_routes(option, len, &lease->static_route, &lease->static_route_size, + &lease->static_route_allocated); + if (r < 0) + return r; + + break; } return 0; @@ -361,10 +583,10 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; struct in_addr address; - struct in_addr *addresses; - size_t addresses_size; + const struct in_addr *addresses; const char *string; uint16_t mtu; + struct sd_dhcp_route *routes; int r; assert(lease); @@ -407,13 +629,17 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { if (r >= 0) fprintf(f, "MTU=%" PRIu16 "\n", mtu); - r = sd_dhcp_lease_get_dns(lease, &addresses, &addresses_size); + fputs("DNS=", f); + r = sd_dhcp_lease_get_dns(lease, &addresses); if (r >= 0) - serialize_in_addrs(f, "DNS", addresses, addresses_size); + serialize_in_addrs(f, addresses, r); + fputs("\n", f); - r = sd_dhcp_lease_get_ntp(lease, &addresses, &addresses_size); + fputs("NTP=", f); + r = sd_dhcp_lease_get_ntp(lease, &addresses); if (r >= 0) - serialize_in_addrs(f, "NTP", addresses, addresses_size); + serialize_in_addrs(f, addresses, r); + fputs("\n", f); r = sd_dhcp_lease_get_domainname(lease, &string); if (r >= 0) @@ -427,6 +653,10 @@ int dhcp_lease_save(sd_dhcp_lease *lease, const char *lease_file) { if (r >= 0) fprintf(f, "ROOT_PATH=%s\n", string); + r = sd_dhcp_lease_get_routes(lease, &routes); + if (r >= 0) + serialize_dhcp_routes(f, "ROUTES", routes, r); + r = 0; fflush(f); @@ -448,7 +678,7 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) { _cleanup_dhcp_lease_unref_ sd_dhcp_lease *lease = NULL; _cleanup_free_ char *address = NULL, *router = NULL, *netmask = NULL, *server_address = NULL, *next_server = NULL, - *dns = NULL, *ntp = NULL, *mtu = NULL; + *dns = NULL, *ntp = NULL, *mtu = NULL, *routes = NULL; struct in_addr addr; int r; @@ -471,6 +701,7 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) { "DOMAINNAME", &lease->domainname, "HOSTNAME", &lease->hostname, "ROOT_PATH", &lease->root_path, + "ROUTES", &routes, NULL); if (r < 0) { if (r == -ENOENT) @@ -517,15 +748,19 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) { } if (dns) { - r = deserialize_in_addrs(&lease->dns, &lease->dns_size, dns); + r = deserialize_in_addrs(&lease->dns, dns); if (r < 0) return r; + + lease->dns_size = r; } if (ntp) { - r = deserialize_in_addrs(&lease->ntp, &lease->ntp_size, dns); + r = deserialize_in_addrs(&lease->ntp, ntp); if (r < 0) return r; + + lease->ntp_size = r; } if (mtu) { @@ -534,6 +769,13 @@ int dhcp_lease_load(const char *lease_file, sd_dhcp_lease **ret) { lease->mtu = u; } + if (routes) { + r = deserialize_dhcp_routes(&lease->static_route, &lease->static_route_size, + &lease->static_route_allocated, routes); + if (r < 0) + return r; + } + *ret = lease; lease = NULL;