ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix networking on win32 host 

At least under some mingw compilers slirp networking fails without declaring
these fields packed.

From: Juha Riihimäki <juha.riihimaki@nokia.com>
Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>
Signed-off-by: Riku Voipio <riku.voipio@nokia.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Juha Riihimäki 2009-12-03 15:56:04 +02:00 committed by Aurelien Jarno
parent 099fe236d5
commit 9a0c6a3373
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slirp/ip.h
View File

@ -91,7 +91,7 @@ struct ip {
u_int8_t ip_p; /* protocol */ u_int8_t ip_p; /* protocol */
u_int16_t ip_sum; /* checksum */ u_int16_t ip_sum; /* checksum */
struct in_addr ip_src,ip_dst; /* source and dest address */ struct in_addr ip_src,ip_dst; /* source and dest address */
}; } __attribute__((packed));
#define IP_MAXPACKET 65535 /* maximum packet size */ #define IP_MAXPACKET 65535 /* maximum packet size */
@ -153,7 +153,7 @@ struct ip_timestamp {
n_long ipt_time; n_long ipt_time;
} ipt_ta[1]; } ipt_ta[1];
} ipt_timestamp; } ipt_timestamp;
}; } __attribute__((packed));
/* flag bits for ipt_flg */ /* flag bits for ipt_flg */
#define IPOPT_TS_TSONLY 0 /* timestamps only */ #define IPOPT_TS_TSONLY 0 /* timestamps only */
@ -183,11 +183,11 @@ struct ip_timestamp {
struct mbuf_ptr { struct mbuf_ptr {
struct mbuf *mptr; struct mbuf *mptr;
uint32_t dummy; uint32_t dummy;
}; } __attribute__((packed));
#else #else
struct mbuf_ptr { struct mbuf_ptr {
struct mbuf *mptr; struct mbuf *mptr;
}; } __attribute__((packed));
#endif #endif
struct qlink { struct qlink {
void *next, *prev; void *next, *prev;
@ -219,7 +219,7 @@ struct ipq {
u_int8_t ipq_p; /* protocol of this fragment */ u_int8_t ipq_p; /* protocol of this fragment */
u_int16_t ipq_id; /* sequence id for reassembly */ u_int16_t ipq_id; /* sequence id for reassembly */
struct in_addr ipq_src,ipq_dst; struct in_addr ipq_src,ipq_dst;
}; } __attribute__((packed));
/* /*
* Ip header, when holding a fragment. * Ip header, when holding a fragment.
@ -229,7 +229,7 @@ struct ipq {
struct ipasfrag { struct ipasfrag {
struct qlink ipf_link; struct qlink ipf_link;
struct ip ipf_ip; struct ip ipf_ip;
}; } __attribute__((packed));
#define ipf_off ipf_ip.ip_off #define ipf_off ipf_ip.ip_off
#define ipf_tos ipf_ip.ip_tos #define ipf_tos ipf_ip.ip_tos
@ -248,6 +248,6 @@ struct ipasfrag {
struct ipoption { struct ipoption {
struct in_addr ipopt_dst; /* first-hop dst if source routed */ struct in_addr ipopt_dst; /* first-hop dst if source routed */
int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */ int8_t ipopt_list[MAX_IPOPTLEN]; /* options proper */
}; } __attribute__((packed));
#endif #endif