mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slirp: added basic 'dnssearch' option (currently only 1 entry supported).

Browse Source 
TODO: 'dnssearch' option should accept a comma-separated list of suffixes.
Other slirp TODOs: SMB support on Linux, reduce code duplication (ARP, DHCP, TFTP)
This commit is contained in:
Volker Ruppert 2014-03-08 08:54:33 +00:00
parent bfe6ecabb8
commit 46037ee5f5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bochs/iodev/network/eth_slirp_new.cc
View File

@ -54,7 +54,7 @@ private:
int restricted;
struct in_addr net, mask, host, dhcp, dns;
char *bootfile, *hostname;
char *bootfile, *hostname, *dnssearch[2];
bx_bool parse_slirp_conf(const char *conf);
static void rx_timer_handler(void *);
@ -77,6 +77,8 @@ bx_slirp_new_pktmover_c::bx_slirp_new_pktmover_c()
slirp = NULL;
bootfile = NULL;
hostname = NULL;
dnssearch[0] = NULL;
dnssearch[1] = NULL;
}
bx_slirp_new_pktmover_c::~bx_slirp_new_pktmover_c()
@ -149,6 +151,13 @@ bx_bool bx_slirp_new_pktmover_c::parse_slirp_conf(const char *conf)
} else {
BX_ERROR(("slirp: wrong format for 'bootfile'"));
}
} else if (!stricmp(param, "dnssearch")) {
if (len2 < 512) {
dnssearch[0] = (char*)malloc(len2+1);
strcpy(dnssearch[0], val);
} else {
BX_ERROR(("slirp: wrong format for 'dnssearch'"));
}
} else if (!stricmp(param, "net")) {
if (!inet_aton(val, &net)) {
BX_ERROR(("slirp: wrong format for 'net'"));
@ -222,7 +231,7 @@ bx_slirp_new_pktmover_c::bx_slirp_new_pktmover_c(const char *netif,
sprintf(prefix, "SLIRP%d", bx_slirp_instances);
slirplog->put(prefix);
slirp = slirp_init(restricted, net, mask, host, hostname, netif, bootfile, dhcp, dns,
NULL, this, slirplog);
(const char**)dnssearch, this, slirplog);
bx_slirp_instances++;
}

1
bochs/misc/slirp.conf
View File

@ -11,6 +11,7 @@
# DHCPSTART start address of DHCP pool
# DNS IP address of the virtual DNS server
# BOOTFILE boot filename returned by DHCP
# DNSSEARCH TODO: comma-separated list of DNS suffixes to search (DHCP extension)
# This is the classic slirp setup
# restricted = 0