git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Recycle least recently used ofport.
[sliver-openvswitch.git]
/
ofproto
/
connmgr.h
diff --git
a/ofproto/connmgr.h
b/ofproto/connmgr.h
index
9a080f2
..
55d08a6
100644
(file)
--- a/
ofproto/connmgr.h
+++ b/
ofproto/connmgr.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012
, 2013
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.
@@
-71,7
+71,7
@@
void connmgr_destroy(struct connmgr *);
void connmgr_run(struct connmgr *,
bool (*handle_openflow)(struct ofconn *,
void connmgr_run(struct connmgr *,
bool (*handle_openflow)(struct ofconn *,
- struct ofpbuf *ofp_msg));
+
const
struct ofpbuf *ofp_msg));
void connmgr_wait(struct connmgr *, bool handling_openflow);
void connmgr_get_memory_usage(const struct connmgr *, struct simap *usage);
void connmgr_wait(struct connmgr *, bool handling_openflow);
void connmgr_get_memory_usage(const struct connmgr *, struct simap *usage);
@@
-85,7
+85,8
@@
bool connmgr_has_controllers(const struct connmgr *);
void connmgr_get_controller_info(struct connmgr *, struct shash *);
void connmgr_free_controller_info(struct shash *);
void connmgr_set_controllers(struct connmgr *,
void connmgr_get_controller_info(struct connmgr *, struct shash *);
void connmgr_free_controller_info(struct shash *);
void connmgr_set_controllers(struct connmgr *,
- const struct ofproto_controller[], size_t n);
+ const struct ofproto_controller[], size_t n,
+ uint32_t allowed_versions);
void connmgr_reconnect(const struct connmgr *);
int connmgr_set_snoops(struct connmgr *, const struct sset *snoops);
void connmgr_reconnect(const struct connmgr *);
int connmgr_set_snoops(struct connmgr *, const struct sset *snoops);
@@
-95,10
+96,12
@@
void connmgr_get_snoops(const struct connmgr *, struct sset *snoops);
/* Individual connections to OpenFlow controllers. */
enum ofconn_type ofconn_get_type(const struct ofconn *);
/* Individual connections to OpenFlow controllers. */
enum ofconn_type ofconn_get_type(const struct ofconn *);
-enum nx_role ofconn_get_role(const struct ofconn *);
-void ofconn_set_role(struct ofconn *, enum nx_role);
+bool ofconn_get_master_election_id(const struct ofconn *, uint64_t *idp);
+bool ofconn_set_master_election_id(struct ofconn *, uint64_t);
+enum ofp12_controller_role ofconn_get_role(const struct ofconn *);
+void ofconn_set_role(struct ofconn *, enum ofp12_controller_role);
-enum ofputil_protocol ofconn_get_protocol(struct ofconn *);
+enum ofputil_protocol ofconn_get_protocol(
const
struct ofconn *);
void ofconn_set_protocol(struct ofconn *, enum ofputil_protocol);
enum nx_packet_in_format ofconn_get_packet_in_format(struct ofconn *);
void ofconn_set_protocol(struct ofconn *, enum ofputil_protocol);
enum nx_packet_in_format ofconn_get_packet_in_format(struct ofconn *);
@@
-115,6
+118,9
@@
void ofconn_set_miss_send_len(struct ofconn *, int miss_send_len);
void ofconn_set_async_config(struct ofconn *,
const uint32_t master_masks[OAM_N_TYPES],
const uint32_t slave_masks[OAM_N_TYPES]);
void ofconn_set_async_config(struct ofconn *,
const uint32_t master_masks[OAM_N_TYPES],
const uint32_t slave_masks[OAM_N_TYPES]);
+void ofconn_get_async_config(struct ofconn *,
+ uint32_t *master_masks,
+ uint32_t *slave_masks);
void ofconn_send_reply(const struct ofconn *, struct ofpbuf *);
void ofconn_send_replies(const struct ofconn *, struct list *);
void ofconn_send_reply(const struct ofconn *, struct ofpbuf *);
void ofconn_send_replies(const struct ofconn *, struct list *);
@@
-122,7
+128,7
@@
void ofconn_send_error(const struct ofconn *, const struct ofp_header *request,
enum ofperr);
enum ofperr ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id,
enum ofperr);
enum ofperr ofconn_pktbuf_retrieve(struct ofconn *, uint32_t id,
- struct ofpbuf **bufferp,
uint16
_t *in_port);
+ struct ofpbuf **bufferp,
ofp_port
_t *in_port);
bool ofconn_has_pending_opgroups(const struct ofconn *);
void ofconn_add_opgroup(struct ofconn *, struct list *);
bool ofconn_has_pending_opgroups(const struct ofconn *);
void ofconn_add_opgroup(struct ofconn *, struct list *);
@@
-153,11
+159,7
@@
void connmgr_set_extra_in_band_remotes(struct connmgr *,
void connmgr_set_in_band_queue(struct connmgr *, int queue_id);
/* In-band implementation. */
void connmgr_set_in_band_queue(struct connmgr *, int queue_id);
/* In-band implementation. */
-bool connmgr_msg_in_hook(struct connmgr *, const struct flow *,
- const struct ofpbuf *packet);
-bool connmgr_may_set_up_flow(struct connmgr *, const struct flow *,
- const struct nlattr *odp_actions,
- size_t actions_len);
+bool connmgr_has_in_band(struct connmgr *);
/* Fail-open and in-band implementation. */
void connmgr_flushed(struct connmgr *);
/* Fail-open and in-band implementation. */
void connmgr_flushed(struct connmgr *);
@@
-171,7
+173,7
@@
struct ofmonitor {
enum nx_flow_monitor_flags flags;
/* Matching. */
enum nx_flow_monitor_flags flags;
/* Matching. */
-
uint16
_t out_port;
+
ofp_port
_t out_port;
uint8_t table_id;
struct minimatch match;
};
uint8_t table_id;
struct minimatch match;
};
@@
-185,11
+187,15
@@
void ofmonitor_destroy(struct ofmonitor *);
void ofmonitor_report(struct connmgr *, struct rule *,
enum nx_flow_update_event, enum ofp_flow_removed_reason,
void ofmonitor_report(struct connmgr *, struct rule *,
enum nx_flow_update_event, enum ofp_flow_removed_reason,
- const struct ofconn *abbrev_ofconn, ovs_be32 abbrev_xid);
+ const struct ofconn *abbrev_ofconn, ovs_be32 abbrev_xid)
+ OVS_REQUIRES(ofproto_mutex);
void ofmonitor_flush(struct connmgr *);
void ofmonitor_flush(struct connmgr *);
+
+struct rule_collection;
void ofmonitor_collect_resume_rules(struct ofmonitor *, uint64_t seqno,
void ofmonitor_collect_resume_rules(struct ofmonitor *, uint64_t seqno,
- struct list *rules);
-void ofmonitor_compose_refresh_updates(struct list *rules, struct list *msgs);
+ struct rule_collection *);
+void ofmonitor_compose_refresh_updates(struct rule_collection *rules,
+ struct list *msgs);
#endif /* connmgr.h */
#endif /* connmgr.h */