diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acd.h | 65 | ||||
| -rw-r--r-- | include/backtrace.h | 32 | ||||
| -rw-r--r-- | include/dbus.h | 6 | ||||
| -rw-r--r-- | include/device.h | 23 | ||||
| -rw-r--r-- | include/inet.h | 1 | ||||
| -rwxr-xr-x | include/network.h | 12 | ||||
| -rwxr-xr-x | include/notifier.h | 4 | ||||
| -rw-r--r-- | include/service.h | 12 | ||||
| -rwxr-xr-x | include/session.h | 1 | ||||
| -rwxr-xr-x | include/technology.h | 6 | ||||
| -rw-r--r-- | include/tethering.h | 37 | ||||
| -rwxr-xr-x | include/vpn-dbus.h | 1 |
12 files changed, 178 insertions, 22 deletions
diff --git a/include/acd.h b/include/acd.h new file mode 100644 index 00000000..0d777963 --- /dev/null +++ b/include/acd.h @@ -0,0 +1,65 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2018 Commend International. 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 + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +/* + * Address Conflict Detection (RFC 5227) + * + * based on DHCP client library with GLib integration, + * Copyright (C) 2009-2014 Intel Corporation. All rights reserved. + * + */ + +#ifndef __CONNMAN_ACD_H +#define __CONNMAN_ACD_H + +#include <stdint.h> +#include <glib.h> + +#ifdef __cplusplus +extern "C" { +#endif + +struct acd_host; + +struct acd_host *acd_host_new(int ifindex, const char* path); +void acd_host_free(struct acd_host *acd); +int acd_host_start(struct acd_host *acd, uint32_t ip); +void acd_host_stop(struct acd_host *acd); + +typedef void (*acd_host_cb_t) (struct acd_host *acd, gpointer user_data); + +enum acd_host_event { + ACD_HOST_EVENT_IPV4_AVAILABLE, + ACD_HOST_EVENT_IPV4_LOST, + ACD_HOST_EVENT_IPV4_CONFLICT, + ACD_HOST_EVENT_IPV4_MAXCONFLICT, +}; + +void acd_host_register_event(struct acd_host *acd, + enum acd_host_event event, + acd_host_cb_t func, + gpointer user_data); + +void acd_host_append_dbus_property(struct acd_host *acd, DBusMessageIter *dict); + +unsigned int acd_host_get_conflicts_count(struct acd_host *acd); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_ACD_H */ diff --git a/include/backtrace.h b/include/backtrace.h new file mode 100644 index 00000000..65415fb6 --- /dev/null +++ b/include/backtrace.h @@ -0,0 +1,32 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2016 Yann E. MORIN <yann.morin.1998@free.fr>. 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 + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __CONNMAN_BACKTRACE_H +#define __CONNMAN_BACKTRACE_H + +#if defined HAVE_EXECINFO_H && defined BACKTRACE +void print_backtrace(const char* program_path, const char* program_exec, + unsigned int offset); +#else +#define print_backtrace(P,E,O) +#endif + +#endif /* __CONNMAN_BACKTRACE_H */ diff --git a/include/dbus.h b/include/dbus.h index 19e49380..d53037b4 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -31,7 +31,6 @@ extern "C" { #define CONNMAN_SERVICE "net.connman" #define CONNMAN_PATH "/net/connman" -#define CONNMAN_DEBUG_INTERFACE CONNMAN_SERVICE ".Debug" #define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error" #define CONNMAN_AGENT_INTERFACE CONNMAN_SERVICE ".Agent" #define CONNMAN_COUNTER_INTERFACE CONNMAN_SERVICE ".Counter" @@ -42,7 +41,6 @@ extern "C" { #define CONNMAN_CLOCK_INTERFACE CONNMAN_SERVICE ".Clock" #define CONNMAN_TASK_INTERFACE CONNMAN_SERVICE ".Task" #define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service" -#define CONNMAN_PROVIDER_INTERFACE CONNMAN_SERVICE ".Provider" #define CONNMAN_TECHNOLOGY_INTERFACE CONNMAN_SERVICE ".Technology" #define CONNMAN_SESSION_INTERFACE CONNMAN_SERVICE ".Session" #define CONNMAN_NOTIFICATION_INTERFACE CONNMAN_SERVICE ".Notification" @@ -183,10 +181,6 @@ int connman_dbus_get_connection_unix_user(DBusConnection *connection, connman_dbus_get_connection_unix_user_cb_t func, void *user_data); -int connman_dbus_get_connection_unix_user_sync(DBusConnection *connection, - const char *bus_name, - unsigned int *user_id); - typedef void (* connman_dbus_get_context_cb_t) (const unsigned char *context, void *user_data, int err); diff --git a/include/device.h b/include/device.h index 852207d4..77c476a4 100644 --- a/include/device.h +++ b/include/device.h @@ -50,6 +50,17 @@ enum connman_device_type { #define CONNMAN_DEVICE_PRIORITY_DEFAULT 0 #define CONNMAN_DEVICE_PRIORITY_HIGH 100 +struct connman_device_scan_params { + enum connman_service_type type; + const char *ssid; + unsigned int ssid_len; + const char *identity; + const char* passphrase; + const char *security; + bool force_full_scan; + void *user_data; +}; + struct connman_device; struct connman_device *connman_device_create(const char *node, @@ -82,7 +93,8 @@ int connman_device_set_powered(struct connman_device *device, bool connman_device_get_powered(struct connman_device *device); int connman_device_set_scanning(struct connman_device *device, enum connman_service_type type, bool scanning); -bool connman_device_get_scanning(struct connman_device *device); +bool connman_device_get_scanning(struct connman_device *device, + enum connman_service_type type); void connman_device_reset_scanning(struct connman_device *device); int connman_device_set_string(struct connman_device *device, @@ -119,11 +131,10 @@ struct connman_device_driver { void (*remove) (struct connman_device *device); int (*enable) (struct connman_device *device); int (*disable) (struct connman_device *device); - int (*scan)(enum connman_service_type type, - struct connman_device *device, - const char *ssid, unsigned int ssid_len, - const char *identity, const char* passphrase, - const char *security, void *user_data); + int (*scan)(struct connman_device *device, + struct connman_device_scan_params *params); + void (*stop_scan) (enum connman_service_type type, + struct connman_device *device); int (*set_regdom) (struct connman_device *device, const char *alpha2); #if defined TIZEN_EXT diff --git a/include/inet.h b/include/inet.h index ef61af93..4844979b 100644 --- a/include/inet.h +++ b/include/inet.h @@ -38,6 +38,7 @@ char *connman_inet_ifname(int index); int connman_inet_ifup(int index); int connman_inet_ifdown(int index); +bool connman_inet_is_ifup(int index); #if defined TIZEN_EXT void connman_inet_update_device_ident(struct connman_device *device); diff --git a/include/network.h b/include/network.h index dc9e6e9c..14b94429 100755 --- a/include/network.h +++ b/include/network.h @@ -25,6 +25,8 @@ #include <stdbool.h> #include <stdint.h> +#include <dbus/dbus.h> + #include <connman/device.h> #include <connman/ipconfig.h> @@ -63,9 +65,10 @@ enum connman_network_error { CONNMAN_NETWORK_ERROR_CONNECT_FAIL = 4, #if defined TIZEN_EXT CONNMAN_NETWORK_ERROR_DHCP_FAIL = 5, -#endif CONNMAN_NETWORK_ERROR_BLOCKED = 6, - +#else + CONNMAN_NETWORK_ERROR_BLOCKED = 5, +#endif }; #if defined TIZEN_EXT @@ -144,6 +147,8 @@ void connman_network_set_error(struct connman_network *network, int connman_network_set_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); bool connman_network_get_associating(struct connman_network *network); @@ -266,6 +271,9 @@ struct connman_network_driver { 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 diff --git a/include/notifier.h b/include/notifier.h index 50b5fb4c..9c0909c7 100755 --- a/include/notifier.h +++ b/include/notifier.h @@ -57,8 +57,8 @@ struct connman_notifier { void (*idle_state) (bool idle); }; -int connman_notifier_register(struct connman_notifier *notifier); -void connman_notifier_unregister(struct connman_notifier *notifier); +int connman_notifier_register(const struct connman_notifier *notifier); +void connman_notifier_unregister(const struct connman_notifier *notifier); #ifdef __cplusplus } diff --git a/include/service.h b/include/service.h index f4f4ea27..6ae94021 100644 --- a/include/service.h +++ b/include/service.h @@ -129,9 +129,12 @@ void connman_service_unref_debug(struct connman_service *service, const char *file, int line, const char *caller); enum connman_service_type connman_service_get_type(struct connman_service *service); +enum connman_service_state connman_service_get_state(struct connman_service *service); char *connman_service_get_interface(struct connman_service *service); +const char *connman_service_get_identifier(struct connman_service *service); const char *connman_service_get_domainname(struct connman_service *service); +const char *connman_service_get_dbuspath(struct connman_service *service); char **connman_service_get_nameservers(struct connman_service *service); char **connman_service_get_timeservers_config(struct connman_service *service); char **connman_service_get_timeservers(struct connman_service *service); @@ -144,6 +147,13 @@ const char *connman_service_get_proxy_autoconfig(struct connman_service *service bool connman_service_get_favorite(struct connman_service *service); bool connman_service_get_autoconnect(struct connman_service *service); +/* Return non-zero value to terminate the loop, zero to continue */ +typedef int (* connman_service_iterate_cb) (struct connman_service *service, + void *user_data); +int connman_service_iterate_services(connman_service_iterate_cb cb, + void *user_data); + +struct connman_service *connman_service_get_default(void); struct connman_service *connman_service_lookup_from_network(struct connman_network *network); struct connman_service *connman_service_lookup_from_identifier(const char* identifier); @@ -177,9 +187,7 @@ gboolean connman_service_user_pdn_connection_unref_and_test( */ gboolean connman_service_is_no_ref_user_pdn_connection( struct connman_service *service); -#endif -#if defined TIZEN_EXT struct connman_service *connman_service_get_default_connection(void); /* diff --git a/include/session.h b/include/session.h index 5106e886..39f33685 100755 --- a/include/session.h +++ b/include/session.h @@ -74,6 +74,7 @@ struct connman_session_config { GSList *allowed_bearers; char *allowed_interface; bool source_ip_rule; + char *context_identifier; }; typedef int (* connman_session_config_func_t) (struct connman_session *session, diff --git a/include/technology.h b/include/technology.h index 729d7aac..3bd6414a 100755 --- a/include/technology.h +++ b/include/technology.h @@ -49,16 +49,14 @@ typedef struct { struct connman_technology; -int connman_technology_tethering_add_station(enum connman_service_type type, - const char *mac); -int connman_technology_tethering_remove_station(const char *mac); - int connman_technology_tethering_notify(struct connman_technology *technology, bool enabled); int connman_technology_set_regdom(const char *alpha2); void connman_technology_regdom_notify(struct connman_technology *technology, const char *alpha2); +enum connman_service_type connman_technology_get_type + (struct connman_technology *technology); bool connman_technology_get_wifi_tethering(const char **ssid, const char **psk); bool connman_technology_is_tethering_allowed(enum connman_service_type type); diff --git a/include/tethering.h b/include/tethering.h new file mode 100644 index 00000000..827f29af --- /dev/null +++ b/include/tethering.h @@ -0,0 +1,37 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2013 Intel Corporation. All rights reserved. + * Copyright (C) 2018 GlobalLogic. 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 + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __CONNMAN_TETHERING_H +#define __CONNMAN_TETHERING_H + +#ifdef __cplusplus +extern "C" { +#endif + +void __connman_tethering_client_register(const char *addr); +void __connman_tethering_client_unregister(const char *addr); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_TETHERING_H */ diff --git a/include/vpn-dbus.h b/include/vpn-dbus.h index 01780cbd..07743bd0 100755 --- a/include/vpn-dbus.h +++ b/include/vpn-dbus.h @@ -48,6 +48,7 @@ extern "C" { #define PROPERTY_CHANGED "PropertyChanged" #define GET_CONNECTIONS "GetConnections" #define VPN_CONNECT "Connect" +#define VPN_CONNECT2 "Connect2" #define VPN_DISCONNECT "Disconnect" #define VPN_REMOVE "Remove" |