core/wireguard: add basic support for creating wireguard devices
Configuring peers (and allowed-ips of the peers) is not yet supported.
This commit is contained in:
@@ -22,10 +22,13 @@
|
|||||||
#include "nm-device-wireguard.h"
|
#include "nm-device-wireguard.h"
|
||||||
|
|
||||||
#include "nm-setting-wireguard.h"
|
#include "nm-setting-wireguard.h"
|
||||||
|
#include "nm-core-internal.h"
|
||||||
|
#include "nm-utils/nm-secret-utils.h"
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "platform/nm-platform.h"
|
#include "platform/nm-platform.h"
|
||||||
#include "nm-device-factory.h"
|
#include "nm-device-factory.h"
|
||||||
|
#include "nm-active-connection.h"
|
||||||
|
#include "nm-act-request.h"
|
||||||
|
|
||||||
#include "nm-device-logging.h"
|
#include "nm-device-logging.h"
|
||||||
_LOG_DECLARE_SELF(NMDeviceWireGuard);
|
_LOG_DECLARE_SELF(NMDeviceWireGuard);
|
||||||
@@ -43,9 +46,15 @@ NM_GOBJECT_PROPERTIES_DEFINE (NMDeviceWireGuard,
|
|||||||
PROP_FWMARK,
|
PROP_FWMARK,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
NMPlatformLnkWireGuard lnk_curr;
|
||||||
|
NMPlatformLnkWireGuard lnk_want;
|
||||||
|
NMActRequestGetSecretsCallId *secrets_call_id;
|
||||||
|
} NMDeviceWireGuardPrivate;
|
||||||
|
|
||||||
struct _NMDeviceWireGuard {
|
struct _NMDeviceWireGuard {
|
||||||
NMDevice parent;
|
NMDevice parent;
|
||||||
NMPlatformLnkWireGuard props;
|
NMDeviceWireGuardPrivate _priv;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct _NMDeviceWireGuardClass {
|
struct _NMDeviceWireGuardClass {
|
||||||
@@ -54,25 +63,22 @@ struct _NMDeviceWireGuardClass {
|
|||||||
|
|
||||||
G_DEFINE_TYPE (NMDeviceWireGuard, nm_device_wireguard, NM_TYPE_DEVICE)
|
G_DEFINE_TYPE (NMDeviceWireGuard, nm_device_wireguard, NM_TYPE_DEVICE)
|
||||||
|
|
||||||
/******************************************************************/
|
#define NM_DEVICE_WIREGUARD_GET_PRIVATE(self) _NM_GET_PRIVATE (self, NMDeviceWireGuard, NM_IS_DEVICE_WIREGUARD, NMDevice)
|
||||||
|
|
||||||
static GVariant *
|
/*****************************************************************************/
|
||||||
get_public_key_as_variant (const NMDeviceWireGuard *self)
|
|
||||||
{
|
|
||||||
return g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
|
|
||||||
self->props.public_key, sizeof (self->props.public_key), 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
update_properties (NMDevice *device)
|
update_properties (NMDevice *device)
|
||||||
{
|
{
|
||||||
NMDeviceWireGuard *self;
|
NMDeviceWireGuard *self;
|
||||||
|
NMDeviceWireGuardPrivate *priv;
|
||||||
const NMPlatformLink *plink;
|
const NMPlatformLink *plink;
|
||||||
const NMPlatformLnkWireGuard *props = NULL;
|
const NMPlatformLnkWireGuard *props = NULL;
|
||||||
int ifindex;
|
int ifindex;
|
||||||
|
|
||||||
g_return_if_fail (NM_IS_DEVICE_WIREGUARD (device));
|
g_return_if_fail (NM_IS_DEVICE_WIREGUARD (device));
|
||||||
self = NM_DEVICE_WIREGUARD (device);
|
self = NM_DEVICE_WIREGUARD (device);
|
||||||
|
priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
|
||||||
ifindex = nm_device_get_ifindex (device);
|
ifindex = nm_device_get_ifindex (device);
|
||||||
props = nm_platform_link_get_lnk_wireguard (nm_device_get_platform (device), ifindex, &plink);
|
props = nm_platform_link_get_lnk_wireguard (nm_device_get_platform (device), ifindex, &plink);
|
||||||
@@ -85,16 +91,16 @@ update_properties (NMDevice *device)
|
|||||||
|
|
||||||
#define CHECK_PROPERTY_CHANGED(field, prop) \
|
#define CHECK_PROPERTY_CHANGED(field, prop) \
|
||||||
G_STMT_START { \
|
G_STMT_START { \
|
||||||
if (self->props.field != props->field) { \
|
if (priv->lnk_curr.field != props->field) { \
|
||||||
self->props.field = props->field; \
|
priv->lnk_curr.field = props->field; \
|
||||||
_notify (self, prop); \
|
_notify (self, prop); \
|
||||||
} \
|
} \
|
||||||
} G_STMT_END
|
} G_STMT_END
|
||||||
|
|
||||||
#define CHECK_PROPERTY_CHANGED_ARRAY(field, prop) \
|
#define CHECK_PROPERTY_CHANGED_ARRAY(field, prop) \
|
||||||
G_STMT_START { \
|
G_STMT_START { \
|
||||||
if (memcmp (&self->props.field, &props->field, sizeof (props->field)) != 0) { \
|
if (memcmp (&priv->lnk_curr.field, &props->field, sizeof (priv->lnk_curr.field)) != 0) { \
|
||||||
memcpy (&self->props.field, &props->field, sizeof (props->field)); \
|
memcpy (&priv->lnk_curr.field, &props->field, sizeof (priv->lnk_curr.field)); \
|
||||||
_notify (self, prop); \
|
_notify (self, prop); \
|
||||||
} \
|
} \
|
||||||
} G_STMT_END
|
} G_STMT_END
|
||||||
@@ -114,24 +120,292 @@ link_changed (NMDevice *device,
|
|||||||
update_properties (device);
|
update_properties (device);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static NMDeviceCapabilities
|
||||||
|
get_generic_capabilities (NMDevice *dev)
|
||||||
|
{
|
||||||
|
return NM_DEVICE_CAP_IS_SOFTWARE;
|
||||||
|
}
|
||||||
|
|
||||||
/******************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static gboolean
|
||||||
|
create_and_realize (NMDevice *device,
|
||||||
|
NMConnection *connection,
|
||||||
|
NMDevice *parent,
|
||||||
|
const NMPlatformLink **out_plink,
|
||||||
|
GError **error)
|
||||||
|
{
|
||||||
|
const char *iface = nm_device_get_iface (device);
|
||||||
|
int r;
|
||||||
|
|
||||||
|
g_return_val_if_fail (iface, FALSE);
|
||||||
|
|
||||||
|
r = nm_platform_link_wireguard_add (nm_device_get_platform (device), iface, out_plink);
|
||||||
|
if (r < 0) {
|
||||||
|
g_set_error (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_CREATION_FAILED,
|
||||||
|
"Failed to create WireGuard interface '%s' for '%s': %s",
|
||||||
|
iface,
|
||||||
|
nm_connection_get_id (connection),
|
||||||
|
nm_strerror (r));
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void
|
||||||
|
_secrets_cancel (NMDeviceWireGuard *self)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
|
||||||
|
if (priv->secrets_call_id)
|
||||||
|
nm_act_request_cancel_secrets (NULL, priv->secrets_call_id);
|
||||||
|
nm_assert (!priv->secrets_call_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_secrets_cb (NMActRequest *req,
|
||||||
|
NMActRequestGetSecretsCallId *call_id,
|
||||||
|
NMSettingsConnection *connection,
|
||||||
|
GError *error,
|
||||||
|
gpointer user_data)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuard *self = NM_DEVICE_WIREGUARD (user_data);
|
||||||
|
NMDevice *device = NM_DEVICE (self);
|
||||||
|
NMDeviceWireGuardPrivate *priv;
|
||||||
|
|
||||||
|
g_return_if_fail (NM_IS_DEVICE_WIREGUARD (self));
|
||||||
|
g_return_if_fail (NM_IS_ACT_REQUEST (req));
|
||||||
|
|
||||||
|
priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
|
||||||
|
g_return_if_fail (priv->secrets_call_id == call_id);
|
||||||
|
|
||||||
|
priv->secrets_call_id = NULL;
|
||||||
|
|
||||||
|
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
|
||||||
|
return;
|
||||||
|
|
||||||
|
g_return_if_fail (req == nm_device_get_act_request (device));
|
||||||
|
g_return_if_fail (nm_device_get_state (device) == NM_DEVICE_STATE_NEED_AUTH);
|
||||||
|
g_return_if_fail (nm_act_request_get_settings_connection (req) == connection);
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
_LOGW (LOGD_ETHER, "%s", error->message);
|
||||||
|
nm_device_state_changed (device,
|
||||||
|
NM_DEVICE_STATE_FAILED,
|
||||||
|
NM_DEVICE_STATE_REASON_NO_SECRETS);
|
||||||
|
} else
|
||||||
|
nm_device_activate_schedule_stage1_device_prepare (device);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_secrets_get_secrets (NMDeviceWireGuard *self,
|
||||||
|
const char *setting_name,
|
||||||
|
NMSecretAgentGetSecretsFlags flags,
|
||||||
|
const char *const*hints)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
NMActRequest *req;
|
||||||
|
|
||||||
|
_secrets_cancel (self);
|
||||||
|
|
||||||
|
req = nm_device_get_act_request (NM_DEVICE (self));
|
||||||
|
g_return_if_fail (NM_IS_ACT_REQUEST (req));
|
||||||
|
|
||||||
|
priv->secrets_call_id = nm_act_request_get_secrets (req,
|
||||||
|
TRUE,
|
||||||
|
setting_name,
|
||||||
|
flags,
|
||||||
|
hints,
|
||||||
|
_secrets_cb,
|
||||||
|
self);
|
||||||
|
g_return_if_fail (priv->secrets_call_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
static NMActStageReturn
|
||||||
|
_secrets_handle_auth_or_fail (NMDeviceWireGuard *self,
|
||||||
|
NMActRequest *req,
|
||||||
|
gboolean new_secrets)
|
||||||
|
{
|
||||||
|
NMConnection *applied_connection;
|
||||||
|
const char *setting_name;
|
||||||
|
gs_unref_ptrarray GPtrArray *hints = NULL;
|
||||||
|
|
||||||
|
if (!nm_device_auth_retries_try_next (NM_DEVICE (self)))
|
||||||
|
return NM_ACT_STAGE_RETURN_FAILURE;
|
||||||
|
|
||||||
|
nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_NEED_AUTH, NM_DEVICE_STATE_REASON_NONE);
|
||||||
|
|
||||||
|
nm_active_connection_clear_secrets (NM_ACTIVE_CONNECTION (req));
|
||||||
|
|
||||||
|
applied_connection = nm_act_request_get_applied_connection (req);
|
||||||
|
setting_name = nm_connection_need_secrets (applied_connection, &hints);
|
||||||
|
if (!setting_name) {
|
||||||
|
_LOGI (LOGD_DEVICE, "Cleared secrets, but setting didn't need any secrets.");
|
||||||
|
return NM_ACT_STAGE_RETURN_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hints)
|
||||||
|
g_ptr_array_add (hints, NULL);
|
||||||
|
|
||||||
|
_secrets_get_secrets (self,
|
||||||
|
setting_name,
|
||||||
|
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION
|
||||||
|
| (new_secrets ? NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW : 0),
|
||||||
|
( hints
|
||||||
|
? (const char *const*) hints->pdata
|
||||||
|
: NULL));
|
||||||
|
return NM_ACT_STAGE_RETURN_POSTPONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static NMActStageReturn
|
||||||
|
link_config (NMDeviceWireGuard *self,
|
||||||
|
gboolean allow_rate_limit,
|
||||||
|
gboolean fail_state_on_failure,
|
||||||
|
const char *reason,
|
||||||
|
NMDeviceStateReason *out_failure_reason)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
NMSettingWireGuard *s_wg;
|
||||||
|
NMConnection *connection;
|
||||||
|
NMActStageReturn ret;
|
||||||
|
const char *setting_name;
|
||||||
|
NMDeviceStateReason failure_reason;
|
||||||
|
int ifindex;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
connection = nm_device_get_applied_connection (NM_DEVICE (self));
|
||||||
|
s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIREGUARD));
|
||||||
|
g_return_val_if_fail (s_wg, NM_ACT_STAGE_RETURN_FAILURE);
|
||||||
|
|
||||||
|
setting_name = nm_connection_need_secrets (connection, NULL);
|
||||||
|
if (setting_name) {
|
||||||
|
NMActRequest *req = nm_device_get_act_request (NM_DEVICE (self));
|
||||||
|
|
||||||
|
_LOGD (LOGD_DEVICE,
|
||||||
|
"Activation: connection '%s' has security, but secrets are required.",
|
||||||
|
nm_connection_get_id (connection));
|
||||||
|
|
||||||
|
ret = _secrets_handle_auth_or_fail (self, req, FALSE);
|
||||||
|
if (ret == NM_ACT_STAGE_RETURN_POSTPONE)
|
||||||
|
return ret;
|
||||||
|
if (ret != NM_ACT_STAGE_RETURN_SUCCESS) {
|
||||||
|
failure_reason = NM_DEVICE_STATE_REASON_NO_SECRETS;
|
||||||
|
goto out_ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ifindex = nm_device_get_ip_ifindex (NM_DEVICE (self));
|
||||||
|
if (ifindex <= 0) {
|
||||||
|
failure_reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED;
|
||||||
|
goto out_ret_fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
priv->lnk_want = (NMPlatformLnkWireGuard) {
|
||||||
|
.listen_port = nm_setting_wireguard_get_listen_port (s_wg),
|
||||||
|
.fwmark = nm_setting_wireguard_get_fwmark (s_wg),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (!_nm_utils_wireguard_decode_key (nm_setting_wireguard_get_private_key (s_wg),
|
||||||
|
sizeof (priv->lnk_want.private_key),
|
||||||
|
priv->lnk_want.private_key)) {
|
||||||
|
_LOGD (LOGD_DEVICE, "the provided private-key is invalid");
|
||||||
|
failure_reason = NM_DEVICE_STATE_REASON_NO_SECRETS;
|
||||||
|
goto out_ret_fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = nm_platform_link_wireguard_change (nm_device_get_platform (NM_DEVICE (self)),
|
||||||
|
ifindex,
|
||||||
|
&priv->lnk_want,
|
||||||
|
NULL,
|
||||||
|
0,
|
||||||
|
TRUE);
|
||||||
|
if (r < 0) {
|
||||||
|
failure_reason = NM_DEVICE_STATE_REASON_CONFIG_FAILED;
|
||||||
|
goto out_ret_fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
NM_SET_OUT (out_failure_reason, NM_DEVICE_STATE_REASON_NONE);
|
||||||
|
return NM_ACT_STAGE_RETURN_SUCCESS;
|
||||||
|
|
||||||
|
out_ret_fail:
|
||||||
|
ret = NM_ACT_STAGE_RETURN_FAILURE;
|
||||||
|
out_ret:
|
||||||
|
NM_SET_OUT (out_failure_reason, failure_reason);
|
||||||
|
if (fail_state_on_failure) {
|
||||||
|
nm_device_state_changed (NM_DEVICE (self),
|
||||||
|
NM_DEVICE_STATE_FAILED,
|
||||||
|
failure_reason);
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static NMActStageReturn
|
||||||
|
act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason)
|
||||||
|
{
|
||||||
|
return link_config (NM_DEVICE_WIREGUARD (device), FALSE, TRUE, "configure", out_failure_reason);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
device_state_changed (NMDevice *device,
|
||||||
|
NMDeviceState new_state,
|
||||||
|
NMDeviceState old_state,
|
||||||
|
NMDeviceStateReason reason)
|
||||||
|
{
|
||||||
|
if (new_state <= NM_DEVICE_STATE_ACTIVATED)
|
||||||
|
return;
|
||||||
|
|
||||||
|
_secrets_cancel (NM_DEVICE_WIREGUARD (device));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void
|
||||||
|
update_connection (NMDevice *device, NMConnection *connection)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (device);
|
||||||
|
NMSettingWireGuard *s_wg = NM_SETTING_WIREGUARD (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIREGUARD));
|
||||||
|
|
||||||
|
if (!s_wg) {
|
||||||
|
s_wg = NM_SETTING_WIREGUARD (nm_setting_wireguard_new ());
|
||||||
|
nm_connection_add_setting (connection, NM_SETTING (s_wg));
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_set (s_wg,
|
||||||
|
NM_SETTING_WIREGUARD_FWMARK,
|
||||||
|
(guint) priv->lnk_curr.fwmark,
|
||||||
|
NM_SETTING_WIREGUARD_LISTEN_PORT,
|
||||||
|
(guint) priv->lnk_curr.listen_port,
|
||||||
|
NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
get_property (GObject *object, guint prop_id,
|
get_property (GObject *object, guint prop_id,
|
||||||
GValue *value, GParamSpec *pspec)
|
GValue *value, GParamSpec *pspec)
|
||||||
{
|
{
|
||||||
NMDeviceWireGuard *self = NM_DEVICE_WIREGUARD (object);
|
NMDeviceWireGuard *self = NM_DEVICE_WIREGUARD (object);
|
||||||
|
NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
case PROP_PUBLIC_KEY:
|
case PROP_PUBLIC_KEY:
|
||||||
g_value_take_variant (value, get_public_key_as_variant (self));
|
g_value_take_variant (value,
|
||||||
|
g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
|
||||||
|
priv->lnk_curr.public_key,
|
||||||
|
sizeof (priv->lnk_curr.public_key),
|
||||||
|
1));
|
||||||
break;
|
break;
|
||||||
case PROP_LISTEN_PORT:
|
case PROP_LISTEN_PORT:
|
||||||
g_value_set_uint (value, self->props.listen_port);
|
g_value_set_uint (value, priv->lnk_curr.listen_port);
|
||||||
break;
|
break;
|
||||||
case PROP_FWMARK:
|
case PROP_FWMARK:
|
||||||
g_value_set_uint (value, self->props.fwmark);
|
g_value_set_uint (value, priv->lnk_curr.fwmark);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
@@ -139,11 +413,35 @@ get_property (GObject *object, guint prop_id,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void
|
static void
|
||||||
nm_device_wireguard_init (NMDeviceWireGuard *self)
|
nm_device_wireguard_init (NMDeviceWireGuard *self)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
dispose (GObject *object)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuard *self = NM_DEVICE_WIREGUARD (object);
|
||||||
|
|
||||||
|
_secrets_cancel (self);
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (nm_device_wireguard_parent_class)->dispose (object);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
finalize (GObject *object)
|
||||||
|
{
|
||||||
|
NMDeviceWireGuard *self = NM_DEVICE_WIREGUARD (object);
|
||||||
|
NMDeviceWireGuardPrivate *priv = NM_DEVICE_WIREGUARD_GET_PRIVATE (self);
|
||||||
|
|
||||||
|
nm_explicit_bzero (priv->lnk_want.private_key, sizeof (priv->lnk_want.private_key));
|
||||||
|
nm_explicit_bzero (priv->lnk_curr.private_key, sizeof (priv->lnk_curr.private_key));
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (nm_device_wireguard_parent_class)->finalize (object);
|
||||||
|
}
|
||||||
|
|
||||||
static const NMDBusInterfaceInfoExtended interface_info_device_wireguard = {
|
static const NMDBusInterfaceInfoExtended interface_info_device_wireguard = {
|
||||||
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (
|
.parent = NM_DEFINE_GDBUS_INTERFACE_INFO_INIT (
|
||||||
NM_DBUS_INTERFACE_DEVICE_WIREGUARD,
|
NM_DBUS_INTERFACE_DEVICE_WIREGUARD,
|
||||||
@@ -163,13 +461,21 @@ nm_device_wireguard_class_init (NMDeviceWireGuardClass *klass)
|
|||||||
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
|
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
|
||||||
|
|
||||||
object_class->get_property = get_property;
|
object_class->get_property = get_property;
|
||||||
|
object_class->dispose = dispose;
|
||||||
|
object_class->finalize = finalize;
|
||||||
|
|
||||||
dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_wireguard);
|
dbus_object_class->interface_infos = NM_DBUS_INTERFACE_INFOS (&interface_info_device_wireguard);
|
||||||
|
|
||||||
device_class->connection_type_supported = NULL;
|
device_class->connection_type_supported = NM_SETTING_WIREGUARD_SETTING_NAME;
|
||||||
|
device_class->connection_type_check_compatible = NM_SETTING_WIREGUARD_SETTING_NAME;
|
||||||
device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_WIREGUARD);
|
device_class->link_types = NM_DEVICE_DEFINE_LINK_TYPES (NM_LINK_TYPE_WIREGUARD);
|
||||||
|
|
||||||
|
device_class->state_changed = device_state_changed;
|
||||||
|
device_class->create_and_realize = create_and_realize;
|
||||||
|
device_class->act_stage2_config = act_stage2_config;
|
||||||
|
device_class->get_generic_capabilities = get_generic_capabilities;
|
||||||
device_class->link_changed = link_changed;
|
device_class->link_changed = link_changed;
|
||||||
|
device_class->update_connection = update_connection;
|
||||||
|
|
||||||
obj_properties[PROP_PUBLIC_KEY] =
|
obj_properties[PROP_PUBLIC_KEY] =
|
||||||
g_param_spec_variant (NM_DEVICE_WIREGUARD_PUBLIC_KEY,
|
g_param_spec_variant (NM_DEVICE_WIREGUARD_PUBLIC_KEY,
|
||||||
@@ -214,6 +520,7 @@ create_device (NMDeviceFactory *factory,
|
|||||||
}
|
}
|
||||||
|
|
||||||
NM_DEVICE_FACTORY_DEFINE_INTERNAL (WIREGUARD, WireGuard, wireguard,
|
NM_DEVICE_FACTORY_DEFINE_INTERNAL (WIREGUARD, WireGuard, wireguard,
|
||||||
NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_WIREGUARD),
|
NM_DEVICE_FACTORY_DECLARE_LINK_TYPES (NM_LINK_TYPE_WIREGUARD)
|
||||||
|
NM_DEVICE_FACTORY_DECLARE_SETTING_TYPES (NM_SETTING_WIREGUARD_SETTING_NAME),
|
||||||
factory_class->create_device = create_device;
|
factory_class->create_device = create_device;
|
||||||
)
|
)
|
||||||
|
@@ -4363,8 +4363,7 @@ realize_start_setup (NMDevice *self,
|
|||||||
* NetworkManager might down the interface or remove the 127.0.0.1 address. */
|
* NetworkManager might down the interface or remove the 127.0.0.1 address. */
|
||||||
nm_device_set_unmanaged_flags (self,
|
nm_device_set_unmanaged_flags (self,
|
||||||
NM_UNMANAGED_BY_TYPE,
|
NM_UNMANAGED_BY_TYPE,
|
||||||
is_loopback (self)
|
is_loopback (self));
|
||||||
|| NM_IS_DEVICE_WIREGUARD (self));
|
|
||||||
|
|
||||||
nm_device_set_unmanaged_by_user_udev (self);
|
nm_device_set_unmanaged_by_user_udev (self);
|
||||||
nm_device_set_unmanaged_by_user_conf (self);
|
nm_device_set_unmanaged_by_user_conf (self);
|
||||||
|
Reference in New Issue
Block a user