X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-parse.h;h=515ccd7027a2523f0e05b057b98bbf7fe946946f;hb=003ce655b7116d18c86a74c50391e54990346931;hp=a68796e5f489010ecc16201463a456f3de31b0b9;hpb=8050b31d635005a11e5f4ef5517af8672af7cf55;p=sliver-openvswitch.git diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h index a68796e5f..515ccd702 100644 --- a/lib/ofp-parse.h +++ b/lib/ofp-parse.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Nicira Networks. + * Copyright (c) 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. @@ -19,22 +19,71 @@ #ifndef OFP_PARSE_H #define OFP_PARSE_H 1 +#include #include #include +#include "compiler.h" -#include "classifier.h" +struct flow; +struct ofpbuf; +struct ofputil_flow_mod; +struct ofputil_flow_monitor_request; +struct ofputil_flow_stats_request; +struct ofputil_group_mod; +struct ofputil_meter_mod; +struct ofputil_table_mod; +struct simap; +enum ofputil_protocol; -struct parsed_flow { - struct cls_rule rule; - uint8_t table_idx; - uint16_t out_port; - uint16_t idle_timeout; - uint16_t hard_timeout; - uint64_t cookie; -}; +char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; -void parse_ofp_str(struct parsed_flow *, struct ofpbuf *actions, char *string); -struct ofpbuf *parse_ofp_flow_mod_str(char *string, uint16_t command); -struct ofpbuf *parse_ofp_add_flow_file(FILE *); +char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string, + uint16_t command, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofp_table_mod(struct ofputil_table_mod *, + const char *table_id, const char *flow_miss_handling, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofp_flow_mod_file(const char *file_name, uint16_t command, + struct ofputil_flow_mod **fms, size_t *n_fms, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofp_flow_stats_request_str(struct ofputil_flow_stats_request *, + bool aggregate, const char *string, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofpacts(const char *, struct ofpbuf *ofpacts, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s, + const struct simap *portno_names); + +char *parse_ofp_meter_mod_str(struct ofputil_meter_mod *, const char *string, + int command, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *, + const char *, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofp_group_mod_file(const char *file_name, uint16_t command, + struct ofputil_group_mod **gms, size_t *n_gms, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; + +char *parse_ofp_group_mod_str(struct ofputil_group_mod *, uint16_t command, + const char *string, + enum ofputil_protocol *usable_protocols) + WARN_UNUSED_RESULT; #endif /* ofp-parse.h */