X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fip%2Fformat.h;h=6e9075cc877ff645cfd449f9d291b1fbf4d2f45a;hb=bdfe5955f;hp=d527e31a05e575dba16d81dac6c9e0feb777502c;hpb=191a59401c0552e5ea79041f34456eb9fcc1f311;p=vpp.git

diff --git a/src/vnet/ip/format.h b/src/vnet/ip/format.h
index d527e31a05e..6e9075cc877 100644
--- a/src/vnet/ip/format.h
+++ b/src/vnet/ip/format.h
@@ -58,14 +58,6 @@ typedef enum format_ip_adjacency_flags_t_
 format_function_t format_ip_adjacency;
 format_function_t format_ip_adjacency_packet_data;
 
-format_function_t format_ip46_address;
-
-typedef enum
-{
-  IP46_TYPE_ANY,
-  IP46_TYPE_IP4,
-  IP46_TYPE_IP6
-} ip46_type_t;
 /* unformat_ip46_address expects arguments (ip46_address_t *, ip46_type_t)
  * The type argument is used to enforce a particular IP version. */
 unformat_function_t unformat_ip46_address;
@@ -74,10 +66,13 @@ unformat_function_t unformat_ip46_address;
 
 /* Parse an IP4 address %d.%d.%d.%d. */
 unformat_function_t unformat_ip4_address;
+/* Parse an IP4 address and mask %d.%d.%d.%d/%d.%d.%d.%d */
+unformat_function_t unformat_ip4_address_and_mask;
 
 /* Format an IP4 address. */
 format_function_t format_ip4_address;
 format_function_t format_ip4_address_and_length;
+format_function_t format_ip4_address_and_mask;
 
 /* Parse an IP4 header. */
 unformat_function_t unformat_ip4_header;
@@ -92,17 +87,19 @@ unformat_function_t unformat_pg_ip4_header;
 
 /* IP6 */
 unformat_function_t unformat_ip6_address;
+unformat_function_t unformat_ip6_address_and_mask;
 format_function_t format_ip6_address;
 format_function_t format_ip6_address_and_length;
+format_function_t format_ip6_address_and_mask;
 unformat_function_t unformat_ip6_header;
 format_function_t format_ip6_header;
+format_function_t format_ip6_frag_hdr;
 unformat_function_t unformat_pg_ip6_header;
 
 /* Format a TCP/UDP headers. */
-format_function_t format_tcp_header, format_udp_header, format_sctp_header;
+format_function_t format_tcp_header, format_udp_header;
 
-unformat_function_t unformat_pg_tcp_header, unformat_pg_udp_header,
-  unformat_pg_sctp_header;
+unformat_function_t unformat_pg_tcp_header, unformat_pg_udp_header;
 
 #endif /* included_ip_format_h */