return 0;
}
-void qemu_send_packet(VLANClientState *vc1, const uint8_t *buf, int size)
+static void
+qemu_deliver_packet(VLANClientState *sender, const uint8_t *buf, int size)
{
- VLANState *vlan = vc1->vlan;
VLANClientState *vc;
- if (vc1->link_down)
+ for (vc = sender->vlan->first_client; vc != NULL; vc = vc->next) {
+ if (vc != sender && !vc->link_down) {
+ vc->fd_read(vc->opaque, buf, size);
+ }
+ }
+}
+
+void qemu_send_packet(VLANClientState *vc, const uint8_t *buf, int size)
+{
+ VLANState *vlan = vc->vlan;
+ VLANPacket *packet;
+
+ if (vc->link_down)
return;
#ifdef DEBUG_NET
printf("vlan %d send:\n", vlan->id);
hex_dump(stdout, buf, size);
#endif
- for(vc = vlan->first_client; vc != NULL; vc = vc->next) {
- if (vc != vc1 && !vc->link_down) {
- vc->fd_read(vc->opaque, buf, size);
+ if (vlan->delivering) {
+ packet = qemu_malloc(sizeof(VLANPacket) + size);
+ packet->next = vlan->send_queue;
+ packet->sender = vc;
+ packet->size = size;
+ memcpy(packet->data, buf, size);
+ vlan->send_queue = packet;
+ } else {
+ vlan->delivering = 1;
+ qemu_deliver_packet(vc, buf, size);
+ while ((packet = vlan->send_queue) != NULL) {
+ qemu_deliver_packet(packet->sender, packet->data, packet->size);
+ vlan->send_queue = packet->next;
+ qemu_free(packet);
}
+ vlan->delivering = 0;
}
}
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)
+static void net_slirp_redir_print(void *opaque, int is_udp,
+ struct in_addr *laddr, u_int lport,
+ struct in_addr *faddr, u_int fport)
+{
+ Monitor *mon = (Monitor *)opaque;
+ uint32_t h_addr;
+ uint32_t g_addr;
+ char buf[16];
+
+ h_addr = ntohl(faddr->s_addr);
+ g_addr = ntohl(laddr->s_addr);
+
+ monitor_printf(mon, " %s |", is_udp ? "udp" : "tcp" );
+ snprintf(buf, 15, "%d.%d.%d.%d", (h_addr >> 24) & 0xff,
+ (h_addr >> 16) & 0xff,
+ (h_addr >> 8) & 0xff,
+ (h_addr) & 0xff);
+ monitor_printf(mon, " %15s |", buf);
+ monitor_printf(mon, " %5d |", fport);
+
+ snprintf(buf, 15, "%d.%d.%d.%d", (g_addr >> 24) & 0xff,
+ (g_addr >> 16) & 0xff,
+ (g_addr >> 8) & 0xff,
+ (g_addr) & 0xff);
+ monitor_printf(mon, " %15s |", buf);
+ monitor_printf(mon, " %5d\n", lport);
+
+}
+
+static void net_slirp_redir_list(Monitor *mon)
+{
+ if (!mon)
+ return;
+
+ monitor_printf(mon, " Prot | Host Addr | HPort | Guest Addr | GPort\n");
+ monitor_printf(mon, " | | | | \n");
+ slirp_redir_loop(net_slirp_redir_print, mon);
+}
+
+static void net_slirp_redir_rm(Monitor *mon, const char *port_str)
+{
+ int host_port;
+ char buf[256] = "";
+ const char *p = port_str;
+ int is_udp = 0;
+ int n;
+
+ if (!mon)
+ return;
+
+ if (!port_str || !port_str[0])
+ goto fail_syntax;
+
+ get_str_sep(buf, sizeof(buf), &p, ':');
+
+ if (!strcmp(buf, "tcp") || buf[0] == '\0') {
+ is_udp = 0;
+ } else if (!strcmp(buf, "udp")) {
+ is_udp = 1;
+ } else {
+ goto fail_syntax;
+ }
+
+ host_port = atoi(p);
+
+ n = slirp_redir_rm(is_udp, host_port);
+
+ monitor_printf(mon, "removed %d redirections to %s port %d\n", n,
+ is_udp ? "udp" : "tcp", host_port);
+ return;
+
+ fail_syntax:
+ monitor_printf(mon, "invalid format\n");
+}
+
+void net_slirp_redir(Monitor *mon, const char *redir_str, const char *redir_opt2)
{
int is_udp;
char buf[256], *r;
- const char *p;
+ const char *p, *errmsg;
struct in_addr guest_addr;
int host_port, guest_port;
slirp_init(slirp_restrict, slirp_ip);
}
+ if (!strcmp(redir_str, "remove")) {
+ net_slirp_redir_rm(mon, redir_opt2);
+ return;
+ }
+
+ if (!strcmp(redir_str, "list")) {
+ net_slirp_redir_list(mon);
+ return;
+ }
+
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;
return;
}
- ts = muldiv64 (qemu_get_clock(vm_clock),1000000, ticks_per_sec);
+ ts = muldiv64(qemu_get_clock(vm_clock), 1000000, ticks_per_sec);
caplen = size > s->pcap_caplen ? s->pcap_caplen : size;
- hdr.ts.tv_sec = ts / 1000000000LL;
+ hdr.ts.tv_sec = ts / 1000000;
hdr.ts.tv_usec = ts % 1000000;
hdr.caplen = caplen;
hdr.len = size;
uint8_t *macaddr;
int idx = nic_get_free_idx();
- if (check_params(buf, sizeof(buf), nic_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(nic_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (idx == -1 || nb_nics >= MAX_NICS) {
static const char * const slirp_params[] = {
"vlan", "name", "hostname", "restrict", "ip", NULL
};
- if (check_params(buf, sizeof(buf), slirp_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(slirp_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (get_param_value(buf, sizeof(buf), "hostname", p)) {
};
char ifname[64];
- if (check_params(buf, sizeof(buf), tap_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(tap_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
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) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(fd_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
fd = strtol(buf, NULL, 0);
static const char * const tap_params[] = {
"vlan", "name", "ifname", "script", "downscript", NULL
};
- if (check_params(buf, sizeof(buf), tap_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(tap_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
if (get_param_value(ifname, sizeof(ifname), "ifname", p) <= 0) {
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) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(fd_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
fd = strtol(buf, NULL, 0);
static const char * const listen_params[] = {
"vlan", "name", "listen", NULL
};
- if (check_params(buf, sizeof(buf), listen_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(listen_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
ret = net_socket_listen_init(vlan, device, name, buf);
static const char * const connect_params[] = {
"vlan", "name", "connect", NULL
};
- if (check_params(buf, sizeof(buf), connect_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(connect_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
ret = net_socket_connect_init(vlan, device, name, buf);
static const char * const mcast_params[] = {
"vlan", "name", "mcast", NULL
};
- if (check_params(buf, sizeof(buf), mcast_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(mcast_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
ret = net_socket_mcast_init(vlan, device, name, buf);
char vde_sock[1024], vde_group[512];
int vde_port, vde_mode;
- if (check_params(buf, sizeof(buf), vde_params, p) < 0) {
- fprintf(stderr, "qemu: invalid parameter '%s' in '%s'\n",
- buf, p);
+ if (check_params(vde_params, p) < 0) {
+ fprintf(stderr, "qemu: invalid parameter in '%s'\n", p);
return -1;
}
vlan->nb_host_devs++;
monitor_printf(mon, "invalid host network device %s\n", device);
return;
}
- net_client_init(device, opts);
+ if (net_client_init(device, opts ? opts : "") < 0) {
+ monitor_printf(mon, "adding host network device %s failed\n", device);
+ }
}
void net_host_device_remove(Monitor *mon, int vlan_id, const char *device)
projects / qemu / blobdiff