osaf/libs/common/ais/aisa_api.c | 2 +-
osaf/libs/common/ntfsv/ntfsv_enc_dec.c | 2 +-
osaf/libs/common/ntfsv/ntfsv_mem.c | 4 ++--
osaf/libs/core/common/include/osaf_extended_name.h | 14 +++++++-------
osaf/libs/core/common/osaf_extended_name.c | 14 +++++++-------
osaf/services/saf/immsv/immloadd/imm_loader.cc | 4 ++--
osaf/services/saf/immsv/immnd/ImmModel.cc | 18 +++++++++---------
osaf/services/saf/ntfsv/ntfimcnd/ntfimcn_notifier.c | 4 ++--
osaf/services/saf/smfsv/smfd/SmfUtils.cc | 4 ++--
osaf/tools/safimm/immcfg/imm_import.cc | 4 ++--
osaf/tools/safntf/ntfread/ntfread.c | 4 ++--
osaf/tools/safntf/ntfsend/ntfsend.c | 4 ++--
12 files changed, 39 insertions(+), 39 deletions(-)
The constants kMaxDnLength and kExtendedNameMagic have been renamed to
kOsafMaxDnLength and kOsafExtendedNameMagic, respectively. The reason is to make
it visible that these constants are on the global OpenSAF level, i.e. that they
don't belong to any specific OpenSAF service.
diff --git a/osaf/libs/common/ais/aisa_api.c b/osaf/libs/common/ais/aisa_api.c
--- a/osaf/libs/common/ais/aisa_api.c
+++ b/osaf/libs/common/ais/aisa_api.c
@@ -115,7 +115,7 @@ SaConstStringT ais_name_borrow(const SaN
TRACE_ENTER();
SaConstStringT value = osaf_extended_name_borrow(name);
size_t length = name->_opaque[0];
- if (length != kExtendedNameMagic) {
+ if (length != kOsafExtendedNameMagic) {
/*
* Check that the string inside SaNameT is properly
* NUL-terminated. If not, we return a NULL pointer. We allow
diff --git a/osaf/libs/common/ntfsv/ntfsv_enc_dec.c
b/osaf/libs/common/ntfsv/ntfsv_enc_dec.c
--- a/osaf/libs/common/ntfsv/ntfsv_enc_dec.c
+++ b/osaf/libs/common/ntfsv/ntfsv_enc_dec.c
@@ -361,7 +361,7 @@ static uint32_t decodeSaNameT(NCS_UBAID
uint32_t rv;
p8 = ncs_dec_flatten_space(uba, local_data, 2);
size_t length = ncs_decode_16bit(&p8);
- if (length > kMaxDnLength) {
+ if (length > kOsafMaxDnLength) {
LOG_ER("SaNameT length too long: %zu", length);
/* this should not happen */
osafassert(0);
diff --git a/osaf/libs/common/ntfsv/ntfsv_mem.c
b/osaf/libs/common/ntfsv/ntfsv_mem.c
--- a/osaf/libs/common/ntfsv/ntfsv_mem.c
+++ b/osaf/libs/common/ntfsv/ntfsv_mem.c
@@ -1275,9 +1275,9 @@ bool ntfsv_sanamet_is_valid(const SaName
"is not set, or not using extended name api");
return false;
}
- if (osaf_extended_name_length(pName) > kMaxDnLength) {
+ if (osaf_extended_name_length(pName) > kOsafMaxDnLength) {
LOG_ER("Exceeding maximum of extended name length(%u)"
- ,kMaxDnLength);
+ ,kOsafMaxDnLength);
return false;
}
return true;
diff --git a/osaf/libs/core/common/include/osaf_extended_name.h
b/osaf/libs/core/common/include/osaf_extended_name.h
--- a/osaf/libs/core/common/include/osaf_extended_name.h
+++ b/osaf/libs/core/common/include/osaf_extended_name.h
@@ -42,13 +42,13 @@ enum {
* stored immediately after the first 16-bit word (typically in the first
* four or eight bytes of the .value field of the legacy SaNameT type.
*/
- kExtendedNameMagic = 0xcd2b,
+ kOsafExtendedNameMagic = 0xcd2b,
/**
* Maximum length of a distinguished name, not counting the terminating NUL
* character.
*/
- kMaxDnLength = 2048
+ kOsafMaxDnLength = 2048
};
/**
@@ -90,7 +90,7 @@ void osaf_extended_name_lend(SaConstStri
*
* This function returns a pointer to the string value in the legacy SaNameT
@a
* name. If the .length field of the legacy SaNameT structure is not equal to
- * the magic number @a kExtendedNameMagic, the returned pointer points to a
+ * the magic number @a kOsafExtendedNameMagic, the returned pointer points to
a
* copy of the string stored inside @a name. Otherwise, the returned pointer
* points to memory outside @a name.
*
@@ -120,10 +120,10 @@ bool osaf_is_an_extended_name(const SaNa
*
* This function returns true if the SaNameT @a name passes some sanity
checks,
* e.g. that the length field is either equal to the magic number @a
- * kExtendedNameMagic, or strictly less than SA_MAX_UNEXTENDED_NAME_LENGTH. It
- * returns false if @a name failed some of the sanity checks. It may of course
- * also crash the process if @a name is severly corrupted, e.g. if the pointer
- * stored inside @a name points to inaccessible memory.
+ * kOsafExtendedNameMagic, or strictly less than
SA_MAX_UNEXTENDED_NAME_LENGTH.
+ * It returns false if @a name failed some of the sanity checks. It may of
+ * course also crash the process if @a name is severely corrupted, e.g. if the
+ * pointer stored inside @a name points to inaccessible memory.
*
* NOTE: This function is intended to be used in agent libraries to read
* SaNameT structures that may have been set by legacy application
diff --git a/osaf/libs/core/common/osaf_extended_name.c
b/osaf/libs/core/common/osaf_extended_name.c
--- a/osaf/libs/core/common/osaf_extended_name.c
+++ b/osaf/libs/core/common/osaf_extended_name.c
@@ -60,7 +60,7 @@ static inline void set_ptr(SaConstString
SaUint8T bytes[sizeof(SaConstStringT)];
} tmp;
tmp.pointer = value;
- name->_opaque[0] = kExtendedNameMagic;
+ name->_opaque[0] = kOsafExtendedNameMagic;
memcpy(name->_opaque + kExtendedNamePointerOffset, tmp.bytes,
sizeof(SaConstStringT));
}
@@ -93,7 +93,7 @@ SaConstStringT osaf_extended_name_borrow
{
size_t length = name->_opaque[0];
SaConstStringT value;
- if (length != kExtendedNameMagic) {
+ if (length != kOsafExtendedNameMagic) {
value = (SaConstStringT) (name->_opaque + 1);
} else {
value = get_ptr(name);
@@ -103,14 +103,14 @@ SaConstStringT osaf_extended_name_borrow
bool osaf_is_an_extended_name(const SaNameT* name)
{
- return name->_opaque[0] == kExtendedNameMagic;
+ return name->_opaque[0] == kOsafExtendedNameMagic;
}
bool osaf_is_extended_name_valid(const SaNameT* name)
{
size_t length = name->_opaque[0];
bool is_valid;
- if (length != kExtendedNameMagic) {
+ if (length != kOsafExtendedNameMagic) {
is_valid = length < SA_MAX_UNEXTENDED_NAME_LENGTH;
} else {
is_valid = osaf_extended_names_enabled &&
@@ -124,7 +124,7 @@ bool osaf_is_extended_name_empty(const S
{
size_t length = name->_opaque[0];
bool is_empty;
- if (length != kExtendedNameMagic) {
+ if (length != kOsafExtendedNameMagic) {
is_empty = length == 0;
} else {
is_empty = *get_ptr(name) == '\0';
@@ -135,7 +135,7 @@ bool osaf_is_extended_name_empty(const S
size_t osaf_extended_name_length(const SaNameT* name)
{
size_t length = name->_opaque[0];
- if (length != kExtendedNameMagic) {
+ if (length != kOsafExtendedNameMagic) {
osafassert(length < SA_MAX_UNEXTENDED_NAME_LENGTH);
length = strnlen((const char*) (name->_opaque + 1), length);
} else {
@@ -191,7 +191,7 @@ void osaf_extended_name_alloc(SaConstStr
void osaf_extended_name_free(SaNameT* name)
{
if (name != NULL) {
- if (name->_opaque[0] == kExtendedNameMagic) {
+ if (name->_opaque[0] == kOsafExtendedNameMagic) {
free((SaStringT*) get_ptr(name));
}
name->_opaque[0] = 0xffff;
diff --git a/osaf/services/saf/immsv/immloadd/imm_loader.cc
b/osaf/services/saf/immsv/immloadd/imm_loader.cc
--- a/osaf/services/saf/immsv/immloadd/imm_loader.cc
+++ b/osaf/services/saf/immsv/immloadd/imm_loader.cc
@@ -2505,9 +2505,9 @@ int syncObjectsOfClass(std::string class
exit(1);
}
- if (objectNameLength > kMaxDnLength) {
+ if (objectNameLength > kOsafMaxDnLength) {
LOG_ER("syncObjectsOfClass: objectName.length(%zu) > %zu",
- objectNameLength, static_cast<size_t>(kMaxDnLength));
+ objectNameLength,
static_cast<size_t>(kOsafMaxDnLength));
exit(1);
}
diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc
b/osaf/services/saf/immsv/immnd/ImmModel.cc
--- a/osaf/services/saf/immsv/immnd/ImmModel.cc
+++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
@@ -3057,7 +3057,7 @@ ImmModel::classCreate(const ImmsvOmClass
attNm, v->val.x.size - 1);
err = SA_AIS_ERR_LIBRARY;
illegal = 1;
- } else if (v->val.x.size > kMaxDnLength) {
+ } else if (v->val.x.size > kOsafMaxDnLength) {
LOG_NO("ERR_LIBRARY: attr '%s' of type SaNameT is too
long:%u",
attNm, v->val.x.size - 1);
err = SA_AIS_ERR_LIBRARY;
@@ -6878,9 +6878,9 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im
objectName.append(parentName);
}
- if (objectName.size() > ((longDnsPermitted) ? kMaxDnLength :
(SA_MAX_UNEXTENDED_NAME_LENGTH - 1))) {
+ if (objectName.size() > ((longDnsPermitted) ? kOsafMaxDnLength :
(SA_MAX_UNEXTENDED_NAME_LENGTH - 1))) {
TRACE_7("ERR_NAME_TOO_LONG: DN is too long, size:%u, max size is:%u",
- (unsigned int) objectName.size(), kMaxDnLength);
+ (unsigned int) objectName.size(), kOsafMaxDnLength);
err = SA_AIS_ERR_NAME_TOO_LONG;
goto ccbObjectCreateExit;
}
@@ -6998,7 +6998,7 @@ SaAisErrorT ImmModel::ccbObjectCreate(Im
}
if(attr->mValueType == SA_IMM_ATTR_SANAMET) {
- if(p->n.attrValue.val.x.size > kMaxDnLength) {
+ if(p->n.attrValue.val.x.size > kOsafMaxDnLength) {
LOG_NO("ERR_LIBRARY: attr '%s' of type SaNameT is too
long:%u",
attrName.c_str(), p->n.attrValue.val.x.size - 1);
err = SA_AIS_ERR_LIBRARY;
@@ -7928,7 +7928,7 @@ ImmModel::ccbObjectModify(const ImmsvOmC
}
}
- if(p->attrValue.attrValue.val.x.size > kMaxDnLength) {
+ if(p->attrValue.attrValue.val.x.size > kOsafMaxDnLength) {
LOG_NO("ERR_LIBRARY: attr '%s' of type SaNameT is too long:%u",
attrName.c_str(), p->attrValue.attrValue.val.x.size - 1);
err = SA_AIS_ERR_LIBRARY;
@@ -13769,9 +13769,9 @@ ImmModel::rtObjectCreate(struct ImmsvOmC
objectName.append(parentName);
}
- if (objectName.size() > ((longDnsPermitted) ? kMaxDnLength :
(SA_MAX_UNEXTENDED_NAME_LENGTH -1))) {
+ if (objectName.size() > ((longDnsPermitted) ? kOsafMaxDnLength :
(SA_MAX_UNEXTENDED_NAME_LENGTH -1))) {
TRACE_7("ERR_NAME_TOO_LONG: DN is too long, size:%u, max size is:%u",
- (unsigned int) objectName.size(), kMaxDnLength);
+ (unsigned int) objectName.size(), kOsafMaxDnLength);
err = SA_AIS_ERR_NAME_TOO_LONG;
goto rtObjectCreateExit;
}
@@ -13878,7 +13878,7 @@ ImmModel::rtObjectCreate(struct ImmsvOmC
break; //out of for-loop
}
if(attr->mValueType == SA_IMM_ATTR_SANAMET) {
- if(p->n.attrValue.val.x.size > kMaxDnLength) {
+ if(p->n.attrValue.val.x.size > kOsafMaxDnLength) {
LOG_NO("ERR_LIBRARY: attr '%s' of type SaNameT is too
long:%u",
attrName.c_str(), p->n.attrValue.val.x.size - 1);
err = SA_AIS_ERR_LIBRARY;
@@ -15079,7 +15079,7 @@ ImmModel::rtObjectUpdate(const ImmsvOmCc
}
}
- if (p->attrValue.attrValue.val.x.size > kMaxDnLength) {
+ if (p->attrValue.attrValue.val.x.size > kOsafMaxDnLength) {
LOG_NO("ERR_LIBRARY: attr '%s' of type SaNameT is too
long:%u",
attrName.c_str(), p->attrValue.attrValue.val.x.size -
1);
err = SA_AIS_ERR_LIBRARY;
diff --git a/osaf/services/saf/ntfsv/ntfimcnd/ntfimcn_notifier.c
b/osaf/services/saf/ntfsv/ntfimcnd/ntfimcn_notifier.c
--- a/osaf/services/saf/ntfsv/ntfimcnd/ntfimcn_notifier.c
+++ b/osaf/services/saf/ntfsv/ntfimcnd/ntfimcn_notifier.c
@@ -167,8 +167,8 @@ done:
/* Allocate string for attribute name */
name_len = strlen(info_value);
- if (name_len > kMaxDnLength)
- name_len = kMaxDnLength;
+ if (name_len > kOsafMaxDnLength)
+ name_len = kOsafMaxDnLength;
rc = saNtfPtrValAllocate(
notificationHandle,
name_len + 1,
diff --git a/osaf/services/saf/smfsv/smfd/SmfUtils.cc
b/osaf/services/saf/smfsv/smfd/SmfUtils.cc
--- a/osaf/services/saf/smfsv/smfd/SmfUtils.cc
+++ b/osaf/services/saf/smfsv/smfd/SmfUtils.cc
@@ -718,8 +718,8 @@ SmfImmUtils::read_IMM_long_DN_config_and
{
TRACE_ENTER();
- //here is the only place where "kMaxDnLength" constant is directly used
- uint32_t maxDnLength = kMaxDnLength;
+ //here is the only place where "kOsafMaxDnLength" constant is directly
used
+ uint32_t maxDnLength = kOsafMaxDnLength;
/* First check if long DNs already enabled.
* If enabled then there is no need to check it again,
diff --git a/osaf/tools/safimm/immcfg/imm_import.cc
b/osaf/tools/safimm/immcfg/imm_import.cc
--- a/osaf/tools/safimm/immcfg/imm_import.cc
+++ b/osaf/tools/safimm/immcfg/imm_import.cc
@@ -1763,7 +1763,7 @@ static void charactersHandler(void* user
break;
case DN:
/* Copy the distinguished name */
- if (len > kMaxDnLength) {
+ if (len > kOsafMaxDnLength) {
LOG_ER("DN is too long (%d characters)", len);
stopParser(state);
state->parsingStatus = 1;
@@ -2474,7 +2474,7 @@ static int charsToValueHelper(SaImmAttrV
break;
case SA_IMM_ATTR_SANAMET:
len = strlen(str);
- if (len > kMaxDnLength) {
+ if (len > kOsafMaxDnLength) {
LOG_ER("SaNameT value is too long: %d characters", len);
return 1;
}
diff --git a/osaf/tools/safntf/ntfread/ntfread.c
b/osaf/tools/safntf/ntfread/ntfread.c
--- a/osaf/tools/safntf/ntfread/ntfread.c
+++ b/osaf/tools/safntf/ntfread/ntfread.c
@@ -318,7 +318,7 @@ int main(int argc, char *argv[]) {
filterAlarm = false;
break;
case 'N':
- if (strlen(optarg) > kMaxDnLength) {
+ if (strlen(optarg) > kOsafMaxDnLength) {
fprintf(stderr, "notifyingObject too long\n");
exit(EXIT_FAILURE);
}
@@ -326,7 +326,7 @@ int main(int argc, char *argv[]) {
nNyObj = 1;
break;
case 'n':
- if (strlen(optarg) > kMaxDnLength) {
+ if (strlen(optarg) > kOsafMaxDnLength) {
fprintf(stderr, "notificationObject too
long\n");
exit(EXIT_FAILURE);
}
diff --git a/osaf/tools/safntf/ntfsend/ntfsend.c
b/osaf/tools/safntf/ntfsend/ntfsend.c
--- a/osaf/tools/safntf/ntfsend/ntfsend.c
+++ b/osaf/tools/safntf/ntfsend/ntfsend.c
@@ -832,14 +832,14 @@ int main(int argc, char *argv[])
getVendorId(&myNotificationParams.notificationClassId);
break;
case 'n':
- if (strlen(optarg) > kMaxDnLength) {
+ if (strlen(optarg) > kOsafMaxDnLength) {
fprintf(stderr, "notificationObject too
long\n");
exit(EXIT_FAILURE);
}
saAisNameLend(optarg,
&myNotificationParams.notificationObject);
break;
case 'N':
- if (strlen(optarg) > kMaxDnLength) {
+ if (strlen(optarg) > kOsafMaxDnLength) {
fprintf(stderr, "notifyingObject too
long\n");
exit(EXIT_FAILURE);
}
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
