Applied code review results

Change-Id: I882871e8fcd5104a6d886cf83d99a65aae867a12
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/msf_tizen_client/include/Error.h b/msf_tizen_client/include/Error.h
index daaabcb815abe210f4219ef18d211b605b080c0a..c96fa1f32ee854380fbaba3ec02a19a57a30bb1a 100644 (file)
--- a/msf_tizen_client/include/Error.h
+++ b/msf_tizen_client/include/Error.h
@@ -18,8 +18,8 @@
 #define __MSF_ERROR_H__
 
 #include <stdio.h>
-#include<iostream>
-#include<string>
+#include <iostream>
+#include <string>
 
 using namespace std;
 

diff --git a/msf_tizen_client/include/MSFDSearchProvider.h b/msf_tizen_client/include/MSFDSearchProvider.h
index 3e029bef0bc3c1aee79b6739551d05ff4f7b5a21..c35a8f1400f396b2c103c4aa8af9d88bcc210c60 100644 (file)
--- a/msf_tizen_client/include/MSFDSearchProvider.h
+++ b/msf_tizen_client/include/MSFDSearchProvider.h
@@ -20,7 +20,7 @@
 #include <map>
 #include <json-glib/json-glib.h>
 #include <json-glib/json-parser.h>
-#include"SearchProvider.h"
+#include "SearchProvider.h"
 
 using namespace std;
 

diff --git a/msf_tizen_client/include/Message.h b/msf_tizen_client/include/Message.h
index 62d94966b9dd0a06600ed16c37a7c6607591da63..6471ce02ca5712320c2ea5d6576d0cf28b646ef5 100755 (executable)
--- a/msf_tizen_client/include/Message.h
+++ b/msf_tizen_client/include/Message.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 
-
 using namespace std;
 
 class Message

diff --git a/msf_tizen_client/include/Search.h b/msf_tizen_client/include/Search.h
index 5479796602532ca2f0c70d312e652476e52aa09e..747a5bac7d38391eaa49ac99dceeb83faaca80d8 100644 (file)
--- a/msf_tizen_client/include/Search.h
+++ b/msf_tizen_client/include/Search.h
@@ -18,11 +18,11 @@
 #define __MSF_SEARCH_H__
 
 #include <list>
-#include"SearchProvider.h"
+#include "SearchProvider.h"
 #include <list>
 #include <pthread.h>
 #include <string>
-#include"mDNSSearchProvider.h"
+#include "mDNSSearchProvider.h"
 
 #define NUM_OF_THREADS 3
 #define MDNS_THREAD_NUMBER 0

diff --git a/msf_tizen_client/include/SearchProvider.h b/msf_tizen_client/include/SearchProvider.h
index d627ae009793b13d7d8e43b23508ec9623bde60f..9e7e15c5852b62f1ba03a8630f919eb42bdf145d 100644 (file)
--- a/msf_tizen_client/include/SearchProvider.h
+++ b/msf_tizen_client/include/SearchProvider.h
@@ -17,9 +17,9 @@
 #ifndef __MSF_SEARCH_PROVIDER_H__
 #define __MSF_SEARCH_PROVIDER_H__
 
-#include<iostream>
-#include<list>
-#include<string>
+#include <iostream>
+#include <list>
+#include <string>
 #include <map>
 
 //#include "Service.h"

diff --git a/msf_tizen_client/include/Service.h b/msf_tizen_client/include/Service.h
index 84c05fa53e51790a8ba3e82b3689d86439035593..e0231c162b3624d68e2dbeb08c2b874021f47114 100755 (executable)
--- a/msf_tizen_client/include/Service.h
+++ b/msf_tizen_client/include/Service.h
@@ -22,7 +22,6 @@
 #include <json-glib/json-glib.h>
 #include <json-glib/json-parser.h>
 
-
 using namespace std;
 
 class Application;

diff --git a/msf_tizen_client/include/mDNSSearchProvider.h b/msf_tizen_client/include/mDNSSearchProvider.h
index e03c5476bcbf5acbf10b2a08e0cf2ec913ab0b07..e6d767cde12bd18b18ec82e8767be3a022769186 100644 (file)
--- a/msf_tizen_client/include/mDNSSearchProvider.h
+++ b/msf_tizen_client/include/mDNSSearchProvider.h
@@ -19,7 +19,7 @@
 
 using namespace std;
 
-#include"SearchProvider.h"
+#include "SearchProvider.h"
 #include <nsd/dns-sd.h>
 #include "Service.h"
 #include "Result.h"

diff --git a/msf_tizen_client/src/Application.cpp b/msf_tizen_client/src/Application.cpp
index e304ad4b2aba479f986ee01dec1293baff0d81c1..2e7d8f0e642f312cad609fc65f93b91694539e07 100755 (executable)
--- a/msf_tizen_client/src/Application.cpp
+++ b/msf_tizen_client/src/Application.cpp
@@ -41,7 +41,6 @@ public:
                if (in_result_cb != NULL) {
                        if (((*in_result_cb) != NULL)) {
                                (*in_result_cb)->onStart(result);
-                       } else {
                        }
                }
 
@@ -54,7 +53,6 @@ public:
                if (in_result_cb != NULL) {
                        if (((*in_result_cb) != NULL)) {
                                (*in_result_cb)->onStart(false);
-                       } else {
                        }
                }
                delete this;
@@ -72,7 +70,6 @@ public:
                if (in_result_cb != NULL) {
                        if (((*in_result_cb) != NULL)) {
                                (*in_result_cb)->onStop(result);
-                       } else {
                        }
                }
 
