C support multiple clients

Signed-off-by: Cervenka Dusan <cervenka@acrios.com>

Author: Hadatko

erpc_c/infra/erpc_arbitrated_client_manager.h

@@ -58,6 +58,13 @@ class ArbitratedClientManager : public ClientManager
      */
     void setArbitrator(TransportArbitrator *arbitrator);
 
+    /*!
+     * @brief Gets the transport arbitrator instance.
+     *
+     * @return TransportArbitrator * Transport arbitrator instance.
+     */
+    TransportArbitrator * getArbitrator(void) { return m_arbitrator; };
+
 protected:
     TransportArbitrator *m_arbitrator; //!< Optional transport arbitrator. May be NULL.
 

erpc_c/infra/erpc_client_manager.cpp

@@ -24,11 +24,6 @@ bool nestingDetection = false;
 #endif
 #endif
 
-void ClientManager::setTransport(Transport *transport)
-{
-    m_transport = transport;
-}
-
 RequestContext ClientManager::createRequest(bool isOneway)
 {
     // Create codec to read and write the request.

erpc_c/infra/erpc_client_manager.h

@@ -13,8 +13,6 @@
 
 #ifdef __cplusplus
 #include "erpc_client_server_common.h"
-#include "erpc_codec.h"
-#include "erpc_config_internal.h"
 #if ERPC_NESTED_CALLS
 #include "erpc_server.h"
 #include "erpc_threading.h"
@@ -32,6 +30,9 @@ extern "C" {
 typedef void (*client_error_handler_t)(erpc_status_t err,
                                        uint32_t functionID); /*!< eRPC error handler function type. */
 
+//! @brief Opaque client object type.
+typedef struct ClientType *erpc_client_t;
+
 #ifdef __cplusplus
 }
 
@@ -60,9 +61,6 @@ class ClientManager : public ClientServerCommon
      */
     ClientManager(void)
     : ClientServerCommon()
-    , m_messageFactory(NULL)
-    , m_codecFactory(NULL)
-    , m_transport(NULL)
     , m_sequence(0)
     , m_errorHandler(NULL)
 #if ERPC_NESTED_CALLS
@@ -77,29 +75,6 @@ class ClientManager : public ClientServerCommon
      */
     virtual ~ClientManager(void) {}
 
-    /*!
-     * @brief This function sets message buffer factory to use.
-     *
-     * @param[in] factory Message buffer factory to use.
-     */
-    void setMessageBufferFactory(MessageBufferFactory *factory) { m_messageFactory = factory; }
-
-    /*!
-     * @brief This function sets codec factory to use.
-     *
-     * @param[in] factory Codec factory to use.
-     */
-    void setCodecFactory(CodecFactory *factory) { m_codecFactory = factory; }
-
-    /*!
-     * @brief This function sets transport layer to use.
-     *
-     * It also set messageBufferFactory to the same as in transport layer.
-     *
-     * @param[in] transport Transport layer to use.
-     */
-    void setTransport(Transport *transport);
-
     /*!
      * @brief This function creates request context.
      *
@@ -155,9 +130,6 @@ class ClientManager : public ClientServerCommon
 #endif
 
 protected:
-    MessageBufferFactory *m_messageFactory; //!< Message buffer factory to use.
-    CodecFactory *m_codecFactory;           //!< Codec to use.
-    Transport *m_transport;                 //!< Transport layer to use.
     uint32_t m_sequence;                    //!< Sequence number.
     client_error_handler_t m_errorHandler;  //!< Pointer to function error handler.
 #if ERPC_NESTED_CALLS

erpc_c/infra/erpc_client_server_common.h

@@ -11,6 +11,7 @@
 #define _EMBEDDED_RPC__CLIENTSERVERCOMMON_H_
 
 #include "erpc_config_internal.h"
+#include "erpc_codec.h"
 #if ERPC_MESSAGE_LOGGING
 #include "erpc_message_loggers.h"
 #endif
@@ -65,7 +66,7 @@ class ClientServerCommon
 #endif
 #if ERPC_MESSAGE_LOGGING
 #ifdef ERPC_OTHER_INHERITANCE
-        ,
+    ,
 #else
 #define ERPC_OTHER_INHERITANCE 1
     :
@@ -74,19 +75,70 @@ class ClientServerCommon
 #endif
 #if ERPC_PRE_POST_ACTION
 #ifdef ERPC_OTHER_INHERITANCE
-            ,
+    ,
 #else
 #define ERPC_OTHER_INHERITANCE 1
     :
 #endif
         PrePostAction()
 #endif
+#ifdef ERPC_OTHER_INHERITANCE
+    ,
+#else
+#define ERPC_OTHER_INHERITANCE 1
+    :
+#endif
+    m_messageFactory(NULL)
+    , m_codecFactory(NULL)
+    , m_transport(NULL)
             {};
 
     /*!
      * @brief ClientServerCommon destructor
      */
     ~ClientServerCommon(void){};
+
+    /*!
+     * @brief This function sets message buffer factory to use.
+     *
+     * @param[in] factory Message buffer factory to use.
+     */
+    void setMessageBufferFactory(MessageBufferFactory *factory) { m_messageFactory = factory; }
+
+    /*!
+     * @brief This function sets codec factory to use.
+     *
+     * @param[in] factory Codec factory to use.
+     */
+    void setCodecFactory(CodecFactory *factory) { m_codecFactory = factory; }
+
+    /*!
+     * @brief This function sets codec factory to use.
+     *
+     * @return CodecFactory * Codec factory to use.
+     */
+    CodecFactory * getCodecFactory(void) { return m_codecFactory; }
+
+    /*!
+     * @brief This function sets transport layer to use.
+     *
+     * It also set messageBufferFactory to the same as in transport layer.
+     *
+     * @param[in] transport Transport layer to use.
+     */
+    void setTransport(Transport *transport) { m_transport = transport; }
+
+    /*!
+     * @brief This function gets transport instance.
+     *
+     * @return Transport * Pointer to transport instance.
+     */
+    Transport * getTransport(void) { return m_transport; }
+
+protected:
+    MessageBufferFactory *m_messageFactory; //!< Message buffer factory to use.
+    CodecFactory *m_codecFactory;           //!< Codec to use.
+    Transport *m_transport;                 //!< Transport layer to use.
 };
 
 } // namespace erpc

