openvswitch
13 years agoofproto: Fix documentation for calls to ->rule_destruct().
Ben Pfaff [Thu, 8 Sep 2011 23:22:38 +0000 (16:22 -0700)]
ofproto: Fix documentation for calls to ->rule_destruct().

This documented what I intended to implement and what I thought I had
implemented, but not what the code actually did.  It is a little easier to
fix the documentation to match the implementation than vice versa, so this
commit does so.

Reported-by: Hao Zheng <hzheng@nicira.com>
13 years agoofproto-dpif: Drop special packets more judiciously.
Ethan Jackson [Wed, 31 Aug 2011 01:19:48 +0000 (18:19 -0700)]
ofproto-dpif: Drop special packets more judiciously.

Before this patch, ofproto-dpif would not forward any LACP or CFM
packets regardless of whether or not the relevant modules were
configured on the in_port.

Feature #6316.

13 years agolacp: Clean up LACP module interface.
Ethan Jackson [Wed, 31 Aug 2011 01:17:27 +0000 (18:17 -0700)]
lacp: Clean up LACP module interface.

There's no particular reason to force users of the LACP module to
be aware of the lacp_pdu structure.  This patch hides that
information in the LACP module implementation.  This results in
slightly cleaner code which is more consistent with the CFM
module.

13 years agovswitch.xml: Whitespace cleanup.
Ethan Jackson [Wed, 31 Aug 2011 01:46:50 +0000 (18:46 -0700)]
vswitch.xml: Whitespace cleanup.

13 years agodatapath: Allow a packet with no input port to omit OVS_KEY_ATTR_IN_PORT.
Ben Pfaff [Thu, 8 Sep 2011 23:30:20 +0000 (16:30 -0700)]
datapath: Allow a packet with no input port to omit OVS_KEY_ATTR_IN_PORT.

When ovs-vswitchd executes actions on a synthesized packet, that is, on a
packet that is not being forwarded from any particular port but is being
generated by ovs-vswitchd itself or by an OpenFlow controller (using a
OFPT_PACKET_OUT message with an in_port of OFPP_NONE), there is no good
choice for the in_port to pass to the kernel in the flow in the
OVS_PACKET_CMD_EXECUTE message.  This commit allows ovs-vswitchd to omit
the in_port entirely in this case.

This fixes a bug in OFPT_PACKET_OUT: using an in_port of OFPP_NONE would
cause the packet to be dropped by the kernel, since that's an invalid
input port.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Reported-by: Aaron Rosen <arosen@clemson.edu>
13 years agodatapath: Calculate flow hash after extracting metadata.
Jesse Gross [Thu, 8 Sep 2011 22:32:24 +0000 (15:32 -0700)]
datapath: Calculate flow hash after extracting metadata.

When we execute a packet from userspace we first extract the header
fields from the packet and then add supplied metadata.  However, we
compute the hash of the packet in between these two steps despite
the fact that the metadata can affect the hash.  This can lead to
two separate hashes for packets of the same flow.

Found by code inspection, not an actual real-world problem.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
13 years agoStrip down vport interface : iflink
Pravin Shelar [Thu, 8 Sep 2011 22:18:42 +0000 (15:18 -0700)]
Strip down vport interface : iflink

Remove iflink from vport interface. iflink is not used anywhere in
OVS. So there is not need to have iflink as vport attribute.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
13 years agoovs-ctl: Add load-kmod command
Simon Horman [Wed, 7 Sep 2011 01:10:30 +0000 (10:10 +0900)]
ovs-ctl: Add load-kmod command

On Debian there is a need for the init scripts to die gracefully
if module insertion fails. In such a case it is desirable to print
some sort of informative message.

By adding the load-kmod sub-command to ovs-ctl init scripts
may try to load modules and take appropriate action on failure
or then try to start the daemons.

13 years agorhel: add ability to build kmod packages for arbitrary kernel version/variant(s)
Alexey I. Froloff [Wed, 7 Sep 2011 09:02:58 +0000 (13:02 +0400)]
rhel: add ability to build kmod packages for arbitrary kernel version/variant(s)

Usage:

rpmbuild --rebuild \
  -D 'kversion KERNEL_VERSION' \
  -D 'kflavors FLAVORS TO BUILD' \
  openvswitch-kmod-VERSION-RELEASE.src.rpm

Signed-off-by: Alexey I. Froloff <raorn@altlinux.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
13 years agorhel: rename RHEL6 kmod source package
Alexey I. Froloff [Thu, 1 Sep 2011 14:56:29 +0000 (18:56 +0400)]
rhel: rename RHEL6 kmod source package

