projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
daemon: Factor out code into new function daemonize_post_detach().
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index 25deaffd9e5b43ad29652026e5fc30311c389036..04b16e8709b529479392207e49334e27c47f6f56 100644
(file)
--- a/
utilities/ovs-controller.c
+++ b/
utilities/ovs-controller.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011
Nicira Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011
, 2012 Nicira, Inc
.
*
* 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.
@@
-33,13
+33,14
@@
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
#include "openflow/openflow.h"
#include "poll-loop.h"
#include "rconn.h"
-#include "s
hash
.h"
+#include "s
imap
.h"
#include "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
#include "stream-ssl.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
+#include "socket-util.h"
VLOG_DEFINE_THIS_MODULE(controller);
VLOG_DEFINE_THIS_MODULE(controller);
@@
-61,7
+62,7
@@
static bool set_up_flows = true;
/* -N, --normal: Use "NORMAL" action instead of explicit port? */
static bool action_normal = false;
/* -N, --normal: Use "NORMAL" action instead of explicit port? */
static bool action_normal = false;
-/* -w, --wildcard: 0 to disable wildcard flow entries, a
OFPFW
_* bitmask to
+/* -w, --wildcard: 0 to disable wildcard flow entries, a
n OFPFW10
_* bitmask to
* enable specific wildcards, or UINT32_MAX to use the default wildcards. */
static uint32_t wildcards = 0;
* enable specific wildcards, or UINT32_MAX to use the default wildcards. */
static uint32_t wildcards = 0;
@@
-75,8
+76,8
@@
static bool mute = false;
/* -q, --queue: default OpenFlow queue, none if UINT32_MAX. */
static uint32_t default_queue = UINT32_MAX;
/* -q, --queue: default OpenFlow queue, none if UINT32_MAX. */
static uint32_t default_queue = UINT32_MAX;
-/* -Q, --port-queue: map from port name to port number
(cast to void *)
. */
-static struct s
hash port_queues = SHASH
_INITIALIZER(&port_queues);
+/* -Q, --port-queue: map from port name to port number. */
+static struct s
imap port_queues = SIMAP
_INITIALIZER(&port_queues);
/* --with-flows: Flows to send to switch. */
static struct ofputil_flow_mod *default_flows;
/* --with-flows: Flows to send to switch. */
static struct ofputil_flow_mod *default_flows;
@@
-115,7
+116,7
@@
main(int argc, char *argv[])
const char *name = argv[i];
struct vconn *vconn;
const char *name = argv[i];
struct vconn *vconn;
- retval = vconn_open(name, OFP
_VERSION, &vconn
);
+ retval = vconn_open(name, OFP
10_VERSION, &vconn, DSCP_DEFAULT
);
if (!retval) {
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
if (!retval) {
if (n_switches >= MAX_SWITCHES) {
ovs_fatal(0, "max %d switch connections", n_switches);
@@
-124,7
+125,7
@@
main(int argc, char *argv[])
continue;
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
continue;
} else if (retval == EAFNOSUPPORT) {
struct pvconn *pvconn;
- retval = pvconn_open(name, &pvconn);
+ retval = pvconn_open(name, &pvconn
, DSCP_DEFAULT
);
if (!retval) {
if (n_listeners >= MAX_LISTENERS) {
ovs_fatal(0, "max %d passive connections", n_listeners);
if (!retval) {
if (n_listeners >= MAX_LISTENERS) {
ovs_fatal(0, "max %d passive connections", n_listeners);
@@
-156,7
+157,7
@@
main(int argc, char *argv[])
for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
struct vconn *new_vconn;
for (i = 0; i < n_listeners && n_switches < MAX_SWITCHES; ) {
struct vconn *new_vconn;
- retval = pvconn_accept(listeners[i], OFP_VERSION, &new_vconn);
+ retval = pvconn_accept(listeners[i], OFP
10
_VERSION, &new_vconn);
if (!retval || retval == EAGAIN) {
if (!retval) {
new_switch(&switches[n_switches++], new_vconn);
if (!retval || retval == EAGAIN) {
if (!retval) {
new_switch(&switches[n_switches++], new_vconn);
@@
-222,7
+223,7
@@
new_switch(struct switch_ *sw, struct vconn *vconn)
{
struct lswitch_config cfg;
{
struct lswitch_config cfg;
- sw->rconn = rconn_create(60, 0);
+ sw->rconn = rconn_create(60, 0
, DSCP_DEFAULT
);
rconn_connect_unreliably(sw->rconn, vconn, NULL);
cfg.mode = (action_normal ? LSW_NORMAL
rconn_connect_unreliably(sw->rconn, vconn, NULL);
cfg.mode = (action_normal ? LSW_NORMAL
@@
-273,8
+274,7
@@
add_port_queue(char *s)
"\"<port-name>:<queue-id>\"");
}
"\"<port-name>:<queue-id>\"");
}
- if (!shash_add_once(&port_queues, port_name,
- (void *) (uintptr_t) atoi(queue_id))) {
+ if (!simap_put(&port_queues, port_name, atoi(queue_id))) {
ovs_fatal(0, "<port-name> arguments for -Q or --port-queue must "
"be unique");
}
ovs_fatal(0, "<port-name> arguments for -Q or --port-queue must "
"be unique");
}
@@
-376,7
+376,7
@@
parse_options(int argc, char *argv[])
usage();
case 'V':
usage();
case 'V':
- ovs_print_version(OFP
_VERSION, OFP
_VERSION);
+ ovs_print_version(OFP
10_VERSION, OFP10
_VERSION);
exit(EXIT_SUCCESS);
VLOG_OPTION_HANDLERS
exit(EXIT_SUCCESS);
VLOG_OPTION_HANDLERS
@@
-397,7
+397,7
@@
parse_options(int argc, char *argv[])
}
free(short_options);
}
free(short_options);
- if (!s
hash
_is_empty(&port_queues) || default_queue != UINT32_MAX) {
+ if (!s
imap
_is_empty(&port_queues) || default_queue != UINT32_MAX) {
if (action_normal) {
ovs_error(0, "queue IDs are incompatible with -N or --normal; "
"not using OFPP_NORMAL");
if (action_normal) {
ovs_error(0, "queue IDs are incompatible with -N or --normal; "
"not using OFPP_NORMAL");