projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jsonrpc: Check RPC status after trying to send, not before.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index 30ab52dbec94845fef655e223f95bc53f3759b39..56a530730f50b665fae95f91509ed0f26b7e84d2 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-26,16
+26,15
@@
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
-#include "fault.h"
#include "learning-switch.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
#include "learning-switch.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
+#include "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn-ssl.h"
#include "vconn.h"
#include "vlog.h"
#include "vconn.h"
#include "vlog.h"
@@
-55,6
+54,12
@@
static bool learn_macs = true;
/* Set up flows? (If not, every packet is processed at the controller.) */
static bool set_up_flows = true;
/* Set up flows? (If not, every packet is processed at the controller.) */
static bool set_up_flows = true;
+/* -N, --normal: Use "NORMAL" action instead of explicit port? */
+static bool action_normal = false;
+
+/* -w, --wildcard: Set up exact match or wildcard flow entries? */
+static bool exact_flows = true;
+
/* --max-idle: Maximum idle time, in seconds, before flows expire. */
static int max_idle = 60;
/* --max-idle: Maximum idle time, in seconds, before flows expire. */
static int max_idle = 60;
@@
-78,7
+83,6
@@
main(int argc, char *argv[])
int i;
set_program_name(argv[0]);
int i;
set_program_name(argv[0]);
- register_fault_handlers();
time_init();
vlog_init();
parse_options(argc, argv);
time_init();
vlog_init();
parse_options(argc, argv);
@@
-121,13
+125,15
@@
main(int argc, char *argv[])
}
die_if_already_running();
}
die_if_already_running();
- daemonize();
+ daemonize
_start
();
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
ovs_fatal(retval, "Could not listen for unixctl connections");
}
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
ovs_fatal(retval, "Could not listen for unixctl connections");
}
+ daemonize_complete();
+
while (n_switches > 0 || n_listeners > 0) {
int iteration;
int i;
while (n_switches > 0 || n_listeners > 0) {
int iteration;
int i;
@@
-201,8
+207,9
@@
static void
new_switch(struct switch_ *sw, struct vconn *vconn, const char *name)
{
sw->rconn = rconn_new_from_vconn(name, vconn);
new_switch(struct switch_ *sw, struct vconn *vconn, const char *name)
{
sw->rconn = rconn_new_from_vconn(name, vconn);
- sw->lswitch = lswitch_create(sw->rconn, learn_macs,
- set_up_flows ? max_idle : -1);
+ sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows,
+ set_up_flows ? max_idle : -1,
+ action_normal);
}
static int
}
static int
@@
-239,6
+246,8
@@
parse_options(int argc, char *argv[])
static struct option long_options[] = {
{"hub", no_argument, 0, 'H'},
{"noflow", no_argument, 0, 'n'},
static struct option long_options[] = {
{"hub", no_argument, 0, 'H'},
{"noflow", no_argument, 0, 'n'},
+ {"normal", no_argument, 0, 'N'},
+ {"wildcard", no_argument, 0, 'w'},
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE},
{"help", no_argument, 0, 'h'},
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE},
{"help", no_argument, 0, 'h'},
@@
-246,7
+255,7
@@
parse_options(int argc, char *argv[])
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
DAEMON_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_LONG_OPTIONS
+
STREAM
_SSL_LONG_OPTIONS
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
{"peer-ca-cert", required_argument, 0, OPT_PEER_CA_CERT},
#endif
{0, 0, 0, 0},
@@
-275,6
+284,14
@@
parse_options(int argc, char *argv[])
mute = true;
break;
mute = true;
break;
+ case 'N':
+ action_normal = true;
+ break;
+
+ case 'w':
+ exact_flows = false;
+ break;
+
case OPT_MAX_IDLE:
if (!strcmp(optarg, "permanent")) {
max_idle = OFP_FLOW_PERMANENT;
case OPT_MAX_IDLE:
if (!strcmp(optarg, "permanent")) {
max_idle = OFP_FLOW_PERMANENT;
@@
-298,10
+315,10
@@
parse_options(int argc, char *argv[])
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
DAEMON_OPTION_HANDLERS
#ifdef HAVE_OPENSSL
-
VCONN
_SSL_OPTION_HANDLERS
+
STREAM
_SSL_OPTION_HANDLERS
case OPT_PEER_CA_CERT:
case OPT_PEER_CA_CERT:
-
vconn
_ssl_set_peer_ca_cert_file(optarg);
+
stream
_ssl_set_peer_ca_cert_file(optarg);
break;
#endif
break;
#endif
@@
-329,6
+346,8
@@
usage(void)
" -H, --hub act as hub instead of learning switch\n"
" -n, --noflow pass traffic, but don't add flows\n"
" --max-idle=SECS max idle time for new flows\n"
" -H, --hub act as hub instead of learning switch\n"
" -n, --noflow pass traffic, but don't add flows\n"
" --max-idle=SECS max idle time for new flows\n"
+ " -N, --normal use OFPAT_NORMAL action\n"
+ " -w, --wildcard use wildcards, not exact-match rules\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
exit(EXIT_SUCCESS);
" -h, --help display this help message\n"
" -V, --version display version information\n");
exit(EXIT_SUCCESS);