Rename RHEL6 source package to openvswitch-kmod, so it doesn't intersect
with main package.

Signed-off-by: Alexey I. Froloff <raorn@altlinux.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
13 years agonetlink-protocol: Move CTRL_ATTR_MCAST definitions for consistency.
Ben Pfaff [Tue, 6 Sep 2011 16:33:26 +0000 (09:33 -0700)]
netlink-protocol: Move CTRL_ATTR_MCAST definitions for consistency.

One of the current goals of netlink-protocol.h, for better or for worse, is
to ensure that the same definitions are available whether a Linux kernel is
in use or not.  One of the ways it accomplishes this is by putting the
conditional definitions that test for features missing in old kernels at
the very end, after the dummy definitions used on non-Linux platforms.
However, commit b0025c8389f "netlink-protocol: Define missing symbols"
added new conditional definitions only in the Linux platform case, which
means that those definitions won't be available on non-Linux platforms.
This commit moves them to the end, instead.

The symbols that are moved are only used from netlink-socket.c, which is
only built on Linux platforms, so this does not change an actual bug.  It
only makes the location of the definitions consistent with prior practice.

13 years agonetlink-protocol: Define missing symbols.
Ethan Jackson [Fri, 2 Sep 2011 01:48:29 +0000 (18:48 -0700)]
netlink-protocol: Define missing symbols.

OVS fails to build with xenddk-56100build3926 because it has an
outdated genetlink header.

13 years agodpif-linux: Stop listening for RTNL notifications.
Ethan Jackson [Wed, 24 Aug 2011 23:21:10 +0000 (16:21 -0700)]
dpif-linux: Stop listening for RTNL notifications.

Currently dpif-linux listens for vport change events using
rtnetlink notifications.  This patch switches to the ovs genl
notification system.

Feature #6809.

13 years agodatapath: genl_notify() on port disappearances.
Ethan Jackson [Wed, 24 Aug 2011 00:20:00 +0000 (17:20 -0700)]
datapath: genl_notify() on port disappearances.

Before this patch, if a vport detached itself from the datapath
without interaction from userspace, rtnetlink notifications would
be sent, but genl notifications would not.

Feature #6809.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
13 years agonetlink-socket: New function nl_lookup_genl_mcgroup().
Ethan Jackson [Tue, 23 Aug 2011 20:13:34 +0000 (13:13 -0700)]
netlink-socket: New function nl_lookup_genl_mcgroup().

13 years agonetlink-notifier: Rename rtnetlink code.
Ethan Jackson [Wed, 24 Aug 2011 22:17:32 +0000 (15:17 -0700)]
netlink-notifier: Rename rtnetlink code.

This patch renames the rtnetlink module's code to "nln" for
"netlink notifier".  Callers are now required to pass in the
netlink protocol to he newly renamed nln_create() function.

13 years agolib: Rename rtnetlink.[ch] files.
Ethan Jackson [Thu, 25 Aug 2011 21:06:54 +0000 (14:06 -0700)]
lib: Rename rtnetlink.[ch] files.

The only rtnetlink specific functionality contained in the
rtnetlink module is the use of the NETLINK_ROUTE protocol.  This
can easily be passed in by callers.

In preparation for generalization, this patch renames
rtnetlink.[ch] to netlink-notifier.[ch].  Future patches will
complete the transition.

13 years agolacp: Clarify documentation.
Ethan Jackson [Wed, 31 Aug 2011 22:18:17 +0000 (15:18 -0700)]
lacp: Clarify documentation.

Requested-by: Dan Wendlandt <dan@nicira.com>
13 years agorhel: Poke iptables hole for gre in init scripts.
Ethan Jackson [Thu, 1 Sep 2011 00:56:07 +0000 (17:56 -0700)]
rhel: Poke iptables hole for gre in init scripts.

13 years agorhel: Add ovs-pki to rpm.
Ethan Jackson [Wed, 31 Aug 2011 19:33:21 +0000 (12:33 -0700)]
rhel: Add ovs-pki to rpm.

13 years agorhel: Don't delete bridges on boot.
Ethan Jackson [Wed, 31 Aug 2011 18:23:21 +0000 (11:23 -0700)]
rhel: Don't delete bridges on boot.

Before this patch, the RHEL init scripts would remove all bridges
configured on the system at boot.

13 years agodatapath: Disable LRO from userspace instead of the kernel.
Justin Pettit [Sat, 27 Aug 2011 06:34:40 +0000 (23:34 -0700)]
datapath: Disable LRO from userspace instead of the kernel.

