char *group;
char *path;
int index;
- int router_solicit_count;
struct connman_network_driver *driver;
void *driver_data;
connman_bool_t wps;
connman_bool_t use_wps;
char *pin_wps;
+#if defined TIZEN_EXT
+ char encryption_mode[6];
+ unsigned char bssid[6];
+ unsigned int maxrate;
+#endif
} wifi;
struct {
static void set_connect_error(struct connman_network *network)
{
+
+#if defined TIZEN_EXT
+ if (network->associating != FALSE)
+ network->associating = FALSE;
+#endif
+
struct connman_service *service;
service = __connman_service_lookup_from_network(network);
__connman_service_clear_error(service);
}
-static void set_configuration(struct connman_network *network,
- enum connman_ipconfig_type type)
+static void set_configuration(struct connman_network *network)
{
struct connman_service *service;
service = __connman_service_lookup_from_network(network);
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_CONFIGURATION,
- type);
+ CONNMAN_IPCONFIG_TYPE_IPV4);
}
static void dhcp_success(struct connman_network *network)
if (err < 0)
goto err;
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+ err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
if (err < 0)
goto err;
ipconfig_ipv4 = __connman_service_get_ip4config(service);
- set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+ set_configuration(network);
network->connecting = FALSE;
if (err < 0)
goto err;
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+ err = __connman_ipconfig_gateway_add(ipconfig_ipv4, service);
+#else
err = __connman_ipconfig_gateway_add(ipconfig_ipv4);
+#endif
if (err < 0)
goto err;
if (__connman_ipconfig_get_local(ipconfig) == NULL)
__connman_service_read_ip4config(service);
- set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+ set_configuration(network);
err = __connman_ipconfig_address_add(ipconfig);
if (err < 0)
goto err;
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+ err = __connman_ipconfig_gateway_add(ipconfig, service);
+#else
err = __connman_ipconfig_gateway_add(ipconfig);
+#endif
if (err < 0)
goto err;
DBG("network %p", network);
- set_configuration(network, CONNMAN_IPCONFIG_TYPE_IPV4);
+ set_configuration(network);
err = __connman_dhcp_start(network, dhcp_callback);
if (err < 0) {
return err;
}
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+ err = __connman_ipconfig_gateway_add(ipconfig_ipv6, service);
+#else
err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
+#endif
if (err < 0)
return err;
return 0;
}
-static void stop_dhcpv6(struct connman_network *network)
-{
- __connman_dhcpv6_stop(network);
-}
-
-static void dhcpv6_info_callback(struct connman_network *network,
- connman_bool_t success)
-{
- DBG("success %d", success);
-
- stop_dhcpv6(network);
-}
-
-static gboolean dhcpv6_set_addresses(struct connman_network *network)
-{
- struct connman_service *service;
- struct connman_ipconfig *ipconfig_ipv6;
- int err = -EINVAL;
-
- service = __connman_service_lookup_from_network(network);
- if (service == NULL)
- goto err;
-
- connman_network_set_associating(network, FALSE);
-
- network->connecting = FALSE;
-
- ipconfig_ipv6 = __connman_service_get_ip6config(service);
- err = __connman_ipconfig_address_add(ipconfig_ipv6);
- if (err < 0)
- goto err;
-
- err = __connman_ipconfig_gateway_add(ipconfig_ipv6);
- if (err < 0)
- goto err;
-
- return 0;
-
-err:
- connman_network_set_error(network,
- CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL);
- return err;
-}
-
-static void autoconf_ipv6_set(struct connman_network *network);
-static void dhcpv6_callback(struct connman_network *network,
- connman_bool_t success);
-
-/*
- * Have a separate callback for renew so that we do not do autoconf
- * in wrong phase as the dhcpv6_callback() is also called when doing
- * DHCPv6 solicitation.
- */
-static void dhcpv6_renew_callback(struct connman_network *network,
- connman_bool_t success)
-{
- if (success == TRUE)
- dhcpv6_callback(network, success);
- else {
- stop_dhcpv6(network);
-
- /* restart and do solicit again. */
- autoconf_ipv6_set(network);
- }
-}
-
-static void dhcpv6_callback(struct connman_network *network,
- connman_bool_t success)
-{
- DBG("success %d", success);
-
- /* Start the renew process if necessary */
- if (success == TRUE) {
-
- if (dhcpv6_set_addresses(network) < 0) {
- stop_dhcpv6(network);
- return;
- }
-
- if (__connman_dhcpv6_start_renew(network,
- dhcpv6_renew_callback) == -ETIMEDOUT)
- dhcpv6_renew_callback(network, FALSE);
- } else
- stop_dhcpv6(network);
-}
-
-static void check_dhcpv6(struct nd_router_advert *reply,
- unsigned int length, void *user_data)
-{
- struct connman_network *network = user_data;
- GSList *prefixes;
-
- DBG("reply %p", reply);
-
- if (reply == NULL) {
- /*
- * Router solicitation message seem to get lost easily so
- * try to send it again.
- */
- if (network->router_solicit_count > 0) {
- DBG("re-send router solicitation %d",
- network->router_solicit_count);
- network->router_solicit_count--;
- __connman_inet_ipv6_send_rs(network->index, 1,
- check_dhcpv6, network);
- return;
- }
- connman_network_unref(network);
- return;
- }
-
- network->router_solicit_count = 0;
-
- prefixes = __connman_inet_ipv6_get_prefixes(reply, length);
-
- /*
- * We do stateful/stateless DHCPv6 if router advertisement says so.
- */
- if (reply->nd_ra_flags_reserved & ND_RA_FLAG_MANAGED)
- __connman_dhcpv6_start(network, prefixes, dhcpv6_callback);
- else if (reply->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
- __connman_dhcpv6_start_info(network, dhcpv6_info_callback);
-
- connman_network_unref(network);
-}
-
static void autoconf_ipv6_set(struct connman_network *network)
{
- struct connman_service *service;
- struct connman_ipconfig *ipconfig;
- int index;
-
DBG("network %p", network);
__connman_device_set_network(network->device, network);
connman_device_set_disconnected(network->device, FALSE);
- network->connecting = FALSE;
-
- service = __connman_service_lookup_from_network(network);
- if (service == NULL)
- return;
-
- ipconfig = __connman_service_get_ip6config(service);
- if (ipconfig == NULL)
- return;
-
- index = connman_ipconfig_get_index(ipconfig);
-
- connman_network_ref(network);
+ /* XXX: Append IPv6 nameservers here */
- /* Try to get stateless DHCPv6 information, RFC 3736 */
- network->router_solicit_count = 3;
- __connman_inet_ipv6_send_rs(index, 1, check_dhcpv6, network);
+ network->connecting = FALSE;
}
static gboolean set_connected(gpointer user_data)
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
break;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_AUTO:
autoconf_ipv6_set(network);
break;
return FALSE;
}
break;
+ case CONNMAN_IPCONFIG_METHOD_DHCP:
+ break;
}
switch (ipv4_method) {
} else {
enum connman_service_state state;
- /*
- * Resetting solicit count here will prevent the RS resend loop
- * from sending packets in check_dhcpv6()
- */
- network->router_solicit_count = 0;
-
__connman_device_set_network(network->device, NULL);
- switch (ipv6_method) {
- case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
- case CONNMAN_IPCONFIG_METHOD_OFF:
- case CONNMAN_IPCONFIG_METHOD_FIXED:
- case CONNMAN_IPCONFIG_METHOD_MANUAL:
- break;
- case CONNMAN_IPCONFIG_METHOD_DHCP:
- case CONNMAN_IPCONFIG_METHOD_AUTO:
- stop_dhcpv6(network);
- break;
- }
-
switch (ipv4_method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
__connman_ipconfig_enable_ipv6(ipconfig_ipv6);
}
+#if defined TIZEN_EXT
+ if (connman_service_get_type(service) ==
+ CONNMAN_SERVICE_TYPE_CELLULAR) {
+ network->connecting = FALSE;
+ connman_network_set_associating(network, FALSE);
+ }
+#endif
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV4);
__connman_service_ipconfig_indicate_state(service,
CONNMAN_SERVICE_STATE_IDLE,
CONNMAN_IPCONFIG_TYPE_IPV6);
+#if defined TIZEN_EXT
+ if (connman_service_get_type(service) ==
+ CONNMAN_SERVICE_TYPE_CELLULAR)
+ return FALSE;
+#endif
}
network->connecting = FALSE;
return network->associating;
}
-int connman_network_connect_hidden(struct connman_network *network,
- char *identity, char* passphrase)
-{
- struct connman_service *service;
-
- DBG("");
-
- service = __connman_service_lookup_from_network(network);
- if (service == NULL)
- return -EINVAL;
-
- if (identity != NULL)
- __connman_service_set_agent_identity(service, identity);
-
- if (passphrase != NULL)
- __connman_service_add_passphrase(service, passphrase);
-
- return __connman_service_connect(service);
-}
-
/**
* __connman_network_connect:
* @network: network structure
network->connecting = TRUE;
+#if defined TIZEN_EXT
+ if (network->type != CONNMAN_NETWORK_TYPE_CELLULAR)
+#endif
__connman_device_disconnect(network->device);
err = network->driver->connect(network);
return err;
}
+#if defined TIZEN_EXT
+/*
+ * Description: __connman_service_lookup_from_index cannot find correct service
+ */
+ return __connman_ipconfig_gateway_add(ipconfig, service);
+#else
return __connman_ipconfig_gateway_add(ipconfig);
+#endif
}
int __connman_network_clear_ipconfig(struct connman_network *network,
return 0;
}
+#if defined TIZEN_EXT
+/*
+ * Description: Telephony plug-in requires manual PROXY setting function
+ */
+int connman_network_set_proxy(struct connman_network *network,
+ const char *proxies)
+{
+ struct connman_service *service;
+
+ DBG("network %p proxies %s", network, proxies);
+
+ service = __connman_service_lookup_from_network(network);
+ if (service == NULL)
+ return -EINVAL;
+
+ __connman_service_set_proxy(service, proxies);
+
+ connman_service_set_proxy_method(service, CONNMAN_SERVICE_PROXY_METHOD_MANUAL);
+
+ return 0;
+}
+
+/*
+ * Description: Network client requires additional wifi specific info
+ */
+int connman_network_set_bssid(struct connman_network *network,
+ const unsigned char *bssid)
+{
+ if (bssid == NULL)
+ return -EINVAL;
+
+ DBG("network %p bssid %02x:%02x:%02x:%02x:%02x:%02x", network,
+ bssid[0], bssid[1], bssid[2],
+ bssid[3], bssid[4], bssid[5]);
+
+ int i = 0;
+ for (;i < 6;i++)
+ network->wifi.bssid[i] = bssid[i];
+
+ return 0;
+}
+
+unsigned char *connman_network_get_bssid(struct connman_network *network)
+{
+ return (unsigned char *)network->wifi.bssid;
+}
+
+int connman_network_set_maxrate(struct connman_network *network,
+ unsigned int maxrate)
+{
+ DBG("network %p maxrate %d", network, maxrate);
+
+ network->wifi.maxrate = maxrate;
+
+ return 0;
+}
+
+unsigned int connman_network_get_maxrate(struct connman_network *network)
+{
+ return network->wifi.maxrate;
+}
+
+int connman_network_set_enc_mode(struct connman_network *network,
+ const char *encryption_mode)
+{
+ if (encryption_mode == NULL)
+ return -EINVAL;
+
+ DBG("network %p encryption mode %s", network, encryption_mode);
+
+ g_strlcpy(network->wifi.encryption_mode, encryption_mode, 6);
+
+ return 0;
+}
+
+const char *connman_network_get_enc_mode(struct connman_network *network)
+{
+ return (const char *)network->wifi.encryption_mode;
+}
+
+const char *connman_network_get_ifname(struct connman_network *network)
+{
+ struct connman_service *service;
+ struct connman_ipconfig *ipconfig;
+ const char *ifname = NULL;
+
+ service = __connman_service_lookup_from_network(network);
+ if (service == NULL)
+ return NULL;
+
+ ipconfig = __connman_service_get_ip4config(service);
+
+ if (ipconfig != NULL)
+ ifname = connman_ipconfig_get_ifname(ipconfig);
+
+ DBG("index %d, service %p ip4config %p ifname %s",
+ network->index, service, ipconfig, ifname);
+ return ifname;
+}
+#endif
+
int connman_network_set_nameservers(struct connman_network *network,
const char *nameservers)
{
}
/**
+ * connman_network_set_roaming:
+ * @network: network structure
+ * @roaming: roaming state
+ *
+ * Set roaming state for network
+ */
+int connman_network_set_roaming(struct connman_network *network,
+ connman_bool_t roaming)
+{
+ DBG("network %p roaming %d", network, roaming);
+
+ network->roaming = roaming;
+
+ return 0;
+}
+
+/**
* connman_network_set_string:
* @network: network structure
* @key: unique identifier
DBG("network %p key %s value %d", network, key, value);
if (g_strcmp0(key, "Roaming") == 0)
- network->roaming = value;
+ return connman_network_set_roaming(network, value);
else if (g_strcmp0(key, "WiFi.WPS") == 0)
network->wifi.wps = value;
else if (g_strcmp0(key, "WiFi.UseWPS") == 0)
projects / profile / ivi / connman.git / blobdiff