motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 23:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

slirp: Enhance host-guest redirection setup (Jan Kiszka)

Browse source 
Allow to establish a TCP/UDP connection redirection also via a monitor
command 'host_net_redir'. Moreover, assume TCP as connection type if
that parameter is omitted.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7204 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-04-21 19:56:44 +00:00
parent 764a4d1deb
commit d4ebe1934a
5 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

35
net.c
View file

@ -556,11 +556,11 @@ static int net_slirp_init(VLANState *vlan, const char *model, const char *name)
return 0;
}
void net_slirp_redir(const char *redir_str)
void net_slirp_redir(Monitor *mon, const char *redir_str)
{
int is_udp;
char buf[256], *r;
const char *p;
const char *p, *errmsg;
struct in_addr guest_addr;
int host_port, guest_port;
@ -571,41 +571,48 @@ void net_slirp_redir(const char *redir_str)
p = redir_str;
if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)
goto fail;
if (!strcmp(buf, "tcp")) {
goto fail_syntax;
if (!strcmp(buf, "tcp") || buf[0] == '\0') {
is_udp = 0;
} else if (!strcmp(buf, "udp")) {
is_udp = 1;
} else {
goto fail;
goto fail_syntax;
}
if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)
goto fail;
goto fail_syntax;
host_port = strtol(buf, &r, 0);
if (r == buf)
goto fail;
goto fail_syntax;
if (get_str_sep(buf, sizeof(buf), &p, ':') < 0)
goto fail;
goto fail_syntax;
if (buf[0] == '\0') {
pstrcpy(buf, sizeof(buf), "10.0.2.15");
}
if (!inet_aton(buf, &guest_addr))
goto fail;
goto fail_syntax;
guest_port = strtol(p, &r, 0);
if (r == p)
goto fail;
goto fail_syntax;
if (slirp_redir(is_udp, host_port, guest_addr, guest_port) < 0) {
fprintf(stderr, "qemu: could not set up redirection\n");
exit(1);
errmsg = "could not set up redirection\n";
goto fail;
}
return;
fail_syntax:
errmsg = "invalid redirection format\n";
fail:
fprintf(stderr, "qemu: syntax: -redir [tcp|udp]:host-port:[guest-host]:guest-port\n");
exit(1);
if (mon) {
monitor_printf(mon, errmsg);
} else {
fprintf(stderr, "qemu: %s", errmsg);
exit(1);
}
}
#ifndef _WIN32