Add property notify to IConnection interface with default no-op

Red5 · Jan 17, 2025 · f956555 · f956555
1 parent f9de7e7
commit f956555
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 20 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-client</artifactId>

diff --git a/client/src/main/java/org/red5/client/Red5Client.java b/client/src/main/java/org/red5/client/Red5Client.java
@@ -18,7 +18,7 @@ public final class Red5Client {
     /**
      * Current server version with revision
      */
-    public static final String VERSION = "Red5 Client 2.0.12";
+    public static final String VERSION = "Red5 Client 2.0.13";
 
     /**
      * Create a new Red5Client object using the connection local to the current thread A bit of magic that lets you access the red5 scope

diff --git a/common/pom.xml b/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server-common</artifactId>
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>net.engio</groupId>
             <artifactId>mbassador</artifactId>
-            <version>2.0.12</version>
+            <version>2.0.13</version>
         </dependency> -->
         <dependency>
             <groupId>junit</groupId>

diff --git a/common/src/main/java/org/red5/server/api/IConnection.java b/common/src/main/java/org/red5/server/api/IConnection.java
@@ -7,6 +7,7 @@
 
 package org.red5.server.api;
 
+import java.beans.PropertyChangeEvent;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -302,4 +303,13 @@ static enum Type {
      */
     String getProtocol();
 
+    /**
+     * Notifies listeners of a property change.
+     *
+     * @param evt PropertyChangeEvent containing details
+     */
+    default void notifyPropertyChanged(PropertyChangeEvent evt) {
+        // no-op
+    }
+
 }
diff --git a/common/src/main/java/org/red5/server/api/Red5.java b/common/src/main/java/org/red5/server/api/Red5.java
@@ -57,12 +57,12 @@ public final class Red5 {
     /**
      * Server version with revision
      */
-    public static final String VERSION = "Red5 Server 2.0.12";
+    public static final String VERSION = "Red5 Server 2.0.13";
 
     /**
      * Server version for fmsVer requests
      */
-    public static final String FMS_VERSION = "RED5/2,0,12,0";
+    public static final String FMS_VERSION = "RED5/2,0,13,0";
 
     /**
      * Server capabilities

diff --git a/io/pom.xml b/io/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-io</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <name>Red5</name>
     <description>The Red5 server</description>
     <groupId>org.red5</groupId>
-    <version>2.0.12</version>
+    <version>2.0.13</version>
     <url>https://github.com/Red5/red5-server</url>
     <inceptionYear>2005</inceptionYear>
     <organization>
@@ -101,17 +101,17 @@
         <red5-service.version>${project.version}</red5-service.version>
         <slf4j.version>2.0.13</slf4j.version>
         <logback.version>1.5.6</logback.version>
-        <bc.version>1.78.1</bc.version>
+        <bc.version>1.79</bc.version>
         <mina.version>2.0.23</mina.version>
         <spring.version>6.2.0</spring.version>
-        <tomcat.version>11.0.1</tomcat.version>
+        <tomcat.version>11.0.2</tomcat.version>
         <junit.version>[4.13.1,)</junit.version>
         <isoparser.version>1.9.59</isoparser.version>
         <ehcache.version>2.10.6</ehcache.version>
-        <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <commons-codec.version>1.17.1</commons-codec.version>
+        <commons-beanutils.version>1.10.0</commons-beanutils.version>
+        <commons-codec.version>1.17.2</commons-codec.version>
         <commons-collections.version>4.4</commons-collections.version>
-        <commons-io.version>2.17.0</commons-io.version>
+        <commons-io.version>2.18.0</commons-io.version>
         <commons-lang3.version>3.17.0</commons-lang3.version>
         <httpcore.version>[4.4.11,)</httpcore.version>
         <httpclient.version>[4.5.13,)</httpclient.version>

diff --git a/server/pom.xml b/server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

diff --git a/server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java b/server/src/main/java/org/red5/server/net/rtmp/InboundHandshake.java
@@ -78,7 +78,7 @@ public IoBuffer doHandshake(IoBuffer in) {
      */
     public IoBuffer decodeClientRequest1(IoBuffer in) {
         if (log.isTraceEnabled()) {
-            log.debug("decodeClientRequest1: {}", Hex.encodeHexString(in.array()));
+            log.trace("decodeClientRequest1: {}", Hex.encodeHexString(in.array()));
         }
         // copy into a new array to ensure the position is respected
         c1 = new byte[Constants.HANDSHAKE_SIZE];
@@ -175,7 +175,7 @@ public IoBuffer decodeClientRequest1(IoBuffer in) {
         if (useEncryption()) {
             switch (handshakeType) {
                 case RTMPConnection.RTMP_ENCRYPTED:
-                    log.debug("RTMPE type 6");
+                    log.debug("RTMPE type 6 - C1");
                     // we dont encrypt signatureResp for type 6
                     break;
                 case RTMPConnection.RTMP_ENCRYPTED_XTEA:
@@ -225,7 +225,7 @@ public IoBuffer decodeClientRequest1(IoBuffer in) {
      */
     public boolean decodeClientRequest2(IoBuffer in) {
         if (log.isTraceEnabled()) {
-            log.debug("decodeClientRequest2: {}", Hex.encodeHexString(in.array()));
+            log.trace("decodeClientRequest2: {}", Hex.encodeHexString(in.array()));
         }
         byte[] c2 = new byte[Constants.HANDSHAKE_SIZE];
         in.get(c2);
@@ -240,7 +240,7 @@ public boolean decodeClientRequest2(IoBuffer in) {
             if (useEncryption()) {
                 switch (handshakeType) {
                     case RTMPConnection.RTMP_ENCRYPTED:
-                        log.debug("RTMPE type 6");
+                        log.debug("RTMPE type 6 - C2");
                         break;
                     case RTMPConnection.RTMP_ENCRYPTED_XTEA:
                         log.debug("RTMPE type 8 XTEA");

diff --git a/service/pom.xml b/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-service</artifactId>

diff --git a/servlet/pom.xml b/servlet/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>2.0.12</version>
+        <version>2.0.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-servlet</artifactId>