openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

slirp: use a dedicated field for chardev pointer 

Let's not mix command line and chardev pointers.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-10 17:45:39 +04:00 committed by Samuel Thibault
parent 7765bee0e3
commit 3ed9f823c6
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/slirp.c
View File

@ -709,8 +709,8 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf); CONFIG_SMBD_COMMAND, s->smb_dir, smb_conf);
g_free(smb_conf); g_free(smb_conf);
if (slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 139) < 0 || if (slirp_add_exec(s->slirp, NULL, smb_cmdline, &vserver_addr, 139) < 0 ||
slirp_add_exec(s->slirp, 0, smb_cmdline, &vserver_addr, 445) < 0) { slirp_add_exec(s->slirp, NULL, smb_cmdline, &vserver_addr, 445) < 0) {
slirp_smb_cleanup(s); slirp_smb_cleanup(s);
g_free(smb_cmdline); g_free(smb_cmdline);
error_setg(errp, "Conflicting/invalid smbserver address"); error_setg(errp, "Conflicting/invalid smbserver address");
@ -774,7 +774,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp)
snprintf(buf, sizeof(buf), "guestfwd.tcp.%d", port); snprintf(buf, sizeof(buf), "guestfwd.tcp.%d", port);
if ((strlen(p) > 4) && !strncmp(p, "cmd:", 4)) { if ((strlen(p) > 4) && !strncmp(p, "cmd:", 4)) {
if (slirp_add_exec(s->slirp, 0, &p[4], &server, port) < 0) { if (slirp_add_exec(s->slirp, NULL, &p[4], &server, port) < 0) {
error_setg(errp, "Conflicting/invalid host:port in guest " error_setg(errp, "Conflicting/invalid host:port in guest "
"forwarding rule '%s'", config_str); "forwarding rule '%s'", config_str);
return -1; return -1;
@ -801,7 +801,7 @@ static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp)
return -1; return -1;
} }
if (slirp_add_exec(s->slirp, 3, &fwd->hd, &server, port) < 0) { if (slirp_add_exec(s->slirp, &fwd->hd, NULL, &server, port) < 0) {
error_setg(errp, "Conflicting/invalid host:port in guest " error_setg(errp, "Conflicting/invalid host:port in guest "
"forwarding rule '%s'", config_str); "forwarding rule '%s'", config_str);
g_free(fwd); g_free(fwd);

2
slirp/libslirp.h
View File

@ -35,7 +35,7 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp,
struct in_addr guest_addr, int guest_port); struct in_addr guest_addr, int guest_port);
int slirp_remove_hostfwd(Slirp *slirp, int is_udp, int slirp_remove_hostfwd(Slirp *slirp, int is_udp,
struct in_addr host_addr, int host_port); struct in_addr host_addr, int host_port);
int slirp_add_exec(Slirp *slirp, int do_pty, const void *args, int slirp_add_exec(Slirp *slirp, void *chardev, const char *cmdline,
struct in_addr *guest_addr, int guest_port); struct in_addr *guest_addr, int guest_port);
void slirp_connection_info(Slirp *slirp, Monitor *mon); void slirp_connection_info(Slirp *slirp, Monitor *mon);

11
slirp/misc.c
View File

@ -37,7 +37,7 @@ remque(void *a)
element->qh_rlink = NULL; element->qh_rlink = NULL;
} }
int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec, int add_exec(struct ex_list **ex_ptr, void *chardev, const char *cmdline,
struct in_addr addr, int port) struct in_addr addr, int port)
{ {
struct ex_list *tmp_ptr; struct ex_list *tmp_ptr;
@ -50,11 +50,14 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec,
} }
tmp_ptr = *ex_ptr; tmp_ptr = *ex_ptr;
*ex_ptr = g_new(struct ex_list, 1); *ex_ptr = g_new0(struct ex_list, 1);
(*ex_ptr)->ex_fport = port; (*ex_ptr)->ex_fport = port;
(*ex_ptr)->ex_addr = addr; (*ex_ptr)->ex_addr = addr;
(*ex_ptr)->ex_chardev = do_pty == 3; if (chardev) {
(*ex_ptr)->ex_exec = (do_pty == 3) ? exec : g_strdup(exec); (*ex_ptr)->ex_chardev = chardev;
} else {
(*ex_ptr)->ex_exec = g_strdup(cmdline);
}
(*ex_ptr)->ex_next = tmp_ptr; (*ex_ptr)->ex_next = tmp_ptr;
return 0; return 0;
} }

4
slirp/misc.h
View File

@ -9,7 +9,7 @@
#define MISC_H #define MISC_H
struct ex_list { struct ex_list {
int ex_chardev; void *ex_chardev;
struct in_addr ex_addr; /* Server address */ struct in_addr ex_addr; /* Server address */
int ex_fport; /* Port to telnet to */ int ex_fport; /* Port to telnet to */
const char *ex_exec; /* Command line of what to exec */ const char *ex_exec; /* Command line of what to exec */
@ -52,7 +52,7 @@ struct slirp_quehead {
void slirp_insque(void *, void *); void slirp_insque(void *, void *);
void slirp_remque(void *); void slirp_remque(void *);
int add_exec(struct ex_list **, int, char *, struct in_addr, int); int add_exec(struct ex_list **, void *, const char *, struct in_addr, int);
int fork_exec(struct socket *so, const char *ex); int fork_exec(struct socket *so, const char *ex);
#endif #endif

5
slirp/slirp.c
View File

@ -1068,7 +1068,7 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp, struct in_addr host_addr,
return 0; return 0;
} }
int slirp_add_exec(Slirp *slirp, int do_pty, const void *args, int slirp_add_exec(Slirp *slirp, void *chardev, const char *cmdline,
struct in_addr *guest_addr, int guest_port) struct in_addr *guest_addr, int guest_port)
{ {
if (!guest_addr->s_addr) { if (!guest_addr->s_addr) {
@ -1081,7 +1081,8 @@ int slirp_add_exec(Slirp *slirp, int do_pty, const void *args,
guest_addr->s_addr == slirp->vnameserver_addr.s_addr) { guest_addr->s_addr == slirp->vnameserver_addr.s_addr) {
return -1; return -1;
} }
return add_exec(&slirp->exec_list, do_pty, (char *)args, *guest_addr,
return add_exec(&slirp->exec_list, chardev, cmdline, *guest_addr,
htons(guest_port)); htons(guest_port));
} }

2
slirp/tcp_subr.c
View File

@ -962,7 +962,7 @@ int tcp_ctl(struct socket *so)
so->so_faddr.s_addr == ex_ptr->ex_addr.s_addr) { so->so_faddr.s_addr == ex_ptr->ex_addr.s_addr) {
if (ex_ptr->ex_chardev) { if (ex_ptr->ex_chardev) {
so->s = -1; so->s = -1;
so->extra = (void *)ex_ptr->ex_exec; so->extra = ex_ptr->ex_chardev;
return 1; return 1;
} }
DEBUG_MISC((dfd, " executing %s\n", ex_ptr->ex_exec)); DEBUG_MISC((dfd, " executing %s\n", ex_ptr->ex_exec));