increase code quality

- Initiailize member variables
- increase robustness (discovery, descructor exception, etc)

diff --git a/common/AittDiscovery.cc b/common/AittDiscovery.cc
index efc54fe..feb9569 100644 (file)
--- a/common/AittDiscovery.cc
+++ b/common/AittDiscovery.cc
@@ -47,8 +47,9 @@ void AittDiscovery::Start(const std::string &host, int port, const std::string &
 
 void AittDiscovery::Stop()
 {
-    discovery_mq->Publish(DISCOVERY_TOPIC_BASE + id_, nullptr, 0, AITT_QOS_EXACTLY_ONCE, true);
     discovery_mq->Unsubscribe(callback_handle);
+    discovery_mq->Publish(DISCOVERY_TOPIC_BASE + id_, nullptr, 0, AITT_QOS_EXACTLY_ONCE, true);
+    discovery_mq->Publish(DISCOVERY_TOPIC_BASE + id_, nullptr, 0, AITT_QOS_AT_MOST_ONCE, true);
     callback_handle = nullptr;
     discovery_mq->Disconnect();
 }
@@ -90,8 +91,6 @@ void AittDiscovery::DiscoveryMessageCallback(MSG *mq, const std::string &topic,
 
     AittDiscovery *discovery = static_cast<AittDiscovery *>(user_data);
 
-    DBG("Called(id = %s, msg = %p:%d)", discovery->id_.c_str(), msg, szmsg);
-
     size_t end = topic.find("/", DISCOVERY_TOPIC_BASE.length());
     std::string clientId = topic.substr(DISCOVERY_TOPIC_BASE.length(), end);
     if (clientId.empty()) {

diff --git a/common/MosquittoMQ.cc b/common/MosquittoMQ.cc
index b25f4c3..c2c87e9 100644 (file)
--- a/common/MosquittoMQ.cc
+++ b/common/MosquittoMQ.cc
@@ -64,12 +64,6 @@ MosquittoMQ::MosquittoMQ(const std::string &id, bool clear_session)
         mosquitto_connect_v5_callback_set(handle, ConnectCallback);
         mosquitto_disconnect_v5_callback_set(handle, DisconnectCallback);
 
-        ret = mosquitto_loop_start(handle);
-        if (ret != MOSQ_ERR_SUCCESS) {
-            ERR("mosquitto_loop_start() Fail(%s)", mosquitto_strerror(ret));
-            break;
-        }
-
         return;
     } while (0);
 
@@ -83,10 +77,6 @@ MosquittoMQ::~MosquittoMQ(void)
     int ret;
     INFO("Destructor");
 
-    ret = mosquitto_loop_stop(handle, true);
-    if (ret != MOSQ_ERR_SUCCESS)
-        ERR("mosquitto_loop_stop() Fail(%s)", mosquitto_strerror(ret));
-
     callback_lock.lock();
     connect_cb = nullptr;
     subscribers.clear();
@@ -145,6 +135,12 @@ void MosquittoMQ::Connect(const std::string &host, int port, const std::string &
         }
     }
 
+    ret = mosquitto_loop_start(handle);
+    if (ret != MOSQ_ERR_SUCCESS) {
+        ERR("mosquitto_loop_start() Fail(%s)", mosquitto_strerror(ret));
+        throw AittException(AittException::MQTT_ERR);
+    }
+
     ret = mosquitto_connect(handle, host.c_str(), port, keep_alive);
     if (ret != MOSQ_ERR_SUCCESS) {
         ERR("mosquitto_connect(%s, %d) Fail(%s)", host.c_str(), port, mosquitto_strerror(ret));
@@ -170,6 +166,10 @@ void MosquittoMQ::Disconnect(void)
         throw AittException(AittException::MQTT_ERR);
     }
 
+    ret = mosquitto_loop_stop(handle, false);
+    if (ret != MOSQ_ERR_SUCCESS)
+        ERR("mosquitto_loop_stop() Fail(%s)", mosquitto_strerror(ret));
+
     mosquitto_will_clear(handle);
 }
 