erpc_c/infra/erpc_framed_transport.h

@@ -109,6 +109,13 @@ class FramedTransport : public Transport
      */
     virtual void setCrc16(Crc16 *crcImpl) override;
 
+    /*!
+     * @brief This functions gets the CRC-16 object.
+     *
+     * @return Crc16* Pointer to CRC-16 object containing crc-16 compute function.
+     */
+    virtual Crc16 * getCrc16() override { return m_crcImpl; }
+
 protected:
     Crc16 *m_crcImpl; /*!< CRC object. */
 

erpc_c/infra/erpc_server.cpp

@@ -21,11 +21,6 @@ extern bool nestingDetection;
 bool nestingDetection = false;
 #endif
 
-void Server::setTransport(Transport *transport)
-{
-    m_transport = transport;
-}
-
 void Server::addService(Service *service)
 {
     if (m_firstService == NULL)

erpc_c/infra/erpc_server.h

@@ -12,7 +12,6 @@
 #define _EMBEDDED_RPC__SERVER_H_
 
 #include "erpc_client_server_common.h"
-#include "erpc_codec.h"
 #include "erpc_config_internal.h"
 #if ERPC_NESTED_CALLS
 #include "erpc_client_manager.h"
@@ -110,9 +109,6 @@ class Server : public ClientServerCommon
      */
     Server(void)
     : ClientServerCommon()
-    , m_messageFactory(NULL)
-    , m_codecFactory(NULL)
-    , m_transport(NULL)
     , m_firstService(NULL)
     {
     }
@@ -122,29 +118,6 @@ class Server : public ClientServerCommon
      */
     virtual ~Server(void) {}
 
-    /*!
-     * @brief Set MessageBufferFactory to use.
-     *
-     * @param[in] factory MessageBufferFactory to use.
-     */
-    void setMessageBufferFactory(MessageBufferFactory *factory) { m_messageFactory = factory; }
-
-    /*!
-     * @brief Set CodecFactory to use.
-     *
-     * @param[in] factory CodecFactory to use.
-     */
-    void setCodecFactory(CodecFactory *factory) { m_codecFactory = factory; }
-
-    /*!
-     * @brief This function sets transport layer to use.
-     *
-     * It also set messageBufferFactory to the same as in transport layer.
-     *
-     * @param[in] transport Transport layer to use.
-     */
-    void setTransport(Transport *transport);
-
     /*!
      * @brief Add service.
      *
@@ -170,9 +143,6 @@ class Server : public ClientServerCommon
     virtual void stop(void) = 0;
 
 protected:
-    MessageBufferFactory *m_messageFactory; /*!< Contains MessageBufferFactory to use. */
-    CodecFactory *m_codecFactory;           /*!< Contains CodecFactory to use. */
-    Transport *m_transport;                 /*!< Transport layer used to send and receive data. */
     Service *m_firstService;                /*!< Contains pointer to first service. */
 
     /*!

erpc_c/infra/erpc_transport.h

@@ -85,6 +85,13 @@ class Transport
      * @param[in] crcImpl Object containing crc-16 compute function.
      */
     virtual void setCrc16(Crc16 *crcImpl) { (void)crcImpl; }
+
+    /*!
+     * @brief This functions gets the CRC-16 object.
+     *
+     * @return Crc16* Pointer to CRC-16 object containing crc-16 compute function.
+     */
+    virtual Crc16 * getCrc16() { return NULL; }
 };
 
 /*!

erpc_c/infra/erpc_transport_arbitrator.cpp

@@ -51,6 +51,12 @@ void TransportArbitrator::setCrc16(Crc16 *crcImpl)
     m_sharedTransport->setCrc16(crcImpl);
 }
 
+Crc16 *TransportArbitrator::getCrc16(void)
+{
+    erpc_assert(m_sharedTransport != NULL);
+    return m_sharedTransport->getCrc16();
+}
+
 bool TransportArbitrator::hasMessage(void)
 {
     erpc_assert((m_sharedTransport != NULL) && ("shared transport is not set" != NULL));

erpc_c/infra/erpc_transport_arbitrator.h

@@ -60,13 +60,27 @@ class TransportArbitrator : public Transport
      */
     void setSharedTransport(Transport *shared) { m_sharedTransport = shared; }
 
+    /*!
+     * @brief This function returns shared client/server transport.
+     *
+     * @return Transport * Returns shared client/server transport.
+     */
+    Transport * getSharedTransport(void) { return m_sharedTransport; }
+
     /*!
      * @brief This function set codec.
      *
      * @param[in] codec Codec.
      */
     void setCodec(Codec *codec) { m_codec = codec; }
 
+    /*!
+     * @brief This function get codec.
+     *
+     * @return Codec * Pointer to codec used within transport.
+     */
+    Codec * getCodec(void) { return m_codec; }
+
     /*!
      * @brief Prototype for receiving message.
      *
@@ -121,6 +135,12 @@ class TransportArbitrator : public Transport
      */
     virtual void setCrc16(Crc16 *crcImpl) override;
 
+    /*!
+     * @brief This functions gets the CRC-16 object.
+     *
+     * @return Crc16* Pointer to CRC-16 object containing crc-16 compute function.
+     */
+    virtual Crc16 * getCrc16(void) override;
     /*!
      * @brief Check if the underlying shared transport has a message
      *