Use magic ETH_ADDR_LEN instead of 6 for Ethernet address length.

[cascardo/ovs.git] / lib / ofp-parse.h

diff --git a/lib/ofp-parse.h b/lib/ofp-parse.h
index 58a3e87..789febf 100644 (file)
--- a/lib/ofp-parse.h
+++ b/lib/ofp-parse.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
 #include <stdint.h>
 #include <stdio.h>
 #include "compiler.h"
+#include "openvswitch/types.h"
+#include "packets.h"
 
 struct flow;
 struct ofpbuf;
@@ -36,14 +38,12 @@ struct simap;
 enum ofputil_protocol;
 
 char *parse_ofp_str(struct ofputil_flow_mod *, int command, const char *str_,
-                    enum ofputil_protocol *usable_protocols,
-                    bool enforce_consistency)
+                    enum ofputil_protocol *usable_protocols)
     WARN_UNUSED_RESULT;
 
 char *parse_ofp_flow_mod_str(struct ofputil_flow_mod *, const char *string,
                              uint16_t command,
-                             enum ofputil_protocol *usable_protocols,
-                             bool enforce_consistency)
+                             enum ofputil_protocol *usable_protocols)
     WARN_UNUSED_RESULT;
 
 char *parse_ofp_table_mod(struct ofputil_table_mod *,
@@ -53,18 +53,12 @@ char *parse_ofp_table_mod(struct ofputil_table_mod *,
 
 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,
-                              bool enforce_consistency)
+                              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,
-                                       bool enforce_consistency)
-    WARN_UNUSED_RESULT;
-
-char *parse_ofpacts(const char *, struct ofpbuf *ofpacts,
-                    enum ofputil_protocol *usable_protocols)
+                                       enum ofputil_protocol *usable_protocols)
     WARN_UNUSED_RESULT;
 
 char *parse_ofp_exact_flow(struct flow *flow, struct flow *mask, const char *s,
@@ -90,4 +84,14 @@ char *parse_ofp_group_mod_str(struct ofputil_group_mod *, uint16_t command,
                               enum ofputil_protocol *usable_protocols)
     WARN_UNUSED_RESULT;
 
+char *str_to_u8(const char *str, const char *name, uint8_t *valuep)
+    WARN_UNUSED_RESULT;
+char *str_to_u16(const char *str, const char *name, uint16_t *valuep)
+    WARN_UNUSED_RESULT;
+char *str_to_u32(const char *str, uint32_t *valuep) WARN_UNUSED_RESULT;
+char *str_to_u64(const char *str, uint64_t *valuep) WARN_UNUSED_RESULT;
+char *str_to_be64(const char *str, ovs_be64 *valuep) WARN_UNUSED_RESULT;
+char *str_to_mac(const char *str, uint8_t mac[ETH_ADDR_LEN]) WARN_UNUSED_RESULT;
+char *str_to_ip(const char *str, ovs_be32 *ip) WARN_UNUSED_RESULT;
+
 #endif /* ofp-parse.h */