From 3c0493a295f6cc61ef7d6c40bd134d4affffeae2 Mon Sep 17 00:00:00 2001
From: prlanzarin <prlanzarin@inf.ufrgs.br>
Date: Mon, 21 Dec 2020 17:59:04 +0000
Subject: [PATCH] akka-fsesl: handle dial in/out users uIDs in
GetUsersStatusToVoiceConfSysMsg responses
The lack of handling to check whether the user was a dial-in user when answering akka-apps periodic member probes was making it use an arbitrary default (callerName) as the userId, explicitly violating the convention that dial-in/outs should have v_memberId userIds
That would botch whichever added janitorial tasks that operated upon akka-apps GetUsersStatusToVoiceConfSysMsg probes
---
.../voice/freeswitch/actions/GetUsersStatusCommand.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetUsersStatusCommand.java b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetUsersStatusCommand.java
index 6c520c36d9..1d5c6ac8ea 100755
--- a/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetUsersStatusCommand.java
+++ b/akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/actions/GetUsersStatusCommand.java
@@ -85,10 +85,12 @@ public class GetUsersStatusCommand extends FreeswitchCommand {
voiceUserId = callWithSess.group(1).trim();
clientSession = callWithSess.group(2).trim();
callerIdName = callWithSess.group(3).trim();
- } else
- if (matcher.matches()) {
+ } else if (matcher.matches()) {
voiceUserId = matcher.group(1).trim();
callerIdName = matcher.group(2).trim();
+ } else {
+ // This is a caller using dial in or out
+ voiceUserId = "v_" + member.getId().toString();
}
log.info("Conf user. uuid=" + uuid
--
GitLab