- client session wasn't set properly

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/VoiceConfCallStateEvtMsgHdlr.scala

@@ -29,7 +29,7 @@ trait VoiceConfCallStateEvtMsgHdlr {
     val body = VoiceCallStateEvtMsgBody(
       meetingId = liveMeeting.props.meetingProp.intId,
       voiceConf = msg.body.voiceConf,
-      clientSession = msg.body.callSession,
+      clientSession = msg.body.clientSession,
       userId = msg.body.userId,
       callerName = msg.body.callerName,
       callState = msg.body.callState

akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java

@@ -80,10 +80,17 @@ public class ESLEventListener implements IEslEventListener {
             ScreenshareStartedEvent dsStart = new ScreenshareStartedEvent(confName, callerId, callerIdName);
             conferenceEventListener.handleConferenceEvent(dsStart);
         } else {
+            String coreuuid = headers.get("Core-UUID");
+            String callState = "IN_CONFERENCE";
+            String origCallerIdName = headers.get("Caller-Caller-ID-Name");
+            String origCallerDestNumber = headers.get("Caller-Destination-Number");
+            String clientSession = "0";
+
             Matcher matcher = CALLERNAME_PATTERN.matcher(callerIdName);
             Matcher callWithSess = CALLERNAME_WITH_SESS_INFO_PATTERN.matcher(callerIdName);
             if (callWithSess.matches()) {
                 voiceUserId = callWithSess.group(1).trim();
+                clientSession = callWithSess.group(2).trim();
                 callerIdName = callWithSess.group(3).trim();
             } else if (matcher.matches()) {
                 voiceUserId = matcher.group(1).trim();
@@ -95,11 +102,6 @@ public class ESLEventListener implements IEslEventListener {
                 voiceUserId = "v_" + memberId.toString();
             }
 
-            String coreuuid = headers.get("Core-UUID");
-            String clientSession = "0";
-            String callState = "IN_CONFERENCE";
-            String origCallerIdName = headers.get("Caller-Caller-ID-Name");
-            String origCallerDestNumber = headers.get("Caller-Destination-Number");
             VoiceCallStateEvent csEvent = new VoiceCallStateEvent(
                     confName,
                     coreuuid,