Skip to content

Fix Windows build #1

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

Closed
floppyhammer wants to merge 2 commits into from
Closed

Fix Windows build #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
021eaa5
Try to fix windows build errors
vertexodessa Jan 31, 2025
97e6d7a
Fix Windows build
floppyhammer Feb 1, 2025
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
28 changes: 18 additions & 10 deletions src/FrameParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,14 @@ typedef unsigned int u32;
(IEEE80211_RADIOTAP_MCS_HAVE_MCS | IEEE80211_RADIOTAP_MCS_HAVE_BW | IEEE80211_RADIOTAP_MCS_HAVE_GI | \
IEEE80211_RADIOTAP_MCS_HAVE_STBC | IEEE80211_RADIOTAP_MCS_HAVE_FEC)

#ifdef __GNUC__
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
#endif

#ifdef _MSC_VER
#define PACK( __Declaration__ ) __pragma( pack(push, 1) ) __Declaration__ __pragma( pack(pop))
#endif

union Keytype
{
u8 skey[16];
Expand Down Expand Up @@ -400,7 +408,7 @@ struct pkt_attrib
u8 inject; /* == a5 if injected */
};

struct rtw_ieee80211_hdr
PACK(struct rtw_ieee80211_hdr
{
u16 frame_ctl;
u16 duration_id;
Expand All @@ -409,19 +417,19 @@ struct rtw_ieee80211_hdr
u8 addr3[ETH_ALEN];
u16 seq_ctl;
u8 addr4[ETH_ALEN];
} __attribute__((packed));
});

struct rtw_ieee80211_hdr_3addr
PACK(struct rtw_ieee80211_hdr_3addr
{
u16 frame_ctl;
u16 duration_id;
u8 addr1[ETH_ALEN];
u8 addr2[ETH_ALEN];
u8 addr3[ETH_ALEN];
u16 seq_ctl;
} __attribute__((packed));
});

struct rtw_ieee80211_hdr_qos
PACK(struct rtw_ieee80211_hdr_qos
{
u16 frame_ctl;
u16 duration_id;
Expand All @@ -431,9 +439,9 @@ struct rtw_ieee80211_hdr_qos
u16 seq_ctl;
u8 addr4[ETH_ALEN];
u16 qc;
} __attribute__((packed));
});

struct rtw_ieee80211_hdr_3addr_qos
PACK(struct rtw_ieee80211_hdr_3addr_qos
{
u16 frame_ctl;
u16 duration_id;
Expand All @@ -442,16 +450,16 @@ struct rtw_ieee80211_hdr_3addr_qos
u8 addr3[ETH_ALEN];
u16 seq_ctl;
u16 qc;
} __attribute__((packed));
});

struct eapol
PACK(struct eapol
{
u8 snap[6];
u16 ethertype;
u8 version;
u8 type;
u16 length;
} __attribute__((packed));
});

struct tx_desc
{
Expand Down
Loading