X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-util.h;h=dc431d0c4aec452a4b548534b22f5638fec84496;hb=772387d560e565abf212d5863698a6834f501639;hp=0d141a683d536b79ba637f5e1f0e4e15b06e80ef;hpb=fa37b408eac875cbc0d7adbbb3f7a004371172da;p=openvswitch diff --git a/lib/ofp-util.h b/lib/ofp-util.h index 0d141a68..dc431d0c 100644 --- a/lib/ofp-util.h +++ b/lib/ofp-util.h @@ -18,6 +18,7 @@ #define OFP_UTIL_H 1 #include +#include #include #include #include "flow.h" @@ -33,12 +34,12 @@ void *put_openflow(size_t openflow_len, uint8_t type, struct ofpbuf *); void *put_openflow_xid(size_t openflow_len, uint8_t type, uint32_t xid, struct ofpbuf *); void update_openflow_length(struct ofpbuf *); -struct ofpbuf *make_flow_mod(uint16_t command, const flow_t *, +struct ofpbuf *make_flow_mod(uint16_t command, const struct flow *, size_t actions_len); -struct ofpbuf *make_add_flow(const flow_t *, uint32_t buffer_id, +struct ofpbuf *make_add_flow(const struct flow *, uint32_t buffer_id, uint16_t max_idle, size_t actions_len); -struct ofpbuf *make_del_flow(const flow_t *); -struct ofpbuf *make_add_simple_flow(const flow_t *, +struct ofpbuf *make_del_flow(const struct flow *); +struct ofpbuf *make_add_simple_flow(const struct flow *, uint32_t buffer_id, uint16_t out_port, uint16_t max_idle); struct ofpbuf *make_packet_in(uint32_t buffer_id, uint16_t in_port, @@ -77,8 +78,10 @@ const union ofp_action *actions_first(struct actions_iterator *, const union ofp_action *actions_next(struct actions_iterator *); int validate_actions(const union ofp_action *, size_t n_actions, int max_ports); +bool action_outputs_to_port(const union ofp_action *, uint16_t port); void normalize_match(struct ofp_match *); +char *ofp_match_to_literal_string(const struct ofp_match *match); static inline int ofp_mkerr(uint16_t type, uint16_t code)