From 6b14de585a60163cbd9f917f8b189d1302bdb462 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sun, 12 May 2013 14:53:51 -0700 Subject: [PATCH] ofproto-dpif: Make fin_timeout work when governor kicks in. The xlate_actions() call in handle_flow_miss_without_facet() didn't implement fin_timeout properly because tcp_flags wasn't getting set. I have not tested that this fixes the problem, but it seems "obviously correct". Bug #16506. Reported-by: Ying Chen Signed-off-by: Ben Pfaff Signed-off-by: Ethan Jackson Acked-by: Ethan Jackson --- AUTHORS | 1 + ofproto/ofproto-dpif.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index c113f16b9..498e9f09e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -206,6 +206,7 @@ Vjekoslav Brajkovic balkan@cs.washington.edu Voravit T. voravit@kth.se YAMAMOTO Takashi yamamoto@valinux.co.jp Yeming Zhao zhaoyeming@gmail.com +Ying Chen yingchen@vmware.com Yongqiang Liu liuyq7809@gmail.com kk yap yapkke@stanford.edu likunyun kunyunli@hotmail.com diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 1da8ffbdd..c4f7d2519 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -3686,8 +3686,8 @@ handle_flow_miss_without_facet(struct flow_miss *miss, dpif_flow_stats_extract(&miss->flow, packet, now, &stats); rule_credit_stats(rule, &stats); - action_xlate_ctx_init(&ctx, ofproto, &miss->flow, - &miss->initial_vals, rule, 0, packet); + action_xlate_ctx_init(&ctx, ofproto, &miss->flow, &miss->initial_vals, + rule, stats.tcp_flags, packet); ctx.resubmit_stats = &stats; xlate_actions(&ctx, rule->up.ofpacts, rule->up.ofpacts_len, &odp_actions); -- 2.43.0