From 958eaee41d68b468f994b61fcce428ee0fe88f58 Mon Sep 17 00:00:00 2001 From: cruizba Date: Mon, 30 May 2022 20:40:10 +0200 Subject: [PATCH] openvidu-server: Check nulls before setting default ICE servers in customIceServers --- .../server/core/SessionEventsHandler.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java b/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java index 81da1910..d74af855 100644 --- a/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java +++ b/openvidu-server/src/main/java/io/openvidu/server/core/SessionEventsHandler.java @@ -189,9 +189,18 @@ public class SessionEventsHandler { result.addProperty(ProtocolElements.PARTICIPANTJOINED_COTURNIP_PARAM, coturnIp); result.addProperty(ProtocolElements.PARTICIPANTJOINED_COTURNPORT_PARAM, openviduConfig.getCoturnPort()); - List customIceServers = participant.getToken().getCustomIceServers(); + if (participant.getToken().getTurnCredentials() != null) { + result.addProperty(ProtocolElements.PARTICIPANTJOINED_TURNUSERNAME_PARAM, + participant.getToken().getTurnCredentials().getUsername()); + result.addProperty(ProtocolElements.PARTICIPANTJOINED_TURNCREDENTIAL_PARAM, + participant.getToken().getTurnCredentials().getCredential()); + } - if (customIceServers == null || customIceServers.isEmpty()) { + List customIceServers = participant.getToken().getCustomIceServers(); + if (customIceServers != null && !customIceServers.isEmpty()) { + result.add(ProtocolElements.PARTICIPANTJOINED_CUSTOM_ICE_SERVERS, + participant.getToken().getCustomIceServersAsJson()); + } else if (coturnIp != null && participant.getToken().getTurnCredentials() != null) { JsonArray defaultCustomIceServers = new JsonArray(); IceServerProperties defaultIceServer = new IceServerProperties.Builder() .url("turn:" + coturnIp + ":" + openviduConfig.getCoturnPort()) @@ -199,15 +208,6 @@ public class SessionEventsHandler { .credential(participant.getToken().getTurnCredentials().getCredential()) .build(); defaultCustomIceServers.add(defaultIceServer.toJson()); - } else { - result.add(ProtocolElements.PARTICIPANTJOINED_CUSTOM_ICE_SERVERS, - participant.getToken().getCustomIceServersAsJson()); - } - if (participant.getToken().getTurnCredentials() != null) { - result.addProperty(ProtocolElements.PARTICIPANTJOINED_TURNUSERNAME_PARAM, - participant.getToken().getTurnCredentials().getUsername()); - result.addProperty(ProtocolElements.PARTICIPANTJOINED_TURNCREDENTIAL_PARAM, - participant.getToken().getTurnCredentials().getCredential()); } if (recording != null) { result.addProperty(ProtocolElements.PARTICIPANTJOINED_RECORDINGID_PARAM, recording.getId());