Skip to content

Commit e155b81

Browse files
Revert "Update sctp again; add config param to set sctp debug flags. (#2122)" (#2126)
This reverts commit 3767437.
1 parent 0f44540 commit e155b81

File tree

4 files changed

+2
-5
lines changed

4 files changed

+2
-5
lines changed

jvb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>${project.groupId}</groupId>
110110
<artifactId>jitsi-sctp</artifactId>
111-
<version>1.0-23-ge04a9c9</version>
111+
<version>1.0-21-gfe0d028</version>
112112
</dependency>
113113
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
114114
<!-- 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. -->

jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class SctpManager
6262
classLogger.info("Initializing Sctp4j");
6363
// "If UDP encapsulation is not necessary, the UDP port has to be set to 0"
6464
// All our SCTP is encapsulated in DTLS, we don't use direct UDP encapsulation.
65-
Sctp4j.init(0, config.getDebugMask());
65+
Sctp4j.init(0);
6666
}
6767
else
6868
{

jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import org.jitsi.metaconfig.config
2121

2222
class SctpConfig private constructor() {
2323
val enabled: Boolean by config { "videobridge.sctp.enabled".from(JitsiConfig.newConfig) }
24-
val debugMask: Int by config { "videobridge.sctp.debug-mask".from(JitsiConfig.newConfig) }
2524

2625
fun enabled() = enabled
2726

jvb/src/main/resources/reference.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,6 @@ videobridge {
219219
sctp {
220220
// Whether SCTP data channels are enabled.
221221
enabled = true
222-
// Debug mask of categories to enable in usrsctp. 0 for none, -1 for all, otherwise see usrsctp source
223-
debug-mask = 0
224222
}
225223
stats {
226224
// The interval at which stats are gathered.

0 commit comments

Comments
 (0)