ofp-util: Don't warn for different forms of nw_{src,dst} wildcards.
authorBen Pfaff <blp@nicira.com>
Fri, 29 Apr 2011 22:47:26 +0000 (15:47 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 2 Jun 2011 16:23:38 +0000 (09:23 -0700)
commit58961017ea07ff1ee4f8ad520bd0e35493a7a06f
tree07a08b926882ee9fa49ad453f25a7385a35c5adc
parente8ee90d2b5a025c0d155af652d18c8a20af4ccc0
ofp-util: Don't warn for different forms of nw_{src,dst} wildcards.

OpenFlow 1.0 uses a 6-bit field to express the number of wildcarded bits
in the nw_src and nw_dst field.  Any value 32 or greater in these fields
(binary 1xxxxx) means that all of the bits are wildcarded.  That means
that there are 32 different ways to express a wildcarded nw_src or nw_dst.
At least two of those seem sensible (100000 and 111111) so we shouldn't
warn about one of them.

This fixes the problem by ORing with 100000 instead of 111111, so that any
already-correct wildcarded mask won't be affected.

This fix allows us to update some tests.

Reviewed-by: Simon Horman <horms@verge.net.au>
lib/ofp-util.c
tests/ovs-ofctl.at