slirp: Remove our_addr code
PATCH 1/1 slirp: Remove our_addr code
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: aside from the CU-SeeMe protocol emulation which I propose removing, the only other reference is in get_dns_addr(), but can't imagine why you would want 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.
---
slirp/main.h +0 -1
@@ -30,7 +30,6 @@ extern char *slirp_tty;extern char *exec_shell;extern u_int curtime;extern fd_set *global_readfds, *global_writefds, *global_xfds; -extern struct in_addr our_addr;extern struct in_addr loopback_addr;extern char *username;extern char *socket_path;
slirp/slirp.c +0 -17
@@ -26,8 +26,6 @@#include "slirp.h" #include "hw/hw.h" -/* host address */ -struct in_addr our_addr;/* host loopback address */ struct in_addr loopback_addr;
@@ -129,8 +127,6 @@ int get_dns_addr(struct in_addr *pdns_addr)if (sscanf (buff,"nameserver%*[ \t]%256s" , buff2) ==1 ) {if (!inet_aton (buff2, &tmp_addr))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 (!found) { *pdns_addr = tmp_addr;
@@ -164,8 +160,6 @@ int get_dns_addr(struct in_addr *pdns_addr)static void slirp_init_once (void ) {static int initialized; -struct hostent *he; -char our_name[256 ];#ifdef _WIN32WSADATA Data;#endif
@@ -181,17 +175,6 @@ static void slirp_init_once(void)#endif 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; - } }static void slirp_state_save (QEMUFile *f,void *opaque);
Quoted 7 lines · Ed Swierk
- It's useless: aside from the CU-SeeMe protocol emulation which I propose removing, the only other reference is in
get_dns_addr(), but can't imagine why you would want 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.
Note that VirtualBox removed this code recently as well:
http://www.virtualbox.org/ticket/1470 .
--Ed
Quoted 11 lines · Ed Swierk
Quoted 7 lines · Ed Swierk
- It's useless: aside from the CU-SeeMe protocol emulation which I propose removing, the only other reference is in
get_dns_addr(), but can't imagine why you would want 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.
Note that VirtualBox removed this code recently as well:
http://www.virtualbox.org/ticket/1470 .
While I don't consider VirtualBox as a good reference for changing QEMU code ;), the patch has my conditional ack (depending on the CUSEEME emulation removal).
Thanks for picking all this up!
Jan