diff options
author | 2019-05-13 14:42:24 +0200 | |
---|---|---|
committer | 2019-05-13 14:43:45 +0200 | |
commit | 0a0e51426506985ae1e7cf8c581d109fdad7a725 (patch) | |
tree | b6ce789c802c906c5644f89c1d5a1fa891e9c5a2 /lib/src | |
parent | 7772439ac913ae1d50b4ee31688efac1fba42435 (diff) |
[HICN-194] support for android environment
Change-Id: I11a614709152035784e492ccd99bc383765a0aa1
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
Diffstat (limited to 'lib/src')
-rw-r--r-- | lib/src/compat.c | 72 | ||||
-rw-r--r-- | lib/src/protocol/tcp.h | 6 |
2 files changed, 39 insertions, 39 deletions
diff --git a/lib/src/compat.c b/lib/src/compat.c index 23683ff8e..63431a384 100644 --- a/lib/src/compat.c +++ b/lib/src/compat.c @@ -541,10 +541,10 @@ hicn_packet_get_payload_type (const hicn_header_t * h, switch (HICN_IP_VERSION (h)) { case 6: - *payload_type = ((h->v6.tcp.flags & TCP_FLAG_URG) == TCP_FLAG_URG); + *payload_type = ((h->v6.tcp.flags & HICN_TCP_FLAG_URG) == HICN_TCP_FLAG_URG); break; case 4: - *payload_type = ((h->v4.tcp.flags & TCP_FLAG_URG) == TCP_FLAG_URG); + *payload_type = ((h->v4.tcp.flags & HICN_TCP_FLAG_URG) == HICN_TCP_FLAG_URG); break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -571,15 +571,15 @@ hicn_packet_set_payload_type (hicn_header_t * h, { case 6: if (payload_type) - h->v6.tcp.flags = h->v6.tcp.flags | TCP_FLAG_URG; + h->v6.tcp.flags = h->v6.tcp.flags | HICN_TCP_FLAG_URG; else - h->v6.tcp.flags = h->v6.tcp.flags & ~TCP_FLAG_URG; + h->v6.tcp.flags = h->v6.tcp.flags & ~HICN_TCP_FLAG_URG; break; case 4: if (payload_type) - h->v4.tcp.flags = h->v4.tcp.flags | TCP_FLAG_URG; + h->v4.tcp.flags = h->v4.tcp.flags | HICN_TCP_FLAG_URG; else - h->v4.tcp.flags = h->v4.tcp.flags & ~TCP_FLAG_URG; + h->v4.tcp.flags = h->v4.tcp.flags & ~HICN_TCP_FLAG_URG; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -594,10 +594,10 @@ hicn_packet_set_syn (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags | TCP_FLAG_SYN; + h->v6.tcp.flags = h->v6.tcp.flags | HICN_TCP_FLAG_SYN; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags | TCP_FLAG_SYN; + h->v4.tcp.flags = h->v4.tcp.flags | HICN_TCP_FLAG_SYN; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -611,10 +611,10 @@ hicn_packet_reset_syn (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags & ~TCP_FLAG_SYN; + h->v6.tcp.flags = h->v6.tcp.flags & ~HICN_TCP_FLAG_SYN; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags & ~TCP_FLAG_SYN; + h->v4.tcp.flags = h->v4.tcp.flags & ~HICN_TCP_FLAG_SYN; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -628,10 +628,10 @@ hicn_packet_test_syn (const hicn_header_t * h, bool * flag) switch (HICN_IP_VERSION (h)) { case 6: - *flag = h->v6.tcp.flags & TCP_FLAG_SYN; + *flag = h->v6.tcp.flags & HICN_TCP_FLAG_SYN; break; case 4: - *flag = h->v4.tcp.flags & TCP_FLAG_SYN; + *flag = h->v4.tcp.flags & HICN_TCP_FLAG_SYN; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -645,10 +645,10 @@ hicn_packet_set_ack (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags | TCP_FLAG_ACK; + h->v6.tcp.flags = h->v6.tcp.flags | HICN_TCP_FLAG_ACK; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags | TCP_FLAG_ACK; + h->v4.tcp.flags = h->v4.tcp.flags | HICN_TCP_FLAG_ACK; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -662,10 +662,10 @@ hicn_packet_reset_ack (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags & ~TCP_FLAG_ACK; + h->v6.tcp.flags = h->v6.tcp.flags & ~HICN_TCP_FLAG_ACK; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags & ~TCP_FLAG_ACK; + h->v4.tcp.flags = h->v4.tcp.flags & ~HICN_TCP_FLAG_ACK; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -679,10 +679,10 @@ hicn_packet_test_ack (const hicn_header_t * h, bool * flag) switch (HICN_IP_VERSION (h)) { case 6: - *flag = h->v6.tcp.flags & TCP_FLAG_ACK; + *flag = h->v6.tcp.flags & HICN_TCP_FLAG_ACK; break; case 4: - *flag = h->v4.tcp.flags & TCP_FLAG_ACK; + *flag = h->v4.tcp.flags & HICN_TCP_FLAG_ACK; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -696,10 +696,10 @@ hicn_packet_set_rst (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags | TCP_FLAG_RST; + h->v6.tcp.flags = h->v6.tcp.flags | HICN_TCP_FLAG_RST; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags | TCP_FLAG_RST; + h->v4.tcp.flags = h->v4.tcp.flags | HICN_TCP_FLAG_RST; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -713,10 +713,10 @@ hicn_packet_reset_rst (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags & ~TCP_FLAG_RST; + h->v6.tcp.flags = h->v6.tcp.flags & ~HICN_TCP_FLAG_RST; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags & ~TCP_FLAG_RST; + h->v4.tcp.flags = h->v4.tcp.flags & ~HICN_TCP_FLAG_RST; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -730,10 +730,10 @@ hicn_packet_test_rst (const hicn_header_t * h, bool * flag) switch (HICN_IP_VERSION (h)) { case 6: - *flag = h->v6.tcp.flags & TCP_FLAG_RST; + *flag = h->v6.tcp.flags & HICN_TCP_FLAG_RST; break; case 4: - *flag = h->v4.tcp.flags & TCP_FLAG_RST; + *flag = h->v4.tcp.flags & HICN_TCP_FLAG_RST; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -747,10 +747,10 @@ hicn_packet_set_fin (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags | TCP_FLAG_FIN; + h->v6.tcp.flags = h->v6.tcp.flags | HICN_TCP_FLAG_FIN; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags | TCP_FLAG_FIN; + h->v4.tcp.flags = h->v4.tcp.flags | HICN_TCP_FLAG_FIN; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -764,10 +764,10 @@ hicn_packet_reset_fin (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags & ~TCP_FLAG_FIN; + h->v6.tcp.flags = h->v6.tcp.flags & ~HICN_TCP_FLAG_FIN; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags & ~TCP_FLAG_FIN; + h->v4.tcp.flags = h->v4.tcp.flags & ~HICN_TCP_FLAG_FIN; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -781,10 +781,10 @@ hicn_packet_test_fin (const hicn_header_t * h, bool * flag) switch (HICN_IP_VERSION (h)) { case 6: - *flag = h->v6.tcp.flags & TCP_FLAG_FIN; + *flag = h->v6.tcp.flags & HICN_TCP_FLAG_FIN; break; case 4: - *flag = h->v4.tcp.flags & TCP_FLAG_FIN; + *flag = h->v4.tcp.flags & HICN_TCP_FLAG_FIN; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -798,10 +798,10 @@ hicn_packet_set_ece (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags | TCP_FLAG_ECE; + h->v6.tcp.flags = h->v6.tcp.flags | HICN_TCP_FLAG_ECE; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags | TCP_FLAG_ECE; + h->v4.tcp.flags = h->v4.tcp.flags | HICN_TCP_FLAG_ECE; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -815,10 +815,10 @@ hicn_packet_reset_ece (hicn_header_t * h) switch (HICN_IP_VERSION (h)) { case 6: - h->v6.tcp.flags = h->v6.tcp.flags & ~TCP_FLAG_ECE; + h->v6.tcp.flags = h->v6.tcp.flags & ~HICN_TCP_FLAG_ECE; break; case 4: - h->v4.tcp.flags = h->v4.tcp.flags & ~TCP_FLAG_ECE; + h->v4.tcp.flags = h->v4.tcp.flags & ~HICN_TCP_FLAG_ECE; break; default: return HICN_LIB_ERROR_UNEXPECTED; @@ -832,10 +832,10 @@ hicn_packet_test_ece (const hicn_header_t * h, bool * flag) switch (HICN_IP_VERSION (h)) { case 6: - *flag = h->v6.tcp.flags & TCP_FLAG_ECE; + *flag = h->v6.tcp.flags & HICN_TCP_FLAG_ECE; break; case 4: - *flag = h->v4.tcp.flags & TCP_FLAG_ECE; + *flag = h->v4.tcp.flags & HICN_TCP_FLAG_ECE; break; default: return HICN_LIB_ERROR_UNEXPECTED; diff --git a/lib/src/protocol/tcp.h b/lib/src/protocol/tcp.h index 3a15a93b3..ded9a06b2 100644 --- a/lib/src/protocol/tcp.h +++ b/lib/src/protocol/tcp.h @@ -143,15 +143,15 @@ static_assert (EXPECTED_TCP_HDRLEN == TCP_HDRLEN, enum { -#define _(f) TCP_FLAG_BIT_##f, +#define _(f) HICN_TCP_FLAG_BIT_##f, foreach_tcp_flag #undef _ - TCP_N_FLAG_BITS, + HICN_TCP_N_FLAG_BITS, }; enum { -#define _(f) TCP_FLAG_##f = 1 << TCP_FLAG_BIT_##f, +#define _(f) HICN_TCP_FLAG_##f = 1 << HICN_TCP_FLAG_BIT_##f, foreach_tcp_flag #undef _ }; |