X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftethering.c;h=c67f2007fb584c9628be2cd712790aed9440dc86;hb=c189a9ab8a085447b775c7fbeb0a8050751b7f84;hp=c8ec981ae93e33fd5d84a9f1e4da3c434c4eded5;hpb=86f7f6daaa4d05428e73ba5417bd0a5b4970ed32;p=framework%2Fconnectivity%2Fconnman.git diff --git a/src/tethering.c b/src/tethering.c index c8ec981..c67f200 100644 --- a/src/tethering.c +++ b/src/tethering.c @@ -2,7 +2,8 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2012 Intel Corporation. All rights reserved. + * Copyright (C) 2011 ProFUSION embedded systems * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -23,6 +24,7 @@ #include #endif +#include #include #include #include @@ -40,32 +42,39 @@ #include +#ifndef DBUS_TYPE_UNIX_FD +#define DBUS_TYPE_UNIX_FD -1 +#endif + #define BRIDGE_PROC_DIR "/proc/sys/net/bridge" #define BRIDGE_NAME "tether" -#define BRIDGE_IP "192.168.218.1" -#define BRIDGE_BCAST "192.168.218.255" -#define BRIDGE_SUBNET "255.255.255.0" -#define BRIDGE_IP_START "192.168.218.100" -#define BRIDGE_IP_END "192.168.218.200" #define BRIDGE_DNS "8.8.8.8" #define DEFAULT_MTU 1500 -static char *default_interface = NULL; -static volatile gint tethering_enabled; +#define PRIVATE_NETWORK_PRIMARY_DNS BRIDGE_DNS +#define PRIVATE_NETWORK_SECONDARY_DNS "8.8.4.4" + +static volatile int tethering_enabled; static GDHCPServer *tethering_dhcp_server = NULL; +static struct connman_ippool *dhcp_ippool = NULL; static DBusConnection *connection; static GHashTable *pn_hash; struct connman_private_network { char *owner; + char *path; guint watch; DBusMessage *msg; + DBusMessage *reply; int fd; char *interface; int index; guint iface_watch; + struct connman_ippool *pool; + const char *primary_dns; + const char *secondary_dns; }; const char *__connman_tethering_get_bridge(void) @@ -157,262 +166,187 @@ static void dhcp_server_stop(GDHCPServer *server) g_dhcp_server_unref(server); } -static int set_forward_delay(const char *name, unsigned int delay) -{ - FILE *f; - char *forward_delay_path; - - forward_delay_path = - g_strdup_printf("/sys/class/net/%s/bridge/forward_delay", name); - - if (forward_delay_path == NULL) - return -ENOMEM; - - f = fopen(forward_delay_path, "r+"); - - g_free(forward_delay_path); - - if (f == NULL) - return -errno; - - fprintf(f, "%d", delay); - - fclose(f); - - return 0; -} - -static int create_bridge(const char *name) +static void tethering_restart(struct connman_ippool *pool, void *user_data) { - int sk, err; - - DBG("name %s", name); - - sk = socket(AF_INET, SOCK_STREAM, 0); - if (sk < 0) - return -EOPNOTSUPP; - - err = ioctl(sk, SIOCBRADDBR, name); - - if (err < 0) - return -EOPNOTSUPP; - - err = set_forward_delay(name, 0); - - if (err < 0) - ioctl(sk, SIOCBRDELBR, name); - - close(sk); - - return err; + __connman_tethering_set_disabled(); + __connman_tethering_set_enabled(); } -static int remove_bridge(const char *name) +void __connman_tethering_set_enabled(void) { - int sk, err; - - DBG("name %s", name); - - sk = socket(AF_INET, SOCK_STREAM, 0); - if (sk < 0) - return -EOPNOTSUPP; + int index; + int err; + const char *gateway; + const char *broadcast; + const char *subnet_mask; + const char *start_ip; + const char *end_ip; + const char *dns; + unsigned char prefixlen; - err = ioctl(sk, SIOCBRDELBR, name); + DBG("enabled %d", tethering_enabled + 1); - close(sk); + if (__sync_fetch_and_add(&tethering_enabled, 1) != 0) + return; + err = __connman_bridge_create(BRIDGE_NAME); if (err < 0) - return -EOPNOTSUPP; - - return 0; -} + return; -static int enable_bridge(const char *name) -{ - int err, index; + index = connman_inet_ifindex(BRIDGE_NAME); + dhcp_ippool = __connman_ippool_create(index, 2, 252, + tethering_restart, NULL); + if (dhcp_ippool == NULL) { + connman_error("Fail to create IP pool"); + return; + } - index = connman_inet_ifindex(name); - if (index < 0) - return index; + gateway = __connman_ippool_get_gateway(dhcp_ippool); + broadcast = __connman_ippool_get_broadcast(dhcp_ippool); + subnet_mask = __connman_ippool_get_subnet_mask(dhcp_ippool); + start_ip = __connman_ippool_get_start_ip(dhcp_ippool); + end_ip = __connman_ippool_get_end_ip(dhcp_ippool); - err = __connman_inet_modify_address(RTM_NEWADDR, - NLM_F_REPLACE | NLM_F_ACK, index, AF_INET, - BRIDGE_IP, NULL, 24, BRIDGE_BCAST); - if (err < 0) - return err; + err = __connman_bridge_enable(BRIDGE_NAME, gateway, broadcast); + if (err < 0 && err != -EALREADY) { + __connman_bridge_remove(BRIDGE_NAME); + return; + } - return connman_inet_ifup(index); -} + dns = gateway; + if (__connman_dnsproxy_add_listener(BRIDGE_NAME) < 0) { + connman_error("Can't add listener %s to DNS proxy", + BRIDGE_NAME); + dns = BRIDGE_DNS; + } -static int disable_bridge(const char *name) -{ - int index; + tethering_dhcp_server = dhcp_server_start(BRIDGE_NAME, + gateway, subnet_mask, + start_ip, end_ip, + 24 * 3600, dns); + if (tethering_dhcp_server == NULL) { + __connman_bridge_disable(BRIDGE_NAME); + __connman_bridge_remove(BRIDGE_NAME); + return; + } - index = connman_inet_ifindex(name); - if (index < 0) - return index; + prefixlen = + __connman_ipconfig_netmask_prefix_len(subnet_mask); + __connman_nat_enable(BRIDGE_NAME, start_ip, prefixlen); - return connman_inet_ifdown(index); + DBG("tethering started"); } -static int enable_ip_forward(connman_bool_t enable) +void __connman_tethering_set_disabled(void) { + DBG("enabled %d", tethering_enabled - 1); - FILE *f; - - f = fopen("/proc/sys/net/ipv4/ip_forward", "r+"); - if (f == NULL) - return -errno; + __connman_dnsproxy_remove_listener(BRIDGE_NAME); - if (enable == TRUE) - fprintf(f, "1"); - else - fprintf(f, "0"); + if (__sync_fetch_and_sub(&tethering_enabled, 1) != 1) + return; - fclose(f); + __connman_nat_disable(BRIDGE_NAME); - return 0; -} - -static int enable_nat(const char *interface) -{ - int err; + dhcp_server_stop(tethering_dhcp_server); - if (interface == NULL) - return 0; + tethering_dhcp_server = NULL; - /* Enable IPv4 forwarding */ - err = enable_ip_forward(TRUE); - if (err < 0) - return err; + __connman_bridge_disable(BRIDGE_NAME); - /* POSTROUTING flush */ - err = __connman_iptables_command("-t nat -F POSTROUTING"); - if (err < 0) - return err; + __connman_ippool_unref(dhcp_ippool); - /* Enable masquerading */ - err = __connman_iptables_command("-t nat -A POSTROUTING " - "-o %s -j MASQUERADE", interface); - if (err < 0) - return err; + __connman_bridge_remove(BRIDGE_NAME); - return __connman_iptables_commit("nat"); + DBG("tethering stopped"); } -static void disable_nat(const char *interface) +static void setup_tun_interface(unsigned int flags, unsigned change, + void *data) { + struct connman_private_network *pn = data; + unsigned char prefixlen; + DBusMessageIter array, dict; + const char *server_ip; + const char *peer_ip; + const char *subnet_mask; int err; - /* Disable IPv4 forwarding */ - enable_ip_forward(FALSE); + DBG("index %d flags %d change %d", pn->index, flags, change); - /* POSTROUTING flush */ - err = __connman_iptables_command("-t nat -F POSTROUTING"); - if (err < 0) + if (flags & IFF_UP) return; - __connman_iptables_commit("nat"); -} - -void __connman_tethering_set_enabled(void) -{ - int err; - - DBG("enabled %d", tethering_enabled + 1); + subnet_mask = __connman_ippool_get_subnet_mask(pn->pool); + server_ip = __connman_ippool_get_start_ip(pn->pool); + peer_ip = __connman_ippool_get_end_ip(pn->pool); + prefixlen = + __connman_ipconfig_netmask_prefix_len(subnet_mask); - if (g_atomic_int_exchange_and_add(&tethering_enabled, 1) == 0) { - err = create_bridge(BRIDGE_NAME); - if (err < 0) - return; - - err = enable_bridge(BRIDGE_NAME); - if (err < 0) { - remove_bridge(BRIDGE_NAME); - return; - } - - tethering_dhcp_server = - dhcp_server_start(BRIDGE_NAME, - BRIDGE_IP, BRIDGE_SUBNET, - BRIDGE_IP_START, BRIDGE_IP_END, - 24 * 3600, BRIDGE_DNS); - if (tethering_dhcp_server == NULL) { - disable_bridge(BRIDGE_NAME); - remove_bridge(BRIDGE_NAME); - return; - } - - enable_nat(default_interface); - - DBG("tethering started"); + if ((__connman_inet_modify_address(RTM_NEWADDR, + NLM_F_REPLACE | NLM_F_ACK, pn->index, AF_INET, + server_ip, peer_ip, prefixlen, NULL)) < 0) { + DBG("address setting failed"); + return; } -} - -void __connman_tethering_set_disabled(void) -{ - DBG("enabled %d", tethering_enabled - 1); - - if (g_atomic_int_dec_and_test(&tethering_enabled) == TRUE) { - disable_nat(default_interface); - dhcp_server_stop(tethering_dhcp_server); + connman_inet_ifup(pn->index); - disable_bridge(BRIDGE_NAME); - - remove_bridge(BRIDGE_NAME); - - DBG("tethering stopped"); + err = __connman_nat_enable(BRIDGE_NAME, server_ip, prefixlen); + if (err < 0) { + connman_error("failed to enable NAT"); + goto error; } -} -void __connman_tethering_update_interface(const char *interface) -{ - DBG("interface %s", interface); + dbus_message_iter_init_append(pn->reply, &array); - g_free(default_interface); + dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH, + &pn->path); - if (interface == NULL) { - disable_nat(interface); - default_interface = NULL; + connman_dbus_dict_open(&array, &dict); - return; - } + connman_dbus_dict_append_basic(&dict, "ServerIPv4", + DBUS_TYPE_STRING, &server_ip); + connman_dbus_dict_append_basic(&dict, "PeerIPv4", + DBUS_TYPE_STRING, &peer_ip); + connman_dbus_dict_append_basic(&dict, "PrimaryDNS", + DBUS_TYPE_STRING, &pn->primary_dns); + connman_dbus_dict_append_basic(&dict, "SecondaryDNS", + DBUS_TYPE_STRING, &pn->secondary_dns); - default_interface = g_strdup(interface); + connman_dbus_dict_close(&array, &dict); - if (!g_atomic_int_get(&tethering_enabled)) - return; + dbus_message_iter_append_basic(&array, DBUS_TYPE_UNIX_FD, &pn->fd); - enable_nat(interface); -} + g_dbus_send_message(connection, pn->reply); -static void setup_tun_interface(unsigned int flags, unsigned change, - void *data) -{ - struct connman_private_network *pn = data; + return; - DBG("index %d flags %d change %d", pn->index, flags, change); +error: + pn->reply = __connman_error_failed(pn->msg, -err); + g_dbus_send_message(connection, pn->reply); - g_dbus_send_reply(connection, pn->msg, DBUS_TYPE_UNIX_FD, &pn->fd, - DBUS_TYPE_INVALID); + g_hash_table_remove(pn_hash, pn->path); } static void remove_private_network(gpointer user_data) { struct connman_private_network *pn = user_data; - close(pn->fd); - + __connman_nat_disable(BRIDGE_NAME); connman_rtnl_remove_watch(pn->iface_watch); + __connman_ippool_unref(pn->pool); if (pn->watch > 0) { g_dbus_remove_watch(connection, pn->watch); pn->watch = 0; } + close(pn->fd); + g_free(pn->interface); g_free(pn->owner); + g_free(pn->path); g_free(pn); } @@ -424,29 +358,48 @@ static void owner_disconnect(DBusConnection *connection, void *user_data) pn->watch = 0; - g_hash_table_remove(pn_hash, pn->owner); + g_hash_table_remove(pn_hash, pn->path); +} + +static void ippool_disconnect(struct connman_ippool *pool, void *user_data) +{ + struct connman_private_network *pn = user_data; + + DBG("block used externally"); + + g_hash_table_remove(pn_hash, pn->path); } int __connman_private_network_request(DBusMessage *msg, const char *owner) { struct connman_private_network *pn; char *iface = NULL; + char *path = NULL; int index, fd, err; - pn = g_hash_table_lookup(pn_hash, owner); - if (pn != NULL) - return -EEXIST; + if (DBUS_TYPE_UNIX_FD < 0) + return -EINVAL; fd = connman_inet_create_tunnel(&iface); if (fd < 0) return fd; + path = g_strdup_printf("/tethering/%s", iface); + + pn = g_hash_table_lookup(pn_hash, path); + if (pn) { + g_free(path); + g_free(iface); + close(fd); + return -EEXIST; + } + index = connman_inet_ifindex(iface); if (index < 0) { err = -ENODEV; goto error; } - DBG("inteface %s", iface); + DBG("interface %s", iface); err = connman_inet_set_mtu(index, DEFAULT_MTU); @@ -457,35 +410,50 @@ int __connman_private_network_request(DBusMessage *msg, const char *owner) } pn->owner = g_strdup(owner); + pn->path = path; pn->watch = g_dbus_add_disconnect_watch(connection, pn->owner, owner_disconnect, pn, NULL); pn->msg = msg; + pn->reply = dbus_message_new_method_return(pn->msg); + if (pn->reply == NULL) + goto error; + pn->fd = fd; pn->interface = iface; pn->index = index; + pn->pool = __connman_ippool_create(pn->fd, 1, 1, ippool_disconnect, pn); + if (pn->pool == NULL) { + errno = -ENOMEM; + goto error; + } + + pn->primary_dns = PRIVATE_NETWORK_PRIMARY_DNS; + pn->secondary_dns = PRIVATE_NETWORK_SECONDARY_DNS; pn->iface_watch = connman_rtnl_add_newlink_watch(index, setup_tun_interface, pn); - g_hash_table_insert(pn_hash, pn->owner, pn); + g_hash_table_insert(pn_hash, pn->path, pn); return 0; error: close(fd); g_free(iface); + g_free(path); + g_free(pn); return err; } -int __connman_private_network_release(const char *owner) +int __connman_private_network_release(const char *path) { struct connman_private_network *pn; - pn = g_hash_table_lookup(pn_hash, owner); + pn = g_hash_table_lookup(pn_hash, path); if (pn == NULL) return -EACCES; - g_hash_table_remove(pn_hash, owner); + g_hash_table_remove(pn_hash, path); return 0; } @@ -509,11 +477,13 @@ void __connman_tethering_cleanup(void) { DBG(""); - if (g_atomic_int_get(&tethering_enabled)) { + __sync_synchronize(); + if (tethering_enabled == 0) { if (tethering_dhcp_server) dhcp_server_stop(tethering_dhcp_server); - disable_bridge(BRIDGE_NAME); - remove_bridge(BRIDGE_NAME); + __connman_bridge_disable(BRIDGE_NAME); + __connman_bridge_remove(BRIDGE_NAME); + __connman_nat_disable(BRIDGE_NAME); } if (connection == NULL)