Rename "secchan" to "ofproto" (library) and "ovs-openflowd" (program).

These names are more meaningful, so we prefer them.

Makefile.am

@@ -57,7 +57,7 @@ SUFFIXES = .in
                 -e 's,[@]PERL[@],$(PERL),g' > $@
 
 include lib/automake.mk
-include secchan/automake.mk
+include ofproto/automake.mk
 include utilities/automake.mk
 include tests/automake.mk
 include include/automake.mk

README

@@ -40,15 +40,15 @@ The main components of this distribution are:
       to be installed on a Citrix XenServer host as a drop-in
       replacement for its switch, with additional functionality.
 
-    * vlog-appctl, a utility that can control Open vSwitch daemons,
+    * ovs-appctl, a utility that can control Open vSwitch daemons,
       adjusting their logging levels among other uses.
 
 Open vSwitch also provides an OpenFlow implementation and tools for
 those interested in OpenFlow but not additional Open vSwitch features:
 
-    * secchan, a program that implements a simple OpenFlow switch
-      (without the special features provided by ovs-vswitchd) using
-      the same kernel module as ovs-vswitchd.
+    * ovs-openflowd, a program that implements a simple OpenFlow
+      switch (without the special features provided by ovs-vswitchd)
+      using the same kernel module as ovs-vswitchd.
 
     * ovs-controller, a simple OpenFlow controller.
 

debian/control

@@ -110,9 +110,9 @@ Architecture: any
 Recommends: openvswitch-switch
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Monitor utility for Open vSwitch switches
- The ovs-monitor utility included in this package monitors the secure
- channel and datapath.  If either become unresponsive, the switch is
- rebooted.
+ The ovs-monitor utility included in this package monitors the
+ ovs-openflowd process and the kernel datapath.  If either become
+ unresponsive, it reboots the machine.
 
 Package: openvswitch-wdt
 Architecture: any

debian/openvswitch-controller.README.Debian

@@ -6,7 +6,8 @@ README.Debian for openvswitch-controller
 
 * To enable OpenFlow switches to automatically discover the location
   of the controller, you must install and configure a DHCP server.
-  The secchan(8) manpage (found in the openvswitch-switch package) gives
-  a working example configuration file for the ISC DHCP server.
+  The ovs-openflowd(8) manpage (found in the openvswitch-switch
+  package) gives a working example configuration file for the ISC DHCP
+  server.
 
- -- Ben Pfaff <[email protected]>, Mon, 11 May 2009 13:26:38 -0700
+ -- Ben Pfaff <[email protected]>, Wed,  8 Jul 2009 09:39:53 -0700

debian/openvswitch-monitor.default

@@ -13,15 +13,16 @@
 # it reboots the system.  A value of zero disables the monitor.
 THRESHOLD=3
 
-# INTERVAL: The number of seconds to wait between probing secchan and
-# the datapath.
+# INTERVAL: The number of seconds to wait between probing
+# ovs-openflowd and the datapath.
 INTERVAL=1
 
 # LOG_FILE: File to log messages related to monitoring.
 LOG_FILE="/var/log/openvswitch/monitor"
 
-# SWITCH_VCONN: The vconn used to connect to the switch (secchan).
-# The secchan must be configured to listen to this vconn.  The default
-# here set is also listened to by default by the openvswitch-switch
-# package, so ordinarily there is no need to modify this.
-SWITCH_VCONN="/var/run/secchan.mgmt"
+# SWITCH_VCONN: The vconn used to connect to the switch
+# (ovs-openflowd).  The ovs-openflowd must be configured to listen to
+# this vconn.  The default here set is also listened to by default by
+# the openvswitch-switch package, so ordinarily there is no need to
+# modify this.
+SWITCH_VCONN="/var/run/ovs-openflowd.mgmt"

debian/openvswitch-switch-config.templates

@@ -64,7 +64,7 @@ _Description: Preparing to discover controller.
  The setup program will now attempt to discover the OpenFlow controller.
  Controller discovery may take up to 30 seconds.  Please be patient.
  .
- See secchan(8) for instructions on how to configure a DHCP server for
+ See ovs-openflowd(8) for instructions on how to configure a DHCP server for
  controller discovery.
 
 Template: openvswitch-switch/discovery-failure
@@ -73,7 +73,7 @@ _Description: Controller discovery failed.
  The controller's location could not be determined automatically.
  .
  Ensure that the OpenFlow DHCP server is properly configured.  See
