david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slirp: Remove our_addr code

Browse Source 
Three problems with our_addr:

- It's determined only once when qemu starts, but the address can change
(just like the DNS configuration can).

- It's supposed to be the IP address of a host network interface, but
there's no guarantee that gethostbyname(gethostname()) actually does
that: the host might be a laptop that has only a loopback interface up,
or the hostname might be localhost.localdomain, etc.

- It's useless at best: get_dns_addr() calls it, there's no reason to
send DNS requests to a different IP address if you're running a DNS
server on the host and resolv.conf points to 127.0.0.1.

These problems are easily solved by removing the code.

Signed-off-by: Ed Swierk <eswierk@aristanetworks.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Ed Swierk 2009-08-20 19:00:25 -07:00 committed by Anthony Liguori
parent 382f074371
commit ce0bd027df
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slirp/main.h
View File

@ -30,7 +30,6 @@ extern char *slirp_tty;
extern char *exec_shell; extern char *exec_shell;
extern u_int curtime; extern u_int curtime;
extern fd_set *global_readfds, *global_writefds, *global_xfds; extern fd_set *global_readfds, *global_writefds, *global_xfds;
extern struct in_addr our_addr;
extern struct in_addr loopback_addr; extern struct in_addr loopback_addr;
extern struct in_addr dns_addr; extern struct in_addr dns_addr;
extern char *username; extern char *username;

17
slirp/slirp.c
View File

@ -27,8 +27,6 @@
#include "slirp.h" #include "slirp.h"
#include "hw/hw.h" #include "hw/hw.h"
/* host address */
struct in_addr our_addr;
/* host dns address */ /* host dns address */
struct in_addr dns_addr; struct in_addr dns_addr;
/* host loopback address */ /* host loopback address */
@ -117,8 +115,6 @@ static int get_dns_addr(struct in_addr *pdns_addr)
if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1) { if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1) {
if (!inet_aton(buff2, &tmp_addr)) if (!inet_aton(buff2, &tmp_addr))
continue; continue;
if (tmp_addr.s_addr == loopback_addr.s_addr)
tmp_addr = our_addr;
/* If it's the first one, set it to dns_addr */ /* If it's the first one, set it to dns_addr */
if (!found) if (!found)
*pdns_addr = tmp_addr; *pdns_addr = tmp_addr;
@ -149,8 +145,6 @@ static int get_dns_addr(struct in_addr *pdns_addr)
static void slirp_init_once(void) static void slirp_init_once(void)
{ {
static int initialized; static int initialized;
struct hostent *he;
char our_name[256];
#ifdef _WIN32 #ifdef _WIN32
WSADATA Data; WSADATA Data;
#endif #endif
@ -167,17 +161,6 @@ static void slirp_init_once(void)
loopback_addr.s_addr = htonl(INADDR_LOOPBACK); loopback_addr.s_addr = htonl(INADDR_LOOPBACK);
/* FIXME: This address may change during runtime */
if (gethostname(our_name, sizeof(our_name)) == 0) {
he = gethostbyname(our_name);
if (he) {
our_addr = *(struct in_addr *)he->h_addr;
}
}
if (our_addr.s_addr == 0) {
our_addr = loopback_addr;
}
/* FIXME: This address may change during runtime */ /* FIXME: This address may change during runtime */
if (get_dns_addr(&dns_addr) < 0) { if (get_dns_addr(&dns_addr) < 0) {
dns_addr = loopback_addr; dns_addr = loopback_addr;