Whenever a port is added to the datapath, LRO is automatically disabled.
In the future, we may want to enable LRO in some circumstances, so have
userspace disable LRO through the ethtool ioctls.

As part of this change, the MTU and LRO checks are moved to
netdev-vport's send(), which is where they're actually needed.

Feature #6810

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
13 years agonetdev-linux: Introduce netdev_linux_ethtool_set_flag().
Justin Pettit [Wed, 17 Aug 2011 21:38:08 +0000 (14:38 -0700)]
netdev-linux: Introduce netdev_linux_ethtool_set_flag().

There will be a caller added soon.

13 years agocfm: Zero out empty field as required.
Ethan Jackson [Sat, 27 Aug 2011 00:12:21 +0000 (17:12 -0700)]
cfm: Zero out empty field as required.

Found with valgrind.

13 years agosocket-util: Suppress valgrind uninitialized use warning.
Ethan Jackson [Fri, 26 Aug 2011 23:55:07 +0000 (16:55 -0700)]
socket-util: Suppress valgrind uninitialized use warning.

13 years agoovs-monitor-ipsec: Don't abort if syslog is not available.
Ben Pfaff [Fri, 26 Aug 2011 23:46:16 +0000 (16:46 -0700)]
ovs-monitor-ipsec: Don't abort if syslog is not available.

If /dev/log doesn't exist or cannot be contacted, ovs-monitor-ipsec would
abort with an exception.  This allows it to start up and run.

It's pretty common for a chroot used for testing not to have a syslogd
instance set up and running, so this limitation caused testing problems.

Reported-by: Simon Horman <horms@verge.net.au>
Tested-by: Simon Horman <horms@verge.net.au>
13 years agobridge: Make bridge_pick_local_hw_addr() easier to reason.
Justin Pettit [Fri, 26 Aug 2011 22:05:53 +0000 (15:05 -0700)]
bridge: Make bridge_pick_local_hw_addr() easier to reason.

The use of eth_addr_is_multicast() to see if a reasonable address was
found always caused me momentary confusion.  This commit uses a flag
instead, and also saves a bit of unnecessary array reading and writing.

13 years agodebian: Transition to dh_python2
Simon Horman [Fri, 26 Aug 2011 09:03:42 +0000 (18:03 +0900)]
debian: Transition to dh_python2

dh_pysupport that the packaging used until now is deprecated, with
dh_python2 as its successor.

This commit removes the PYTHONPATH setting from
debian/openvswitch-ipsec.init because it is not needed, as the Python
packaging is public.  In fact, the Python packaging was public,
unintentionally, before, so the PYTHONPATH could have been removed earlier.

13 years agogitignore: Add manpage-check.
Ethan Jackson [Thu, 25 Aug 2011 23:03:25 +0000 (16:03 -0700)]
gitignore: Add manpage-check.

13 years agoovs.db.types: Remove write-only variable from constraintsToEnglish().
Ben Pfaff [Thu, 25 Aug 2011 00:09:27 +0000 (17:09 -0700)]
ovs.db.types: Remove write-only variable from constraintsToEnglish().

Found by pychecker.

13 years agopython: Remove unused imports.
Ben Pfaff [Thu, 25 Aug 2011 00:08:50 +0000 (17:08 -0700)]
python: Remove unused imports.

Found by pychecker.

13 years agoovs.stream: Remove unused parameter from usage().
Ben Pfaff [Thu, 25 Aug 2011 00:08:24 +0000 (17:08 -0700)]
ovs.stream: Remove unused parameter from usage().

This function has no callers.  We could delete it entirely, instead.

13 years agoovs.ovsuuid: Fix UUID.cInitUUID invocation of re.match with too few params.
Ben Pfaff [Thu, 25 Aug 2011 00:07:32 +0000 (17:07 -0700)]
ovs.ovsuuid: Fix UUID.cInitUUID invocation of re.match with too few params.

Found by pychecker.

13 years agoovs.jsonrpc: Fix static method Session.open() reference to 'self'.
Ben Pfaff [Thu, 25 Aug 2011 00:06:37 +0000 (17:06 -0700)]
ovs.jsonrpc: Fix static method Session.open() reference to 'self'.

Found by pychecker.

13 years agoovs.jsonrpc: Fix static method Message.__validate_arg reference to 'self'.
Ben Pfaff [Thu, 25 Aug 2011 00:06:11 +0000 (17:06 -0700)]
ovs.jsonrpc: Fix static method Message.__validate_arg reference to 'self'.

