aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet')
-rw-r--r--src/vnet/ethernet/ethernet_format_fns.h27
-rw-r--r--src/vnet/ethernet/ethernet_types.api2
-rw-r--r--src/vnet/format_fns.h23
-rw-r--r--src/vnet/interface_api.c6
-rw-r--r--src/vnet/ip/ip4_forward.c4
-rw-r--r--src/vnet/ip/ip_api.c1
-rw-r--r--src/vnet/ip/ip_format_fns.h86
-rw-r--r--src/vnet/ip/ip_types.api13
-rw-r--r--src/vnet/vnet_all_api_h.h4
9 files changed, 156 insertions, 10 deletions
diff --git a/src/vnet/ethernet/ethernet_format_fns.h b/src/vnet/ethernet/ethernet_format_fns.h
new file mode 100644
index 00000000000..17b5737913e
--- /dev/null
+++ b/src/vnet/ethernet/ethernet_format_fns.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+#ifndef included_ethernet_format_fns_h
+#define included_ethernet_format_fns_h
+
+static inline u8 *
+format_vl_api_mac_address_t (u8 * s, va_list * args)
+{
+ u8 *a = va_arg (*args, u8 *);
+ return format (s, "%02x%02x.%02x%02x.%02x%02x",
+ a[0], a[1], a[2], a[3], a[4], a[5]);
+}
+
+#endif
diff --git a/src/vnet/ethernet/ethernet_types.api b/src/vnet/ethernet/ethernet_types.api
index f945f20910f..1d6683ef398 100644
--- a/src/vnet/ethernet/ethernet_types.api
+++ b/src/vnet/ethernet/ethernet_types.api
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-typedef u8 mac_address[6];
+manual_print typedef u8 mac_address[6];
diff --git a/src/vnet/format_fns.h b/src/vnet/format_fns.h
new file mode 100644
index 00000000000..b88cb53f233
--- /dev/null
+++ b/src/vnet/format_fns.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+#ifndef included_format_fns_h
+#define included_format_fns_h
+
+#include <vnet/ip/format.h>
+#include <vnet/ip/ip_format_fns.h>
+#include <vnet/ethernet/ethernet_format_fns.h>
+
+#endif
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 3448c6037b7..687f599b616 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -166,8 +166,10 @@ vl_api_sw_interface_set_mtu_t_handler (vl_api_sw_interface_set_mtu_t * mp)
VALIDATE_SW_IF_INDEX (mp);
for (i = 0; i < VNET_N_MTU; i++)
- per_protocol_mtu[i] = ntohl (mp->mtu[i]);
-
+ {
+ per_protocol_mtu[i] = ntohl (mp->mtu[i]);
+ clib_warning ("MTU %u", per_protocol_mtu[i]);
+ }
vnet_sw_interface_set_protocol_mtu (vnm, sw_if_index, per_protocol_mtu);
BAD_SW_IF_INDEX_LABEL;
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 3562f501bf7..2250e0385bc 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -736,9 +736,11 @@ ip4_add_del_interface_address_internal (vlib_main_t * vm,
return
clib_error_create
- ("failed to add %U which conflicts with %U for interface %U",
+ ("failed to add %U on %U which conflicts with %U for interface %U",
format_ip4_address_and_length, address,
address_length,
+ format_vnet_sw_if_index_name, vnm,
+ sw_if_index,
format_ip4_address_and_length, x,
ia->address_length,
format_vnet_sw_if_index_name, vnm,
diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
index fd4c1521a22..8dbd3e6ce12 100644
--- a/src/vnet/ip/ip_api.c
+++ b/src/vnet/ip/ip_api.c
@@ -66,6 +66,7 @@
#include <vlibapi/api_helper_macros.h>
+#include <vnet/format_fns.h>
#define foreach_ip_api_msg \
_(IP_TABLE_DUMP, ip_table_dump) \
diff --git a/src/vnet/ip/ip_format_fns.h b/src/vnet/ip/ip_format_fns.h
new file mode 100644
index 00000000000..b24c59454d4
--- /dev/null
+++ b/src/vnet/ip/ip_format_fns.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2019 Cisco and/or its affiliates.
+ * 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.
+ */
+
+#ifndef included_ip_format_fns_h
+#define included_ip_format_fns_h
+
+static inline u8 *format_vl_api_ip6_address_t (u8 * s, va_list * args);
+static inline u8 *format_vl_api_ip4_address_t (u8 * s, va_list * args);
+
+#include <vnet/ip/format.h>
+#define vl_typedefs
+#include <vnet/ip/ip_types.api.h>
+
+static inline u8 *
+format_vl_api_ip6_address_t (u8 * s, va_list * args)
+{
+ vl_api_ip6_address_t *a = va_arg (*args, vl_api_ip6_address_t *);
+ u32 indent __attribute__((unused)) = va_arg (*args, u32);
+
+ return format (s, "%U", format_ip6_address, a);
+}
+
+static inline u8 *
+format_vl_api_ip6_prefix_t (u8 * s, va_list * args)
+{
+ vl_api_ip6_prefix_t *a = va_arg (*args, vl_api_ip6_prefix_t *);
+ u32 indent __attribute__((unused)) = va_arg (*args, u32);
+
+ return format (s, "%U/%u", format_ip6_address, &a->address, a->len);
+}
+
+static inline u8 *
+format_vl_api_ip4_address_t (u8 * s, va_list * args)
+{
+ vl_api_ip4_address_t *a = va_arg (*args, vl_api_ip4_address_t *);
+ u32 indent __attribute__((unused)) = va_arg (*args, u32);
+
+ return format (s, "%U", format_ip4_address, a);
+}
+
+static inline u8 *
+format_vl_api_ip4_prefix_t (u8 * s, va_list * args)
+{
+ vl_api_ip4_prefix_t *a = va_arg (*args, vl_api_ip4_prefix_t *);
+ u32 indent __attribute__((unused)) = va_arg (*args, u32);
+
+ return format (s, "%U/%u", format_ip4_address, &a->address, a->len);
+}
+
+static inline u8 *
+format_vl_api_address_t (u8 * s, va_list * args)
+{
+ vl_api_address_t *a = va_arg (*args, vl_api_address_t *);
+ u32 indent __attribute__((unused)) = va_arg (*args, u32);
+
+ switch (a->af) {
+ case ADDRESS_IP4:
+ return format(s, "%U", format_ip4_address, &a->un.ip4);
+ case ADDRESS_IP6:
+ return format(s, "%U", format_ip6_address, &a->un.ip6);
+ }
+ return format (s, "");
+}
+
+static inline u8 *
+format_vl_api_prefix_t (u8 * s, va_list * args)
+{
+ vl_api_prefix_t *a = va_arg (*args, vl_api_prefix_t *);
+ u32 indent __attribute__((unused)) = va_arg (*args, u32);
+
+ return format (s, "%U/%u", format_vl_api_address_t, &a->address, indent, a->len);
+}
+
+#endif
diff --git a/src/vnet/ip/ip_types.api b/src/vnet/ip/ip_types.api
index af8f6231285..d9ad893412d 100644
--- a/src/vnet/ip/ip_types.api
+++ b/src/vnet/ip/ip_types.api
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-typedef u8 ip4_address[4];
-typedef u8 ip6_address[16];
+option version = "3.0.0";
+manual_print typedef u8 ip4_address[4];
+manual_print typedef u8 ip6_address[16];
enum address_family {
ADDRESS_IP4 = 0,
@@ -80,12 +81,12 @@ union address_union {
vl_api_ip6_address_t ip6;
};
-typedef address {
+manual_print typedef address {
vl_api_address_family_t af;
vl_api_address_union_t un;
};
-typedef prefix {
+manual_print typedef prefix {
vl_api_address_t address;
u8 len;
};
@@ -97,12 +98,12 @@ typedef mprefix {
vl_api_address_union_t src_address;
};
-typedef ip6_prefix {
+manual_print typedef ip6_prefix {
vl_api_ip6_address_t address;
u8 len;
};
-typedef ip4_prefix {
+manual_print typedef ip4_prefix {
vl_api_ip4_address_t address;
u8 len;
};
diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h
index ad6dd6a8d79..83991106c8b 100644
--- a/src/vnet/vnet_all_api_h.h
+++ b/src/vnet/vnet_all_api_h.h
@@ -29,6 +29,10 @@
#include <vlibmemory/vl_memory_api_h.h>
#endif /* included_from_layer_3 */
+#ifdef vl_printfun
+#include <vnet/format_fns.h>
+#endif
+
#include <vnet/bonding/bond.api.h>
#include <vnet/devices/af_packet/af_packet.api.h>
#include <vnet/devices/netmap/netmap.api.h>