diff options
| author | Vito Piserchia <vito.piserchia@dreamlab.net> | 2016-11-03 15:08:56 +0100 |
|---|---|---|
| committer | Vito Piserchia <vito.piserchia@dreamlab.net> | 2016-11-03 15:08:56 +0100 |
| commit | 087ca9d0d5c03fe0a6943d1763348ef317a824d2 (patch) | |
| tree | 2dd8ff68321acb8232373da247dfdbefd661b4f7 /src/lib/protocols | |
| parent | 8169b35fa68c5dde575b961820271f4b05dd6e4d (diff) | |
| parent | 002b8b04e9ff06aa75a93af4466361636ef38820 (diff) | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/lib/protocols')
| -rw-r--r-- | src/lib/protocols/openvpn.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/protocols/openvpn.c b/src/lib/protocols/openvpn.c index 3e8412355..234f18df8 100644 --- a/src/lib/protocols/openvpn.c +++ b/src/lib/protocols/openvpn.c @@ -37,11 +37,19 @@ #define P_PACKET_ID_ARRAY_LEN_OFFSET(hmac_size) (P_HARD_RESET_PACKET_ID_OFFSET(hmac_size) + 8) #define P_HARD_RESET_CLIENT_MAX_COUNT 5 -static inline u_int32_t get_packet_id(const u_int8_t * payload, u_int8_t hms) { +static +#ifndef WIN32 +inline +#endif +u_int32_t get_packet_id(const u_int8_t * payload, u_int8_t hms) { return ntohl(*(u_int32_t*)(payload + P_HARD_RESET_PACKET_ID_OFFSET(hms))); } -static inline int8_t check_pkid_and_detect_hmac_size(const u_int8_t * payload) { +static +#ifndef WIN32 +inline +#endif +int8_t check_pkid_and_detect_hmac_size(const u_int8_t * payload) { // try to guess if (get_packet_id(payload, P_HMAC_160) == 1) return P_HMAC_160; |