This method needs to be an instance method because it refers to 'self'.

Found by pychecker.

13 years agoovs.json: Use Exception, which exists, instead of Error, which doesn't.
Ben Pfaff [Thu, 25 Aug 2011 00:04:20 +0000 (17:04 -0700)]
ovs.json: Use Exception, which exists, instead of Error, which doesn't.

Found by pychecker.

13 years agoovs.db.idl: Fix error message format arguments.
Ben Pfaff [Thu, 25 Aug 2011 00:03:42 +0000 (17:03 -0700)]
ovs.db.idl: Fix error message format arguments.

There's no variable table_name.

Found by pychecker.

13 years agoovs.daemon: Add missing format string argument.
Ben Pfaff [Thu, 25 Aug 2011 00:01:14 +0000 (17:01 -0700)]
ovs.daemon: Add missing format string argument.

Found by pychecker.

13 years agoovs.daemon: Fix name of EALREADY error.
Ben Pfaff [Thu, 25 Aug 2011 00:00:46 +0000 (17:00 -0700)]
ovs.daemon: Fix name of EALREADY error.

Found by pychecker.

13 years agoovs.daemon: Add missing 'global' when setting _pidfile_dev, _pidfile_ino.
Ben Pfaff [Thu, 25 Aug 2011 00:00:15 +0000 (17:00 -0700)]
ovs.daemon: Add missing 'global' when setting _pidfile_dev, _pidfile_ino.

Found by pychecker.

13 years agoovs.db.idl: Fix call to ovs.db.parser.Parser constructor.
Ben Pfaff [Thu, 25 Aug 2011 18:06:53 +0000 (11:06 -0700)]
ovs.db.idl: Fix call to ovs.db.parser.Parser constructor.

This bug was introduced by commit 4c0f62718f "ovs.db.idl: Improve error
reporting for bad <row-update>s."

Found by pychecker.
Bug #7006.

13 years agodebian: Apply Ubuntu patch to add DKMS support.
Chuck Short [Tue, 23 Aug 2011 22:37:11 +0000 (15:37 -0700)]
debian: Apply Ubuntu patch to add DKMS support.

I tested that installing openvswitch-datapath-dkms worked OK on my own
Debian machine.

The bulk of this patch is taken from downstream Ubuntu DKMS support written
by Chuck Short <zulcss@ubuntu.com>, version 1.2.0-1ubuntu1.  I made the
following changes:

  * Update debian/.gitignore.

  * Update debian/automake.mk.

  * Correct description in debian/control (it was a cut-and-paste from
    the openvswitch-datapath-source description without editing).

  * Fix up for --with-l26 to --with-linux and datapath/linux-2.6 to
    datapath/linux transitions.

CC: Chuck Short <zulcss@ubuntu.com>
CC: Dave Walker <DaveWalker@ubuntu.com>
Acked-by: Simon Horman <horms@verge.net.au>
13 years agodocs: Add Makefile rule to check syntax of manpages.
Ben Pfaff [Wed, 24 Aug 2011 17:45:32 +0000 (10:45 -0700)]
docs: Add Makefile rule to check syntax of manpages.

This should catch future nroff syntax errors immediately, instead of much
later.

13 years agodocs: Fix some manpage syntax errors found with "groff".
Ben Pfaff [Wed, 24 Aug 2011 17:43:41 +0000 (10:43 -0700)]
docs: Fix some manpage syntax errors found with "groff".

13 years agopython: Use enumerate() builtin function to simplify counted iteration.
Ben Pfaff [Tue, 23 Aug 2011 21:43:54 +0000 (14:43 -0700)]
python: Use enumerate() builtin function to simplify counted iteration.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.stream: Simplify logic in Stream.wait().
Ben Pfaff [Tue, 23 Aug 2011 18:16:57 +0000 (11:16 -0700)]
ovs.stream: Simplify logic in Stream.wait().

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.stream: Drop Stream.get_name() since clients can use 'name' directly.
Ben Pfaff [Tue, 23 Aug 2011 18:16:27 +0000 (11:16 -0700)]
ovs.stream: Drop Stream.get_name() since clients can use 'name' directly.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.stream: Use %d in place of %ld since the two are equivalent in Python.
Ben Pfaff [Tue, 23 Aug 2011 17:47:53 +0000 (10:47 -0700)]
ovs.stream: Use %d in place of %ld since the two are equivalent in Python.

Reported-by: Reid Price <reid@nicira.com>
13 years agoovs.reconnect: Fix typo in documentation.
Ben Pfaff [Tue, 23 Aug 2011 18:33:08 +0000 (11:33 -0700)]
ovs.reconnect: Fix typo in documentation.

