mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
slirp: Use internal state in interface
This now also exports the internal state to the slirp users in qemu, returning it from slirp_init and expecting it along with service invocations. Additionally provide an opaque value interface for the callbacks from slirp into the qemu core. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
460fec67ee
commit
9f8bd0421d
6 changed files with 108 additions and 84 deletions
|
@ -8,11 +8,11 @@
|
|||
struct Slirp;
|
||||
typedef struct Slirp Slirp;
|
||||
|
||||
void slirp_init(int restricted, struct in_addr vnetwork,
|
||||
struct in_addr vnetmask, struct in_addr vhost,
|
||||
const char *vhostname, const char *tftp_path,
|
||||
const char *bootfile, struct in_addr vdhcp_start,
|
||||
struct in_addr vnameserver);
|
||||
Slirp *slirp_init(int restricted, struct in_addr vnetwork,
|
||||
struct in_addr vnetmask, struct in_addr vhost,
|
||||
const char *vhostname, const char *tftp_path,
|
||||
const char *bootfile, struct in_addr vdhcp_start,
|
||||
struct in_addr vnameserver, void *opaque);
|
||||
|
||||
void slirp_select_fill(int *pnfds,
|
||||
fd_set *readfds, fd_set *writefds, fd_set *xfds);
|
||||
|
@ -20,23 +20,26 @@ void slirp_select_fill(int *pnfds,
|
|||
void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds,
|
||||
int select_error);
|
||||
|
||||
void slirp_input(const uint8_t *pkt, int pkt_len);
|
||||
void slirp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len);
|
||||
|
||||
/* you must provide the following functions: */
|
||||
int slirp_can_output(void);
|
||||
void slirp_output(const uint8_t *pkt, int pkt_len);
|
||||
int slirp_can_output(void *opaque);
|
||||
void slirp_output(void *opaque, const uint8_t *pkt, int pkt_len);
|
||||
|
||||
int slirp_add_hostfwd(int is_udp, struct in_addr host_addr, int host_port,
|
||||
int slirp_add_hostfwd(Slirp *slirp, int is_udp,
|
||||
struct in_addr host_addr, int host_port,
|
||||
struct in_addr guest_addr, int guest_port);
|
||||
int slirp_remove_hostfwd(int is_udp, struct in_addr host_addr, int host_port);
|
||||
int slirp_add_exec(int do_pty, const void *args, struct in_addr guest_addr,
|
||||
int guest_port);
|
||||
int slirp_remove_hostfwd(Slirp *slirp, int is_udp,
|
||||
struct in_addr host_addr, int host_port);
|
||||
int slirp_add_exec(Slirp *slirp, int do_pty, const void *args,
|
||||
struct in_addr guest_addr, int guest_port);
|
||||
|
||||
void slirp_connection_info(Monitor *mon);
|
||||
void slirp_connection_info(Slirp *slirp, Monitor *mon);
|
||||
|
||||
void slirp_socket_recv(struct in_addr guest_addr, int guest_port,
|
||||
const uint8_t *buf, int size);
|
||||
size_t slirp_socket_can_recv(struct in_addr guest_addr, int guest_port);
|
||||
void slirp_socket_recv(Slirp *slirp, struct in_addr guest_addr,
|
||||
int guest_port, const uint8_t *buf, int size);
|
||||
size_t slirp_socket_can_recv(Slirp *slirp, struct in_addr guest_addr,
|
||||
int guest_port);
|
||||
|
||||
#else /* !CONFIG_SLIRP */
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue