projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto-dpif: Introduce "internal flows" for handling flow table misses.
[openvswitch]
/
utilities
/
ovs-controller.c
diff --git
a/utilities/ovs-controller.c
b/utilities/ovs-controller.c
index da9b17d00f86354bb7b3d25fab781d1e5038c433..d70b630517930fd2dad2a323e3835569a995bbd9 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 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.
@@
-40,6
+40,7
@@
#include "util.h"
#include "vconn.h"
#include "vlog.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
+#include "socket-util.h"
VLOG_DEFINE_THIS_MODULE(controller);
VLOG_DEFINE_THIS_MODULE(controller);
@@
-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, OFP10_VERSION, &vconn);
+ retval = vconn_open(name, OFP10_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);
@@
-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