From 7981b901c43848d3b923ec49515b28a75ab984e3 Mon Sep 17 00:00:00 2001 From: Masoud Hemmatpour Date: Tue, 26 Nov 2019 12:05:02 +0100 Subject: [HICN-403] update vapi communication with vpp Signed-off-by: Masoud Hemmatpour Change-Id: I6e05d96af049229a6dc2da0adf32707873cdc816 Signed-off-by: Alberto Compagno --- .../hicn-plugin/plugin/model/hicn_model.c | 1304 +++++++++----------- 1 file changed, 590 insertions(+), 714 deletions(-) (limited to 'ctrl/sysrepo-plugins/hicn-plugin/plugin/model/hicn_model.c') diff --git a/ctrl/sysrepo-plugins/hicn-plugin/plugin/model/hicn_model.c b/ctrl/sysrepo-plugins/hicn-plugin/plugin/model/hicn_model.c index bb8c5e828..305512af3 100644 --- a/ctrl/sysrepo-plugins/hicn-plugin/plugin/model/hicn_model.c +++ b/ctrl/sysrepo-plugins/hicn-plugin/plugin/model/hicn_model.c @@ -27,7 +27,6 @@ #include /* Hicn headers */ -#include #include #include "../hicn_plugin.h" #include "../hicn_vpp_comm.h" @@ -46,9 +45,9 @@ volatile hicn_strategies_t * hicn_strategies =NULL; volatile hicn_route_t * hicn_route = NULL; volatile hicn_face_ip_params_t * hicn_face_ip_params = NULL; volatile hicn_faces_t * hicn_faces = NULL; -//volatile hicn_face_stat_t * hicn_face_stat=NULL; -struct hicn_faces_s * current = NULL; -//volatile hicn_state_face_t * hicn_state_face=NULL; +volatile hicn_routes_t * hicn_routes = NULL; +struct hicn_faces_s * fcurrent = NULL; +struct hicn_routes_s * rcurrent = NULL; static int init_buffer(void){ @@ -67,13 +66,17 @@ static int init_buffer(void){ hicn_faces = memalign(MEM_ALIGN, sizeof(hicn_faces_t) ); hicn_faces->next=memalign(MEM_ALIGN, sizeof(struct hicn_faces_s)); - current=hicn_faces->next; + fcurrent=hicn_faces->next; + + + hicn_routes = memalign(MEM_ALIGN, sizeof(hicn_routes_t) ); + hicn_routes->next=memalign(MEM_ALIGN, sizeof(struct hicn_routes_s)); + rcurrent=hicn_routes->next; -// hicn_state_face = memalign(MEM_ALIGN, sizeof(hicn_state_face_t) ); -// memset((hicn_state_face_t *) hicn_state_face, 0, sizeof(hicn_state_face_t)); int retval=-1; - ARG_CHECK6(retval, hicn_state, hicn_strategy, hicn_strategies, hicn_route, current, hicn_faces); + ARG_CHECK7(retval, hicn_state, hicn_strategy, hicn_strategies, hicn_route, fcurrent, hicn_faces, hicn_routes); + hicn_routes->nroute=0; hicn_faces->nface=0; retval=0; @@ -83,145 +86,403 @@ static int init_buffer(void){ static int init_face_pool(struct hicn_faces_s * head){ - ARG_CHECK(HICN_EINVAL, head); for(int i=0; inext=memalign(MEM_ALIGN, sizeof(struct hicn_faces_s)); head=head->next; - SRP_LOG_DBG_MSG("Allocated\n"); } + SRP_LOG_DBGMSG("Face memory pool allocated\n"); head->next=NULL; - return HICN_OK; + return 0; + +} + + +static int init_route_pool(struct hicn_routes_s * head){ + + for(int i=0; inext=memalign(MEM_ALIGN, sizeof(struct hicn_routes_s)); + head=head->next; + } + SRP_LOG_DBGMSG("Route memory pool allocated\n"); + head->next=NULL; + return 0; + +} + +/* VAPI CALLBACKS */ + +vapi_error_e call_hicn_api_strategy_get(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_node_params_set_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + +vapi_error_e call_hicn_api_strategies_get(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_strategies_get_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; } -static inline void state_cache(vapi_msg_hicn_api_node_stats_get_reply * resp){ - hicn_state->pkts_processed = resp->payload.pkts_processed; - hicn_state->pkts_interest_count = resp->payload.pkts_interest_count; - hicn_state->pkts_data_count = resp->payload.pkts_data_count; - hicn_state->pkts_from_cache_count = resp->payload.pkts_from_cache_count; - hicn_state->pkts_no_pit_count = resp->payload.pkts_no_pit_count; - hicn_state->pit_expired_count = resp->payload.pit_expired_count; - hicn_state->cs_expired_count = resp->payload.cs_expired_count; - hicn_state->cs_lru_count = resp->payload.cs_lru_count; - hicn_state->pkts_drop_no_buf = resp->payload.pkts_drop_no_buf; - hicn_state->interests_aggregated = resp->payload.interests_aggregated; - hicn_state->interests_retx = resp->payload.interests_retx; - hicn_state->pit_entries_count = resp->payload.pit_entries_count; - hicn_state->cs_entries_count = resp->payload.cs_entries_count; - hicn_state->cs_entries_ntw_count = resp->payload.cs_entries_ntw_count; - SRP_LOG_DBG_MSG("state cached"); +vapi_error_e call_hicn_api_route_get_hton(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_strategies_get_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; } -static inline void state_update(sr_val_t * vals ){ +vapi_error_e call_hicn_api_route_nhops_add(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_route_nhops_add_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + +vapi_error_e call_hicn_api_route_del(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_route_del_reply *reply){ + +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + +vapi_error_e call_hicn_api_face_ip_params_get(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_face_ip_params_get_reply *reply){ +if(!reply->retval){ + if (callback_ctx!=NULL){ + struct hicn_faces_s * tmp; + tmp = (struct hicn_faces_s *) callback_ctx; + tmp->face.intfc = reply->swif; + } + return VAPI_OK; + }else + return VAPI_EUSER; +} + + +vapi_error_e call_hicn_api_punting_add(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_punting_add_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + + +vapi_error_e call_hicn_api_route_nhop_del(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_route_nhop_del_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + + +vapi_error_e call_hicn_api_punting_del(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_punting_del_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + + +vapi_error_e call_hicn_api_face_ip_del(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_face_ip_del_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + + +vapi_error_e call_hicn_api_face_ip_add(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_face_ip_add_reply *reply){ +if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; + +} + +vapi_error_e call_vapi_hicn_api_node_stats_get(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_node_stats_get_reply *reply){ + + +if(!reply->retval){ + hicn_state->pkts_processed = reply->pkts_processed; + hicn_state->pkts_interest_count = reply->pkts_interest_count; + hicn_state->pkts_data_count = reply->pkts_data_count; + hicn_state->pkts_from_cache_count = reply->pkts_from_cache_count; + hicn_state->pkts_no_pit_count = reply->pkts_no_pit_count; + hicn_state->pit_expired_count = reply->pit_expired_count; + hicn_state->cs_expired_count = reply->cs_expired_count; + hicn_state->cs_lru_count = reply->cs_lru_count; + hicn_state->pkts_drop_no_buf = reply->pkts_drop_no_buf; + hicn_state->interests_aggregated = reply->interests_aggregated; + hicn_state->interests_retx = reply->interests_retx; + hicn_state->pit_entries_count = reply->pit_entries_count; + hicn_state->cs_entries_count = reply->cs_entries_count; + hicn_state->cs_entries_ntw_count = reply->cs_entries_ntw_count; + return VAPI_OK; + }else + return VAPI_EUSER; +} + +vapi_error_e call_hicn_api_node_params_set(struct vapi_ctx_s *ctx, + void *callback_ctx, + vapi_error_e rv, + bool is_last, + vapi_payload_hicn_api_node_params_set_reply *reply){ + if(!reply->retval){ + SRP_LOG_DBGMSG("Successfully done"); + return VAPI_OK; + }else + return VAPI_EUSER; +} + +static inline void state_update(sr_val_t * vals, struct lyd_node **parent, sr_session_ctx_t *session){ + char buf[20]; + //struct ly_ctx *ly_ctx = sr_get_context(sr_session_get_connection(session)); sr_val_set_xpath(&vals[0], "/hicn:hicn-state/states/pkts_processed"); vals[0].type = SR_UINT64_T; vals[0].data.uint64_val = hicn_state->pkts_processed; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pkts_processed); + * parent = lyd_new_path(NULL, sr_get_context(sr_session_get_connection(session)), vals[0].xpath, buf, 0, 0); sr_val_set_xpath(&vals[1], "/hicn:hicn-state/states/pkts_interest_count"); vals[1].type = SR_UINT64_T; vals[1].data.uint64_val = hicn_state->pkts_interest_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pkts_interest_count ); + lyd_new_path(*parent, NULL, vals[1].xpath, buf, 0, 0); sr_val_set_xpath(&vals[2], "/hicn:hicn-state/states/pkts_data_count"); vals[2].type = SR_UINT64_T; vals[2].data.uint64_val = hicn_state->pkts_data_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pkts_data_count ); + lyd_new_path(*parent, NULL, vals[2].xpath, buf, 0, 0); sr_val_set_xpath(&vals[3], "/hicn:hicn-state/states/pkts_from_cache_count"); vals[3].type = SR_UINT64_T; vals[3].data.uint64_val = hicn_state->pkts_from_cache_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pkts_from_cache_count ); + lyd_new_path(*parent, NULL, vals[3].xpath, buf, 0, 0); sr_val_set_xpath(&vals[4], "/hicn:hicn-state/states/pkts_no_pit_count"); vals[4].type = SR_UINT64_T; vals[4].data.uint64_val = hicn_state->pkts_no_pit_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pkts_no_pit_count ); + lyd_new_path(*parent, NULL, vals[4].xpath, buf, 0, 0); sr_val_set_xpath(&vals[5], "/hicn:hicn-state/states/pit_expired_count"); vals[5].type = SR_UINT64_T; vals[5].data.uint64_val = hicn_state->pit_expired_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pit_expired_count ); + lyd_new_path(*parent, NULL, vals[5].xpath, buf, 0, 0); sr_val_set_xpath(&vals[6], "/hicn:hicn-state/states/cs_expired_count"); vals[6].type = SR_UINT64_T; vals[6].data.uint64_val = hicn_state->cs_expired_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->cs_expired_count ); + lyd_new_path(*parent, NULL, vals[6].xpath, buf, 0, 0); sr_val_set_xpath(&vals[7], "/hicn:hicn-state/states/cs_lru_count"); vals[7].type = SR_UINT64_T; vals[7].data.uint64_val = hicn_state->cs_lru_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->cs_lru_count ); + lyd_new_path(*parent, NULL, vals[7].xpath, buf, 0, 0); sr_val_set_xpath(&vals[8], "/hicn:hicn-state/states/pkts_drop_no_buf"); vals[8].type = SR_UINT64_T; vals[8].data.uint64_val = hicn_state->pkts_drop_no_buf; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pkts_drop_no_buf ); + lyd_new_path(*parent, NULL, vals[8].xpath, buf, 0, 0); sr_val_set_xpath(&vals[9], "/hicn:hicn-state/states/interests_aggregated"); vals[9].type = SR_UINT64_T; vals[9].data.uint64_val = hicn_state->interests_aggregated; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->interests_aggregated ); + lyd_new_path(*parent, NULL, vals[9].xpath, buf, 0, 0); sr_val_set_xpath(&vals[10], "/hicn:hicn-state/states/interests_retx"); vals[10].type = SR_UINT64_T; vals[10].data.uint64_val = hicn_state->interests_retx; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->interests_retx ); + lyd_new_path(*parent, NULL, vals[10].xpath, buf, 0, 0); sr_val_set_xpath(&vals[11], "/hicn:hicn-state/states/interests_hash_collision"); vals[11].type = SR_UINT64_T; vals[11].data.uint64_val = hicn_state->interests_hash_collision; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->interests_hash_collision ); + lyd_new_path(*parent, NULL, vals[11].xpath, buf, 0, 0); sr_val_set_xpath(&vals[12], "/hicn:hicn-state/states/pit_entries_count"); vals[12].type = SR_UINT64_T; vals[12].data.uint64_val = hicn_state->pit_entries_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->pit_entries_count ); + lyd_new_path(*parent, NULL, vals[12].xpath, buf, 0, 0); sr_val_set_xpath(&vals[13], "/hicn:hicn-state/states/cs_entries_count"); vals[13].type = SR_UINT64_T; vals[13].data.uint64_val = hicn_state->cs_entries_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->cs_entries_count ); + lyd_new_path(*parent, NULL, vals[13].xpath, buf, 0, 0); sr_val_set_xpath(&vals[14], "/hicn:hicn-state/states/cs_entries_ntw_count"); vals[14].type = SR_UINT64_T; vals[14].data.uint64_val = hicn_state->cs_entries_ntw_count; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, hicn_state->cs_entries_ntw_count ); + lyd_new_path(*parent, NULL, vals[14].xpath, buf, 0, 0); + } -static inline void strategies_update(sr_val_t * vals ){ - sr_val_set_xpath(&vals[0], "/hicn:hicn-state/strategies/n_strategies"); - vals[0].type = SR_UINT8_T; - vals[0].data.uint8_val = hicn_strategies->n_strategies; +static inline int routes_update(sr_val_t * vals, uint32_t nleaves, struct lyd_node **parent, sr_session_ctx_t *session){ - sr_val_set_xpath(&vals[1], "/hicn:hicn-state/strategies/strategy_id"); - vals[1].type = SR_UINT32_T; - vals[1].data.uint32_val = hicn_strategies->strategy_id[0]; -} + struct hicn_routes_s * temp = hicn_routes->next; + char buf[20]; + int route =0; + for(int count=0; countroute.route_id); + vals[route].type = SR_STRING_T; + + memset(buf, 0x00, 20); + if (temp->route.prefix.address.af==ADDRESS_IP4){ + struct sockaddr_in sa; + memcpy(&sa.sin_addr.s_addr,temp->route.prefix.address.un.ip4,INET_ADDRSTRLEN); + inet_ntop(AF_INET, &(sa.sin_addr), buf, INET_ADDRSTRLEN); + vals[route].data.string_val = buf; + }else{ + struct sockaddr_in6 sa; + memcpy(&sa.sin6_addr,temp->route.prefix.address.un.ip6,INET6_ADDRSTRLEN); + inet_ntop(AF_INET6, &(sa.sin6_addr), buf, INET6_ADDRSTRLEN); + vals[route].data.string_val = buf; + } + + + lyd_new_path(*parent, NULL, vals[route].xpath, buf, 0, 0); + + + route++; + + sr_val_build_xpath(&vals[route], "%s[routeid='%d']/strategy_id", "/hicn:hicn-state/routes/route", + temp->route.route_id); + vals[route].type = SR_UINT32_T; + vals[route].data.uint32_val = temp->route.strategy_id; + memset(buf, 0x00, 20); + sprintf( buf, "%d", temp->route.strategy_id); + lyd_new_path(*parent, NULL, vals[route].xpath, buf, 0, 0); + + route++; -static inline void route_update(sr_val_t * vals ){ - sr_val_set_xpath(&vals[0], "/hicn:hicn-state/routes/faceids"); - vals[0].type = SR_UINT16_T; - vals[0].data.uint32_val = hicn_route->faceids[0]; + temp=temp->next; + +} - sr_val_set_xpath(&vals[1], "/hicn:hicn-state/routes/strategy_id"); - vals[1].type = SR_UINT32_T; - vals[1].data.uint32_val = hicn_route->strategy_id; + SRP_LOG_DBGMSG("Routes state updated \n"); + return SR_ERR_OK; } -static inline int faces_update(sr_val_t * vals, uint32_t nleaves){ +static inline int faces_update(sr_val_t * vals, uint32_t nleaves, struct lyd_node **parent, sr_session_ctx_t *session){ struct hicn_faces_s * temp = hicn_faces->next; + char buf[20]; int face =0; + for(int count=0; countpayload.faceid = temp->face.faceid; - vapi_msg_hicn_api_face_ip_params_get_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_face_ip_params_get_reply_ntoh(resp); - if(!resp->payload.retval){ - SRP_LOG_DBG("faceid(%d)-->intfc(%d)", temp->face.faceid, resp->payload.swif); - temp->face.intfc= resp->payload.swif; - } + if(vapi_hicn_api_face_ip_params_get(g_vapi_ctx_instance,msg,call_hicn_api_face_ip_params_get, (void *)temp)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); + return SR_ERR_OPERATION_FAILED; + } sr_val_build_xpath(&vals[face], "%s[faceid='%d']/intfc", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT32_T; vals[face].data.uint32_val = temp->face.intfc; + memset(buf, 0x00, 20); + sprintf( buf,"%u", temp->face.intfc); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); face++; @@ -231,484 +492,204 @@ static inline int faces_update(sr_val_t * vals, uint32_t nleaves){ temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.irx_packets; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.irx_packets); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); face++; + + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/irx_bytes", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.irx_bytes; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.irx_bytes); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); face++; + + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/itx_packets", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.itx_packets; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.itx_packets); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); face++; + + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/itx_bytes", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.itx_bytes; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.itx_bytes); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); + face++; + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/drx_packets", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.drx_packets; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.drx_packets); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); + face++; + + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/drx_bytes", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; - vals[face].data.uint64_val = temp->face.drx_bytes; + vals[face].data.uint64_val = temp->face.drx_bytes; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.drx_packets); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); + face++; + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/dtx_packets", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.dtx_packets; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.dtx_packets); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); face++; + sr_val_build_xpath(&vals[face], "%s[faceid='%d']/dtx_bytes", "/hicn:hicn-state/faces/face", temp->face.faceid); vals[face].type = SR_UINT64_T; vals[face].data.uint64_val = temp->face.dtx_bytes; + memset(buf, 0x00, 20); + sprintf( buf, "%" PRIu64, temp->face.dtx_bytes); + lyd_new_path(*parent, NULL, vals[face].xpath, buf, 0, 0); - face++; - SRP_LOG_DBG(" **********************face is: %d-%d-%d ****************\n",temp->face.dtx_bytes,temp->face.drx_bytes,temp->face.faceid); - - printf("%" PRId64 "\n", temp->face.drx_bytes); + face++; temp=temp->next; } - SRP_LOG_DBG_MSG("Faces state updated \n"); + SRP_LOG_DBGMSG("Faces state updated \n"); return SR_ERR_OK; } -static int hicn_state_states_cb(const char *xpath, sr_val_t **values, - size_t *values_cnt, uint64_t request_id, - const char *original_xpath, void *private_ctx) { +static int hicn_state_states_cb(sr_session_ctx_t *session, const char *module_name, const char *path, const char *request_xpath, + uint32_t request_id, struct lyd_node **parent, void *private_data) { sr_val_t *vals; int rc; enum locks_name state; state=lstate; - SRP_LOG_DBG("Requesting state data for '%s'", xpath); + SRP_LOG_DBGMSG("Requesting state data"); - if (!sr_xpath_node_name_eq(xpath, "states")) { - *values = NULL; - *values_cnt = 0; - return SR_ERR_OK; - } rc = sr_new_values(NSTATE_LEAVES, &vals); if (SR_ERR_OK != rc) { return rc; } - SRP_LOG_DBG("Requesting state data for '%s'", xpath); + tlock(state); - state_update(vals); + state_update(vals,parent,session); tunlock(state); - *values = vals; - *values_cnt = NSTATE_LEAVES; return SR_ERR_OK; } -static int hicn_state_strategies_cb(const char *xpath, sr_val_t **values, - size_t *values_cnt, uint64_t request_id, - const char *original_xpath, void *private_ctx) { - sr_val_t *vals; - int rc; - enum locks_name strategies; - strategies=lstrategies; - - - - if (! sr_xpath_node_name_eq(xpath, "strategies")) { - SRP_LOG_DBG_MSG("Requesting state is not for strategies"); - *values = NULL; - *values_cnt = 0; - return SR_ERR_OK; - } - - - rc = sr_new_values(NSTRATEGIES_LEAVES, &vals); - if (SR_ERR_OK != rc) { - return rc; - } - - SRP_LOG_DBG("Requesting state data for '%s'", xpath); - tlock(strategies); - strategies_update(vals); - tunlock(strategies); - - *values = vals; - *values_cnt = NSTRATEGIES_LEAVES; - return SR_ERR_OK; - - } - - -static int hicn_state_route_cb(const char *xpath, sr_val_t **values, - size_t *values_cnt, uint64_t request_id, - const char *original_xpath, void *private_ctx) { +static int hicn_state_route_cb(sr_session_ctx_t *session, const char *module_name, const char *path, const char *request_xpath, + uint32_t request_id, struct lyd_node **parent, void *private_data) { sr_val_t *vals; int rc; enum locks_name route; route=lroute; + uint32_t NROUTE_NODES = hicn_routes->nroute * ROUTES_CHILDREN; - if (! sr_xpath_node_name_eq(xpath, "routes")) { - SRP_LOG_DBG_MSG("Requesting state is not for routes"); - *values = NULL; - *values_cnt = 0; - return SR_ERR_OK; - } - rc = sr_new_values(NROUTE_LEAVES, &vals); + rc = sr_new_values(NROUTE_NODES, &vals); if (SR_ERR_OK != rc) { return rc; } - SRP_LOG_DBG("Requesting state data for '%s'", xpath); tlock(route); - route_update(vals); + routes_update(vals,NROUTE_NODES/ROUTES_CHILDREN, parent, session); tunlock(route); - *values = vals; - *values_cnt = NROUTE_LEAVES; + return SR_ERR_OK; } - static int hicn_state_faces_cb(const char *xpath, sr_val_t **values, - size_t *values_cnt, uint64_t request_id, - const char *original_xpath, void *private_ctx) { + static int hicn_state_faces_cb(sr_session_ctx_t *session, const char *module_name, const char *path, const char *request_xpath, + uint32_t request_id, struct lyd_node **parent, void *private_data) { + + sr_val_t *vals; int rc; enum locks_name faces; faces=lfaces; uint32_t NFACES_NODES = hicn_faces->nface * FACES_CHILDREN; - if (! sr_xpath_node_name_eq(xpath, "faces")) { - SRP_LOG_DBG_MSG("Requesting state is not for faces"); - *values = NULL; - *values_cnt = 0; - return SR_ERR_OK; - } - - // We should only consider the number of leaves not the head of list(faceid) rc = sr_new_values(NFACES_NODES, &vals); if (SR_ERR_OK != rc) { return rc; } - SRP_LOG_DBG("Requesting state data for '%s'", xpath); - tlock(faces); - SRP_LOG_DBG("**********NFACES-LEAVES '%d' *********", NFACES_NODES); - faces_update(vals, NFACES_NODES/FACES_CHILDREN); + faces_update(vals, NFACES_NODES/FACES_CHILDREN, parent, session); tunlock(faces); - //hicn_faces->nface=0; - *values = vals; - *values_cnt = NFACES_NODES; - return SR_ERR_OK; - } - -/** -* @brief Callback to be called by any config change of "/hicn:/" leaf. -*/ -static int hicn_node_params_set_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; - sr_val_t *old_val = NULL; - sr_val_t *new_val = NULL; - sr_xpath_ctx_t xpath_ctx = { - 0, - }; - int rc = SR_ERR_OK, op_rc = SR_ERR_OK; - // 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; - } - - // get changes iterator - rc = sr_get_changes_iter(session, xpath, &iter); - if (SR_ERR_OK != rc) { - SRP_LOG_ERR("Unable to retrieve change iterator: %s", sr_strerror(rc)); - return rc; - } - - vapi_msg_hicn_api_node_params_set *msg; - vapi_msg_hicn_api_node_params_set_reply *resp = NULL; - msg = vapi_alloc_hicn_api_node_params_set(g_vapi_ctx_instance); - SRP_LOG_DBG("H:recv msgid [%d]\n", msg->header._vl_msg_id); \ - - // iterate over all changes - while ((SR_ERR_OK == op_rc || event == SR_EV_ABORT) && - (SR_ERR_OK == - (rc = sr_get_change_next(session, iter, &op, &old_val, &new_val)))) { - if (!strcmp(new_val->xpath, "/hicn:hicn-conf/params/enable_disable")) { - SRP_LOG_DBG("A change detected in '%s', op=%d", - new_val ? new_val->xpath : old_val->xpath, - new_val->data.bool_val); - msg->payload.enable_disable = new_val->data.bool_val; - } else if (!strcmp(new_val->xpath, "/hicn:hicn-conf/params/pit_max_size")) { - SRP_LOG_DBG("A change detected in '%s', op=%d", - new_val ? new_val->xpath : old_val->xpath, - new_val->data.int32_val); - msg->payload.pit_max_size = new_val->data.int32_val; - } else if (!strcmp(new_val->xpath, "/hicn:hicn-conf/params/cs_max_size")) { - SRP_LOG_DBG("A change detected in '%s', op=%d", - new_val ? new_val->xpath : old_val->xpath, - new_val->data.int32_val); - msg->payload.cs_max_size = new_val->data.int32_val; - } else if (!strcmp(new_val->xpath, - "/hicn:hicn-conf/params/cs_reserved_app")) { - SRP_LOG_DBG("A change detected in '%s', op=%d", - new_val ? new_val->xpath : old_val->xpath, - new_val->data.int32_val); - msg->payload.cs_reserved_app = new_val->data.int32_val; - } else if (!strcmp(new_val->xpath, - "/hicn:hicn-conf/params/pit_max_lifetime_sec")) { - SRP_LOG_DBG("A change detected in '%s', op=%d", - new_val ? new_val->xpath : old_val->xpath, - new_val->data.decimal64_val); - msg->payload.pit_max_lifetime_sec = new_val->data.decimal64_val; - } - - switch (op) { - case SR_OP_CREATED: - case SR_OP_MODIFIED: - op_rc = SR_ERR_OK; // OK - break; - case SR_OP_DELETED: - op_rc = SR_ERR_OPERATION_FAILED; // ERROR - break; - default: - break; - } - sr_xpath_recover(&xpath_ctx); - if (SR_ERR_INVAL_ARG == op_rc) { - sr_set_error(session, "You are not allowed to change the schema.", - new_val ? new_val->xpath : old_val->xpath); - } - sr_free_val(old_val); - sr_free_val(new_val); - } - - vapi_msg_hicn_api_node_params_set_hton(msg); - - params_send(msg, resp); - - vapi_msg_hicn_api_node_params_set_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - sr_free_change_iter(iter); - return SR_ERR_OK; - } - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; -} - -/** -* @brief API to get hicn param in vpp. -*/ -static int hicn_node_params_get_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { - - SRP_LOG_DBG_MSG("hicn node parameter received successfully"); - vapi_msg_hicn_api_node_params_get *msg; - vapi_msg_hicn_api_node_params_get_reply *resp; - - msg = vapi_alloc_hicn_api_node_params_get(g_vapi_ctx_instance); - - - - - vapi_msg_hicn_api_node_params_get_hton(msg); - params_send(msg, resp); - vapi_msg_hicn_api_node_params_get_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; -} - -/** -* @brief API to get hicn stat in vpp. -*/ -static int hicn_node_stat_get_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { - - SRP_LOG_DBG_MSG("hicn status received successfully"); - vapi_msg_hicn_api_node_stats_get *msg; - vapi_msg_hicn_api_node_stats_get_reply *resp; - enum locks_name state; - state=lstate; - msg = vapi_alloc_hicn_api_node_stats_get(g_vapi_ctx_instance); - - vapi_msg_hicn_api_node_stats_get_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_node_stats_get_reply_ntoh(resp); - - if(resp->payload.retval){ - SRP_LOG_DBG_MSG("Error updating state"); - return SR_ERR_OPERATION_FAILED; - } - tlock(state); - - state_cache(resp); - - tunlock(state); return SR_ERR_OK; -} - -/** -* @brief API to get hicn strategy in vpp. -*/ -static int hicn_strategy_get_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { - - SRP_LOG_DBG_MSG("hicn strategy receive successfully"); - vapi_msg_hicn_api_strategy_get *msg; - vapi_msg_hicn_api_strategy_get_reply *resp; - - msg = vapi_alloc_hicn_api_strategy_get(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); - - msg->payload.strategy_id = input[0].data.uint32_val; - - vapi_msg_hicn_api_strategy_get_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_strategy_get_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; } - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; -} - /** * @brief API to get hicn strategies in vpp. */ -static int hicn_strategies_get_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { - - SRP_LOG_DBG_MSG("hicn strategies received successfully"); - vapi_msg_hicn_api_strategies_get *msg; - vapi_msg_hicn_api_strategies_get_reply *resp; - - msg = vapi_alloc_hicn_api_strategies_get(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); +static int hicn_strategies_get_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { +SRP_LOG_DBGMSG("hicn strategies received successfully"); +vapi_msg_hicn_api_strategies_get *msg; - vapi_msg_hicn_api_strategies_get_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_strategies_get_reply_ntoh(resp); +msg = vapi_alloc_hicn_api_strategies_get(g_vapi_ctx_instance); - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; +if (vapi_hicn_api_strategies_get(g_vapi_ctx_instance, msg, call_hicn_api_strategies_get, NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); + return SR_ERR_OPERATION_FAILED; } +return SR_ERR_OK; -/** -* @brief API to get hicn route in vpp. -*/ -static int hicn_route_get_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { - - SRP_LOG_DBG_MSG("hicn route receive successfully"); - vapi_msg_hicn_api_route_get *msg; - vapi_msg_hicn_api_route_get_reply *resp; - - msg = vapi_alloc_hicn_api_route_get(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); - - - if(strcmp(input[0].data.string_val,"-1")){ - - struct sockaddr_in sa; - inet_pton(AF_INET, input[0].data.string_val, &(sa.sin_addr)); - unsigned char * tmp = (unsigned char *) &sa.sin_addr.s_addr; - memcpy(&msg->payload.prefix.address.un.ip4[0],tmp,B32); - msg->payload.prefix.address.af = ADDRESS_IP4; - - }else if(strcmp(input[1].data.string_val,"-1")){ - - void *dst = malloc(sizeof(struct in6_addr)); - inet_pton(AF_INET6, input[1].data.string_val, dst); - unsigned char * tmp = (unsigned char *) ((struct in6_addr *)dst)->s6_addr; - memcpy(&msg->payload.prefix.address.un.ip6[0],tmp,B128); - msg->payload.prefix.address.af = ADDRESS_IP6; - - }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); - return SR_ERR_OPERATION_FAILED; - } - - - - msg->payload.prefix.len = input[2].data.uint8_val; - - vapi_msg_hicn_api_route_get_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_route_get_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; } /** * @brief API to add hicn route nhops in vpp. */ -static int hicn_route_nhops_add_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_route_nhops_add_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn route nhops add received successfully"); + SRP_LOG_DBGMSG("hicn route nhops add received successfully"); vapi_msg_hicn_api_route_nhops_add *msg; - vapi_msg_hicn_api_route_nhops_add_reply *resp; msg = vapi_alloc_hicn_api_route_nhops_add(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); if(strcmp(input[0].data.string_val,"-1")){ @@ -727,7 +708,7 @@ static int hicn_route_nhops_add_cb(const char *xpath, const sr_val_t *input, msg->payload.prefix.address.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } @@ -741,29 +722,22 @@ static int hicn_route_nhops_add_cb(const char *xpath, const sr_val_t *input, msg->payload.face_ids[6] = input[9].data.uint32_val; msg->payload.n_faces = input[10].data.uint8_val; - vapi_msg_hicn_api_route_nhops_add_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_route_nhops_add_reply_ntoh(resp); - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - SRP_LOG_DBG_MSG("Operation failed"); +if(vapi_hicn_api_route_nhops_add(g_vapi_ctx_instance,msg,call_hicn_api_route_nhops_add,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); return SR_ERR_OPERATION_FAILED; } +return SR_ERR_OK; +} /** * @brief API to del hicn route in vpp. */ -static int hicn_route_del_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_route_del_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn route del received successfully"); + SRP_LOG_DBGMSG("hicn route del received successfully"); vapi_msg_hicn_api_route_del *msg; - vapi_msg_hicn_api_route_del_reply *resp; msg = vapi_alloc_hicn_api_route_del(g_vapi_ctx_instance); @@ -785,72 +759,54 @@ static int hicn_route_del_cb(const char *xpath, const sr_val_t *input, msg->payload.prefix.address.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } msg->payload.prefix.len = input[2].data.uint8_val; - vapi_msg_hicn_api_route_del_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_route_del_reply_ntoh(resp); - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - SRP_LOG_DBG_MSG("Operation failed"); +if(vapi_hicn_api_route_del(g_vapi_ctx_instance,msg,call_hicn_api_route_del,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); return SR_ERR_OPERATION_FAILED; } +return SR_ERR_OK; +} /** * @brief API to get face ip params in hicn in vpp. */ -static int hicn_face_ip_params_get_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_face_ip_params_get_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn face ip params get received successfully"); + SRP_LOG_DBGMSG("hicn face ip params get received successfully"); vapi_msg_hicn_api_face_ip_params_get *msg; - vapi_msg_hicn_api_face_ip_params_get_reply *resp; msg = vapi_alloc_hicn_api_face_ip_params_get(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); msg->payload.faceid = input[0].data.uint32_val; - vapi_msg_hicn_api_face_ip_params_get_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_face_ip_params_get_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG("faceid(%d)-->intfc(%d)",input[0].data.uint32_val, resp->payload.swif); - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - SRP_LOG_DBG_MSG("Operation failed"); +if (vapi_hicn_api_face_ip_params_get(g_vapi_ctx_instance,msg,call_hicn_api_face_ip_params_get,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); return SR_ERR_OPERATION_FAILED; - +} +return SR_ERR_OK; } /** * @brief API to get face ip params in hicn in vpp. */ -static int hicn_punting_add_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_punting_add_ip_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn punting add received successfully"); + SRP_LOG_DBGMSG("hicn punting add received successfully"); // allocate memory msg and resp vapi_msg_hicn_api_punting_add *msg; - vapi_msg_hicn_api_punting_add_reply *resp; msg = vapi_alloc_hicn_api_punting_add(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); + msg->payload.type=IP_PUNT; if(strcmp(input[0].data.string_val,"-1")){ @@ -858,8 +814,8 @@ static int hicn_punting_add_cb(const char *xpath, const sr_val_t *input, // store this IP address in sa: inet_pton(AF_INET, input[0].data.string_val, &(sa.sin_addr)); unsigned char * tmp = (unsigned char *) &sa.sin_addr.s_addr; - memcpy(&msg->payload.prefix.address.un.ip4[0],tmp,B32); - msg->payload.prefix.address.af = ADDRESS_IP4; + memcpy(&msg->payload.rule.ip.prefix.address.un.ip4[0],tmp,B32); + msg->payload.rule.ip.prefix.address.af = ADDRESS_IP4; }else if(strcmp(input[1].data.string_val,"-1")){ @@ -867,45 +823,36 @@ static int hicn_punting_add_cb(const char *xpath, const sr_val_t *input, void *dst = malloc(sizeof(struct in6_addr)); inet_pton(AF_INET6, input[1].data.string_val, dst); unsigned char * tmp =(unsigned char *) ((struct in6_addr *)dst)->s6_addr; - memcpy(&msg->payload.prefix.address.un.ip6[0],tmp,B128); - msg->payload.prefix.address.af = ADDRESS_IP6; + memcpy(&msg->payload.rule.ip.prefix.address.un.ip6[0],tmp,B128); + msg->payload.rule.ip.prefix.address.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } - msg->payload.prefix.len = input[2].data.uint8_val; - msg->payload.swif = input[3].data.uint32_val; - + msg->payload.rule.ip.prefix.len = input[2].data.uint8_val; + msg->payload.rule.ip.swif = input[3].data.uint32_val; - vapi_msg_hicn_api_punting_add_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_punting_add_reply_ntoh(resp); - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - SRP_LOG_DBG_MSG("Operation failed"); +if (vapi_hicn_api_punting_add(g_vapi_ctx_instance, msg, call_hicn_api_punting_add, NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); return SR_ERR_OPERATION_FAILED; } +return SR_ERR_OK; +} /** * @brief API to del hicn route nhops in vpp. */ -static int hicn_route_nhops_del_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_route_nhops_del_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn route nhop del received successfully"); - // allocate memory msg and resp + SRP_LOG_DBGMSG("hicn route nhop del received successfully"); + // allocate memory msg vapi_msg_hicn_api_route_nhop_del *msg; - vapi_msg_hicn_api_route_nhop_del_reply *resp; msg = vapi_alloc_hicn_api_route_nhop_del(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); if(strcmp(input[0].data.string_val,"-1")){ @@ -927,7 +874,7 @@ static int hicn_route_nhops_del_cb(const char *xpath, const sr_val_t *input, msg->payload.prefix.address.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } @@ -935,43 +882,35 @@ static int hicn_route_nhops_del_cb(const char *xpath, const sr_val_t *input, msg->payload.prefix.len = input[2].data.uint8_val; msg->payload.faceid = input[3].data.uint32_val; - vapi_msg_hicn_api_route_nhop_del_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_route_nhop_del_reply_ntoh(resp); - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - - - SRP_LOG_DBG_MSG("Operation failed"); +if (vapi_hicn_api_route_nhop_del(g_vapi_ctx_instance, msg, call_hicn_api_route_nhop_del,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); return SR_ERR_OPERATION_FAILED; } +return SR_ERR_OK; +} /** * @brief API to del hicn punting in vpp. */ -static int hicn_punting_del_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_punting_del_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn punting del received successfully"); - // allocate memory msg and resp + SRP_LOG_DBGMSG("hicn punting del received successfully"); + // allocate memory msg vapi_msg_hicn_api_punting_del *msg; - vapi_msg_hicn_api_punting_del_reply *resp; msg = vapi_alloc_hicn_api_punting_del(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); + msg->payload.type=IP_PUNT; if(strcmp(input[0].data.string_val,"-1")){ struct sockaddr_in sa; inet_pton(AF_INET, input[0].data.string_val, &(sa.sin_addr)); unsigned char * tmp = (unsigned char *) &sa.sin_addr.s_addr; - memcpy(&msg->payload.prefix.address.un.ip4[0],tmp,B32); - msg->payload.prefix.address.af = ADDRESS_IP4; + memcpy(&msg->payload.rule.ip.prefix.address.un.ip4[0],tmp,B32); + msg->payload.rule.ip.prefix.address.af = ADDRESS_IP4; }else if(strcmp(input[1].data.string_val,"-1")){ @@ -979,76 +918,60 @@ static int hicn_punting_del_cb(const char *xpath, const sr_val_t *input, void *dst = malloc(sizeof(struct in6_addr)); inet_pton(AF_INET6, input[1].data.string_val, dst); unsigned char * tmp = (unsigned char *) ((struct in6_addr *)dst)->s6_addr; - memcpy(&msg->payload.prefix.address.un.ip6[0],tmp,B128); - msg->payload.prefix.address.af = ADDRESS_IP6; + memcpy(&msg->payload.rule.ip.prefix.address.un.ip6[0],tmp,B128); + msg->payload.rule.ip.prefix.address.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } - msg->payload.prefix.len = input[2].data.uint8_val; - msg->payload.swif = input[3].data.uint32_val; + msg->payload.rule.ip.prefix.len = input[2].data.uint8_val; + msg->payload.rule.ip.swif = input[3].data.uint32_val; - vapi_msg_hicn_api_punting_del_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_punting_del_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } +if (vapi_hicn_api_punting_del(g_vapi_ctx_instance, msg, call_hicn_api_punting_del,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); + return SR_ERR_OPERATION_FAILED; +} +return SR_ERR_OK; - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; } /** * @brief API to del hicn face ip in vpp. */ -static int hicn_face_ip_del_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_face_ip_del_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn face ip del received successfully"); - // allocate memory msg and resp + SRP_LOG_DBGMSG("hicn face ip del received successfully"); + // allocate memory msg vapi_msg_hicn_api_face_ip_del *msg; - vapi_msg_hicn_api_face_ip_del_reply *resp; msg = vapi_alloc_hicn_api_face_ip_del(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); msg->payload.faceid = input[0].data.uint32_val; - vapi_msg_hicn_api_face_ip_del_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_face_ip_del_reply_ntoh(resp); - - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } - SRP_LOG_DBG_MSG("Operation failed"); +if(vapi_hicn_api_face_ip_del(g_vapi_ctx_instance,msg, call_hicn_api_face_ip_del,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); return SR_ERR_OPERATION_FAILED; } +return SR_ERR_OK; +} /** * @brief API to del hicn face ip in vpp. */ -static int hicn_face_ip_add_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { +static int hicn_face_ip_add_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, + sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) { - SRP_LOG_DBG_MSG("hicn face ip add received successfully"); + SRP_LOG_DBGMSG("hicn face ip add received successfully"); vapi_msg_hicn_api_face_ip_add *msg; - vapi_msg_hicn_api_face_ip_add_reply *resp; msg = vapi_alloc_hicn_api_face_ip_add(g_vapi_ctx_instance); - SRP_LOG_DBG("msg id:%d",msg->header._vl_msg_id); if(strcmp(input[0].data.string_val,"-1")){ struct sockaddr_in sa; inet_pton(AF_INET, input[0].data.string_val, &(sa.sin_addr)); @@ -1065,7 +988,7 @@ static int hicn_face_ip_add_cb(const char *xpath, const sr_val_t *input, msg->payload.face.local_addr.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } @@ -1087,27 +1010,57 @@ static int hicn_face_ip_add_cb(const char *xpath, const sr_val_t *input, msg->payload.face.remote_addr.af = ADDRESS_IP6; }else{ - SRP_LOG_DBG_MSG("Invalid local IP address"); + SRP_LOG_DBGMSG("Invalid local IP address"); return SR_ERR_OPERATION_FAILED; } - msg->payload.swif = input[4].data.uint32_val; // This is the idx number of interface + msg->payload.face.swif = input[4].data.uint32_val; // This is the idx number of interface - vapi_msg_hicn_api_face_ip_add_hton(msg); - params_send(msg,resp); - vapi_msg_hicn_api_face_ip_add_reply_ntoh(resp); +if(vapi_hicn_api_face_ip_add(g_vapi_ctx_instance,msg,call_hicn_api_face_ip_add,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG("Operation failed"); + return SR_ERR_OPERATION_FAILED; +} +return SR_ERR_OK; +} - if(!resp->payload.retval){ - SRP_LOG_DBG_MSG("Successfully done"); - return SR_ERR_OK; - } + vapi_error_e +hicn_api_routes_dump_cb(struct vapi_ctx_s *ctx, void *callback_ctx, + vapi_error_e rv, bool is_last, + vapi_payload_hicn_api_routes_details *reply) +{ + + static int counter = 0; + + tlock(lroute); + if (reply!=NULL){ + rcurrent->route.route_id = counter; + rcurrent->route.prefix = reply->prefix; + rcurrent->route.nfaces = reply->nfaces; + rcurrent->route.strategy_id = reply->strategy_id; + for(int cnt=0;cntroute.nfaces;cnt++) + rcurrent->route.faceids[cnt] = rcurrent->route.faceids[cnt]; + + counter++; + rcurrent = rcurrent->next; + + SRP_LOG_DBG("nfaces %d", reply->nfaces); + SRP_LOG_DBG("strategy_id %d", reply->strategy_id); + + }else + { + SRP_LOG_DBGMSG("---------Routes------- \n"); + hicn_routes->nroute=counter; + counter=0; + rcurrent=hicn_routes->next; + } + tunlock(lroute); + return SR_ERR_OK; - SRP_LOG_DBG_MSG("Operation failed"); - return SR_ERR_OPERATION_FAILED; } + static vapi_error_e hicn_api_face_stats_dump_cb(struct vapi_ctx_s *ctx, void *callback_ctx, vapi_error_e rv, bool is_last, @@ -1115,68 +1068,37 @@ hicn_api_face_stats_dump_cb(struct vapi_ctx_s *ctx, void *callback_ctx, { static int counter = 0; -/* - UNUSED(ctx); UNUSED(rv); UNUSED(is_last); - //struct elt **stackp; - ARG_CHECK2(VAPI_EINVAL, callback_ctx, reply); - stackp = (struct elt**) callback_ctx; - SRP_LOG_DBG("reply: %d:%d:%d", reply->faceid,reply->dtx_packets,reply->irx_packets); - - vapi_payload_hicn_api_face_stats_details *passed; - ARG_CHECK2(VAPI_EINVAL, callback_ctx, reply); - passed = (vapi_payload_hicn_api_face_stats_details *) callback_ctx; - *passed = *reply; - SRP_LOG_DBG("reply %d", reply->faceid);*/ tlock(lfaces); if (reply!=NULL){ - current->face.faceid = reply->faceid; - current->face.intfc = 1; - current->face.irx_packets = reply->irx_packets; - current->face.irx_bytes = reply->irx_bytes; - current->face.itx_packets = reply->itx_packets; - current->face.itx_bytes = reply->itx_bytes; - current->face.drx_packets = reply->drx_packets; - current->face.drx_bytes = reply->drx_bytes; - current->face.dtx_packets = reply->dtx_packets; - current->face.dtx_bytes = reply->dtx_bytes; - //hicn_faces->nface++; // Increment the number of faces + fcurrent->face.faceid = reply->faceid; + fcurrent->face.intfc = 1; + fcurrent->face.irx_packets = reply->irx_packets; + fcurrent->face.irx_bytes = reply->irx_bytes; + fcurrent->face.itx_packets = reply->itx_packets; + fcurrent->face.itx_bytes = reply->itx_bytes; + fcurrent->face.drx_packets = reply->drx_packets; + fcurrent->face.drx_bytes = reply->drx_bytes; + fcurrent->face.dtx_packets = reply->dtx_packets; + fcurrent->face.dtx_bytes = reply->dtx_bytes; counter++; - current = current->next; - //current->next = memalign(MEM_ALIGN, sizeof(hicn_faces_t)); - SRP_LOG_DBG_MSG("---------Face------- \n"); - SRP_LOG_DBG("reply %d", reply->faceid); - SRP_LOG_DBG("reply %d", reply->drx_bytes); - SRP_LOG_DBG("reply %d", reply->dtx_bytes); + fcurrent = fcurrent->next; + SRP_LOG_DBG("faceid %d", reply->faceid); + SRP_LOG_DBG("drxB %d", reply->drx_bytes); + SRP_LOG_DBG("dtxB %d", reply->dtx_bytes); }else { + SRP_LOG_DBGMSG("---------Faces------- \n"); hicn_faces->nface=counter; counter=0; - current=hicn_faces->next; + fcurrent=hicn_faces->next; } tunlock(lfaces); return SR_ERR_OK; } -/** -* @brief API to del hicn face state details in vpp. -*/ - -static int hicn_face_stats_details_cb(const char *xpath, const sr_val_t *input, - const size_t input_cnt, sr_val_t **output, - size_t *output_cnt, void *private_ctx) { - //struct elt* stack=NULL ; - SRP_LOG_DBG_MSG("hicn face state details received successfully"); - vapi_payload_hicn_api_face_stats_details resp={0}; - vapi_msg_hicn_api_face_stats_dump *msg; - msg = vapi_alloc_hicn_api_face_stats_dump(g_vapi_ctx_instance); - vapi_hicn_api_face_stats_dump(g_vapi_ctx_instance, msg, hicn_api_face_stats_dump_cb, &resp); - return SR_ERR_OK; -} - - /** * @brief Thread to update the state */ @@ -1191,46 +1113,42 @@ static void *state_thread(void *arg) { // pin the thread to a core if (pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset)) { - SRP_LOG_DBG_MSG("Thread pining failed\n"); + SRP_LOG_DBGMSG("Thread pining failed\n"); exit(1); } vapi_msg_hicn_api_node_stats_get *msg=NULL; - vapi_msg_hicn_api_node_stats_get_reply *resp=NULL; enum locks_name state; state=lstate; while(true){ + // dump faces + vapi_msg_hicn_api_face_stats_dump *fmsg; + fmsg = vapi_alloc_hicn_api_face_stats_dump(g_vapi_ctx_instance); + vapi_hicn_api_face_stats_dump(g_vapi_ctx_instance, fmsg, hicn_api_face_stats_dump_cb, fcurrent); + + // dump routes + vapi_msg_hicn_api_routes_dump *rmsg; + rmsg = vapi_alloc_hicn_api_routes_dump(g_vapi_ctx_instance); + vapi_hicn_api_routes_dump(g_vapi_ctx_instance, rmsg, hicn_api_routes_dump_cb, rcurrent); + + + msg = vapi_alloc_hicn_api_node_stats_get(g_vapi_ctx_instance); - vapi_msg_hicn_api_node_stats_get_hton(msg); - if (VAPI_OK != vapi_send(g_vapi_ctx_instance, msg)) { - SRP_LOG_DBG_MSG("Sending msg to VPP failed"); - // Here I should think about a recovery method - return NULL; - } - HICN_VPP_VAPI_RECV; + tlock(state); - vapi_msg_hicn_api_node_stats_get_reply_ntoh(resp); + if(vapi_hicn_api_node_stats_get(g_vapi_ctx_instance,msg,call_vapi_hicn_api_node_stats_get,NULL)!=VAPI_OK){ + SRP_LOG_DBGMSG(" State operation failed"); + } - if(resp->payload.retval){ - SRP_LOG_DBG_MSG("Error updating state"); - // Here I should think about a recovery method - return NULL; - } - //vapi_payload_hicn_api_face_stats_details resp_dump={0}; - vapi_msg_hicn_api_face_stats_dump *msg; - msg = vapi_alloc_hicn_api_face_stats_dump(g_vapi_ctx_instance); - vapi_hicn_api_face_stats_dump(g_vapi_ctx_instance, msg, hicn_api_face_stats_dump_cb, current); + tunlock(state); + sleep(1); - tlock(state); - state_cache(resp); - SRP_LOG_DBG_MSG("state updated"); - tunlock(state); - sleep(1); + SRP_LOG_DBGMSG("state cached"); } return NULL; @@ -1242,15 +1160,16 @@ static void *state_thread(void *arg) { int hicn_subscribe_events(sr_session_ctx_t *session, sr_subscription_ctx_t **subscription) { int rc = SR_ERR_OK; - SRP_LOG_DBG_MSG("Subscriging hicn."); + SRP_LOG_DBGMSG("Subscriging hicn."); + // Create state thread observation pthread_t state_tid; rc = pthread_create((pthread_t *)&state_tid, NULL, state_thread, NULL); if (rc != 0) { - SRP_LOG_DBG_MSG("Error making hicn state thread"); + SRP_LOG_DBGMSG("Error making hicn state thread"); return SR_ERR_OPERATION_FAILED; } - SRP_LOG_DBG_MSG("State thread created successfully."); + SRP_LOG_DBGMSG("State thread created successfully."); //Initializing the locks for (int i=0; i