My original patch only returned the first DNS server, but we might
want all of them.
be32_t server_address;
be32_t subnet_mask;
be32_t router;
be32_t server_address;
be32_t subnet_mask;
be32_t router;
};
typedef struct DHCPLease DHCPLease;
};
typedef struct DHCPLease DHCPLease;
-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)
{
assert_return(client, -EINVAL);
assert_return(addr, -EINVAL);
{
assert_return(client, -EINVAL);
assert_return(addr, -EINVAL);
case DHCP_STATE_RENEWING:
case DHCP_STATE_REBINDING:
if (client->lease->dns)
case DHCP_STATE_RENEWING:
case DHCP_STATE_REBINDING:
if (client->lease->dns)
- addr->s_addr = client->lease->dns;
+ *addr = client->lease->dns;
+static void in_addrs_free(struct in_addr **addrs) {
+ unsigned i;
+
+ if (!addrs)
+ return;
+
+ for (i = 0; addrs[i]; i++)
+ free(addrs[i]);
+
+ free(addrs);
+}
+
static int client_stop(sd_dhcp_client *client, int error)
{
assert_return(client, -EINVAL);
static int client_stop(sd_dhcp_client *client, int error)
{
assert_return(client, -EINVAL);
+ in_addrs_free(client->lease->dns);
free(client->lease);
client->lease = NULL;
}
free(client->lease);
client->lease = NULL;
}
break;
case DHCP_OPTION_DOMAIN_NAME_SERVER:
break;
case DHCP_OPTION_DOMAIN_NAME_SERVER:
- if (len >= 4)
- memcpy(&lease->dns, option, 4);
+ if (len >= 4) {
+ unsigned i;
+
+ in_addrs_free(lease->dns);
+
+ lease->dns = new0(struct in_addr*, len / 4 + 1);
+ 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);
+ }
+
+ lease->dns[i + 1] = NULL;
+ }
int sd_dhcp_client_get_netmask(sd_dhcp_client *client, struct in_addr *addr);
int sd_dhcp_client_prefixlen(const struct in_addr *addr);
int sd_dhcp_client_get_router(sd_dhcp_client *client, struct in_addr *addr);
int sd_dhcp_client_get_netmask(sd_dhcp_client *client, struct in_addr *addr);
int sd_dhcp_client_prefixlen(const struct in_addr *addr);
int sd_dhcp_client_get_router(sd_dhcp_client *client, struct in_addr *addr);
-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);
int sd_dhcp_client_stop(sd_dhcp_client *client);
int sd_dhcp_client_start(sd_dhcp_client *client);
int sd_dhcp_client_stop(sd_dhcp_client *client);
int sd_dhcp_client_start(sd_dhcp_client *client);