Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update sctp again; add config param to set sctp debug flags. (#2122)" #2126

Merged
merged 1 commit into from
Apr 22, 2024
Merged

Revert "Update sctp again; add config param to set sctp debug flags. (#2122)" #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jvb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down
2 changes: 1 addition & 1 deletion jvb/src/main/java/org/jitsi/videobridge/sctp/SctpManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 0 additions & 1 deletion jvb/src/main/kotlin/org/jitsi/videobridge/sctp/SctpConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions jvb/src/main/resources/reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading