diff --git a/src/rm_transport.c b/src/rm_transport.c
index c105a143a989ab87a19c39e05c8fdfc1cb641785..db14c8853bd65a04cbf2b1be6a23aebb9c3f6a54 100644 (file)
--- a/src/rm_transport.c
+++ b/src/rm_transport.c
transports = transports->nextTransport;\r
}\r
transports->nextTransport = newTransport;\r
- }\r
- else {\r
+ } else {\r
rmInst->transports = newTransport;\r
}\r
}\r
- return (newTransport);\r
+ return(newTransport);\r
}\r
\r
/* FUNCTION PURPOSE: Tests if a transport is registered to an instance\r
{\r
Rm_Inst *rmInst = (Rm_Inst *)rmHandle;\r
Rm_Transport *transportList = (Rm_Transport *)rmInst->transports;\r
- \r
+\r
while (transportList) {\r
if (transportList == transport) {\r
- return(RM_TRUE); \r
+ return(RM_TRUE);\r
}\r
transportList = transportList->nextTransport;\r
}\r
- return (RM_FALSE);\r
+ return(RM_FALSE);\r
}\r
\r
/* FUNCTION PURPOSE: Deletes a transport\r
/* Get previous transport in list */\r
while (transportList) {\r
if (transportList == transport) {\r
- break; \r
+ break;\r
}\r
prevTransport = transportList;\r
transportList = transportList->nextTransport;\r
\r
if (prevTransport == NULL) {\r
rmInst->transports = transport->nextTransport;\r
- }\r
- else {\r
+ } else {\r
prevTransport->nextTransport = transport->nextTransport;\r
}\r
Rm_osalFree((void *)transport, sizeof(Rm_Transport));\r
}\r
\r
-/**********************************************************************\r
- ********************** Internal Functions ****************************\r
- **********************************************************************/\r
-\r
-/* FUNCTION PURPOSE: Finds a transport based on remote inst type\r
- ***********************************************************************\r
- * DESCRIPTION: Returns a pointer to the transport within an instance's\r
- * transport list that matches the provided remote\r
- * instance type. NULL is returned if no transports in \r
- * the list match the remote instance type.\r
- */\r
-Rm_Transport *rmTransportFindRemoteInstType(Rm_Transport *transports, Rm_InstType remoteInstType)\r
-{\r
- while (transports) {\r
- if (transports->remoteInstType == remoteInstType) {\r
- break; \r
- }\r
- transports = transports->nextTransport;\r
- }\r
- return (transports);\r
-}\r
-\r
/* FUNCTION PURPOSE: Returns RM packet source instance\r
***********************************************************************\r
* DESCRIPTION: Can return the RM instance name for one of two things:\r
@@ -168,27 +144,28 @@ Rm_Transport *rmTransportFindRemoteInstType(Rm_Transport *transports, Rm_InstTyp
* - RM instance from which the service request contained\r
* in the provided RM packet originated\r
*/\r
-int32_t getPktSrcNames(const Rm_Packet *pkt, char *pktSrc, char *serviceSrc, int32_t bufLen)\r
+static int32_t getPktSrcNames(const Rm_Packet *pkt, char *pktSrc,\r
+ char *serviceSrc, int32_t bufLen)\r
{\r
int32_t retVal = RM_OK;\r
\r
if (bufLen != RM_NAME_MAX_CHARS) {\r
retVal = RM_ERROR_SRC_NAME_BUF_INVALID_SIZE;\r
- }\r
- else {\r
+ } else {\r
switch (pkt->pktType) {\r
case Rm_pktType_RESOURCE_REQUEST:\r
{\r
Rm_ResourceRequestPkt *resourceReqPkt = (Rm_ResourceRequestPkt *)pkt->data;\r
\r
if (pktSrc){\r
- rm_strncpy(pktSrc, resourceReqPkt->pktSrcInstName, RM_NAME_MAX_CHARS);\r
+ rm_strncpy(pktSrc, resourceReqPkt->pktSrcInstName,\r
+ RM_NAME_MAX_CHARS);\r
}\r
\r
if (serviceSrc) {\r
- rm_strncpy(serviceSrc, resourceReqPkt->serviceSrcInstName, RM_NAME_MAX_CHARS);\r
+ rm_strncpy(serviceSrc, resourceReqPkt->serviceSrcInstName,\r
+ RM_NAME_MAX_CHARS);\r
}\r
-\r
break;\r
}\r
case Rm_pktType_NAMESERVER_REQUEST:\r
@@ -196,26 +173,48 @@ int32_t getPktSrcNames(const Rm_Packet *pkt, char *pktSrc, char *serviceSrc, int
Rm_NsRequestPkt *nsRequestPkt = (Rm_NsRequestPkt *)pkt->data;\r
\r
if (pktSrc){\r
- rm_strncpy(pktSrc, nsRequestPkt->pktSrcInstName, RM_NAME_MAX_CHARS);\r
+ rm_strncpy(pktSrc, nsRequestPkt->pktSrcInstName,\r
+ RM_NAME_MAX_CHARS);\r
}\r
\r
if (serviceSrc) {\r
- rm_strncpy(serviceSrc, nsRequestPkt->serviceSrcInstName, RM_NAME_MAX_CHARS);\r
+ rm_strncpy(serviceSrc, nsRequestPkt->serviceSrcInstName,\r
+ RM_NAME_MAX_CHARS);\r
}\r
-\r
break;\r
}\r
case Rm_pktType_RESOURCE_RESPONSE:\r
case Rm_pktType_NAMESERVER_RESPONSE:\r
default:\r
- {\r
retVal = RM_ERROR_PKT_AND_SERVICE_SRC_NOT_AVAIL;\r
break;\r
- }\r
}\r
}\r
\r
- return (retVal);\r
+ return(retVal);\r
+}\r
+\r
+/**********************************************************************\r
+ ********************** Internal Functions ****************************\r
+ **********************************************************************/\r
+\r
+/* FUNCTION PURPOSE: Finds a transport based on remote inst type\r
+ ***********************************************************************\r
+ * DESCRIPTION: Returns a pointer to the transport within an instance's\r
+ * transport list that matches the provided remote\r
+ * instance type. NULL is returned if no transports in \r
+ * the list match the remote instance type.\r
+ */\r
+Rm_Transport *rmTransportFindRemoteInstType(Rm_Transport *transports,\r
+ Rm_InstType remoteInstType)\r
+{\r
+ while (transports) {\r
+ if (transports->remoteInstType == remoteInstType) {\r
+ break;\r
+ }\r
+ transports = transports->nextTransport;\r
+ }\r
+ return(transports);\r
}\r
\r
/**********************************************************************\r
@@ -234,7 +233,8 @@ int32_t getPktSrcNames(const Rm_Packet *pkt, char *pktSrc, char *serviceSrc, int
* is returned for the transport handle if any errors\r
* are encountered.\r
*/\r
-Rm_TransportHandle Rm_transportRegister (const Rm_TransportCfg *transportCfg, int32_t *result)\r
+Rm_TransportHandle Rm_transportRegister(const Rm_TransportCfg *transportCfg,\r
+ int32_t *result)\r
{\r
Rm_Inst *rmInst = (Rm_Inst *) transportCfg->rmHandle;\r
Rm_Transport *transport = NULL;\r
@@ -270,22 +270,22 @@ Rm_TransportHandle Rm_transportRegister (const Rm_TransportCfg *transportCfg, in
goto errorExit;\r
}\r
\r
- /* Verify Clients are not registering with more than one Client Delegate or Server. And\r
- * that Client Delegate is not registering with more than one Server. */\r
+ /* Verify Clients are not registering with more than one Client Delegate or\r
+ * Server. And that Client Delegate is not registering with more than one\r
+ * Server. */\r
if (rmInst->registeredWithDelegateOrServer &&\r
(((rmInst->instType == Rm_instType_CLIENT) &&\r
- (transportCfg->remoteInstType == Rm_instType_CLIENT_DELEGATE)) || \r
+ (transportCfg->remoteInstType == Rm_instType_CLIENT_DELEGATE)) ||\r
((rmInst->instType == Rm_instType_CLIENT_DELEGATE) &&\r
(transportCfg->remoteInstType == Rm_instType_SERVER)))) {\r
*result = RM_ERROR_ALREADY_REGD_SERVER_OR_CD;\r
goto errorExit;\r
- } \r
- \r
+ }\r
+\r
if (!transportCfg->transportCallouts.rmAllocPkt) {\r
*result = RM_ERROR_TRANSPORT_ALLOC_PKT_NOT_REGD;\r
goto errorExit;\r
- }\r
- else if (!transportCfg->transportCallouts.rmSendPkt) {\r
+ } else if (!transportCfg->transportCallouts.rmSendPkt) {\r
*result = RM_ERROR_TRANSPORT_SEND_NOT_REGD;\r
goto errorExit;\r
}\r
@@ -299,8 +299,8 @@ Rm_TransportHandle Rm_transportRegister (const Rm_TransportCfg *transportCfg, in
errorExit:\r
if (rmInst->mtSemObj) {\r
Rm_osalMtCsExit(rmInst->mtSemObj, mtKey);\r
- } \r
- RM_SS_INST_WB_EXIT_CS(rmInst, key); \r
+ }\r
+ RM_SS_INST_WB_EXIT_CS(rmInst, key);\r
return ((Rm_TransportHandle) transport);\r
}\r
\r
* configuration parameters if it exists within the \r
* instance.\r
*/\r
-int32_t Rm_transportReconfig (Rm_TransportHandle transportHandle, const Rm_TransportReCfg *reCfg)\r
+int32_t Rm_transportReconfig(Rm_TransportHandle transportHandle,\r
+ const Rm_TransportReCfg *reCfg)\r
{\r
Rm_Transport *transport = (Rm_Transport *)transportHandle;\r
Rm_Inst *rmInst = (Rm_Inst *)transport->rmHandle;\r
@@ -324,8 +325,8 @@ int32_t Rm_transportReconfig (Rm_TransportHandle transportHandle, const Rm_Trans
}\r
\r
if (transportIsRegistered(transport->rmHandle, transport)) {\r
- /* Reconfigure existing transport's appTransportHandle. Used in cases where instances\r
- * running on same core connected by function call. */\r
+ /* Reconfigure existing transport's appTransportHandle. Used in cases\r
+ * where instances running on same core connected by function call. */\r
transport->appTransportHandle = reCfg->appTransportHandle;\r
\r
if (reCfg->transportCallouts.rmAllocPkt) {\r
@@ -334,16 +335,15 @@ int32_t Rm_transportReconfig (Rm_TransportHandle transportHandle, const Rm_Trans
if (reCfg->transportCallouts.rmSendPkt) {\r
transport->callouts.rmSendPkt = reCfg->transportCallouts.rmSendPkt;\r
}\r
- }\r
- else {\r
+ } else {\r
retVal = RM_ERROR_TRANSPORT_HANDLE_DOES_NOT_EXIST;\r
- } \r
+ }\r
\r
if (rmInst->mtSemObj) {\r
Rm_osalMtCsExit(rmInst->mtSemObj, mtKey);\r
}\r
- RM_SS_INST_WB_EXIT_CS(rmInst, key); \r
- return (retVal);\r
+ RM_SS_INST_WB_EXIT_CS(rmInst, key);\r
+ return(retVal);\r
}\r
\r
/* FUNCTION PURPOSE: Unregisters an app transport from a RM instance\r
rmInst->registeredWithDelegateOrServer = RM_FALSE;\r
}\r
transportDelete(transport);\r
- }\r
- else {\r
+ } else {\r
retVal = RM_ERROR_TRANSPORT_HANDLE_DOES_NOT_EXIST;\r
}\r
- return (retVal);\r
+ return(retVal);\r
}\r
\r
/* FUNCTION PURPOSE: Returns a RM packet's service source instance name\r
* DESCRIPTION: Returns the RM instance name from which the service\r
* encapsulated in the RM packet originated.\r
*/\r
-int32_t Rm_receiveGetPktServiceSrcName(const Rm_Packet *pkt, char *serviceInstName, \r
- int32_t charBufLen)\r
+int32_t Rm_receiveGetPktServiceSrcName(const Rm_Packet *pkt,\r
+ char *serviceInstName,\r
+ int32_t charBufLen)\r
{\r
return(getPktSrcNames(pkt, NULL, serviceInstName, charBufLen));\r
}\r
@@ -387,8 +387,8 @@ int32_t Rm_receiveGetPktServiceSrcName(const Rm_Packet *pkt, char *serviceInstNa
* DESCRIPTION: Returns the RM instance name from which the RM packet\r
* originated.\r
*/\r
-int32_t Rm_receiveGetPktSrcName(const Rm_Packet *pkt, char *pktInstName, \r
- int32_t charBufLen)\r
+int32_t Rm_receiveGetPktSrcName(const Rm_Packet *pkt, char *pktInstName,\r
+ int32_t charBufLen)\r
{\r
return(getPktSrcNames(pkt, pktInstName, NULL, charBufLen));\r
}\r
* invoking application will free packet after this\r
* function returns.\r
*/\r
-int32_t Rm_receivePacket(Rm_TransportHandle transportHandle, const Rm_Packet *pkt)\r
+int32_t Rm_receivePacket(Rm_TransportHandle transportHandle,\r
+ const Rm_Packet *pkt)\r
{\r\r\r
Rm_Transport *transport = (Rm_Transport *)transportHandle;\r
Rm_Inst *rmInst = (Rm_Inst *)transport->rmHandle;\r
@@ -421,36 +422,40 @@ int32_t Rm_receivePacket(Rm_TransportHandle transportHandle, const Rm_Packet *pk
transaction = rmTransactionQueueAdd(rmInst);\r
transaction->remoteOriginatingId = resourceReqPkt->requestId;\r
transaction->u.respTrans = transport;\r
- if (resourceReqPkt->resourceReqType == Rm_resReqPktType_ALLOCATE_INIT) {\r
+ if (resourceReqPkt->resourceReqType ==\r
+ Rm_resReqPktType_ALLOCATE_INIT) {\r
transaction->type = Rm_service_RESOURCE_ALLOCATE_INIT;\r
- }\r
- else if (resourceReqPkt->resourceReqType == Rm_resReqPktType_ALLOCATE_USE) {\r
+ } else if (resourceReqPkt->resourceReqType ==\r
+ Rm_resReqPktType_ALLOCATE_USE) {\r
transaction->type = Rm_service_RESOURCE_ALLOCATE_USE;\r
- }\r
- else if (resourceReqPkt->resourceReqType == Rm_resReqPktType_GET_STATUS) {\r
+ } else if (resourceReqPkt->resourceReqType ==\r
+ Rm_resReqPktType_GET_STATUS) {\r
transaction->type = Rm_service_RESOURCE_STATUS;\r
- }\r
- else if (resourceReqPkt->resourceReqType == Rm_resReqPktType_FREE) {\r
+ } else if (resourceReqPkt->resourceReqType ==\r
+ Rm_resReqPktType_FREE) {\r
transaction->type = Rm_service_RESOURCE_FREE;\r
- }\r
- else if (resourceReqPkt->resourceReqType == Rm_resReqPktType_GET_NAMED) {\r
+ } else if (resourceReqPkt->resourceReqType ==\r
+ Rm_resReqPktType_GET_NAMED) {\r
transaction->type = Rm_service_RESOURCE_GET_BY_NAME;\r
- } \r
- rm_strncpy(transaction->serviceSrcInstName, resourceReqPkt->serviceSrcInstName, RM_NAME_MAX_CHARS);\r
+ }\r
+ rm_strncpy(transaction->serviceSrcInstName,\r
+ resourceReqPkt->serviceSrcInstName, RM_NAME_MAX_CHARS);\r
transaction->state = RM_SERVICE_PROCESSING;\r
- memcpy ((void *)&(transaction->resourceInfo), (void *)&(resourceReqPkt->resourceInfo),\r
- sizeof(Rm_ResourceInfo));\r
+ memcpy((void *)&(transaction->resourceInfo),\r
+ (void *)&(resourceReqPkt->resourceInfo),\r
+ sizeof(Rm_ResourceInfo));\r
break;\r
}\r
case Rm_pktType_RESOURCE_RESPONSE:\r
{\r
Rm_ResourceResponsePkt *resourceRespPkt = (Rm_ResourceResponsePkt *)pkt->data;\r
\r
- if ((transaction = rmTransactionQueueFind(rmInst,resourceRespPkt->responseId))) {\r
+ if ((transaction = rmTransactionQueueFind(rmInst,\r
+ resourceRespPkt->responseId))) {\r
if ((transaction->state == RM_SERVICE_APPROVED_STATIC) &&\r
(resourceRespPkt->requestState != RM_SERVICE_APPROVED)) {\r
- /* Lock the RM instance since service validated against static policy failed against \r
- * Server's global policy */\r
+ /* Lock the RM instance since service validated against\r
+ * static policy failed against Server's global policy */\r
rmInst->isLocked = RM_TRUE;\r
}\r
transaction->state = resourceRespPkt->requestState;\r
@@ -460,16 +465,15 @@ int32_t Rm_receivePacket(Rm_TransportHandle transportHandle, const Rm_Packet *pk
(transaction->type == Rm_service_RESOURCE_ALLOCATE_USE) ||\r
(transaction->type == Rm_service_RESOURCE_STATUS) ||\r
(transaction->type == Rm_service_RESOURCE_GET_BY_NAME))) {\r
- memcpy ((void *)&(transaction->resourceInfo), (void *)&(resourceRespPkt->resourceInfo),\r
- sizeof(Rm_ResourceInfo));\r
- }\r
- else {\r
+ memcpy((void *)&(transaction->resourceInfo),\r
+ (void *)&(resourceRespPkt->resourceInfo),\r
+ sizeof(Rm_ResourceInfo));\r
+ } else {\r
/* Always copy owner count and instance allocation count */\r
transaction->resourceInfo.ownerCount = resourceRespPkt->resourceInfo.ownerCount;\r
transaction->resourceInfo.instAllocCount = resourceRespPkt->resourceInfo.instAllocCount;\r
}\r
- }\r
- else {\r
+ } else {\r
retVal = RM_ERROR_PKT_RESP_DOES_NOT_MATCH_ANY_REQ;\r
goto errorExit;\r
}\r
@@ -485,31 +489,33 @@ int32_t Rm_receivePacket(Rm_TransportHandle transportHandle, const Rm_Packet *pk
\r
if (nsRequestPkt->nsRequestType == Rm_nsReqPktType_MAP_RESOURCE) {\r
transaction->type = Rm_service_RESOURCE_MAP_TO_NAME;\r
- }\r
- else if (nsRequestPkt->nsRequestType == Rm_nsReqPktType_UNMAP_RESOURCE) {\r
+ } else if (nsRequestPkt->nsRequestType ==\r
+ Rm_nsReqPktType_UNMAP_RESOURCE) {\r
transaction->type = Rm_service_RESOURCE_UNMAP_NAME;\r
}\r
\r
- rm_strncpy(transaction->serviceSrcInstName, nsRequestPkt->serviceSrcInstName, RM_NAME_MAX_CHARS);\r
+ rm_strncpy(transaction->serviceSrcInstName,\r
+ nsRequestPkt->serviceSrcInstName, RM_NAME_MAX_CHARS);\r
transaction->state = RM_SERVICE_PROCESSING;\r
- memcpy ((void *)&(transaction->resourceInfo), (void *)&(nsRequestPkt->resourceInfo),\r
- sizeof(Rm_ResourceInfo)); \r
+ memcpy((void *)&(transaction->resourceInfo),\r
+ (void *)&(nsRequestPkt->resourceInfo),\r
+ sizeof(Rm_ResourceInfo));\r
break;\r
}\r
case Rm_pktType_NAMESERVER_RESPONSE:\r
{\r
Rm_NsResponsePkt *nsResponsePkt = (Rm_NsResponsePkt *)pkt->data;\r
\r
- if ((transaction = rmTransactionQueueFind(rmInst, nsResponsePkt->responseId))) {\r
+ if ((transaction = rmTransactionQueueFind(rmInst,\r
+ nsResponsePkt->responseId))) {\r
if ((transaction->state == RM_SERVICE_APPROVED_STATIC) &&\r
(nsResponsePkt->requestState != RM_SERVICE_APPROVED)) {\r
- /* Lock the RM instance since service validated against static policy failed against \r
- * Server's global policy */\r
+ /* Lock the RM instance since service validated against\r
+ * static policy failed against Server's global policy */\r
rmInst->isLocked = RM_TRUE;\r
}\r
transaction->state = nsResponsePkt->requestState;\r
- }\r
- else {\r
+ } else {\r
retVal = RM_ERROR_PKT_RESP_DOES_NOT_MATCH_ANY_REQ;\r
goto errorExit;\r
}\r
@@ -521,7 +527,7 @@ int32_t Rm_receivePacket(Rm_TransportHandle transportHandle, const Rm_Packet *pk
}\r
\r
/* Process received transaction */\r
- rmProcessRouter(rmInst, transaction); \r
+ rmProcessRouter(rmInst, transaction);\r
errorExit:\r
return(retVal);\r
}\r