#include "compiler.h"
#include "daemon.h"
#include "dirs.h"
-#include "dpif.h"
#include "leak-checker.h"
#include "list.h"
#include "netdev.h"
#include "ofpbuf.h"
#include "ofproto/ofproto.h"
+#include "ofproto/wdp.h"
#include "openflow/openflow.h"
#include "packets.h"
#include "poll-loop.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
+#include "xfif.h"
VLOG_DEFINE_THIS_MODULE(openflowd)
struct ofproto *ofproto;
struct ofsettings s;
int error;
- struct dpif *dpif;
+ struct xfif *xfif;
struct netflow_options nf_options;
proctitle_init(argc, argv);
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 = xfif_create_and_open(s.dp_name, s.dp_type, &xfif);
if (error) {
ovs_fatal(error, "could not create datapath");
}
size_t i;
SVEC_FOR_EACH (i, port, &s.ports) {
- error = dpif_port_add(dpif, port, 0, NULL);
+ error = xfif_port_add(xfif, port, 0, NULL);
if (error) {
ovs_fatal(error, "failed to add %s as a port", port);
}
ovs_fatal(error, "unrecoverable datapath error");
}
unixctl_server_run(unixctl);
- dp_run();
+ wdp_run();
netdev_run();
ofproto_wait(ofproto);
unixctl_server_wait(unixctl);
- dp_wait();
+ wdp_wait();
netdev_wait();
poll_block();
}
- dpif_close(dpif);
+ xfif_close(xfif);
return 0;
}
}
/* Local vconns. */
- dp_parse_name(argv[0], &s->dp_name, &s->dp_type);
+ xf_parse_name(argv[0], &s->dp_name, &s->dp_type);
/* Figure out controller names. */
if (!controllers.n) {