net-config: Notify network configuration changes using dbus signal

[platform/core/connectivity/net-config.git] / src / vpnsvc-internal.c

diff --git a/src/vpnsvc-internal.c b/src/vpnsvc-internal.c
index ae8baee..87add01 100755 (executable)
--- a/src/vpnsvc-internal.c
+++ b/src/vpnsvc-internal.c
@@ -157,10 +157,8 @@ static char *connman_default_profile(GDBusConnection *connection)
 
        if (message) {
                g_variant_get(message, "(a(oa{sv}))", &iter);
-               while (g_variant_iter_loop(iter, "(oa{sv})", &key, &value)) {
+               if (g_variant_iter_loop(iter, "(oa{sv})", &key, &value))
                        profile = strdup(key);
-                       break;
-               }
 
                if (value)
                        g_variant_iter_free(value);
@@ -758,7 +756,6 @@ static int check_interface_precondition(const char *iface_name)
 int vpn_service_init(const char* iface_name, size_t iface_name_len, int fd, vpnsvc_tun_s *handle_s)
 {
        struct ifreq ifr;
-       size_t len = 0;
        char buf[BUF_SIZE_FOR_ERR] = { 0 };
 
        DBG("enter vpn_daemon_init, iface_name : %s, iface_name_len : %d, fd : %d\n", iface_name, iface_name_len, fd);
@@ -775,6 +772,7 @@ int vpn_service_init(const char* iface_name, size_t iface_name_len, int fd, vpns
 
        if (*iface_name)
                strncpy(ifr.ifr_name, iface_name, iface_name_len);
+       ifr.ifr_name[iface_name_len] = '\0';
 
        DBG("before init, ifindex : %d", ifr.ifr_ifindex);
 
@@ -798,9 +796,7 @@ int vpn_service_init(const char* iface_name, size_t iface_name_len, int fd, vpns
 
        handle_s->fd = 0;   /* server fd does not meaning */
        handle_s->index = get_interface_index(iface_name);
-       len = strlen(ifr.ifr_name);
-       strncpy(handle_s->name, ifr.ifr_name, len);
-       handle_s->name[len] = '\0';
+       g_strlcpy(handle_s->name, ifr.ifr_name, VPNSVC_VPN_IFACE_NAME_LEN);
 
        return VPNSVC_ERROR_NONE;
 }