[pull] master from jitsi:master

.editorconfig

@@ -1,5 +1,10 @@
 [*.{kt,kts}]
-# Comma-separated list of rules to disable (Since 0.34.0)
-# Note that rules in any ruleset other than the standard ruleset will need to be prefixed 
-# by the ruleset identifier.
 max_line_length=120
+ktlint_code_style = intellij_idea
+
+# I find trailing commas annoying
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+
+# This forbids underscores in package names, which we use
+ktlint_standard_package-name = disabled

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directories: 
+      - "/"
+      - "/rtp"
+      - "/jitsi-media-transform"
+      - "/jvb"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10

CONFIG.md

@@ -57,10 +57,6 @@ This list will be updated as properties are migrated:
 | org.jitsi.videobridge.rest.COLIBRI_WS_DOMAIN | videobridge.websockets.domain | |
 | org.jitsi.videobridge.rest.COLIBRI_WS_TLS | videobridge.websockets.tls | |
 | org.jitsi.videobridge.rest.COLIBRI_WS_SERVER_ID | videobridge.websockets.server-id | |
-| org.jitsi.videobridge.DISABLE_TCP_HARVESTER | videobridge.ice.tcp.enabled | The semantics of this property have been inverted (disable -> enable) |
-| org.jitsi.videobridge.TCP_HARVESTER_SSLTCP | videobridge.ice.tcp.ssltcp | |
-| org.jitsi.videobridge.TCP_HARVESTER_PORT | videobridge.ice.tcp.port | |
-| org.jitsi.videobridge.TCP_HARVESTER_MAPPED_PORT | videobridge.ice.tcp.mapped-port | |
 | org.jitsi.videobridge.SINGLE_PORT_HARVESTER_PORT | videobridge.ice.udp.port | |
 | org.jitsi.videobridge.ICE_UFRAG_PREFIX | videobridge.ice.ufrag-prefix | |
 | org.jitsi.videobridge.KEEP_ALIVE_STRATEGY | videobridge.ice.keep-alive-strategy | |

README.md

@@ -34,7 +34,7 @@ JVB_CONFIG_DIR_LOCATION="~/"
 JVB_CONFIG_DIR_NAME=".jvb"
 JVB_CONFIG_FILE="$JVB_CONFIG_DIR_LOCATION/$JVB_JVB_CONFIG_DIR_NAME/jvb.conf"
 
-mvn compile exec:exec -Dexec.executable=java -Dexec.args="-cp %classpath org.jitsi.videobridge.MainKt -Djava.library.path=$JVB_HOME/lib/native/linux-64 -Djava.util.logging.config.file=$JVB_HOME/lib/logging.properties -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=$JVB_CONFIG_DIR_LOCATION -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=$JVB_CONFIG_DIR_NAME -Dconfig.file=$JVB_CONFIG_.FILE"
+mvn compile exec:exec -Dexec.executable=java -Dexec.args="-cp %classpath org.jitsi.videobridge.MainKt -Djava.library.path=$JVB_HOME/lib/native/linux-64 -Djava.util.logging.config.file=$JVB_HOME/lib/logging.properties -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=$JVB_CONFIG_DIR_LOCATION -Dnet.java.sip.communicator.SC_HOME_DIR_NAME=$JVB_CONFIG_DIR_NAME -Dconfig.file=$JVB_CONFIG_FILE"
 ```
 
 # Configuration

SECURITY.md

@@ -1,9 +1,9 @@
 # Security
 
-## Reporting security issuess
+## Reporting security issues
 
 We take security very seriously and develop all Jitsi projects to be secure and safe.
 
-If you find (or simply suspect) a security issue in any of the Jitsi projects, please send us an email to security@jitsi.org.
+If you find (or simply suspect) a security issue in any of the Jitsi projects, please report it to us via [HackerOne](https://hackerone.com/8x8-bounty) or send us an email to security@jitsi.org.
 
 **We encourage responsible disclosure for the sake of our users, so please reach out before posting in a public space.**

debian/control

@@ -3,16 +3,17 @@ Section: net
 Priority: extra
 Maintainer: Jitsi Team <dev@jitsi.org>
 Uploaders: Emil Ivov <emcho@jitsi.org>, Damian Minkov <damencho@jitsi.org>
-Build-Depends: debhelper (>= 9), dh-systemd, java8-runtime-headless | java8-runtime | java11-runtime-headless | java11-runtime, maven
+Build-Depends: debhelper (>= 9), dh-systemd, openjdk-11-jdk | openjdk-17-jdk, maven
 Standards-Version: 3.9.3
 Homepage: https://jitsi.org/videobridge
 
 Package: jitsi-videobridge2
 Replaces: jitsi-videobridge
 Conflicts: jitsi-videobridge (<= 1400-1)
 Architecture: all
-Pre-Depends: openjdk-11-jre-headless | openjdk-11-jre | java11-runtime-headless | java11-runtime, libssl3 | libssl1.1
+Pre-Depends: openjdk-11-jre-headless | openjdk-11-jre | openjdk-17-jre-headless | openjdk-17-jre, libssl3 | libssl1.1
 Depends: ${misc:Depends}, procps, uuid-runtime, ruby-hocon
+Recommends: libpcap0.8
 Description: WebRTC compatible Selective Forwarding Unit (SFU)
  Jitsi Videobridge is a WebRTC compatible Selective Forwarding Unit
  (SFU) for multiuser video communication. It is an essential part

debian/postinst

@@ -124,6 +124,12 @@ case "$1" in
             sed -i 's/.*--apis.*//' $CONFIG
         fi
 
+        # dcsctp4j isn't built for ppc64el, so use usrsctp there if no explicit option has been set.
+        DEBARCH=$(dpkg --print-architecture)
+        if [ "$DEBARCH" = "ppc64el" ] && ! hocon -f $HOCON_CONFIG get "videobridge.sctp.use-usrsctp" > /dev/null 2>&1 ;then
+            hocon -f $HOCON_CONFIG set "videobridge.sctp.use-usrsctp" "true"
+        fi
+
         # we don't want to start the daemon as root
         if ! getent group jitsi > /dev/null ; then
             groupadd jitsi

doc/constraints.md

@@ -12,16 +12,3 @@ higher than the specified need not be transmitted for a specific video source:
   "maxHeight": 180
 }
 ```
