stv0g/libiec61850
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

- added configuration option CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS to limit the maximum number of data set members

Browse source
This commit is contained in:
Michael Zillgith 2015-02-04 17:25:59 +01:00
parent f9d673dcf3
commit 751dc5f7c2
5 changed files with 100 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/stack_config.h
View file

@ -139,12 +139,18 @@
/* Maximum number of open file per MMS connection (for MMS file read service) */ /* Maximum number of open file per MMS connection (for MMS file read service) */
#define CONFIG_MMS_MAX_NUMBER_OF_OPEN_FILES_PER_CONNECTION 5 #define CONFIG_MMS_MAX_NUMBER_OF_OPEN_FILES_PER_CONNECTION 5
/* Maximum number of the domain specific data sets - this also includes the static (pre-configured) and dynamic data sets */
#define CONFIG_MMS_MAX_NUMBER_OF_DOMAIN_SPECIFIC_DATA_SETS 10 #define CONFIG_MMS_MAX_NUMBER_OF_DOMAIN_SPECIFIC_DATA_SETS 10
/* Maximum number of association specific data sets */
#define CONFIG_MMS_MAX_NUMBER_OF_ASSOCIATION_SPECIFIC_DATA_SETS 10 #define CONFIG_MMS_MAX_NUMBER_OF_ASSOCIATION_SPECIFIC_DATA_SETS 10
/* Maximum number of VMD specific data sets */
#define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10 #define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10
/* Maximum number of the members in a data set (named variable list) */
#define CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS 50
/* Definition of supported services */ /* Definition of supported services */
#define MMS_DEFAULT_PROFILE 1 #define MMS_DEFAULT_PROFILE 1

3
config/stack_config.h.cmake
View file

@ -149,6 +149,9 @@
#define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10 #define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10
/* Maximum number of the members in a data set (named variable list) */
#define CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS 50
/* Definition of supported services */ /* Definition of supported services */
#define MMS_DEFAULT_PROFILE 1 #define MMS_DEFAULT_PROFILE 1

14
src/hal/socket/linux/socket_linux.c
View file