Reported-by: Reid Price <reid@nicira.com>
13 years agoovs.reconnect: Make Reconnect.Reconnect inherit from object.
Ben Pfaff [Tue, 23 Aug 2011 17:45:43 +0000 (10:45 -0700)]
ovs.reconnect: Make Reconnect.Reconnect inherit from object.

Reported-by: Reid Price <reid@nicira.com>
13 years agoovs.jsonrpc: Use "not X" in place of "len(X) == 0" for testing strings.
Ben Pfaff [Tue, 23 Aug 2011 17:43:26 +0000 (10:43 -0700)]
ovs.jsonrpc: Use "not X" in place of "len(X) == 0" for testing strings.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.jsonrpc: Remove Connection.get_name()--clients can use 'name' directly.
Ben Pfaff [Tue, 23 Aug 2011 17:40:24 +0000 (10:40 -0700)]
ovs.jsonrpc: Remove Connection.get_name()--clients can use 'name' directly.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.jsonrpc: Remove dead class variable Message.__next_id.
Ben Pfaff [Tue, 23 Aug 2011 17:37:39 +0000 (10:37 -0700)]
ovs.jsonrpc: Remove dead class variable Message.__next_id.

Reported-by: Reid Price <reid@nicira.com>
13 years agoovs.json: Optimize __dump_string().
Ben Pfaff [Wed, 24 Aug 2011 19:05:13 +0000 (12:05 -0700)]
ovs.json: Optimize __dump_string().

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.fatal_signal: Remove unnecessary "global" statement.
Ben Pfaff [Tue, 23 Aug 2011 17:31:22 +0000 (10:31 -0700)]
ovs.fatal_signal: Remove unnecessary "global" statement.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.fatal_signal: Reorder definitions to be more easily readable.
Ben Pfaff [Tue, 23 Aug 2011 17:29:40 +0000 (10:29 -0700)]
ovs.fatal_signal: Reorder definitions to be more easily readable.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.types: Introduce DEFAULT_MIN, DEFAULT_MAX as Type class members.
Ben Pfaff [Tue, 23 Aug 2011 17:06:04 +0000 (10:06 -0700)]
ovs.db.types: Introduce DEFAULT_MIN, DEFAULT_MAX as Type class members.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.types: Use toAtomicType() instead of open-coding it.
Ben Pfaff [Tue, 23 Aug 2011 17:04:14 +0000 (10:04 -0700)]
ovs.db.types: Use toAtomicType() instead of open-coding it.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.types: Simplify code to avoid try/except case.
Ben Pfaff [Tue, 23 Aug 2011 16:58:49 +0000 (09:58 -0700)]
ovs.db.types: Simplify code to avoid try/except case.

Also fixes a typo that caused one version of the error message to have a
hyphen and the other to have a space.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.types: Use .append instead of += for adding to lists.
Ben Pfaff [Tue, 23 Aug 2011 21:00:54 +0000 (14:00 -0700)]
ovs.db.types: Use .append instead of += for adding to lists.

Python does not do a good job of appending lists to lists.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.schema: Factor common checks for identifiers into new function.
Ben Pfaff [Tue, 23 Aug 2011 16:55:14 +0000 (09:55 -0700)]
ovs.db.schema: Factor common checks for identifiers into new function.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.parser: Simplify code.
Ben Pfaff [Tue, 23 Aug 2011 16:36:56 +0000 (09:36 -0700)]
ovs.db.parser: Simplify code.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.idl: Use top-level class to represent IDL rows.
Ben Pfaff [Tue, 23 Aug 2011 16:36:39 +0000 (09:36 -0700)]
ovs.db.idl: Use top-level class to represent IDL rows.

According to Reid, there may be some disadvantages to having this class be
anonymous, for example, cannot do instance/typechecking, might be
allocating a new class for every row as well, which isn't the most memory
efficient.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.idl: Actually use Idl.__modify_row()'s return value.
Ben Pfaff [Tue, 23 Aug 2011 16:26:29 +0000 (09:26 -0700)]
ovs.db.idl: Actually use Idl.__modify_row()'s return value.

Idl.__parse_row_update() assumed that every change that the database server
sent down actually modified the database.  This is generally true, but
since Idl.__modify_row() already returns whether there was a change, we
might as well use it.

Reported-by: Reid Price <reid@nicira.com>
13 years agoovs.db.idl: Improve error reporting for bad <row-update>s.
Ben Pfaff [Tue, 23 Aug 2011 00:12:59 +0000 (17:12 -0700)]
ovs.db.idl: Improve error reporting for bad <row-update>s.

