[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/64] slirp: use a callback structure to interface w
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULL 15/64] slirp: use a callback structure to interface with qemu |
Date: |
Wed, 19 Dec 2018 00:03:53 +0100 |
From: Marc-André Lureau <address@hidden>
This will bring slirp a bit forward to the state of an independent
project.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
net/slirp.c | 6 +++++-
slirp/libslirp.h | 13 +++++++++++--
slirp/ncsi.c | 2 +-
slirp/slirp.c | 10 +++++-----
slirp/slirp.h | 2 +-
5 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index dfc72cfc2e..a7802ddbcc 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -140,6 +140,10 @@ static NetClientInfo net_slirp_info = {
.cleanup = net_slirp_cleanup,
};
+static const SlirpCb slirp_cb = {
+ .output = net_slirp_output,
+};
+
static int net_slirp_init(NetClientState *peer, const char *model,
const char *name, int restricted,
bool ipv4, const char *vnetwork, const char *vhost,
@@ -379,7 +383,7 @@ static int net_slirp_init(NetClientState *peer, const char
*model,
vhostname, tftp_server_name,
tftp_export, bootfile, dhcp,
dns, ip6_dns, dnssearch, vdomainname,
- net_slirp_output, s);
+ &slirp_cb, s);
QTAILQ_INSERT_TAIL(&slirp_stacks, s, entry);
for (config = slirp_configs; config; config = config->next) {
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 04b6db9f49..a5d1b27b5e 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -5,7 +5,16 @@
typedef struct Slirp Slirp;
-typedef void (*slirp_output)(void *opaque, const uint8_t *pkt, int pkt_len);
+/*
+ * Callbacks from slirp
+ *
+ * The opaque parameter comes from the opaque parameter given to slirp_init().
+ */
+typedef struct SlirpCb {
+ /* Send an ethernet frame to the guest network. */
+ void (*output)(void *opaque, const uint8_t *pkt, int pkt_len);
+} SlirpCb;
+
Slirp *slirp_init(int restricted, bool in_enabled, struct in_addr vnetwork,
struct in_addr vnetmask, struct in_addr vhost,
@@ -17,7 +26,7 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct
in_addr vnetwork,
struct in_addr vdhcp_start, struct in_addr vnameserver,
struct in6_addr vnameserver6, const char **vdnssearch,
const char *vdomainname,
- slirp_output output,
+ const SlirpCb *callbacks,
void *opaque);
void slirp_cleanup(Slirp *slirp);
diff --git a/slirp/ncsi.c b/slirp/ncsi.c
index d7701f7785..10decfb5ef 100644
--- a/slirp/ncsi.c
+++ b/slirp/ncsi.c
@@ -163,5 +163,5 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int
pkt_len)
*pchecksum = htonl(checksum);
ncsi_rsp_len += 4;
- slirp->output(slirp->opaque, ncsi_reply, ETH_HLEN + ncsi_rsp_len);
+ slirp->cb->output(slirp->opaque, ncsi_reply, ETH_HLEN + ncsi_rsp_len);
}
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 0e4ade3e4a..7213915bf3 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -288,14 +288,14 @@ Slirp *slirp_init(int restricted, bool in_enabled, struct
in_addr vnetwork,
struct in_addr vdhcp_start, struct in_addr vnameserver,
struct in6_addr vnameserver6, const char **vdnssearch,
const char *vdomainname,
- slirp_output output,
+ const SlirpCb *callbacks,
void *opaque)
{
Slirp *slirp = g_malloc0(sizeof(Slirp));
slirp_init_once();
- slirp->output = output;
+ slirp->cb = callbacks;
slirp->grand = g_rand_new();
slirp->restricted = restricted;
@@ -843,7 +843,7 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int
pkt_len)
rah->ar_sip = ah->ar_tip;
memcpy(rah->ar_tha, ah->ar_sha, ETH_ALEN);
rah->ar_tip = ah->ar_sip;
- slirp->output(slirp->opaque, arp_reply, sizeof(arp_reply));
+ slirp->cb->output(slirp->opaque, arp_reply, sizeof(arp_reply));
}
break;
case ARPOP_REPLY:
@@ -943,7 +943,7 @@ static int if_encap4(Slirp *slirp, struct mbuf *ifm, struct
ethhdr *eh,
/* target IP */
rah->ar_tip = iph->ip_dst.s_addr;
slirp->client_ipaddr = iph->ip_dst;
- slirp->output(slirp->opaque, arp_req, sizeof(arp_req));
+ slirp->cb->output(slirp->opaque, arp_req, sizeof(arp_req));
ifm->resolution_requested = true;
/* Expire request and drop outgoing packet after 1 second */
@@ -1029,7 +1029,7 @@ int if_encap(Slirp *slirp, struct mbuf *ifm)
eh->h_dest[0], eh->h_dest[1], eh->h_dest[2],
eh->h_dest[3], eh->h_dest[4], eh->h_dest[5]));
memcpy(buf + sizeof(struct ethhdr), ifm->m_data, ifm->m_len);
- slirp->output(slirp->opaque, buf, ifm->m_len + ETH_HLEN);
+ slirp->cb->output(slirp->opaque, buf, ifm->m_len + ETH_HLEN);
return 1;
}
diff --git a/slirp/slirp.h b/slirp/slirp.h
index de299aa36c..f7c087456a 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -220,7 +220,7 @@ struct Slirp {
GRand *grand;
QEMUTimer *ra_timer;
- slirp_output output;
+ const SlirpCb *cb;
void *opaque;
};
--
2.19.2
- [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H, (continued)
- [Qemu-devel] [PULL 27/64] slirp: remove HAVE_SYS_FILIO_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 25/64] slirp: remove unused HAVE_SYS_SELECT_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 22/64] slirp: remove unused HAVE_SYS_STROPTS_H, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 38/64] slirp: remove unused sbflush(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 31/64] slirp: replace SIZEOF_CHAR_P with glib equivalent, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 43/64] glib-compat: add g_spawn_async_with_fds() fallback, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 28/64] slirp: remove unused DECLARE_IOVEC, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 41/64] slirp: replace ARRAY_SIZE with G_N_ELEMENTS, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 45/64] slirp: replace error_report() with g_critical(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 35/64] slirp: improve a bit the debug macros, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 15/64] slirp: use a callback structure to interface with qemu,
Samuel Thibault <=
- [Qemu-devel] [PULL 44/64] slirp: simplify fork_exec(), Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 46/64] slirp: Enable fork_exec support on Windows, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 40/64] slirp: remove dead TCP_ACK_HACK code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 39/64] slirp: NULL is defined by stddef.h, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 48/64] slirp: rename exec_list, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 37/64] slirp: remove #if notdef dead code, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 32/64] slirp: replace compile time DO_KEEPALIVE, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 51/64] slirp: replace some fprintf() with DEBUG_MISC, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 54/64] slirp: always build with debug statements, Samuel Thibault, 2018/12/18
- [Qemu-devel] [PULL 49/64] slirp: use virtual time for packet expiration, Samuel Thibault, 2018/12/18