index 63b4ea78ae5d3ae85fbc010881d68e8ac760f740..d9ee3193a163d8e38ff715ff9b8f1a77ea535625 100755 (executable)
**************************************************************
* @file netapi_sec.c
*
- * @brief DESCRIPTION: netapi security cfg file for user space transport
+ * @brief DESCRIPTION: netapi security cfg file for user space transport
* library
*
- * REVISION HISTORY: rev 0.0.1
+ * REVISION HISTORY:
*
- * Copyright (c) Texas Instruments Incorporated 2010-2011
+ * Copyright (c) Texas Instruments Incorporated 2013
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/
-//#define NWAL_ENABLE_SA
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "netapi.h"
-#include "netapi_loc.h"
+#include "netapi_sec.h"
/********************************************************************
* FUNCTION PURPOSE: API to add an IPSEC SA
********************************************************************
* DESCRIPTION: API to add an IPSEC SA
********************************************************************/
-NETCP_CFG_SA_T netapi_secAddSA(NETAPI_T h, //the netapi handle
- int iface_no, //inteface to attach to
- NETAPI_SEC_SA_INFO_T *sa_info ,//info on the SA
- nwalSecKeyParams_t * key_params, //keys,etc
- int inflow_mode, //SA implementation mode: inflow or sideband or both
- NETCP_CFG_ROUTE_HANDLE_T route, //Optional route
- void **p_data_mode_handle,
- void **p_inflow_mode_handle,
- int * perr)
+NETCP_CFG_SA_T netapi_secAddSA(NETAPI_T h,
+ int iface_no,
+ NETAPI_SEC_SA_INFO_T *sa_info,
+ nwalSecKeyParams_t * key_params,
+ int inflow_mode,
+ NETCP_CFG_ROUTE_HANDLE_T route,
+ void **p_data_mode_handle,
+ void **p_inflow_mode_handle,
+ void * p_user_data,
+ int * perr)
{
NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
nwal_RetValue retValue;
int tunnelId;
nwalSaIpSecId_t saInfo;
int have_to_wait=1;
+ nwalTxDmPSCmdInfo_t dmPSCmdInfo;
+ nwalSaIpSecId_t nwalSaIpSecId;
+ uint32_t swInfo0;
+ uint32_t swInfo1;
+
nwalCreateSAParams_t createParam =
{
/* mac handle */
NULL, //to be filled in
4,
-
- /*nwalSaIpSecParam_t */
- {
+ /*nwalSaIpSecParam_t */
+ {
0,/* validParams */
nwal_SA_MODE_TUNNEL, //update from input
- 64,/* replayWindow */
+ 64,/* replayWindow */\
NWAL_SA_DIR_INBOUND,
0,
0,
- NWAL_SA_AALG_HMAC_SHA1, /* update from input */
- NWAL_SA_EALG_AES_CTR, /* update from input */
+ NWAL_SA_AALG_HMAC_SHA1,/* update from input */
+ NWAL_SA_EALG_AES_CTR, /* update from input */
{ 0x00}, /* remMacAddr: NA */
- 12, /* update from input, mac size */
- NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE, /* Continue parsing to next route for match */
- NWAL_NEXT_ROUTE_FAIL_ACTION_HOST, /* For next route fail action by default is route to host */
- CPPI_PARAM_NOT_SPECIFIED, /* Use default flow configured to NWAL if packet is routed to host */
- QMSS_PARAM_NOT_SPECIFIED /* Use default queue configured to NWAL if packet is routed to host */
- },
- /* nwalSaIpSecKeyParams_t */
- {0}
+ 12, /* update from input, mac size */
+ NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE,/* Continue parsing to next route for match */
+ NWAL_NEXT_ROUTE_FAIL_ACTION_HOST,/* For next route fail action by default is route to host */
+ CPPI_PARAM_NOT_SPECIFIED, /* Use default flow configured to NWAL if packet is routed to host */
+ QMSS_PARAM_NOT_SPECIFIED /* Use default queue configured to NWAL if packet is routed to host */
+ },
+ /* nwalSaIpSecKeyParams_t */
+ {0}
};
- void * mac_handle = netcp_cfgp_get_mac_handle(&netapi_get_global()->nwal_context,iface_no);
- int coreid = Osal_nwalGetProcId();
- *perr =0;
- if ((!n) || (!sa_info) || (!p_data_mode_handle) ) {*perr = NETAPI_ERR_BAD_INPUT; return -1;}
- //reserve a slot
- tunnelId = netcp_cfgp_find_sa_slot(&netapi_get_global()->nwal_context,
+
+ void * mac_handle = netapip_netcpCfgGetMacHandle(&netapi_get_global()->nwal_context,iface_no);
+ *perr =NETAPI_ERR_OK;
+ if ((!n) || (!sa_info) || (!p_data_mode_handle))
+ {
+ *perr = NETAPI_ERR_BAD_INPUT;
+ return -1;
+ }
+
+ /* reserve a slot */
+ tunnelId = netapip_netcpCfgFindSaSlot(&netapi_get_global()->nwal_context,
iface_no);
- printf("coreid: %d, netapi_secAddSA called for tunnelId %d\n", coreid, tunnelId);
- if (tunnelId <0) {*perr= NETAPI_ERR_NOMEM; return -1; }
- appId |= (tunnelId<<8);
+ if (tunnelId <0)
+ {
+ *perr= NETAPI_ERR_NOMEM;
+ return -1;
+ }
+ appId |= (tunnelId << NETAPI_NETCP_MATCH_ID_SHIFT);
+ netapi_Log("netapi_secAddSA: app id: 0x%x\n", appId);
*p_data_mode_handle= NULL;
- *p_inflow_mode_handle= NULL;
+ *p_inflow_mode_handle= NULL;
+
+
if (inflow_mode & NETAPI_SEC_SA_INFLOW)
{
- pTransInfo = netapip_GetFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
+ pTransInfo = netapip_getFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
if (!pTransInfo)
{
*perr = NETAPI_ERR_BUSY;
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context,tunnelId);
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
return -1;
}
pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_SA;
saInfo.proto = sa_info->proto;
createParam.macHandle = mac_handle;
createParam.ipType = sa_info->ipType;
- //memcpy(&createParam.saIpSecParam.src,&sa_info->src, sizeof(nwalIpAddr_t));
createParam.saIpSecParam.dir = sa_info->dir;
createParam.saIpSecParam.saMode = sa_info->saMode;
createParam.saIpSecParam.replayWindow = sa_info->replayWindow;
createParam.saIpSecParam.esnHi = sa_info->esnHi;
if ((sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) ||
(sa_info->cipherMode == NWAL_SA_EALG_AES_CCM) ||
- (sa_info->authMode == NWAL_SA_AALG_GMAC))
+ (sa_info->authMode == NWAL_SA_AALG_GMAC) ||
+ (sa_info->authMode == NWAL_SA_AALG_HMAC_SHA2_256_RFC4868))
{
createParam.saIpSecParam.macSize = 16;
}
if (route != NULL)
{
- netcp_cfgp_build_route(route,&createParam.saIpSecParam.appRxPktFlowId,
+ netapip_netcpCfgBuildRoute(route,&createParam.saIpSecParam.appRxPktFlowId,
&createParam.saIpSecParam.appRxPktQueue);
}
- //fire off config message
+ /* fire off config message */
retValue = nwal_setSecAssoc (((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
trans_id,
(nwal_AppId) appId,
else if(retValue != nwal_OK)
{
*perr = NETAPI_ERR_NWAL_ERR0;
- printf ("coreid: %d, netapi_secAddSA: ERROR: nwal_setSecAssoc returned Error Code %d\n",
- coreid, retValue);
- netapip_FreeTransInfo(pTransInfo);
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context,tunnelId);
+ netapip_freeTransInfo(pTransInfo);
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
return -1;
}
- //wait here until its done since scheduler isn't running yet most likely..
- // todo: make this handled by scheduler poll later ??
if((trans_id != NWAL_TRANSID_SPIN_WAIT)&&(have_to_wait))
{
n->nwal_local.numPendingCfg++;
while ((pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
(pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
{
- // if response is there, then this poll squirts out in the CTl poll callback,
- // which handles the rest (including decrmenting #pending!!
nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
}
if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_IDLE;
pTransInfo->inUse = nwal_FALSE;
*perr = NETAPI_ERR_PA_FW;
- printf (">netapi_sec - ERROR returned by NETCP PA firmware %d\n",
+ netapi_Log ("netapi_sec - ERROR returned by NETCP PA firmware %d\n",
*perr);
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context,tunnelId);
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
return -1;
}
}
- printf ("coreid: %d, netapi_secAddSA: SA %d added to mac %d\n", coreid, tunnelId, iface_no);
*p_inflow_mode_handle=pTransInfo->handle;
- netapip_FreeTransInfo(pTransInfo);
+ netapip_freeTransInfo(pTransInfo);
+
+ if (sa_info->dir == NWAL_SA_DIR_OUTBOUND)
+ {
+ memset(&nwalSaIpSecId, 0, sizeof(nwalSaIpSecId_t));
+ nwalSaIpSecId.spi = sa_info->spi;
+ memcpy(&(nwalSaIpSecId.src), &sa_info->src,sizeof( nwalIpAddr_t));
+ memcpy(&(nwalSaIpSecId.dst), &sa_info->dst,sizeof( nwalIpAddr_t));
+ nwalSaIpSecId.proto = sa_info->proto;
+ if (nwal_getSecAssoc(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+ &nwalSaIpSecId,
+ NWAL_SA_DIR_OUTBOUND,
+ p_inflow_mode_handle,
+ &swInfo0,
+ &swInfo1) == nwal_TRUE)
+ {
+ //netapi_Log("netapisecAddSA swInfo0: 0x%x, swInfo1: 0x%x\n", swInfo0, swInfo1);
+ }
+ else
+ netapi_Log("netapisecAddSA: call to nwal_getSecAssoc() returned error\n");
+ }
}
- //sideband mode
+ /* sideband mode */
if (inflow_mode &NETAPI_SEC_SA_SIDEBAND)
{
nwalCreateDmSAParams_t dmSaParam;
void * dm_handle;
memset(&dmSaParam,0,sizeof(nwalCreateDmSAParams_t));
dmSaParam.dmSaParam.dmChnType= (sa_info->dir==NWAL_SA_DIR_INBOUND)? NWAL_DM_CHAN_DECRYPT: NWAL_DM_CHAN_ENCRYPT; /**direction*/
- dmSaParam.dmSaParam.replayWindow=sa_info->replayWindow; /**< Replay Window Size */
- dmSaParam.dmSaParam.authMode=sa_info->authMode; /**< Authentication Algorithm */
- dmSaParam.dmSaParam.cipherMode=sa_info->cipherMode ; /**< Encryption Algorithm */
- dmSaParam.dmSaParam.macSize=12; /**todo: pass in or deduce */
- dmSaParam.dmSaParam.aadSize=0; /**todo: pass in or deduce */
+ dmSaParam.dmSaParam.replayWindow=sa_info->replayWindow;
+ dmSaParam.dmSaParam.authMode=sa_info->authMode;
+ dmSaParam.dmSaParam.cipherMode=sa_info->cipherMode;
+ dmSaParam.dmSaParam.macSize=12;
+ dmSaParam.dmSaParam.aadSize=0;
dmSaParam.dmSaParam.enc1st = (sa_info->dir ==NWAL_SA_DIR_OUTBOUND) ? nwal_TRUE : nwal_FALSE; //encypt 1st for outbound
if ((sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) ||
(sa_info->cipherMode == NWAL_SA_EALG_AES_CCM) ||
}
else
{
- dmSaParam.dmSaParam.macSize=12; /**todo: pass in or deduce */
- dmSaParam.dmSaParam.aadSize=0; /**todo: pass in or deduce */
+ dmSaParam.dmSaParam.macSize=12;
+ dmSaParam.dmSaParam.aadSize=0;
}
if (sa_info->authMode == NWAL_SA_AALG_NULL)
{
dmSaParam.dmSaParam.enc1st = nwal_TRUE;
}
- //todo; allow app q for Sideband return
+ /* todo; allow app q for Sideband return */
memcpy(&dmSaParam.keyParam,key_params,sizeof(nwalSecKeyParams_t));
retValue = nwal_setDMSecAssoc(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
(nwal_AppId)appId,
if(retValue != nwal_OK)
{
*perr = NETAPI_ERR_NWAL_ERR0;
- printf (">netapi_sec - ERROR: nwal_setDMSecAssoc returned Error Code %d\n",
+ netapi_Log ("netapi_secAddSA: nwal_setDMSecAssoc() returned Error Code %d\n",
retValue);
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context,tunnelId);
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
return -1;
}
- printf("netapi_secAddSA: Creating sideband mode SA for %d ( mac %d)\n", tunnelId, iface_no);
+
+ //netapi_Log("netapi_secAddSA: Creating sideband mode SA for %d ( mac %d)\n", tunnelId, iface_no);
*p_data_mode_handle = dm_handle;
+ memset(&dmPSCmdInfo, 0, sizeof(nwalTxDmPSCmdInfo_t));
+ retValue = nwal_initDMPSCmdInfo(netapip_returnNwalInstanceHandle(h),
+ *p_data_mode_handle,
+ &dmPSCmdInfo);
}
- netcp_cfgp_insert_sa(&netapi_get_global()->nwal_context,
- tunnelId,
- (sa_info->dir == NWAL_SA_DIR_INBOUND) ? TRUE: FALSE,
+ netapip_netcpCfgInsertSa(&netapi_get_global()->nwal_context,
+ tunnelId,
+ (sa_info->dir == NWAL_SA_DIR_INBOUND) ? TRUE: FALSE,
inflow_mode,
&saInfo, &createParam,
*p_inflow_mode_handle,
- *p_data_mode_handle);
+ *p_data_mode_handle,
+ &dmPSCmdInfo,
+ swInfo0,
+ swInfo1,
+ p_user_data);
return (appId);
}
* DESCRIPTION: Internal function to dynamically switch between inflow
* and sideband mode
********************************************************************/
-void netapi_secInflowMode(int iface, NETCP_CFG_SA_T sa, int on)
+void netapi_secInflowMode(int iface,
+ NETCP_CFG_SA_T sa,
+ int on)
{
- /*todo */ /* FUTURE */
- printf(">netapi_sec: dynamic switch between inflow and sideband is not functional yet\n");
+ /* NOT_IMPLEMENTED */
+ netapi_Log("netapi_secInflowMode: dynamic switch between inflow and sideband is NOT_IMPLEMENTED\n");
}
/********************************************************************
********************************************************************
* DESCRIPTION: Internal function to delete an IPSEC SA
********************************************************************/
-static void netapi_secDelSA_internal(NETAPI_T h,int iface_no, NETCP_CFG_SA_T sa_app_id, int flags, int *perr)
+static void netapi_secDelSA_internal(NETAPI_T h,
+ int iface_no,
+ NETCP_CFG_SA_T sa_app_id,
+ int flags,
+ int *perr)
{
NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
nwal_RetValue retValue;
NetapiNwalTransInfo_t *pTransInfo;
nwal_TransID_t trans_id;
- int tunnelId = (sa_app_id >>8) &0xffff;
+ int tunnelId = (sa_app_id >> NETAPI_NETCP_MATCH_ID_SHIFT) &NETAPI_NETCP_MATCH_ID_MASK;
void * handle_inflow;
void * handle_sideband;
int have_to_wait = 1;
- handle_inflow = netcp_cfgp_get_sa_handles(&netapi_get_global()->nwal_context,
+ handle_inflow = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,
tunnelId, &handle_sideband);
*perr =0;
if(handle_inflow)
{
- //get a transaction id
- pTransInfo = netapip_GetFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
+ /* get a transaction id */
+ pTransInfo = netapip_getFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
if (!pTransInfo)
{
*perr = NETAPI_ERR_BUSY;
@@ -331,13 +369,11 @@ static void netapi_secDelSA_internal(NETAPI_T h,int iface_no, NETCP_CFG_SA_T sa
else if(retValue != nwal_OK)
{
*perr = NETAPI_ERR_NWAL_ERR0;
- printf (">netcp cfg - ERROR: netapi_secDelSA_internal returned Error Code %d\n",
+ netapi_Log ("netcp_cfg - ERROR: netapi_secDelSA_internal returned Error Code %d\n",
retValue);
- netapip_FreeTransInfo(pTransInfo);
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context,tunnelId);
+ netapip_freeTransInfo(pTransInfo);
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
}
- //wait here until its done since scheduler isn't running yet most likely..
- // todo: make this handled by scheduler poll later ??
if((trans_id != NWAL_TRANSID_SPIN_WAIT)&&(have_to_wait))
{
n->nwal_local.numPendingCfg++;
@@ -345,23 +381,21 @@ static void netapi_secDelSA_internal(NETAPI_T h,int iface_no, NETCP_CFG_SA_T sa
while ((pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
(pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
{
- // if response is there, then this poll squirts out in the CTl poll callback,
- // which handles the rest (including decrmenting #pending!!
nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
}
if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
{
- netapip_FreeTransInfo(pTransInfo);
+ netapip_freeTransInfo(pTransInfo);
*perr = NETAPI_ERR_PA_FW;
if (!flags)
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context, tunnelId);
- printf (">netapi_sec - ERROR returned by NETCP PA firmware %d\n",
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context, tunnelId);
+ netapi_Log ("netapi_sec - ERROR returned by NETCP PA firmware %d\n",
*perr);
return;
}
}
- printf (">netapi sec: inflow tunnel %d (iface %d) deleted\n",tunnelId,iface_no);
- netapip_FreeTransInfo(pTransInfo);
+ netapi_Log ("netapi sec: inflow tunnel %d (iface %d) deleted\n",tunnelId,iface_no);
+ netapip_freeTransInfo(pTransInfo);
}
if (handle_sideband)
{
@@ -370,17 +404,17 @@ static void netapi_secDelSA_internal(NETAPI_T h,int iface_no, NETCP_CFG_SA_T sa
if(retValue != nwal_OK)
{
*perr = NETAPI_ERR_NWAL_ERR0;
- printf (">netapi_sec - ERROR: nwal_delDMSA returned Error Code %d\n",
+ netapi_Log ("netapi_sec - ERROR: nwal_delDMSA returned Error Code %d\n",
retValue);
}
else
- printf(">netapi_sec: Sideband SA deleted\n");
+ netapi_Log("netapi_sec: Sideband SA deleted\n");
}
- //zap the entry
+ /* zap the entry */
if (!flags)
- netcp_cfgp_delete_sa(&netapi_get_global()->nwal_context, tunnelId);
+ netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context, tunnelId);
}
/********************************************************************
@@ -388,35 +422,40 @@ static void netapi_secDelSA_internal(NETAPI_T h,int iface_no, NETCP_CFG_SA_T sa
********************************************************************
* DESCRIPTION: API to delete an IPSEC SA
********************************************************************/
-void netapi_secDelSA(NETAPI_T h,int iface_no, NETCP_CFG_SA_T sa_app_id, int *perr)
+void netapi_secDelSA(NETAPI_T h,
+ int iface_no,
+ NETCP_CFG_SA_T sa_app_id,
+ int *perr)
{
netapi_secDelSA_internal( h, iface_no, sa_app_id, 0x00, perr);
}
/********************************************************************
- * FUNCTION PURPOSE: API to add a recieve security policy
+ * FUNCTION PURPOSE: API to add a receive security policy
********************************************************************
- * DESCRIPTION: API to add a recieve security policy
+ * DESCRIPTION: API to add a receive security policy
********************************************************************/
-NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T h, //the netapi handle
- NETCP_CFG_SA_T sa, //tunnel to attach to
- nwal_IpType ipType, //V4 or V6
- nwalIpAddr_t * src_ip_addr, //src (from where)
- nwalIpAddr_t * dst_ip_addr, //dst (us)
- nwalIpOpt_t * ip_qualifiers, //other qualifiers
- NETCP_CFG_ROUTE_HANDLE_T route, //Optional route
- int * perr)
+NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T h,
+ NETCP_CFG_SA_T sa,
+ nwal_IpType ipType,
+ nwalIpAddr_t * src_ip_addr,
+ nwalIpAddr_t * dst_ip_addr,
+ nwalIpOpt_t * ip_qualifiers,
+ NETCP_CFG_ROUTE_HANDLE_T route,
+ void * user_data,
+ int * perr)
{
NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
nwal_RetValue retValue;
NetapiNwalTransInfo_t *pTransInfo;
nwal_TransID_t trans_id;
- unsigned int appId = NETAPI_NETCP_MATCH_IPSEC_POLICY | (sa&0xff);
+ unsigned int appId = NETAPI_NETCP_MATCH_IPSEC_POLICY;
int policyId;
- int tunnelId= (sa>>8)&0xff;
+ int tunnelId= netapi_cfgGetMatchId(sa);
void * blah;
- int iface_no = sa&0xff;
+ int iface_no = netapi_cfgGetMatchLogicalMacIface(sa);
+
nwalSecPolParams_t createParam =
{
0, /* handle */
@@ -430,20 +469,25 @@ NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T h, //the netapi handle
CPPI_PARAM_NOT_SPECIFIED, /* Use default flow configured to NWAL if packet is routed to host */
QMSS_PARAM_NOT_SPECIFIED /* Use default queue configured to NWAL if packet is routed to host */
};
- void * sa_handle = NULL;
+ void * sa_handle = NULL;
*perr =0;
- if ((!n) ) {*perr = NETAPI_ERR_BAD_INPUT; return -1;}
+
+ if ((!n) )
+ {
+ *perr = NETAPI_ERR_BAD_INPUT;
+ return -1;
+ }
- sa_handle = netcp_cfgp_get_sa_handles(&netapi_get_global()->nwal_context,tunnelId,&blah);
+ sa_handle = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,tunnelId,&blah);
if (!sa_handle)
{
*perr = NETAPI_ERR_BAD_INPUT;
return -1;
}
- //get a transaction id
- pTransInfo = netapip_GetFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
+ /* get a transaction id */
+ pTransInfo = netapip_getFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
if (!pTransInfo)
{
*perr = NETAPI_ERR_BUSY;
@@ -460,22 +504,21 @@ NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T h, //the netapi handle
if (ip_qualifiers) memcpy(&createParam.ipOpt,ip_qualifiers ,sizeof(nwalIpOpt_t));
if (route != NULL)
{
- netcp_cfgp_build_route(route,&createParam.appRxPktFlowId,
+ netapip_netcpCfgBuildRoute(route,&createParam.appRxPktFlowId,
&createParam.appRxPktQueue);
}
- //reserve a slot
- policyId = netcp_cfgp_find_policy_slot(&netapi_get_global()->nwal_context,
+ /* reserve a slot */
+ policyId = netapip_netcpCfgFindPolicySlot(&netapi_get_global()->nwal_context,
tunnelId);
if (policyId <0)
{
*perr= NETAPI_ERR_NOMEM;
- netapip_FreeTransInfo(pTransInfo);
+ netapip_freeTransInfo(pTransInfo);
return -1;
}
- appId |= (policyId<<8);
-
- //fire off config message
+ appId |= (policyId <<8);
+ /* fire off config message */
retValue = nwal_setSecPolicy (((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
trans_id,
(nwal_AppId) appId,
@@ -484,80 +527,83 @@ NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T h, //the netapi handle
if(retValue != nwal_OK)
{
*perr = NETAPI_ERR_NWAL_ERR0;
- printf (">netapi sec - ERROR: nwal_setPolicy returned Error Code %d\n",
+ printf("netapi_secAddPolicy: error returned: %d\n", retValue);
+ netapi_Log ("netapi sec - ERROR: nwal_setPolicy returned Error Code %d\n",
retValue);
- netapip_FreeTransInfo(pTransInfo);
+ netapip_freeTransInfo(pTransInfo);
- netcp_cfgp_delete_policy(&netapi_get_global()->nwal_context,policyId);
+ netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context,policyId);
return -1;
}
- //wait here until its done since scheduler isn't running yet most likely..
- // todo: make this handled by scheduler poll later ??
if(trans_id != NWAL_TRANSID_SPIN_WAIT)
{
n->nwal_local.numPendingCfg++;
while ((pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
(pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
{
- // if response is there, then this poll squirts out in the CTl poll callback,
- // which handles the rest (including decrmenting #pending!!
nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
}
if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
{
- netapip_FreeTransInfo(pTransInfo);
+ netapip_freeTransInfo(pTransInfo);
*perr = NETAPI_ERR_PA_FW;
- printf (">netapi_sec - ERROR2: netapi_secAddRxPolicy returned Error Code %d\n",
+ netapi_Log ("netapi_sec - ERROR2: netapi_secAddRxPolicy returned Error Code %d\n",
*perr);
- netcp_cfgp_delete_policy(&netapi_get_global()->nwal_context,policyId);
+ netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context,policyId);
return -1;
}
}
- printf (">netapi sec: SA %d added to tunnel %d mac %d\n", policyId, tunnelId, iface_no);
+ netapi_Log ("netapi sec: SA %d added to tunnel %d mac %d\n", policyId, tunnelId, iface_no);
- //todo: the sideband i/f
-
- //save stuff
- netcp_cfgp_insert_policy(&netapi_get_global()->nwal_context,
+ /* save stuff */
+ netapip_netcpCfgInsertPolicy(&netapi_get_global()->nwal_context,
policyId,
- (void *) pTransInfo->handle);
- netapip_FreeTransInfo(pTransInfo);
+ (void *) pTransInfo->handle,
+ user_data);
+ netapip_freeTransInfo(pTransInfo);
return (appId);
}
/********************************************************************
- * FUNCTION PURPOSE: Internal function to delete a recieve security policy
+ * FUNCTION PURPOSE: Internal function to delete a receive security policy
********************************************************************
- * DESCRIPTION: Internal function to delete a recieve security policy
+ * DESCRIPTION: Internal function to delete a receive security policy
********************************************************************/
-static void netapi_secDelRxPolicy_internal(NETAPI_T h, NETCP_CFG_IPSEC_POLICY_T policy_app_id, int flags, int *perr)
+static void netapi_secDelRxPolicy_internal(NETAPI_T h,
+ NETCP_CFG_IPSEC_POLICY_T policy_app_id,
+ int flags,
+ int *perr)
{
NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
nwal_RetValue retValue;
NetapiNwalTransInfo_t *pTransInfo;
nwal_TransID_t trans_id;
- int policyId = (policy_app_id >>8) &0xffff;
+ int policyId = netapi_cfgGetMatchId(policy_app_id);
void * handle_policy=NULL;
- handle_policy = netcp_cfgp_get_policy(&netapi_get_global()->nwal_context,policyId);
+ handle_policy = netapip_netcpCfgGetPolicy(&netapi_get_global()->nwal_context,policyId);
;
- if (!handle_policy) {*perr = NETAPI_ERR_BAD_INPUT; return ;}
+ if (!handle_policy)
+ {
+ *perr = NETAPI_ERR_BAD_INPUT;
+ goto ERR_netapi_secDelRxPolicy_internal;
+ }
*perr =0;
- //get a transaction id
- pTransInfo = netapip_GetFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
+ /* get a transaction id */
+ pTransInfo = netapip_getFreeTransInfo((NETAPI_GLOBAL_T *) n->global, &trans_id);
if (!pTransInfo)
{
*perr = NETAPI_ERR_BUSY;
- return -1;
+ goto ERR_netapi_secDelRxPolicy_internal;
}
pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_SA_POLICY;
pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING;
pTransInfo->inUse = nwal_TRUE;
pTransInfo->netapi_handle = h;
- //issue request
+ /* issue request */
retValue = nwal_delSecPolicy(
((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
trans_id,
@@ -565,48 +611,52 @@ static void netapi_secDelRxPolicy_internal(NETAPI_T h, NETCP_CFG_IPSEC_POLICY_T
if(retValue != nwal_OK)
{
*perr = NETAPI_ERR_NWAL_ERR0;
- printf (">netapi sec - ERROR: netapi_secDelRxPolicy_internal returned Error Code %d\n",
+ netapi_Log ("netapi sec - ERROR: netapi_secDelRxPolicy_internal returned Error Code %d\n",
retValue);
- netapip_FreeTransInfo(pTransInfo);
- return ;
+ netapip_freeTransInfo(pTransInfo);
+ goto ERR_netapi_secDelRxPolicy_internal;
}
- //wait here until its done since scheduler isn't running yet most likely..
- // todo: make this handled by scheduler poll later ??
+
if(trans_id != NWAL_TRANSID_SPIN_WAIT)
{
n->nwal_local.numPendingCfg++;
while ((pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
(pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
{
- // if response is there, then this poll squirts out in the CTl poll callback,
- // which handles the rest (including decrmenting #pending!!
nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
}
if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
{
- netapip_FreeTransInfo(pTransInfo);
+ netapip_freeTransInfo(pTransInfo);
*perr = NETAPI_ERR_PA_FW;
- printf (">netapi_sec - ERROR2: netapi_secDelRxPolicy_internal returned Error Code %d\n",
+ netapi_Log ("netapi_sec - ERROR2: netapi_secDelRxPolicy_internal returned Error Code %d\n",
*perr);
//zap the entry
if (!flags)
- netcp_cfgp_delete_policy(&netapi_get_global()->nwal_context, policyId);
- return -1;
+ netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context, policyId);
+ goto ERR_netapi_secDelRxPolicy_internal;
}
}
- printf (">netapi sec: policy %d (iface %d) deleted\n",policyId,(policy_app_id&0xff));
- netapip_FreeTransInfo(pTransInfo);
- //zap the entry
- if (!flags) netcp_cfgp_delete_policy(&netapi_get_global()->nwal_context, policyId);
+ netapi_Log ("netapi sec: policy %d (iface %d) deleted\n",policyId,(policy_app_id&0xff));
+ netapip_freeTransInfo(pTransInfo);
+ /* zap the entry */
+ if (!flags)
+ {
+ netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context, policyId);
+ }
+ERR_netapi_secDelRxPolicy_internal:
+ return;
}
/********************************************************************
- * FUNCTION PURPOSE: API to delete a recieve security policy
+ * FUNCTION PURPOSE: API to delete a receive security policy
********************************************************************
- * DESCRIPTION: API to delete a recieve security policy
+ * DESCRIPTION: API to delete a receive security policy
********************************************************************/
-void netapi_secDelRxPolicy(NETAPI_T h, NETCP_CFG_IPSEC_POLICY_T policy_app_id, int *perr)
+void netapi_secDelRxPolicy(NETAPI_T h,
+ NETCP_CFG_IPSEC_POLICY_T policy_app_id,
+ int *perr)
{
netapi_secDelRxPolicy_internal(h, policy_app_id, 0, perr);
}
NETCP_CFG_SA_T handle,
NETAPI_SA_STATS_T* pSaStats)
{
-
NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
void * handle_inflow;
void * handle_sideband;
- int tunnelId = (handle >>8) &0xffff;
+ int tunnelId = (handle >> NETAPI_NETCP_MATCH_ID_SHIFT) &0xffff;
int have_to_wait = 1;
- handle_inflow = netcp_cfgp_get_sa_handles(&netapi_get_global()->nwal_context,
+ handle_inflow = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,
tunnelId, &handle_sideband);
if(handle_inflow)
{
handle_sideband, &(pSaStats->dataModeStats));
pSaStats->validParams |= NETAPI_SIDEBAND_DATA_MODE_STAT_VALID;
}
-
+}
+
+
+/**********************************************************************************
+ * FUNCTION PURPOSE: API to API to retrieve local channel context information
+ **********************************************************************************
+ * DESCRIPTION: API to retrieve API to retrieve local channel context information
+ *********************************************************************************/
+void netapi_secGetChanCtxInfo(NETAPI_T h,
+ NETCP_CFG_APP_ID_T appId,
+ nwalChanCxtInfo_t* pInfo)
+{
+
+ NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+ void * handle_inflow;
+ void * handle_sideband = NULL;
+ void * handle_policy=NULL;
+ nwalChanCxtInfo_t info;
+ uint32_t stage = 0;
+ int policyId;
+ int tunnelId;
+
+ if(!pInfo)
+ return;
+ memset(pInfo, 0, sizeof(nwalChanCxtInfo_t));
+
+ stage = netapi_cfgGetMatchStage(appId);
+ netapi_Log("netapi_secGetChanCtxInfo: app id: 0x%x, stage: 0x%x\n", appId, stage);
+
+
+ switch (stage)
+ {
+ case 1:
+ /* this is for SA, need SA and OUTER IP handle */
+ tunnelId = netapi_cfgGetMatchId(appId);
+ handle_inflow = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,
+ tunnelId, &handle_sideband);
+ if(handle_inflow)
+ {
+ nwal_getChanCxtInfo(&netapi_get_global()->nwal_context,
+ handle_inflow,
+ pInfo);
+ netapi_Log("netapi_secGetChanCtxInfo: outerIP: 0x%x, SA chan handle: 0x%x, bitmap: 0x%x\n",
+ pInfo->paOuterIpHandle, pInfo->saChanHandle, pInfo->validBitMap);
+ }
+ break;
+ case 2:
+ /* this is for policy, need SA inner IP */
+ policyId = netapi_cfgGetMatchId(appId);
+ handle_policy = netapip_netcpCfgGetPolicy(&netapi_get_global()->nwal_context,
+ policyId);
+ if (handle_policy)
+ {
+ nwal_getChanCxtInfo(&netapi_get_global()->nwal_context,
+ handle_policy,
+ pInfo);
+ netapi_Log("netapi_secGetChanCtxInfo: innerIP: 0x%x, bitmap: 0x%x\n",
+ pInfo->paInnerIpHandle, pInfo->validBitMap);
+ }
+ break;
+ default:
+ netapi_Log("netapi_secGetChanCtxInfo:Invalid APPID provided\n");
+ break;
+ }
+ return;
}