* limitations under the License.
*/
+#include <vlibapi/api_types.h>
#include <vnet/ip/ip_types_api.h>
#define vl_typedefs /* define message structures */
#include <vnet/vnet_all_api_h.h>
#undef vl_printfun
+int
+ip_address_family_decode (int _af, ip_address_family_t * out)
+{
+ vl_api_address_family_t af = clib_host_to_net_u32 (_af);
+
+ switch (af)
+ {
+ case ADDRESS_IP4:
+ *out = AF_IP4;
+ return (0);
+ case ADDRESS_IP6:
+ *out = AF_IP6;
+ return (0);
+ }
+ return (-1);
+}
+
+int
+ip_address_family_encode (ip_address_family_t af)
+{
+ switch (af)
+ {
+ case AF_IP4:
+ return (clib_host_to_net_u32 (ADDRESS_IP4));
+ case AF_IP6:
+ return (clib_host_to_net_u32 (ADDRESS_IP6));
+ }
+
+ ASSERT (0);
+ return (clib_host_to_net_u32 (ADDRESS_IP4));
+}
+
+int
+ip_proto_decode (int _ipp, ip_protocol_t * out)
+{
+ ip_protocol_t ipp = clib_host_to_net_u32 (_ipp);
+
+ switch (ipp)
+ {
+#define ip_protocol(n,s) \
+ case IP_PROTOCOL_##s: \
+ *out = IP_PROTOCOL_##s; \
+ return (0);
+#include "protocols.def"
+#undef ip_protocol
+ }
+ return (-1);
+}
+
+int
+ip_proto_encode (ip_protocol_t ipp)
+{
+ switch (ipp)
+ {
+#define ip_protocol(n,s) \
+ case IP_PROTOCOL_##s: \
+ return (clib_host_to_net_u32 (IP_PROTOCOL_##s));
+#include "protocols.def"
+#undef ip_protocol
+ }
+
+ ASSERT (0);
+ return (clib_host_to_net_u32 (IP_API_PROTO_TCP));
+}
+
+void
+ip6_address_encode (const ip6_address_t * in, vl_api_ip6_address_t out)
+{
+ clib_memcpy (out, in, sizeof (*in));
+}
+
+void
+ip6_address_decode (const vl_api_ip6_address_t in, ip6_address_t * out)
+{
+ clib_memcpy (out, in, sizeof (*out));
+}
+
+void
+ip4_address_encode (const ip4_address_t * in, vl_api_ip4_address_t out)
+{
+ clib_memcpy (out, in, sizeof (*in));
+}
+
+void
+ip4_address_decode (const vl_api_ip4_address_t in, ip4_address_t * out)
+{
+ clib_memcpy (out, in, sizeof (*out));
+}
+
static ip46_type_t
ip_address_union_decode (const vl_api_address_union_t * in,
vl_api_address_family_t af, ip46_address_t * out)
vl_api_address_union_t * out)
{
if (ADDRESS_IP6 == clib_net_to_host_u32 (af))
- memcpy (out->ip6.address, &in->ip6, sizeof (out->ip6));
+ ip6_address_encode (&in->ip6, out->ip6);
else
- memcpy (out->ip4.address, &in->ip4, sizeof (out->ip4));
+ ip4_address_encode (&in->ip4, out->ip4);
}
void
break;
}
out->fp_len = in->address_length;
+ out->___fp___pad = 0;
ip_address_decode (&in->address, &out->fp_addr);
}
ip_address_union_decode (&in->grp_address, in->af, &out->fp_grp_addr);
ip_address_union_decode (&in->src_address, in->af, &out->fp_src_addr);
-}
-
-u8 *
-format_vl_api_address (u8 * s, va_list * args)
-{
- const vl_api_address_t *addr = va_arg (*args, vl_api_address_t *);
-
- if (ADDRESS_IP6 == clib_net_to_host_u32 (addr->af))
- s = format (s, "ip6:%U", format_ip6_address, addr->un.ip6.address);
- else
- s = format (s, "ip4:%U", format_ip4_address, addr->un.ip4.address);
-
- return s;
-}
-
-u8 *
-format_vl_api_address_union (u8 * s, va_list * args)
-{
- const vl_api_address_union_t *addr =
- va_arg (*args, vl_api_address_union_t *);
- vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t);
-
- if (ADDRESS_IP6 == af)
- s = format (s, "ip6:%U", format_ip6_address, addr->ip6.address);
- else
- s = format (s, "ip4:%U", format_ip4_address, addr->ip4.address);
-
- return s;
-}
-
-u8 *
-format_vl_api_prefix (u8 * s, va_list * args)
-{
- const vl_api_prefix_t *pfx = va_arg (*args, vl_api_prefix_t *);
-
- s = format (s, "%U/%d", format_vl_api_address,
- &pfx->address, pfx->address_length);
- return s;
+ if (!ip46_address_is_zero (&out->fp_src_addr))
+ out->fp_len = (out->fp_proto == FIB_PROTOCOL_IP6 ? 256 : 64);
}
/*