@ -140,21 +140,21 @@ prepareServerAddress(const char* address, int port, struct sockaddr_in* sockaddr
memset((char *) sockaddr, 0, sizeof(struct sockaddr_in)); memset((char *) sockaddr, 0, sizeof(struct sockaddr_in));
if (address != NULL) { if (address != NULL) {
struct addrinfo addr_hints; struct addrinfo addressHints;
struct addrinfo *lookup_result; struct addrinfo *lookupResult;
int result; int result;
memset(&addr_hints, 0, sizeof(struct addrinfo)); memset(&addressHints, 0, sizeof(struct addrinfo));
addr_hints.ai_family = AF_INET; addressHints.ai_family = AF_INET;
result = getaddrinfo(address, NULL, &addr_hints, &lookup_result); result = getaddrinfo(address, NULL, &addressHints, &lookupResult);
if (result != 0) { if (result != 0) {
retVal = false; retVal = false;
goto exit_function; goto exit_function;
} }
memcpy(sockaddr, lookup_result->ai_addr, sizeof(struct sockaddr_in)); memcpy(sockaddr, lookupResult->ai_addr, sizeof(struct sockaddr_in));
freeaddrinfo(lookup_result); freeaddrinfo(lookupResult);
} }
else else
sockaddr->sin_addr.s_addr = htonl(INADDR_ANY); sockaddr->sin_addr.s_addr = htonl(INADDR_ANY);

113
src/mms/iso_mms/server/mms_named_variable_list_service.c
View file

@ -43,6 +43,10 @@
#define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10 #define CONFIG_MMS_MAX_NUMBER_OF_VMD_SPECIFIC_DATA_SETS 10
#endif #endif
#ifndef CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS
#define CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS 50
#endif
static void static void
createDeleteNamedVariableListResponse(uint32_t invokeId, ByteBuffer* response, createDeleteNamedVariableListResponse(uint32_t invokeId, ByteBuffer* response,
uint32_t numberMatched, uint32_t numberDeleted) uint32_t numberMatched, uint32_t numberDeleted)
@ -90,8 +94,10 @@ mmsServer_handleDeleteNamedVariableListRequest(MmsServerConnection* connection,
asn_dec_rval_t rval = ber_decode(NULL, &asn_DEF_MmsPdu, (void**) &mmsPdu, buffer, maxBufPos); asn_dec_rval_t rval = ber_decode(NULL, &asn_DEF_MmsPdu, (void**) &mmsPdu, buffer, maxBufPos);
if (rval.code != RC_OK) if (rval.code != RC_OK) {
mmsServer_writeMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response); mmsServer_writeMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response);
goto exit_function;
}
request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.deleteNamedVariableList); request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.deleteNamedVariableList);
@ -134,8 +140,10 @@ mmsServer_handleDeleteNamedVariableListRequest(MmsServerConnection* connection,
} }
} }
else if (request->listOfVariableListName->list.array[i]->present == ObjectName_PR_aaspecific) { else if (request->listOfVariableListName->list.array[i]->present == ObjectName_PR_aaspecific) {
char* itemId = mmsMsg_createStringFromAsnIdentifier( char itemId[65];
request->listOfVariableListName->list.array[i]->choice.aaspecific);
mmsMsg_copyAsn1IdentifierToStringBuffer(request->listOfVariableListName->list.array[i]->choice.aaspecific,
itemId, 65);
MmsNamedVariableList variableList = MmsServerConnection_getNamedVariableList(connection, itemId); MmsNamedVariableList variableList = MmsServerConnection_getNamedVariableList(connection, itemId);
@ -145,8 +153,6 @@ mmsServer_handleDeleteNamedVariableListRequest(MmsServerConnection* connection,
MmsServerConnection_deleteNamedVariableList(connection, itemId); MmsServerConnection_deleteNamedVariableList(connection, itemId);
} }
GLOBAL_FREEMEM(itemId);
} }
} }
@ -157,6 +163,9 @@ mmsServer_handleDeleteNamedVariableListRequest(MmsServerConnection* connection,
} }
asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0); asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0);
exit_function:
return;
} }
static void static void
@ -213,22 +222,30 @@ createNamedVariableList(MmsDevice* device,
DefineNamedVariableListRequest_t* request, DefineNamedVariableListRequest_t* request,
char* variableListName, MmsError* mmsError) char* variableListName, MmsError* mmsError)
{ {
MmsNamedVariableList namedVariableList = MmsNamedVariableList_create(variableListName, true); MmsNamedVariableList namedVariableList = NULL;
int variableCount = request->listOfVariable.list.count; int variableCount = request->listOfVariable.list.count;
if (variableCount > CONFIG_MMS_MAX_NUMBER_OF_DATA_SET_MEMBERS) {
*mmsError = MMS_ERROR_DEFINITION_OTHER;
goto exit_function;
}
namedVariableList = MmsNamedVariableList_create(variableListName, true);
int i; int i;
for (i = 0; i < variableCount; i++) { for (i = 0; i < variableCount; i++) {
VariableSpecification_t* varSpec = VariableSpecification_t* varSpec =
&request->listOfVariable.list.array[i]->variableSpecification; &request->listOfVariable.list.array[i]->variableSpecification;
long arrayIndex = -1; long arrayIndex = -1;
char componentNameBuf[65];
char* componentName = NULL; char* componentName = NULL;
/* Handle alternate access specification - for array element definition */ /* Handle alternate access specification - for array element definition */
if (request->listOfVariable.list.array[i]->alternateAccess != NULL) { if (request->listOfVariable.list.array[i]->alternateAccess != NULL) {
if (request->listOfVariable.list.array[i]->alternateAccess->list.count != 1) { if (request->listOfVariable.list.array[i]->alternateAccess->list.count != 1) {
MmsNamedVariableList_destroy(namedVariableList); MmsNamedVariableList_destroy(namedVariableList);
namedVariableList = NULL; namedVariableList = NULL;
@ -247,10 +264,13 @@ createNamedVariableList(MmsDevice* device,
asn_INTEGER2long(&(alternateAccess->choice.unnamed->choice.selectAlternateAccess.accessSelection.choice.index), asn_INTEGER2long(&(alternateAccess->choice.unnamed->choice.selectAlternateAccess.accessSelection.choice.index),
&arrayIndex); &arrayIndex);
Identifier_t componentIdentifier = alternateAccess->choice.unnamed->
choice.selectAlternateAccess.alternateAccess->list.array[0]->
choice.unnamed->choice.selectAccess.choice.component;
componentName = componentName =
mmsMsg_createStringFromAsnIdentifier(alternateAccess->choice.unnamed-> StringUtils_createStringFromBufferInBuffer(componentNameBuf,
choice.selectAlternateAccess.alternateAccess->list.array[0]-> componentIdentifier.buf, componentIdentifier.size);
choice.unnamed->choice.selectAccess.choice.component);
} }
else { else {
@ -265,13 +285,17 @@ createNamedVariableList(MmsDevice* device,
} }
if (varSpec->present == VariableSpecification_PR_name) { if (varSpec->present == VariableSpecification_PR_name) {
char* variableName = createStringFromBuffer(
varSpec->choice.name.choice.domainspecific.itemId.buf,
varSpec->choice.name.choice.domainspecific.itemId.size);
char* domainId = createStringFromBuffer( char variableName[65];
varSpec->choice.name.choice.domainspecific.domainId.buf, char domainId[65];
varSpec->choice.name.choice.domainspecific.domainId.size);
StringUtils_createStringFromBufferInBuffer(variableName,
varSpec->choice.name.choice.domainspecific.itemId.buf,
varSpec->choice.name.choice.domainspecific.itemId.size);
StringUtils_createStringFromBufferInBuffer(domainId,
varSpec->choice.name.choice.domainspecific.domainId.buf,
varSpec->choice.name.choice.domainspecific.domainId.size);
MmsDomain* domain = MmsDevice_getDomain(device, domainId); MmsDomain* domain = MmsDevice_getDomain(device, domainId);
@ -296,9 +320,6 @@ createNamedVariableList(MmsDevice* device,
i = variableCount; // exit loop after freeing loop variables i = variableCount; // exit loop after freeing loop variables
*mmsError = MMS_ERROR_DEFINITION_OBJECT_UNDEFINED; *mmsError = MMS_ERROR_DEFINITION_OBJECT_UNDEFINED;
} }
GLOBAL_FREEMEM(domainId);
GLOBAL_FREEMEM(variableName);
} }
else { else {
MmsNamedVariableList_destroy(namedVariableList); MmsNamedVariableList_destroy(namedVariableList);
@ -308,6 +329,8 @@ createNamedVariableList(MmsDevice* device,
} }
} }
exit_function:
return namedVariableList; return namedVariableList;
} }
@ -324,8 +347,10 @@ mmsServer_handleDefineNamedVariableListRequest(
asn_dec_rval_t rval = ber_decode(NULL, &asn_DEF_MmsPdu, (void**) &mmsPdu, buffer, maxBufPos); asn_dec_rval_t rval = ber_decode(NULL, &asn_DEF_MmsPdu, (void**) &mmsPdu, buffer, maxBufPos);
if (rval.code != RC_OK) if (rval.code != RC_OK) {
mmsServer_writeMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response); mmsServer_writeMmsRejectPdu(&invokeId, MMS_ERROR_REJECT_INVALID_PDU, response);
goto exit_function;
}
request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.defineNamedVariableList); request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.defineNamedVariableList);
@ -333,22 +358,34 @@ mmsServer_handleDefineNamedVariableListRequest(
if (request->variableListName.present == ObjectName_PR_domainspecific) { if (request->variableListName.present == ObjectName_PR_domainspecific) {
char* domainName = createStringFromBuffer( char domainName[65];
request->variableListName.choice.domainspecific.domainId.buf,
request->variableListName.choice.domainspecific.domainId.size); if (request->variableListName.choice.domainspecific.domainId.size > 64) {
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT);
goto exit_free_struct;
}
StringUtils_createStringFromBufferInBuffer(domainName,
request->variableListName.choice.domainspecific.domainId.buf,
request->variableListName.choice.domainspecific.domainId.size);
MmsDomain* domain = MmsDevice_getDomain(device, domainName); MmsDomain* domain = MmsDevice_getDomain(device, domainName);
GLOBAL_FREEMEM(domainName);
if (domain == NULL) { if (domain == NULL) {
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT); mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT);
return; goto exit_free_struct;
} }
if (LinkedList_size(domain->namedVariableLists) < CONFIG_MMS_MAX_NUMBER_OF_DOMAIN_SPECIFIC_DATA_SETS) { if (LinkedList_size(domain->namedVariableLists) < CONFIG_MMS_MAX_NUMBER_OF_DOMAIN_SPECIFIC_DATA_SETS) {
char* variableListName = createStringFromBuffer( char variableListName[65];
request->variableListName.choice.domainspecific.itemId.buf,
if (request->variableListName.choice.domainspecific.itemId.size > 64) {
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT);
goto exit_free_struct;
}
StringUtils_createStringFromBufferInBuffer(variableListName,
request->variableListName.choice.domainspecific.itemId.buf,
request->variableListName.choice.domainspecific.itemId.size); request->variableListName.choice.domainspecific.itemId.size);
if (MmsDomain_getNamedVariableList(domain, variableListName) != NULL) { if (MmsDomain_getNamedVariableList(domain, variableListName) != NULL) {
@ -367,8 +404,6 @@ mmsServer_handleDefineNamedVariableListRequest(
else else
mmsServer_createConfirmedErrorPdu(invokeId, response, mmsError); mmsServer_createConfirmedErrorPdu(invokeId, response, mmsError);
} }
GLOBAL_FREEMEM(variableListName);
} }
else else
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_RESOURCE_CAPABILITY_UNAVAILABLE); mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_RESOURCE_CAPABILITY_UNAVAILABLE);
@ -379,10 +414,16 @@ mmsServer_handleDefineNamedVariableListRequest(
if (LinkedList_size(connection->namedVariableLists) < CONFIG_MMS_MAX_NUMBER_OF_ASSOCIATION_SPECIFIC_DATA_SETS) { if (LinkedList_size(connection->namedVariableLists) < CONFIG_MMS_MAX_NUMBER_OF_ASSOCIATION_SPECIFIC_DATA_SETS) {
char* variableListName = createStringFromBuffer( char variableListName[65];
request->variableListName.choice.aaspecific.buf,
request->variableListName.choice.aaspecific.size);
if (request->variableListName.choice.aaspecific.size > 64) {
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_NON_EXISTENT);
goto exit_free_struct;
}
StringUtils_createStringFromBufferInBuffer(variableListName,
request->variableListName.choice.aaspecific.buf,
request->variableListName.choice.aaspecific.size);
if (MmsServerConnection_getNamedVariableList(connection, variableListName) != NULL) { if (MmsServerConnection_getNamedVariableList(connection, variableListName) != NULL) {
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_DEFINITION_OBJECT_EXISTS); mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_DEFINITION_OBJECT_EXISTS);
@ -400,8 +441,6 @@ mmsServer_handleDefineNamedVariableListRequest(
else else
mmsServer_createConfirmedErrorPdu(invokeId, response, mmsError); mmsServer_createConfirmedErrorPdu(invokeId, response, mmsError);
} }
GLOBAL_FREEMEM(variableListName);
} }
else else
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_RESOURCE_CAPABILITY_UNAVAILABLE); mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_RESOURCE_CAPABILITY_UNAVAILABLE);
@ -409,7 +448,11 @@ mmsServer_handleDefineNamedVariableListRequest(
else else
mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_DEFINITION_TYPE_UNSUPPORTED); mmsServer_createConfirmedErrorPdu(invokeId, response, MMS_ERROR_DEFINITION_TYPE_UNSUPPORTED);
exit_free_struct:
asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0); asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0);
exit_function:
return;
} }
#endif /* (MMS_DYNAMIC_DATA_SETS == 1) */ #endif /* (MMS_DYNAMIC_DATA_SETS == 1) */

