projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Move private definitions to separate header.
[openvswitch]
/
utilities
/
ovs-openflowd.c
diff --git
a/utilities/ovs-openflowd.c
b/utilities/ovs-openflowd.c
index a58a9d219467b7f034523b6fb1196f193125270b..f54eb355d30694b51cb48d6266b26784d26166d4 100644
(file)
--- a/
utilities/ovs-openflowd.c
+++ b/
utilities/ovs-openflowd.c
@@
-93,7
+93,6
@@
main(int argc, char *argv[])
struct ofproto *ofproto;
struct ofsettings s;
int error;
struct ofproto *ofproto;
struct ofsettings s;
int error;
- struct dpif *dpif;
struct netflow_options nf_options;
const char *port;
bool exiting;
struct netflow_options nf_options;
const char *port;
bool exiting;
@@
-103,7
+102,6
@@
main(int argc, char *argv[])
parse_options(argc, argv, &s);
signal(SIGPIPE, SIG_IGN);
parse_options(argc, argv, &s);
signal(SIGPIPE, SIG_IGN);
- die_if_already_running();
daemonize_start();
/* Start listening for ovs-appctl requests. */
daemonize_start();
/* Start listening for ovs-appctl requests. */
@@
-117,9
+115,10
@@
main(int argc, char *argv[])
VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR);
VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION);
VLOG_INFO("Open vSwitch version %s", VERSION BUILDNR);
VLOG_INFO("OpenFlow protocol version 0x%02x", OFP_VERSION);
- error =
dpif_create_and_open(s.dp_name, s.dp_type, &dpif
);
+ error =
ofproto_create(s.dp_name, s.dp_type, NULL, NULL, &ofproto
);
if (error) {
if (error) {
- VLOG_FATAL("could not create datapath (%s)", strerror(error));
+ VLOG_FATAL("could not initialize OpenFlow switch (%s)",
+ strerror(error));
}
/* Add ports to the datapath if requested by the user. */
}
/* Add ports to the datapath if requested by the user. */
@@
-132,7
+131,7
@@
main(int argc, char *argv[])
port, strerror(error));
}
port, strerror(error));
}
- error =
dpif_port_add(dpif
, netdev, NULL);
+ error =
ofproto_port_add(ofproto
, netdev, NULL);
if (error) {
VLOG_FATAL("failed to add %s as a port (%s)",
port, strerror(error));
if (error) {
VLOG_FATAL("failed to add %s as a port (%s)",
port, strerror(error));
@@
-141,12
+140,7
@@
main(int argc, char *argv[])
netdev_close(netdev);
}
netdev_close(netdev);
}
- /* Start OpenFlow processing. */
- error = ofproto_create(s.dp_name, s.dp_type, NULL, NULL, &ofproto);
- if (error) {
- VLOG_FATAL("could not initialize openflow switch (%s)",
- strerror(error));
- }
+ /* Configure OpenFlow switch. */
if (s.datapath_id) {
ofproto_set_datapath_id(ofproto, s.datapath_id);
}
if (s.datapath_id) {
ofproto_set_datapath_id(ofproto, s.datapath_id);
}
@@
-189,7
+183,7
@@
main(int argc, char *argv[])
poll_block();
}
poll_block();
}
-
dpif_close(dpif
);
+
ofproto_destroy(ofproto
);
return 0;
}
return 0;
}