slirp_input(buf, size);
}
+static int slirp_in_use;
+
+static void net_slirp_cleanup(VLANClientState *vc)
+{
+ slirp_in_use = 0;
+}
+
static int net_slirp_init(VLANState *vlan, const char *model, const char *name)
{
+ if (slirp_in_use) {
+ /* slirp only supports a single instance so far */
+ return -1;
+ }
if (!slirp_inited) {
slirp_inited = 1;
slirp_init(slirp_restrict, slirp_ip);
}
slirp_vc = qemu_new_vlan_client(vlan, model, name,
- slirp_receive, NULL, NULL, NULL);
+ slirp_receive, NULL, net_slirp_cleanup, NULL);
slirp_vc->info_str[0] = '\0';
+ slirp_in_use = 1;
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;
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, "%s", errmsg);
+ } else {
+ fprintf(stderr, "qemu: %s", errmsg);
+ exit(1);
+ }
}
#ifndef _WIN32
uint8_t buf[4096];
int size;
- size = vde_recv(s->vde, buf, sizeof(buf), 0);
+ size = vde_recv(s->vde, (char *)buf, sizeof(buf), 0);
if (size > 0) {
qemu_send_packet(s->vc, buf, size);
}
VDEState *s = opaque;
int ret;
for(;;) {
- ret = vde_send(s->vde, buf, size, 0);
+ ret = vde_send(s->vde, (const char *)buf, size, 0);
if (ret < 0 && errno == EINTR) {
} else {
break;
};
s = qemu_mallocz(sizeof(VDEState));
- s->vde = vde_open(init_sock, "QEMU", &args);
+ s->vde = vde_open(init_sock, (char *)"QEMU", &args);
if (!s->vde){
free(s);
return -1;
uint8_t *macaddr;
int idx = nic_get_free_idx();
- if (check_params(buf, sizeof(buf), nic_params, p) < 0) {
+ if (check_params(nic_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
static const char * const slirp_params[] = {
"vlan", "name", "hostname", "restrict", "ip", NULL
};
- if (check_params(buf, sizeof(buf), slirp_params, p) < 0) {
+ if (check_params(slirp_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
};
char ifname[64];
- if (check_params(buf, sizeof(buf), tap_params, p) < 0) {
+ if (check_params(tap_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
int fd;
vlan->nb_host_devs++;
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
- if (check_params(buf, sizeof(buf), fd_params, p) < 0) {
+ if (check_params(fd_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
static const char * const tap_params[] = {
"vlan", "name", "ifname", "script", "downscript", NULL
};
- if (check_params(buf, sizeof(buf), tap_params, p) < 0) {
+ if (check_params(tap_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
if (!strcmp(device, "socket")) {
if (get_param_value(buf, sizeof(buf), "fd", p) > 0) {
int fd;
- if (check_params(buf, sizeof(buf), fd_params, p) < 0) {
+ if (check_params(fd_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
static const char * const listen_params[] = {
"vlan", "name", "listen", NULL
};
- if (check_params(buf, sizeof(buf), listen_params, p) < 0) {
+ if (check_params(listen_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
static const char * const connect_params[] = {
"vlan", "name", "connect", NULL
};
- if (check_params(buf, sizeof(buf), connect_params, p) < 0) {
+ if (check_params(connect_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
static const char * const mcast_params[] = {
"vlan", "name", "mcast", NULL
};
- if (check_params(buf, sizeof(buf), mcast_params, p) < 0) {
+ if (check_params(mcast_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
char vde_sock[1024], vde_group[512];
int vde_port, vde_mode;
- if (check_params(buf, sizeof(buf), vde_params, p) < 0) {
+ if (check_params(vde_params, p) < 0) {
fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
buf, p);
return -1;
monitor_printf(mon, "invalid host network device %s\n", device);
return;
}
- if (net_client_init(device, opts ? : "") < 0) {
+ if (net_client_init(device, opts ? opts : "") < 0) {
monitor_printf(mon, "adding host network device %s failed\n", device);
}
}