narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use struct sockaddr rather than struct sockaddr_tcpip 

Tidy up code
pull/1/head
Michael Brown 2007-01-18 03:35:00 +00:00
parent 6601a7da6a
commit 99e58865c7
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/include/gpxe/dns.h
View File

@ -89,21 +89,27 @@ union dns_rr_info {
struct dns_rr_info_cname cname; struct dns_rr_info_cname cname;
}; };
/** A DNS request */
struct dns_request { struct dns_request {
/** Socket address to fill in with resolved address */
struct sockaddr *sa;
struct sockaddr_tcpip *st; /** Current query packet */
struct async async;
struct dns_query query; struct dns_query query;
/** Length of current query packet */
struct dns_query_info *qinfo; struct dns_query_info *qinfo;
/** Recursion counter */
unsigned int recursion; unsigned int recursion;
/** Asynchronous operation */
struct async async;
/** UDP connection */
struct udp_connection udp; struct udp_connection udp;
/** Retry timer */
struct retry_timer timer; struct retry_timer timer;
}; };
extern int dns_resolv ( const char *name, struct sockaddr_tcpip *st, extern int dns_resolv ( const char *name, struct sockaddr *sa,
struct async *parent ); struct async *parent );
#endif /* _GPXE_DNS_H */ #endif /* _GPXE_DNS_H */

21
src/net/udp/dns.c
View File

@ -308,7 +308,7 @@ static int dns_newdata ( struct udp_connection *conn, void *data, size_t len,
/* Found the target A record */ /* Found the target A record */
DBGC ( dns, "DNS %p found address %s\n", DBGC ( dns, "DNS %p found address %s\n",
dns, inet_ntoa ( rr_info->a.in_addr ) ); dns, inet_ntoa ( rr_info->a.in_addr ) );
sin = ( struct sockaddr_in * ) dns->st; sin = ( struct sockaddr_in * ) dns->sa;
sin->sin_family = AF_INET; sin->sin_family = AF_INET;
sin->sin_addr = rr_info->a.in_addr; sin->sin_addr = rr_info->a.in_addr;
@ -403,13 +403,15 @@ static struct async_operations dns_async_operations = {
* Resolve name using DNS * Resolve name using DNS
* *
*/ */
int dns_resolv ( const char *name, struct sockaddr_tcpip *st, int dns_resolv ( const char *name, struct sockaddr *sa,
struct async *parent ) { struct async *parent ) {
struct dns_request *dns; struct dns_request *dns;
struct dhcp_option *option;
union { union {
struct sockaddr_tcpip st; struct sockaddr_tcpip st;
struct sockaddr_in sin; struct sockaddr_in sin;
} nameserver; } nameserver;
int rc; int rc;
/* Allocate DNS structure */ /* Allocate DNS structure */
@ -419,9 +421,10 @@ int dns_resolv ( const char *name, struct sockaddr_tcpip *st,
goto err; goto err;
} }
memset ( dns, 0, sizeof ( *dns ) ); memset ( dns, 0, sizeof ( *dns ) );
dns->st = st; dns->sa = sa;
dns->timer.expired = dns_timer_expired; dns->timer.expired = dns_timer_expired;
dns->udp.udp_op = &dns_udp_operations; dns->udp.udp_op = &dns_udp_operations;
async_init ( &dns->async, &dns_async_operations, parent );
/* Create query */ /* Create query */
dns->query.dns.flags = htons ( DNS_FLAG_QUERY | DNS_FLAG_OPCODE_QUERY | dns->query.dns.flags = htons ( DNS_FLAG_QUERY | DNS_FLAG_OPCODE_QUERY |
@ -431,33 +434,33 @@ int dns_resolv ( const char *name, struct sockaddr_tcpip *st,
dns->qinfo->qtype = htons ( DNS_TYPE_A ); dns->qinfo->qtype = htons ( DNS_TYPE_A );
dns->qinfo->qclass = htons ( DNS_CLASS_IN ); dns->qinfo->qclass = htons ( DNS_CLASS_IN );
/* Open UDP connection */ /* Identify nameserver */
memset ( &nameserver, 0, sizeof ( nameserver ) ); memset ( &nameserver, 0, sizeof ( nameserver ) );
nameserver.sin.sin_family = AF_INET; nameserver.sin.sin_family = AF_INET;
nameserver.sin.sin_port = htons ( DNS_PORT ); nameserver.sin.sin_port = htons ( DNS_PORT );
#warning "DHCP-DNS hack" if ( ! ( option = find_global_dhcp_option ( DHCP_DNS_SERVERS ) ) ) {
struct dhcp_option *option =
find_global_dhcp_option ( DHCP_DNS_SERVERS );
if ( ! option ) {
DBGC ( dns, "DNS %p no name servers\n", dns ); DBGC ( dns, "DNS %p no name servers\n", dns );
rc = -ENXIO; rc = -ENXIO;
goto err; goto err;
} }
dhcp_ipv4_option ( option, &nameserver.sin.sin_addr ); dhcp_ipv4_option ( option, &nameserver.sin.sin_addr );
/* Open UDP connection */
DBGC ( dns, "DNS %p using nameserver %s\n", dns, DBGC ( dns, "DNS %p using nameserver %s\n", dns,
inet_ntoa ( nameserver.sin.sin_addr ) ); inet_ntoa ( nameserver.sin.sin_addr ) );
udp_connect ( &dns->udp, &nameserver.st ); udp_connect ( &dns->udp, &nameserver.st );
if ( ( rc = udp_open ( &dns->udp, 0 ) ) != 0 ) if ( ( rc = udp_open ( &dns->udp, 0 ) ) != 0 )
goto err; goto err;
/* Send first DNS packet */
dns_send_packet ( dns ); dns_send_packet ( dns );
async_init ( &dns->async, &dns_async_operations, parent );
return 0; return 0;
err: err:
DBGC ( dns, "DNS %p could not create request: %s\n", DBGC ( dns, "DNS %p could not create request: %s\n",
dns, strerror ( rc ) ); dns, strerror ( rc ) );
async_uninit ( &dns->async );
free ( dns ); free ( dns );
return rc; return rc;
} }