projects
/
platform
/
upstream
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Send Mac policy parameters in CreateInterface dbus call.
[platform/upstream/connman.git]
/
vpn
/
main.c
diff --git
a/vpn/main.c
b/vpn/main.c
index
debb0ca
..
ae9c945
100755
(executable)
--- a/
vpn/main.c
+++ b/
vpn/main.c
@@
-232,6
+232,18
@@
bool connman_setting_get_bool(const char *key)
return false;
}
return false;
}
+#if defined TIZEN_EXT
+unsigned int connman_setting_get_uint(const char *key)
+{
+ return 0;
+}
+
+int connman_setting_get_int(const char *key)
+{
+ return 0;
+}
+#endif
+
char **connman_setting_get_string_list(const char *key)
{
return NULL;
char **connman_setting_get_string_list(const char *key)
{
return NULL;
@@
-248,7
+260,7
@@
unsigned int *connman_setting_get_uint_list(const char *key)
*/
unsigned int connman_timeout_input_request(void)
{
*/
unsigned int connman_timeout_input_request(void)
{
- return
connman_vpn_settings.timeout_inputreq
;
+ return
__vpn_settings_get_timeout_inputreq()
;
}
unsigned int connman_timeout_browser_launch(void)
}
unsigned int connman_timeout_browser_launch(void)
@@
-256,6
+268,11
@@
unsigned int connman_timeout_browser_launch(void)
return connman_vpn_settings.timeout_browserlaunch;
}
return connman_vpn_settings.timeout_browserlaunch;
}
+const char *connman_option_get_string(const char *key)
+{
+ return NULL;
+}
+
int main(int argc, char *argv[])
{
GOptionContext *context;
int main(int argc, char *argv[])
{
GOptionContext *context;
@@
-337,9
+354,9
@@
int main(int argc, char *argv[])
__connman_dbus_init(conn);
if (!option_config)
__connman_dbus_init(conn);
if (!option_config)
-
config
_init(CONFIGMAINFILE);
+
__vpn_settings
_init(CONFIGMAINFILE);
else
else
-
config
_init(option_config);
+
__vpn_settings
_init(option_config);
__connman_inotify_init();
__connman_agent_init();
__connman_inotify_init();
__connman_agent_init();
@@
-371,6
+388,7
@@
int main(int argc, char *argv[])
__connman_inotify_cleanup();
__connman_dbus_cleanup();
__connman_log_cleanup(false);
__connman_inotify_cleanup();
__connman_dbus_cleanup();
__connman_log_cleanup(false);
+ __vpn_settings_cleanup();
dbus_connection_unref(conn);
dbus_connection_unref(conn);