[qca-nss-clients] Clients netlink fix for nlcfg
Defined macros to be used in userspace and change of
parameter names
Change-Id: I326cf4c4f4be7aa29b36e376a3ec07df618a49ae
Signed-off-by: pavir <pavir@codeaurora.org>
diff --git a/netlink/include/nss_nlipsec_if.h b/netlink/include/nss_nlipsec_if.h
index 8dae814..9bd3a8a 100644
--- a/netlink/include/nss_nlipsec_if.h
+++ b/netlink/include/nss_nlipsec_if.h
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2015,2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015,2018-2019 The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -28,7 +28,7 @@
#define NSS_NLIPSEC_FAMILY "nss_nlipsec" /**< IPsec family */
#define NSS_NLIPSEC_MAX_TUNNELS 16 /**< Max tunnels */
-
+#define NSS_NLIPSEC_MCAST_GRP "nss_nlipsec_mc"
/**
* @brief ipsec commands types
*/
diff --git a/netlink/include/nss_nlipv4_if.h b/netlink/include/nss_nlipv4_if.h
index d048de0..b2d820f 100644
--- a/netlink/include/nss_nlipv4_if.h
+++ b/netlink/include/nss_nlipv4_if.h
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2015-2016,2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016,2018-2019, The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -39,8 +39,8 @@
char flow_ifname[IFNAMSIZ]; /**< ingress interface name */
char return_ifname[IFNAMSIZ]; /**< egress interface name */
- uint16_t flow_if_type; /**< ingress interface type */
- uint16_t return_if_type; /**< egress interface type */
+ uint16_t flow_iftype; /**< ingress interface type */
+ uint16_t return_iftype; /**< egress interface type */
struct nss_ipv4_msg nim; /**< rule message */
};
diff --git a/netlink/include/nss_nlipv6_if.h b/netlink/include/nss_nlipv6_if.h
index 8445064..f036d9f 100644
--- a/netlink/include/nss_nlipv6_if.h
+++ b/netlink/include/nss_nlipv6_if.h
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2016,2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016,2018-2019, The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -25,6 +25,9 @@
* IPv6 forwarding Family
*/
#define NSS_NLIPV6_FAMILY "nss_nlipv6"
+#define NSS_NLIPV6_MCAST_GRP "nss_nlipv6_mc"
+#define NSS_NLIPV6_ARPHRD_IPSEC_TUNNEL_TYPE 0x31
+#define NSS_NLIPV6_VLAN_ID_NOT_CONFIGURED 0xFFF
#define NSS_NLIPV6_ADDR_BITS (sizeof(uint32_t) * 4 * BITS_PER_BYTE) /* 128 bits */
#define NSS_NLIPV6_SUBNET_BITS (sizeof(uint32_t) * 4 * BITS_PER_BYTE) /* 128 bits */
@@ -38,8 +41,8 @@
char flow_ifname[IFNAMSIZ]; /**< ingress interface name */
char return_ifname[IFNAMSIZ]; /**< egress interface name */
- uint16_t flow_if_type; /**< ingress interface type */
- uint16_t return_if_type; /**< egress interface type */
+ uint16_t flow_iftype; /**< ingress interface type */
+ uint16_t return_iftype; /**< egress interface type */
struct nss_ipv6_msg nim; /**< rule message */
};
diff --git a/netlink/nss_nlipsec.c b/netlink/nss_nlipsec.c
index 4c4bd29..93b2436 100644
--- a/netlink/nss_nlipsec.c
+++ b/netlink/nss_nlipsec.c
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2015-2016,2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2016,2018-2019 The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -86,8 +86,8 @@
/*
* Multicast group for sending message status & events
*/
-static struct genl_multicast_group nss_nlipsec_mcgrp[] = {
- {.name = NSS_NLIPSEC_FAMILY},
+static const struct genl_multicast_group nss_nlipsec_mcgrp[] = {
+ {.name = NSS_NLIPSEC_MCAST_GRP},
};
/*
diff --git a/netlink/nss_nlipv4.c b/netlink/nss_nlipv4.c
index c3bf37d..0cd58e1 100644
--- a/netlink/nss_nlipv4.c
+++ b/netlink/nss_nlipv4.c
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -637,7 +637,7 @@
* check connection rule
*/
error = nss_nlipv4_verify_conn_rule(&nim->msg.rule_create, flow_dev, return_dev,
- nl_rule->flow_if_type, nl_rule->return_if_type);
+ nl_rule->flow_iftype, nl_rule->return_iftype);
if (error < 0) {
nss_nl_error("%d:invalid conn rule information passed\n", pid);
goto done;
diff --git a/netlink/nss_nlipv6.c b/netlink/nss_nlipv6.c
index 1a0972b..3d3fcbb 100644
--- a/netlink/nss_nlipv6.c
+++ b/netlink/nss_nlipv6.c
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -610,7 +610,7 @@
* check connection rule
*/
error = nss_nlipv6_verify_conn_rule(&nim->msg.rule_create, flow_dev, return_dev,
- nl_rule->flow_if_type, nl_rule->return_if_type);
+ nl_rule->flow_iftype, nl_rule->return_iftype);
if (error < 0) {
nss_nl_error("%d:invalid conn rule information passed\n", pid);
goto done;