aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/sctp/sctp_api.c
diff options
context:
space:
mode:
authorJakub Grajciar <jgrajcia@cisco.com>2020-01-30 14:30:04 +0100
committerOle Trøan <otroan@employees.org>2020-02-10 13:27:38 +0000
commitb954f0125b9aa9324c4d2f9f25ba8232a94c624a (patch)
treeb90e689a0205d61716ec142f1f3fe5b45dcf6ea6 /src/plugins/sctp/sctp_api.c
parentf267d11475d12975ca95cf2f5a61ad0f65ab9f45 (diff)
sctp: API cleanup
Use consistent API types. Type: fix Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com> Change-Id: I344ff299e2a20552450d82064c86aecb4403a71d Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Diffstat (limited to 'src/plugins/sctp/sctp_api.c')
-rw-r--r--src/plugins/sctp/sctp_api.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/src/plugins/sctp/sctp_api.c b/src/plugins/sctp/sctp_api.c
index bc7a69673ec..d804fcb36a4 100644
--- a/src/plugins/sctp/sctp_api.c
+++ b/src/plugins/sctp/sctp_api.c
@@ -21,6 +21,9 @@
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
+#include <vnet/ip/ip_types_api.h>
+#include <vnet/format_fns.h>
+
#include <sctp/sctp.h>
#include <sctp/sctp.api_enum.h>
@@ -36,15 +39,15 @@ static void
vlib_main_t *vm = vlib_get_main ();
vl_api_sctp_add_src_dst_connection_reply_t *rmp;
int rv;
+ ip46_address_t src, dst;
+
+ ip_address_decode (&mp->src_address, &src);
+ ip_address_decode (&mp->dst_address, &dst);
- if (mp->is_ipv6)
- rv = sctp_sub_connection_add_ip6
- (vm,
- (ip6_address_t *) mp->src_address, (ip6_address_t *) mp->dst_address);
+ if (ip46_address_is_ip4 (&src) && ip46_address_is_ip4 (&dst))
+ rv = sctp_sub_connection_add_ip4 (vm, &src.ip4, &dst.ip4);
else
- rv = sctp_sub_connection_add_ip4
- (vm,
- (ip4_address_t *) mp->src_address, (ip4_address_t *) mp->dst_address);
+ rv = sctp_sub_connection_add_ip6 (vm, &src.ip6, &dst.ip6);
REPLY_MACRO (VL_API_SCTP_ADD_SRC_DST_CONNECTION_REPLY);
}
@@ -55,13 +58,15 @@ static void
{
vl_api_sctp_del_src_dst_connection_reply_t *rmp;
int rv;
+ ip46_address_t src, dst;
+
+ ip_address_decode (&mp->src_address, &src);
+ ip_address_decode (&mp->dst_address, &dst);
- if (mp->is_ipv6)
- rv = sctp_sub_connection_del_ip6
- ((ip6_address_t *) mp->src_address, (ip6_address_t *) mp->dst_address);
+ if (ip46_address_is_ip4 (&src) && ip46_address_is_ip4 (&dst))
+ rv = sctp_sub_connection_del_ip4 (&src.ip4, &dst.ip4);
else
- rv = sctp_sub_connection_del_ip4
- ((ip4_address_t *) mp->src_address, (ip4_address_t *) mp->dst_address);
+ rv = sctp_sub_connection_del_ip6 (&src.ip6, &dst.ip6);
REPLY_MACRO (VL_API_SCTP_ADD_SRC_DST_CONNECTION_REPLY);
}