diff --git a/myClient b/myClient index 27cb1ae..ffe7df6 100755 Binary files a/myClient and b/myClient differ diff --git a/myClient.c b/myClient.c index bd054de..dc49b17 100644 --- a/myClient.c +++ b/myClient.c @@ -22,6 +22,33 @@ // return flag; // } +void saveUA_ReferenceDescriptionToUAReferenceDescription(int j,UA_ReferenceDescription *ref,UAReferenceDescription *BrowseResult){ + memcpy(BrowseResult[j].BrowseName.data,ref->browseName.name.data,ref->browseName.name.length); + BrowseResult[j].BrowseName.length=ref->browseName.name.length; + memcpy(BrowseResult[j].DisplayName.Locale,ref->displayName.locale.data,ref->displayName.locale.length); + memcpy(BrowseResult[j].DisplayName.Text.data,ref->displayName.text.data,ref->displayName.text.length); + BrowseResult[j].IsForward=ref->isForward; + BrowseResult[j].NodeClass=ref->nodeClass; + BrowseResult[j].NodeID.ID.NamespaceIndex=ref->nodeId.nodeId.namespaceIndex; + BrowseResult[j].NodeID.ID.IdentifierType=ref->nodeId.nodeId.identifierType; + BrowseResult[j].NodeID.ID.Identifier.length=ref->nodeId.nodeId.identifier.string.length; + BrowseResult[j].NodeID.ID.Identifier.data=ref->nodeId.nodeId.identifier.string.data; + BrowseResult[j].NodeID.NamespaceURI.length=ref->nodeId.namespaceUri.length; + memcpy(BrowseResult[j].NodeID.NamespaceURI.data,ref->nodeId.namespaceUri.data,ref->nodeId.namespaceUri.length); + BrowseResult[j].NodeID.ServerIndex=ref->nodeId.serverIndex; + BrowseResult[j].ReferenceTypeID.NamespaceIndex=ref->referenceTypeId.namespaceIndex; + BrowseResult[j].ReferenceTypeID.IdentifierType=ref->referenceTypeId.identifierType; + BrowseResult[j].ReferenceTypeID.Identifier.length=ref->referenceTypeId.identifier.string.length; + //memcpy(BrowseResult[j].ReferenceTypeID.Identifier.data,ref->referenceTypeId.identifier.string.data,ref->referenceTypeId.identifier.string.length); + BrowseResult[j].TypeDefinition.ID.NamespaceIndex=ref->typeDefinition.nodeId.namespaceIndex; + BrowseResult[j].TypeDefinition.ID.IdentifierType=ref->typeDefinition.nodeId.identifierType; + BrowseResult[j].TypeDefinition.ID.Identifier.length=ref->typeDefinition.nodeId.identifier.string.length; + memcpy(BrowseResult[j].TypeDefinition.ID.Identifier.data,ref->typeDefinition.nodeId.identifier.string.data,ref->typeDefinition.nodeId.identifier.string.length); + BrowseResult[j].TypeDefinition.NamespaceURI.length=ref->typeDefinition.namespaceUri.length; + memcpy(BrowseResult[j].TypeDefinition.NamespaceURI.data,ref->typeDefinition.namespaceUri.data,ref->typeDefinition.namespaceUri.length); + BrowseResult[j].TypeDefinition.ServerIndex=ref->typeDefinition.serverIndex; +} + u32 UA_NodeGetHandleList(long ConnectionHdl,u16 NodeIDCount,UANodeID *NodeIDs,long *NodeHdls,u32 ErrorIDs[]){ int i; u32 retval=0; @@ -395,6 +422,87 @@ u32 MonitoredItemAddList(long ConnectionHdl,long SubscriptionHdl,u16 NodeHdlCoun } +u32 Browse(long ConnectionHdl,UABrowseDescription BrowseDescription,u32 ContinuationPointIn,u16 *BrowseResultCount,UAReferenceDescription *BrowseResult,u32 ContinuationPointOut){ + UA_Client *c = (UA_Client*)ConnectionHdl; + UA_StatusCode retval; + if(ContinuationPointIn==0){ + UA_BrowseRequest bReq; + UA_BrowseRequest_init(&bReq); + bReq.requestedMaxReferencesPerNode = 0; + bReq.nodesToBrowse = UA_BrowseDescription_new(); + bReq.nodesToBrowseSize = 1; + switch(BrowseDescription.StartingNodeID.IdentifierType){ + case 0:bReq.nodesToBrowse[0].nodeId=UA_NODEID_NUMERIC(BrowseDescription.StartingNodeID.NamespaceIndex,BrowseDescription.StartingNodeID.Identifier.data);break; + case 1:bReq.nodesToBrowse[0].nodeId=UA_NODEID_STRING(BrowseDescription.StartingNodeID.NamespaceIndex,BrowseDescription.StartingNodeID.Identifier.data);break; + case 2:bReq.nodesToBrowse[0].nodeId.identifierType=4; + bReq.nodesToBrowse[0].nodeId.identifier.string.data=BrowseDescription.StartingNodeID.Identifier.data; + bReq.nodesToBrowse[0].nodeId.identifier.string.length=BrowseDescription.StartingNodeID.Identifier.length; + bReq.nodesToBrowse[0].nodeId.namespaceIndex=BrowseDescription.StartingNodeID.NamespaceIndex;break; + case 3:bReq.nodesToBrowse[0].nodeId=UA_NODEID_BYTESTRING(BrowseDescription.StartingNodeID.NamespaceIndex,BrowseDescription.StartingNodeID.Identifier.data);break; + default:retval=UA_STATUSCODE_BADUNEXPECTEDERROR; + } + if(BrowseDescription.ReferenceTypeID.Identifier.length!=NULL) + bReq.nodesToBrowse[0].referenceTypeId=UA_NODEID_NUMERIC(0,BrowseDescription.ReferenceTypeID.Identifier.length); + if(BrowseDescription.ResultMask==1||BrowseDescription.ResultMask==2||BrowseDescription.ResultMask==4||BrowseDescription.ResultMask==8||BrowseDescription.ResultMask==16) + bReq.nodesToBrowse[0].resultMask = BrowseDescription.ResultMask; + if(BrowseDescription.Direction==2||BrowseDescription.Direction==1||BrowseDescription.Direction==0) + bReq.nodesToBrowse[0].browseDirection = BrowseDescription.Direction; + if(BrowseDescription.IncludeSubtypes==0||BrowseDescription.IncludeSubtypes==1) + bReq.nodesToBrowse[0].includeSubtypes = BrowseDescription.IncludeSubtypes; + if(BrowseDescription.NodeClass!=NULL) + bReq.nodesToBrowse[0].nodeClassMask = BrowseDescription.NodeClass; + + UA_BrowseResponse bResp = UA_Client_Service_browse(c, bReq); + retval = bResp.responseHeader.serviceResult; + if(retval == UA_STATUSCODE_GOOD) { + if(bResp.results[0].referencesSize<=MAX_ELEMENTS_NODELIST){ + *BrowseResultCount=bResp.results[0].referencesSize; + for(size_t j = 0; j < bResp.results[0].referencesSize; ++j){ + UA_ReferenceDescription *ref = &bResp.results[0].references[j]; + saveUA_ReferenceDescriptionToUAReferenceDescription(j,ref,BrowseResult); + } + ContinuationPointOut=0; + }else if(bResp.results[0].referencesSize>MAX_ELEMENTS_NODELIST){ + *BrowseResultCount=MAX_ELEMENTS_NODELIST; + UA_ReferenceDescription *ref1=malloc(sizeof(UA_ReferenceDescription)*(bResp.results[0].referencesSize-MAX_ELEMENTS_NODELIST+1)); + for(size_t j = 0; j < MAX_ELEMENTS_NODELIST; ++j){ + UA_ReferenceDescription *ref = &bResp.results[0].references[j]; + saveUA_ReferenceDescriptionToUAReferenceDescription(j,ref,BrowseResult); + } + for(size_t j=MAX_ELEMENTS_NODELIST+1;j<=bResp.results[0].referencesSize;j++){ + ref1[j-MAX_ELEMENTS_NODELIST]=bResp.results[0].references[j]; + } + ref1[0].browseName.namespaceIndex=bResp.results[0].referencesSize-MAX_ELEMENTS_NODELIST; + ContinuationPointOut=(u32 *)ref1; + } + + } + //UA_BrowseRequest_clear(&bReq); + //UA_BrowseResponse_clear(&bResp); + }else{ + UA_ReferenceDescription *ref=(UA_ReferenceDescription *)ContinuationPointOut; + if(ref[0].browseName.namespaceIndex<=MAX_ELEMENTS_NODELIST){ + for(size_t j = 1; j < ref[0].browseName.namespaceIndex+1; ++j){ + saveUA_ReferenceDescriptionToUAReferenceDescription(j,ref,BrowseResult); + } + ContinuationPointOut=0; + }else if(ref[0].browseName.namespaceIndex>MAX_ELEMENTS_NODELIST){ + UA_ReferenceDescription *ref1=malloc(sizeof(UA_ReferenceDescription)*(ref[0].browseName.namespaceIndex-MAX_ELEMENTS_NODELIST+1)); + for(size_t j = 1; j < MAX_ELEMENTS_NODELIST+1; ++j){ + saveUA_ReferenceDescriptionToUAReferenceDescription(j,ref,BrowseResult); + } + for(size_t j=MAX_ELEMENTS_NODELIST+1;j<=ref[0].browseName.namespaceIndex;j++){ + ref1[j-MAX_ELEMENTS_NODELIST]=ref[j]; + } + ref1[0].browseName.namespaceIndex=ref[0].browseName.namespaceIndex-MAX_ELEMENTS_NODELIST; + ContinuationPointOut=(u32 *)ref1; + } + + } + + return retval; +} + int main(int argc, char *argv[]) { // long connecthdl; @@ -452,15 +560,17 @@ int main(int argc, char *argv[]) { } UA_BrowseRequest_clear(&bReq); UA_BrowseResponse_clear(&bResp); - - UA_NodeGetHandleList(hdl,4,nodes,nodeHdls,errors); - UA_Value *variables = (UA_Value*)malloc(4 * sizeof(UA_Value)); - readTest(hdl,4,nodeHdls,variables,errors); - for (int i = 0; i < 4; i++) - { - printf("%d\n",variables[i].type); - } - + u16 count; + UABrowseDescription browseDes; + browseDes.Direction = 1; + browseDes.StartingNodeID = nodes[0]; + browseDes.ResultMask = 31; + browseDes.IncludeSubtypes = true; + browseDes.ReferenceTypeID.Identifier.length == NULL; + browseDes.NodeClass = 511; + UAReferenceDescription *browseResult = (UAReferenceDescription*)malloc(MAX_ELEMENTS_NODELIST * sizeof(UAReferenceDescription)); + u32 resultOut; + Browse(hdl,browseDes,0,&count,browseResult,resultOut); /* Clean up */ UA_Client_disconnect(client);