-
-The legacy format prior to the multi-stream support was endpoint scoped. This message is still sent to old clients, but
-will be removed in the future.
-
-```
-{
-  "colibriClass": "SenderVideoConstraints",
-  "videoConstraints": {
-    "idealHeight": 180
-  }
-}
-```
-

doc/debugging.md

@@ -197,10 +197,10 @@ allow it by setting `jmt.debug.pcap.enabled=true` in `/etc/jitsi/videobridge/jvb
 
 Enable:
 ```
-POST /debug/stats/endpoint/CONFERENCE_ID/ENDPOINT_ID/pcap-dump/true
+POST /debug/features/endpoint/CONFERENCE_ID/ENDPOINT_ID/pcap-dump/true
 ```
 
 Disable:
 ```
-POST /debug/stats/endpoint/CONFERENCE_ID/ENDPOINT_ID/pcap-dump/false
+POST /debug/features/endpoint/CONFERENCE_ID/ENDPOINT_ID/pcap-dump/false
 ```

doc/relay.md

@@ -2,8 +2,8 @@
 
 ### Relays
 Relays (aka secure octo) use ICE and DTLS/SRTP between each pair of bridges, so a secure
-network is not required. It uses and requires colibri websockets for the
-bridge-bridge connections (endpoints can still use SCTP).
+network is not required. It uses and requires either SCTP or colibri websockets for the
+bridge-bridge connections.
 
 ## Jitsi Videobridge configuration
 

doc/statistics.md

@@ -121,7 +121,6 @@ connection.
 * `total_ice_failed` - total number of endpoints which failed to establish an ICE connection.
 * `total_ice_succeeded` - total number of endpoints which successfully established an ICE connection.
 * `total_ice_succeeded_relayed` - total number of endpoints which connected through a TURN relay (currently broken).
-* `total_ice_succeeded_tcp` - total number of endpoints which connected through via ICE/TCP (currently broken).
 * `total_packets_dropped_octo` - total number of packets dropped on the `octo` channel.
 * `total_packets_received` - total number of RTP packets received.
 * `total_packets_received_octo` - total number packets received on the `octo` channel.

jitsi-media-transform/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.jitsi</groupId>
         <artifactId>jvb-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.3-SNAPSHOT</version>
     </parent>
 
     <groupId>org.jitsi</groupId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>jitsi-srtp</artifactId>
-            <version>1.1-12-ga64adcc</version>
+            <version>1.1-18-g98e4c5d</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -55,17 +55,17 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bctls-jdk15on</artifactId>
+            <artifactId>bctls-jdk18on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
+            <artifactId>bcprov-jdk18on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
+            <artifactId>bcpkix-jdk18on</artifactId>
             <version>${bouncycastle.version}</version>
         </dependency>
         <dependency>
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>io.pkts</groupId>
             <artifactId>pkts-core</artifactId>
-            <version>3.0.3</version>
+            <version>3.0.10</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -115,10 +115,19 @@
             <version>${kotest.version}</version>
             <scope>test</scope>
         </dependency>
+        <!-- Specify this dependency here because kotest needs it, and otherwise an older
+             version will be pulled in -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.mockk</groupId>
-            <artifactId>mockk</artifactId>
-            <version>1.12.4</version>
+            <artifactId>mockk-jvm</artifactId>
+            <version>${mockk.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -165,7 +174,7 @@
                 <!-- To try and get both java and kotlin sources in the sources jar -->
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -229,8 +238,11 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>3.2.5</version>
                 <configuration>
+                    <systemPropertyVariables>
+                        <kotest.framework.classpath.scanning.autoscan.disable>true</kotest.framework.classpath.scanning.autoscan.disable>
+                    </systemPropertyVariables>
                     <excludes>
                         <!-- init() currently throws an exception -->
                         <exclude>DtlsStackTest.*</exclude>
@@ -240,7 +252,7 @@
             <plugin>
                 <groupId>com.github.gantsign.maven</groupId>
                 <artifactId>ktlint-maven-plugin</artifactId>
-                <version>1.13.1</version>
+                <version>${ktlint-maven-plugin.version}</version>
                 <configuration>
                     <sourceRoots>
                        <sourceRoot>${project.basedir}/src/main/kotlin</sourceRoot>
@@ -276,7 +288,7 @@
           <plugin>
               <groupId>com.github.spotbugs</groupId>
               <artifactId>spotbugs-maven-plugin</artifactId>
-              <version>4.7.0.0</version>
+              <version>4.8.5.0</version>
               <configuration>
                   <excludeFilterFile>${project.basedir}/spotbugs-exclude.xml</excludeFilterFile>
                   <includeTests>true</includeTests>

jitsi-media-transform/spotbugs-exclude.xml

@@ -34,6 +34,8 @@
     <Bug pattern="NP_NULL_ON_SOME_PATH"/>
     <!-- False positives with lazy vals -->
     <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
+    <!-- False positives with lazy vals -->
+    <Bug pattern="BC_IMPOSSIBLE_INSTANCEOF"/>
     <!-- False positives with Kotlin inlines -->
     <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
 

jitsi-media-transform/src/main/java/org/jitsi_modified/impl/neomedia/rtp/remotebitrateestimator/AimdRateControl.java

@@ -64,11 +64,6 @@ class AimdRateControl
 
     private boolean bitrateIsInitialized;
 
-    /**
-     * the number of time we've expired the initial incoming estimate.
-     */
-    private int incomingBitrateExpirations = 0;
-
     private long currentBitrateBps;
 
     private final RateControlInput currentInput
@@ -351,14 +346,6 @@ public boolean isTimeToReduceFurther(long timeNow, long incomingBitrateBps)
         return false;
     }
 
-    /**
-     * @return the number of time we've expired the initial incoming estimate.
-     */
-    public int getIncomingEstimateExpirations()
-    {
-        return incomingBitrateExpirations;
-    }
-
     /**
      * Returns <tt>true</tt> if there is a valid estimate of the incoming
      * bitrate, <tt>false</tt> otherwise.
@@ -465,8 +452,6 @@ public void update(RateControlInput input, long nowMs)
                     {
                         timeFirstIncomingEstimate = -1L;
                     }
-
-                    incomingBitrateExpirations++;
                 }
                 else if (timeSinceFirstIncomingEstimate > kInitializationTimeMs
                     && input.incomingBitRate > 0L)

jitsi-media-transform/src/main/java/org/jitsi_modified/impl/neomedia/rtp/remotebitrateestimator/BandwidthUsage.java

@@ -20,7 +20,7 @@
  *
  * @author Lyubomir Marinov
  */
-enum BandwidthUsage
+public enum BandwidthUsage
 {
     kBwNormal(0), kBwUnderusing(-1), kBwOverusing(1);
 

jitsi-media-transform/src/main/java/org/jitsi_modified/impl/neomedia/rtp/remotebitrateestimator/OveruseDetector.java

@@ -195,4 +195,9 @@ private void updateThreshold(double modifiedOffset, long nowMs)
 
         lastUpdateMs = nowMs;
     }
+
+    public double getThreshold()
+    {
+        return threshold;
+    }
 }