Merge pull request #1211 from qeeg/master

More POSIX fixes
This commit is contained in:
Miran Grča
2021-01-07 17:24:57 +01:00
committed by GitHub
4 changed files with 7 additions and 4 deletions

View File

@@ -81,15 +81,15 @@ struct bpf_program {
typedef struct pcap_if pcap_if_t; typedef struct pcap_if pcap_if_t;
typedef struct timeval { typedef struct net_timeval {
long tv_sec; long tv_sec;
long tv_usec; long tv_usec;
} timeval; } net_timeval;
#define PCAP_ERRBUF_SIZE 256 #define PCAP_ERRBUF_SIZE 256
struct pcap_pkthdr { struct pcap_pkthdr {
struct timeval ts; struct net_timeval ts;
bpf_u_int32 caplen; bpf_u_int32 caplen;
bpf_u_int32 len; bpf_u_int32 len;
}; };

View File

@@ -38,6 +38,7 @@
#include "slirp.h" #include "slirp.h"
#include "ip_icmp.h" #include "ip_icmp.h"
#include <stddef.h>
static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp); static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
static void ip_freef(Slirp *slirp, struct ipq *fp); static void ip_freef(Slirp *slirp, struct ipq *fp);

View File

@@ -14,6 +14,7 @@
*/ */
#include "slirp.h" #include "slirp.h"
#include <stddef.h>
#define MBUF_THRESH 30 #define MBUF_THRESH 30

View File

@@ -4,6 +4,7 @@
*/ */
#include "slirp.h" #include "slirp.h"
#include <stdbool.h>
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
#include <sys/un.h> #include <sys/un.h>
#endif #endif
@@ -366,7 +367,7 @@ char *slirp_connection_info(Slirp *slirp)
so->so_rcv.sb_cc, so->so_snd.sb_cc); so->so_rcv.sb_cc, so->so_snd.sb_cc);
} }
return g_string_free(str, FALSE); return g_string_free(str, false);
} }
int slirp_bind_outbound(struct socket *so, unsigned short af) int slirp_bind_outbound(struct socket *so, unsigned short af)