
Clone the connection upon activation. This makes it safe for the user to modify the original connection while it is activated. This involves several changes: - NMActiveConnection gets @settings_connection and @applied_connection. To support add-and-activate, we constructing a NMActiveConnection with no connection set. Previously, we would set the "connection" field to a temporary NMConnection. Now NMManager piggybacks this temporary connection as object-data (TAG_ACTIVE_CONNETION_ADD_AND_ACTIVATE). - get rid of the functions nm_active_connection_get_connection_type() and nm_active_connection_get_connection_uuid(). From their names it is unclear whether this returns the settings or applied connection. The (few) callers should figure that out themselves. - rename nm_active_connection_get_id() to nm_active_connection_get_settings_connection_id(). This function is only used internally for logging. - dispatcher calls now get two connections as well. The applied-connection is used for the connection data, while the settings-connection is used for the connection path. - needs special handling for properties that apply immediately when changed (nm_device_reapply_settings_immediately()). Co-Authored-By: Thomas Haller <thaller@redhat.com> https://bugzilla.gnome.org/show_bug.cgi?id=724041
83 lines
3.3 KiB
C
83 lines
3.3 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* 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.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright (C) 2004 - 2012 Red Hat, Inc.
|
|
* Copyright (C) 2005 - 2008 Novell, Inc.
|
|
*/
|
|
|
|
#ifndef __NETWORKMANAGER_DISPATCHER_H__
|
|
#define __NETWORKMANAGER_DISPATCHER_H__
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "nm-default.h"
|
|
#include "nm-connection.h"
|
|
|
|
typedef enum {
|
|
DISPATCHER_ACTION_HOSTNAME,
|
|
DISPATCHER_ACTION_PRE_UP,
|
|
DISPATCHER_ACTION_UP,
|
|
DISPATCHER_ACTION_PRE_DOWN,
|
|
DISPATCHER_ACTION_DOWN,
|
|
DISPATCHER_ACTION_VPN_PRE_UP,
|
|
DISPATCHER_ACTION_VPN_UP,
|
|
DISPATCHER_ACTION_VPN_PRE_DOWN,
|
|
DISPATCHER_ACTION_VPN_DOWN,
|
|
DISPATCHER_ACTION_DHCP4_CHANGE,
|
|
DISPATCHER_ACTION_DHCP6_CHANGE
|
|
} DispatcherAction;
|
|
|
|
typedef void (*DispatcherFunc) (guint call_id, gpointer user_data);
|
|
|
|
gboolean nm_dispatcher_call (DispatcherAction action,
|
|
NMSettingsConnection *settings_connection,
|
|
NMConnection *applied_connection,
|
|
NMDevice *device,
|
|
DispatcherFunc callback,
|
|
gpointer user_data,
|
|
guint *out_call_id);
|
|
|
|
gboolean nm_dispatcher_call_sync (DispatcherAction action,
|
|
NMSettingsConnection *settings_connection,
|
|
NMConnection *applied_connection,
|
|
NMDevice *device);
|
|
|
|
gboolean nm_dispatcher_call_vpn (DispatcherAction action,
|
|
NMSettingsConnection *settings_connection,
|
|
NMConnection *applied_connection,
|
|
NMDevice *parent_device,
|
|
const char *vpn_iface,
|
|
NMIP4Config *vpn_ip4_config,
|
|
NMIP6Config *vpn_ip6_config,
|
|
DispatcherFunc callback,
|
|
gpointer user_data,
|
|
guint *out_call_id);
|
|
|
|
gboolean nm_dispatcher_call_vpn_sync (DispatcherAction action,
|
|
NMSettingsConnection *settings_connection,
|
|
NMConnection *applied_connection,
|
|
NMDevice *parent_device,
|
|
const char *vpn_iface,
|
|
NMIP4Config *vpn_ip4_config,
|
|
NMIP6Config *vpn_ip6_config);
|
|
|
|
void nm_dispatcher_call_cancel (guint call_id);
|
|
|
|
void nm_dispatcher_init (void);
|
|
|
|
#endif /* __NETWORKMANAGER_DISPATCHER_H__ */
|