be32_t server_address;
be32_t subnet_mask;
be32_t router;
- struct in_addr **dns;
+ struct in_addr *dns;
+ size_t dns_size;
+ uint16_t mtu;
+ char *hostname;
};
typedef struct DHCPLease DHCPLease;
return 0;
}
-int sd_dhcp_client_get_netmask(sd_dhcp_client *client, struct in_addr *addr)
+int sd_dhcp_client_get_mtu(sd_dhcp_client *client, uint16_t *mtu)
{
assert_return(client, -EINVAL);
- assert_return(addr, -EINVAL);
+ assert_return(mtu, -EINVAL);
switch (client->state) {
case DHCP_STATE_INIT:
case DHCP_STATE_BOUND:
case DHCP_STATE_RENEWING:
case DHCP_STATE_REBINDING:
- addr->s_addr = client->lease->subnet_mask;
+ if (client->lease->mtu)
+ *mtu = client->lease->mtu;
+ else
+ return -ENOENT;
break;
}
return 0;
}
-int sd_dhcp_client_get_dns(sd_dhcp_client *client, struct in_addr ***addr)
+int sd_dhcp_client_get_dns(sd_dhcp_client *client, struct in_addr **addr, size_t *addr_size)
{
assert_return(client, -EINVAL);
assert_return(addr, -EINVAL);
+ assert_return(addr_size, -EINVAL);
switch (client->state) {
case DHCP_STATE_INIT:
case DHCP_STATE_BOUND:
case DHCP_STATE_RENEWING:
case DHCP_STATE_REBINDING:
- if (client->lease->dns)
+ if (client->lease->dns_size) {
+ *addr_size = client->lease->dns_size;
*addr = client->lease->dns;
+ } else
+ return -ENOENT;
+
+ break;
+ }
+
+ return 0;
+}
+
+int sd_dhcp_client_get_hostname(sd_dhcp_client *client, const char **hostname)
+{
+ assert_return(client, -EINVAL);
+ assert_return(hostname, -EINVAL);
+
+ switch (client->state) {
+ case DHCP_STATE_INIT:
+ case DHCP_STATE_SELECTING:
+ case DHCP_STATE_INIT_REBOOT:
+ case DHCP_STATE_REBOOTING:
+ case DHCP_STATE_REQUESTING:
+ return -EADDRNOTAVAIL;
+
+ case DHCP_STATE_BOUND:
+ case DHCP_STATE_RENEWING:
+ case DHCP_STATE_REBINDING:
+ if (client->lease->hostname)
+ *hostname = client->lease->hostname;
else
return -ENOENT;
return 0;
}
-static int client_notify(sd_dhcp_client *client, int event)
+int sd_dhcp_client_get_netmask(sd_dhcp_client *client, struct in_addr *addr)
{
- if (client->cb)
- client->cb(client, event, client->userdata);
+ assert_return(client, -EINVAL);
+ assert_return(addr, -EINVAL);
- return 0;
-}
+ switch (client->state) {
+ case DHCP_STATE_INIT:
+ case DHCP_STATE_SELECTING:
+ case DHCP_STATE_INIT_REBOOT:
+ case DHCP_STATE_REBOOTING:
+ case DHCP_STATE_REQUESTING:
+ return -EADDRNOTAVAIL;
+
+ case DHCP_STATE_BOUND:
+ case DHCP_STATE_RENEWING:
+ case DHCP_STATE_REBINDING:
+ addr->s_addr = client->lease->subnet_mask;
-static void in_addrs_free(struct in_addr **addrs) {
- unsigned i;
+ break;
+ }
- if (!addrs)
- return;
+ return 0;
+}
- for (i = 0; addrs[i]; i++)
- free(addrs[i]);
+static int client_notify(sd_dhcp_client *client, int event)
+{
+ if (client->cb)
+ client->cb(client, event, client->userdata);
- free(addrs);
+ return 0;
}
static int client_stop(sd_dhcp_client *client, int error)
}
if (client->lease) {
- in_addrs_free(client->lease->dns);
+ free(client->lease->dns);
free(client->lease);
client->lease = NULL;
}
if (len >= 4) {
unsigned i;
- in_addrs_free(lease->dns);
+ lease->dns_size = len / 4;
- lease->dns = new0(struct in_addr*, len / 4 + 1);
+ free(lease->dns);
+ lease->dns = new0(struct in_addr, lease->dns_size);
if (!lease->dns)
return -ENOMEM;
- for (i = 0; i < len / 4; i++) {
- lease->dns[i] = new0(struct in_addr, 1);
- memcpy(&lease->dns[i]->s_addr, option + 4 * i, 4);
+ for (i = 0; i < lease->dns_size; i++) {
+ memcpy(&lease->dns[i].s_addr, option + 4 * i, 4);
}
+ }
+
+ break;
+
+ case DHCP_OPTION_INTERFACE_MTU:
+ if (len >= 2) {
+ be16_t mtu;
+
+ memcpy(&mtu, option, 2);
+ lease->mtu = be16toh(mtu);
+
+ if (lease->mtu < 68)
+ lease->mtu = 0;
+ }
+
+ break;
- lease->dns[i + 1] = NULL;
+ case DHCP_OPTION_HOST_NAME:
+ if (len >= 1) {
+ free(lease->hostname);
+ lease->hostname = strndup((const char *)option, len);
}
break;