|
@@ -261,7 +261,7 @@ UA_Subscription * UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptio
|
|
|
new->lastMonitoredItemId = 0;
|
|
|
new->state = UA_SUBSCRIPTIONSTATE_NORMAL; /* The first publish response is sent immediately */
|
|
|
LIST_INIT(&new->retransmissionQueue);
|
|
|
- LIST_INIT(&new->MonitoredItems);
|
|
|
+ LIST_INIT(&new->monitoredItems);
|
|
|
return new;
|
|
|
}
|
|
|
|
|
@@ -270,7 +270,7 @@ void UA_Subscription_deleteMembers(UA_Subscription *subscription, UA_Server *ser
|
|
|
|
|
|
/* Delete monitored Items */
|
|
|
UA_MonitoredItem *mon, *tmp_mon;
|
|
|
- LIST_FOREACH_SAFE(mon, &subscription->MonitoredItems, listEntry, tmp_mon) {
|
|
|
+ LIST_FOREACH_SAFE(mon, &subscription->monitoredItems, listEntry, tmp_mon) {
|
|
|
LIST_REMOVE(mon, listEntry);
|
|
|
MonitoredItem_delete(server, mon);
|
|
|
}
|
|
@@ -287,7 +287,7 @@ void UA_Subscription_deleteMembers(UA_Subscription *subscription, UA_Server *ser
|
|
|
UA_MonitoredItem *
|
|
|
UA_Subscription_getMonitoredItem(UA_Subscription *sub, UA_UInt32 monitoredItemID) {
|
|
|
UA_MonitoredItem *mon;
|
|
|
- LIST_FOREACH(mon, &sub->MonitoredItems, listEntry) {
|
|
|
+ LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
|
|
|
if(mon->itemId == monitoredItemID)
|
|
|
break;
|
|
|
}
|
|
@@ -298,7 +298,7 @@ UA_StatusCode
|
|
|
UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
|
|
|
UA_UInt32 monitoredItemID) {
|
|
|
UA_MonitoredItem *mon;
|
|
|
- LIST_FOREACH(mon, &sub->MonitoredItems, listEntry) {
|
|
|
+ LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
|
|
|
if(mon->itemId == monitoredItemID) {
|
|
|
LIST_REMOVE(mon, listEntry);
|
|
|
MonitoredItem_delete(server, mon);
|
|
@@ -313,7 +313,7 @@ countQueuedNotifications(UA_Subscription *sub, UA_Boolean *moreNotifications) {
|
|
|
size_t notifications = 0;
|
|
|
if(sub->publishingEnabled) {
|
|
|
UA_MonitoredItem *mon;
|
|
|
- LIST_FOREACH(mon, &sub->MonitoredItems, listEntry) {
|
|
|
+ LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
|
|
|
MonitoredItem_queuedValue *qv;
|
|
|
TAILQ_FOREACH(qv, &mon->queue, listEntry) {
|
|
|
if(notifications >= sub->notificationsPerPublish) {
|
|
@@ -356,7 +356,7 @@ prepareNotificationMessage(UA_Subscription *sub, UA_NotificationMessage *message
|
|
|
/* Move notifications into the response .. the point of no return */
|
|
|
size_t l = 0;
|
|
|
UA_MonitoredItem *mon;
|
|
|
- LIST_FOREACH(mon, &sub->MonitoredItems, listEntry) {
|
|
|
+ LIST_FOREACH(mon, &sub->monitoredItems, listEntry) {
|
|
|
MonitoredItem_queuedValue *qv, *qv_tmp;
|
|
|
TAILQ_FOREACH_SAFE(qv, &mon->queue, listEntry, qv_tmp) {
|
|
|
if(l >= notifications)
|