Disable Iface monitoring and fix service file

Change-Id: Ie53048f3da9ddfad4ea5fb109ecdd36c45c3f914

diff --git a/packaging/inm-manager.service b/packaging/inm-manager.service
index 162dac58ce6e06077817d83c3120fb9430d85b32..0b7e9d78fd2635ce51b68d3d222c033d8e42da23 100644 (file)
--- a/packaging/inm-manager.service
+++ b/packaging/inm-manager.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Intelligent Network Monitoring service
-After=dbus.service network-pre.target systemd-sysusers.service net-config.service
-Before=network.target multi-user.target shutdown.target
+After=net-config.service connman.service
 
 [Service]
 Type=dbus

diff --git a/packaging/inm-manager.spec b/packaging/inm-manager.spec
index f87557daab4365263c3a0a3784a9717442a9bed3..7a13f841cc479ff28c1fe34d9e5d86b8a9b0548d 100644 (file)
--- a/packaging/inm-manager.spec
+++ b/packaging/inm-manager.spec
@@ -2,7 +2,7 @@
 
 Name:       inm-manager
 Summary:    INM(Intelligent Network Monitoring) daemon
-Version:    0.0.34
+Version:    0.0.35
 Release:    1
 Group:      Network & Connectivity/Other
 License:    Apache-2.0

diff --git a/resources/var/lib/inm-manager/settings b/resources/var/lib/inm-manager/settings
index b3e372a4127f0ad0b0bb7654c0da4f89f9fe8d90..a86ff28a03c8f0a80e566f172a1a33a00971fe65 100644 (file)
--- a/resources/var/lib/inm-manager/settings
+++ b/resources/var/lib/inm-manager/settings
@@ -13,5 +13,5 @@ SupportDnsMonitoring=True
 SupportGatewayMonitoring=True
 SupportRtnlMonitoring=false
 SupportArpMonitoring=True
-SupportIfaceMonitoring=True
+SupportIfaceMonitoring=false
 SupportRetryTxRateMonitoring=false
\ No newline at end of file

diff --git a/src/inm-congestion-mon.c b/src/inm-congestion-mon.c
index 261b8af08f850c42536c753c5b1d9c77e6ca0a37..637149929d6fc9b304333e0c5277d6165e48fbf5 100644 (file)
--- a/src/inm-congestion-mon.c
+++ b/src/inm-congestion-mon.c
@@ -46,6 +46,7 @@ static congestion_mon_s *g_p_cong_mon = NULL;
 
 static int __inm_check_congestion_status(int *status)
 {
+       __INM_FUNC_ENTER__;
        double prev_transmit = -1;
        double curr_transmit = -1;
        double prev_retrans = -1;
@@ -133,6 +134,7 @@ static int __inm_check_congestion_status(int *status)
        if (buffer)
                free(buffer);
        *status = retrans_rate;
+       __INM_FUNC_EXIT__;
        return 0;
 }
 

diff --git a/src/inm-dns-lookup.c b/src/inm-dns-lookup.c
index a950338aa6ab19b9a22aa03d05bc5a893d2d9452..0883c01dab0d4ff5121232ce9330d0b23606e048 100644 (file)
--- a/src/inm-dns-lookup.c
+++ b/src/inm-dns-lookup.c
@@ -129,6 +129,7 @@ static inline void __destroy_default_dns_lookup_data()
 static gboolean __sock_channel_io_cb(GIOChannel *source,
                                        GIOCondition condition, gpointer data)
 {
+       INM_LOGI("");
        inm_gio_channel_s *gio_channel;
        ares_socket_t read_fd = ARES_SOCKET_BAD;
        ares_socket_t write_fd = ARES_SOCKET_BAD;
@@ -151,11 +152,12 @@ static gboolean __sock_channel_io_cb(GIOChannel *source,
                write_fd = gio_channel->fd;
 
        /* We should think about when do we call this? */
+
        ares_process_fd(gio_channel->ares_ch, read_fd, write_fd);
 
        if (g_default_dns_lookup_data->is_lookup_finished)
                __destroy_default_dns_lookup_data();
-
+       INM_LOGI("");
        return TRUE;
 }
 

diff --git a/src/inm-gdbus.c b/src/inm-gdbus.c
index 712246c3c94fcd77864d5cef1b05b21583d6bf9b..5f1df85127e856870484a5dfdba7656d4111068d 100644 (file)
--- a/src/inm-gdbus.c
+++ b/src/inm-gdbus.c
@@ -2304,6 +2304,7 @@ static void __gdbus_name_vanished_cb(GDBusConnection *connection,
                if (g_p_gdbus_mon->watching_cb[INM_DBUS_TYPE_STC])
                        g_p_gdbus_mon->watching_cb[INM_DBUS_TYPE_STC](FALSE);
        }
+       __INM_FUNC_EXIT__;
 }
 
 static inline const gchar *__get_bus_name(inm_gdbus_type type)

