DNS Forward and Use of Tethering cellular profile are removed

Change-Id: Ic912f2eb4b0afde573a324d1e54342235710b471

diff --git a/src/mobileap_network.c b/src/mobileap_network.c
index a472c35..74f63a2 100644 (file)
--- a/src/mobileap_network.c
+++ b/src/mobileap_network.c
@@ -25,10 +25,7 @@
 
 static connection_h connection = NULL;
 static connection_profile_h cprof = NULL;
-static char *dns_addr = NULL;
-
-static gboolean __set_dns_forward(void);
-static gboolean __unset_dns_forward(void);
+static connection_profile_h old_prof = NULL;
 
 static void __print_profile(connection_profile_h profile)
 {
@@ -86,51 +83,27 @@ static void __print_profile(connection_profile_h profile)
        return;
 }
 
-static void __connection_opened_cb(connection_error_e result, void *user_data)
+static gboolean __is_connected_prof(connection_profile_h profile)
 {
-       if (cprof == NULL) {
-               ERR("Current profile is not set\n");
-               return;
-       }
-
-       if (result != CONNECTION_ERROR_NONE) {
-               ERR("connection open is failed : 0x%X\n", result);
-               connection_profile_destroy(cprof);
-               cprof = NULL;
-               return;
-       }
-       DBG("connection is opened\n");
+       int conn_ret;
+       connection_profile_state_e pstat = CONNECTION_PROFILE_STATE_DISCONNECTED;
 
-       if (_mobileap_is_disabled()) {
-               DBG("Tethering is disabled\n");
-               _close_network();
-               return;
+       conn_ret = connection_profile_get_state(profile, &pstat);
+       if (conn_ret != CONNECTION_ERROR_NONE) {
+               ERR("connection_profile_get_state is failed: 0x%X\n", conn_ret);
+               return FALSE;
        }
 
-       DBG("Set masquerading\n");
-       if (_set_masquerade() == FALSE) {
-               ERR("_set_masquerade is failed\n");
-               _close_network();
-               return;
+       if (pstat != CONNECTION_PROFILE_STATE_CONNECTED) {
+               DBG("Profile is not connected\n");
+               return FALSE;
        }
 
-       return;
-}
-
-static void __connection_closed_cb(connection_error_e result, void *user_data)
-{
-       if (result != CONNECTION_ERROR_NONE)
-               ERR("Connection close is failed : 0x%X\n", result);
-       else
-               DBG("Connection is closed\n");
-
-       connection_profile_destroy(cprof);
-       cprof = NULL;
-
-       return;
+       DBG("Profile is connected\n");
+       return TRUE;
 }
 
-static gboolean __get_connected_prof(connection_profile_h *r_prof, connection_profile_type_e *r_net_type)
+static gboolean __get_current_prof(connection_profile_h *r_prof, connection_profile_type_e *r_net_type)
 {
        int conn_ret;
        connection_profile_h profile = NULL;
@@ -151,92 +124,25 @@ static gboolean __get_connected_prof(connection_profile_h *r_prof, connection_pr
 
        *r_prof = profile;
        *r_net_type = net_type;
-
-       return TRUE;
-}
-
-static gboolean __is_tethering_cellular_prof(connection_profile_h profile)
-{
-       int conn_ret;
-       connection_cellular_service_type_e svc_type;
-
-       conn_ret = connection_profile_get_cellular_service_type(profile, &svc_type);
-       if (conn_ret != CONNECTION_ERROR_NONE) {
-               ERR("connection_profile_get_cellular_service_type is failed : 0x%X\n", conn_ret);
-               return FALSE;
-       }
-
-       DBG("Service type : %d\n", svc_type);
-       if (svc_type != CONNECTION_CELLULAR_SERVICE_TYPE_TETHERING)
-               return FALSE;
-
        return TRUE;
 }
 
-static gboolean __get_tethering_cellular_prof(connection_profile_h *profile, gboolean *is_connected)
-{
-       int conn_ret;
-       connection_profile_state_e pstat = CONNECTION_PROFILE_STATE_DISCONNECTED;
-
-       conn_ret = connection_get_default_cellular_service_profile(connection,
-                       CONNECTION_CELLULAR_SERVICE_TYPE_TETHERING, profile);
-       if (conn_ret != CONNECTION_ERROR_NONE) {
-               ERR("There is no tethering profile : 0x%X\n", conn_ret);
-               return FALSE;
-       }
-
-       conn_ret = connection_profile_get_state(*profile, &pstat);
-       if (conn_ret != CONNECTION_ERROR_NONE) {
-               ERR("connection_profile_get_state is failed : 0x%X\n", conn_ret);
-               connection_profile_destroy(*profile);
-               return FALSE;
-       }
-       DBG("Tethering cellular service profile\n");
-       __print_profile(*profile);
-
-       if (pstat != CONNECTION_PROFILE_STATE_CONNECTED) {
-               DBG("Tethering profile is not connected\n");
-               *is_connected = FALSE;
-       } else {
-               DBG("Tethering profile is connected\n");
-               *is_connected = TRUE;
-       }
-
-       return TRUE;
-}
-
-static gboolean __get_network_prof(connection_profile_h *r_prof, gboolean *is_connected)
+static gboolean __get_network_prof(connection_profile_h *r_prof)
 {
        connection_profile_h profile;
-       connection_profile_h tether_prof;
        connection_profile_type_e net_type = CONNECTION_PROFILE_TYPE_CELLULAR;
 
-       if (__get_connected_prof(&profile, &net_type) != TRUE) {
+       if (__get_current_prof(&profile, &net_type) != TRUE) {
                ERR("There is no available network\n");
                return FALSE;
        }
 
        DBG("Current connected net_type : %d\n", net_type);
        if (net_type == CONNECTION_PROFILE_TYPE_CELLULAR) {
-               DBG("Cellular profile\n");
                __print_profile(profile);
-
-               if (__is_tethering_cellular_prof(profile) == TRUE)
-                       goto DONE;
-
-               if (__get_tethering_cellular_prof(&tether_prof, is_connected) == FALSE)
-                       goto DONE;
-               connection_profile_destroy(profile);
-
-               DBG("Getting tethering profile is successful\n");
-
-               *r_prof = tether_prof;
-               return TRUE;
        }
 
-DONE:
        *r_prof = profile;
-       *is_connected = TRUE;
        return TRUE;
 }
 
@@ -310,107 +216,20 @@ gboolean _unset_masquerade(void)
        return TRUE;
 }
 
-static gboolean __set_dns_forward(void)
-{
-       if (cprof == NULL) {
-               ERR("There is no connected network profile\n");
-               return FALSE;
-       }
-
-       char cmd[MAX_BUF_SIZE] = {0, };
-       char *interface[] = {WIFI_IF, BT_IF_ALL, USB_IF, NULL};
-       int conn_ret;
-       int i;
-
-       if (dns_addr)
-               __unset_dns_forward();
-
-       conn_ret = connection_profile_get_dns_address(cprof, DNS_ORDER,
-                       CONNECTION_ADDRESS_FAMILY_IPV4, &dns_addr);
-       if (conn_ret != CONNECTION_ERROR_NONE || dns_addr == NULL) {
-               ERR("connection_profile_get_dns_address is failed : 0x%X, 0x%p\n",
-                               conn_ret, dns_addr);
-               return FALSE;
-       }
-
-       if (strlen(dns_addr) == 0) {
-               ERR("DNS Address has zero length\n");
-               free(dns_addr);
-               dns_addr = NULL;
-               return FALSE;
-       }
-
-       DBG("DNS Address : %s\n", dns_addr);
-       for (i = 0; interface[i] != NULL; i++) {
-               snprintf(cmd, sizeof(cmd),
-                               "%s -t nat -A PREROUTING "TCP_DNS_FORWARD_RULE,
-                               IPTABLES, interface[i], dns_addr);
-               _execute_command(cmd);
-
-               snprintf(cmd, sizeof(cmd),
-                               "%s -t nat -A PREROUTING "UDP_DNS_FORWARD_RULE,
-                               IPTABLES, interface[i], dns_addr);
-               _execute_command(cmd);
-       }
-
-       return TRUE;
-}
-
-static gboolean __unset_dns_forward(void)
-{
-       if (dns_addr == NULL) {
-               DBG("There is no configured dns forward\n");
-               return TRUE;
-       }
-
-       char cmd[MAX_BUF_SIZE] = {0, };
-       char *interface[] = {WIFI_IF, BT_IF_ALL, USB_IF, NULL};
-       int i;
-
-       DBG("DNS Address : %s\n", dns_addr);
-       for (i = 0; interface[i] != NULL; i++) {
-               snprintf(cmd, sizeof(cmd),
-                               "%s -t nat -D PREROUTING "TCP_DNS_FORWARD_RULE,
-                               IPTABLES, interface[i], dns_addr);
-               _execute_command(cmd);
-
-               snprintf(cmd, sizeof(cmd),
-                               "%s -t nat -D PREROUTING "UDP_DNS_FORWARD_RULE,
-                               IPTABLES, interface[i], dns_addr);
-               _execute_command(cmd);
-       }
-
-       free(dns_addr);
-       dns_addr = NULL;
-
-       return TRUE;
-}
-
 gboolean _open_network(void)
 {
        connection_profile_h profile = NULL;
-       gboolean is_connected = FALSE;
-       int conn_ret;
 
        DBG("+\n");
 
-       if (__get_network_prof(&profile, &is_connected) == FALSE) {
+       if (__get_network_prof(&profile) == FALSE) {
                ERR("__get_network_prof is failed\n");
                return FALSE;
        }
        cprof = profile;
 
-       if (is_connected == FALSE) {
-               DBG("Profile is not connected\n");
-               conn_ret = connection_open_profile(connection, cprof,
-                               __connection_opened_cb, NULL);
-               if (conn_ret != CONNECTION_ERROR_NONE) {
-                       ERR("connection_open_profile is failed : 0x%X\n", conn_ret);
-                       connection_profile_destroy(cprof);
-                       cprof = NULL;
-                       return FALSE;
-               }
-
+       if (__is_connected_prof(cprof) == FALSE) {
+               DBG("Connection is not yet opened\n");
                return TRUE;
        }
 
@@ -421,14 +240,6 @@ gboolean _open_network(void)
                return FALSE;
        }
 
-       DBG("Set dns forwarding\n");
-       if (__set_dns_forward() == FALSE) {
-               ERR("_set_dns_forward is failed\n");
-               _unset_masquerade();
-               _close_network();
-               return FALSE;
-       }
-
        DBG("-\n");
 
        return TRUE;
@@ -436,32 +247,19 @@ gboolean _open_network(void)
 
 gboolean _close_network(void)
 {
-       int conn_ret;
-
-       if (cprof == NULL)
-               return TRUE;
+       gboolean ret;
 
        DBG("+\n");
 
-       if (__unset_dns_forward() == FALSE)
-               ERR("__unset_dns_forward is failed\n");
-
-       if (_unset_masquerade() == FALSE)
-               ERR("_unset_masquerade is failed\n");
-
-       if (__is_tethering_cellular_prof(cprof) == TRUE) {
-               conn_ret = connection_close_profile(connection, cprof,
-                               __connection_closed_cb, NULL);
-               if (conn_ret != CONNECTION_ERROR_NONE) {
-                       ERR("connection_close_profile is failed : 0x%X\n", conn_ret);
-                       connection_profile_destroy(cprof);
-                       cprof = NULL;
-                       return FALSE;
-               }
-
+       if (cprof == NULL && old_prof == NULL) {
+               ERR("There is nothing to handle\n");
                return TRUE;
        }
 
+       ret = _unset_masquerade();
+       if (ret == FALSE)
+               ERR("_unset_masquerade is failed\n");
+
        connection_profile_destroy(cprof);
        cprof = NULL;