/*
- * 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.
int dp_register_provider(const struct dpif_class *);
int dp_unregister_provider(const char *type);
+void dp_blacklist_provider(const char *type);
void dp_enumerate_types(struct sset *types);
const char *dpif_normalize_type(const char *);
const char *dpif_name(const struct dpif *);
const char *dpif_base_name(const struct dpif *);
+const char *dpif_type(const struct dpif *);
int dpif_delete(struct dpif *);
-/* Statisticss for a dpif as a whole. */
+/* Statistics for a dpif as a whole. */
struct dpif_dp_stats {
uint64_t n_hit; /* Number of flow table matches. */
uint64_t n_missed; /* Number of flow table misses. */
\f
/* Port operations. */
-int dpif_port_add(struct dpif *, struct netdev *, uint16_t *port_nop);
-int dpif_port_del(struct dpif *, uint16_t port_no);
+const char *dpif_port_open_type(const char *datapath_type,
+ const char *port_type);
+int dpif_port_add(struct dpif *, struct netdev *, uint32_t *port_nop);
+int dpif_port_del(struct dpif *, uint32_t port_no);
/* A port within a datapath.
*
};
void dpif_port_clone(struct dpif_port *, const struct dpif_port *);
void dpif_port_destroy(struct dpif_port *);
-int dpif_port_query_by_number(const struct dpif *, uint16_t port_no,
+bool dpif_port_exists(const struct dpif *dpif, const char *devname);
+int dpif_port_query_by_number(const struct dpif *, uint32_t port_no,
struct dpif_port *);
int dpif_port_query_by_name(const struct dpif *, const char *devname,
struct dpif_port *);
-int dpif_port_get_name(struct dpif *, uint16_t port_no,
+int dpif_port_get_name(struct dpif *, uint32_t port_no,
char *name, size_t name_size);
int dpif_get_max_ports(const struct dpif *);
-uint32_t dpif_port_get_pid(const struct dpif *, uint16_t port_no);
+uint32_t dpif_port_get_pid(const struct dpif *, uint32_t port_no);
struct dpif_port_dump {
const struct dpif *dpif;
uint8_t tcp_flags;
};
-void dpif_flow_stats_extract(const struct flow *, struct ofpbuf *packet,
- struct dpif_flow_stats *);
+void dpif_flow_stats_extract(const struct flow *, const struct ofpbuf *packet,
+ long long int used, struct dpif_flow_stats *);
void dpif_flow_stats_format(const struct dpif_flow_stats *, struct ds *);
enum dpif_flow_put_flags {
enum dpif_op_type {
DPIF_OP_FLOW_PUT = 1,
- DPIF_OP_EXECUTE
+ DPIF_OP_FLOW_DEL,
+ DPIF_OP_EXECUTE,
};
struct dpif_flow_put {
- enum dpif_op_type type; /* Always DPIF_OP_FLOW_PUT. */
-
/* Input. */
enum dpif_flow_put_flags flags; /* DPIF_FP_*. */
const struct nlattr *key; /* Flow to put. */
/* Output. */
struct dpif_flow_stats *stats; /* Optional flow statistics. */
- int error; /* 0 or positive errno value. */
};
-struct dpif_execute {
- enum dpif_op_type type; /* Always DPIF_OP_EXECUTE. */
-
+struct dpif_flow_del {
/* Input. */
+ const struct nlattr *key; /* Flow to delete. */
+ size_t key_len; /* Length of 'key' in bytes. */
+
+ /* Output. */
+ struct dpif_flow_stats *stats; /* Optional flow statistics. */
+};
+
+struct dpif_execute {
const struct nlattr *key; /* Partial flow key (only for metadata). */
size_t key_len; /* Length of 'key' in bytes. */
const struct nlattr *actions; /* Actions to execute on packet. */
size_t actions_len; /* Length of 'actions' in bytes. */
const struct ofpbuf *packet; /* Packet to execute. */
-
- /* Output. */
- int error; /* 0 or positive errno value. */
};
-union dpif_op {
+struct dpif_op {
enum dpif_op_type type;
- struct dpif_flow_put flow_put;
- struct dpif_execute execute;
+ int error;
+ union {
+ struct dpif_flow_put flow_put;
+ struct dpif_flow_del flow_del;
+ struct dpif_execute execute;
+ } u;
};
-void dpif_operate(struct dpif *, union dpif_op **ops, size_t n_ops);
+void dpif_operate(struct dpif *, struct dpif_op **ops, size_t n_ops);
\f
/* Upcalls. */
uint64_t userdata; /* Argument to OVS_ACTION_ATTR_USERSPACE. */
};
-int dpif_recv_get_mask(const struct dpif *, int *listen_mask);
-int dpif_recv_set_mask(struct dpif *, int listen_mask);
-int dpif_recv(struct dpif *, struct dpif_upcall *);
+int dpif_recv_set(struct dpif *, bool enable);
+int dpif_recv(struct dpif *, struct dpif_upcall *, struct ofpbuf *);
void dpif_recv_purge(struct dpif *);
void dpif_recv_wait(struct dpif *);
\f