- secchan(8) for instructions on how to configure a DHCP server for
+ ovs-openflowd(8) for instructions on how to configure a DHCP server for
  controller discovery.
 
 Template: openvswitch-switch/discovery-success

debian/openvswitch-switch.init

@@ -19,9 +19,9 @@
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/secchan
-NAME=secchan
-DESC=secchan
+DAEMON=/usr/sbin/ovs-openflowd
+NAME=ovs-openflowd
+DESC=ovs-openflowd
 
 test -x $DAEMON || exit 0
 
@@ -35,7 +35,7 @@ DODTIME=1                   # Time to wait for the server to die, in seconds
                             # let some servers to die gracefully and
                             # 'restart' will not work
 
-# Include secchan defaults if available
+# Include ovs-openflowd defaults if available
 unset NETDEVS
 unset MODE
 unset SWITCH_IP
@@ -319,7 +319,7 @@ case "$1" in
             check_op "Setting core limit to $CORE_LIMIT" ulimit -c "$CORE_LIMIT"
         fi
 
-        # Compose secchan options.
+        # Compose ovs-openflowd options.
         set --
         set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err
         set -- "$@" --log-file

debian/openvswitch-switch.install

@@ -1,4 +1,4 @@
-_debian/secchan/secchan usr/sbin
+_debian/utilities/ovs-openflowd usr/sbin
 _debian/utilities/ovs-dpctl usr/sbin
 _debian/utilities/ovs-discover usr/sbin
 _debian/utilities/ovs-kill usr/sbin

debian/openvswitch-switch.logrotate

@@ -1,11 +1,11 @@
-/var/log/openvswitch/secchan.log {
+/var/log/openvswitch/ovs-openflowd.log {
         daily
         compress
         create 640 root adm
         delaycompress
         missingok
         rotate 30
         postrotate
-                ovs-appctl --target /var/run/secchan.pid --reopen
+                ovs-appctl --target /var/run/ovs-openflowd.pid --reopen
         endscript
 }

debian/openvswitch-switch.manpages

@@ -1,4 +1,4 @@
-_debian/secchan/secchan.8
+_debian/utilities/ovs-openflowd.8
 _debian/utilities/ovs-discover.8
 _debian/utilities/ovs-dpctl.8
 _debian/utilities/ovs-kill.8

debian/openvswitch-switch.template

@@ -1,7 +1,7 @@
 # This is a POSIX shell fragment                -*- sh -*-
 
-# To configure the secure channel, fill in the following properly and
-# uncomment them.  Afterward, the secure channel will come up
+# To configure the OpenFlow switch, fill in the following properly and
+# uncomment them.  Afterward, the switch will come up
 # automatically at boot time.  It can be started immediately with
 #       /etc/init.d/openvswitch-switch start
 # Alternatively, use the ovs-switch-setup program (from the
@@ -101,12 +101,12 @@ SWITCH_IP=dhcp
 # Set CACERT_MODE to 'secure' or 'bootstrap' for these respective cases.
 #CACERT_MODE=secure
 
-# MGMT_VCONNS: List of vconns (space-separated) on which secchan
+# MGMT_VCONNS: List of vconns (space-separated) on which ovs-openflowd
 # should listen for management connections from ovs-ofctl, etc.
 # openvswitch-switchui by default connects to
-# unix:/var/run/secchan.mgmt, so do not disable this if you want to
+# unix:/var/run/ovs-openflowd.mgmt, so do not disable this if you want to
 # use openvswitch-switchui.
-MGMT_VCONNS="punix:/var/run/secchan.mgmt"
+MGMT_VCONNS="punix:/var/run/ovs-openflowd.mgmt"
 
 # COMMANDS: Access control list for the commands that can be executed
 # remotely over the OpenFlow protocol, as a comma-separated list of
@@ -122,7 +122,7 @@ MGMT_VCONNS="punix:/var/run/secchan.mgmt"
 #DISCONNECTED_MODE=switch
 
 # STP: Enable or disabled 802.1D-1998 Spanning Tree Protocol.  Set to
-# 'yes' to enable STP, 'no' to disable it.  If unset, secchan's
+# 'yes' to enable STP, 'no' to disable it.  If unset, ovs-openflowd's
 # current default is 'no' (but this may change in the future).
 #STP=no
 
@@ -133,17 +133,17 @@ MGMT_VCONNS="punix:/var/run/secchan.mgmt"
 #RATE_LIMIT=1000
 
 # INACTIVITY_PROBE: The maximum number of seconds of inactivity on the
-# controller connection before secchan sends an inactivity probe
+# controller connection before ovs-openflowd sends an inactivity probe
 # message to the controller.  The valid range is 5 and up.  If unset,
-# secchan defaults to 15 seconds.
+# ovs-openflowd defaults to 15 seconds.
 #INACTIVITY_PROBE=5
 
-# MAX_BACKOFF: The maximum time that secchan will wait between
+# MAX_BACKOFF: The maximum time that ovs-openflowd will wait between
 # attempts to connect to the controller.  The valid range is 1 and up.
-# If unset, secchan defaults to 15 seconds.
+# If unset, ovs-openflowd defaults to 15 seconds.
 #MAX_BACKOFF=15
 
-# DAEMON_OPTS: Additional options to pass to secchan, e.g. "--fail=open"
+# DAEMON_OPTS: Additional options to pass to ovs-openflowd, e.g. "--fail=open"
 DAEMON_OPTS=""
 
 # CORE_LIMIT: Maximum size for core dumps.

debian/openvswitch-switchui.default

@@ -1,19 +1,19 @@
 # This is a POSIX shell fragment                -*- sh -*-
 
-# To configure the switch monitor, modify the following.  Afterward,
-# the secure channel will come up automatically at boot time.  It can
+# To configure the switch UI, modify the following.  Afterward,
+# the switch UI will come up automatically at boot time.  It can
 # be restarted immediately with
 #       /etc/init.d/openvswitch-switchui start
 
 # Defaults for initscript
 # sourced by /etc/init.d/openvswitch-switchui
 # installed at /etc/default/openvswitch-switchui by the maintainer scripts
 
-# SWITCH_VCONN: The vconn used to connect to the switch (secchan).
-# The secchan must be configured to listen to this vconn.  The default
+# SWITCH_VCONN: The vconn used to connect to the switch (ovs-openflowd).
+# The ovs-openflowd must be configured to listen to this vconn.  The default
 # here set is also listened to by default by the openvswitch-switch
 # package, so ordinarily there is no need to modify this.
-SWITCH_VCONN="unix:/var/run/secchan.mgmt"
+SWITCH_VCONN="unix:/var/run/ovs-openflowd.mgmt"
 
 # EZIO3_DEVICE: To display the switch monitor on an EZIO3 (aka
 # MTB-134) 16x2 LCD displays found on server appliances made by

debian/ovs-switch-setup.8

@@ -38,4 +38,4 @@ obtained from the OpenFlow PKI server.
 
 .BR ovs\-dpctl (8),
 .BR ovs-pki (8),
-.BR secchan (8)
+.BR ovs-openflowd (8)

debian/po/templates.pot

@@ -168,7 +168,7 @@ msgstr ""
 #. Description
 #: ../openvswitch-switch-config.templates:5001
 msgid ""
-"See secchan(8) for instructions on how to configure a DHCP server for "
+"See ovs-openflowd(8) for instructions on how to configure a DHCP server for "
 "controller discovery."
 msgstr ""
 
@@ -188,7 +188,7 @@ msgstr ""
 #. Description
 #: ../openvswitch-switch-config.templates:6001
 msgid ""
-"Ensure that the OpenFlow DHCP server is properly configured.  See secchan(8) "
+"Ensure that the OpenFlow DHCP server is properly configured.  See ovs-openflowd(8) "
 "for instructions on how to configure a DHCP server for controller discovery."
 msgstr ""
 

extras/ezio/ovs-switchui.c

@@ -114,7 +114,7 @@ static void compose_messages(const struct dict *, struct rconn *rconn);
 
 static void show_flows(struct rconn *);
 static void show_dpid_ip(struct rconn *, const struct dict *);
-static void show_secchan_state(const struct dict *);
+static void show_ofproto_state(const struct dict *);
 static void show_fail_open_state(const struct dict *);
 static void show_discovery_state(const struct dict *);
 static void show_remote_state(const struct dict *);
@@ -257,7 +257,7 @@ compose_messages(const struct dict *dict, struct rconn *rconn)
     if (!show_reboot_state()) {
         show_flows(rconn);
         show_dpid_ip(rconn, dict);
-        show_secchan_state(dict);
+        show_ofproto_state(dict);
         show_fail_open_state(dict);
         show_discovery_state(dict);
         show_remote_state(dict);
@@ -648,7 +648,7 @@ addf(const char *format, ...)
 }
 
 static void
-show_secchan_state(const struct dict *dict)
+show_ofproto_state(const struct dict *dict)
 {
     static struct message *msg;
     const char *is_connected;

include/openvswitch/datapath-protocol.h

@@ -37,7 +37,7 @@
  * ----------------------------------------------------------------------
  */
 
-/* Protocol between secchan and datapath. */
+/* Protocol between userspace and kernel datapath. */
 
 #ifndef OPENVSWITCH_DATAPATH_PROTOCOL_H
 #define OPENVSWITCH_DATAPATH_PROTOCOL_H 1

lib/automake.mk

@@ -187,8 +187,8 @@ COVERAGE_FILES = \
 	lib/unixctl.c \
 	lib/util.c \
 	lib/vconn.c \
-	secchan/ofproto.c \
-	secchan/pktbuf.c \
+	ofproto/ofproto.c \
+	ofproto/pktbuf.c \
 	vswitchd/bridge.c \
 	vswitchd/mgmt.c \
 	vswitchd/ovs-brcompatd.c

lib/rconn.c

@@ -89,7 +89,7 @@ struct rconn {
     time_t last_admitted;
 
     /* These values are simply for statistics reporting, not used directly by
-     * anything internal to the rconn (or the secchan for that matter). */
+     * anything internal to the rconn (or ofproto for that matter). */
     unsigned int packets_received;
     unsigned int n_attempted_connections, n_successful_connections;
     time_t creation_time;

lib/vlog-modules.def

@@ -50,16 +50,15 @@ VLOG_MODULE(netlink)
 VLOG_MODULE(ofctl)
 VLOG_MODULE(ovs_discover)
 VLOG_MODULE(ofproto)
+VLOG_MODULE(openflowd)
 VLOG_MODULE(pktbuf)
 VLOG_MODULE(pcap)
 VLOG_MODULE(poll_loop)
 VLOG_MODULE(port_watcher)
 VLOG_MODULE(proc_net_compat)
 VLOG_MODULE(process)
-VLOG_MODULE(secchan)
 VLOG_MODULE(rconn)
 VLOG_MODULE(stp)
-VLOG_MODULE(stp_secchan)
 VLOG_MODULE(stats)
 VLOG_MODULE(status)
 VLOG_MODULE(svec)

secchan/.gitignore → ofproto/.gitignore

@@ -1,4 +1,2 @@
 /Makefile
 /Makefile.in
-/secchan
-/secchan.8

ofproto/automake.mk

@@ -0,0 +1,29 @@
+# Copyright (C) 2009 Nicira Networks, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without warranty of any kind.
+
+noinst_LIBRARIES += ofproto/libofproto.a
+ofproto_libofproto_a_SOURCES = \
+	ofproto/discovery.c \
+	ofproto/discovery.h \
+	ofproto/executer.c \
+	ofproto/executer.h \
+	ofproto/fail-open.c \
+	ofproto/fail-open.h \
+	ofproto/in-band.c \
+	ofproto/in-band.h \
+	ofproto/netflow.c \
+	ofproto/netflow.h \
+	ofproto/ofproto.c \
+	ofproto/ofproto.h \
+	ofproto/pktbuf.c \
+	ofproto/pktbuf.h \
+	ofproto/pinsched.c \
+	ofproto/pinsched.h \
+	ofproto/status.c \
+	ofproto/status.h
+
+include ofproto/commands/automake.mk

secchan/commands/automake.mk → ofproto/commands/automake.mk

@@ -1,3 +1,3 @@
 commandsdir = ${pkgdatadir}/commands
 dist_commands_SCRIPTS = \
-	secchan/commands/reboot
+	ofproto/commands/reboot

secchan/executer.c → ofproto/executer.c

@@ -83,7 +83,7 @@ static void send_child_message(struct rconn *, uint32_t xid, uint32_t status,
 
 /* Returns true if 'cmd' is allowed by 'acl', which is a command-separated
  * access control list in the format described for --command-acl in
- * secchan(8). */
+ * ovs-openflowd(8). */
 static bool
 executer_is_permitted(const char *acl_, const char *cmd)
 {