diff --git a/src/inm-netlink.c b/src/inm-netlink.c
index 7ef6a80adaa3c8189ed8d846b5222538cbe902d6..a834c4352a4e23787544ff5d90861590b12f39e5 100644 (file)
--- a/src/inm-netlink.c
+++ b/src/inm-netlink.c
@@ -276,7 +276,7 @@ static gboolean __inm_extract_link(struct ifinfomsg *msg, int bytes,
 
 static void __nl_message(void *buf, size_t length, gpointer user_data)
 {
-       INM_LOGE("");
+       __INM_FUNC_ENTER__;
        while (length > 0) {
                struct nlmsghdr *hdr = buf;
                iface_mon_data_s *data = (iface_mon_data_s *)user_data;
@@ -311,10 +311,11 @@ static void __nl_message(void *buf, size_t length, gpointer user_data)
                                        data->cb((char *)ifname, status, data->cb_user_data);
                        }
                }
-
+               INM_LOGI("hdr->nlmsg_len %d", hdr->nlmsg_len);
                length -= hdr->nlmsg_len;
                buf += hdr->nlmsg_len;
        }
+       __INM_FUNC_EXIT__;
 }
 
 static gboolean __inm_netlink_event(GIOChannel *channel, GIOCondition cond, gpointer user_data)
@@ -488,6 +489,7 @@ static void inmmanager_print_ie(inmmanager_mon_data_s *data,
 
 static void __inmmanager_print_ies(inmmanager_mon_data_s *data, unsigned char *ie, int ielen)
 {
+       __INM_FUNC_ENTER__;
        while (ielen >= 2 && ielen >= ie[1]) {
                if (ie[0] < ARRAY_SIZE(ie_printers) &&
                                ie_printers[ie[0]].name) {
@@ -496,6 +498,7 @@ static void __inmmanager_print_ies(inmmanager_mon_data_s *data, unsigned char *i
                ielen -= ie[1] + 2;
                ie += ie[1] + 2;
        }
+       __INM_FUNC_EXIT__;
 }
 
 static inmmanager_chan_info_s *__inmmanager_find_chan(inmmanager_chan_intf_info_s *intf_info, int freq)
@@ -894,6 +897,7 @@ fail:
 
 static gboolean __inmmanager_send_netlink_cmd(gpointer user_data)
 {
+       __INM_FUNC_ENTER__;
        int err;
        struct nl_msg *msg;
        inmmanager_mon_data_s *data = (inmmanager_mon_data_s*)user_data;
@@ -949,12 +953,14 @@ static gboolean __inmmanager_send_netlink_cmd(gpointer user_data)
        }
 
        /** Receive the kernel message. */
-       while (err > 0)
+       while (err > 0) {
                nl_recvmsgs(global->socket, global->cb);
+       }
 
        INM_LOGI("Kernel message received");
 out:
        nlmsg_free(msg);
+       __INM_FUNC_EXIT__;
        return TRUE;
 }
 

diff --git a/src/inm-port-scan.c b/src/inm-port-scan.c
index 873d56359a6270771636e0c54ee149e3e1b5ed3a..b6d41ceffb4788921a8e084343d2a24851b1adad 100644 (file)
--- a/src/inm-port-scan.c
+++ b/src/inm-port-scan.c
@@ -741,6 +741,7 @@ static int __conn_port_scan_send(target_manager_s *p_target_manager,
 
 static unsigned short __checksum(unsigned short *buf, int len)
 {
+       __INM_FUNC_ENTER__;
        int sum = 0;
        int left = len;
        u_short  *word = buf;
@@ -756,7 +757,7 @@ static unsigned short __checksum(unsigned short *buf, int len)
 
        sum = (sum >> 16) + (sum & 0xffff);
        sum += (sum >> 16);
-
+       __INM_FUNC_EXIT__;
        return (unsigned short)(~sum);
 }