From c7c7e97ace3c1e398d7adf85b35643fcc2f6c0c4 Mon Sep 17 00:00:00 2001
From: Jonathan Lennox <jonathan.lennox@8x8.com>
Date: Mon, 22 Apr 2024 09:59:24 -0400
Subject: [PATCH] Revert "Update sctp again; add config param to set sctp debug
 flags. (#2122)"

This reverts commit 37674374c7b2fd20b701d54afa18d94ec42c5fee.
---
 jvb/pom.xml                                                   | 2 +-
 jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java | 2 +-
 jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt  | 1 -
 jvb/src/main/resources/reference.conf                         | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/jvb/pom.xml b/jvb/pom.xml
index c5479f7d5e..7cf98e8893 100644
--- a/jvb/pom.xml
+++ b/jvb/pom.xml
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-sctp</artifactId>
-      <version>1.0-23-ge04a9c9</version>
+      <version>1.0-21-gfe0d028</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
     <!-- we inherit an old version of slf4j-api from tinder, which pcap4j doesn't work with. Adding slf4j-api 1.7.30 (the current stable) as a dep of jvb fixes the problem. -->
diff --git a/jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java b/jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java
index af7f71a1b8..72e0cacce8 100644
--- a/jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java
+++ b/jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java
@@ -62,7 +62,7 @@ public class SctpManager
             classLogger.info("Initializing Sctp4j");
             // "If UDP encapsulation is not necessary, the UDP port has to be set to 0"
             // All our SCTP is encapsulated in DTLS, we don't use direct UDP encapsulation.
-            Sctp4j.init(0, config.getDebugMask());
+            Sctp4j.init(0);
         }
         else
         {
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt
index 4293cfdc62..ffed0aad65 100644
--- a/jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt
+++ b/jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt
@@ -21,7 +21,6 @@ import org.jitsi.metaconfig.config
 
 class SctpConfig private constructor() {
     val enabled: Boolean by config { "videobridge.sctp.enabled".from(JitsiConfig.newConfig) }
-    val debugMask: Int by config { "videobridge.sctp.debug-mask".from(JitsiConfig.newConfig) }
 
     fun enabled() = enabled
 
diff --git a/jvb/src/main/resources/reference.conf b/jvb/src/main/resources/reference.conf
index 43d9b37afa..94eaeddb0e 100644
--- a/jvb/src/main/resources/reference.conf
+++ b/jvb/src/main/resources/reference.conf
@@ -219,8 +219,6 @@ videobridge {
   sctp {
     // Whether SCTP data channels are enabled.
     enabled = true
-    // Debug mask of categories to enable in usrsctp.  0 for none, -1 for all, otherwise see usrsctp source
-    debug-mask = 0
   }
   stats {
     // The interval at which stats are gathered.