Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually attempt to obtain DNS server from DHCP

Browse Source
This commit is contained in:
Kevin Lange 2016-09-05 15:23:25 +09:00
parent c9a85035ae
commit 5b0b012fc0
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/net.c
View File

@ -13,6 +13,7 @@
static hashmap_t * dns_cache;
static list_t * dns_waiters = NULL;
static uint32_t _dns_server;
static hashmap_t *_tcp_sockets = NULL;
static hashmap_t *_udp_sockets = NULL;
@ -424,7 +425,7 @@ static size_t write_dns_packet(uint8_t * buffer, size_t queries_len, uint8_t * q
.protocol = IPV4_PROT_UDP,
.checksum = 0, /* fill this in later */
.source = htonl(_netif.source),
.destination = htonl(ip_aton("10.0.2.3")),
.destination = htonl(_dns_server),
};
uint16_t checksum = calculate_ipv4_checksum(&ipv4_out);
@ -860,6 +861,32 @@ static void placeholder_dhcp(void) {
_netif.source = yiaddr;
debug_print(NOTICE," Scanning offer for DNS servers...");
size_t i = sizeof(struct dhcp_packet);
size_t j = 0;
while (i < length) {
uint8_t type = dhcp->options[j];
uint8_t len = dhcp->options[j+1];
uint8_t * data = &dhcp->options[j+2];
debug_print(NOTICE," type=%d, len=%d", type, len);
if (type == 255) {
break;
} else if (type == 6) {
/* DNS Server! */
uint32_t dnsaddr = ntohl(*(uint32_t *)data);
char ip[16];
ip_ntoa(dnsaddr, ip);
debug_print(NOTICE, "Found one: %s", ip);
_dns_server = dnsaddr;
}
j += 2 + len;
i += 2 + len;
}
free(eth);
}
@ -869,6 +896,8 @@ void net_handler(void * data, char * name) {
/* Network Packet Handler*/
_netif.extra = NULL;
_dns_server = ip_aton("10.0.2.3");
placeholder_dhcp();
dns_waiters = list_create();