net: do not depend on slirp internals

Only slirp/libslirp.h should be included.

Instead of using some slirp declarations and utility functions directly,
let's copy them in net/util.h.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-14 16:36:40 +04:00 committed by Samuel Thibault
parent 37b9117faa
commit e05ae1d9fb
7 changed files with 72 additions and 15 deletions

View File

@ -30,6 +30,7 @@
#include "net/colo-compare.h" #include "net/colo-compare.h"
#include "migration/colo.h" #include "migration/colo.h"
#include "migration/migration.h" #include "migration/migration.h"
#include "util.h"
#define TYPE_COLO_COMPARE "colo-compare" #define TYPE_COLO_COMPARE "colo-compare"
#define COLO_COMPARE(obj) \ #define COLO_COMPARE(obj) \
@ -129,19 +130,19 @@ static int compare_chr_send(CompareState *s,
static gint seq_sorter(Packet *a, Packet *b, gpointer data) static gint seq_sorter(Packet *a, Packet *b, gpointer data)
{ {
struct tcphdr *atcp, *btcp; struct tcp_hdr *atcp, *btcp;
atcp = (struct tcphdr *)(a->transport_header); atcp = (struct tcp_hdr *)(a->transport_header);
btcp = (struct tcphdr *)(b->transport_header); btcp = (struct tcp_hdr *)(b->transport_header);
return ntohl(atcp->th_seq) - ntohl(btcp->th_seq); return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);
} }
static void fill_pkt_tcp_info(void *data, uint32_t *max_ack) static void fill_pkt_tcp_info(void *data, uint32_t *max_ack)
{ {
Packet *pkt = data; Packet *pkt = data;
struct tcphdr *tcphd; struct tcp_hdr *tcphd;
tcphd = (struct tcphdr *)pkt->transport_header; tcphd = (struct tcp_hdr *)pkt->transport_header;
pkt->tcp_seq = ntohl(tcphd->th_seq); pkt->tcp_seq = ntohl(tcphd->th_seq);
pkt->tcp_ack = ntohl(tcphd->th_ack); pkt->tcp_ack = ntohl(tcphd->th_ack);

View File

@ -15,6 +15,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "trace.h" #include "trace.h"
#include "colo.h" #include "colo.h"
#include "util.h"
uint32_t connection_key_hash(const void *opaque) uint32_t connection_key_hash(const void *opaque)
{ {

View File

@ -15,10 +15,9 @@
#ifndef QEMU_COLO_PROXY_H #ifndef QEMU_COLO_PROXY_H
#define QEMU_COLO_PROXY_H #define QEMU_COLO_PROXY_H
#include "slirp/slirp.h"
#include "qemu/jhash.h" #include "qemu/jhash.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "slirp/tcp.h" #include "net/eth.h"
#define HASHTABLE_MAX_SIZE 16384 #define HASHTABLE_MAX_SIZE 16384
@ -81,10 +80,10 @@ typedef struct Connection {
/* the maximum of acknowledgement number in secondary_list queue */ /* the maximum of acknowledgement number in secondary_list queue */
uint32_t sack; uint32_t sack;
/* offset = secondary_seq - primary_seq */ /* offset = secondary_seq - primary_seq */
tcp_seq offset; uint32_t offset;
int tcp_state; /* TCP FSM state */ int tcp_state; /* TCP FSM state */
tcp_seq fin_ack_seq; /* the seq of 'fin=1,ack=1' */ uint32_t fin_ack_seq; /* the seq of 'fin=1,ack=1' */
} Connection; } Connection;
uint32_t connection_key_hash(const void *opaque); uint32_t connection_key_hash(const void *opaque);

View File

@ -22,6 +22,7 @@
#include "net/checksum.h" #include "net/checksum.h"
#include "net/colo.h" #include "net/colo.h"
#include "migration/colo.h" #include "migration/colo.h"
#include "util.h"
#define FILTER_COLO_REWRITER(obj) \ #define FILTER_COLO_REWRITER(obj) \
OBJECT_CHECK(RewriterState, (obj), TYPE_FILTER_REWRITER) OBJECT_CHECK(RewriterState, (obj), TYPE_FILTER_REWRITER)
@ -73,9 +74,9 @@ static int handle_primary_tcp_pkt(RewriterState *rf,
Connection *conn, Connection *conn,
Packet *pkt, ConnectionKey *key) Packet *pkt, ConnectionKey *key)
{ {
struct tcphdr *tcp_pkt; struct tcp_hdr *tcp_pkt;
tcp_pkt = (struct tcphdr *)pkt->transport_header; tcp_pkt = (struct tcp_hdr *)pkt->transport_header;
if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) { if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) {
trace_colo_filter_rewriter_pkt_info(__func__, trace_colo_filter_rewriter_pkt_info(__func__,
inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst),
@ -176,9 +177,9 @@ static int handle_secondary_tcp_pkt(RewriterState *rf,
Connection *conn, Connection *conn,
Packet *pkt, ConnectionKey *key) Packet *pkt, ConnectionKey *key)
{ {
struct tcphdr *tcp_pkt; struct tcp_hdr *tcp_pkt;
tcp_pkt = (struct tcphdr *)pkt->transport_header; tcp_pkt = (struct tcp_hdr *)pkt->transport_header;
if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) { if (trace_event_get_state_backends(TRACE_COLO_FILTER_REWRITER_DEBUG)) {
trace_colo_filter_rewriter_pkt_info(__func__, trace_colo_filter_rewriter_pkt_info(__func__,

View File

@ -38,12 +38,12 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "slirp/libslirp.h" #include "slirp/libslirp.h"
#include "slirp/ip6.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "util.h"
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
{ {

View File

@ -26,6 +26,61 @@
#define QEMU_NET_UTIL_H #define QEMU_NET_UTIL_H
/*
* Structure of an internet header, naked of options.
*/
struct ip {
#ifdef HOST_WORDS_BIGENDIAN
uint8_t ip_v:4, /* version */
ip_hl:4; /* header length */
#else
uint8_t ip_hl:4, /* header length */
ip_v:4; /* version */
#endif
uint8_t ip_tos; /* type of service */
uint16_t ip_len; /* total length */
uint16_t ip_id; /* identification */
uint16_t ip_off; /* fragment offset field */
#define IP_DF 0x4000 /* don't fragment flag */
#define IP_MF 0x2000 /* more fragments flag */
#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */
uint8_t ip_ttl; /* time to live */
uint8_t ip_p; /* protocol */
uint16_t ip_sum; /* checksum */
struct in_addr ip_src, ip_dst; /* source and dest address */
} QEMU_PACKED;
static inline bool in6_equal_net(const struct in6_addr *a,
const struct in6_addr *b,
int prefix_len)
{
if (memcmp(a, b, prefix_len / 8) != 0) {
return 0;
}
if (prefix_len % 8 == 0) {
return 1;
}
return a->s6_addr[prefix_len / 8] >> (8 - (prefix_len % 8))
== b->s6_addr[prefix_len / 8] >> (8 - (prefix_len % 8));
}
#define TCPS_CLOSED 0 /* closed */
#define TCPS_LISTEN 1 /* listening for connection */
#define TCPS_SYN_SENT 2 /* active, have sent syn */
#define TCPS_SYN_RECEIVED 3 /* have send and received syn */
/* states < TCPS_ESTABLISHED are those where connections not established */
#define TCPS_ESTABLISHED 4 /* established */
#define TCPS_CLOSE_WAIT 5 /* rcvd fin, waiting for close */
/* states > TCPS_CLOSE_WAIT are those where user has closed */
#define TCPS_FIN_WAIT_1 6 /* have closed, sent fin */
#define TCPS_CLOSING 7 /* closed xchd FIN; await FIN ACK */
#define TCPS_LAST_ACK 8 /* had fin and close; await FIN ACK */
/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
#define TCPS_FIN_WAIT_2 9 /* have closed, fin is acked */
#define TCPS_TIME_WAIT 10 /* in 2*msl quiet wait after close */
int net_parse_macaddr(uint8_t *macaddr, const char *p); int net_parse_macaddr(uint8_t *macaddr, const char *p);
#endif /* QEMU_NET_UTIL_H */ #endif /* QEMU_NET_UTIL_H */

View File

@ -1,7 +1,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/host-utils.h" #include "qemu/host-utils.h"
#include "slirp/slirp.h" #include "slirp/libslirp.h"
void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout) void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout)
{ {