X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fconnmgr.h;h=48b81193f6acb1571cc13dc2eb43d74155b04041;hb=a39c3ff9f586d3416976d3c3bd095fa81d73efa0;hp=24a33fb0e1c6908962e663a4894f496574d54e06;hpb=2b07c8b182b76e4e3a162796d3ae273ef51d4131;p=sliver-openvswitch.git diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h index 24a33fb0e..48b81193f 100644 --- 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. @@ -20,6 +20,7 @@ #include "classifier.h" #include "hmap.h" #include "list.h" +#include "match.h" #include "ofp-errors.h" #include "ofproto.h" #include "openflow/nicira-ext.h" @@ -84,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 *, - 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); @@ -94,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 *); -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 *); @@ -155,6 +159,7 @@ void connmgr_set_in_band_queue(struct connmgr *, int queue_id); 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 *, + uint32_t local_odp_port, const struct nlattr *odp_actions, size_t actions_len); @@ -172,7 +177,7 @@ struct ofmonitor { /* Matching. */ uint16_t out_port; uint8_t table_id; - struct cls_rule match; + struct minimatch match; }; struct ofputil_flow_monitor_request;