colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm-device-bt: allow Bluetooth NAP type for complete-connection

Browse Source 
Bluetooth NAP is besides Bluetooth PAN and DUN also supported by
NetworkManager. Add NAP to the supported Bluetooth types of
nm-device-bt.c

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/1058

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1320
This commit is contained in:
Dylan Van Assche
2022-07-28 19:55:32 +02:00
committed by Thomas Haller
parent 05825b0348
commit 0f3eb6fabb
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/devices/bluetooth/nm-device-bt.c
View File

@@ -262,6 +262,7 @@ complete_connection(NMDevice *device,
const char *ctype; const char *ctype;
gboolean is_dun = FALSE; gboolean is_dun = FALSE;
gboolean is_pan = FALSE; gboolean is_pan = FALSE;
gboolean is_nap = FALSE;
NMSettingGsm *s_gsm; NMSettingGsm *s_gsm;
NMSettingCdma *s_cdma; NMSettingCdma *s_cdma;
NMSettingSerial *s_serial; NMSettingSerial *s_serial;
@@ -281,6 +282,8 @@ complete_connection(NMDevice *device,
is_dun = TRUE; is_dun = TRUE;
else if (!strcmp(ctype, NM_SETTING_BLUETOOTH_TYPE_PANU)) else if (!strcmp(ctype, NM_SETTING_BLUETOOTH_TYPE_PANU))
is_pan = TRUE; is_pan = TRUE;
else if (!strcmp(ctype, NM_SETTING_BLUETOOTH_TYPE_NAP))
is_nap = TRUE;
} else { } else {
if (s_gsm || s_cdma) if (s_gsm || s_cdma)
is_dun = TRUE; is_dun = TRUE;
@@ -288,7 +291,27 @@ complete_connection(NMDevice *device,
is_pan = TRUE; is_pan = TRUE;
} }
if (is_pan) { if (is_nap) {
/* Make sure the device supports NAP */
if (!(priv->capabilities & NM_BT_CAPABILITY_NAP)) {
g_set_error_literal(error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("NAP requested, but Bluetooth device does not support NAP"));
g_prefix_error(error,
"%s.%s: ",
NM_SETTING_BLUETOOTH_SETTING_NAME,
NM_SETTING_BLUETOOTH_TYPE);
return FALSE;
}
g_object_set(G_OBJECT(s_bt),
NM_SETTING_BLUETOOTH_TYPE,
NM_SETTING_BLUETOOTH_TYPE_NAP,
NULL);
fallback_prefix = _("NAP connection");
} else if (is_pan) {
/* Make sure the device supports PAN */ /* Make sure the device supports PAN */
if (!(priv->capabilities & NM_BT_CAPABILITY_NAP)) { if (!(priv->capabilities & NM_BT_CAPABILITY_NAP)) {
g_set_error_literal(error, g_set_error_literal(error,