summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rwxr-xr-x[-rw-r--r--]include/agent.h0
-rwxr-xr-x[-rw-r--r--]include/dbus.h0
-rwxr-xr-x[-rw-r--r--]include/device.h0
-rwxr-xr-x[-rw-r--r--]include/inet.h4
-rwxr-xr-x[-rw-r--r--]include/inotify.h0
-rwxr-xr-x[-rw-r--r--]include/ipaddress.h0
-rwxr-xr-x[-rw-r--r--]include/ipconfig.h2
-rwxr-xr-x[-rw-r--r--]include/log.h4
-rwxr-xr-x[-rw-r--r--]include/machine.h0
-rwxr-xr-x[-rw-r--r--]include/network.h6
-rwxr-xr-x[-rw-r--r--]include/notifier.h0
-rwxr-xr-x[-rw-r--r--]include/option.h0
-rwxr-xr-x[-rw-r--r--]include/peer.h2
-rwxr-xr-x[-rw-r--r--]include/plugin.h0
-rwxr-xr-x[-rw-r--r--]include/provider.h0
-rwxr-xr-x[-rw-r--r--]include/provision.h0
-rwxr-xr-x[-rw-r--r--]include/proxy.h0
-rwxr-xr-x[-rw-r--r--]include/resolver.h2
-rwxr-xr-x[-rw-r--r--]include/rtnl.h0
-rwxr-xr-x[-rw-r--r--]include/service.h0
-rwxr-xr-x[-rw-r--r--]include/session.h0
-rwxr-xr-x[-rw-r--r--]include/setting.h0
-rwxr-xr-x[-rw-r--r--]include/storage.h0
-rwxr-xr-x[-rw-r--r--]include/task.h0
-rwxr-xr-x[-rw-r--r--]include/technology.h0
-rwxr-xr-x[-rw-r--r--]include/timeserver.h0
-rwxr-xr-x[-rw-r--r--]include/utsname.h0
-rwxr-xr-x[-rw-r--r--]include/version.h.in0
-rwxr-xr-x[-rw-r--r--]include/vpn-dbus.h0
29 files changed, 17 insertions, 3 deletions
diff --git a/include/agent.h b/include/agent.h
index 6961f7a..6961f7a 100644..100755
--- a/include/agent.h
+++ b/include/agent.h
diff --git a/include/dbus.h b/include/dbus.h
index 3087fe4..3087fe4 100644..100755
--- a/include/dbus.h
+++ b/include/dbus.h
diff --git a/include/device.h b/include/device.h
index 57b925c..57b925c 100644..100755
--- a/include/device.h
+++ b/include/device.h
diff --git a/include/inet.h b/include/inet.h
index 6482934..0742730 100644..100755
--- a/include/inet.h
+++ b/include/inet.h
@@ -39,6 +39,10 @@ char *connman_inet_ifname(int index);
int connman_inet_ifup(int index);
int connman_inet_ifdown(int index);
+#if defined TIZEN_EXT
+void connman_inet_update_device_ident(struct connman_device *device);
+#endif
+
int connman_inet_set_address(int index, struct connman_ipaddress *ipaddress);
int connman_inet_clear_address(int index, struct connman_ipaddress *ipaddress);
int connman_inet_add_host_route(int index, const char *host, const char *gateway);
diff --git a/include/inotify.h b/include/inotify.h
index 4bc6330..4bc6330 100644..100755
--- a/include/inotify.h
+++ b/include/inotify.h
diff --git a/include/ipaddress.h b/include/ipaddress.h
index 3655ca8..3655ca8 100644..100755
--- a/include/ipaddress.h
+++ b/include/ipaddress.h
diff --git a/include/ipconfig.h b/include/ipconfig.h
index a86b295..68ef40b 100644..100755
--- a/include/ipconfig.h
+++ b/include/ipconfig.h
@@ -36,9 +36,9 @@ extern "C" {
enum connman_ipconfig_type {
CONNMAN_IPCONFIG_TYPE_UNKNOWN = 0,
- CONNMAN_IPCONFIG_TYPE_ALL = 0,
CONNMAN_IPCONFIG_TYPE_IPV4 = 1,
CONNMAN_IPCONFIG_TYPE_IPV6 = 2,
+ CONNMAN_IPCONFIG_TYPE_ALL = 3,
};
enum connman_ipconfig_method {
diff --git a/include/log.h b/include/log.h
index 8b00e9d..7687ed0 100644..100755
--- a/include/log.h
+++ b/include/log.h
@@ -52,7 +52,11 @@ void connman_debug(const char *format, ...)
struct connman_debug_desc {
const char *name;
const char *file;
+#if defined TIZEN_EXT
+#define CONNMAN_DEBUG_FLAG_DEFAULT (1)
+#else
#define CONNMAN_DEBUG_FLAG_DEFAULT (0)
+#endif
#define CONNMAN_DEBUG_FLAG_PRINT (1 << 0)
#define CONNMAN_DEBUG_FLAG_ALIAS (1 << 1)
unsigned int flags;
diff --git a/include/machine.h b/include/machine.h
index c8d8735..c8d8735 100644..100755
--- a/include/machine.h
+++ b/include/machine.h
diff --git a/include/network.h b/include/network.h
index 5528f19..97b76e5 100644..100755
--- a/include/network.h
+++ b/include/network.h
@@ -136,6 +136,9 @@ 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_is_hs20AP(struct connman_network *network,
+ unsigned int isHS20AP);
+unsigned int connman_network_get_is_hs20AP(struct connman_network *network);
#endif
int connman_network_set_name(struct connman_network *network,
@@ -178,6 +181,9 @@ struct connman_network_driver {
void (*remove) (struct connman_network *network);
int (*connect) (struct connman_network *network);
int (*disconnect) (struct connman_network *network);
+#if defined TIZEN_EXT
+ int (*merge) (struct connman_network *network);
+#endif
};
int connman_network_driver_register(struct connman_network_driver *driver);
diff --git a/include/notifier.h b/include/notifier.h
index 50b5fb4..50b5fb4 100644..100755
--- a/include/notifier.h
+++ b/include/notifier.h
diff --git a/include/option.h b/include/option.h
index 5e97ed4..5e97ed4 100644..100755
--- a/include/option.h
+++ b/include/option.h
diff --git a/include/peer.h b/include/peer.h
index 8a690f5..8066393 100644..100755
--- a/include/peer.h
+++ b/include/peer.h
@@ -64,6 +64,8 @@ void connman_peer_unref_debug(struct connman_peer *peer,
const char *connman_peer_get_identifier(struct connman_peer *peer);
void connman_peer_set_name(struct connman_peer *peer, const char *name);
+void connman_peer_set_iface_address(struct connman_peer *peer,
+ const unsigned char *iface_address);
void connman_peer_set_device(struct connman_peer *peer,
struct connman_device *device);
struct connman_device *connman_peer_get_device(struct connman_peer *peer);
diff --git a/include/plugin.h b/include/plugin.h
index 8d2bb08..8d2bb08 100644..100755
--- a/include/plugin.h
+++ b/include/plugin.h
diff --git a/include/provider.h b/include/provider.h
index d1a8983..d1a8983 100644..100755
--- a/include/provider.h
+++ b/include/provider.h
diff --git a/include/provision.h b/include/provision.h
index 3eb80a8..3eb80a8 100644..100755
--- a/include/provision.h
+++ b/include/provision.h
diff --git a/include/proxy.h b/include/proxy.h
index 7842f65..7842f65 100644..100755
--- a/include/proxy.h
+++ b/include/proxy.h
diff --git a/include/resolver.h b/include/resolver.h
index 57cb287..70a02ad 100644..100755
--- a/include/resolver.h
+++ b/include/resolver.h
@@ -40,8 +40,6 @@ int connman_resolver_remove(int index, const char *domain,
const char *server);
int connman_resolver_remove_all(int index);
-void connman_resolver_flush(void);
-
#ifdef __cplusplus
}
#endif
diff --git a/include/rtnl.h b/include/rtnl.h
index aa70f4d..aa70f4d 100644..100755
--- a/include/rtnl.h
+++ b/include/rtnl.h
diff --git a/include/service.h b/include/service.h
index fe55d4b..fe55d4b 100644..100755
--- a/include/service.h
+++ b/include/service.h
diff --git a/include/session.h b/include/session.h
index 37dfc4e..37dfc4e 100644..100755
--- a/include/session.h
+++ b/include/session.h
diff --git a/include/setting.h b/include/setting.h
index a882021..a882021 100644..100755
--- a/include/setting.h
+++ b/include/setting.h
diff --git a/include/storage.h b/include/storage.h
index 4c23a14..4c23a14 100644..100755
--- a/include/storage.h
+++ b/include/storage.h
diff --git a/include/task.h b/include/task.h
index 9977d63..9977d63 100644..100755
--- a/include/task.h
+++ b/include/task.h
diff --git a/include/technology.h b/include/technology.h
index 8efe9e7..8efe9e7 100644..100755
--- a/include/technology.h
+++ b/include/technology.h
diff --git a/include/timeserver.h b/include/timeserver.h
index 48ea194..48ea194 100644..100755
--- a/include/timeserver.h
+++ b/include/timeserver.h
diff --git a/include/utsname.h b/include/utsname.h
index b8165f6..b8165f6 100644..100755
--- a/include/utsname.h
+++ b/include/utsname.h
diff --git a/include/version.h.in b/include/version.h.in
index d3d6dd3..d3d6dd3 100644..100755
--- a/include/version.h.in
+++ b/include/version.h.in
diff --git a/include/vpn-dbus.h b/include/vpn-dbus.h
index 01780cb..01780cb 100644..100755
--- a/include/vpn-dbus.h
+++ b/include/vpn-dbus.h