X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fnetwork.h;h=d637579f75891d320d28c538b833f8fc11556623;hb=00b8c314dc2cfb641494d413f4b00d90a10ecbeb;hp=91154c8d32dea79d45c00fd45c384ebdaa489308;hpb=d9eb2d0c1032c34854528fca9d910d978c454997;p=platform%2Fupstream%2Fconnman.git diff --git a/include/network.h b/include/network.h old mode 100644 new mode 100755 index 91154c8..d637579 --- a/include/network.h +++ b/include/network.h @@ -1,9 +1,8 @@ - /* * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2013 Intel Corporation. All rights reserved. * * 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,7 +22,11 @@ #ifndef __CONNMAN_NETWORK_H #define __CONNMAN_NETWORK_H -#include +#include +#include + +#include + #include #include @@ -31,6 +34,12 @@ extern "C" { #endif +#if defined TIZEN_EXT +#define WIFI_ENCYPTION_MODE_LEN_MAX 6 +#define WIFI_BSSID_LEN_MAX 6 +#define MAC_ADDRESS_LENGTH 18 +#endif + /** * SECTION:network * @title: Network premitives @@ -41,10 +50,10 @@ enum connman_network_type { CONNMAN_NETWORK_TYPE_UNKNOWN = 0, CONNMAN_NETWORK_TYPE_ETHERNET = 1, CONNMAN_NETWORK_TYPE_WIFI = 2, - CONNMAN_NETWORK_TYPE_WIMAX = 3, CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN = 8, CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9, CONNMAN_NETWORK_TYPE_CELLULAR = 10, + CONNMAN_NETWORK_TYPE_GADGET = 11, CONNMAN_NETWORK_TYPE_VENDOR = 10000, }; @@ -54,8 +63,55 @@ enum connman_network_error { CONNMAN_NETWORK_ERROR_CONFIGURE_FAIL = 2, CONNMAN_NETWORK_ERROR_INVALID_KEY = 3, CONNMAN_NETWORK_ERROR_CONNECT_FAIL = 4, +#if defined TIZEN_EXT + CONNMAN_NETWORK_ERROR_DHCP_FAIL = 5, + CONNMAN_NETWORK_ERROR_BLOCKED = 6, + CONNMAN_NETWORK_ERROR_AUTHENTICATE_FAIL = 7, +#else + CONNMAN_NETWORK_ERROR_BLOCKED = 5, +#endif +}; + +#if defined TIZEN_EXT +struct connman_bssids { + unsigned char bssid[WIFI_BSSID_LEN_MAX]; + uint16_t strength; + uint16_t frequency; + uint16_t assoc_reject_cnt; + bool is_last_connected; +#if defined TIZEN_EXT_INS + int score_last_connected_bssid; + int score_assoc_reject; + int score_frequency; + int score_strength; +#endif + int ins_score; }; +/* Backward compatible + * modes of available network */ +typedef enum { + IEEE80211_UNKNOWN, + IEEE80211_MODE_B, + IEEE80211_MODE_BG, + IEEE80211_MODE_BGN, + IEEE80211_MODE_A, + IEEE80211_MODE_AN, + IEEE80211_MODE_ANAC, +} ieee80211_modes_e; + +/* connection mode of connected network + * based on current linkspeed */ +typedef enum { + CONNECTION_MODE_IEEE80211_UNKNOWN, + CONNECTION_MODE_IEEE80211B, + CONNECTION_MODE_IEEE80211G, + CONNECTION_MODE_IEEE80211N, + CONNECTION_MODE_IEEE80211A, + CONNECTION_MODE_IEEE80211AC, +} connection_mode_e; +#endif + #define CONNMAN_NETWORK_PRIORITY_LOW -100 #define CONNMAN_NETWORK_PRIORITY_DEFAULT 0 #define CONNMAN_NETWORK_PRIORITY_HIGH 100 @@ -87,23 +143,31 @@ void connman_network_set_group(struct connman_network *network, const char *group); const char *connman_network_get_group(struct connman_network *network); -connman_bool_t connman_network_get_connecting(struct connman_network *network); +bool connman_network_get_connecting(struct connman_network *network); +#if defined TIZEN_EXT +void connman_network_set_connecting(struct connman_network *network); +#endif +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +bool connman_network_check_validity(struct connman_network *network); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ int connman_network_set_available(struct connman_network *network, - connman_bool_t available); -connman_bool_t connman_network_get_available(struct connman_network *network); + bool available); +bool connman_network_get_available(struct connman_network *network); int connman_network_set_associating(struct connman_network *network, - connman_bool_t associating); + bool associating); void connman_network_set_error(struct connman_network *network, enum connman_network_error error); -void connman_network_clear_error(struct connman_network *network); int connman_network_set_connected(struct connman_network *network, - connman_bool_t connected); -connman_bool_t connman_network_get_connected(struct connman_network *network); + bool connected); +bool connman_network_get_connected(struct connman_network *network); +void connman_network_set_connected_dhcp_later(struct connman_network *network, + uint32_t sec); -connman_bool_t connman_network_get_associating(struct connman_network *network); +bool connman_network_get_associating(struct connman_network *network); +void connman_network_clear_hidden(void *user_data); int connman_network_connect_hidden(struct connman_network *network, - char *identity, char* passphrase); + char *identity, char* passphrase, void *user_data); void connman_network_set_ipv4_method(struct connman_network *network, enum connman_ipconfig_method method); @@ -115,30 +179,113 @@ int connman_network_set_nameservers(struct connman_network *network, const char *nameservers); int connman_network_set_domain(struct connman_network *network, const char *domain); +#if defined TIZEN_EXT +/* + * Description: Network client requires additional wifi specific info + */ +int connman_network_set_bssid(struct connman_network *network, + const unsigned char *bssid); +unsigned char *connman_network_get_bssid(struct connman_network *network); + +int connman_network_set_transition_mode_bssid(struct connman_network *network, + const unsigned char *transition_mode_bssid); + +unsigned char *connman_network_get_transition_mode_bssid(struct connman_network *network); + +bool connman_network_check_transition_mode(struct connman_network *network1, struct connman_network *network2); + +int connman_network_set_maxrate(struct connman_network *network, + unsigned int maxrate); + +int connman_network_set_maxspeed(struct connman_network *network, + int maxrate); + +unsigned int connman_network_get_maxrate(struct connman_network *network); + +int connman_network_get_maxspeed(struct connman_network *network); + +int connman_network_set_sec_list(struct connman_network *network, + GSList *sec_list); +void *connman_network_get_sec_list(struct connman_network *network); + +int connman_network_set_enc_mode(struct connman_network *network, + const char *encryption_mode); +const char *connman_network_get_enc_mode(struct connman_network *network); + +int connman_network_set_rsn_mode(struct connman_network *network, + bool rsn_mode); + +int connman_network_set_proxy(struct connman_network *network, + const char *proxies); + +void connman_network_clear_associating(struct connman_network *network); + +int connman_network_set_keymgmt(struct connman_network *network, + unsigned int keymgmt); +unsigned int connman_network_get_keymgmt(struct connman_network *network); +int connman_network_set_disconnect_reason(struct connman_network *network, + int reason_code); +int connman_network_get_disconnect_reason(struct connman_network *network); +int connman_network_get_assoc_status_code(struct connman_network *network); +int connman_network_set_assoc_status_code(struct connman_network *network, + int assoc_status_code); +int connman_network_set_countrycode(struct connman_network *network, const + unsigned char *country_code); +unsigned char *connman_network_get_countrycode(struct connman_network *network); +int connman_network_set_bssid_list(struct connman_network *network, + GSList *bssids); +void *connman_network_get_bssid_list(struct connman_network *network); +unsigned int connman_network_get_max_bssid_count(struct connman_network *network); +int connman_network_set_last_connected_bssid(struct connman_network *network, + const unsigned char *bssid); +unsigned char *connman_network_get_last_connected_bssid(struct connman_network *network); +void connman_network_set_assoc_reject_table(struct connman_network *network, + GHashTable *assoc_reject_table); +GHashTable *connman_network_get_assoc_reject_table(struct connman_network *network); +__time_t connman_network_get_roam_scan_time(struct connman_network *network); +void connman_network_set_roam_scan_time(struct connman_network *network, + __time_t roam_scan_time); +int connman_network_get_snr(struct connman_network *network); +void connman_network_set_snr(struct connman_network *network, int snr); +int connman_network_set_phy_mode(struct connman_network *network, + ieee80211_modes_e mode); +ieee80211_modes_e connman_network_get_phy_mode(struct connman_network *network); +int connman_network_set_connection_mode(struct connman_network *network, + connection_mode_e mode); +connection_mode_e connman_network_get_connection_mode(struct connman_network *network); +int set_connected_dhcp(struct connman_network *network); +#endif + int connman_network_set_name(struct connman_network *network, const char *name); int connman_network_set_strength(struct connman_network *network, - connman_uint8_t strength); -connman_uint8_t connman_network_get_strength(struct connman_network *network); + uint8_t strength); +uint8_t connman_network_get_strength(struct connman_network *network); int connman_network_set_frequency(struct connman_network *network, - connman_uint16_t frequency); -connman_uint16_t connman_network_get_frequency(struct connman_network *network); + uint16_t frequency); +uint16_t connman_network_get_frequency(struct connman_network *network); int connman_network_set_wifi_channel(struct connman_network *network, - connman_uint16_t channel); -connman_uint16_t connman_network_get_wifi_channel(struct connman_network *network); + uint16_t channel); +uint16_t connman_network_get_wifi_channel(struct connman_network *network); +int connman_network_set_autoconnect(struct connman_network *network, + bool autoconnect); int connman_network_set_string(struct connman_network *network, const char *key, const char *value); const char *connman_network_get_string(struct connman_network *network, const char *key); int connman_network_set_bool(struct connman_network *network, - const char *key, connman_bool_t value); -connman_bool_t connman_network_get_bool(struct connman_network *network, + const char *key, bool value); +bool connman_network_get_bool(struct connman_network *network, const char *key); int connman_network_set_blob(struct connman_network *network, const char *key, const void *data, unsigned int size); const void *connman_network_get_blob(struct connman_network *network, const char *key, unsigned int *size); +#if defined TIZEN_EXT +void connman_network_set_vsie_list(struct connman_network *network, GSList *vsie_list); +void *connman_network_get_vsie_list(struct connman_network *network); +#endif struct connman_device *connman_network_get_device(struct connman_network *network); @@ -155,11 +302,19 @@ struct connman_network_driver { void (*remove) (struct connman_network *network); int (*connect) (struct connman_network *network); int (*disconnect) (struct connman_network *network); + int (*set_autoconnect) (struct connman_network *network, + bool autoconnect); +#if defined TIZEN_EXT + int (*merge) (struct connman_network *network); +#endif }; int connman_network_driver_register(struct connman_network_driver *driver); void connman_network_driver_unregister(struct connman_network_driver *driver); +void connman_network_append_acddbus(DBusMessageIter *dict, + struct connman_network *network); + #ifdef __cplusplus } #endif