summaryrefslogtreecommitdiffstats
path: root/src/plugins/ietf/ietf_interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/ietf/ietf_interface.c')
-rw-r--r--src/plugins/ietf/ietf_interface.c369
1 files changed, 53 insertions, 316 deletions
diff --git a/src/plugins/ietf/ietf_interface.c b/src/plugins/ietf/ietf_interface.c
index 728d20e..922c84f 100644
--- a/src/plugins/ietf/ietf_interface.c
+++ b/src/plugins/ietf/ietf_interface.c
@@ -18,50 +18,14 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <sysrepo.h>
-#include <sysrepo/plugins.h>
-#include <sysrepo/values.h>
-#include <sysrepo/xpath.h>
-#include <vnet/interface.h>
-#include <vnet/vnet.h>
-#include <vnet/ip/ip.h>
-#include <vapi/interface.api.vapi.h>
-
#include "ietf_interface.h"
-DEFINE_VAPI_MSG_IDS_INTERFACE_API_JSON;
-
-typedef struct _s_vpp_interface_
-{
- u32 sw_if_index;
- char interface_name[VPP_INTFC_NAME_LEN];
- u8 l2_address[VPP_MAC_ADDRESS_LEN];
- u32 l2_address_length;
- u64 link_speed;
- u16 link_mtu;
- u8 admin_up_down;
- u8 link_up_down;
-} scVppIntfc;
-
-typedef struct _ietf_sw_interface_dump_ctx
-{
- u8 last_called;
- int num_ifs;
- int capacity;
- scVppIntfc * intfcArray;
-} ietf_sw_interface_dump_ctx;
-
-static i32 ietf_setInterfaceFlags(u32 sw_if_index, u8 admin_up_down);
-static i32 ietf_interface_name2index(const char *name, u32* if_index);
-static i32 ietf_interface_add_del_addr(u32 sw_if_index, u8 is_add, u8 is_ipv6,
- u8 del_all, u8 address_length,
- u8 address[VPP_IP6_ADDRESS_LEN]);
-static int ietf_swInterfaceDump(ietf_sw_interface_dump_ctx * dctx);
-static int ietf_initSwInterfaceDumpCTX(ietf_sw_interface_dump_ctx * dctx);
-static int ietf_freeSwInterfaceDumpCTX(ietf_sw_interface_dump_ctx * dctx);
+#include "sc_vpp_interface.h"
+#include "sc_vpp_ip.h"
/**
- * @brief Helper function for converting netmask into prefix length.
+ * @brief Helper function for converting netmask (ex: 255.255.255.0)
+ * to prefix length (ex: 24).
*/
static uint8_t
netmask_to_prefix(const char *netmask)
@@ -80,65 +44,12 @@ netmask_to_prefix(const char *netmask)
}
/**
- * @brief Helper function for converting IPv4/IPv6 address string into binary representation.
+ * @brief Callback to be called by any config change of
+ * "/ietf-interfaces:interfaces/interface/enabled" leaf.
*/
static int
-ip_addr_str_to_binary(const char *ip_address_str, uint8_t *ip_address_bin, bool is_ipv6)
-{
- struct in6_addr addr6 = { 0, };
- struct in_addr addr4 = { 0, };
- int ret = 0;
-
- if (is_ipv6) {
- ret = inet_pton(AF_INET6, ip_address_str, &(addr6));
- if (1 == ret)
- {
- memcpy(ip_address_bin, &addr6, sizeof(addr6));
- }
- } else {
- ret = inet_pton(AF_INET, ip_address_str, &(addr4));
- if (1 == ret)
- {
- memcpy(ip_address_bin, &addr4, sizeof(addr4));
- }
- }
-
- return ret;
-}
-
-/**
- * @brief Enable or disable given interface.
- */
-static int
-interface_enable_disable(const char *if_name, bool enable)
-{
- uint32_t if_index = ~0;
- int rc = 0;
-
- SRP_LOG_DBG("%s interface '%s'", enable ? "Enabling" : "Disabling", if_name);
-
- /* get interface index */
- rc = ietf_interface_name2index(if_name, &if_index);
- if (0 != rc) {
- SRP_LOG_ERR("Invalid interface name: %s", if_name);
- return SR_ERR_INVAL_ARG;
- }
-
- /* enable/disable interface */
- rc = ietf_setInterfaceFlags(if_index, (uint8_t)enable);
- if (0 != rc) {
- SRP_LOG_ERR("Error by processing of the sw_interface_set_flags request, rc=%d", rc);
- return SR_ERR_OPERATION_FAILED;
- } else {
- return SR_ERR_OK;
- }
-}
-
-/**
- * @brief Callback to be called by any config change of "/ietf-interfaces:interfaces/interface/enabled" leaf.
- */
-static int
-ietf_interface_enable_disable_cb(sr_session_ctx_t *session, const char *xpath, sr_notif_event_t event, void *private_ctx)
+ietf_interface_enable_disable_cb(sr_session_ctx_t *session, const char *xpath,
+ sr_notif_event_t event, void *private_ctx)
{
char *if_name = NULL;
sr_change_iter_t *iter = NULL;
@@ -148,6 +59,7 @@ ietf_interface_enable_disable_cb(sr_session_ctx_t *session, const char *xpath, s
sr_xpath_ctx_t xpath_ctx = { 0, };
int rc = SR_ERR_OK, op_rc = SR_ERR_OK;
+ SRP_LOG_INF("In %s", __FUNCTION__);
/* no-op for apply, we only care about SR_EV_ENABLED, SR_EV_VERIFY, SR_EV_ABORT */
if (SR_EV_APPLY == event) {
return SR_ERR_OK;
@@ -170,10 +82,10 @@ ietf_interface_enable_disable_cb(sr_session_ctx_t *session, const char *xpath, s
switch (op) {
case SR_OP_CREATED:
case SR_OP_MODIFIED:
- op_rc = interface_enable_disable(if_name, new_val->data.bool_val);
+ op_rc = interface_enable(if_name, new_val->data.bool_val);
break;
case SR_OP_DELETED:
- op_rc = interface_enable_disable(if_name, false /* !enable */);
+ op_rc = interface_enable(if_name, false /* !enable */);
break;
default:
break;
@@ -190,45 +102,7 @@ ietf_interface_enable_disable_cb(sr_session_ctx_t *session, const char *xpath, s
return op_rc;
}
-/**
- * @brief Add or remove IPv4/IPv6 address to/from an interface.
- */
-static int
-interface_ipv46_config_add_remove(const char *if_name, uint8_t *addr, uint8_t prefix, bool is_ipv6, bool add)
-{
- uint32_t if_index = ~0;
- int rc = 0;
-
- SRP_LOG_DBG("%s IP config on interface '%s'.", add ? "Adding" : "Removing", if_name);
-
- /* get interface index */
- rc = ietf_interface_name2index(if_name, &if_index);
- if (0 != rc) {
- SRP_LOG_ERR("Invalid interface name: %s", if_name);
- return SR_ERR_INVAL_ARG;
- }
-
- /* add del addr */
- rc = ietf_interface_add_del_addr(if_index, (uint8_t)add, (uint8_t)is_ipv6, 0, prefix, addr);
- if (0 != rc) {
- SRP_LOG_ERR("Error by processing of the sw_interface_set_flags request, rc=%d", rc);
- return SR_ERR_OPERATION_FAILED;
- } else {
- return SR_ERR_OK;
- }
-}
-int ietf_initSwInterfaceDumpCTX(ietf_sw_interface_dump_ctx * dctx)
-{
- if(dctx == NULL)
- return -1;
-
- dctx->intfcArray = NULL;
- dctx->last_called = false;
- dctx->capacity = 0;
- dctx->num_ifs = 0;
- return 0;
-}
-int ietf_freeSwInterfaceDumpCTX(ietf_sw_interface_dump_ctx * dctx)
+static int free_sw_interface_dump_ctx(dump_all_ctx * dctx)
{
if(dctx == NULL)
return -1;
@@ -238,167 +112,22 @@ int ietf_freeSwInterfaceDumpCTX(ietf_sw_interface_dump_ctx * dctx)
free(dctx->intfcArray);
}
- return ietf_initSwInterfaceDumpCTX(dctx);
-}
-vapi_error_e
-ietf_sw_interface_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
- vapi_error_e rv, bool is_last,
- vapi_payload_sw_interface_details * reply)
-{
- ietf_sw_interface_dump_ctx *dctx = callback_ctx;
- if (is_last)
- {
- dctx->last_called = true;
- }
- else
- {
- if(dctx->capacity == 0 && dctx->intfcArray == NULL)
- {
- dctx->capacity = 10;
- dctx->intfcArray = (scVppIntfc*)malloc( sizeof(scVppIntfc)*dctx->capacity );
- }
- if(dctx->num_ifs >= dctx->capacity-1)
- {
-
- dctx->capacity += 10;
- dctx->intfcArray = (scVppIntfc*)realloc(dctx->intfcArray, sizeof(scVppIntfc)*dctx->capacity );
- }
-
- scVppIntfc * thisIntfc = &dctx->intfcArray[dctx->num_ifs];
-
- thisIntfc->sw_if_index = reply->sw_if_index;
- strncpy(thisIntfc->interface_name, reply->interface_name, VPP_INTFC_NAME_LEN);
- thisIntfc->l2_address_length = reply->l2_address_length;
- memcpy(thisIntfc->l2_address, reply->l2_address, reply->l2_address_length );
- //thisIntfc->link_speed = reply->link_speed;
-#define ONE_MEGABIT (uint64_t)1000000
- switch (reply->link_speed << VNET_HW_INTERFACE_FLAG_SPEED_SHIFT)
- {
- default:
- thisIntfc->link_speed = 0;
- break;
- }
-
- thisIntfc->link_mtu = reply->link_mtu;
- thisIntfc->admin_up_down = reply->admin_up_down;
- thisIntfc->link_up_down = reply->link_up_down;
-
- dctx->num_ifs += 1;
- }
- return VAPI_OK;
-}
-
-static int ietf_swInterfaceDump(ietf_sw_interface_dump_ctx * dctx)
-{
- if(dctx == NULL)
- {
- return -1;
- }
-
- //ietf_sw_interface_dump_ctx dctx = { false, 0, 0, 0 };
- vapi_msg_sw_interface_dump *dump;
- vapi_error_e rv;
- // dctx->last_called = false;
- ietf_initSwInterfaceDumpCTX(dctx);
- dump = vapi_alloc_sw_interface_dump (g_vapi_ctx_instance);
- dump->payload.name_filter_valid = 0;
- memset (dump->payload.name_filter, 0, sizeof (dump->payload.name_filter));
- while (VAPI_EAGAIN ==
- (rv =
- vapi_sw_interface_dump (g_vapi_ctx_instance, dump, ietf_sw_interface_dump_cb,
- dctx)));
-
- return dctx->num_ifs;
-}
-
-static i32 ietf_interface_name2index(const char *name, u32* if_index)
-{
- ARG_CHECK2(-1, name, if_index);
-
- i32 ret = -1;
- ietf_sw_interface_dump_ctx dctx = {false, 0, 0, 0};
- vapi_msg_sw_interface_dump *dump;
- vapi_error_e rv;
- dctx.last_called = false;
-
- dump = vapi_alloc_sw_interface_dump(g_vapi_ctx_instance);
- dump->payload.name_filter_valid = true;
- strncpy(dump->payload.name_filter, name, sizeof(dump->payload.name_filter));
-
- while (VAPI_EAGAIN == (rv = vapi_sw_interface_dump(g_vapi_ctx_instance, dump, ietf_sw_interface_dump_cb, &dctx)))
- ;
-
- int i = 0;
- for (; i < dctx.num_ifs; ++i)
- {
- if (strcmp(dctx.intfcArray[i].interface_name, name) == 0)
- {
- *if_index = dctx.intfcArray[i].sw_if_index;
- ret = 0;
- break;
- }
- }
- ietf_freeSwInterfaceDumpCTX(&dctx);
-
- return ret;
-}
-
-i32 ietf_interface_add_del_addr( u32 sw_if_index, u8 is_add, u8 is_ipv6, u8 del_all,
- u8 address_length, u8 address[VPP_IP6_ADDRESS_LEN] )
-{
- i32 ret = -1;
- vapi_msg_sw_interface_add_del_address *msg = vapi_alloc_sw_interface_add_del_address(g_vapi_ctx_instance);
- msg->payload.sw_if_index = sw_if_index;
- msg->payload.is_add = is_add;
- msg->payload.is_ipv6 = is_ipv6;
- msg->payload.del_all = del_all;
- msg->payload.address_length = address_length;
- memcpy(msg->payload.address, address, VPP_IP6_ADDRESS_LEN);
- vapi_msg_sw_interface_add_del_address_hton (msg);
-
- vapi_error_e rv = vapi_send (g_vapi_ctx_instance, msg);
-
- vapi_msg_sw_interface_add_del_address_reply *resp;
-
- SC_VPP_VAPI_RECV;
-
- vapi_msg_sw_interface_add_del_address_reply_hton(resp);
- ret = resp->payload.retval;
- vapi_msg_free (g_vapi_ctx_instance, resp);
- return ret;
-}
-
-i32 ietf_setInterfaceFlags(u32 sw_if_index, u8 admin_up_down)
-{
- i32 ret = -1;
- vapi_msg_sw_interface_set_flags *msg = vapi_alloc_sw_interface_set_flags(g_vapi_ctx_instance);
- msg->payload.sw_if_index = sw_if_index;
- msg->payload.admin_up_down = admin_up_down;
- vapi_msg_sw_interface_set_flags_hton (msg);
-
- vapi_error_e rv = vapi_send (g_vapi_ctx_instance, msg);
-
- vapi_msg_sw_interface_set_flags_reply *resp;
+ dctx->intfcArray = NULL;
+ dctx->capacity = 0;
+ dctx->num_ifs = 0;
- SC_VPP_VAPI_RECV;
-
- vapi_msg_sw_interface_set_flags_reply_ntoh(resp);
- ret = resp->payload.retval;
- vapi_msg_free (g_vapi_ctx_instance, resp);
- return ret;
+ return 0;
}
-
/**
* @brief Modify existing IPv4/IPv6 config on an interface.
*/
static int
-interface_ipv46_config_modify(sr_session_ctx_t *session, const char *if_name,
- sr_val_t *old_val, sr_val_t *new_val, bool is_ipv6)
+interface_ipv46_config_modify(const char *if_name, sr_val_t *old_val,
+ sr_val_t *new_val, bool is_ipv6)
{
sr_xpath_ctx_t xpath_ctx = { 0, };
- char *addr_str = NULL;
- uint8_t addr[16] = { 0, };
+ char *addr = NULL;
uint8_t prefix = 0;
int rc = SR_ERR_OK;
@@ -412,12 +141,11 @@ interface_ipv46_config_modify(sr_session_ctx_t *session, const char *if_name,
} else {
return SR_ERR_INVAL_ARG;
}
- addr_str = sr_xpath_key_value((char*)old_val->xpath, "address", "ip", &xpath_ctx);
- ip_addr_str_to_binary(addr_str, addr, is_ipv6);
+ addr = sr_xpath_key_value((char*)old_val->xpath, "address", "ip", &xpath_ctx);
sr_xpath_recover(&xpath_ctx);
/* delete old IP config */
- rc = interface_ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, false /* remove */);
+ rc = ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, false /* remove */);
if (SR_ERR_OK != rc) {
SRP_LOG_ERR("Unable to remove old IP address config, rc=%d", rc);
return rc;
@@ -431,7 +159,7 @@ interface_ipv46_config_modify(sr_session_ctx_t *session, const char *if_name,
}
/* set new IP config */
- rc = interface_ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, true /* add */);
+ rc = ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, true /* add */);
if (SR_ERR_OK != rc) {
SRP_LOG_ERR("Unable to remove old IP address config, rc=%d", rc);
return rc;
@@ -445,7 +173,10 @@ interface_ipv46_config_modify(sr_session_ctx_t *session, const char *if_name,
* or "/ietf-interfaces:interfaces/interface/ietf-ip:ipv6/address".
*/
static int
-ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xpath, sr_notif_event_t event, void *private_ctx)
+ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session,
+ const char *xpath,
+ sr_notif_event_t event,
+ void *private_ctx)
{
sr_change_iter_t *iter = NULL;
sr_change_oper_t op = SR_OP_CREATED;
@@ -453,11 +184,13 @@ ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xp
sr_val_t *new_val = NULL;
sr_xpath_ctx_t xpath_ctx = { 0, };
bool is_ipv6 = false, has_addr = false, has_prefix = false;
- uint8_t addr[16] = { 0, };
+ char addr[VPP_IP6_ADDRESS_STRING_LEN] = {0};
uint8_t prefix = 0;
char *node_name = NULL, *if_name = NULL;
int rc = SR_ERR_OK, op_rc = SR_ERR_OK;
+ SRP_LOG_INF("In %s", __FUNCTION__);
+
/* no-op for apply, we only care about SR_EV_ENABLED, SR_EV_VERIFY, SR_EV_ABORT */
if (SR_EV_APPLY == event) {
return SR_ERR_OK;
@@ -493,7 +226,7 @@ ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xp
has_addr = has_prefix = false;
} else {
if (sr_xpath_node_name_eq(new_val->xpath, "ip")) {
- ip_addr_str_to_binary(new_val->data.string_val, addr, is_ipv6);
+ strncpy(addr, new_val->data.string_val, strlen(new_val->data.string_val));
has_addr = true;
} else if (sr_xpath_node_name_eq(new_val->xpath, "prefix-length")) {
prefix = new_val->data.uint8_val;
@@ -503,12 +236,13 @@ ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xp
has_prefix = true;
}
if (has_addr && has_prefix) {
- op_rc = interface_ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, true /* add */);
+ op_rc = ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, true /* add */);
}
}
break;
case SR_OP_MODIFIED:
- op_rc = interface_ipv46_config_modify(session, if_name, old_val, new_val, is_ipv6);
+ //TODO Why is it using old_val and new_val?
+ op_rc = interface_ipv46_config_modify(if_name, old_val, new_val, is_ipv6);
break;
case SR_OP_DELETED:
if (SR_LIST_T == old_val->type) {
@@ -516,7 +250,7 @@ ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xp
has_addr = has_prefix = false;
} else {
if (sr_xpath_node_name_eq(old_val->xpath, "ip")) {
- ip_addr_str_to_binary(old_val->data.string_val, addr, is_ipv6);
+ strncpy(addr, old_val->data.string_val, strlen(old_val->data.string_val));
has_addr = true;
} else if (sr_xpath_node_name_eq(old_val->xpath, "prefix-length")) {
prefix = old_val->data.uint8_val;
@@ -526,7 +260,7 @@ ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xp
has_prefix = true;
}
if (has_addr && has_prefix) {
- op_rc = interface_ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, false /* !add */);
+ op_rc = ipv46_config_add_remove(if_name, addr, prefix, is_ipv6, false /* !add */);
}
}
break;
@@ -550,8 +284,10 @@ ietf_interface_ipv46_address_change_cb(sr_session_ctx_t *session, const char *xp
* Does not provide any functionality, needed just to cover not supported config leaves.
*/
static int
-ietf_interface_change_cb(sr_session_ctx_t *session, const char *xpath, sr_notif_event_t event, void *private_ctx)
+ietf_interface_change_cb(sr_session_ctx_t *session, const char *xpath,
+ sr_notif_event_t event, void *private_ctx)
{
+ SRP_LOG_INF("In %s", __FUNCTION__);
SRP_LOG_DBG("'%s' modified, event=%d", xpath, event);
return SR_ERR_OK;
@@ -569,11 +305,12 @@ ietf_interface_state_cb(const char *xpath, sr_val_t **values,
{
sr_val_t *values_arr = NULL;
int values_arr_size = 0, values_arr_cnt = 0;
- ietf_sw_interface_dump_ctx dctx;
- scVppIntfc* if_details;
+ dump_all_ctx dctx;
+ int nb_iface;
+ vpp_interface_t* if_details;
int rc = 0;
- SRP_LOG_DBG("Requesting state data for '%s'", xpath);
+ SRP_LOG_INF("In %s", __FUNCTION__);
if (! sr_xpath_node_name_eq(xpath, "interface")) {
/* statistics, ipv4 and ipv6 state data not supported */
@@ -583,23 +320,23 @@ ietf_interface_state_cb(const char *xpath, sr_val_t **values,
}
/* dump interfaces */
- rc = ietf_swInterfaceDump(&dctx);
- if (rc <= 0) {
+ nb_iface = interface_dump_all(&dctx);
+ if (nb_iface <= 0) {
SRP_LOG_ERR_MSG("Error by processing of a interface dump request.");
- ietf_freeSwInterfaceDumpCTX(&dctx);
+ free_sw_interface_dump_ctx(&dctx);
return SR_ERR_INTERNAL;
}
/* allocate array of values to be returned */
- values_arr_size = dctx.num_ifs * 5;
+ values_arr_size = nb_iface * 5;
rc = sr_new_values(values_arr_size, &values_arr);
if (0 != rc) {
- ietf_freeSwInterfaceDumpCTX(&dctx);
+ free_sw_interface_dump_ctx(&dctx);
return rc;
}
int i = 0;
- for (; i < dctx.num_ifs; i++) {
+ for (; i < nb_iface; i++) {
if_details = dctx.intfcArray+i;
/* currently the only supported interface types are propVirtual / ethernetCsmacd */
@@ -623,10 +360,10 @@ ietf_interface_state_cb(const char *xpath, sr_val_t **values,
if_details->l2_address[3], if_details->l2_address[4], if_details->l2_address[5]);
values_arr_cnt++;
} else {
- sr_val_build_xpath(&values_arr[values_arr_cnt], "%s[name='%s']/phys-address", xpath, if_details->interface_name);
- sr_val_build_str_data(&values_arr[values_arr_cnt], SR_STRING_T, "%02x:%02x:%02x:%02x:%02x:%02x", 0,0,0,0,0,0);
- values_arr_cnt++;
- }
+ sr_val_build_xpath(&values_arr[values_arr_cnt], "%s[name='%s']/phys-address", xpath, if_details->interface_name);
+ sr_val_build_str_data(&values_arr[values_arr_cnt], SR_STRING_T, "%02x:%02x:%02x:%02x:%02x:%02x", 0,0,0,0,0,0);
+ values_arr_cnt++;
+ }
sr_val_build_xpath(&values_arr[values_arr_cnt], "%s[name='%s']/speed", xpath, if_details->interface_name);
values_arr[values_arr_cnt].type = SR_UINT64_T;
@@ -639,7 +376,7 @@ ietf_interface_state_cb(const char *xpath, sr_val_t **values,
*values = values_arr;
*values_cnt = values_arr_cnt;
- ietf_freeSwInterfaceDumpCTX(&dctx);
+ free_sw_interface_dump_ctx(&dctx);
return SR_ERR_OK;
}