Thanks to Ben Pfaff for immediately pinpointing the likely location of
the issue.
Signed-off-by: Justin Pettit <jpet...@nicira.com>
---
lib/flow.c | 1 +
tests/ofproto-dpif.at | 36 ++++++++++++++++++------------------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/lib/flow.c b/lib/flow.c
index 76d2340..7c3d2e1 100644
--- a/lib/flow.c
+++ b/lib/flow.c
@@ -850,6 +850,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow)
b->l3 = ip = ofpbuf_put_zeros(b, sizeof *ip);
ip->ip_ihl_ver = IP_IHL_VER(5, 4);
ip->ip_tos = flow->nw_tos;
+ ip->ip_ttl = flow->nw_ttl;
ip->ip_proto = flow->nw_proto;
ip->ip_src = flow->nw_src;
ip->ip_dst = flow->nw_dst;
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index 80ba333..098a1b9 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -263,13 +263,13 @@ done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via no_match) data_len=60
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->9) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->9) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via no_match) data_len=60
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->9) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->9) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via no_match) data_len=60
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->9) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(50:54:00:00:00:05->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->9) tcp_csum:0
])
dnl Singleton controller action.
@@ -282,13 +282,13 @@ done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=60 in_port=1 (via action) data_len=60
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(10:11:11:11:11:11->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
])
dnl Modified controller action.
@@ -301,13 +301,13 @@ done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
dnl
OFPT_PACKET_IN (xid=0x0): total_len=64 in_port=1 (via action) data_len=64
(unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(vlan:15,pcp:0)
mac(30:33:33:33:33:33->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->10) tcp_csum:0
])
dnl Checksum TCP.
@@ -320,31 +320,31 @@ done
OVS_WAIT_UNTIL([ovs-appctl -t ovs-ofctl exit])
AT_CHECK([cat ofctl_monitor.log], [0], [dnl
NXT_PACKET_IN (xid=0x0): cookie=0x1 total_len=60 in_port=1 (via action)
data_len=60 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
dnl
NXT_PACKET_IN (xid=0x0): table_id=1 cookie=0x3 total_len=64 in_port=1 reg0=0x1
(via action) data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(20:22:22:22:22:22->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
dnl
NXT_PACKET_IN (xid=0x0): table_id=2 cookie=0x4 total_len=64 in_port=1 reg0=0x1
reg1=0x2 (via action) data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->50:54:00:00:00:07) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
dnl
NXT_PACKET_IN (xid=0x0): table_id=3 cookie=0x5 total_len=64 in_port=1 reg0=0x1
reg1=0x2 reg2=0x3 (via action) data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:64
ip(192.168.0.1->192.168.0.2) port(8->11) tcp_csum:0
dnl
NXT_PACKET_IN (xid=0x0): table_id=4 cookie=0x6 total_len=64 in_port=1 reg0=0x1
reg1=0x2 reg2=0x3 reg3=0x4 (via action) data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0
ip(83.83.83.83->192.168.0.2) port(8->11) tcp_csum:1a03
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:64
ip(83.83.83.83->192.168.0.2) port(8->11) tcp_csum:1a03
dnl
NXT_PACKET_IN (xid=0x0): table_id=5 cookie=0x7 total_len=64 in_port=1
tun_id=0x6 reg0=0x1 reg1=0x2 reg2=0x3 reg3=0x4 reg4=0x5 (via action)
data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0
ip(83.83.83.83->84.84.84.84) port(8->11) tcp_csum:3205
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:64
ip(83.83.83.83->84.84.84.84) port(8->11) tcp_csum:3205
dnl
NXT_PACKET_IN (xid=0x0): table_id=6 cookie=0x8 total_len=64 in_port=1
tun_id=0x6 reg0=0x1 reg1=0x2 reg2=0x3 reg3=0x4 reg4=0x5 (via action)
data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0
ip(83.83.83.83->84.84.84.84) port(85->11) tcp_csum:31b8
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:64
ip(83.83.83.83->84.84.84.84) port(85->11) tcp_csum:31b8
dnl
NXT_PACKET_IN (xid=0x0): table_id=7 cookie=0x9 total_len=64 in_port=1
tun_id=0x6 reg0=0x1 reg1=0x2 reg2=0x3 reg3=0x4 reg4=0x5 (via action)
data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0
ip(83.83.83.83->84.84.84.84) port(85->86) tcp_csum:316d
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:64
ip(83.83.83.83->84.84.84.84) port(85->86) tcp_csum:316d
dnl
NXT_PACKET_IN (xid=0x0): table_id=7 cookie=0x9 total_len=64 in_port=1
tun_id=0x6 reg0=0x1 reg1=0x2 reg2=0x3 reg3=0x4 reg4=0x5 (via action)
data_len=64 (unbuffered)
-priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:0
ip(83.83.83.83->84.84.84.84) port(85->86) tcp_csum:316d
+priority:0,metadata:0,in_port:0000,tci(vlan:80,pcp:0)
mac(80:81:81:81:81:81->82:82:82:82:82:82) type:0800 proto:6 tos:0 ttl:64
ip(83.83.83.83->84.84.84.84) port(85->86) tcp_csum:316d
])
dnl Checksum UDP.
--
1.7.5.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
