mirror of
https://github.com/open62541/open62541.git
synced 2025-06-03 04:00:21 +00:00
remove unneeded whitespaces (#1552)
* remove unneeded whitespaces * fix generate_datatypes.py
This commit is contained in:
parent
7fac71131f
commit
7332a100ee
@ -59,13 +59,13 @@ stateCallback (UA_Client *client, UA_ClientState clientState) {
|
||||
switch(clientState) {
|
||||
case UA_CLIENTSTATE_DISCONNECTED:
|
||||
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "The client is disconnected");
|
||||
break;
|
||||
break;
|
||||
case UA_CLIENTSTATE_CONNECTED:
|
||||
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "A TCP connection to the server is open");
|
||||
break;
|
||||
break;
|
||||
case UA_CLIENTSTATE_SECURECHANNEL:
|
||||
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "A SecureChannel to the server is open");
|
||||
break;
|
||||
break;
|
||||
case UA_CLIENTSTATE_SESSION:{
|
||||
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "A session with the server is open");
|
||||
/* A new session was created. We need to create the subscription. */
|
||||
@ -85,11 +85,11 @@ stateCallback (UA_Client *client, UA_ClientState clientState) {
|
||||
if(monId)
|
||||
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "Monitoring UA_NS0ID_SERVER_SERVERSTATUS_CURRENTTIME', id %u", monId);
|
||||
}
|
||||
break;
|
||||
break;
|
||||
case UA_CLIENTSTATE_SESSION_RENEWED:
|
||||
UA_LOG_INFO(logger, UA_LOGCATEGORY_USERLAND, "A session with the server is open (renewed)");
|
||||
/* The session was renewed. We don't need to recreate the subscription. */
|
||||
break;
|
||||
break;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
@ -15,7 +15,7 @@ int main(void) {
|
||||
|
||||
UA_ServerConfig *config = UA_ServerConfig_new_default();
|
||||
UA_Server *server = UA_Server_new(config);
|
||||
|
||||
|
||||
/* Create a rudimentary objectType
|
||||
*
|
||||
* BaseObjectType
|
||||
@ -30,43 +30,43 @@ int main(void) {
|
||||
UA_ObjectTypeAttributes otAttr = UA_ObjectTypeAttributes_default;
|
||||
otAttr.description = UA_LOCALIZEDTEXT("en-US", "A mamal");
|
||||
otAttr.displayName = UA_LOCALIZEDTEXT("en-US", "MamalType");
|
||||
UA_Server_addObjectTypeNode(server, UA_NODEID_NUMERIC(1, 10000),
|
||||
UA_Server_addObjectTypeNode(server, UA_NODEID_NUMERIC(1, 10000),
|
||||
UA_NODEID_NUMERIC(0, UA_NS0ID_BASEOBJECTTYPE),
|
||||
UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
|
||||
UA_QUALIFIEDNAME(1, "MamalType"), otAttr, NULL, NULL);
|
||||
|
||||
|
||||
UA_VariableAttributes vAttr = UA_VariableAttributes_default;
|
||||
vAttr.description = UA_LOCALIZEDTEXT("en-US", "This mamals Age in months");
|
||||
vAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Age");
|
||||
UA_UInt32 ageVar = 0;
|
||||
UA_Variant_setScalar(&vAttr.value, &ageVar, &UA_TYPES[UA_TYPES_UINT32]);
|
||||
UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 10001),
|
||||
UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 10001),
|
||||
UA_NODEID_NUMERIC(1, 10000), UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
|
||||
UA_QUALIFIEDNAME(1, "Age"), UA_NODEID_NULL, vAttr, NULL, NULL);
|
||||
|
||||
|
||||
otAttr = UA_ObjectTypeAttributes_default;
|
||||
otAttr.description = UA_LOCALIZEDTEXT("en-US", "A dog, subtype of mamal");
|
||||
otAttr.displayName = UA_LOCALIZEDTEXT("en-US", "DogType");
|
||||
UA_Server_addObjectTypeNode(server, UA_NODEID_NUMERIC(1, 10002),
|
||||
UA_NODEID_NUMERIC(1, 10000), UA_NODEID_NUMERIC(0, UA_NS0ID_HASSUBTYPE),
|
||||
UA_QUALIFIEDNAME(1, "DogType"), otAttr, NULL, NULL);
|
||||
|
||||
|
||||
vAttr = UA_VariableAttributes_default;
|
||||
vAttr.description = UA_LOCALIZEDTEXT("en-US", "This mamals Age in months");
|
||||
vAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Name");
|
||||
UA_String defaultName = UA_STRING("unnamed dog");
|
||||
UA_Variant_setScalar(&vAttr.value, &defaultName, &UA_TYPES[UA_TYPES_STRING]);
|
||||
UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 10003),
|
||||
UA_Server_addVariableNode(server, UA_NODEID_NUMERIC(1, 10003),
|
||||
UA_NODEID_NUMERIC(1, 10002), UA_NODEID_NUMERIC(0, UA_NS0ID_HASPROPERTY),
|
||||
UA_QUALIFIEDNAME(1, "Name"), UA_NODEID_NULL, vAttr, NULL, NULL);
|
||||
|
||||
|
||||
/* Instatiate a dog named bello:
|
||||
* (O) Objects
|
||||
* + O Bello <DogType>
|
||||
* + Age
|
||||
* + Name
|
||||
*/
|
||||
|
||||
|
||||
UA_ObjectAttributes oAttr = UA_ObjectAttributes_default;
|
||||
oAttr.description = UA_LOCALIZEDTEXT("en-US", "A dog named Bello");
|
||||
oAttr.displayName = UA_LOCALIZEDTEXT("en-US", "Bello");
|
||||
@ -75,7 +75,7 @@ int main(void) {
|
||||
UA_NODEID_NUMERIC(0, UA_NS0ID_HASCOMPONENT),
|
||||
UA_QUALIFIEDNAME(1, "Bello"), UA_NODEID_NUMERIC(1, 10002),
|
||||
oAttr, NULL, NULL);
|
||||
|
||||
|
||||
retval = UA_Server_run(server, &running);
|
||||
UA_Server_delete(server);
|
||||
UA_ServerConfig_delete(config);
|
||||
|
@ -47,7 +47,7 @@ variables_basic(void) {
|
||||
UA_String_deleteMembers(&s4);
|
||||
if(!eq)
|
||||
return;
|
||||
|
||||
|
||||
/* Structured Type */
|
||||
UA_CallRequest cr;
|
||||
UA_init(&cr, &UA_TYPES[UA_TYPES_CALLREQUEST]); /* Generic method */
|
||||
|
@ -70,7 +70,7 @@ addCurrentTimeVariable(UA_Server *server) {
|
||||
static void
|
||||
beforeReadTime(UA_Server *server,
|
||||
const UA_NodeId *sessionId, void *sessionContext,
|
||||
const UA_NodeId *nodeid, void *nodeContext,
|
||||
const UA_NodeId *nodeid, void *nodeContext,
|
||||
const UA_NumericRange *range, const UA_DataValue *data) {
|
||||
UA_DateTime now = UA_DateTime_now();
|
||||
UA_Variant value;
|
||||
|
@ -270,13 +270,13 @@ pumpTypeConstructor(UA_Server *server,
|
||||
rpe.isInverse = false;
|
||||
rpe.includeSubtypes = false;
|
||||
rpe.targetName = UA_QUALIFIEDNAME(1, "Status");
|
||||
|
||||
|
||||
UA_BrowsePath bp;
|
||||
UA_BrowsePath_init(&bp);
|
||||
bp.startingNode = *nodeId;
|
||||
bp.relativePath.elementsSize = 1;
|
||||
bp.relativePath.elements = &rpe;
|
||||
|
||||
|
||||
UA_BrowsePathResult bpr =
|
||||
UA_Server_translateBrowsePathToNodeIds(server, &bp);
|
||||
if(bpr.statusCode != UA_STATUSCODE_GOOD ||
|
||||
|
@ -125,7 +125,7 @@ UA_Server_removeRepeatedCallback(UA_Server *server, UA_UInt64 callbackId);
|
||||
UA_DataValue UA_EXPORT
|
||||
UA_Server_read(UA_Server *server, const UA_ReadValueId *item,
|
||||
UA_TimestampsToReturn timestamps);
|
||||
|
||||
|
||||
/* Don't use this function. There are typed versions for every supported
|
||||
* attribute. */
|
||||
UA_StatusCode UA_EXPORT
|
||||
@ -945,7 +945,7 @@ UA_Server_addMethodNode(UA_Server *server, const UA_NodeId requestedNewNodeId,
|
||||
const UA_NodeId referenceTypeId,
|
||||
const UA_QualifiedName browseName,
|
||||
const UA_MethodAttributes attr, UA_MethodCallback method,
|
||||
size_t inputArgumentsSize, const UA_Argument* inputArguments,
|
||||
size_t inputArgumentsSize, const UA_Argument* inputArguments,
|
||||
size_t outputArgumentsSize, const UA_Argument* outputArguments,
|
||||
void *nodeContext, UA_NodeId *outNewNodeId);
|
||||
|
||||
|
@ -80,7 +80,7 @@ struct UA_ServerConfig {
|
||||
size_t networkLayersSize;
|
||||
UA_ServerNetworkLayer *networkLayers;
|
||||
UA_String customHostname;
|
||||
|
||||
|
||||
/* Available endpoints */
|
||||
size_t endpointsSize;
|
||||
UA_Endpoint *endpoints;
|
||||
|
@ -137,7 +137,7 @@ allowDeleteNode_default(const UA_NodeId *sessionId, void *sessionContext,
|
||||
const UA_DeleteNodesItem *item) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
UA_Boolean
|
||||
allowDeleteReference_default(const UA_NodeId *sessionId, void *sessionContext,
|
||||
const UA_DeleteReferencesItem *item) {
|
||||
|
@ -60,7 +60,7 @@ UA_ServerConfig_new_default(void) {
|
||||
UA_EXPORT void
|
||||
UA_ServerConfig_set_customHostname(UA_ServerConfig *config,
|
||||
const UA_String customHostname);
|
||||
|
||||
|
||||
/* Frees allocated memory in the server config */
|
||||
UA_EXPORT void
|
||||
UA_ServerConfig_delete(UA_ServerConfig *config);
|
||||
|
@ -87,7 +87,7 @@ asym_verify_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
|
||||
|
||||
/* Set the RSA settings */
|
||||
mbedtls_rsa_context *rsaContext = mbedtls_pk_rsa(cc->remoteCertificate.pk);
|
||||
mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, 0);
|
||||
mbedtls_rsa_set_padding(rsaContext, MBEDTLS_RSA_PKCS_V15, 0);
|
||||
|
||||
/* Verify */
|
||||
int mbedErr = mbedtls_pk_verify(&cc->remoteCertificate.pk,
|
||||
@ -302,7 +302,7 @@ sym_verify_sp_basic128rsa15(const UA_SecurityPolicy *securityPolicy,
|
||||
return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
|
||||
}
|
||||
|
||||
Basic128Rsa15_PolicyContext *pc =
|
||||
Basic128Rsa15_PolicyContext *pc =
|
||||
(Basic128Rsa15_PolicyContext*)securityPolicy->policyContext;
|
||||
|
||||
unsigned char mac[UA_SHA1_LENGTH];
|
||||
|
@ -197,7 +197,7 @@ openSecureChannel(UA_Client *client, UA_Boolean renew) {
|
||||
UA_DateTime_nowMonotonic() +
|
||||
((UA_DateTime)client->config.timeout * UA_DATETIME_MSEC),
|
||||
&requestId);
|
||||
|
||||
|
||||
if(retval != UA_STATUSCODE_GOOD) {
|
||||
UA_Client_close(client);
|
||||
return retval;
|
||||
|
@ -207,7 +207,7 @@ addMonitoredItems(UA_Client *client, const UA_UInt32 subscriptionId,
|
||||
|
||||
UA_StatusCode
|
||||
UA_Client_Subscriptions_addMonitoredItems(UA_Client *client, const UA_UInt32 subscriptionId,
|
||||
UA_MonitoredItemCreateRequest *items, size_t itemsSize,
|
||||
UA_MonitoredItemCreateRequest *items, size_t itemsSize,
|
||||
UA_MonitoredItemHandlingFunction *hfs,
|
||||
void **hfContexts, UA_StatusCode *itemResults,
|
||||
UA_UInt32 *newMonitoredItemIds) {
|
||||
@ -239,7 +239,7 @@ UA_Client_Subscriptions_addMonitoredItem(UA_Client *client, UA_UInt32 subscripti
|
||||
|
||||
UA_StatusCode
|
||||
UA_Client_Subscriptions_addMonitoredEvents(UA_Client *client, const UA_UInt32 subscriptionId,
|
||||
UA_MonitoredItemCreateRequest *items, size_t itemsSize,
|
||||
UA_MonitoredItemCreateRequest *items, size_t itemsSize,
|
||||
UA_MonitoredEventHandlingFunction *hfs,
|
||||
void **hfContexts, UA_StatusCode *itemResults,
|
||||
UA_UInt32 *newMonitoredItemIds) {
|
||||
@ -503,7 +503,7 @@ UA_Client_Subscriptions_manuallySendPublishRequest(UA_Client *client) {
|
||||
|
||||
UA_PublishResponse response = UA_Client_Service_publish(client, request);
|
||||
UA_Client_processPublishResponse(client, &request, &response);
|
||||
|
||||
|
||||
now = UA_DateTime_nowMonotonic();
|
||||
if(now > maxDate) {
|
||||
moreNotifications = UA_FALSE;
|
||||
@ -511,11 +511,11 @@ UA_Client_Subscriptions_manuallySendPublishRequest(UA_Client *client) {
|
||||
} else {
|
||||
moreNotifications = response.moreNotifications;
|
||||
}
|
||||
|
||||
|
||||
UA_PublishResponse_deleteMembers(&response);
|
||||
UA_PublishRequest_deleteMembers(&request);
|
||||
}
|
||||
|
||||
|
||||
if(client->state < UA_CLIENTSTATE_SESSION)
|
||||
return UA_STATUSCODE_BADSERVERNOTCONNECTED;
|
||||
|
||||
|
@ -401,7 +401,7 @@ mdns_set_address_record_if(UA_Server *server, const char *fullServiceDomain,
|
||||
// [servername]-[hostname]._opcua-tcp._tcp.local. A [ip].
|
||||
mdns_record_t *r = mdnsd_shared(server->mdnsDaemon, fullServiceDomain, QTYPE_A, 600);
|
||||
mdnsd_set_raw(server->mdnsDaemon, r, addr, addr_len);
|
||||
|
||||
|
||||
// [hostname]. A [ip].
|
||||
r = mdnsd_shared(server->mdnsDaemon, localDomain, QTYPE_A, 600);
|
||||
mdnsd_set_raw(server->mdnsDaemon, r, addr, addr_len);
|
||||
@ -442,7 +442,7 @@ getInterfaces(UA_Server *server) {
|
||||
adapter_addresses = NULL;
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
/* Unexpected error */
|
||||
UA_LOG_ERROR(server->config.logger, UA_LOGCATEGORY_SERVER,
|
||||
"GetAdaptersAddresses returned an unexpected error. "
|
||||
|
@ -547,7 +547,7 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
|
||||
/* Was processed before...*/
|
||||
retval = UA_MessageContext_encode(&mc, response, responseType);
|
||||
break;
|
||||
case UA_SERVICETYPE_INSITU:
|
||||
case UA_SERVICETYPE_INSITU:
|
||||
retval = ((UA_InSituService)service)
|
||||
(server, session, &mc, request, (UA_ResponseHeader*)response);
|
||||
break;
|
||||
|
@ -613,7 +613,7 @@ UA_Server_initNS0(UA_Server *server) {
|
||||
&enabledFlag, &UA_TYPES[UA_TYPES_BOOLEAN]);
|
||||
|
||||
/* ServerStatus */
|
||||
UA_DataSource serverStatus = {readStatus, NULL};
|
||||
UA_DataSource serverStatus = {readStatus, NULL};
|
||||
retVal |= UA_Server_setVariableNode_dataSource(server,
|
||||
UA_NODEID_NUMERIC(0, UA_NS0ID_SERVER_SERVERSTATUS), serverStatus);
|
||||
|
||||
|
@ -40,7 +40,7 @@ typedef struct {
|
||||
UA_Boolean delayed; /* Is it a delayed callback? */
|
||||
UA_Boolean countersSampled; /* Have the worker counters been sampled? */
|
||||
UA_UInt32 workerCounters[]; /* Counter value for each worker */
|
||||
} WorkerCallback;
|
||||
} WorkerCallback;
|
||||
|
||||
/* Forward Declaration */
|
||||
static void
|
||||
@ -74,7 +74,7 @@ workerLoop(UA_Worker *worker) {
|
||||
processDelayedCallback(server, dc);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
dc->callback(server, dc->data);
|
||||
UA_free(dc);
|
||||
}
|
||||
@ -247,7 +247,7 @@ processDelayedCallback(UA_Server *server, WorkerCallback *dc) {
|
||||
pthread_cond_broadcast(&server->dispatchQueue_condition);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/* Execute the callback */
|
||||
dc->callback(server, dc->data);
|
||||
UA_free(dc);
|
||||
@ -395,7 +395,6 @@ UA_Server_run_shutdown(UA_Server *server) {
|
||||
/* Execute the remaining callbacks in the dispatch queue.
|
||||
* This also executes the delayed callbacks. */
|
||||
emptyDispatchQueue(server);
|
||||
|
||||
#endif
|
||||
|
||||
/* Stop multicast discovery */
|
||||
|
@ -359,7 +359,7 @@ void Service_Call(UA_Server *server, UA_Session *session,
|
||||
* links to be deleted, but has no effect on the MonitoredItems referenced by
|
||||
* the triggered items. */
|
||||
void Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
|
||||
const UA_CreateMonitoredItemsRequest *request,
|
||||
const UA_CreateMonitoredItemsRequest *request,
|
||||
UA_CreateMonitoredItemsResponse *response);
|
||||
|
||||
/**
|
||||
|
@ -1264,7 +1264,7 @@ Service_Write(UA_Server *server, UA_Session *session,
|
||||
return;
|
||||
}
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_Write, NULL,
|
||||
&request->nodesToWriteSize, &UA_TYPES[UA_TYPES_WRITEVALUE],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
|
||||
|
@ -238,7 +238,7 @@ void Service_Call(UA_Server *server, UA_Session *session,
|
||||
return;
|
||||
}
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_CallMethod, NULL,
|
||||
&request->methodsToCallSize, &UA_TYPES[UA_TYPES_CALLMETHODREQUEST],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_CALLMETHODRESULT]);
|
||||
|
@ -246,7 +246,7 @@ UA_Discovery_update_MdnsForDiscoveryUrl(UA_Server *server, const UA_String *serv
|
||||
(int)serverName->length, serverName->data);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
UA_String *capabilities = NULL;
|
||||
size_t capabilitiesSize = 0;
|
||||
if(mdnsConfig) {
|
||||
|
@ -223,7 +223,7 @@ useVariableTypeAttributes(UA_Server *server, UA_Session *session,
|
||||
UA_Nodestore_release(server, (const UA_Node*)vt);
|
||||
return UA_STATUSCODE_BADTYPEMISMATCH;
|
||||
}
|
||||
|
||||
|
||||
/* If no value is set, see if the vt provides one and copy it. This needs to
|
||||
* be done before copying the datatype from the vt, as setting the datatype
|
||||
* triggers a typecheck. */
|
||||
@ -965,7 +965,7 @@ Service_AddNodes(UA_Server *server, UA_Session *session,
|
||||
return;
|
||||
}
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_addNode, NULL,
|
||||
&request->nodesToAddSize, &UA_TYPES[UA_TYPES_ADDNODESITEM],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_ADDNODESRESULT]);
|
||||
|
@ -135,7 +135,7 @@ Service_SetPublishingMode(UA_Server *server, UA_Session *session,
|
||||
UA_SetPublishingModeResponse *response) {
|
||||
UA_LOG_DEBUG_SESSION(server->config.logger, session, "Processing SetPublishingModeRequest");
|
||||
UA_Boolean publishingEnabled = request->publishingEnabled; /* request is const */
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_SetPublishingMode,
|
||||
&publishingEnabled,
|
||||
&request->subscriptionIdsSize, &UA_TYPES[UA_TYPES_UINT32],
|
||||
@ -310,7 +310,7 @@ Service_CreateMonitoredItems(UA_Server *server, UA_Session *session,
|
||||
/* Reset the subscription lifetime */
|
||||
cmc.sub->currentLifetimeCount = 0;
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_CreateMonitoredItem, &cmc,
|
||||
&request->itemsToCreateSize, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATEREQUEST],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_MONITOREDITEMCREATERESULT]);
|
||||
@ -361,7 +361,7 @@ void Service_ModifyMonitoredItems(UA_Server *server, UA_Session *session,
|
||||
|
||||
sub->currentLifetimeCount = 0; /* Reset the subscription lifetime */
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session,
|
||||
(UA_ServiceOperation)Operation_ModifyMonitoredItem, sub,
|
||||
&request->itemsToModifySize, &UA_TYPES[UA_TYPES_MONITOREDITEMMODIFYREQUEST],
|
||||
@ -417,7 +417,7 @@ void Service_SetMonitoringMode(UA_Server *server, UA_Session *session,
|
||||
smc.sub->currentLifetimeCount = 0; /* Reset the subscription lifetime */
|
||||
|
||||
smc.monitoringMode = request->monitoringMode;
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_SetMonitoringMode, &smc,
|
||||
&request->monitoredItemIdsSize, &UA_TYPES[UA_TYPES_UINT32],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
|
||||
@ -512,7 +512,7 @@ Service_Publish(UA_Server *server, UA_Session *session,
|
||||
|
||||
/* Answer immediately to a late subscription */
|
||||
UA_Subscription *immediate;
|
||||
UA_Boolean found = true;
|
||||
UA_Boolean found = true;
|
||||
int loopCount = 1;
|
||||
|
||||
if(session->lastSeenSubscriptionId > 0) {
|
||||
@ -529,8 +529,8 @@ Service_Publish(UA_Server *server, UA_Session *session,
|
||||
LIST_FOREACH(immediate, &session->serverSubscriptions, listEntry) {
|
||||
if(!found) {
|
||||
if(session->lastSeenSubscriptionId == immediate->subscriptionId) {
|
||||
found = true;
|
||||
}
|
||||
found = true;
|
||||
}
|
||||
} else {
|
||||
if(immediate->state == UA_SUBSCRIPTIONSTATE_LATE) {
|
||||
session->lastSeenSubscriptionId = immediate->subscriptionId;
|
||||
@ -538,9 +538,9 @@ Service_Publish(UA_Server *server, UA_Session *session,
|
||||
"Response on a late subscription", immediate->subscriptionId);
|
||||
UA_Subscription_publishCallback(server, immediate);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
/* after the first loop, we can publish the first subscription with UA_SUBSCRIPTIONSTATE_LATE */
|
||||
found = true;
|
||||
}
|
||||
@ -569,7 +569,7 @@ Service_DeleteSubscriptions(UA_Server *server, UA_Session *session,
|
||||
UA_LOG_DEBUG_SESSION(server->config.logger, session,
|
||||
"Processing DeleteSubscriptionsRequest");
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_DeleteSubscription, NULL,
|
||||
&request->subscriptionIdsSize, &UA_TYPES[UA_TYPES_UINT32],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
|
||||
@ -610,7 +610,7 @@ void Service_DeleteMonitoredItems(UA_Server *server, UA_Session *session,
|
||||
/* Reset the subscription lifetime */
|
||||
sub->currentLifetimeCount = 0;
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_DeleteMonitoredItem, sub,
|
||||
&request->monitoredItemIdsSize, &UA_TYPES[UA_TYPES_UINT32],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_STATUSCODE]);
|
||||
|
@ -362,7 +362,7 @@ Service_BrowseNext(UA_Server *server, UA_Session *session,
|
||||
UA_LOG_DEBUG_SESSION(server->config.logger, session,
|
||||
"Processing BrowseNextRequest");
|
||||
UA_Boolean releaseContinuationPoints = request->releaseContinuationPoints; /* request is const */
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_BrowseNext,
|
||||
&releaseContinuationPoints,
|
||||
&request->continuationPointsSize, &UA_TYPES[UA_TYPES_BYTESTRING],
|
||||
@ -597,7 +597,7 @@ Operation_TranslateBrowsePathToNodeIds(UA_Server *server, UA_Session *session,
|
||||
result->statusCode = UA_STATUSCODE_BADNOTHINGTODO;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/* RelativePath elements must not have an empty targetName */
|
||||
for(size_t i = 0; i < path->relativePath.elementsSize; ++i) {
|
||||
if(UA_QualifiedName_isNull(&path->relativePath.elements[i].targetName)) {
|
||||
@ -693,7 +693,7 @@ Service_TranslateBrowsePathsToNodeIds(UA_Server *server, UA_Session *session,
|
||||
return;
|
||||
}
|
||||
|
||||
response->responseHeader.serviceResult =
|
||||
response->responseHeader.serviceResult =
|
||||
UA_Server_processServiceOperations(server, session, (UA_ServiceOperation)Operation_TranslateBrowsePathToNodeIds,
|
||||
NULL, &request->browsePathsSize, &UA_TYPES[UA_TYPES_BROWSEPATH],
|
||||
&response->resultsSize, &UA_TYPES[UA_TYPES_BROWSEPATHRESULT]);
|
||||
|
@ -597,7 +597,7 @@ UA_Variant_copyRange(const UA_Variant *src, UA_Variant *dst,
|
||||
nextrange.dimensions = &range.dimensions[dims];
|
||||
nextrange.dimensionsSize = range.dimensionsSize - dims;
|
||||
}
|
||||
|
||||
|
||||
/* Compute the strides */
|
||||
size_t count, block, stride, first;
|
||||
UA_StatusCode retval = computeStrides(src, thisrange, &count,
|
||||
|
@ -905,7 +905,7 @@ ExtensionObject_decodeBinaryContent(UA_ExtensionObject *dst, const UA_NodeId *ty
|
||||
|
||||
/* Jump over the length field (TODO: check if the decoded length matches) */
|
||||
ctx->pos += 4;
|
||||
|
||||
|
||||
/* Decode */
|
||||
dst->encoding = UA_EXTENSIONOBJECT_DECODED;
|
||||
dst->content.decoded.type = type;
|
||||
|
@ -99,7 +99,7 @@ class Type(object):
|
||||
" " + str(len(self.members)) + ", /* .membersSize */\n" + \
|
||||
" " + self.builtin + ", /* .builtin */\n" + \
|
||||
" " + self.pointerfree + ", /* .pointerFree */\n" + \
|
||||
" " + self.overlayable + ", /* .overlayable */ \n" + \
|
||||
" " + self.overlayable + ", /* .overlayable */\n" + \
|
||||
" " + binaryEncodingId + ", /* .binaryEncodingId */\n" + \
|
||||
" %s_members" % self.name + " /* .members */\n}"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user