@@ -184,8 +184,11 @@ void MosquittoMQ::MessageCallback(mosquitto *handle, void *obj, const mosquitto_
     mq->subscriber_iterator = mq->subscribers.begin();
     while (mq->subscriber_iterator != mq->subscribers.end()) {
         auto subscribe_data = *(mq->subscriber_iterator);
-        if (nullptr == subscribe_data)
-            ERR("end() is not valid because elements were added.");
+        if (nullptr == subscribe_data) {
+            ERR("Invalid subscribe data");
+            mq->subscriber_iterator++;
+            continue;
+        }
 
         bool result = AittUtil::CompareTopic(subscribe_data->topic.c_str(), msg->topic);
         if (result)

diff --git a/common/MosquittoMQ.h b/common/MosquittoMQ.h
index 5a55cfc..e045b9c 100644 (file)
--- a/common/MosquittoMQ.h
+++ b/common/MosquittoMQ.h
@@ -57,9 +57,9 @@ class MosquittoMQ : public MQ {
         void *user_data;
     };
 
-    static void ConnectCallback(mosquitto *mosq, void *obj, int rc, int flag,
+    static void ConnectCallback(struct mosquitto *mosq, void *obj, int rc, int flag,
           const mosquitto_property *props);
-    static void DisconnectCallback(mosquitto *mosq, void *obj, int rc,
+    static void DisconnectCallback(struct mosquitto *mosq, void *obj, int rc,
           const mosquitto_property *props);
     static void MessageCallback(mosquitto *, void *, const mosquitto_message *,
           const mosquitto_property *);

diff --git a/modules/tcp/Module.cc b/modules/tcp/Module.cc
index a2df94e..23faae0 100644 (file)
--- a/modules/tcp/Module.cc
+++ b/modules/tcp/Module.cc
@@ -38,7 +38,11 @@ Module::Module(AittProtocol type, AittDiscovery &discovery, const std::string &m
 
 Module::~Module(void)
 {
-    discovery.RemoveDiscoveryCB(discovery_cb);
+    try {
+        discovery.RemoveDiscoveryCB(discovery_cb);
+    } catch (std::exception &e) {
+        ERR("RemoveDiscoveryCB() Fail(%s)", e.what());
+    }
 
     while (main_loop.Quit() == false) {
         // wait when called before the thread has completely created.

diff --git a/modules/webrtc/CameraHandler.cc b/modules/webrtc/CameraHandler.cc
index c3fc8ec..2f20f16 100644 (file)
--- a/modules/webrtc/CameraHandler.cc
+++ b/modules/webrtc/CameraHandler.cc
@@ -44,6 +44,11 @@ CameraHandler::~CameraHandler(void)
         camera_destroy(handle_);
 }
 
+CameraHandler::CameraHandler()
+      : handle_(nullptr), is_started_(false), media_packet_preview_cb_(nullptr), user_data_(nullptr)
+{
+}
+
 int CameraHandler::Init(const MediaPacketPreviewCallback &preview_cb, void *user_data)
 {
     int ret = camera_create(CAMERA_DEVICE_CAMERA0, &handle_);

diff --git a/modules/webrtc/CameraHandler.h b/modules/webrtc/CameraHandler.h
index 5c44828..48f0d43 100644 (file)
--- a/modules/webrtc/CameraHandler.h
+++ b/modules/webrtc/CameraHandler.h
@@ -41,6 +41,7 @@ class CameraHandler {
   public:
     using MediaPacketPreviewCallback = std::function<void(media_packet_h, void *)>;
 
+    CameraHandler();
     ~CameraHandler();
     int Init(const MediaPacketPreviewCallback &preview_cb, void *user_data);
     void Deinit(void);

diff --git a/modules/webrtc/WebRtcStream.cc b/modules/webrtc/WebRtcStream.cc
index 0f2ef93..75bbce6 100644 (file)
--- a/modules/webrtc/WebRtcStream.cc
+++ b/modules/webrtc/WebRtcStream.cc
@@ -18,6 +18,10 @@
 
 #include "aitt_internal.h"
 
+WebRtcStream::WebRtcStream() : webrtc_handle_(nullptr), is_source_overflow_(false), source_id_(0)
+{
+}
+
 WebRtcStream::~WebRtcStream()
 {
     Destroy();

diff --git a/modules/webrtc/WebRtcStream.h b/modules/webrtc/WebRtcStream.h
index b2a9ef5..2e4d2d2 100644 (file)
--- a/modules/webrtc/WebRtcStream.h
+++ b/modules/webrtc/WebRtcStream.h
@@ -32,6 +32,7 @@
 
 class WebRtcStream {
   public:
+    WebRtcStream();
     ~WebRtcStream();
     bool Create(bool is_source, bool need_display);
     void Destroy(void);

diff --git a/src/AITTImpl.cc b/src/AITTImpl.cc
index 4f6d298..db91328 100644 (file)
--- a/src/AITTImpl.cc
+++ b/src/AITTImpl.cc
@@ -42,19 +42,25 @@ AITT::Impl::Impl(AITT &parent, const std::string &id, const std::string &my_ip,
 {
     if (option.GetUseCustomMqttBroker()) {
         mq = modules.NewCustomMQ(id, option);
+        AittOption discovery_option = option;
+        discovery_option.SetClearSession(false);
         discovery.SetMQ(modules.NewCustomMQ(id + 'd', option));
     } else {
         mq = std::unique_ptr<MQ>(new MosquittoMQ(id, option.GetClearSession()));
-        discovery.SetMQ(std::unique_ptr<MQ>(new MosquittoMQ(id + 'd', option.GetClearSession())));
+        discovery.SetMQ(std::unique_ptr<MQ>(new MosquittoMQ(id + 'd', false)));
     }
     aittThread = std::thread(&AITT::Impl::ThreadMain, this);
 }
 
 AITT::Impl::~Impl(void)
 {
-    if (false == mqtt_broker_ip_.empty())
-        Disconnect();
-
+    if (false == mqtt_broker_ip_.empty()) {
+        try {
+            Disconnect();
+        } catch (std::exception &e) {
+            ERR("Disconnect() Fail(%s)", e.what());
+        }
+    }
     while (main_loop.Quit() == false) {
         // wait when called before the thread has completely created.
         usleep(1000);  // 1millisecond
@@ -109,8 +115,8 @@ void AITT::Impl::Disconnect(void)
     mqtt_broker_ip_.clear();
     mqtt_broker_port_ = -1;
 
-    mq->Disconnect();
     discovery.Stop();
+    mq->Disconnect();
 }
 
 void AITT::Impl::UnsubscribeAll()

diff --git a/src/ModuleManager.cc b/src/ModuleManager.cc
index 82c21d4..960a987 100644 (file)
--- a/src/ModuleManager.cc
+++ b/src/ModuleManager.cc
@@ -124,10 +124,10 @@ void ModuleManager::LoadTransport(TransportType type)
 
 std::unique_ptr<MQ> ModuleManager::NewCustomMQ(const std::string &id, const AittOption &option)
 {
-    ModuleHandle handle = OpenModule("libaitt-st-broker.so");
+    custom_mqtt_handle = OpenModule("libaitt-st-broker.so");
 
     MQ::ModuleEntry get_instance_fn =
-          reinterpret_cast<MQ::ModuleEntry>(dlsym(handle.get(), MQ::MODULE_ENTRY_NAME));
+          reinterpret_cast<MQ::ModuleEntry>(dlsym(custom_mqtt_handle.get(), MQ::MODULE_ENTRY_NAME));
     if (get_instance_fn == nullptr) {
         ERR("dlsym: %s", dlerror());
         throw AittException(AittException::SYSTEM_ERR);

diff --git a/src/ModuleManager.h b/src/ModuleManager.h
index 69c43b7..8754ff5 100644 (file)
--- a/src/ModuleManager.h
+++ b/src/ModuleManager.h
@@ -42,7 +42,6 @@ class ModuleManager {
         TYPE_TCP,         //(0x1 << 1)
         TYPE_TCP_SECURE,  //(0x1 << 2)
         TYPE_WEBRTC,      //(0x1 << 3)
-        TYPE_RTSP,
         TYPE_TRANSPORT_MAX,
     };