X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=362ea264bad6f6b61fc383390d5cf972f03cab11;hb=309eaa2bc4f9367cb1ca6ec91b583a7a6cabf079;hp=3758deca145203a807079efa8d2e6e8e46b9e2f5;hpb=f1588b1fa1be46231ee079358e428dae74ff09cc;p=openvswitch diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 3758deca..362ea264 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -36,7 +36,7 @@ struct ofproto; struct svec; struct ofexpired { - flow_t flow; + struct flow flow; uint64_t packet_count; /* Packets from subrules. */ uint64_t byte_count; /* Bytes from subrules. */ long long int used; /* Last-used time (0 if never used). */ @@ -95,6 +95,7 @@ void ofproto_wait(struct ofproto *); bool ofproto_is_alive(const struct ofproto *); int ofproto_port_del(struct ofproto *, uint16_t odp_port); +bool ofproto_port_is_floodable(struct ofproto *, uint16_t odp_port); /* Configuration. */ void ofproto_set_datapath_id(struct ofproto *, uint64_t datapath_id); @@ -122,23 +123,23 @@ void ofproto_get_snoops(const struct ofproto *, struct svec *); void ofproto_get_all_flows(struct ofproto *p, struct ds *); /* Functions for use by ofproto implementation modules, not by clients. */ -int ofproto_send_packet(struct ofproto *, const flow_t *, +int ofproto_send_packet(struct ofproto *, const struct flow *, 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 struct flow *, + uint32_t wildcards, unsigned int priority, 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 struct flow *, + uint32_t wildcards, unsigned int priority); void ofproto_flush_flows(struct ofproto *); /* Hooks for ovs-vswitchd. */ struct ofhooks { - bool (*normal_cb)(const flow_t *, const struct ofpbuf *packet, + bool (*normal_cb)(const struct flow *, const struct ofpbuf *packet, struct odp_actions *, tag_type *, uint16_t *nf_output_iface, void *aux); - void (*account_flow_cb)(const flow_t *, tag_type tags, + void (*account_flow_cb)(const struct flow *, tag_type tags, const union odp_action *, size_t n_actions, unsigned long long int n_bytes, void *aux); void (*account_checkpoint_cb)(void *aux);