projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: New macro OBJECT_CONTAINING.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index 87383e1befe307c028922960889a1779ed066873..40e2a801da63ca01f3d37d062655f262f5147fdf 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-21,6
+21,7
@@
#include <limits.h>
#include <signal.h>
#include <stdlib.h>
#include <limits.h>
#include <signal.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include "command-line.h"
#include <string.h>
#include "command-line.h"
@@
-36,9
+37,9
@@
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_controller
+
+VLOG_DEFINE_THIS_MODULE(controller)
#define MAX_SWITCHES 16
#define MAX_LISTENERS 16
#define MAX_SWITCHES 16
#define MAX_LISTENERS 16
@@
-70,6
+71,10
@@
static bool mute = false;
/* -q, --queue: OpenFlow queue to use, or the default queue if UINT32_MAX. */
static uint32_t queue_id = UINT32_MAX;
/* -q, --queue: OpenFlow queue to use, or the default queue if UINT32_MAX. */
static uint32_t queue_id = UINT32_MAX;
+/* --with-flows: File with flows to send to switch, or null to not load
+ * any default flows. */
+static FILE *flow_file = NULL;
+
/* --unixctl: Name of unixctl socket, or null to use the default. */
static char *unixctl_path = NULL;
/* --unixctl: Name of unixctl socket, or null to use the default. */
static char *unixctl_path = NULL;
@@
-90,7
+95,6
@@
main(int argc, char *argv[])
proctitle_init(argc, argv);
set_program_name(argv[0]);
proctitle_init(argc, argv);
set_program_name(argv[0]);
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
@@
-103,7
+107,6
@@
main(int argc, char *argv[])
for (i = optind; i < argc; i++) {
const char *name = argv[i];
struct vconn *vconn;
for (i = optind; i < argc; i++) {
const char *name = argv[i];
struct vconn *vconn;
- int retval;
retval = vconn_open(name, OFP_VERSION, &vconn);
if (!retval) {
retval = vconn_open(name, OFP_VERSION, &vconn);
if (!retval) {
@@
-142,12
+145,10
@@
main(int argc, char *argv[])
while (n_switches > 0 || n_listeners > 0) {
int iteration;
while (n_switches > 0 || n_listeners > 0) {
int iteration;
- int i;
/* Accept connections on listening vconns. */
for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
struct vconn *new_vconn;
/* Accept connections on listening vconns. */
for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
struct vconn *new_vconn;
- int retval;
retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
if (!retval || retval == EAGAIN) {
retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
if (!retval || retval == EAGAIN) {
@@
-167,7
+168,8
@@
main(int argc, char *argv[])
bool progress = false;
for (i = 0; i < n_switches; ) {
struct switch_ *this = &switches[i];
bool progress = false;
for (i = 0; i < n_switches; ) {
struct switch_ *this = &switches[i];
- int retval = do_switching(this);
+
+ retval = do_switching(this);
if (!retval || retval == EAGAIN) {
if (!retval) {
progress = true;
if (!retval || retval == EAGAIN) {
if (!retval) {
progress = true;
@@
-185,7
+187,7
@@
main(int argc, char *argv[])
}
for (i = 0; i < n_switches; i++) {
struct switch_ *this = &switches[i];
}
for (i = 0; i < n_switches; i++) {
struct switch_ *this = &switches[i];
- lswitch_run(this->lswitch
, this->rconn
);
+ lswitch_run(this->lswitch);
}
unixctl_server_run(unixctl);
}
unixctl_server_run(unixctl);
@@
-214,9
+216,17
@@
new_switch(struct switch_ *sw, struct vconn *vconn)
{
sw->rconn = rconn_create(60, 0);
rconn_connect_unreliably(sw->rconn, vconn, NULL);
{
sw->rconn = rconn_create(60, 0);
rconn_connect_unreliably(sw->rconn, vconn, NULL);
+
+ /* If it was set, rewind 'flow_file' to the beginning, since a
+ * previous call to lswitch_create() will leave the stream at the
+ * end. */
+ if (flow_file) {
+ rewind(flow_file);
+ }
sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows,
set_up_flows ? max_idle : -1,
sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows,
set_up_flows ? max_idle : -1,
- action_normal);
+ action_normal, flow_file);
+
lswitch_set_queue(sw->lswitch, queue_id);
}
lswitch_set_queue(sw->lswitch, queue_id);
}
@@
-249,6
+259,7
@@
parse_options(int argc, char *argv[])
OPT_MAX_IDLE = UCHAR_MAX + 1,
OPT_PEER_CA_CERT,
OPT_MUTE,
OPT_MAX_IDLE = UCHAR_MAX + 1,
OPT_PEER_CA_CERT,
OPT_MUTE,
+ OPT_WITH_FLOWS,
OPT_UNIXCTL,
VLOG_OPTION_ENUMS
};
OPT_UNIXCTL,
VLOG_OPTION_ENUMS
};
@@
-260,6
+271,7
@@
parse_options(int argc, char *argv[])
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE},
{"queue", required_argument, 0, 'q'},
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE},
{"queue", required_argument, 0, 'q'},
+ {"with-flows", required_argument, 0, OPT_WITH_FLOWS},
{"unixctl", required_argument, 0, OPT_UNIXCTL},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
{"unixctl", required_argument, 0, OPT_UNIXCTL},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
@@
-319,6
+331,13
@@
parse_options(int argc, char *argv[])
queue_id = atoi(optarg);
break;
queue_id = atoi(optarg);
break;
+ case OPT_WITH_FLOWS:
+ flow_file = fopen(optarg, "r");
+ if (flow_file == NULL) {
+ ovs_fatal(errno, "%s: open", optarg);
+ }
+ break;
+
case OPT_UNIXCTL:
unixctl_path = optarg;
break;
case OPT_UNIXCTL:
unixctl_path = optarg;
break;
@@
-368,6
+387,7
@@
usage(void)
" -N, --normal use OFPAT_NORMAL action\n"
" -w, --wildcard use wildcards, not exact-match rules\n"
" -q, --queue=QUEUE OpenFlow queue ID to use for output\n"
" -N, --normal use OFPAT_NORMAL action\n"
" -w, --wildcard use wildcards, not exact-match rules\n"
" -q, --queue=QUEUE OpenFlow queue ID to use for output\n"
+ " --with-flows FILE use the flows from FILE\n"
" --unixctl=SOCKET override default control socket name\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
" --unixctl=SOCKET override default control socket name\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");