Hi zoran,
Reviewed the patch.
Ack.
/Neel.
On Wednesday 25 February 2015 06:14 PM, Zoran Milinkovic wrote:
> osaf/libs/common/immsv/include/immsv_api.h | 2 +-
> osaf/services/saf/immsv/immnd/ImmModel.cc | 12 ++++++------
> osaf/services/saf/immsv/immnd/ImmModel.hh | 2 +-
> osaf/services/saf/immsv/immnd/immnd_evt.c | 4 ++--
> osaf/services/saf/immsv/immnd/immnd_init.h | 2 +-
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
>
> Correct protocol number for OpenSAF 4.6 is 46.
>
> diff --git a/osaf/libs/common/immsv/include/immsv_api.h
> b/osaf/libs/common/immsv/include/immsv_api.h
> --- a/osaf/libs/common/immsv/include/immsv_api.h
> +++ b/osaf/libs/common/immsv/include/immsv_api.h
> @@ -135,7 +135,7 @@ typedef enum {
> #define OPENSAF_IMM_FLAG_PRT43_ALLOW 0x00000004
> #define OPENSAF_IMM_FLAG_2PBE1_ALLOW 0x00000008
> #define OPENSAF_IMM_FLAG_PRT45_ALLOW 0x00000010
> -#define OPENSAF_IMM_FLAG_PRT47_ALLOW 0x00000020
> +#define OPENSAF_IMM_FLAG_PRT46_ALLOW 0x00000020
>
>
> #define OPENSAF_IMM_SERVICE_NAME "safImmService"
> 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
> @@ -914,9 +914,9 @@ immModel_protocol45Allowed(IMMND_CB *cb)
> }
>
> SaBoolT
> -immModel_protocol47Allowed(IMMND_CB *cb)
> -{
> - return (ImmModel::instance(&cb->immModel)->protocol47Allowed()) ?
> +immModel_protocol46Allowed(IMMND_CB *cb)
> +{
> + return (ImmModel::instance(&cb->immModel)->protocol46Allowed()) ?
> SA_TRUE : SA_FALSE;
> }
>
> @@ -3450,7 +3450,7 @@ ImmModel::protocol45Allowed()
> }
>
> bool
> -ImmModel::protocol47Allowed()
> +ImmModel::protocol46Allowed()
> {
> //TRACE_ENTER();
> ObjectMap::iterator oi = sObjectMap.find(immObjectDn);
> @@ -3468,7 +3468,7 @@ ImmModel::protocol47Allowed()
> unsigned int noStdFlags = valuep->getValue_int();
>
> //TRACE_LEAVE();
> - return noStdFlags & OPENSAF_IMM_FLAG_PRT47_ALLOW;
> + return noStdFlags & OPENSAF_IMM_FLAG_PRT46_ALLOW;
> }
>
> bool
> @@ -4325,7 +4325,7 @@ ImmModel::adminOwnerDelete(SaUint32T own
> noStdFlags |= OPENSAF_IMM_FLAG_PRT41_ALLOW;
> noStdFlags |= OPENSAF_IMM_FLAG_PRT43_ALLOW;
> noStdFlags |= OPENSAF_IMM_FLAG_PRT45_ALLOW;
> - noStdFlags |= OPENSAF_IMM_FLAG_PRT47_ALLOW;
> + noStdFlags |= OPENSAF_IMM_FLAG_PRT46_ALLOW;
> valuep->setValue_int(noStdFlags);
> LOG_NO("%s changed to: 0x%x", immAttrNostFlags.c_str(),
> noStdFlags);
> /* END Temporary code. */
> diff --git a/osaf/services/saf/immsv/immnd/ImmModel.hh
> b/osaf/services/saf/immsv/immnd/ImmModel.hh
> --- a/osaf/services/saf/immsv/immnd/ImmModel.hh
> +++ b/osaf/services/saf/immsv/immnd/ImmModel.hh
> @@ -109,7 +109,7 @@ public:
> bool protocol41Allowed();
> bool protocol43Allowed();
> bool protocol45Allowed();
> - bool protocol47Allowed();
> + bool protocol46Allowed();
> bool oneSafe2PBEAllowed();
> bool purgeSyncRequest(SaUint32T clientId);
> bool verifySchemaChange(const std::string& className,
> diff --git a/osaf/services/saf/immsv/immnd/immnd_evt.c
> b/osaf/services/saf/immsv/immnd/immnd_evt.c
> --- a/osaf/services/saf/immsv/immnd/immnd_evt.c
> +++ b/osaf/services/saf/immsv/immnd/immnd_evt.c
> @@ -2342,7 +2342,7 @@ static uint32_t immnd_evt_proc_admowner_
> }
>
> send_evt.type = IMMSV_EVT_TYPE_IMMD;
> - if (!immModel_protocol47Allowed(cb)) {
> + if (!immModel_protocol46Allowed(cb)) {
> send_evt.info.immd.type = IMMD_EVT_ND2D_ADMINIT_REQ;
>
> osaf_extended_name_lend(evt->info.adminitReq.i.adminOwnerName.octetString.buf,
>
> &send_evt.info.immd.info.admown_init.i.adminOwnerName.saName);
> @@ -8876,7 +8876,7 @@ static void immnd_evt_proc_adminit_rsp(I
> SaUint32T conn;
>
> osafassert(evt);
> - osafassert((evt->type != IMMND_EVT_D2ND_ADMINIT_2) ||
> immModel_protocol47Allowed(cb));
> + osafassert((evt->type != IMMND_EVT_D2ND_ADMINIT_2) ||
> immModel_protocol46Allowed(cb));
> conn = m_IMMSV_UNPACK_HANDLE_HIGH(clnt_hdl);
> nodeId = m_IMMSV_UNPACK_HANDLE_LOW(clnt_hdl);
> err = immModel_adminOwnerCreate(cb, &(evt->info.adminitGlobal.i),
> diff --git a/osaf/services/saf/immsv/immnd/immnd_init.h
> b/osaf/services/saf/immsv/immnd/immnd_init.h
> --- a/osaf/services/saf/immsv/immnd/immnd_init.h
> +++ b/osaf/services/saf/immsv/immnd/immnd_init.h
> @@ -298,7 +298,7 @@ extern "C" {
> SaBoolT immModel_protocol41Allowed(IMMND_CB *cb);
> SaBoolT immModel_protocol43Allowed(IMMND_CB *cb);
> SaBoolT immModel_protocol45Allowed(IMMND_CB *cb);
> - SaBoolT immModel_protocol47Allowed(IMMND_CB *cb);
> + SaBoolT immModel_protocol46Allowed(IMMND_CB *cb);
> SaBoolT immModel_oneSafe2PBEAllowed(IMMND_CB *cb);
> OsafImmAccessControlModeT immModel_accessControlMode(IMMND_CB *cb);
> const char *immModel_authorizedGroup(IMMND_CB *cb);
>
> ------------------------------------------------------------------------------
> Dive into the World of Parallel Programming The Go Parallel Website, sponsored
> by Intel and developed in partnership with Slashdot Media, is your hub for all
> things parallel software development, from weekly thought leadership blogs to
> news, videos, case studies, tutorials and more. Take a look and join the
> conversation now. http://goparallel.sourceforge.net/
> _______________________________________________
> Opensaf-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/opensaf-devel
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
