06da353242
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
87 lines
3.8 KiB
C
87 lines
3.8 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.
|
|
*
|
|
* (C) Copyright 2005 - 2012 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NETWORKMANAGER_ACTIVATION_REQUEST_H__
|
|
#define __NETWORKMANAGER_ACTIVATION_REQUEST_H__
|
|
|
|
|
|
#include "nm-default.h"
|
|
#include "nm-connection.h"
|
|
#include "nm-active-connection.h"
|
|
|
|
#define NM_TYPE_ACT_REQUEST (nm_act_request_get_type ())
|
|
#define NM_ACT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_ACT_REQUEST, NMActRequest))
|
|
#define NM_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_ACT_REQUEST, NMActRequestClass))
|
|
#define NM_IS_ACT_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_ACT_REQUEST))
|
|
#define NM_IS_ACT_REQUEST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_ACT_REQUEST))
|
|
#define NM_ACT_REQUEST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_ACT_REQUEST, NMActRequestClass))
|
|
|
|
struct _NMActRequestGetSecretsCallId;
|
|
typedef struct _NMActRequestGetSecretsCallId *NMActRequestGetSecretsCallId;
|
|
|
|
struct _NMActRequest {
|
|
NMActiveConnection parent;
|
|
};
|
|
|
|
typedef struct {
|
|
NMActiveConnectionClass parent;
|
|
|
|
} NMActRequestClass;
|
|
|
|
GType nm_act_request_get_type (void);
|
|
|
|
NMActRequest *nm_act_request_new (NMSettingsConnection *settings_connection,
|
|
const char *specific_object,
|
|
NMAuthSubject *subject,
|
|
NMDevice *device);
|
|
|
|
NMSettingsConnection *nm_act_request_get_settings_connection (NMActRequest *req);
|
|
|
|
NMConnection *nm_act_request_get_applied_connection (NMActRequest *req);
|
|
|
|
gboolean nm_act_request_get_shared (NMActRequest *req);
|
|
|
|
void nm_act_request_set_shared (NMActRequest *req, gboolean shared);
|
|
|
|
void nm_act_request_add_share_rule (NMActRequest *req,
|
|
const char *table,
|
|
const char *rule);
|
|
|
|
/* Secrets handling */
|
|
|
|
typedef void (*NMActRequestSecretsFunc) (NMActRequest *req,
|
|
NMActRequestGetSecretsCallId call_id,
|
|
NMSettingsConnection *connection,
|
|
GError *error,
|
|
gpointer user_data);
|
|
|
|
NMActRequestGetSecretsCallId nm_act_request_get_secrets (NMActRequest *req,
|
|
const char *setting_name,
|
|
NMSecretAgentGetSecretsFlags flags,
|
|
const char *hint,
|
|
NMActRequestSecretsFunc callback,
|
|
gpointer callback_data);
|
|
|
|
void nm_act_request_cancel_secrets (NMActRequest *req, NMActRequestGetSecretsCallId call_id);
|
|
void nm_act_request_clear_secrets (NMActRequest *self);
|
|
|
|
#endif /* __NETWORKMANAGER_ACTIVATION_REQUEST_H__ */
|
|
|