Base Code merged to SPIN 2.4submit/tizen/20150810.034432

Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
Change-Id: I84a42375b5c59739e4caca1f726699ea7647ef17

29 files changed, 17 insertions, 3 deletions

diff --git a/include/agent.h b/include/agent.h
index 6961f7a1..6961f7a1 100644..100755
--- a/include/agent.h
+++ b/include/agent.h
diff --git a/include/dbus.h b/include/dbus.h
index 3087fe40..3087fe40 100644..100755
--- a/include/dbus.h
+++ b/include/dbus.h
diff --git a/include/device.h b/include/device.h
index 57b925c4..57b925c4 100644..100755
--- a/include/device.h
+++ b/include/device.h
diff --git a/include/inet.h b/include/inet.h
index 6482934a..07427300 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 4bc63303..4bc63303 100644..100755
--- a/include/inotify.h
+++ b/include/inotify.h
diff --git a/include/ipaddress.h b/include/ipaddress.h
index 3655ca86..3655ca86 100644..100755
--- a/include/ipaddress.h
+++ b/include/ipaddress.h
diff --git a/include/ipconfig.h b/include/ipconfig.h
index a86b2955..68ef40b6 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 8b00e9dc..7687ed0b 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 c8d8735e..c8d8735e 100644..100755
--- a/include/machine.h
+++ b/include/machine.h
diff --git a/include/network.h b/include/network.h
index 5528f196..97b76e5b 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 50b5fb4c..50b5fb4c 100644..100755
--- a/include/notifier.h
+++ b/include/notifier.h
diff --git a/include/option.h b/include/option.h
index 5e97ed4c..5e97ed4c 100644..100755
--- a/include/option.h
+++ b/include/option.h
diff --git a/include/peer.h b/include/peer.h
index 8a690f5f..80663932 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 8d2bb08e..8d2bb08e 100644..100755
--- a/include/plugin.h
+++ b/include/plugin.h
diff --git a/include/provider.h b/include/provider.h
index d1a8983b..d1a8983b 100644..100755
--- a/include/provider.h
+++ b/include/provider.h
diff --git a/include/provision.h b/include/provision.h
index 3eb80a86..3eb80a86 100644..100755
--- a/include/provision.h
+++ b/include/provision.h
diff --git a/include/proxy.h b/include/proxy.h
index 7842f65f..7842f65f 100644..100755
--- a/include/proxy.h
+++ b/include/proxy.h
diff --git a/include/resolver.h b/include/resolver.h
index 57cb2870..70a02ade 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 aa70f4d8..aa70f4d8 100644..100755
--- a/include/rtnl.h
+++ b/include/rtnl.h
diff --git a/include/service.h b/include/service.h
index fe55d4bc..fe55d4bc 100644..100755
--- a/include/service.h
+++ b/include/service.h
diff --git a/include/session.h b/include/session.h
index 37dfc4e4..37dfc4e4 100644..100755
--- a/include/session.h
+++ b/include/session.h
diff --git a/include/setting.h b/include/setting.h
index a8820217..a8820217 100644..100755
--- a/include/setting.h
+++ b/include/setting.h
diff --git a/include/storage.h b/include/storage.h
index 4c23a14e..4c23a14e 100644..100755
--- a/include/storage.h
+++ b/include/storage.h
diff --git a/include/task.h b/include/task.h
index 9977d634..9977d634 100644..100755
--- a/include/task.h
+++ b/include/task.h
diff --git a/include/technology.h b/include/technology.h
index 8efe9e74..8efe9e74 100644..100755
--- a/include/technology.h
+++ b/include/technology.h
diff --git a/include/timeserver.h b/include/timeserver.h
index 48ea1945..48ea1945 100644..100755
--- a/include/timeserver.h
+++ b/include/timeserver.h
diff --git a/include/utsname.h b/include/utsname.h
index b8165f68..b8165f68 100644..100755
--- a/include/utsname.h
+++ b/include/utsname.h
diff --git a/include/version.h.in b/include/version.h.in
index d3d6dd37..d3d6dd37 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 01780cbd..01780cbd 100644..100755
--- a/include/vpn-dbus.h
+++ b/include/vpn-dbus.h