NetworkManager/info-daemon/NetworkManagerInfoVPN.c
Ray Strode 278e500f99 2005-03-14 Ray Strode <rstrode@redhat.com>
Fourth (probably working) cut at porting to
	dbus 0.30 api and new hal. This cut adds
	some new logging macros to make debugging
	easier.

	* dispatcher-daemon/NetworkManagerDispatcher.c:
	* info-daemon/NetworkmanagerInfo.c:
	* info-daemon/NetworkManagerInfoPassphraseDialog.c:
	* info-daemon/NetworkManagerInfoVPN.c:
	* src/NetworkManager.c:
	* src/NetworkManagerAP.c:
	* src/NetworkManagerAPList.c:
	* src/NetworkManagerDHCP.c:
	* src/NetworkManagerDbus.c:
	* src/NetworkManagerDevice.c:
	* src/NetworkManagerPolicy.c:
	* src/NetworkManagerSystem.c:
	* src/NetworkManagerUtils.c:
	* src/NetworkManagerWireless.c:
	* src/autoip.c:
	* src/nm-dbus-nm.c:
	* src/backends/NetworkManagerDebian.c:
	* src/backends/NetworkManagerGentoo.c:
	* src/backends/NetworkManagerRedHat.c:
	* src/backends/NetworkManagerSlackware.c:
	use new logging macros.

	* dispatcher-daemon/NetworkManagerDispatcher.c:
	(nmd_dbus_filter): s/dbus_free/g_free/

	* info-daemon/Makefile.am: link in utils library.
	* info-daemon/NetworkmanagerInfo.c: use new logging
	macros.
	(nmi_dbus_get_network): don't assume enumerations
	are 32-bit.
	(nmi_dbus_nmi_message_handler): don't free what
	doesn't belong to us.

	* libnm_glib/libnm_glib.c:
	(libnm_glib_get_nm_status):
	(libnm_glib_init): don't free what doesn't
	belong to us.
	(libnm_glib_dbus): strdup result, so it doesn't get
	lost when message is unref'd.

	* panel-applet/NMWirelessAppletDbus.c:
	(nmwa_dbus_update_devices): s/dbus_free/g_free/

	* src/NetworkManager.c:
	(nm_monitor_wired_link_state): request initial status
	dump of all cards when we start up, instead of relying
	on /sys/.../carrier.
	(nm_info_handler), (nm_set_up_log_handlers):
	log handlers to specify what syslog priorites
	the logging macros default to.

	* src/NetworkManagerAPList.c:
	(nm_ap_list_populate_from_nmi):
	s/dbus_free_string_array/g_strfreev/

	* src/NetworkManagerDbus.c:
	(nm_dbus_get_network_object):
	validate d-bus message argument types.
	Advance message iterator after reading argument,
	prepend instead of append to GSList.

	* src/NetworkManagerDevice.c:
	(nm_device_probe_wired_link_status):
	remove redundant /sys in /sys path. remove wrong
	contents == NULL means has carrier assumption.

	* src/nm-netlink-monitor.c
	(nm_netlink_monitor_request_status): implement
	function to ask kernel to dump interface link
	status over netlink socket.

	* test/*.c: s/dbus_free/g_free/

	* utils/nm-utils.h:
	(nm_print_backtrace): new macro to print backtrace.
	(nm_get_timestamp): new macro to get sub-second precise
	unix timestamp.
	(nm_info), (nm_debug), (nm_warning), (nm_error):
	new logging functions. nm_info just prints,
	nm_debug includes timestamp and function,
	nm_warning includes function, nm_error includes
	backtrace and sigtrap.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@497 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2005-03-15 05:30:15 +00:00

188 lines
5.8 KiB
C

/* NetworkManagerInfo -- Manage allowed access points and provide a UI
* for WEP key entry
*
* Colin Walters <walters@redhat.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* (C) Copyright 2004 Red Hat, Inc.
*/
#include <config.h>
#include <libintl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <glib.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <gnome-keyring.h>
#include <libgnomeui/gnome-password-dialog.h>
#ifndef _
#define _(x) dgettext (GETTEXT_PACKAGE, x)
#define N_(x) x
#endif
#include "NetworkManagerInfoDbus.h"
#include "NetworkManagerInfoVPN.h"
#include "nm-utils.h"
int nmi_vpn_init (NMIAppInfo *info)
{
info->vpn_password_dialog = NULL;
info->vpn_password_message = NULL;
return 0;
}
static gboolean lookup_pass (const char *vpn, const char *username, char **password)
{
GList *result;
if (gnome_keyring_find_network_password_sync (username,
NULL,
vpn,
NULL,
"vpn",
NULL,
0,
&result) != GNOME_KEYRING_RESULT_OK)
return FALSE;
if (result)
{
GnomeKeyringNetworkPasswordData *data = result->data;
*password = g_strdup (data->password);
gnome_keyring_network_password_list_free (result);
return TRUE;
}
return FALSE;
}
static void save_vpn_password (const char *vpn, const char *keyring, const char *username, const char *password)
{
guint32 item_id;
GnomeKeyringResult keyring_result;
keyring_result = gnome_keyring_set_network_password_sync (NULL,
username,
NULL,
vpn,
NULL,
"vpn",
NULL,
0,
password,
&item_id);
if (keyring_result != GNOME_KEYRING_RESULT_OK)
{
nm_warning ("Couldn't store password in keyring, code %d",
(int) keyring_result);
}
}
static void close_cb (GtkWidget *dialog, gpointer user_data)
{
NMIAppInfo *info = user_data;
nmi_dbus_return_vpn_password (info->connection, info->vpn_password_message, NULL);
gtk_widget_destroy (dialog);
info->vpn_password_dialog = NULL;
}
static void response_cb (GtkWidget *dialog, int response, gpointer user_data)
{
NMIAppInfo *info = user_data;
GnomePasswordDialog *passwd_dialog;
char *password;
const char *vpn, *username;
if (response != GTK_RESPONSE_OK)
{
close_cb (dialog, user_data);
return;
}
passwd_dialog = GNOME_PASSWORD_DIALOG (dialog);
username = g_object_get_data (G_OBJECT (passwd_dialog), "NetworkManagerInfoVPN-username");
vpn = g_object_get_data (G_OBJECT (passwd_dialog), "NetworkManagerInfoVPN-vpn");
password = gnome_password_dialog_get_password (passwd_dialog);
nm_warning ("returning VPN vpn_password for %s@%s: %s", username, vpn, password);
nmi_dbus_return_vpn_password (info->connection, info->vpn_password_message, password);
switch (gnome_password_dialog_get_remember (passwd_dialog))
{
case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION:
save_vpn_password (vpn, "session", username, password);
break;
case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER:
save_vpn_password (vpn, NULL, username, password);
break;
default:
break;
}
g_free (password);
gtk_widget_destroy (dialog);
info->vpn_password_dialog = NULL;
}
void nmi_vpn_request_password (NMIAppInfo *info, DBusMessage *message, const char *vpn, const char *username, gboolean retry)
{
char *prompt;
char *password;
if (!username)
username = g_get_user_name ();
if (!retry && lookup_pass (vpn, username, &password))
{
nmi_dbus_return_vpn_password (info->connection, message, password);
g_free (password);
return;
}
prompt = g_strdup_printf (_("You must log in to access the private network %s"), vpn);
info->vpn_password_dialog = gnome_password_dialog_new ("",
prompt,
username,
NULL,
FALSE);
g_free (prompt);
info->vpn_password_message = message;
dbus_message_ref (info->vpn_password_message);
gnome_password_dialog_set_show_username (GNOME_PASSWORD_DIALOG (info->vpn_password_dialog), TRUE);
gnome_password_dialog_set_readonly_username (GNOME_PASSWORD_DIALOG (info->vpn_password_dialog), TRUE);
gnome_password_dialog_set_show_userpass_buttons (GNOME_PASSWORD_DIALOG (info->vpn_password_dialog), FALSE);
gnome_password_dialog_set_show_domain (GNOME_PASSWORD_DIALOG (info->vpn_password_dialog), FALSE);
gnome_password_dialog_set_show_remember (GNOME_PASSWORD_DIALOG (info->vpn_password_dialog), TRUE);
g_object_set_data_full (G_OBJECT (info->vpn_password_dialog), "NetworkManagerInfoVPN-username", g_strdup (username), (GDestroyNotify) g_free);
g_object_set_data_full (G_OBJECT (info->vpn_password_dialog), "NetworkManagerInfoVPN-vpn", g_strdup (vpn), (GDestroyNotify) g_free);
g_signal_connect (info->vpn_password_dialog, "response", G_CALLBACK (response_cb), info);
g_signal_connect (info->vpn_password_dialog, "close", G_CALLBACK (close_cb), info);
gtk_widget_show (info->vpn_password_dialog);
}
void nmi_vpn_cancel_request_password (NMIAppInfo *info)
{
if (info->vpn_password_dialog)
{
gtk_widget_destroy (info->vpn_password_dialog);
dbus_message_unref (info->vpn_password_message);
info->vpn_password_message = NULL;
}
}