diff options
author | Ben Warren <ben@skyportsystems.com> | 2016-03-25 14:10:23 -0700 |
---|---|---|
committer | Ben Pfaff <blp@ovn.org> | 2016-03-30 13:05:32 -0700 |
commit | 7888d2a6cdc77a45b4247db322df64fe9211a1bb (patch) | |
tree | a65dcf8cee33fc1133d07f86bc4687f4abaffba7 /lib | |
parent | 417e7e66e1217ab984ebb058fb3b469e77e216fc (diff) | |
download | openvswitch-7888d2a6cdc77a45b4247db322df64fe9211a1bb.tar.gz |
Move ofp-parse.h to include/openvswitch directory
Signed-off-by: Ben Warren <ben@skyportsystems.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/automake.mk | 1 | ||||
-rw-r--r-- | lib/dpctl.c | 2 | ||||
-rw-r--r-- | lib/learning-switch.c | 2 | ||||
-rw-r--r-- | lib/ofp-actions.c | 2 | ||||
-rw-r--r-- | lib/ofp-parse.c | 3 | ||||
-rw-r--r-- | lib/ofp-parse.h | 106 |
6 files changed, 4 insertions, 112 deletions
diff --git a/lib/automake.mk b/lib/automake.mk index 3eae15b65..a1d36978f 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -145,7 +145,6 @@ lib_libopenvswitch_la_SOURCES = \ lib/ofp-msgs.c \ lib/ofp-msgs.h \ lib/ofp-parse.c \ - lib/ofp-parse.h \ lib/ofp-print.c \ lib/ofp-print.h \ lib/ofp-prop.c \ diff --git a/lib/dpctl.c b/lib/dpctl.c index 854190f73..6f4507819 100644 --- a/lib/dpctl.c +++ b/lib/dpctl.c @@ -39,7 +39,6 @@ #include "netdev-dpdk.h" #include "netlink.h" #include "odp-util.h" -#include "ofp-parse.h" #include "ofpbuf.h" #include "ovs-numa.h" #include "packets.h" @@ -50,6 +49,7 @@ #include "timeval.h" #include "unixctl.h" #include "util.h" +#include "openvswitch/ofp-parse.h" typedef int dpctl_command_handler(int argc, const char *argv[], struct dpctl_params *); diff --git a/lib/learning-switch.c b/lib/learning-switch.c index d9e284d2f..3b23a878c 100644 --- a/lib/learning-switch.c +++ b/lib/learning-switch.c @@ -32,7 +32,6 @@ #include "ofpbuf.h" #include "ofp-actions.h" #include "ofp-msgs.h" -#include "ofp-parse.h" #include "ofp-print.h" #include "ofp-util.h" #include "openflow/openflow.h" @@ -42,6 +41,7 @@ #include "simap.h" #include "timeval.h" #include "openvswitch/ofp-errors.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vconn.h" #include "openvswitch/vlog.h" diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c index 98227f720..20ad381b7 100644 --- a/lib/ofp-actions.c +++ b/lib/ofp-actions.c @@ -30,12 +30,12 @@ #include "multipath.h" #include "nx-match.h" #include "odp-netlink.h" -#include "ofp-parse.h" #include "ofp-prop.h" #include "ofp-util.h" #include "ofpbuf.h" #include "unaligned.h" #include "util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(ofp_actions); diff --git a/lib/ofp-parse.c b/lib/ofp-parse.c index 9b6db3a32..e938ba13d 100644 --- a/lib/ofp-parse.c +++ b/lib/ofp-parse.c @@ -16,8 +16,6 @@ #include <config.h> -#include "ofp-parse.h" - #include <ctype.h> #include <errno.h> #include <stdlib.h> @@ -38,6 +36,7 @@ #include "packets.h" #include "simap.h" #include "socket-util.h" +#include "openvswitch/ofp-parse.h" #include "openvswitch/vconn.h" /* Parses 'str' as an 8-bit unsigned integer into '*valuep'. diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h deleted file mode 100644 index e1ebee7c4..000000000 --- a/lib/ofp-parse.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* OpenFlow protocol string to flow parser. */ - -#ifndef OFP_PARSE_H -#define OFP_PARSE_H 1 - -#include <stdbool.h> -#include <stdint.h> -#include <stdio.h> -#include "compiler.h" -#include "openvswitch/types.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 ofputil_tlv_table_mod; -struct simap; -enum ofputil_protocol; - -char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_, - enum ofputil_protocol *usable_protocols) - OVS_WARN_UNUSED_RESULT; - -char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string, - int command, - enum ofputil_protocol *usable_protocols) - OVS_WARN_UNUSED_RESULT; - -char *parse_ofp_table_mod(struct ofputil_table_mod *, - const char *table_id, const char *flow_miss_handling, - uint32_t *usable_versions) - OVS_WARN_UNUSED_RESULT; - -char *parse_ofp_flow_mod_file(const char *file_name, int command, - struct ofputil_flow_mod **fms, size_t *n_fms, - enum ofputil_protocol *usable_protocols) - OVS_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) - OVS_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) - OVS_WARN_UNUSED_RESULT; - -char *parse_flow_monitor_request(struct ofputil_flow_monitor_request *, - const char *, - enum ofputil_protocol *usable_protocols) - OVS_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) - OVS_WARN_UNUSED_RESULT; - -char *parse_ofp_group_mod_str(struct ofputil_group_mod *, uint16_t command, - const char *string, - enum ofputil_protocol *usable_protocols) - OVS_WARN_UNUSED_RESULT; - -char *parse_ofp_tlv_table_mod_str(struct ofputil_tlv_table_mod *, - uint16_t command, const char *string, - enum ofputil_protocol *usable_protocols) - OVS_WARN_UNUSED_RESULT; - -char *str_to_u8(const char *str, const char *name, uint8_t *valuep) - OVS_WARN_UNUSED_RESULT; -char *str_to_u16(const char *str, const char *name, uint16_t *valuep) - OVS_WARN_UNUSED_RESULT; -char *str_to_u32(const char *str, uint32_t *valuep) OVS_WARN_UNUSED_RESULT; -char *str_to_u64(const char *str, uint64_t *valuep) OVS_WARN_UNUSED_RESULT; -char *str_to_be64(const char *str, ovs_be64 *valuep) OVS_WARN_UNUSED_RESULT; -char *str_to_mac(const char *str, struct eth_addr *mac) OVS_WARN_UNUSED_RESULT; -char *str_to_ip(const char *str, ovs_be32 *ip) OVS_WARN_UNUSED_RESULT; -char *str_to_connhelper(const char *str, uint16_t *alg) OVS_WARN_UNUSED_RESULT; -char *parse_ofp_table_vacancy(struct ofputil_table_mod *, - const char *flow_miss_handling) - OVS_WARN_UNUSED_RESULT; - -#endif /* ofp-parse.h */ |