Strangely malformed <row-update>s could hypothetically get confusing error
message.  Using the Parser class should avoid that.

Reported-by: Reid Price <reid@nicira.com>
13 years agoovsdb-data: Simplify converting an OVSDB datum to JSON by reordering logic.
Ben Pfaff [Mon, 22 Aug 2011 21:52:21 +0000 (14:52 -0700)]
ovsdb-data: Simplify converting an OVSDB datum to JSON by reordering logic.

Putting the "map" case first avoids duplicate tests.

Suggested-by: Reid Price <reid@nicira.com>
13 years agodaemon: Stylistic improvement for __read_pidfile in Python implementation.
Ben Pfaff [Mon, 22 Aug 2011 21:40:09 +0000 (14:40 -0700)]
daemon: Stylistic improvement for __read_pidfile in Python implementation.

Suggested-by: Reid Price <reid@nicira.com>
13 years agodaemon: Correct comment in Python implementation.
Ben Pfaff [Mon, 22 Aug 2011 21:26:58 +0000 (14:26 -0700)]
daemon: Correct comment in Python implementation.

Reported-by: Reid Price <reid@nicira.com>
13 years agopython: Avoid using 'tuple' as a variable name.
Ben Pfaff [Tue, 23 Aug 2011 17:50:47 +0000 (10:50 -0700)]
python: Avoid using 'tuple' as a variable name.

'tuple' is a Python built-in function, so it's best to avoid using it as a
variable name.

Suggested-by: Reid Price <reid@nicira.com>
13 years agopython: Avoid using 'type' as a variable name.
Ben Pfaff [Tue, 23 Aug 2011 16:50:46 +0000 (09:50 -0700)]
python: Avoid using 'type' as a variable name.

'type' is a Python built-in function, so it's best to avoid using it as
a variable name.

Reported-by: Reid Price <reid@nicira.com>
13 years agopython: Take advantage of Python "x < y < z" syntax.
Ben Pfaff [Mon, 22 Aug 2011 23:49:53 +0000 (16:49 -0700)]
python: Take advantage of Python "x < y < z" syntax.

Suggested-by: Reid Price <reid@nicira.com>
13 years agopython: Avoid lots of \" in quoted strings by using '' as outermost quotes.
Ben Pfaff [Mon, 22 Aug 2011 23:54:28 +0000 (16:54 -0700)]
python: Avoid lots of \" in quoted strings by using '' as outermost quotes.

Suggested-by: Reid Price <reid@nicira.com>
13 years agopython: Join a list of strings instead of concatenating a long string.
Ben Pfaff [Tue, 23 Aug 2011 21:02:03 +0000 (14:02 -0700)]
python: Join a list of strings instead of concatenating a long string.

Python does not do a good job of appending strings: it takes O(n**2) time
to append n strings.

Suggested-by: Reid Price <reid@nicira.com>
13 years agopython: Use getattr() and setattr() instead of __dict__.
Ben Pfaff [Mon, 22 Aug 2011 21:31:18 +0000 (14:31 -0700)]
python: Use getattr() and setattr() instead of __dict__.

This leaves one use of __dict__ used for iterating through attributes.
I could use dir() instead, but I was put off by this note in its
documentation in the Python Library Reference:

    Because dir() is supplied primarily as a convenience for use at an
    interactive prompt, it tries to supply an interesting set of names more
    than it tries to supply a rigorously or consistently defined set of names,
    and its detailed behavior may change across releases.  For example,
    metaclass attributes are not in the result list when the argument is a
    class.

Suggested-by: Reid Price <reid@nicira.com>
13 years agoovs.db.data: Fix bugs in Atom.is_default() and Datum.is_default().
Ben Pfaff [Wed, 24 Aug 2011 18:57:14 +0000 (11:57 -0700)]
ovs.db.data: Fix bugs in Atom.is_default() and Datum.is_default().

Reported-by: Reid Price <reid@nicira.com>
13 years agoovs.stream: Fix logic bug in Stream.connect().
Ben Pfaff [Tue, 23 Aug 2011 18:09:46 +0000 (11:09 -0700)]
ovs.stream: Fix logic bug in Stream.connect().

The loop here is supposed to run at least once, and to continue looping as
long as the loop body changes the current state, but this bug caused it to
continue looping until the connection completed in success or failure.  It
probably didn't cause many problems in practice because only Unix domain
socket connections are currently supported, and those connections normally
complete immediately.

