Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

net/libslirp: Fix the layout of struct tcpiphdr #172

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

net/libslirp: Fix the layout of struct tcpiphdr #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions net/libslirp/files/cheribsd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ index ecca972..4ea2852 100644
ti->ti_x0 = 0;
ti->ti_src6 = save_ip6.ip_src;
diff --git src/tcpip.h src/tcpip.h
index a0fb228..278b1d8 100644
index a0fb228..553344f 100644
--- src/tcpip.h
+++ src/tcpip.h
@@ -38,7 +38,7 @@
Expand All @@ -76,11 +76,13 @@ index a0fb228..278b1d8 100644
union {
struct {
struct in_addr ih_src; /* source internet address */
@@ -57,7 +57,6 @@ struct tcpiphdr {
@@ -56,8 +56,7 @@ struct tcpiphdr {
uint16_t ti_x0;
uint16_t ti_len; /* protocol length */
struct tcphdr ti_t; /* tcp header */
};
-};
-#define ti_mbuf ih_mbuf.mptr
+} SLIRP_PACKED;
#define ti_pr ti.ti_i4.ih_pr
#define ti_src ti.ti_i4.ih_src
#define ti_dst ti.ti_i4.ih_dst
Expand Down