code formatting

src/server/ua_securechannel_manager.c

@@ -3,162 +3,164 @@
 #include "ua_statuscodes.h"
 
 UA_StatusCode UA_SecureChannelManager_init(UA_SecureChannelManager *cm,
-		size_t maxChannelCount, UA_UInt32 tokenLifetime,
-		UA_UInt32 startChannelId, UA_UInt32 startTokenId) {
-	LIST_INIT(&cm->channels);
-	cm->lastChannelId = startChannelId;
-	cm->lastTokenId = startTokenId;
-	cm->maxChannelLifetime = tokenLifetime;
-	cm->maxChannelCount = maxChannelCount;
-	cm->currentChannelCount = 0;
-	return UA_STATUSCODE_GOOD;
+        size_t maxChannelCount, UA_UInt32 tokenLifetime,
+        UA_UInt32 startChannelId, UA_UInt32 startTokenId) {
+    LIST_INIT(&cm->channels);
+    cm->lastChannelId = startChannelId;
+    cm->lastTokenId = startTokenId;
+    cm->maxChannelLifetime = tokenLifetime;
+    cm->maxChannelCount = maxChannelCount;
+    cm->currentChannelCount = 0;
+    return UA_STATUSCODE_GOOD;
 }
 
 void UA_SecureChannelManager_deleteMembers(UA_SecureChannelManager *cm) {
-	channel_list_entry *entry, *temp;
-	LIST_FOREACH_SAFE(entry, &cm->channels, pointers, temp)
-	{
-		LIST_REMOVE(entry, pointers);
-		UA_SecureChannel_deleteMembersCleanup(&entry->channel);
-		UA_free(entry);
-	}
+    channel_list_entry *entry, *temp;
+    LIST_FOREACH_SAFE(entry, &cm->channels, pointers, temp)
+    {
+        LIST_REMOVE(entry, pointers);
+        UA_SecureChannel_deleteMembersCleanup(&entry->channel);
+        UA_free(entry);
+    }
 }
 
 /* remove channels that were not renewed or who have no connection attached */
 void UA_SecureChannelManager_cleanupTimedOut(UA_SecureChannelManager *cm,
-		UA_DateTime now) {
-	channel_list_entry *entry, *temp;
-	LIST_FOREACH_SAFE(entry, &cm->channels, pointers, temp)
-	{
-		UA_DateTime timeout = entry->channel.securityToken.createdAt
-				+ ((UA_DateTime) entry->channel.securityToken.revisedLifetime
-						* 10000);
-		if (timeout < now || !entry->channel.connection) {
-			LIST_REMOVE(entry, pointers);
-			UA_SecureChannel_deleteMembersCleanup(&entry->channel);
+        UA_DateTime now) {
+    channel_list_entry *entry, *temp;
+    LIST_FOREACH_SAFE(entry, &cm->channels, pointers, temp)
+    {
+        UA_DateTime timeout = entry->channel.securityToken.createdAt
+                + ((UA_DateTime) entry->channel.securityToken.revisedLifetime
+                        * 10000);
+        if (timeout < now || !entry->channel.connection) {
+            LIST_REMOVE(entry, pointers);
+            UA_SecureChannel_deleteMembersCleanup(&entry->channel);
 #ifndef UA_MULTITHREADING
-			cm->currentChannelCount--;
+            cm->currentChannelCount--;
 #else
-			cm->currentChannelCount = uatomic_add_return(&cm->currentChannelCount, -1);
+            cm->currentChannelCount = uatomic_add_return(
+                    &cm->currentChannelCount, -1);
 #endif
-			UA_free(entry);
-		} else if (entry->channel.nextSecurityToken.tokenId > 0) {
-			UA_SecureChannel_revolveTokens(&entry->channel);
-		}
-	}
+            UA_free(entry);
+        } else if (entry->channel.nextSecurityToken.tokenId > 0) {
+            UA_SecureChannel_revolveTokens(&entry->channel);
+        }
+    }
 }
 
 UA_StatusCode UA_SecureChannelManager_open(UA_SecureChannelManager *cm,
-		UA_Connection *conn, const UA_OpenSecureChannelRequest *request,
-		UA_OpenSecureChannelResponse *response) {
+        UA_Connection *conn, const UA_OpenSecureChannelRequest *request,
+        UA_OpenSecureChannelResponse *response) {
 
-	if (request->securityMode != UA_MESSAGESECURITYMODE_NONE) {
-		return UA_STATUSCODE_BADSECURITYMODEREJECTED;
+    if (request->securityMode != UA_MESSAGESECURITYMODE_NONE) {
+        return UA_STATUSCODE_BADSECURITYMODEREJECTED;
 
-	}
+    }
 
-	channel_list_entry *entry = UA_malloc(sizeof(channel_list_entry));
-	if (!entry) {
-		return UA_STATUSCODE_BADOUTOFMEMORY;
-	}
-	if (cm->currentChannelCount >= cm->maxChannelCount) {
-		return UA_STATUSCODE_BADOUTOFMEMORY;
-	}
+    channel_list_entry *entry = UA_malloc(sizeof(channel_list_entry));
+    if (!entry) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+    if (cm->currentChannelCount >= cm->maxChannelCount) {
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
 #ifndef UA_MULTITHREADING
-	cm->currentChannelCount++;
+    cm->currentChannelCount++;
 #else
-	cm->currentChannelCount = uatomic_add_return(&cm->currentChannelCount, 1);
+    cm->currentChannelCount = uatomic_add_return(&cm->currentChannelCount, 1);
 #endif
 
-	UA_SecureChannel_init(&entry->channel);
-	response->responseHeader.stringTableSize = 0;
-	response->responseHeader.timestamp = UA_DateTime_now();
-	response->serverProtocolVersion = 0;
-
-	entry->channel.securityToken.channelId = cm->lastChannelId++;
-	entry->channel.securityToken.tokenId = cm->lastTokenId++;
-	entry->channel.securityToken.createdAt = UA_DateTime_now();
-	entry->channel.securityToken.revisedLifetime =
-			(request->requestedLifetime > cm->maxChannelLifetime) ?
-					cm->maxChannelLifetime : request->requestedLifetime;
-	/* pragmatic workaround to get clients requesting lifetime of 0 working */
-	if (entry->channel.securityToken.revisedLifetime == 0)
-		entry->channel.securityToken.revisedLifetime = cm->maxChannelLifetime;
-
-	UA_ByteString_copy(&request->clientNonce, &entry->channel.clientNonce);
-	entry->channel.serverAsymAlgSettings.securityPolicyUri = UA_STRING_ALLOC(
-			"http://opcfoundation.org/UA/SecurityPolicy#None");
-
-	UA_SecureChannel_generateNonce(&entry->channel.serverNonce);
-	UA_ByteString_copy(&entry->channel.serverNonce, &response->serverNonce);
-	UA_ChannelSecurityToken_copy(&entry->channel.securityToken,
-			&response->securityToken);
-
-	UA_Connection_attachSecureChannel(conn, &entry->channel);
-	LIST_INSERT_HEAD(&cm->channels, entry, pointers);
-	return UA_STATUSCODE_GOOD;
+    UA_SecureChannel_init(&entry->channel);
+    response->responseHeader.stringTableSize = 0;
+    response->responseHeader.timestamp = UA_DateTime_now();
+    response->serverProtocolVersion = 0;
+
+    entry->channel.securityToken.channelId = cm->lastChannelId++;
+    entry->channel.securityToken.tokenId = cm->lastTokenId++;
+    entry->channel.securityToken.createdAt = UA_DateTime_now();
+    entry->channel.securityToken.revisedLifetime =
+            (request->requestedLifetime > cm->maxChannelLifetime) ?
+                    cm->maxChannelLifetime : request->requestedLifetime;
+    /* pragmatic workaround to get clients requesting lifetime of 0 working */
+    if (entry->channel.securityToken.revisedLifetime == 0)
+        entry->channel.securityToken.revisedLifetime = cm->maxChannelLifetime;
+
+    UA_ByteString_copy(&request->clientNonce, &entry->channel.clientNonce);
+    entry->channel.serverAsymAlgSettings.securityPolicyUri = UA_STRING_ALLOC(
+            "http://opcfoundation.org/UA/SecurityPolicy#None");
+
+    UA_SecureChannel_generateNonce(&entry->channel.serverNonce);
+    UA_ByteString_copy(&entry->channel.serverNonce, &response->serverNonce);
+    UA_ChannelSecurityToken_copy(&entry->channel.securityToken,
+            &response->securityToken);
+
+    UA_Connection_attachSecureChannel(conn, &entry->channel);
+    LIST_INSERT_HEAD(&cm->channels, entry, pointers);
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_StatusCode UA_SecureChannelManager_renew(UA_SecureChannelManager *cm,
-		UA_Connection *conn, const UA_OpenSecureChannelRequest *request,
-		UA_OpenSecureChannelResponse *response) {
-	UA_SecureChannel *channel = conn->channel;
-	if (!channel)
-		return UA_STATUSCODE_BADINTERNALERROR;
-
-	/* if no security token is already issued */
-	if (channel->nextSecurityToken.tokenId == 0) {
-		channel->nextSecurityToken.channelId = channel->securityToken.channelId;
-		//FIXME: UaExpert seems not to use the new tokenid
-		channel->nextSecurityToken.tokenId = cm->lastTokenId++;
-		//channel->nextSecurityToken.tokenId = channel->securityToken.tokenId;
-		channel->nextSecurityToken.createdAt = UA_DateTime_now();
-		channel->nextSecurityToken.revisedLifetime =
-				(request->requestedLifetime > cm->maxChannelLifetime) ?
-						cm->maxChannelLifetime : request->requestedLifetime;
-
-		/* pragmatic workaround to get clients requesting lifetime of 0 working */
-		if (channel->nextSecurityToken.revisedLifetime == 0)
-			channel->nextSecurityToken.revisedLifetime = cm->maxChannelLifetime;
-	}
-
-	if (channel->clientNonce.data)
-		UA_ByteString_deleteMembers(&channel->clientNonce);
-
-	UA_ByteString_copy(&request->clientNonce, &channel->clientNonce);
-	UA_ByteString_copy(&channel->serverNonce, &response->serverNonce);
-	UA_ChannelSecurityToken_copy(&channel->nextSecurityToken,
-			&response->securityToken);
-	return UA_STATUSCODE_GOOD;
+        UA_Connection *conn, const UA_OpenSecureChannelRequest *request,
+        UA_OpenSecureChannelResponse *response) {
+    UA_SecureChannel *channel = conn->channel;
+    if (!channel)
+        return UA_STATUSCODE_BADINTERNALERROR;
+
+    /* if no security token is already issued */
+    if (channel->nextSecurityToken.tokenId == 0) {
+        channel->nextSecurityToken.channelId = channel->securityToken.channelId;
+        //FIXME: UaExpert seems not to use the new tokenid
+        channel->nextSecurityToken.tokenId = cm->lastTokenId++;
+        //channel->nextSecurityToken.tokenId = channel->securityToken.tokenId;
+        channel->nextSecurityToken.createdAt = UA_DateTime_now();
+        channel->nextSecurityToken.revisedLifetime =
+                (request->requestedLifetime > cm->maxChannelLifetime) ?
+                        cm->maxChannelLifetime : request->requestedLifetime;
+
+        /* pragmatic workaround to get clients requesting lifetime of 0 working */
+        if (channel->nextSecurityToken.revisedLifetime == 0)
+            channel->nextSecurityToken.revisedLifetime = cm->maxChannelLifetime;
+    }
+
+    if (channel->clientNonce.data)
+        UA_ByteString_deleteMembers(&channel->clientNonce);
+
+    UA_ByteString_copy(&request->clientNonce, &channel->clientNonce);
+    UA_ByteString_copy(&channel->serverNonce, &response->serverNonce);
+    UA_ChannelSecurityToken_copy(&channel->nextSecurityToken,
+            &response->securityToken);
+    return UA_STATUSCODE_GOOD;
 }
 
 UA_SecureChannel *
 UA_SecureChannelManager_get(UA_SecureChannelManager *cm, UA_UInt32 channelId) {
-	channel_list_entry *entry;
-	LIST_FOREACH(entry, &cm->channels, pointers)
-	{
-		if (entry->channel.securityToken.channelId == channelId)
-			return &entry->channel;
-	}
-	return NULL;
+    channel_list_entry *entry;
+    LIST_FOREACH(entry, &cm->channels, pointers)
+    {
+        if (entry->channel.securityToken.channelId == channelId)
+            return &entry->channel;
+    }
+    return NULL;
 }
 
 UA_StatusCode UA_SecureChannelManager_close(UA_SecureChannelManager *cm,
-		UA_UInt32 channelId) {
-	channel_list_entry *entry;
-	LIST_FOREACH(entry, &cm->channels, pointers)
-	{
-		if (entry->channel.securityToken.channelId == channelId) {
-			LIST_REMOVE(entry, pointers);
-			UA_SecureChannel_deleteMembersCleanup(&entry->channel);
-			UA_free(entry);
+        UA_UInt32 channelId) {
+    channel_list_entry *entry;
+    LIST_FOREACH(entry, &cm->channels, pointers)
+    {
+        if (entry->channel.securityToken.channelId == channelId) {
+            LIST_REMOVE(entry, pointers);
+            UA_SecureChannel_deleteMembersCleanup(&entry->channel);
+            UA_free(entry);
 #ifndef UA_MULTITHREADING
-			cm->currentChannelCount--;
+            cm->currentChannelCount--;
 #else
-			cm->currentChannelCount = uatomic_add_return(&cm->currentChannelCount, -1);
+            cm->currentChannelCount = uatomic_add_return(
+                    &cm->currentChannelCount, -1);
 #endif
-			return UA_STATUSCODE_GOOD;
-		}
-	}
-	return UA_STATUSCODE_BADINTERNALERROR;
+            return UA_STATUSCODE_GOOD;
+        }
+    }
+    return UA_STATUSCODE_BADINTERNALERROR;
 }