summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchleun.moon <chleun.moon@samsung.com>2017-05-26 04:09:25 (GMT)
committercheoleun moon <chleun.moon@samsung.com>2017-05-30 01:20:23 (GMT)
commitefda17ea48df86866d517a506a6a99604bd98082 (patch)
tree633b44c2496dc64f06892ab52f5f38b6f9f5b79e
parentc2037647cf2aed7d5793cedab7f171de13ef5fa0 (diff)
downloadconnman-efda17ea48df86866d517a506a6a99604bd98082.zip
connman-efda17ea48df86866d517a506a6a99604bd98082.tar.gz
connman-efda17ea48df86866d517a506a6a99604bd98082.tar.bz2
Wrap tizen specific codes with TIZEN_EXTrefs/changes/40/131240/2
Change-Id: I4f30b15332aef3ceb2f0b601f1a18a170487c1f3 Signed-off-by: cheoleun <chleun.moon@samsung.com>
-rwxr-xr-xvpn/plugins/vpn.c4
-rwxr-xr-xvpn/plugins/vpn.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/vpn/plugins/vpn.c b/vpn/plugins/vpn.c
index 3e40e4f..b48b6bc 100755
--- a/vpn/plugins/vpn.c
+++ b/vpn/plugins/vpn.c
@@ -307,6 +307,7 @@ static DBusMessage *vpn_notify(struct connman_task *task,
return NULL;
}
+#if defined TIZEN_EXT
static void vpn_event(struct vpn_provider *provider, int state)
{
struct vpn_data *data;
@@ -399,6 +400,7 @@ static void vpn_event(struct vpn_provider *provider, int state)
return;
}
+#endif
static int vpn_create_tun(struct vpn_provider *provider)
{
@@ -548,8 +550,10 @@ static int vpn_connect(struct vpn_provider *provider,
}
+#if defined TIZEN_EXT
if(vpn_driver_data->vpn_driver->set_event_cb)
vpn_driver_data->vpn_driver->set_event_cb(vpn_event, provider);
+#endif
ret = vpn_driver_data->vpn_driver->connect(provider, data->task,
data->if_name, cb, dbus_sender,
diff --git a/vpn/plugins/vpn.h b/vpn/plugins/vpn.h
index 6175863..af7e8f8 100755
--- a/vpn/plugins/vpn.h
+++ b/vpn/plugins/vpn.h
@@ -40,12 +40,16 @@ enum vpn_state {
VPN_STATE_AUTH_FAILURE = 6,
};
+#if defined TIZEN_EXT
typedef void (*vpn_event_callback)(struct vpn_provider *provider, int state);
+#endif
struct vpn_driver {
int flags;
int (*notify) (DBusMessage *msg, struct vpn_provider *provider);
+#if defined TIZEN_EXT
void (*set_event_cb) (vpn_event_callback event_cb, struct vpn_provider *provider);
+#endif
int (*connect) (struct vpn_provider *provider,
struct connman_task *task, const char *if_name,
vpn_provider_connect_cb_t cb, const char *dbus_sender,