Type: fix
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I73d27520726543d6375caad76a841339f68c3533
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
fib_protocol_t fproto;
int rv = 0;
fib_protocol_t fproto;
int rv = 0;
- fproto = fib_proto_from_api_address_family (mp->af);
+ rv = fib_proto_from_api_address_family (mp->af, &fproto);
+ if (rv < 0)
+ goto error;
rv = svs_table_delete (fproto, ntohl (mp->table_id));
}
rv = svs_table_delete (fproto, ntohl (mp->table_id));
}
REPLY_MACRO (VL_API_SVS_TABLE_ADD_DEL_REPLY + svs_base_msg_id);
}
REPLY_MACRO (VL_API_SVS_TABLE_ADD_DEL_REPLY + svs_base_msg_id);
}
VALIDATE_SW_IF_INDEX (mp);
VALIDATE_SW_IF_INDEX (mp);
- fproto = fib_proto_from_api_address_family (mp->af);
+ rv = fib_proto_from_api_address_family (mp->af, &fproto);
+ if (rv < 0)
+ goto error;
REPLY_MACRO (VL_API_SVS_ENABLE_DISABLE_REPLY + svs_base_msg_id);
}
REPLY_MACRO (VL_API_SVS_ENABLE_DISABLE_REPLY + svs_base_msg_id);
}
static u8 *
format_vl_api_ip_address_union (u8 * s, va_list * args)
{
static u8 *
format_vl_api_ip_address_union (u8 * s, va_list * args)
{
- vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t);
+ vl_api_address_family_t af = va_arg (*args, int);
const vl_api_address_union_t *u = va_arg (*args, vl_api_address_union_t *);
switch (af)
const vl_api_address_union_t *u = va_arg (*args, vl_api_address_union_t *);
switch (af)
break;
case FIB_API_PATH_TYPE_CLASSIFY:
out->frp_flags |= FIB_ROUTE_PATH_CLASSIFY;
break;
case FIB_API_PATH_TYPE_CLASSIFY:
out->frp_flags |= FIB_ROUTE_PATH_CLASSIFY;
if (pool_is_free_index (cm->tables, ntohl (in->nh.classify_table_index)))
{
return VNET_API_ERROR_NO_SUCH_TABLE;
if (pool_is_free_index (cm->tables, ntohl (in->nh.classify_table_index)))
{
return VNET_API_ERROR_NO_SUCH_TABLE;
-fib_protocol_t
-fib_proto_from_api_address_family (int af)
+int
+fib_proto_from_api_address_family (vl_api_address_family_t af, fib_protocol_t * out)
- switch (clib_net_to_host_u32 (af))
- return (FIB_PROTOCOL_IP4);
+ *out = (FIB_PROTOCOL_IP4);
+ return (0);
- return (FIB_PROTOCOL_IP6);
+ *out = (FIB_PROTOCOL_IP6);
+ return (0);
- ASSERT(0);
- return (FIB_PROTOCOL_IP4);
+ return (VNET_API_ERROR_INVALID_ADDRESS_FAMILY);
fib_proto_to_api_address_family (fib_protocol_t fproto)
{
switch (fproto)
{
case FIB_PROTOCOL_IP4:
fib_proto_to_api_address_family (fib_protocol_t fproto)
{
switch (fproto)
{
case FIB_PROTOCOL_IP4:
- return (clib_net_to_host_u32 (ADDRESS_IP4));
- return (clib_net_to_host_u32 (ADDRESS_IP6));
default:
break;
}
ASSERT(0);
default:
break;
}
ASSERT(0);
- return (clib_net_to_host_u32 (ADDRESS_IP4));
#include <vnet/fib/fib_types.h>
#include <vnet/fib/fib_entry.h>
#include <vnet/fib/fib_types.h>
#include <vnet/fib/fib_entry.h>
+#include <vnet/ip/ip.api_types.h>
/**
* Forward declare the API type, no need to include the generated api headers
/**
* Forward declare the API type, no need to include the generated api headers
extern u8* format_vl_api_fib_path(u8 * s, va_list * args);
extern u8* format_vl_api_fib_path(u8 * s, va_list * args);
-extern fib_protocol_t fib_proto_from_api_address_family (int af);
-extern int fib_proto_to_api_address_family (fib_protocol_t fproto);
+extern int fib_proto_from_api_address_family (vl_api_address_family_t af, fib_protocol_t *out);
+extern vl_api_address_family_t fib_proto_to_api_address_family (fib_protocol_t fproto);
#endif /* __FIB_API_H__ */
#endif /* __FIB_API_H__ */
manual_print typedef u8 ip4_address[4];
manual_print typedef u8 ip6_address[16];
manual_print typedef u8 ip4_address[4];
manual_print typedef u8 ip6_address[16];
+enum address_family : u8 {
ADDRESS_IP4 = 0,
ADDRESS_IP6,
};
ADDRESS_IP4 = 0,
ADDRESS_IP6,
};
IP_API_PROTO_HOPOPT = 0,
IP_API_PROTO_ICMP = 1,
IP_API_PROTO_IGMP = 2,
IP_API_PROTO_HOPOPT = 0,
IP_API_PROTO_ICMP = 1,
IP_API_PROTO_IGMP = 2,
-ip_address_family_decode (int _af, ip_address_family_t * out)
+ip_address_family_decode (vl_api_address_family_t af,
+ ip_address_family_t * out)
- vl_api_address_family_t af = clib_host_to_net_u32 (_af);
-
switch (af)
{
case ADDRESS_IP4:
switch (af)
{
case ADDRESS_IP4:
*out = AF_IP6;
return (0);
}
*out = AF_IP6;
return (0);
}
+ return (VNET_API_ERROR_INVALID_ADDRESS_FAMILY);
ip_address_family_encode (ip_address_family_t af)
{
switch (af)
{
case AF_IP4:
ip_address_family_encode (ip_address_family_t af)
{
switch (af)
{
case AF_IP4:
- return (clib_host_to_net_u32 (ADDRESS_IP4));
- return (clib_host_to_net_u32 (ADDRESS_IP6));
- return (clib_host_to_net_u32 (ADDRESS_IP4));
-ip_proto_decode (int _ipp, ip_protocol_t * out)
+ip_proto_decode (vl_api_ip_proto_t ipp, ip_protocol_t * out)
- ip_protocol_t ipp = clib_host_to_net_u32 (_ipp);
-
- switch (ipp)
+ /* Not all protocol are defined in vl_api_ip_proto_t
+ * so we must cast to a different type.
+ */
+ switch ((u8) ipp)
{
#define ip_protocol(n,s) \
case IP_PROTOCOL_##s: \
{
#define ip_protocol(n,s) \
case IP_PROTOCOL_##s: \
#include "protocols.def"
#undef ip_protocol
}
#include "protocols.def"
#undef ip_protocol
}
+ return (VNET_API_ERROR_INVALID_PROTOCOL);
ip_proto_encode (ip_protocol_t ipp)
{
switch (ipp)
{
#define ip_protocol(n,s) \
case IP_PROTOCOL_##s: \
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));
+ return ((vl_api_ip_proto_t) IP_PROTOCOL_##s);
#include "protocols.def"
#undef ip_protocol
}
ASSERT (0);
#include "protocols.def"
#undef ip_protocol
}
ASSERT (0);
- return (clib_host_to_net_u32 (IP_API_PROTO_TCP));
+ return (IP_API_PROTO_TCP);
+ip_dscp_decode (vl_api_ip_dscp_t in)
{
return ((ip_dscp_t) in);
}
{
return ((ip_dscp_t) in);
}
ip_dscp_encode (ip_dscp_t dscp)
{
ip_dscp_encode (ip_dscp_t dscp)
{
+ return ((vl_api_ip_dscp_t) dscp);
- switch (clib_net_to_host_u32 (af))
{
case ADDRESS_IP4:
clib_memset (out, 0, sizeof (*out));
{
case ADDRESS_IP4:
clib_memset (out, 0, sizeof (*out));
type = IP46_TYPE_IP6;
break;
default:
type = IP46_TYPE_IP6;
break;
default:
- ASSERT (!"Unknown address family in API address type");
type = IP46_TYPE_ANY;
break;
}
type = IP46_TYPE_ANY;
break;
}
out->version = AF_IP6;
break;
default:
out->version = AF_IP6;
break;
default:
vl_api_address_family_t af,
vl_api_address_union_t * out)
{
vl_api_address_family_t af,
vl_api_address_union_t * out)
{
- if (ADDRESS_IP6 == clib_net_to_host_u32 (af))
ip6_address_encode (&in->ip6, out->ip6);
else
ip4_address_encode (&in->ip4, out->ip4);
ip6_address_encode (&in->ip6, out->ip6);
else
ip4_address_encode (&in->ip4, out->ip4);
switch (type)
{
case IP46_TYPE_IP4:
switch (type)
{
case IP46_TYPE_IP4:
- out->af = clib_net_to_host_u32 (ADDRESS_IP4);
break;
case IP46_TYPE_IP6:
break;
case IP46_TYPE_IP6:
- out->af = clib_net_to_host_u32 (ADDRESS_IP6);
break;
case IP46_TYPE_ANY:
if (ip46_address_is_ip4 (in))
break;
case IP46_TYPE_ANY:
if (ip46_address_is_ip4 (in))
- out->af = clib_net_to_host_u32 (ADDRESS_IP4);
- out->af = clib_net_to_host_u32 (ADDRESS_IP6);
break;
}
ip_address_union_encode (in, out->af, &out->un);
break;
}
ip_address_union_encode (in, out->af, &out->un);
switch (in->version)
{
case AF_IP4:
switch (in->version)
{
case AF_IP4:
- out->af = clib_net_to_host_u32 (ADDRESS_IP4);
+ out->af = ADDRESS_IP4;
+ ip4_address_encode (&in->ip.ip4, out->un.ip4);
- out->af = clib_net_to_host_u32 (ADDRESS_IP6);
+ out->af = ADDRESS_IP6;
+ ip6_address_encode (&in->ip.ip6, out->un.ip6);
break;
}
ip_address_union_encode (&in->ip, out->af, &out->un);
break;
}
ip_address_union_encode (&in->ip, out->af, &out->un);
void
ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out)
{
void
ip_prefix_decode (const vl_api_prefix_t * in, fib_prefix_t * out)
{
- switch (clib_net_to_host_u32 (in->address.af))
+ switch (in->address.af)
{
case ADDRESS_IP4:
out->fp_proto = FIB_PROTOCOL_IP4;
{
case ADDRESS_IP4:
out->fp_proto = FIB_PROTOCOL_IP4;
ip_mprefix_encode (const mfib_prefix_t * in, vl_api_mprefix_t * out)
{
out->af = (FIB_PROTOCOL_IP6 == in->fp_proto ? ADDRESS_IP6 : ADDRESS_IP4);
ip_mprefix_encode (const mfib_prefix_t * in, vl_api_mprefix_t * out)
{
out->af = (FIB_PROTOCOL_IP6 == in->fp_proto ? ADDRESS_IP6 : ADDRESS_IP4);
- out->af = clib_host_to_net_u32 (out->af);
out->grp_address_length = clib_host_to_net_u16 (in->fp_len);
ip_address_union_encode (&in->fp_grp_addr, out->af, &out->grp_address);
out->grp_address_length = clib_host_to_net_u16 (in->fp_len);
ip_address_union_encode (&in->fp_grp_addr, out->af, &out->grp_address);
void
ip_mprefix_decode (const vl_api_mprefix_t * in, mfib_prefix_t * out)
{
void
ip_mprefix_decode (const vl_api_mprefix_t * in, mfib_prefix_t * out)
{
- out->fp_proto = (ADDRESS_IP6 == clib_net_to_host_u32 (in->af) ?
+ out->fp_proto = (ADDRESS_IP6 == in->af ?
FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
out->fp_len = clib_net_to_host_u16 (in->grp_address_length);
out->___fp___pad = 0;
FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4);
out->fp_len = clib_net_to_host_u16 (in->grp_address_length);
out->___fp___pad = 0;
* These enum decode/encodes use 'int' as the type for the enum because
* one cannot forward declare an enum
*/
* These enum decode/encodes use 'int' as the type for the enum because
* one cannot forward declare an enum
*/
-extern int ip_address_family_decode (int _af, ip_address_family_t * out);
-extern int ip_address_family_encode (ip_address_family_t af);
-extern int ip_proto_decode (int _af, ip_protocol_t * out);
-extern int ip_proto_encode (ip_protocol_t af);
-extern ip_dscp_t ip_dscp_decode (u8 _dscp);
-extern u8 ip_dscp_encode (ip_dscp_t dscp);
+extern int ip_address_family_decode (vl_api_address_family_t af,
+ ip_address_family_t * out);
+extern vl_api_address_family_t ip_address_family_encode (ip_address_family_t
+ af);
+extern int ip_proto_decode (vl_api_ip_proto_t ipp, ip_protocol_t * out);
+extern vl_api_ip_proto_t ip_proto_encode (ip_protocol_t ipp);
+extern ip_dscp_t ip_dscp_decode (vl_api_ip_dscp_t _dscp);
+extern vl_api_ip_dscp_t ip_dscp_encode (ip_dscp_t dscp);
/**
* Decode/Encode for struct/union types
/**
* Decode/Encode for struct/union types
int rv;
rv = ip_address_family_decode (in->af, &out->af);
int rv;
rv = ip_address_family_decode (in->af, &out->af);
- rv += ip_proto_decode (in->protocol, &out->protocol);
+ if (rv < 0)
+ return (rv);
+ rv = ip_proto_decode (in->protocol, &out->protocol);
+ if (rv < 0)
+ return (rv);
out->port = clib_net_to_host_u16 (in->port);
return (rv);
out->port = clib_net_to_host_u16 (in->port);
return (rv);
int rv;
rv = ip_address_family_decode (in->af, &out->af);
int rv;
rv = ip_address_family_decode (in->af, &out->af);
- rv += ip_proto_decode (in->protocol, &out->protocol);
+ if (rv < 0)
+ return (rv);
+ rv = ip_proto_decode (in->protocol, &out->protocol);
&ue->ue_hdrs.ip4.ue_ip4.src_address, 4);
clib_memcpy (&mp->udp_encap.dst_ip.un.ip4,
&ue->ue_hdrs.ip4.ue_ip4.dst_address, 4);
&ue->ue_hdrs.ip4.ue_ip4.src_address, 4);
clib_memcpy (&mp->udp_encap.dst_ip.un.ip4,
&ue->ue_hdrs.ip4.ue_ip4.dst_address, 4);
- mp->udp_encap.dst_ip.af = clib_host_to_net_u32 (ADDRESS_IP4);
- mp->udp_encap.src_ip.af = clib_host_to_net_u32 (ADDRESS_IP4);
+ mp->udp_encap.dst_ip.af = ip_address_family_encode (AF_IP4);
+ mp->udp_encap.src_ip.af = ip_address_family_encode (AF_IP4);
/* ports aren't byte swapped because they are stored in network
* byte order */
/* ports aren't byte swapped because they are stored in network
* byte order */
&ue->ue_hdrs.ip6.ue_ip6.src_address, 16);
clib_memcpy (&mp->udp_encap.dst_ip.un.ip6,
&ue->ue_hdrs.ip6.ue_ip6.dst_address, 16);
&ue->ue_hdrs.ip6.ue_ip6.src_address, 16);
clib_memcpy (&mp->udp_encap.dst_ip.un.ip6,
&ue->ue_hdrs.ip6.ue_ip6.dst_address, 16);
- mp->udp_encap.dst_ip.af = clib_host_to_net_u32 (ADDRESS_IP6);
- mp->udp_encap.src_ip.af = clib_host_to_net_u32 (ADDRESS_IP6);
+ mp->udp_encap.dst_ip.af = ip_address_family_encode (AF_IP6);
+ mp->udp_encap.src_ip.af = ip_address_family_encode (AF_IP6);
/* ports aren't byte swapped because they are stored in network
* byte order */
/* ports aren't byte swapped because they are stored in network
* byte order */
u8 *
format_vl_api_address_family (u8 * s, va_list * args)
{
u8 *
format_vl_api_address_family (u8 * s, va_list * args)
{
- vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t);
+ vl_api_address_family_t af = va_arg (*args, int);
if (ADDRESS_IP6 == clib_net_to_host_u32 (af))
s = format (s, "ip4");
if (ADDRESS_IP6 == clib_net_to_host_u32 (af))
s = format (s, "ip4");
{
const vl_api_address_union_t *addr =
va_arg (*args, vl_api_address_union_t *);
{
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);
+ vl_api_address_family_t af = va_arg (*args, int);
if (ADDRESS_IP6 == af)
s = format (s, "%U", format_ip6_address, addr->ip6);
if (ADDRESS_IP6 == af)
s = format (s, "%U", format_ip6_address, addr->ip6);