X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fconnman.h;h=9d9959628b9e7a280db4bb04984d4d89887f96eb;hb=325427376ced628eed0208cf24d48c4784939e98;hp=56f9dd9d20823573508d392b69234723b399fa6e;hpb=0a714ce6194d231e509310aa69a230e7e5914853;p=platform%2Fupstream%2Fconnman.git diff --git a/src/connman.h b/src/connman.h index 56f9dd9..9d99596 100755 --- a/src/connman.h +++ b/src/connman.h @@ -24,6 +24,11 @@ #include #define CONNMAN_API_SUBJECT_TO_CHANGE +#if defined TIZEN_EXT +#define WIFI_COUNTRY_CODE_LEN 2 +#define WIFI_PHY_MODE_LEN 18 +#define GIO_SOCKET_RETRY_COUNT 3 +#endif #include @@ -54,6 +59,11 @@ DBusMessage *__connman_error_operation_aborted(DBusMessage *msg); DBusMessage *__connman_error_operation_timeout(DBusMessage *msg); DBusMessage *__connman_error_invalid_service(DBusMessage *msg); DBusMessage *__connman_error_invalid_property(DBusMessage *msg); +#if defined TIZEN_EXT_WIFI_MESH +DBusMessage *__connman_error_invalid_command(DBusMessage *msg); +DBusMessage *__connman_error_scan_abort_failed(DBusMessage *msg); +#endif +DBusMessage *__connman_error_operation_canceled(DBusMessage *msg); int __connman_manager_init(void); void __connman_manager_cleanup(void); @@ -69,6 +79,9 @@ int __connman_clock_init(void); void __connman_clock_cleanup(void); void __connman_clock_update_timezone(void); +#if defined TIZEN_EXT +void __connman_clock_set_time_updated(bool updated); +#endif int __connman_timezone_init(void); void __connman_timezone_cleanup(void); @@ -125,6 +138,7 @@ int __connman_agent_request_peer_authorization(struct connman_peer *peer, bool wps_requested, const char *dbus_sender, void *user_data); + #include int __connman_log_init(const char *program, const char *debug, @@ -134,7 +148,7 @@ void __connman_log_cleanup(gboolean backtrace); void __connman_log_enable(struct connman_debug_desc *start, struct connman_debug_desc *stop); -#include +#include #include @@ -155,9 +169,13 @@ int __connman_inet_modify_address(int cmd, int flags, int index, int family, const char *address, const char *peer, unsigned char prefixlen, - const char *broadcast); + const char *broadcast, + bool is_p2p); int __connman_inet_get_interface_address(int index, int family, void *address); int __connman_inet_get_interface_ll_address(int index, int family, void *address); +int __connman_inet_get_interface_mac_address(int index, uint8_t *mac_address); + +bool __connman_inet_is_any_addr(const char *address, int family); #include #include @@ -169,6 +187,9 @@ int __connman_inet_ipv6_send_rs(int index, int timeout, __connman_inet_rs_cb_t callback, void *user_data); int __connman_inet_ipv6_send_ra(int index, struct in6_addr *src_addr, GSList *prefixes, int router_lifetime); +#if defined TIZEN_EXT +void __connman_network_set_auto_ipv6_gateway(char *gateway, void *user_data); +#endif typedef void (*__connman_inet_ns_cb_t) (struct nd_neighbor_advert *reply, unsigned int length, @@ -237,27 +258,39 @@ int __connman_inet_rtnl_addattr32(struct nlmsghdr *n, size_t maxlen, int __connman_inet_add_fwmark_rule(uint32_t table_id, int family, uint32_t fwmark); int __connman_inet_del_fwmark_rule(uint32_t table_id, int family, uint32_t fwmark); int __connman_inet_add_default_to_table(uint32_t table_id, int ifindex, const char *gateway); +int __connman_inet_add_subnet_to_table(uint32_t table_id, int ifindex, + const char *gateway, unsigned char prefixlen); int __connman_inet_del_default_from_table(uint32_t table_id, int ifindex, const char *gateway); +int __connman_inet_del_subnet_from_table(uint32_t table_id, int ifindex, + const char *gateway, unsigned char prefixlen); int __connman_inet_get_address_netmask(int ifindex, struct sockaddr_in *address, struct sockaddr_in *netmask); +bool __connman_inet_isrootnfs_device(const char *devname); +char **__connman_inet_get_pnp_nameservers(const char *pnp_file); + #include int __connman_resolver_init(gboolean dnsproxy); void __connman_resolver_cleanup(void); +void __connman_resolver_append_fallback_nameservers(void); int __connman_resolvfile_append(int index, const char *domain, const char *server); int __connman_resolvfile_remove(int index, const char *domain, const char *server); int __connman_resolver_redo_servers(int index); +int __connman_resolver_set_mdns(int index, bool enabled); GKeyFile *__connman_storage_open_global(void); GKeyFile *__connman_storage_load_global(void); int __connman_storage_save_global(GKeyFile *keyfile); void __connman_storage_delete_global(void); +#if defined TIZEN_EXT +GKeyFile *__connman_storage_load_ins(void); +int __connman_storage_save_ins(GKeyFile *keyfile); +#endif GKeyFile *__connman_storage_load_config(const char *ident); GKeyFile *__connman_storage_load_provider_config(const char *ident); -GKeyFile *__connman_storage_open_service(const char *ident); int __connman_storage_save_service(GKeyFile *keyfile, const char *ident); GKeyFile *__connman_storage_load_provider(const char *identifier); void __connman_storage_save_provider(GKeyFile *keyfile, const char *identifier); @@ -287,6 +320,7 @@ struct connman_ipaddress { char *peer; char *broadcast; char *gateway; + bool is_p2p; /* P2P connection or VPN, broadcast is excluded. */ }; struct connman_ipconfig_ops { @@ -314,7 +348,6 @@ __connman_ipconfig_ref_debug(struct connman_ipconfig *ipconfig, void __connman_ipconfig_unref_debug(struct connman_ipconfig *ipconfig, const char *file, int line, const char *caller); -void __connman_ipconfig_clear_address(struct connman_ipconfig *ipconfig); void *__connman_ipconfig_get_data(struct connman_ipconfig *ipconfig); void __connman_ipconfig_set_data(struct connman_ipconfig *ipconfig, void *data); @@ -364,6 +397,11 @@ const char *__connman_ipconfig_get_broadcast(struct connman_ipconfig *ipconfig); void __connman_ipconfig_set_broadcast(struct connman_ipconfig *ipconfig, const char *broadcast); const char *__connman_ipconfig_get_gateway(struct connman_ipconfig *ipconfig); void __connman_ipconfig_set_gateway(struct connman_ipconfig *ipconfig, const char *gateway); + +#if defined TIZEN_EXT +void __connman_ipconfig_set_dhcp_lease_duration(struct connman_ipconfig *ipconfig, int dhcp_lease_duration); +#endif + unsigned char __connman_ipconfig_get_prefixlen(struct connman_ipconfig *ipconfig); void __connman_ipconfig_set_prefixlen(struct connman_ipconfig *ipconfig, unsigned char prefixlen); @@ -415,9 +453,9 @@ void __connman_ipconfig_set_dhcpv6_prefixes(struct connman_ipconfig *ipconfig, char **prefixes); char **__connman_ipconfig_get_dhcpv6_prefixes(struct connman_ipconfig *ipconfig); -int __connman_ipconfig_load(struct connman_ipconfig *ipconfig, +void __connman_ipconfig_load(struct connman_ipconfig *ipconfig, GKeyFile *keyfile, const char *identifier, const char *prefix); -int __connman_ipconfig_save(struct connman_ipconfig *ipconfig, +void __connman_ipconfig_save(struct connman_ipconfig *ipconfig, GKeyFile *keyfile, const char *identifier, const char *prefix); bool __connman_ipconfig_ipv6_privacy_enabled(struct connman_ipconfig *ipconfig); int __connman_ipconfig_ipv6_reset_privacy(struct connman_ipconfig *ipconfig); @@ -443,8 +481,11 @@ char **__connman_timeserver_system_get(); GSList *__connman_timeserver_add_list(GSList *server_list, const char *timeserver); GSList *__connman_timeserver_get_all(struct connman_service *service); -int __connman_timeserver_sync(struct connman_service *service); -void __connman_timeserver_sync_next(); +void __connman_timeserver_sync(struct connman_service *service); +void __connman_timeserver_conf_update(struct connman_service *service); + +bool __connman_timeserver_is_synced(void); +void __connman_timeserver_set_synced(bool status); enum __connman_dhcpv6_status { CONNMAN_DHCPV6_STATUS_FAIL = 0, @@ -452,6 +493,11 @@ enum __connman_dhcpv6_status { CONNMAN_DHCPV6_STATUS_RESTART = 2, }; +#if defined TIZEN_EXT +void set_dhcp_discover_timeout(int timeout_value); +void set_dhcp_discover_retry_count(int retry_count); +#endif + typedef void (* dhcpv6_cb) (struct connman_network *network, enum __connman_dhcpv6_status status, gpointer data); @@ -463,6 +509,7 @@ int __connman_dhcp_start(struct connman_ipconfig *ipconfig, struct connman_network *network, dhcp_cb callback, gpointer user_data); void __connman_dhcp_stop(struct connman_ipconfig *ipconfig); +void __connman_dhcp_decline(struct connman_ipconfig *ipconfig); int __connman_dhcp_init(void); void __connman_dhcp_cleanup(void); int __connman_dhcpv6_init(void); @@ -496,12 +543,13 @@ int __connman_connection_gateway_add(struct connman_service *service, void __connman_connection_gateway_remove(struct connman_service *service, enum connman_ipconfig_type type); int __connman_connection_get_vpn_index(int phy_index); +int __connman_connection_get_vpn_phy_index(int vpn_index); bool __connman_connection_update_gateway(void); -void __connman_connection_gateway_activate(struct connman_service *service, - enum connman_ipconfig_type type); -int __connman_ntp_start(char *server); +typedef void (*__connman_ntp_cb_t) (bool success, void *user_data); +int __connman_ntp_start(char *server, __connman_ntp_cb_t callback, + void *user_data); void __connman_ntp_stop(); int __connman_wpad_init(void); @@ -549,6 +597,25 @@ void __connman_technology_remove_interface(enum connman_service_type type, void __connman_technology_notify_regdom_by_device(struct connman_device *device, int result, const char *alpha2); +#if defined TIZEN_EXT +void __connman_technology_notify_mac_policy_by_device(struct connman_device *device, + int result, unsigned int policy); +void __connman_technology_notify_preassoc_mac_policy_by_device(struct connman_device *device, + int result, unsigned int policy); +void __connman_technology_notify_random_mac_lifetime_by_device(struct connman_device *device, + int result, unsigned int lifetime); + +enum bssid_type { + CHECK_BSSID = 0, + GET_BSSID = 1, + SET_BSSID = 2, + RESET_BSSID = 3, +}; + +int set_connman_bssid(enum bssid_type mode, char *bssid, const char *ifname); +void technology_save_device(struct connman_device *device); +#endif + #include int __connman_device_init(const char *device, const char *nodevice); @@ -559,10 +626,18 @@ void __connman_device_list(DBusMessageIter *iter, void *user_data); enum connman_service_type __connman_device_get_service_type(struct connman_device *device); struct connman_device *__connman_device_find_device(enum connman_service_type type); int __connman_device_request_scan(enum connman_service_type type); +int __connman_device_request_scan_full(enum connman_service_type type); int __connman_device_request_hidden_scan(struct connman_device *device, const char *ssid, unsigned int ssid_len, const char *identity, const char *passphrase, const char *security, void *user_data); +void __connman_device_stop_scan(enum connman_service_type type); +#if defined TIZEN_EXT +int __connman_device_request_specific_scan(enum connman_service_type type, + const char *ifname, int scan_type, GSList *specific_scan_list); +int connman_device_request_device_scan(enum connman_service_type type, + const char * ifname, bool force_full_scan); +#endif bool __connman_device_isfiltered(const char *devname); @@ -585,6 +660,8 @@ int __connman_rfkill_block(enum connman_service_type type, bool block); #if defined TIZEN_EXT char *index2ident(int index, const char *prefix); char *index2addr(int index); +char *_get_wifi_ident(void); +char *_get_wifi_addr(void); #endif #include @@ -606,6 +683,12 @@ const char *__connman_network_get_type(struct connman_network *network); const char *__connman_network_get_group(struct connman_network *network); const char *__connman_network_get_ident(struct connman_network *network); bool __connman_network_get_weakness(struct connman_network *network); +bool __connman_network_native_autoconnect(struct connman_network *network); +#if defined TIZEN_EXT +dbus_bool_t __connman_network_notify_dhcp_changed(const char *key, void *val); +bool connman_network_get_psk_sha256(struct connman_network *network); +void connman_network_set_psk_sha256(struct connman_network *network, bool is_psk_sha256); +#endif int __connman_config_init(); void __connman_config_cleanup(void); @@ -627,12 +710,15 @@ bool __connman_config_get_bool(GKeyFile *key_file, bool __connman_config_address_provisioned(const char *address, const char *netmask); +#include + int __connman_tethering_init(void); void __connman_tethering_cleanup(void); const char *__connman_tethering_get_bridge(void); -void __connman_tethering_set_enabled(void); +int __connman_tethering_set_enabled(void); void __connman_tethering_set_disabled(void); +void __connman_tethering_list_clients(DBusMessageIter *array); int __connman_private_network_request(DBusMessage *msg, const char *owner); int __connman_private_network_release(const char *path); @@ -650,11 +736,14 @@ void __connman_provider_list(DBusMessageIter *iter, void *user_data); bool __connman_provider_is_immutable(struct connman_provider *provider); int __connman_provider_create_and_connect(DBusMessage *msg); const char * __connman_provider_get_ident(struct connman_provider *provider); +const char * __connman_provider_get_transport_ident( + struct connman_provider *provider); int __connman_provider_indicate_state(struct connman_provider *provider, enum connman_provider_state state); int __connman_provider_indicate_error(struct connman_provider *provider, enum connman_provider_error error); -int __connman_provider_connect(struct connman_provider *provider); +int __connman_provider_connect(struct connman_provider *provider, + const char *dbus_sender); int __connman_provider_remove_by_path(const char *path); void __connman_provider_cleanup(void); int __connman_provider_init(void); @@ -663,16 +752,34 @@ int __connman_provider_init(void); int __connman_service_init(void); void __connman_service_cleanup(void); +int __connman_service_move(struct connman_service *service, + struct connman_service *target, bool before); int __connman_service_load_modifiable(struct connman_service *service); void __connman_service_list_struct(DBusMessageIter *iter); +#if defined TIZEN_EXT_INS +void __connman_ins_list_struct(DBusMessageIter *iter); +#endif + +#if defined TIZEN_EXT +int connman_service_get_ipv6_dns_method(struct connman_service *service); +enum connman_dnsconfig_method { + CONNMAN_DNSCONFIG_METHOD_UNKNOWN = 0, + CONNMAN_DNSCONFIG_METHOD_MANUAL = 1, + CONNMAN_DNSCONFIG_METHOD_DHCP = 2, +}; +#endif + +int __connman_service_compare(const struct connman_service *a, + const struct connman_service *b); struct connman_service *__connman_service_lookup_from_index(int index); -struct connman_service *__connman_service_lookup_from_ident(const char *identifier); struct connman_service *__connman_service_create_from_network(struct connman_network *network); struct connman_service *__connman_service_create_from_provider(struct connman_provider *provider); bool __connman_service_index_is_default(int index); -struct connman_service *__connman_service_get_default(void); +#if defined TIZEN_EXT +void __connman_service_notify_strength_changed(struct connman_network *network); +#endif void __connman_service_update_from_network(struct connman_network *network); void __connman_service_remove_from_network(struct connman_network *network); void __connman_service_read_ip4config(struct connman_service *service); @@ -684,14 +791,14 @@ struct connman_ipconfig *__connman_service_get_ip6config( struct connman_service *service); struct connman_ipconfig *__connman_service_get_ipconfig( struct connman_service *service, int family); +void __connman_service_notify_ipv4_configuration( + struct connman_service *service); +void __connman_service_wispr_start(struct connman_service *service, + enum connman_ipconfig_type type); bool __connman_service_is_connected_state(struct connman_service *service, enum connman_ipconfig_type type); -const char *__connman_service_get_ident(struct connman_service *service); const char *__connman_service_get_path(struct connman_service *service); const char *__connman_service_get_name(struct connman_service *service); -unsigned int __connman_service_get_order(struct connman_service *service); -enum connman_service_state __connman_service_get_state(struct connman_service *service); -void __connman_service_update_ordering(void); struct connman_network *__connman_service_get_network(struct connman_service *service); enum connman_service_security __connman_service_get_security(struct connman_service *service); const char *__connman_service_get_phase2(struct connman_service *service); @@ -711,11 +818,14 @@ int __connman_service_set_ignore(struct connman_service *service, bool ignore); void __connman_service_set_search_domains(struct connman_service *service, char **domains); +int __connman_service_set_mdns(struct connman_service *service, + bool enabled); void __connman_service_set_string(struct connman_service *service, const char *key, const char *value); -int __connman_service_online_check_failed(struct connman_service *service, - enum connman_ipconfig_type type); +void __connman_service_online_check(struct connman_service *service, + enum connman_ipconfig_type type, + bool success); int __connman_service_ipconfig_indicate_state(struct connman_service *service, enum connman_service_state new_state, enum connman_ipconfig_type type); @@ -735,9 +845,19 @@ int __connman_service_indicate_default(struct connman_service *service); int __connman_service_connect(struct connman_service *service, enum connman_service_connect_reason reason); int __connman_service_disconnect(struct connman_service *service); -int __connman_service_disconnect_all(void); void __connman_service_set_active_session(bool enable, GSList *list); void __connman_service_auto_connect(enum connman_service_connect_reason reason); + +#if defined TIZEN_EXT +bool __connman_service_get_auto_connect_mode(void); +void __connman_service_set_auto_connect_mode(bool enable); +#endif + +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +int __connman_service_get_use_eapol(struct connman_service *service); +int __connman_service_get_connect_reason(struct connman_service *service); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ + bool __connman_service_remove(struct connman_service *service); bool __connman_service_is_provider_pending(struct connman_service *service); void __connman_service_set_provider_pending(struct connman_service *service, @@ -755,10 +875,19 @@ const char *__connman_service_type2string(enum connman_service_type type); enum connman_service_type __connman_service_string2type(const char *str); enum connman_service_security __connman_service_string2security(const char *str); +#if defined TIZEN_EXT +int __connman_service_nameserver_append(struct connman_service *service, + const char *nameserver, bool is_auto, + enum connman_ipconfig_type type); +int __connman_service_nameserver_remove(struct connman_service *service, + const char *nameserver, bool is_auto, + enum connman_ipconfig_type type); +#else int __connman_service_nameserver_append(struct connman_service *service, const char *nameserver, bool is_auto); int __connman_service_nameserver_remove(struct connman_service *service, const char *nameserver, bool is_auto); +#endif void __connman_service_nameserver_clear(struct connman_service *service); void __connman_service_nameserver_add_routes(struct connman_service *service, const char *gw); @@ -782,10 +911,15 @@ void __connman_service_set_pac(struct connman_service *service, int __connman_service_get_connected_count_of_iface(struct connman_service *service); void __connman_service_set_proxy(struct connman_service *service, const char *proxies); +int check_passphrase_ext(struct connman_network *network, + const char *passphrase); #endif bool __connman_service_is_hidden(struct connman_service *service); bool __connman_service_is_split_routing(struct connman_service *service); bool __connman_service_index_is_split_routing(int index); +void __connman_service_set_split_routing(struct connman_service *service, + bool split_routing); +void __connman_service_split_routing_changed(struct connman_service *service); int __connman_service_get_index(struct connman_service *service); void __connman_service_set_hidden(struct connman_service *service); void __connman_service_set_hostname(struct connman_service *service, @@ -799,11 +933,23 @@ void __connman_service_set_proxy_autoconfig(struct connman_service *service, void __connman_service_set_identity(struct connman_service *service, const char *identity); +void __connman_service_set_anonymous_identity(struct connman_service *service, + const char *anonymous_identity); +void __connman_service_set_subject_match(struct connman_service *service, + const char *subject_match); +void __connman_service_set_altsubject_match(struct connman_service *service, + const char *altsubject_match); +void __connman_service_set_domain_suffix_match(struct connman_service *service, + const char *domain_suffix_match); +void __connman_service_set_domain_match(struct connman_service *service, + const char *domain_match); void __connman_service_set_agent_identity(struct connman_service *service, const char *agent_identity); int __connman_service_set_passphrase(struct connman_service *service, const char *passphrase); const char *__connman_service_get_passphrase(struct connman_service *service); +int __connman_service_check_passphrase(enum connman_service_security security, + const char *passphrase); int __connman_service_reset_ipconfig(struct connman_service *service, enum connman_ipconfig_type type, DBusMessageIter *array, enum connman_service_state *new_state); @@ -814,9 +960,6 @@ void __connman_service_notify(struct connman_service *service, unsigned int rx_error, unsigned int tx_error, unsigned int rx_dropped, unsigned int tx_dropped); -bool __connman_service_is_user_allowed(enum connman_service_type type, - uid_t uid); - int __connman_service_counter_register(const char *counter); void __connman_service_counter_unregister(const char *counter); @@ -827,6 +970,7 @@ void __connman_peer_cleanup(void); void __connman_peer_list_struct(DBusMessageIter *array); const char *__connman_peer_get_path(struct connman_peer *peer); +void __connman_peer_disconnect_all(void); int __connman_peer_service_init(void); void __connman_peer_service_cleanup(void); @@ -844,12 +988,31 @@ int __connman_peer_service_unregister(const char *owner, const unsigned char *query, int query_length, int version); -#include - -typedef void (* service_iterate_cb) (struct connman_service *service, - void *user_data); +#if defined TIZEN_EXT_WIFI_MESH +#include + +int __connman_mesh_init(void); +void __connman_mesh_cleanup(void); +bool __connman_technology_get_connected(enum connman_service_type type); +void __connman_technology_mesh_interface_create_finished( + enum connman_service_type type, bool success, + const char *error); +void __connman_technology_mesh_interface_remove_finished( + enum connman_service_type type, bool success); +void __connman_mesh_peer_list_struct(DBusMessageIter *array); +void __connman_mesh_connected_peer_list_struct(DBusMessageIter *array); +void __connman_mesh_disconnected_peer_list_struct(DBusMessageIter *array); +int __connman_mesh_dhcp_start(struct connman_ipconfig *ipconfig, + dhcp_cb callback, gpointer user_data); +int __connman_device_abort_scan(enum connman_service_type type); +void __connman_technology_notify_abort_scan(enum connman_service_type type, + int result); +int __connman_device_request_mesh_specific_scan(enum connman_service_type type, + const char *name, unsigned int freq); +void __connman_mesh_auto_connect(void); +#endif /* TIZEN_EXT_WIFI_MESH */ -int __connman_service_iterate_services(service_iterate_cb cb, void *user_data); +#include void __connman_service_mark_dirty(); void __connman_service_save(struct connman_service *service); @@ -882,16 +1045,29 @@ const char *__connman_notifier_get_state(void); #include +#if defined TIZEN_EXT +int __connman_rtnl_init(int retry_count); +#else int __connman_rtnl_init(void); +#endif void __connman_rtnl_start(void); void __connman_rtnl_cleanup(void); +#if defined TIZEN_EXT +void __connman_wifi_vsie_list_struct(DBusMessageIter *iter); +#endif + enum connman_device_type __connman_rtnl_get_device_type(int index); unsigned int __connman_rtnl_update_interval_add(unsigned int interval); unsigned int __connman_rtnl_update_interval_remove(unsigned int interval); int __connman_rtnl_request_update(void); int __connman_rtnl_send(const void *buf, size_t len); +#if defined TIZEN_EXT +void rtnl_nameserver_add_all(struct connman_service *service, + enum connman_ipconfig_type type); +#endif + bool __connman_session_policy_autoconnect(enum connman_service_connect_reason reason); int __connman_session_create(DBusMessage *msg); @@ -923,35 +1099,47 @@ int __connman_stats_get(struct connman_service *service, bool roaming, struct connman_stats_data *data); -int __connman_iptables_dump(const char *table_name); -int __connman_iptables_new_chain(const char *table_name, - const char *chain); -int __connman_iptables_delete_chain(const char *table_name, - const char *chain); -int __connman_iptables_flush_chain(const char *table_name, - const char *chain); -int __connman_iptables_change_policy(const char *table_name, - const char *chain, - const char *policy); -int __connman_iptables_append(const char *table_name, - const char *chain, - const char *rule_spec); -int __connman_iptables_insert(const char *table_name, - const char *chain, - const char *rule_spec); -int __connman_iptables_delete(const char *table_name, - const char *chain, - const char *rule_spec); +int __connman_iptables_dump(int type, + const char *table_name); +int __connman_iptables_new_chain(int type, + const char *table_name, + const char *chain); +int __connman_iptables_delete_chain(int type, + const char *table_name, + const char *chain); +int __connman_iptables_flush_chain(int type, + const char *table_name, + const char *chain); +int __connman_iptables_find_chain(int type, + const char *table_name, + const char *chain); +int __connman_iptables_change_policy(int type, + const char *table_name, + const char *chain, + const char *policy); +int __connman_iptables_append(int type, + const char *table_name, + const char *chain, + const char *rule_spec); +int __connman_iptables_insert(int type, + const char *table_name, + const char *chain, + const char *rule_spec); +int __connman_iptables_delete(int type, + const char *table_name, + const char *chain, + const char *rule_spec); typedef void (*connman_iptables_iterate_chains_cb_t) (const char *chain_name, void *user_data); -int __connman_iptables_iterate_chains(const char *table_name, +int __connman_iptables_iterate_chains(int type, + const char *table_name, connman_iptables_iterate_chains_cb_t cb, void *user_data); int __connman_iptables_init(void); void __connman_iptables_cleanup(void); -int __connman_iptables_commit(const char *table_name); +int __connman_iptables_commit(int type, const char *table_name); int __connman_dnsproxy_init(void); void __connman_dnsproxy_cleanup(void); @@ -959,6 +1147,7 @@ int __connman_dnsproxy_add_listener(int index); void __connman_dnsproxy_remove_listener(int index); int __connman_dnsproxy_append(int index, const char *domain, const char *server); int __connman_dnsproxy_remove(int index, const char *domain, const char *server); +int __connman_dnsproxy_set_mdns(int index, bool enabled); int __connman_6to4_probe(struct connman_service *service); void __connman_6to4_remove(struct connman_ipconfig *ipconfig); @@ -972,15 +1161,7 @@ typedef void (*ippool_collision_cb_t) (struct connman_ippool *pool, int __connman_ippool_init(void); void __connman_ippool_cleanup(void); -#define __connman_ippool_ref(ipconfig) \ - __connman_ippool_ref_debug(ipconfig, __FILE__, __LINE__, __func__) -#define __connman_ippool_unref(ipconfig) \ - __connman_ippool_unref_debug(ipconfig, __FILE__, __LINE__, __func__) - -struct connman_ippool *__connman_ippool_ref_debug(struct connman_ippool *pool, - const char *file, int line, const char *caller); -void __connman_ippool_unref_debug(struct connman_ippool *pool, - const char *file, int line, const char *caller); +void __connman_ippool_free(struct connman_ippool *pool); struct connman_ippool *__connman_ippool_create(int index, unsigned int start, @@ -1016,13 +1197,19 @@ struct firewall_context; struct firewall_context *__connman_firewall_create(void); void __connman_firewall_destroy(struct firewall_context *ctx); -int __connman_firewall_add_rule(struct firewall_context *ctx, - const char *table, - const char *chain, - const char *rule_fmt, ...); -int __connman_firewall_enable(struct firewall_context *ctx); -int __connman_firewall_disable(struct firewall_context *ctx); -bool __connman_firewall_is_up(void); +int __connman_firewall_enable_nat(struct firewall_context *ctx, + char *address, unsigned char prefixlen, + char *interface); +int __connman_firewall_disable_nat(struct firewall_context *ctx); +int __connman_firewall_enable_snat(struct firewall_context *ctx, + int index, const char *ifname, + const char *addr); +int __connman_firewall_disable_snat(struct firewall_context *ctx); +int __connman_firewall_enable_marking(struct firewall_context *ctx, + enum connman_session_id_type id_type, + char *id, const char *src_ip, + uint32_t mark); +int __connman_firewall_disable_marking(struct firewall_context *ctx); int __connman_firewall_init(void); void __connman_firewall_cleanup(void); @@ -1065,5 +1252,15 @@ int __connman_machine_init(void); void __connman_machine_cleanup(void); int __connman_util_get_random(uint64_t *val); +unsigned int __connman_util_random_delay_ms(unsigned int secs); int __connman_util_init(void); void __connman_util_cleanup(void); + +#ifdef TIZEN_EXT +__attribute__ ((unused)) static int __tizentvextension = -1; +#define TIZEN_TV_EXT (__builtin_expect(__tizentvextension != -1, 1) ? \ + __tizentvextension : \ + (__tizentvextension = connman_setting_get_bool("TizenTVExtension"))) +#else /* TIZEN_EXT */ +#define TIZEN_TV_EXT (0) /* Always False */ +#endif /* TIZEN_EXT */