Reported-by: Reid Price <reid@nicira.com>
13 years agoDebian: set -e in brcompat postinst
Simon Horman [Wed, 24 Aug 2011 01:40:55 +0000 (10:40 +0900)]
Debian: set -e in brcompat postinst

As reported by lintian:

The maintainer script doesn't seem to set the -e flag which ensures
that the script's execution is aborted when any executed command
fails.

Refer to Debian Policy Manual section 10.4 (Scripts) for details.

13 years agodoc: Add spaces between commas to avoid overflowing line during formatting.
Ben Pfaff [Wed, 24 Aug 2011 16:45:18 +0000 (09:45 -0700)]
doc: Add spaces between commas to avoid overflowing line during formatting.

This resolves a warning reported as
"71: warning [p 11, 5.0i]: cannot adjust line"

Reported-by: Simon Horman <horms@verge.net.au>
Found by lintian.

13 years agodocs: Add missing escape
Simon Horman [Wed, 24 Aug 2011 01:40:53 +0000 (10:40 +0900)]
docs: Add missing escape

This adds what appears to be a missing character to an escape sequence.

This resolves a problem reported as
"a newline character is not allowed in an escape name".

Reported by lintian

13 years agodocs: Suppress "warning: macro `DD' not defined" warning
Simon Horman [Wed, 24 Aug 2011 01:40:52 +0000 (10:40 +0900)]
docs: Suppress "warning: macro `DD' not defined" warning

Suppress "warning: macro `DD' not defined" warning for ovs-brcompatd.8.

As per the description by Ben Pfaff for the same problem effecting
other files:

deamon.man allows the file that is including it to include extra
text in the description of --detach by defining a macro named DD.
Only some of the manpages that included it did this (only those
manpages that needed extra text there).  But it's better to be
quiet in "man --warnings", so this defines DD to an empty value in
the other manpages that include daemon.man.

Reported by lintian

13 years agoDebian: Add dependency on ${misc:Depends}
Simon Horman [Wed, 24 Aug 2011 01:40:51 +0000 (10:40 +0900)]
Debian: Add dependency on ${misc:Depends}

Add dependency on ${misc:Depends} to openvswitch-brcompat and ovsdbmonitor.
As reported by Lintian:

The source package uses debhelper, but it does not include
${misc:Depends} in the given binary package's debian/control entry.
Any debhelper command may add dependencies to ${misc:Depends} that
are required for the work that it does, so recommended best
practice is always add ${misc:Depends} to the dependencies of each
binary package if debhelper is in use.

Refer to the debhelper(7) manual page for details.

13 years agodpif-linux: Call rtnetlink_notifier_run() as required.
Ethan Jackson [Sat, 20 Aug 2011 00:50:32 +0000 (17:50 -0700)]
dpif-linux: Call rtnetlink_notifier_run() as required.

I don't think this actually fixes a bug, as netdev-linux calls this
function. However, it seems stylistically more correct.

13 years agortnetlink: Notifiers should only run once per poll loop.
Ethan Jackson [Mon, 22 Aug 2011 19:47:43 +0000 (12:47 -0700)]
rtnetlink: Notifiers should only run once per poll loop.

rtnetlink_notifier_run() does quite a bit of work, and is likely
only to have interesting effects once per poll loop.

13 years agoDrop spurious 'H' cases from daemon option parsing switch statements.
Ben Pfaff [Mon, 22 Aug 2011 17:41:21 +0000 (10:41 -0700)]
Drop spurious 'H' cases from daemon option parsing switch statements.

Help is 'h'.  I don't see how 'H' can ever happen.

13 years agodatapath: Remove unneeded { } around single statement.
Ben Pfaff [Fri, 19 Aug 2011 22:43:06 +0000 (15:43 -0700)]
datapath: Remove unneeded { } around single statement.

I noticed this looking around at other code.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
13 years agodatapath: Use "OVS_*" as opposed to "ODP_*" for user<->kernel interactions.
Justin Pettit [Thu, 18 Aug 2011 17:35:40 +0000 (10:35 -0700)]
datapath: Use "OVS_*" as opposed to "ODP_*" for user<->kernel interactions.

The prefix "ODP_*" is not overly descriptive in the context of the
larger Linux tree.  This commit changes the prefix to "OVS_*" for the
userpace to kernel interactions.  The userspace libraries still use
"ODP_" in many of their interfaces since it is more descriptive in the
OVS oeuvre.