6
src/mms/iso_mms/server/mms_server_common.c
View file

@ -81,6 +81,12 @@ mmsServer_createConfirmedErrorPdu(uint32_t invokeId, ByteBuffer* response, MmsEr
asn_long2INTEGER(&mmsPdu->choice.confirmedErrorPDU.serviceError.errorClass.choice.access, asn_long2INTEGER(&mmsPdu->choice.confirmedErrorPDU.serviceError.errorClass.choice.access,
ServiceError__errorClass__service_other); ServiceError__errorClass__service_other);
} }
else if (errorType == MMS_ERROR_DEFINITION_OTHER) {
mmsPdu->choice.confirmedErrorPDU.serviceError.errorClass.present =
ServiceError__errorClass_PR_definition;
asn_long2INTEGER(&mmsPdu->choice.confirmedErrorPDU.serviceError.errorClass.choice.access,
ServiceError__errorClass__definition_other);
}
else if (errorType == MMS_ERROR_DEFINITION_OBJECT_EXISTS) { else if (errorType == MMS_ERROR_DEFINITION_OBJECT_EXISTS) {
mmsPdu->choice.confirmedErrorPDU.serviceError.errorClass.present = mmsPdu->choice.confirmedErrorPDU.serviceError.errorClass.present =
ServiceError__errorClass_PR_definition; ServiceError__errorClass_PR_definition;