/*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#ifndef OFPROTO_H
#define OFPROTO_H 1
+#include <sys/types.h>
+#include <netinet/in.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
extern "C" {
#endif
-struct odp_actions;
+struct xflow_actions;
struct ofhooks;
struct ofproto;
struct svec;
-enum {
- DP_GROUP_FLOOD = 0,
- DP_GROUP_ALL = 1
-};
-
struct ofexpired {
flow_t flow;
uint64_t packet_count; /* Packets from subrules. */
char *control_ip;
};
+/* How the switch should act if the controller cannot be contacted. */
+enum ofproto_fail_mode {
+ OFPROTO_FAIL_SECURE, /* Preserve flow table. */
+ OFPROTO_FAIL_STANDALONE /* Act as a standalone switch. */
+};
+
+enum ofproto_band {
+ OFPROTO_IN_BAND, /* In-band connection to controller. */
+ OFPROTO_OUT_OF_BAND /* Out-of-band connection to controller. */
+};
+
+struct ofproto_controller {
+ char *target; /* e.g. "tcp:127.0.0.1" */
+ int max_backoff; /* Maximum reconnection backoff, in seconds. */
+ int probe_interval; /* Max idle time before probing, in seconds. */
+ enum ofproto_band band; /* In-band or out-of-band? */
+
+ /* Discovery options. */
+ char *accept_re; /* Regexp for acceptable controllers. */
+ bool update_resolv_conf; /* Update /etc/resolv.conf? */
+
+ /* OpenFlow packet-in rate-limiting. */
+ int rate_limit; /* Max packet-in rate in packets per second. */
+ int burst_limit; /* Limit on accumulating packet credits. */
+};
+
#define DEFAULT_MFR_DESC "Nicira Networks, Inc."
#define DEFAULT_HW_DESC "Open vSwitch"
#define DEFAULT_SW_DESC VERSION BUILDNR
void ofproto_wait(struct ofproto *);
bool ofproto_is_alive(const struct ofproto *);
+struct wdp *ofproto_get_wdp(struct ofproto *);
+
/* Configuration. */
void ofproto_set_datapath_id(struct ofproto *, uint64_t datapath_id);
-void ofproto_set_probe_interval(struct ofproto *, int probe_interval);
-void ofproto_set_max_backoff(struct ofproto *, int max_backoff);
+void ofproto_set_controllers(struct ofproto *,
+ const struct ofproto_controller *, size_t n);
+void ofproto_set_fail_mode(struct ofproto *, enum ofproto_fail_mode fail_mode);
+void ofproto_reconnect_controllers(struct ofproto *);
+void ofproto_set_extra_in_band_remotes(struct ofproto *,
+ const struct sockaddr_in *, size_t n);
void ofproto_set_desc(struct ofproto *,
const char *mfr_desc, const char *hw_desc,
const char *sw_desc, const char *serial_desc,
const char *dp_desc);
-int ofproto_set_in_band(struct ofproto *, bool in_band);
-int ofproto_set_discovery(struct ofproto *, bool discovery,
- const char *accept_controller_re,
- bool update_resolv_conf);
-int ofproto_set_controller(struct ofproto *, const char *controller);
-int ofproto_set_listeners(struct ofproto *, const struct svec *listeners);
int ofproto_set_snoops(struct ofproto *, const struct svec *snoops);
int ofproto_set_netflow(struct ofproto *,
const struct netflow_options *nf_options);
void ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *);
-void ofproto_set_failure(struct ofproto *, bool fail_open);
-void ofproto_set_rate_limit(struct ofproto *, int rate_limit, int burst_limit);
-int ofproto_set_stp(struct ofproto *, bool enable_stp);
/* Configuration querying. */
uint64_t ofproto_get_datapath_id(const struct ofproto *);
-int ofproto_get_probe_interval(const struct ofproto *);
-int ofproto_get_max_backoff(const struct ofproto *);
-bool ofproto_get_in_band(const struct ofproto *);
-bool ofproto_get_discovery(const struct ofproto *);
-const char *ofproto_get_controller(const struct ofproto *);
+bool ofproto_has_primary_controller(const struct ofproto *);
+enum ofproto_fail_mode ofproto_get_fail_mode(const struct ofproto *);
void ofproto_get_listeners(const struct ofproto *, struct svec *);
void ofproto_get_snoops(const struct ofproto *, struct svec *);
void ofproto_get_all_flows(struct ofproto *p, struct ds *);
int ofproto_send_packet(struct ofproto *, const flow_t *,
const union ofp_action *, size_t n_actions,
const struct ofpbuf *);
-void ofproto_add_flow(struct ofproto *, const flow_t *, uint32_t wildcards,
- unsigned int priority,
+void ofproto_add_flow(struct ofproto *, const flow_t *,
const union ofp_action *, size_t n_actions,
int idle_timeout);
-void ofproto_delete_flow(struct ofproto *, const flow_t *, uint32_t wildcards,
- unsigned int priority);
+void ofproto_delete_flow(struct ofproto *, const flow_t *);
void ofproto_flush_flows(struct ofproto *);
-/* Hooks for ovs-vswitchd. */
+/* Hooks for ovs-vswitchd.
+ *
+ * This needs to be redesigned; it only makes sense for wdp-xflow. */
struct ofhooks {
void (*port_changed_cb)(enum ofp_port_reason, const struct ofp_phy_port *,
void *aux);
bool (*normal_cb)(const flow_t *, const struct ofpbuf *packet,
- struct odp_actions *, tag_type *,
+ struct xflow_actions *, tag_type *,
uint16_t *nf_output_iface, void *aux);
- void (*account_flow_cb)(const flow_t *, const union odp_action *,
- size_t n_actions, unsigned long long int n_bytes,
- void *aux);
+ void (*account_flow_cb)(const flow_t *, tag_type tags,
+ const union xflow_action *, size_t n_actions,
+ unsigned long long int n_bytes, void *aux);
void (*account_checkpoint_cb)(void *aux);
};
void ofproto_revalidate(struct ofproto *, tag_type);
-struct tag_set *ofproto_get_revalidate_set(struct ofproto *);
+void ofproto_revalidate_all(struct ofproto *);
#ifdef __cplusplus
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff