Merge pull request #122 from mconf/v2.4.4-dev

 Addresses #109 and closes 2.4.4

config/custom-environment-variables.yml

@@ -47,3 +47,7 @@ conference-media-specs:
 
 videoSubscriberSpecSlave: VIDEO_SUBSCRIBER_SLAVE
 screenshareSubscriberSpecSlave: SCREENSHARE_SUBSCRIBER_SLAVE
+
+kurentoAllowedCandidateIps:
+  __name: KURENTO_ALLOWED_CANDIDATE_IPS
+  __format: json

config/default.example.yml

@@ -166,3 +166,8 @@ kurentoRembParams:
   upLosses: 12
   decrementFactor: 0.5
   thresholdFactor: 0.8
+# Optional configuration. List of VALID IPs to be used to define valid outbound ICE candidates.
+# This is a short-term optimization to reduce the number of candidate sent to
+# the client by filtering out anything that isn't in this list
+kurentoAllowedCandidateIps:
+  #- <ipv4|ipv6>

lib/mcs-core/lib/adapters/kurento/kurento.js

@@ -13,6 +13,9 @@ const GLOBAL_EVENT_EMITTER = require('../../utils/emitter');
 const SDPMedia = require('../../model/sdp-media');
 const RecordingMedia = require('../../model/recording-media');
 const KURENTO_REMB_PARAMS = config.get('kurentoRembParams');
+const ALLOWED_CANDIDATE_IPS = config.has('kurentoAllowedCandidateIps')
+  ? config.get('kurentoAllowedCandidateIps')
+  : [];
 
 const LOG_PREFIX = "[mcs-kurento-adapter]";
 
@@ -936,6 +939,14 @@ module.exports = class Kurento extends EventEmitter {
     return;
   }
 
+  _shouldSendCandidate (candidate) {
+    if (ALLOWED_CANDIDATE_IPS == null || ALLOWED_CANDIDATE_IPS.length <= 0) {
+      return true;
+    }
+
+    return ALLOWED_CANDIDATE_IPS.some(ip => candidate.includes(ip));
+  }
+
   addMediaEventListener (eventTag, elementId) {
     const mediaElement = this._mediaElements[elementId];
     let event = {};
@@ -945,6 +956,9 @@ module.exports = class Kurento extends EventEmitter {
         mediaElement.on(eventTag, (e) => {
           switch (eventTag) {
             case C.EVENT.MEDIA_STATE.ICE:
+              if (!this._shouldSendCandidate(e.candidate.candidate)) {
+                return;
+              }
               event.candidate = KMS_CLIENT.getComplexType('IceCandidate')(e.candidate);
               event.elementId = elementId;
               this.emit(C.EVENT.MEDIA_STATE.ICE+elementId, event);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bbb-webrtc-sfu",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "private": true,
   "scripts": {
     "start": "node server.js",