1 files changed, 35 insertions, 9 deletions
diff --git a/implementation/message/src/message_impl.cpp b/implementation/message/src/message_impl.cpp
index 25cf584..c784e52 100644
--- a/implementation/message/src/message_impl.cpp
+++ b/implementation/message/src/message_impl.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2014-2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -19,7 +19,9 @@ namespace vsomeip_v3 {
 
 message_impl::message_impl()
     : payload_(runtime::get()->create_payload()),
-      check_result_(0), uid_(ANY_UID), gid_(ANY_GID) {
+      check_result_(0) {
+
+    sec_client_.client_type = VSOMEIP_CLIENT_INVALID;
 }
 
 message_impl::~message_impl() {
@@ -66,19 +68,43 @@ bool message_impl::is_valid_crc() const {
 }
 
 uid_t message_impl::get_uid() const {
-    return uid_;
+
+    uid_t its_uid(ANY_UID);
+
+    if (sec_client_.client_type == VSOMEIP_CLIENT_UDS) {
+        its_uid = sec_client_.client.uds_client.user;
+    }
+
+    return (its_uid);
 }
 
-void message_impl::set_uid(uid_t _uid) {
-    uid_ = _uid;
+gid_t message_impl::get_gid() const {
+
+    gid_t its_gid(ANY_GID);
+
+    if (sec_client_.client_type == VSOMEIP_CLIENT_UDS) {
+        its_gid = sec_client_.client.uds_client.group;
+    }
+
+    return (its_gid);
+}
+
+vsomeip_sec_client_t message_impl::get_sec_client() const {
+
+    return (sec_client_);
+}
+
+void message_impl::set_sec_client(const vsomeip_sec_client_t &_sec_client) {
+
+    sec_client_ = _sec_client;
 }
 
-uid_t message_impl::get_gid() const {
-    return gid_;
+std::string message_impl::get_env() const {
+    return env_;
 }
 
-void message_impl::set_gid(gid_t _gid) {
-    gid_ = _gid;
+void message_impl::set_env(const std::string &_env) {
+    env_ = _env;
 }
 
 } // namespace vsomeip_v3