motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: do not depend on slirp internals

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

7
net/colo.h
View file

@ -15,10 +15,9 @@
#ifndef QEMU_COLO_PROXY_H
#define QEMU_COLO_PROXY_H
#include "slirp/slirp.h"
#include "qemu/jhash.h"
#include "qemu/timer.h"
#include "slirp/tcp.h"
#include "net/eth.h"
#define HASHTABLE_MAX_SIZE 16384
@ -81,10 +80,10 @@ typedef struct Connection {
/* the maximum of acknowledgement number in secondary_list queue */
uint32_t sack;
/* offset = secondary_seq - primary_seq */
tcp_seq offset;
uint32_t offset;
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;
uint32_t connection_key_hash(const void *opaque);