Remove unnecessary included header and debug messages

Change-Id: I60583710c5041c1a97908c8f25fc41f876ecd6b0
Signed-off-by: Yu Jiung <jiung.yu@samsung.com>

diff --git a/include/inm-util.h b/include/inm-util.h
index fb50cc66dce5a4132203c4b37ae2a58569bb648d..a0acdf6ecbe7c52d011148b62b354ca816a233ca 100644 (file)
--- a/include/inm-util.h
+++ b/include/inm-util.h
@@ -41,32 +41,13 @@ extern "C" {
 #define MAC_ADDR_LEN 6
 #define MAX_SIZE_ERROR_BUFFER 128
 #define TIME_STR_LEN 128
-#define WIFI_IFNAME    "wlan0"
+#define IF_NAME_WLAN   "wlan0"
 
 #define MSEC 1000
 
 #define PRINT_LOG(format, args...) util_put_log(format, ##args)
 #define PRINT_STR(str) util_put_str((str))
 
-#define DEBUG_G_VARIANT(str, parameters)\
-       do {\
-               gchar *parameters_debug_str = NULL;\
-               if (parameters)\
-                       parameters_debug_str = g_variant_print(parameters, TRUE);\
-               INM_LOGI("<%s:%s>", str, parameters_debug_str ? parameters_debug_str : "NULL");\
-               g_free(parameters_debug_str);\
-       } while (0)
-
-#define DEBUG_SIGNAL(sender_name, object_path, interface_name, signal_name, parameters)\
-       do {\
-               INM_LOGI("<GDBus signal sender name:%s>", sender_name);\
-               INM_LOGI("<GDBus signal signal name:%s>", signal_name);\
-               INM_LOGI("signal object path [%s]", object_path);\
-               INM_LOGI("signal interface name [%s]", interface_name);\
-               DEBUG_G_VARIANT("signal params ", parameters);\
-               INM_LOGI("signal params type [%s]", g_variant_get_type_string(parameters));\
-       } while (0)
-
 #define CHECK_STRING_AND_COPY(src, dst) do {\
                if (!src || strlen(src) == 0) \
                        break; \

diff --git a/packaging/inm-manager.spec b/packaging/inm-manager.spec
index 91d7e8216aaf72bf652815759f3d1da9cc3dfefa..0ccd4fe679fbac390114a4f8024d2aa194e63631 100644 (file)
--- a/packaging/inm-manager.spec
+++ b/packaging/inm-manager.spec
@@ -1,6 +1,6 @@
 Name:       inm-manager
 Summary:    INM(Intelligent Network Monitoring) daemon
-Version:    0.0.12
+Version:    0.0.13
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0
@@ -12,8 +12,6 @@ Source3:      %{name}.service
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gobject-2.0)
-BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(vconf)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f7cb596311bdeb0881e3ed756a29e7c3e0ec19a1..13f46da0aebfe0f39437075616a468191649b7d4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,7 +23,6 @@ INCLUDE(FindPkgConfig)
 PKG_CHECK_MODULES(inm_pkgs REQUIRED
        glib-2.0
        gio-2.0
-       gio-unix-2.0
        dlog
        libnl-2.0
        vconf

diff --git a/src/inm-arping.c b/src/inm-arping.c
index 7e57db628aa04f953cf7bd4b9f502257d1230596..85fb2512df1cd651800ea6dd35ed9b70f77db082 100644 (file)
--- a/src/inm-arping.c
+++ b/src/inm-arping.c
@@ -24,17 +24,7 @@
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */
-
-#include <string.h>
-#include <unistd.h>
-
-#include <errno.h>
-
 #include <glib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <linux/if.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-congestion-mon.c b/src/inm-congestion-mon.c
index d6b4390c2ba91eeaf6dcffab4827c8f874422a55..7ee1db921ac7e42e29bd3f459451a1ab86c6cc71 100644 (file)
--- a/src/inm-congestion-mon.c
+++ b/src/inm-congestion-mon.c
@@ -25,14 +25,9 @@
  * @version     0.1
  */
 
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <unistd.h>
 
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-connman-mgr.c b/src/inm-connman-mgr.c
index 7da9e13b9c6b892974540dfbcbd3733aa9f3027a..5985e6e017e887f863ccbedcd14fe1d1604c8c11 100644 (file)
--- a/src/inm-connman-mgr.c
+++ b/src/inm-connman-mgr.c
@@ -26,8 +26,6 @@
  */
 
 #include <glib.h>
-#include <gio/gio.h>
-
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-connman-service.c b/src/inm-connman-service.c
index 8d86c2f707b6d260799b5225ecb8c3cee5a903b6..990bbe14d8ecba156b688cedc1795202da348b3b 100644 (file)
--- a/src/inm-connman-service.c
+++ b/src/inm-connman-service.c
@@ -25,8 +25,6 @@
  * @version     0.1
  */
 
-#include <stdlib.h>
-
 #include <arpa/inet.h>
 
 #include <glib.h>

diff --git a/src/inm-connman.c b/src/inm-connman.c
index f111815ab999c5ddb1284a6b6fc4f795640d8f48..1248a4b5ab414634172506fc0e6863e13fef1b4b 100644 (file)
--- a/src/inm-connman.c
+++ b/src/inm-connman.c
@@ -25,10 +25,7 @@
  * @version     0.1
  */
 
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-dump.c b/src/inm-dump.c
index 5a07b806957bec2072bc11a4de7c8f0df0d9dabd..0d6513e314f6ed1505bd31504ed4f6b627f6df47 100644 (file)
--- a/src/inm-dump.c
+++ b/src/inm-dump.c
@@ -25,10 +25,6 @@
  * @version     0.1
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
 #include <glib.h>
 
 #include "inm-util.h"

diff --git a/src/inm-gdbus.c b/src/inm-gdbus.c
index 03091ba999c8fb52611b0092609b208b8d1a012f..d7af75c301959ce286c1b155e363803ed6ef96c6 100644 (file)
--- a/src/inm-gdbus.c
+++ b/src/inm-gdbus.c
@@ -25,8 +25,6 @@
  * @version     0.1
  */
 
-#include <string.h>
-
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -262,7 +260,6 @@ static void __gdbus_signal_callback(GDBusConnection *connection,
                gpointer user_data)
 {
        signal_param_s *param = (signal_param_s *)user_data;
-       DEBUG_SIGNAL(sender_name, object_path, interface_name, signal_name, parameters);
 
        if (param->callback)
                param->callback(sender_name, object_path, interface_name, signal_name, parameters, user_data);
@@ -306,8 +303,6 @@ int inm_gdbus_method_call(method_param_s *params,
        }
 
        if (reply != NULL) {
-               DEBUG_G_VARIANT("Reply : ", reply);
-
                if (function)
                        function(reply, user_data);
                g_variant_unref(reply);
@@ -474,7 +469,7 @@ static inline void __handle_get_current_connection(GVariant *parameters,
                __INM_FUNC_EXIT__;
                return;
        }
-       DEBUG_G_VARIANT("ret: ", arg);
+
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -515,7 +510,6 @@ static inline void __handle_get_wifi_module_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -537,7 +531,6 @@ static inline void __handle_get_ethernet_cable_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -559,7 +552,6 @@ static inline void __handle_get_ip_conflict_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -581,7 +573,6 @@ static inline void __handle_get_ip_conflict_detect(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -613,7 +604,6 @@ static inline void __handle_get_tcpdump_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -671,7 +661,6 @@ static inline void __handle_get_cellular_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(i)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -693,7 +682,6 @@ static inline void __handle_get_wifi_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(i)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -715,7 +703,6 @@ static inline void __handle_get_ethernet_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(i)", state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -737,7 +724,6 @@ static inline void __handle_get_congestion_level(GVariant *parameters,
        }
 
        arg = g_variant_new("(i)", level);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -759,7 +745,6 @@ static inline void __handle_get_retry_tx_rate(GVariant *parameters,
        }
 
        arg = g_variant_new("(i)", rate);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -781,7 +766,6 @@ static inline void __handle_get_channel_interference(GVariant *parameters,
        }
 
        arg = g_variant_new("(d)", ch_interference);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -952,7 +936,6 @@ static inline void __handle_reacher_is_running(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", is_running);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
@@ -1600,7 +1583,6 @@ static inline void __handle_get_scan_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", wifi_scan_state);
-       DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }

diff --git a/src/inm-icmp-ping.c b/src/inm-icmp-ping.c
index 2a99ac5252f57b460d7a676fc1106708e88441f0..5967d135f562b0786b1c521a8536c56d875e7ca7 100644 (file)
--- a/src/inm-icmp-ping.c
+++ b/src/inm-icmp-ping.c
@@ -24,19 +24,12 @@
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include <sys/socket.h>
 
 #include <netinet/in.h>
 #include <netinet/ip_icmp.h>
 #include <arpa/inet.h>
 
-#include <errno.h>
-
 #include <glib.h>
 
 #include "inm-util.h"

diff --git a/src/inm-iface-mon.c b/src/inm-iface-mon.c
index 250ae1be0620b4be8f6ab1b88d005671c1c93134..9ebef12073f098da1645d0ed60b4bb13b4ad514f 100644 (file)
--- a/src/inm-iface-mon.c
+++ b/src/inm-iface-mon.c
@@ -25,14 +25,8 @@
  * @version     0.1
  */
 
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <net/if.h>
-
 #include <glib.h>
-#include <gio/gio.h>
+
 #include <vconf.h>
 #include <vconf-keys.h>
 

diff --git a/src/inm-ip-conflict.c b/src/inm-ip-conflict.c
index 75c181b1d2daf9616d803edbf635e71e6005c407..a47097da366445f29e80f8b02be027812c9ba70d 100644 (file)
--- a/src/inm-ip-conflict.c
+++ b/src/inm-ip-conflict.c
@@ -24,10 +24,6 @@
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */
-#include <string.h>
-#include <unistd.h>
-
-#include <errno.h>
 
 #include <glib.h>
 

diff --git a/src/inm-manager-main.c b/src/inm-manager-main.c
index ce7c256afd5011110e9d6295fd816dc33cc0e92d..f511c0328b64bc373e5755d677942585cd3be602 100644 (file)
--- a/src/inm-manager-main.c
+++ b/src/inm-manager-main.c
@@ -25,12 +25,6 @@
  * @version     0.1
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <signal.h>
-#include <unistd.h>
-
 #include <glib.h>
 
 #include "inm-manager.h"

diff --git a/src/inm-manager.c b/src/inm-manager.c
index a7651d2fcf8ee145df831b6f349a9d0ea4498cde..497e8f60301897a15f8bdd6239282606ecf7bec7 100644 (file)
--- a/src/inm-manager.c
+++ b/src/inm-manager.c
@@ -26,8 +26,8 @@
  */
 
 #include <glib.h>
-#include <gio/gio.h>
 
+#include "inm-util.h"
 #include "inm-gdbus.h"
 #include "inm-dump.h"
 #include "inm-ip-conflict.h"
@@ -38,11 +38,9 @@
 #include "inm-connman.h"
 #include "inm-manager.h"
 #include "inm-rtnl.h"
-#include "inm-util.h"
 #include "inm-manager-log.h"
 #include "inm-error.h"
 
-#define IF_NAME_WLAN "wlan0"
 #define IF_NAME_ETH "eth0"
 
 typedef struct {

diff --git a/src/inm-mobileap.c b/src/inm-mobileap.c
index 4400921f3ba78572360f3033fef454d82150ebf8..47a5d88e7a75716db0a2d8de9faae79aae488357 100644 (file)
--- a/src/inm-mobileap.c
+++ b/src/inm-mobileap.c
@@ -25,11 +25,7 @@
  * @version     0.1
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-netlink.c b/src/inm-netlink.c
index 9d849bb80032acf744c1aeff75c9c39617e6cd6d..e924c78c4ed3611501067b551a94220e9c009619 100644 (file)
--- a/src/inm-netlink.c
+++ b/src/inm-netlink.c
@@ -16,6 +16,7 @@
 #include <netlink/genl/ctrl.h>
 
 #include <glib.h>
+
 #include "inm-iface-mon.h"
 #include "inm-util.h"
 #include "inm-manager-log.h"
@@ -845,7 +846,7 @@ static int __inmmanager_initialize_nl80211(gpointer user_data)
        inmmanager_nl_global_s *global = (inmmanager_nl_global_s *)data->nl_global;
        int err = 0;
 
-       global->if_index = inmmanager_get_interface_index(WIFI_IFNAME);
+       global->if_index = inmmanager_get_interface_index(IF_NAME_WLAN);
        if (global->if_index < 0) {
                INM_LOGE("Failed to get interface index");
                return -1;

diff --git a/src/inm-reacher.c b/src/inm-reacher.c
index 2899661c4a9e9fb73b06b6e86c2beb828c693853..9736e7722a0024752cf7865f989a1f5a0a09601d 100644 (file)
--- a/src/inm-reacher.c
+++ b/src/inm-reacher.c
@@ -1,8 +1,3 @@
-#include <string.h>
-#include <unistd.h>
-
-#include <errno.h>
-
 #include <curl/curl.h>
 #include <curl/multi.h>
 

diff --git a/src/inm-rtnl.c b/src/inm-rtnl.c
index f92319721f41d425f366be291448fe74d7c1769a..0741727d7476b28e48b8f92775b48470c6155398 100644 (file)
--- a/src/inm-rtnl.c
+++ b/src/inm-rtnl.c
@@ -25,10 +25,6 @@
  * @version     0.1
  */
 
-#include <stdio.h>
-
-#include <string.h>
-
 #include <net/if.h>
 #include <netlink/addr.h>
 #include <netlink/route/addr.h>

diff --git a/src/inm-statistics.c b/src/inm-statistics.c
index 05ada97aade520a5ccf6dd9a90147e0ee57eb081..62eb5088dc97f5d63847ad4bd1986365a9aa3963 100644 (file)
--- a/src/inm-statistics.c
+++ b/src/inm-statistics.c
@@ -25,9 +25,6 @@
  * @version     0.1
  */
 
-#include <stdio.h>
-#include <string.h>
-
 #include <glib.h>
 
 #include "inm-util.h"

diff --git a/src/inm-stc-manager.c b/src/inm-stc-manager.c
index 55a9897613e275d7b4c8c2ca8b14e65ffbf289d7..2bf1556d26598d6388fe89e59700cc71e83ddaaa 100644 (file)
--- a/src/inm-stc-manager.c
+++ b/src/inm-stc-manager.c
@@ -25,11 +25,7 @@
  * @version     0.1
  */
 
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
-
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-supplicant-iface.c b/src/inm-supplicant-iface.c
index 3a433c99572f221ac697bb404fa044c88efdeaa7..82dfd45dd9480f8b05e46fa398feb3761b9f1d6f 100644 (file)
--- a/src/inm-supplicant-iface.c
+++ b/src/inm-supplicant-iface.c
@@ -25,10 +25,7 @@
  * @version     0.1
  */
 
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-supplicant-wps.c b/src/inm-supplicant-wps.c
index f2c7a7f45d7100fe4048491083fc16f28bd31604..d6bfead5e5829d6d419c5528cf1936169b912258 100644 (file)
--- a/src/inm-supplicant-wps.c
+++ b/src/inm-supplicant-wps.c
@@ -25,10 +25,7 @@
  * @version     0.1
  */
 
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-supplicant.c b/src/inm-supplicant.c
index 95923c3c1bd594697ec8526928ec80be1e9eb114..4002790f5c921164ddc4b94b3685d8a4c44b528e 100644 (file)
--- a/src/inm-supplicant.c
+++ b/src/inm-supplicant.c
@@ -25,10 +25,7 @@
  * @version     0.1
  */
 
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-telephony.c b/src/inm-telephony.c
index 239eb35ae9d26e4221f0c0771c4fb9324c142b06..e129516b9789ab5b39715efcca0dcc8592bd1313 100644 (file)
--- a/src/inm-telephony.c
+++ b/src/inm-telephony.c
@@ -25,11 +25,7 @@
  * @version     0.1
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include <glib.h>
-#include <gio/gio.h>
 
 #include "inm-util.h"
 #include "inm-manager-log.h"

diff --git a/src/inm-util.c b/src/inm-util.c
index 5f5d8f75ff44a452bb08dabc00358fc37876e3ec..313c6ff1e0d72ba69fad8c65e9e52ce058d05408 100644 (file)
--- a/src/inm-util.c
+++ b/src/inm-util.c
@@ -24,13 +24,7 @@
  * @author      Jiung Yu (jiung.yu@samsung.com)
  * @version     0.1
  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <signal.h>
 #include <unistd.h>
-#include <string.h>
 
 #include <sys/wait.h>
 #include <sys/time.h>
@@ -63,7 +57,6 @@
 #include <netlink/route/route.h>
 
 #include <glib.h>
-#include <gio/gio.h>
 
 #include <vconf.h>
 #include <vconf-keys.h>