X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=vpn%2Fplugins%2Fl2tp.c;h=48894aa5286503d640c4b0210678c84507d364b3;hb=c647a4b6f1132684c9d8b8ad71ec38d81147b278;hp=a322178984490ffaa9aeabf5b6a937c6c2beb04f;hpb=5052b3acb5d041ed9dd00397a36563850faacf00;p=platform%2Fupstream%2Fconnman.git diff --git a/vpn/plugins/l2tp.c b/vpn/plugins/l2tp.c old mode 100644 new mode 100755 index a322178..48894aa --- a/vpn/plugins/l2tp.c +++ b/vpn/plugins/l2tp.c @@ -2,8 +2,8 @@ * * ConnMan VPN daemon * - * Copyright (C) 2010 BMW Car IT GmbH. All rights reserved. - * Copyright (C) 2012 Intel Corporation. All rights reserved. + * Copyright (C) 2010,2013 BMW Car IT GmbH. + * Copyright (C) 2012-2013 Intel Corporation. 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 @@ -65,6 +65,7 @@ enum { OPT_L2G = 2, OPT_L2 = 3, OPT_PPPD = 4, + OPT_L2LNS = 5, }; struct { @@ -83,7 +84,7 @@ struct { { "L2TP.DefaultRoute", "defaultroute", OPT_L2, NULL, OPT_STRING }, { "L2TP.FlowBit", "flow bit", OPT_L2, NULL, OPT_STRING }, { "L2TP.TunnelRWS", "tunnel rws", OPT_L2, NULL, OPT_STRING }, - { "L2TP.Exclusive", "exclusive", OPT_L2, NULL, OPT_STRING }, + { "L2TP.Exclusive", "exclusive", OPT_L2LNS, NULL, OPT_STRING }, { "L2TP.Autodial", "autodial", OPT_L2, "yes", OPT_STRING }, { "L2TP.Redial", "redial", OPT_L2, "yes", OPT_STRING }, { "L2TP.RedialTimeout", "redial timeout", OPT_L2, "10", OPT_STRING }, @@ -96,7 +97,7 @@ struct { { "L2TP.ForceUserSpace", "force userspace", OPT_L2G, NULL, OPT_STRING }, { "L2TP.ListenAddr", "listen-addr", OPT_L2G, NULL, OPT_STRING }, { "L2TP.Rand Source", "rand source", OPT_L2G, NULL, OPT_STRING }, - { "L2TP.IPsecSaref", "ipsec saref", OPT_L2G, NULL, OPT_STRING }, + { "L2TP.IPsecSaref", "ipsec saref", OPT_L2G, "no", OPT_STRING }, { "L2TP.Port", "port", OPT_L2G, NULL, OPT_STRING }, { "PPPD.EchoFailure", "lcp-echo-failure", OPT_PPPD, "0", OPT_STRING }, { "PPPD.EchoInterval", "lcp-echo-interval", OPT_PPPD, "0", OPT_STRING }, @@ -108,13 +109,13 @@ struct { { "PPPD.RefuseMSCHAP2", "refuse-mschapv2", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.NoBSDComp", "nobsdcomp", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.NoPcomp", "nopcomp", OPT_PPPD, NULL, OPT_BOOL }, - { "PPPD.UseAccomp", "accomp", OPT_PPPD, NULL, OPT_BOOL }, + { "PPPD.UseAccomp", "noaccomp", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.NoDeflate", "nodeflate", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.ReqMPPE", "require-mppe", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.ReqMPPE40", "require-mppe-40", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.ReqMPPE128", "require-mppe-128", OPT_PPPD, NULL, OPT_BOOL }, { "PPPD.ReqMPPEStateful", "mppe-stateful", OPT_PPPD, NULL, OPT_BOOL }, - { "PPPD.NoVJ", "no-vj-comp", OPT_PPPD, NULL, OPT_BOOL }, + { "PPPD.NoVJ", "novj", OPT_PPPD, NULL, OPT_BOOL }, }; static DBusConnection *connection; @@ -132,18 +133,18 @@ static DBusMessage *l2tp_get_sec(struct connman_task *task, const char *user, *passwd; struct vpn_provider *provider = user_data; - if (dbus_message_get_no_reply(msg) == FALSE) { + if (!dbus_message_get_no_reply(msg)) { DBusMessage *reply; user = vpn_provider_get_string(provider, "L2TP.User"); passwd = vpn_provider_get_string(provider, "L2TP.Password"); - if (user == NULL || strlen(user) == 0 || - passwd == NULL || strlen(passwd) == 0) + if (!user || strlen(user) == 0 || + !passwd || strlen(passwd) == 0) return NULL; reply = dbus_message_new_method_return(msg); - if (reply == NULL) + if (!reply) return NULL; dbus_message_append_args(reply, DBUS_TYPE_STRING, &user, @@ -178,7 +179,8 @@ static int l2tp_notify(DBusMessage *msg, struct vpn_provider *provider) DBG("authentication failure"); vpn_provider_set_string(provider, "L2TP.User", NULL); - vpn_provider_set_string(provider, "L2TP.Password", NULL); + vpn_provider_set_string_hide_value(provider, "L2TP.Password", + NULL); return VPN_STATE_AUTH_FAILURE; } @@ -198,20 +200,14 @@ static int l2tp_notify(DBusMessage *msg, struct vpn_provider *provider) DBG("%s = %s", key, value); - if (!strcmp(key, "INTERNAL_IP4_ADDRESS")) { - vpn_provider_set_string(provider, "Address", value); + if (!strcmp(key, "INTERNAL_IP4_ADDRESS")) addressv4 = g_strdup(value); - } - if (!strcmp(key, "INTERNAL_IP4_NETMASK")) { - vpn_provider_set_string(provider, "Netmask", value); + if (!strcmp(key, "INTERNAL_IP4_NETMASK")) netmask = g_strdup(value); - } - if (!strcmp(key, "INTERNAL_IP4_DNS")) { - vpn_provider_set_string(provider, "DNS", value); + if (!strcmp(key, "INTERNAL_IP4_DNS")) nameservers = g_strdup(value); - } if (!strcmp(key, "INTERNAL_IFNAME")) ifname = g_strdup(value); @@ -227,12 +223,12 @@ static int l2tp_notify(DBusMessage *msg, struct vpn_provider *provider) return VPN_STATE_FAILURE; } - if (addressv4 != NULL) + if (addressv4) ipaddress = connman_ipaddress_alloc(AF_INET); g_free(ifname); - if (ipaddress == NULL) { + if (!ipaddress) { connman_error("No IP address for provider"); g_free(addressv4); g_free(netmask); @@ -241,12 +237,12 @@ static int l2tp_notify(DBusMessage *msg, struct vpn_provider *provider) } value = vpn_provider_get_string(provider, "HostIP"); - if (value != NULL) { + if (value) { vpn_provider_set_string(provider, "Gateway", value); gateway = g_strdup(value); } - if (addressv4 != NULL) + if (addressv4) connman_ipaddress_set_ipv4(ipaddress, addressv4, netmask, gateway); @@ -265,29 +261,29 @@ static int l2tp_notify(DBusMessage *msg, struct vpn_provider *provider) static int l2tp_save(struct vpn_provider *provider, GKeyFile *keyfile) { const char *option; - connman_bool_t l2tp_option, pppd_option; + bool l2tp_option, pppd_option; int i; for (i = 0; i < (int)ARRAY_SIZE(pppd_options); i++) { - l2tp_option = pppd_option = FALSE; + l2tp_option = pppd_option = false; if (strncmp(pppd_options[i].cm_opt, "L2TP.", 5) == 0) - l2tp_option = TRUE; + l2tp_option = true; if (strncmp(pppd_options[i].cm_opt, "PPPD.", 5) == 0) - pppd_option = TRUE; + pppd_option = true; - if (l2tp_option == TRUE || pppd_option == TRUE) { + if (l2tp_option || pppd_option) { option = vpn_provider_get_string(provider, pppd_options[i].cm_opt); - if (option == NULL) { + if (!option) { /* * Check if the option prefix is L2TP as the * PPPD options were using L2TP prefix earlier. */ char *l2tp_str; - if (pppd_option == FALSE) + if (!pppd_option) continue; l2tp_str = g_strdup_printf("L2TP.%s", @@ -296,7 +292,7 @@ static int l2tp_save(struct vpn_provider *provider, GKeyFile *keyfile) l2tp_str); g_free(l2tp_str); - if (option == NULL) + if (!option) continue; } @@ -333,7 +329,7 @@ static ssize_t l2tp_write_bool_option(int fd, gchar *buf; ssize_t ret = 0; - if (key != NULL && value != NULL) { + if (key && value) { if (strcasecmp(value, "yes") == 0 || strcasecmp(value, "true") == 0 || strcmp(value, "1") == 0) { @@ -352,8 +348,8 @@ static int l2tp_write_option(int fd, const char *key, const char *value) gchar *buf; ssize_t ret = 0; - if (key != NULL) { - if (value != NULL) + if (key) { + if (value) buf = g_strdup_printf("%s %s\n", key, value); else buf = g_strdup_printf("%s\n", key); @@ -371,7 +367,7 @@ static int l2tp_write_section(int fd, const char *key, const char *value) gchar *buf; ssize_t ret = 0; - if (key != NULL && value != NULL) { + if (key && value) { buf = g_strdup_printf("%s = %s\n", key, value); ret = full_write(fd, buf, strlen(buf)); @@ -388,6 +384,7 @@ static int write_pppd_option(struct vpn_provider *provider, int fd) l2tp_write_option(fd, "nodetach", NULL); l2tp_write_option(fd, "lock", NULL); + l2tp_write_option(fd, "logfd", "2"); l2tp_write_option(fd, "usepeerdns", NULL); l2tp_write_option(fd, "noipdefault", NULL); l2tp_write_option(fd, "noauth", NULL); @@ -459,6 +456,9 @@ static int l2tp_write_config(struct vpn_provider *provider, l2tp_write_option(fd, "[global]", NULL); l2tp_write_fields(provider, fd, OPT_L2G); + l2tp_write_option(fd, "[lns default]", NULL); + l2tp_write_fields(provider, fd, OPT_L2LNS); + l2tp_write_option(fd, "[lac l2tp]", NULL); option = vpn_provider_get_string(provider, "Host"); @@ -478,11 +478,11 @@ static void l2tp_died(struct connman_task *task, int exit_code, void *user_data) vpn_died(task, exit_code, user_data); - conf_file = g_strdup_printf("/var/run/connman/connman-xl2tpd.conf"); + conf_file = g_strdup_printf(VPN_STATEDIR "/connman-xl2tpd.conf"); unlink(conf_file); g_free(conf_file); - conf_file = g_strdup_printf("/var/run/connman/connman-ppp-option.conf"); + conf_file = g_strdup_printf(VPN_STATEDIR "/connman-ppp-option.conf"); unlink(conf_file); g_free(conf_file); } @@ -496,19 +496,32 @@ struct request_input_reply { static void request_input_reply(DBusMessage *reply, void *user_data) { struct request_input_reply *l2tp_reply = user_data; + struct l2tp_private_data *data; const char *error = NULL; char *username = NULL, *password = NULL; char *key; DBusMessageIter iter, dict; + int err; DBG("provider %p", l2tp_reply->provider); - if (dbus_message_get_type(reply) == DBUS_MESSAGE_TYPE_ERROR) { + if (!reply) + goto done; + + data = l2tp_reply->user_data; + + err = vpn_agent_check_and_process_reply_error(reply, + l2tp_reply->provider, data->task, data->cb, + data->user_data); + if (err) { + /* Ensure cb is called only once */ + data->cb = NULL; + data->user_data = NULL; error = dbus_message_get_error_name(reply); goto done; } - if (vpn_agent_check_reply_has_dict(reply) == FALSE) + if (!vpn_agent_check_reply_has_dict(reply)) goto done; dbus_message_iter_init(reply, &iter); @@ -567,7 +580,8 @@ typedef void (* request_cb_t)(struct vpn_provider *provider, const char *error, void *user_data); static int request_input(struct vpn_provider *provider, - request_cb_t callback, void *user_data) + request_cb_t callback, const char *dbus_sender, + void *user_data) { DBusMessage *message; const char *path, *agent_sender, *agent_path; @@ -575,16 +589,17 @@ static int request_input(struct vpn_provider *provider, DBusMessageIter dict; struct request_input_reply *l2tp_reply; int err; + void *agent; - connman_agent_get_info(&agent_sender, &agent_path); - - if (provider == NULL || agent_path == NULL || callback == NULL) + agent = connman_agent_get_info(dbus_sender, &agent_sender, + &agent_path); + if (!provider || !agent || !agent_path || !callback) return -ESRCH; message = dbus_message_new_method_call(agent_sender, agent_path, VPN_AGENT_INTERFACE, "RequestInput"); - if (message == NULL) + if (!message) return -ENOMEM; dbus_message_iter_init_append(message, &iter); @@ -595,6 +610,9 @@ static int request_input(struct vpn_provider *provider, connman_dbus_dict_open(&iter, &dict); + if (vpn_provider_get_authentication_errors(provider)) + vpn_agent_append_auth_failure(&dict, provider, NULL); + vpn_agent_append_user_info(&dict, provider, "L2TP.User"); vpn_agent_append_host_and_name(&dict, provider); @@ -602,7 +620,7 @@ static int request_input(struct vpn_provider *provider, connman_dbus_dict_close(&iter, &dict); l2tp_reply = g_try_new0(struct request_input_reply, 1); - if (l2tp_reply == NULL) { + if (!l2tp_reply) { dbus_message_unref(message); return -ENOMEM; } @@ -613,7 +631,7 @@ static int request_input(struct vpn_provider *provider, err = connman_agent_queue_message(provider, message, connman_timeout_input_request(), - request_input_reply, l2tp_reply); + request_input_reply, l2tp_reply, agent); if (err < 0 && err != -EBUSY) { DBG("error %d sending agent request", err); dbus_message_unref(message); @@ -635,7 +653,7 @@ static int run_connect(struct vpn_provider *provider, int l2tp_fd, pppd_fd; int err; - if (username == NULL || password == NULL) { + if (!username || !*username || !password || !*password) { DBG("Cannot connect username %s password %p", username, password); err = -EINVAL; @@ -644,7 +662,7 @@ static int run_connect(struct vpn_provider *provider, DBG("username %s password %p", username, password); - l2tp_name = g_strdup_printf("/var/run/connman/connman-xl2tpd.conf"); + l2tp_name = g_strdup_printf(VPN_STATEDIR "/connman-xl2tpd.conf"); l2tp_fd = open(l2tp_name, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR); if (l2tp_fd < 0) { @@ -654,7 +672,7 @@ static int run_connect(struct vpn_provider *provider, goto done; } - pppd_name = g_strdup_printf("/var/run/connman/connman-ppp-option.conf"); + pppd_name = g_strdup_printf(VPN_STATEDIR "/connman-ppp-option.conf"); pppd_fd = open(pppd_name, O_RDWR|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR); if (pppd_fd < 0) { @@ -675,6 +693,8 @@ static int run_connect(struct vpn_provider *provider, g_free(l2tp_name); g_free(pppd_name); + close(l2tp_fd); + close(pppd_fd); err = connman_task_run(task, l2tp_died, provider, NULL, NULL, NULL); @@ -685,7 +705,7 @@ static int run_connect(struct vpn_provider *provider, } done: - if (cb != NULL) + if (cb) cb(provider, user_data, err); return err; @@ -704,10 +724,10 @@ static void request_input_cb(struct vpn_provider *provider, { struct l2tp_private_data *data = user_data; - if (username == NULL || password == NULL) + if (!username || !*username || !password || !*password) DBG("Requesting username %s or password failed, error %s", username, error); - else if (error != NULL) + else if (error) DBG("error %s", error); vpn_provider_set_string(provider, "L2TP.User", username); @@ -722,7 +742,8 @@ static void request_input_cb(struct vpn_provider *provider, static int l2tp_connect(struct vpn_provider *provider, struct connman_task *task, const char *if_name, - vpn_provider_connect_cb_t cb, void *user_data) + vpn_provider_connect_cb_t cb, const char *dbus_sender, + void *user_data) { const char *username, *password; int err; @@ -738,11 +759,11 @@ static int l2tp_connect(struct vpn_provider *provider, DBG("user %s password %p", username, password); - if (username == NULL || password == NULL) { + if (!username || !*username || !password || !*password) { struct l2tp_private_data *data; data = g_try_new0(struct l2tp_private_data, 1); - if (data == NULL) + if (!data) return -ENOMEM; data->task = task; @@ -750,7 +771,8 @@ static int l2tp_connect(struct vpn_provider *provider, data->cb = cb; data->user_data = user_data; - err = request_input(provider, request_input_cb, data); + err = request_input(provider, request_input_cb, dbus_sender, + data); if (err != -EINPROGRESS) { free_private_data(data); goto done; @@ -763,13 +785,13 @@ done: username, password); error: - if (cb != NULL) + if (cb) cb(provider, user_data, err); return err; } -static int l2tp_error_code(int exit_code) +static int l2tp_error_code(struct vpn_provider *provider, int exit_code) { switch (exit_code) { case 1: @@ -781,7 +803,12 @@ static int l2tp_error_code(int exit_code) static void l2tp_disconnect(struct vpn_provider *provider) { - vpn_provider_set_string(provider, "L2TP.Password", NULL); + if (!provider) + return; + + vpn_provider_set_string_hide_value(provider, "L2TP.Password", NULL); + + connman_agent_cancel(provider); } static struct vpn_driver vpn_driver = {