@@ -85,7 +82,6 @@ public:
                if (in_result_cb != NULL) {
                        if (((*in_result_cb) != NULL)) {
                                (*in_result_cb)->onStop(false);
-                       } else {
                        }
                }
                delete this;
@@ -99,6 +95,8 @@ Application::Application()
        webapp = false;
        install_listener = NULL;
        install_result = false;
+       result = NULL;
+       startArgs = NULL;
 }
 
 Application::Application(Service *se, string Uri, string Id)
@@ -120,7 +118,9 @@ Application::Application(Service *se, string Uri, string Id)
        waitForOnReady = false;
        install_listener = NULL;
        install_result = false;
-       setSecureSupport(se->IsSecureConnectionSupport());
+       if (se != NULL) {
+               setSecureSupport(se->IsSecureConnectionSupport());
+       }
 }
 
 Application::Application(Service *se, string Uri, string Id, map<string, string> startargs)

diff --git a/msf_tizen_client/src/ApplicationInfo.cpp b/msf_tizen_client/src/ApplicationInfo.cpp
index 9d7c6dcf95bda81f0fcef1f35cd04862c487305a..bb7bc933b10266c703dcecf4e57c5b5f6b992c78 100755 (executable)
--- a/msf_tizen_client/src/ApplicationInfo.cpp
+++ b/msf_tizen_client/src/ApplicationInfo.cpp
@@ -23,6 +23,7 @@ string ApplicationInfo::PROPERTY_VERSION = "version";
 
 ApplicationInfo::ApplicationInfo()
 {
+       running = false;
 }
 
 ApplicationInfo::ApplicationInfo(string iD, bool state, string Name, string Version)

diff --git a/msf_tizen_client/src/Channel.cpp b/msf_tizen_client/src/Channel.cpp
index 3486da0ef06aa802b856d7c43315cc0110496420..2669a2a07573249b57f04714fa9b6368f2db5882 100755 (executable)
--- a/msf_tizen_client/src/Channel.cpp
+++ b/msf_tizen_client/src/Channel.cpp
@@ -64,6 +64,11 @@ ChannelConnectionHandler::ChannelConnectionHandler() {
        pingTimeout = 5000000;
        lastPingReceived = 0;
        running = false;
+       longestRT = 0;
+       numPings = 0;
+       startTime = 0;
+       pingSent = 0;
+       average = 0;
 }
 
 Channel::Channel() {
@@ -771,6 +776,7 @@ void Channel::write_socket(Channel* ch_p)
                lws_callback_on_writable(ch_p->wsi_mirror);
        }
 
+       MSF_DBG("write_buf_count:%d", ch_p->write_buf_count);
        if (ch_p->write_buf_count) {
                if (ch_p->write_buf_last_sent_index == 999) {
                        ch_p->write_buf_last_sent_index = 1;
@@ -803,7 +809,7 @@ void Channel::write_socket(Channel* ch_p)
                                ch_p->onPublishListener->onPublished(false, ch_p->publish_user_data[ch_p->write_buf_last_sent_index]);
                        }
                } else {
-                       MSF_DBG("Writing succeed\n");
+                       MSF_DBG("Writing succeed : %d", n);
                        if (ch_p->onPublishListener) {
                                ch_p->onPublishListener->onPublished(true, ch_p->publish_user_data[ch_p->write_buf_last_sent_index]);
                        }
@@ -884,9 +890,10 @@ int Channel::callback_lws_mirror(struct lws *wsi,
                        this_ptr->cl_payload[len - 2 - header_size] = 0;
                        this_ptr->cl_payload_size = len - 2 - header_size;
 
+/*
                        MSF_DBG("payload = %s",
                                                &(this_ptr->cl_payload[0]));
-
+*/
                        this_ptr->connectionHandler->resetLastPingReceived();
 
                        if (this_ptr->eventType == CONNECT_EVENT) {
@@ -1108,7 +1115,7 @@ unsigned char *Channel::prepareMessageMap(string method, string event,
        int l = 0;
        int header_size = 0;
 
-       int prepare_buf_size = LWS_SEND_BUFFER_PRE_PADDING + 4096 + LWS_SEND_BUFFER_POST_PADDING;
+       int prepare_buf_size = LWS_SEND_BUFFER_PRE_PADDING + payload_size + LWS_SEND_BUFFER_POST_PADDING + 128;
        unsigned char *prepare_buf = new unsigned char[prepare_buf_size];
 
        if (payload) {

diff --git a/msf_tizen_client/src/Client.cpp b/msf_tizen_client/src/Client.cpp
index ed7d277d1dae0e0080aed6ef5cd7321f1c75b8fc..5545ce2d6b90633065a0e425a9f62c92b2710c2c 100644 (file)
--- a/msf_tizen_client/src/Client.cpp
+++ b/msf_tizen_client/src/Client.cpp
@@ -27,6 +27,7 @@ Client::Client()
        id   = string();
        host = false ;
        connectTime = 0;
+       m_channel = NULL;
 }
 
 void Client::create(Client &client)

diff --git a/msf_tizen_client/src/Message.cpp b/msf_tizen_client/src/Message.cpp
index 92235a7f7a8744d300d14b30e2f3f60add91cf43..cdee8aa8e230a31059f236d51d729184a32fe3e0 100755 (executable)
--- a/msf_tizen_client/src/Message.cpp
+++ b/msf_tizen_client/src/Message.cpp
@@ -64,6 +64,9 @@ Message::Message(Channel *ch, string event, string data, string from, unsigned c
 
 Message::Message()
 {
+       m_channel = NULL;
+       m_payload = NULL;
+       m_payload_size = 0;
 }
 
 Message::Message(const Message& m)