projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Make explicit that ovs-vswitchd is the preferred switch.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index 56a530730f50b665fae95f91509ed0f26b7e84d2..f4358e9f352fb9276625da74982505e8b5f26c7b 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009
, 2010
Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-67,8
+67,11
@@
static int max_idle = 60;
* of their messages (for debugging fail-open mode). */
static bool mute = false;
* of their messages (for debugging fail-open mode). */
static bool mute = false;
+/* --unixctl: Name of unixctl socket, or null to use the default. */
+static char *unixctl_path = NULL;
+
static int do_switching(struct switch_ *);
static int do_switching(struct switch_ *);
-static void new_switch(struct switch_ *, struct vconn *
, const char *name
);
+static void new_switch(struct switch_ *, struct vconn *);
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
@@
-82,6
+85,7
@@
main(int argc, char *argv[])
int retval;
int i;
int retval;
int i;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
time_init();
vlog_init();
set_program_name(argv[0]);
time_init();
vlog_init();
@@
-104,7
+108,7
@@
main(int argc, char *argv[])
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
}
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
}
- new_switch(&switches[n_switches++], vconn
, name
);
+ new_switch(&switches[n_switches++], vconn);
continue;
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
continue;
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
@@
-127,9
+131,9
@@
main(int argc, char *argv[])
die_if_already_running();
daemonize_start();
die_if_already_running();
daemonize_start();
- retval = unixctl_server_create(
NULL
, &unixctl);
+ retval = unixctl_server_create(
unixctl_path
, &unixctl);
if (retval) {
if (retval) {
-
ovs_fatal(retval, "Could not listen for unixctl connections"
);
+
exit(EXIT_FAILURE
);
}
daemonize_complete();
}
daemonize_complete();
@@
-146,7
+150,7
@@
main(int argc, char *argv[])
retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
if (!retval || retval == EAGAIN) {
if (!retval) {
retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
if (!retval || retval == EAGAIN) {
if (!retval) {
- new_switch(&switches[n_switches++], new_vconn
, "tcp"
);
+ new_switch(&switches[n_switches++], new_vconn);
}
i++;
} else {
}
i++;
} else {
@@
-204,9
+208,10
@@
main(int argc, char *argv[])
}
static void
}
static void
-new_switch(struct switch_ *sw, struct vconn *vconn
, const char *name
)
+new_switch(struct switch_ *sw, struct vconn *vconn)
{
{
- sw->rconn = rconn_new_from_vconn(name, vconn);
+ sw->rconn = rconn_create(60, 0);
+ rconn_connect_unreliably(sw->rconn, vconn, NULL);
sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows,
set_up_flows ? max_idle : -1,
action_normal);
sw->lswitch = lswitch_create(sw->rconn, learn_macs, exact_flows,
set_up_flows ? max_idle : -1,
action_normal);
@@
-241,6
+246,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_UNIXCTL,
VLOG_OPTION_ENUMS
};
static struct option long_options[] = {
VLOG_OPTION_ENUMS
};
static struct option long_options[] = {
@@
-250,6
+256,7
@@
parse_options(int argc, char *argv[])
{"wildcard", no_argument, 0, 'w'},
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE},
{"wildcard", no_argument, 0, 'w'},
{"max-idle", required_argument, 0, OPT_MAX_IDLE},
{"mute", no_argument, 0, OPT_MUTE},
+ {"unixctl", required_argument, 0, OPT_UNIXCTL},
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
DAEMON_LONG_OPTIONS,
{"help", no_argument, 0, 'h'},
{"version", no_argument, 0, 'V'},
DAEMON_LONG_OPTIONS,
@@
-304,6
+311,10
@@
parse_options(int argc, char *argv[])
}
break;
}
break;
+ case OPT_UNIXCTL:
+ unixctl_path = optarg;
+ break;
+
case 'h':
usage();
case 'h':
usage();
@@
-348,6
+359,7
@@
usage(void)
" --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"
" --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"
+ " --unixctl=SOCKET override default control socket name\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);