mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

Widen TCP flags handling.

Browse Source 
Widen TCP flags handling from 7 bits (uint8_t) to 12 bits (uint16_t).
The kernel interface remains at 8 bits, which makes no functional
difference now, as none of the higher bits is currently of interest
to the userspace.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
This commit is contained in:
Jarno Rajahalme
2013-10-28 13:54:39 -07:00
committed by Ben Pfaff
parent 1591fe8ee5
commit a66733a8bc
12 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/packets.c
View File

@@ -898,7 +898,7 @@ packet_set_sctp_port(struct ofpbuf *packet, ovs_be16 src, ovs_be16 dst)
*
* 'flow' must be the flow corresponding to 'packet' and 'packet''s header
* pointers must be properly initialized (e.g. with flow_extract()). */
uint8_t
uint16_t
packet_get_tcp_flags(const struct ofpbuf *packet, const struct flow *flow)
{
if (dl_type_is_ip_any(flow->dl_type) &&
@@ -914,7 +914,7 @@ packet_get_tcp_flags(const struct ofpbuf *packet, const struct flow *flow)
* (e.g. obtained via packet_get_tcp_flags() or TCP_FLAGS) to 's', in the
* format used by tcpdump. */
void
packet_format_tcp_flags(struct ds *s, uint8_t tcp_flags)
packet_format_tcp_flags(struct ds *s, uint16_t tcp_flags)
{
if (!tcp_flags) {
ds_put_cstr(s, "none");
@@ -939,10 +939,22 @@ packet_format_tcp_flags(struct ds *s, uint8_t tcp_flags)
if (tcp_flags & TCP_ACK) {
ds_put_char(s, '.');
}
if (tcp_flags & 0x40) {
ds_put_cstr(s, "[40]");
if (tcp_flags & TCP_ECE) {
ds_put_cstr(s, "E");
}
if (tcp_flags & 0x80) {
ds_put_cstr(s, "[80]");
if (tcp_flags & TCP_CWR) {
ds_put_cstr(s, "C");
}
if (tcp_flags & TCP_NS) {
ds_put_cstr(s, "N");
}
if (tcp_flags & 0x200) {
ds_put_cstr(s, "[200]");
}
if (tcp_flags & 0x400) {
ds_put_cstr(s, "[400]");
}
if (tcp_flags & 0x800) {
ds_put_cstr(s, "[800]");
}
}