Feature #6904

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
13 years agoofproto-dpif: Delete MAC learning entries when they expire.
Ben Pfaff [Fri, 19 Aug 2011 21:29:27 +0000 (14:29 -0700)]
ofproto-dpif: Delete MAC learning entries when they expire.

Commit fa066f015f716c7 "bridge: Move packet processing functionality into
ofproto" deleted the call to mac_learning_run() that deletes MAC learning
table entries when they expire.  This fixes the problem.

13 years agoclassifier: Fix typo in comment.
Ben Pfaff [Thu, 18 Aug 2011 20:02:22 +0000 (13:02 -0700)]
classifier: Fix typo in comment.

13 years agodatapath-protocol: Correct a description in odp_flow_attr structure.
Justin Pettit [Thu, 18 Aug 2011 17:31:15 +0000 (10:31 -0700)]
datapath-protocol: Correct a description in odp_flow_attr structure.

The description referenced "ODPAT_*", but it should be "ODP_ACTION_ATTR_".

Signed-off-by: Justin Pettit <jpettit@nicira.com>
13 years agodatapath: Correct comment for vport_add().
Justin Pettit [Thu, 18 Aug 2011 16:57:23 +0000 (09:57 -0700)]
datapath: Correct comment for vport_add().

The comment describing vport_add() incorrectly stated that the function
added the vport to the datapath.  It is the responsibility of the caller
to do that.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
13 years agoodp-util: Fix parsing of Ethertypes 0x8000 and above.
Ben Pfaff [Thu, 18 Aug 2011 17:33:32 +0000 (10:33 -0700)]
odp-util: Fix parsing of Ethertypes 0x8000 and above.

An existing comment in the function being updated explains the problem:

    * Many of the sscanf calls in this function use oversized destination
    * fields because some sscanf() implementations truncate the range of %i
    * directives, so that e.g. "%"SCNi16 interprets input of "0xfedc" as a
    * value of 0x7fff.  The other alternatives are to allow only a single
    * radix (e.g. decimal or hexadecimal) or to write more sophisticated
    * parsers.

13 years agoINSTALL.Linux: Fix up reference to old option name --with-l26.
Philippe Jung [Wed, 17 Aug 2011 18:34:09 +0000 (11:34 -0700)]
INSTALL.Linux: Fix up reference to old option name --with-l26.

13 years agoofproto: Update 'struct facet''s comments.
Ethan Jackson [Tue, 16 Aug 2011 21:14:33 +0000 (14:14 -0700)]
ofproto: Update 'struct facet''s comments.

Some of the comments in the definition of 'struct facet' had become
out of date.

13 years agoofproto: Remove extra_bytes parameter of facet_account().
Ethan Jackson [Tue, 16 Aug 2011 21:21:12 +0000 (14:21 -0700)]
ofproto: Remove extra_bytes parameter of facet_account().

It no longer has interesting users.

13 years agoofproto: Fix over accounting of byte counters.
Ethan Jackson [Tue, 16 Aug 2011 21:16:58 +0000 (14:16 -0700)]
ofproto: Fix over accounting of byte counters.

The update_stats() function in ofproto was attributing more bytes
to facets than they had actually accrued.  This could potentially
throw off bond load balancing.

Found by inspection.

13 years agoofproto: Clear packet and byte counters on flow additions.
Ethan Jackson [Tue, 16 Aug 2011 20:50:00 +0000 (13:50 -0700)]
ofproto: Clear packet and byte counters on flow additions.

When a flow is added to the flow table, its packet and byte
counters should be reset.  This patch efficiently approximates this
behavior.  It also does some minor code refactoring.

Bug #3183.

13 years agovswitch.xml: Remove unused "hwaddr" other-config key.
Justin Pettit [Mon, 15 Aug 2011 20:51:09 +0000 (13:51 -0700)]
vswitch.xml: Remove unused "hwaddr" other-config key.

13 years agoofp-print: Add missing "break".
Ben Pfaff [Mon, 15 Aug 2011 22:18:12 +0000 (15:18 -0700)]
ofp-print: Add missing "break".

This is not a bug yet, but it could be the next time someone carelessly
adds a new case.

13 years agoovs-ofctl: Fix a few formatting typos in manpage.
Ben Pfaff [Mon, 15 Aug 2011 20:17:58 +0000 (13:17 -0700)]
ovs-ofctl: Fix a few formatting typos in manpage.

13 years agoconnmgr: Remove unused function ofconn_n_pending_opgroups().
Ben Pfaff [Wed, 10 Aug 2011 19:46:36 +0000 (12:46 -0700)]
connmgr: Remove unused function ofconn_n_pending_opgroups().