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

Slirp: added support for up to 5 'hostfwd' redirection rules.

Browse Source 
Fixed MSVC compilation error.
This commit is contained in:
Volker Ruppert 2014-04-18 17:14:32 +00:00
parent a5c687dfb0
commit 2d63afca12
3 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bochs/doc/docbook/user/user.dbk
View File

@ -7080,17 +7080,14 @@ binary packages (<filename>misc/slirp.conf</filename>).
With the config file option "hostfwd" you can map guest ports to ports on the host
system. This is the format of the directive:
<screen>
hostfwd = protocol:hostaddr:hostport-guestaddr:guestport
hostfwd = <emphasis>protocol:hostaddr:hostport-guestaddr:guestport</emphasis>
</screen>
The host and guest IP addresses are optional. This example shows how to access
the guest SSH server using the host port 12345.
<screen>
hostfwd = tcp::12345-:22
</screen>
</para>
<note><title>Limitation</title>
<para>Currently only port redirection is supported per slirp instance.</para>
</note>
Up to 5 port redirection rules are supported per slirp instance.</para>
</section>
</section>

26
bochs/iodev/network/eth_slirp.cc
View File

@ -33,6 +33,8 @@
#define LOG_THIS netdev->
#define MAX_HOSTFWD 5
static int rx_timer_index = BX_NULL_TIMER_HANDLE;
static unsigned int bx_slirp_instances = 0;
fd_set rfds, wfds, xfds;
@ -61,7 +63,8 @@ private:
int restricted;
struct in_addr net, mask, host, dhcp, dns;
char *bootfile, *hostname, **dnssearch;
char *hostfwd;
char *hostfwd[MAX_HOSTFWD];
int n_hostfwd;
#ifndef WIN32
char *smb_export, *smb_tmpdir;
struct in_addr smb_srv;
@ -103,7 +106,9 @@ bx_slirp_pktmover_c::~bx_slirp_pktmover_c()
}
free(dnssearch);
}
if (hostfwd != NULL) free(hostfwd);
while (n_hostfwd > 0) {
free(hostfwd[--n_hostfwd]);
}
if (--bx_slirp_instances == 0) {
bx_pc_system.deactivate_timer(rx_timer_index);
#ifndef WIN32
@ -236,8 +241,13 @@ bx_bool bx_slirp_pktmover_c::parse_slirp_conf(const char *conf)
#endif
} else if (!stricmp(param, "hostfwd")) {
if (len2 < 256) {
hostfwd = (char*)malloc(len2+1);
strcpy(hostfwd, val);
if (n_hostfwd < MAX_HOSTFWD) {
hostfwd[n_hostfwd] = (char*)malloc(len2+1);
strcpy(hostfwd[n_hostfwd], val);
n_hostfwd++;
} else {
BX_ERROR(("slirp: too many 'hostfwd' rules"));
}
} else {
BX_ERROR(("slirp: wrong format for 'hostfwd'"));
}
@ -266,7 +276,7 @@ bx_slirp_pktmover_c::bx_slirp_pktmover_c(const char *netif,
hostname = NULL;
bootfile = NULL;
dnssearch = NULL;
hostfwd = NULL;
n_hostfwd = 0;
/* default settings according to historic slirp */
net.s_addr = htonl(0x0a000200); /* 10.0.2.0 */
mask.s_addr = htonl(0xffffff00); /* 255.255.255.0 */
@ -309,8 +319,10 @@ bx_slirp_pktmover_c::bx_slirp_pktmover_c(const char *netif,
slirplog->put(prefix);
slirp = slirp_init(restricted, net, mask, host, hostname, netif, bootfile, dhcp, dns,
(const char**)dnssearch, this, slirplog);
if (hostfwd != NULL) {
slirp_hostfwd(slirp, hostfwd, 0);
if (n_hostfwd > 0) {
for (int i = 0; i < n_hostfwd; i++) {
slirp_hostfwd(slirp, hostfwd[i], 0);
}
}
#ifndef WIN32
if (smb_export != NULL) {

6
bochs/iodev/network/slirp/compat.cc
View File

@ -268,14 +268,16 @@ static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
int slirp_hostfwd(Slirp *s, const char *redir_str, int legacy_format)
{
struct in_addr host_addr = { .s_addr = INADDR_ANY };
struct in_addr guest_addr = { .s_addr = 0 };
struct in_addr host_addr;
struct in_addr guest_addr;
int host_port, guest_port;
const char *p;
char buf[256], error_msg[256];
int is_udp;
char *end;
host_addr.s_addr = INADDR_ANY;
guest_addr.s_addr = 0;
p = redir_str;
if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
goto fail_syntax;