ofproto-dpif: add reply on error in ofproto/tnl-push-pop
authorIlya Maximets <i.maximets@samsung.com>
Mon, 7 Dec 2015 10:02:41 +0000 (13:02 +0300)
committerBen Pfaff <blp@ovn.org>
Mon, 7 Dec 2015 17:12:07 +0000 (09:12 -0800)
Fixes hang of 'ovs-appctl ofproto/tnl-push-pop' when an invalid
argument passed.

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
ofproto/ofproto-dpif.c

index d920ed0..6561c65 100644 (file)
@@ -5328,6 +5328,8 @@ disable_tnl_push_pop(struct unixctl_conn *conn OVS_UNUSED, int argc OVS_UNUSED,
         ofproto_use_tnl_push_pop = true;
         unixctl_command_reply(conn, "Tunnel push-pop on");
         ofproto_revalidate_all_backers();
+    } else {
+        unixctl_command_reply_error(conn, "Invalid argument");
     }
 }