瀏覽代碼

fixed some invalid pointer warnings

FlorianPalm 11 年之前
父節點
當前提交
63d33404ae

+ 1 - 1
OPCUAServer/src/opcua_binaryEncDec.c

@@ -19,7 +19,6 @@ void encodeByte(Byte encodeByte, Int32 *pos, AD_RawMessage *dstBuf)
 {
 	dstBuf->message[*pos] = encodeByte;
 	*pos = (*pos) + 1;
-	dstBuf->length = dstBuf->length + 1;
 
 }
 
@@ -106,6 +105,7 @@ Int32 decodeUAString(const char* buf, Int32 *pos, UA_String *dstUAString)
 		dstUAString->Data = NULL;
 	}
 	*pos += dstUAString->Length;
+	return 0;
 }
 
 Int32 decodeUAGuid(const char *buf, Int32 *pos, UA_Guid *dstGUID)

+ 3 - 1
OPCUAServer/src/opcua_secureChannelLayer.c

@@ -35,6 +35,7 @@ Int32 SL_secureChannel_ResponseHeader_form(UA_connection *connection, T_Response
 
 
 	responseHeader->requestHandle = 0;
+	return 0;
 }
 /*
  *
@@ -47,6 +48,7 @@ Int32 SL_secureChannel_Response_form(UA_connection *connection, SL_Response *res
 	response->SecurityToken.TokenId = connection->secureLayer.tokenId; //TODO  must be generated;
 	response->SecurityToken.RevisedLifeTime = connection->secureLayer.revisedLifetime;
 	response->ServerNonce.Length = 0; // TODO
+	return 0;
 }
 /*
  * opens a secureChannel (server side)
@@ -64,8 +66,8 @@ Int32 SL_secureChannel_open(const UA_connection *connection,
 	TL_send();
 	//client protocol Version
 
+return 0;
 
-//connection->secureLayer.
 }
 /*
  void SL_secureChannel_Request_get(AD_RawMessage        *secureChannelMessage,

+ 8 - 8
OPCUAServer/src/opcua_transportLayer.c

@@ -66,7 +66,7 @@ Int32 TL_checkMessage(UA_connection *connection, AD_RawMessage *TL_messsage)
 
 	Int32 messageLen = decodeUInt32(TL_messsage->message, &position);
 	if (messageLen == TL_messsage->length &&
-		messageLen < (connection->transportLayer.serverConf.maxMessageSize));
+		messageLen < (connection->transportLayer.serverConf.maxMessageSize))
 	{
 		return 1;
 	}
@@ -183,9 +183,9 @@ void TL_getMessageHeader(struct TL_header *header, AD_RawMessage *rawMessage)
 
 	pos = pos + TL_MESSAGE_TYPE_LEN;
 
-	header->Reserved = decodeByte(rawMessage->message,pos);
+	header->Reserved = decodeByte(rawMessage->message,&pos);
 	pos = pos + TL_RESERVED_LEN;
-	header->MessageSize = decodeUInt32(rawMessage->message,pos);
+	header->MessageSize = decodeUInt32(rawMessage->message,&pos);
 
 }
 Int32 TL_getPacketType(AD_RawMessage *rawMessage)
@@ -278,22 +278,22 @@ void TL_processHELMessage(UA_connection *connection, AD_RawMessage *rawMessage)
 	struct TL_header tmpHeader;
 
 	connection->transportLayer.clientConf.protocolVersion =
-			decodeUInt32(rawMessage->message,pos);
+			decodeUInt32(rawMessage->message,&pos);
 	pos = pos + sizeof(UInt32);
 
 	connection->transportLayer.clientConf.recvBufferSize =
-			decodeUInt32(rawMessage->message,pos);
+			decodeUInt32(rawMessage->message,&pos);
 	pos = pos +  sizeof(UInt32);
 
 	connection->transportLayer.clientConf.sendBufferSize =
-			decodeUInt32(rawMessage->message,pos);
+			decodeUInt32(rawMessage->message,&pos);
 	pos = pos +  sizeof(UInt32);
 	connection->transportLayer.clientConf.maxMessageSize =
-			decodeUInt32(rawMessage->message,pos);
+			decodeUInt32(rawMessage->message,&pos);
 	pos = pos +  sizeof(UInt32);
 
 	connection->transportLayer.clientConf.maxChunkCount =
-			decodeUInt32(rawMessage->message,pos);
+			decodeUInt32(rawMessage->message,&pos);
 	pos = pos +  sizeof(UInt32);
 
 	connection->transportLayer.endpointURL.Data = &(rawMessage->message[pos]);

+ 7 - 7
OPCUAServer/tests/check_stack.c

@@ -60,7 +60,7 @@ START_TEST(encodeByte_test)
 	Int32 position = 0;
 	//EncodeByte
 		char *mem = malloc(sizeof(Byte));
-		rawMessage.message = &mem;
+		rawMessage.message = mem;
 		Byte testByte = 0x08;
 		rawMessage.length = 1;
 		position = 0;
@@ -82,7 +82,7 @@ START_TEST(decodeUInt16_test)
 	//EncodeUInt16
 	char mem[2] = {0x01,0x00};
 
-	rawMessage.message = &mem;
+	rawMessage.message = mem;
 
 	rawMessage.length = 2;
 
@@ -103,7 +103,7 @@ START_TEST(encodeUInt16_test)
 	Int32 position = 0;
 	//EncodeUInt16
 	char *mem = malloc(sizeof(UInt16));
-	rawMessage.message = &mem;
+	rawMessage.message = mem;
 	UInt16 testUInt16 = 1;
 	rawMessage.length = 2;
 	position = 0;
@@ -145,7 +145,7 @@ Suite* TL_testSuite_encodeUInt16(void)
 	suite_add_tcase(s,tc_core);
 	return s;
 }
-/*
+
 Suite* TL_testSuite_encodeByte(void)
 {
 	Suite *s = suite_create("encodeByte_test");
@@ -154,7 +154,7 @@ Suite* TL_testSuite_encodeByte(void)
 	suite_add_tcase(s,tc_core);
 	return s;
 }
-*/
+
 /*
 Suite* TL_<TESTSUITENAME>(void)
 {
@@ -187,13 +187,13 @@ int main (void)
 	srunner_run_all(sr,CK_NORMAL);
 	number_failed += srunner_ntests_failed(sr);
 	srunner_free(sr);
-/*
+
 	s = TL_testSuite_encodeByte();
 	sr = srunner_create(s);
 	srunner_run_all(sr,CK_NORMAL);
 	number_failed += srunner_ntests_failed(sr);
 	srunner_free(sr);
-*/
+
 	/* <TESTSUITE_TEMPLATE>
 	s =  <TESTSUITENAME>;
 	sr = srunner_create(s);