On Mon, Jul 06, 2015 at 03:32:45PM -0700, Jarno Rajahalme wrote:
>
> > On Jul 6, 2015, at 11:47 AM, Ben Pfaff <b...@nicira.com> wrote:
> >
> > Thanks for the review! Is that meant to cover the series, or will you
> > separately review patches 1 and 2?
> >
>
> Oops, patches 1&2 were in the junk mailbox, but I just read them, and the ack
> now covers the whole series :-)
Thanks!
I applied the series to master and in a minute I'll apply patch 2 (only)
to branch-2.4, since I consider that a bug fix.
> Jarno
>
> > Thanks,
> >
> > Ben.
> >
> > On Mon, Jul 06, 2015 at 11:36:41AM -0700, Jarno Rajahalme wrote:
> >> Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
> >>
> >>> On Jul 6, 2015, at 10:20 AM, Ben Pfaff <b...@nicira.com> wrote:
> >>>
> >>> This makes troubleshooting easier.
> >>>
> >>> Signed-off-by: Ben Pfaff <b...@nicira.com>
> >>> ---
> >>> lib/ofp-util.c | 2 ++
> >>> tests/ofp-print.at | 4 +++-
> >>> 2 files changed, 5 insertions(+), 1 deletion(-)
> >>>
> >>> diff --git a/lib/ofp-util.c b/lib/ofp-util.c
> >>> index d02ee3a..646bae7 100644
> >>> --- a/lib/ofp-util.c
> >>> +++ b/lib/ofp-util.c
> >>> @@ -9119,6 +9119,8 @@ ofputil_decode_bundle_add(const struct ofp_header
> >>> *oh,
> >>> }
> >>>
> >>> if (!ofputil_is_bundlable(*type_ptr)) {
> >>> + VLOG_WARN_RL(&bad_ofmsg_rl, "%s message not allowed inside "
> >>> + "OFPT14_BUNDLE_ADD_MESSAGE",
> >>> ofptype_get_name(*type_ptr));
> >>> return OFPERR_OFPBFC_MSG_UNSUP;
> >>> }
> >>>
> >>> diff --git a/tests/ofp-print.at b/tests/ofp-print.at
> >>> index 83c7b9e..6e11150 100644
> >>> --- a/tests/ofp-print.at
> >>> +++ b/tests/ofp-print.at
> >>> @@ -3247,11 +3247,13 @@ AT_CLEANUP
> >>>
> >>> AT_SETUP([OFPT_BUNDLE_ADD_MESSAGE - reject OFPT_HELLO])
> >>> AT_KEYWORDS([ofp-print])
> >>> -AT_CHECK([ovs-ofctl ofp-print "\
> >>> +AT_CHECK([ovs-ofctl '-vPATTERN:console:%c|%p|%m' ofp-print "\
> >>> 05 22 00 20 00 00 00 00 00 00 00 01 00 00 00 01 \
> >>> 05 00 00 10 00 00 00 00 00 00 00 00 00 00 00 00 \
> >>> "], [0], [dnl
> >>> OFPT_BUNDLE_ADD_MESSAGE (OF1.4) (xid=0x0): ***decode error:
> >>> OFPBFC_MSG_UNSUP***
> >>> +], [dnl
> >>> +ofp_util|WARN|OFPT_HELLO message not allowed inside
> >>> OFPT14_BUNDLE_ADD_MESSAGE
> >>> ])
> >>> AT_CLEANUP
> >>>
> >>> --
> >>> 2.1.3
> >>>
> >>> _______________________________________________
> >>> dev mailing list
> >>> dev@openvswitch.org
> >>> http://openvswitch.org/mailman/listinfo/dev
> >>
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
