[ovs-git] Open vSwitch: netflow: Only un-wildcard IPv4 packets. (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  9b658910ab3c709f05f8d986f13aeae9bc53b233 (commit)
       via  6cdd514560e16a294d09aa9d6bf5c8c7ac31e442 (commit)
       via  bed7d6a1b7316db3f0be19c9f2d58cc7d71a24fa (commit)
       via  b06b6a394a066b82a27d8baa17d6d562711d0a48 (commit)
       via  baf8ebaded1b03b129ad036342f3e4a0ecaa06f9 (commit)
      from  9bbd9da08efacb9e12376d0905c7776281d268e4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9b658910ab3c709f05f8d986f13aeae9bc53b233
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=9b658910ab3c709f05f8d986f13aeae9bc53b233
Author: Justin Pettit <jpettit at nicira.com>
		
netflow: Only un-wildcard IPv4 packets.
		
NetFlow v5 only supports IPv4, so don't bother un-wildcarding
non-IPv4 packets.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ethan Jackson <ethan at nicira.com>


commit 6cdd514560e16a294d09aa9d6bf5c8c7ac31e442
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=6cdd514560e16a294d09aa9d6bf5c8c7ac31e442
Author: Justin Pettit <jpettit at nicira.com>
		
flow: Only un-wildcard relevant IP headers.
		
When determining the fields to un-wildcard, we need to be careful
about only un-wildcarding fields that are relevant.  Also, we
didn't properly handle IPv6 addresses.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ethan Jackson <ethan at nicira.com>


commit bed7d6a1b7316db3f0be19c9f2d58cc7d71a24fa
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=bed7d6a1b7316db3f0be19c9f2d58cc7d71a24fa
Author: Justin Pettit <jpettit at nicira.com>
		
odp-util: Fix converting masked VLAN from flow.
		
When converting the VLAN from a flow to an ODP key, the processing logic
would always store the VLAN ethertype.  However, when handling a mask,
it should be a mask, not an ethertype.  And since we don't support
bit-wise masking of the ethertype, just make it an exact-match mask.

Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ethan Jackson <ethan at nicira.com>


commit b06b6a394a066b82a27d8baa17d6d562711d0a48
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=b06b6a394a066b82a27d8baa17d6d562711d0a48
Author: Justin Pettit <jpettit at nicira.com>
		
odp-util: Correct printing the VLAN PCP mask.
		
Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ethan Jackson <ethan at nicira.com>


commit baf8ebaded1b03b129ad036342f3e4a0ecaa06f9
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=baf8ebaded1b03b129ad036342f3e4a0ecaa06f9
Author: Justin Pettit <jpettit at nicira.com>
		
ofproto-dpif: Remove old comment.
		
Signed-off-by: Justin Pettit <jpettit at nicira.com>
Acked-by: Ethan Jackson <ethan at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 lib/bond.c                   |    4 ++--
 lib/bundle.c                 |    2 +-
 lib/flow.c                   |   20 ++++++++++++++------
 lib/flow.h                   |    3 ++-
 lib/multipath.c              |    2 +-
 lib/odp-util.c               |    8 ++++++--
 ofproto/netflow.c            |    5 ++++-
 ofproto/netflow.h            |    2 +-
 ofproto/ofproto-dpif-xlate.c |    3 +--
 9 files changed, 32 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Open vSwitch