diff options
| -rw-r--r-- | audio/avdtp.c | 4 | ||||
| -rw-r--r-- | audio/control.c | 4 | ||||
| -rw-r--r-- | audio/manager.c | 4 | ||||
| -rw-r--r-- | network/server.c | 5 |
4 files changed, 7 insertions, 10 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c index c215ca24..c3286bfc 100644 --- a/audio/avdtp.c +++ b/audio/avdtp.c @@ -2773,9 +2773,7 @@ drop: static GIOChannel *avdtp_server_socket(gboolean master) { - int lm; - - lm = L2CAP_LM_SECURE; + int lm = L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT; if (master) lm |= L2CAP_LM_MASTER; diff --git a/audio/control.c b/audio/control.c index 82646061..a1014d48 100644 --- a/audio/control.c +++ b/audio/control.c @@ -705,10 +705,8 @@ drop: static GIOChannel *avctp_server_socket(gboolean master) { - int lm; GIOChannel *io; - - lm = L2CAP_LM_SECURE; + int lm = L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT; if (master) lm |= L2CAP_LM_MASTER; diff --git a/audio/manager.c b/audio/manager.c index 5a363f9c..ef8056de 100644 --- a/audio/manager.c +++ b/audio/manager.c @@ -565,7 +565,7 @@ static int headset_server_init(struct audio_adapter *adapter) hfp = tmp; } - flags = RFCOMM_LM_SECURE; + flags = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT; if (master) flags |= RFCOMM_LM_MASTER; @@ -641,7 +641,7 @@ static int gateway_server_init(struct audio_adapter *adapter) master = tmp; } - flags = RFCOMM_LM_SECURE; + flags = RFCOMM_LM_AUTH | RFCOMM_LM_ENCRYPT; if (master) flags |= RFCOMM_LM_MASTER; diff --git a/network/server.c b/network/server.c index aafdd4fc..606cfc7c 100644 --- a/network/server.c +++ b/network/server.c @@ -873,9 +873,10 @@ static GDBusSignalTable server_signals[] = { static struct network_adapter *create_adapter(const char *path, bdaddr_t *src) { struct network_adapter *na; - int lm; + int lm = 0; - lm = security ? L2CAP_LM_SECURE : 0; + if (security) + lm |= L2CAP_LM_AUTH | L2CAP_LM_ENCRYPT; na = g_new0(struct network_adapter, 1); na->path = g_strdup(path); |