mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-26 12:20:09 +01:00
22c8721f35
It should be possible to add a profile with autoconnect blocked form the start. Update2() has a %NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT flag to block autoconnect, and so we need something similar when adding a connection. As the existing AddConnection() and AddConnectionUnsaved() API is not extensible, add AddConnection2() that has flags and room for additional arguments. Then add and implement the new flag %NM_SETTINGS_ADD_CONNECTION2_FLAG_BLOCK_AUTOCONNECT for AddConnection2(). Note that libnm's nm_client_add_connection2() API can completely replace the existing nm_client_add_connection_async() call. In particular, it will automatically prefer to call the D-Bus methods AddConnection() and AddConnectionUnsaved(), in order to work with server versions older than 1.20. The purpose of this is that when upgrading the package, the running NetworkManager might still be older than the installed libnm. Anyway, so since nm_client_add_connection2_finish() also has a result output, the caller needs to decide whether he cares about that result. Hence it has an argument ignore_out_result, which allows to fallback to the old API. One might argue that a caller who doesn't care about the output results while still wanting to be backward compatible, should itself choose to call nm_client_add_connection_async() or nm_client_add_connection2(). But instead, it's more convenient if the new function can fully replace the old one, so that the caller does not need to switch which start/finish method to call. https://bugzilla.redhat.com/show_bug.cgi?id=1677068
130 lines
6.7 KiB
C
130 lines
6.7 KiB
C
/*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library 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
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the
|
|
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
* Boston, MA 02110-1301 USA.
|
|
*
|
|
* Copyright 2008 Novell, Inc.
|
|
* Copyright 2009 - 2011 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_REMOTE_SETTINGS_H__
|
|
#define __NM_REMOTE_SETTINGS_H__
|
|
|
|
#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
|
|
#error Cannot use this header.
|
|
#endif
|
|
|
|
#include "nm-object.h"
|
|
|
|
#define NM_TYPE_REMOTE_SETTINGS (nm_remote_settings_get_type ())
|
|
#define NM_REMOTE_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettings))
|
|
#define NM_REMOTE_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettingsClass))
|
|
#define NM_IS_REMOTE_SETTINGS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_REMOTE_SETTINGS))
|
|
#define NM_IS_REMOTE_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_SETTINGS))
|
|
#define NM_REMOTE_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettingsClass))
|
|
|
|
#define NM_REMOTE_SETTINGS_CONNECTIONS "connections"
|
|
#define NM_REMOTE_SETTINGS_HOSTNAME "hostname"
|
|
#define NM_REMOTE_SETTINGS_CAN_MODIFY "can-modify"
|
|
|
|
#define NM_REMOTE_SETTINGS_CONNECTION_ADDED "connection-added"
|
|
#define NM_REMOTE_SETTINGS_CONNECTION_REMOVED "connection-removed"
|
|
|
|
typedef struct _NMRemoteSettings NMRemoteSettings;
|
|
typedef struct _NMRemoteSettingsClass NMRemoteSettingsClass;
|
|
|
|
/**
|
|
* NMRemoteSettings:
|
|
*/
|
|
struct _NMRemoteSettings {
|
|
NMObject parent;
|
|
};
|
|
|
|
struct _NMRemoteSettingsClass {
|
|
NMObjectClass parent;
|
|
|
|
void (*connection_added) (NMRemoteSettings *settings,
|
|
NMRemoteConnection *connection);
|
|
void (*connection_removed) (NMRemoteSettings *settings,
|
|
NMRemoteConnection *connection);
|
|
};
|
|
|
|
GType nm_remote_settings_get_type (void);
|
|
|
|
const GPtrArray *nm_remote_settings_get_connections (NMRemoteSettings *settings);
|
|
|
|
NMRemoteConnection *nm_remote_settings_get_connection_by_id (NMRemoteSettings *settings,
|
|
const char *id);
|
|
|
|
NMRemoteConnection *nm_remote_settings_get_connection_by_path (NMRemoteSettings *settings,
|
|
const char *path);
|
|
|
|
NMRemoteConnection *nm_remote_settings_get_connection_by_uuid (NMRemoteSettings *settings,
|
|
const char *uuid);
|
|
|
|
typedef void (*NMRemoteSettingAddConnection2Callback) (NMRemoteSettings *self,
|
|
NMRemoteConnection *connection,
|
|
GVariant *results,
|
|
GError *error,
|
|
gpointer user_data);
|
|
|
|
void nm_remote_settings_add_connection2 (NMRemoteSettings *self,
|
|
GVariant *settings,
|
|
NMSettingsAddConnection2Flags flags,
|
|
GVariant *args,
|
|
gboolean ignore_out_result,
|
|
GCancellable *cancellable,
|
|
NMRemoteSettingAddConnection2Callback callback,
|
|
gpointer user_data);
|
|
|
|
gboolean nm_remote_settings_load_connections (NMRemoteSettings *settings,
|
|
char **filenames,
|
|
char ***failures,
|
|
GCancellable *cancellable,
|
|
GError **error);
|
|
void nm_remote_settings_load_connections_async (NMRemoteSettings *settings,
|
|
char **filenames,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data);
|
|
gboolean nm_remote_settings_load_connections_finish (NMRemoteSettings *settings,
|
|
char ***failures,
|
|
GAsyncResult *result,
|
|
GError **error);
|
|
|
|
gboolean nm_remote_settings_reload_connections (NMRemoteSettings *settings,
|
|
GCancellable *cancellable,
|
|
GError **error);
|
|
void nm_remote_settings_reload_connections_async (NMRemoteSettings *settings,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data);
|
|
gboolean nm_remote_settings_reload_connections_finish (NMRemoteSettings *settings,
|
|
GAsyncResult *result,
|
|
GError **error);
|
|
|
|
gboolean nm_remote_settings_save_hostname (NMRemoteSettings *settings,
|
|
const char *hostname,
|
|
GCancellable *cancellable,
|
|
GError **error);
|
|
void nm_remote_settings_save_hostname_async (NMRemoteSettings *settings,
|
|
const char *hostname,
|
|
GCancellable *cancellable,
|
|
GAsyncReadyCallback callback,
|
|
gpointer user_data);
|
|
gboolean nm_remote_settings_save_hostname_finish (NMRemoteSettings *settings,
|
|
GAsyncResult *result,
|
|
GError **error);
|
|
|
|
#endif /* __NM_REMOTE_SETTINGS_H__ */
|