Skip to content

Commit 8f09252

Browse files
committed
Updated for alias support in 1.2.16
1 parent 300fef2 commit 8f09252

File tree

7 files changed

+234
-80
lines changed

7 files changed

+234
-80
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.red5</groupId>
55
<artifactId>red5-parent</artifactId>
6-
<version>1.2.13</version>
6+
<version>1.2.16</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99
<artifactId>red5-server-common</artifactId>

src/main/java/org/red5/server/api/Red5.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ public final class Red5 {
5555
/**
5656
* Server version with revision
5757
*/
58-
public static final String VERSION = "Red5 Server 1.2.10";
58+
public static final String VERSION = "Red5 Server 1.2.15";
5959

6060
/**
6161
* Server version for fmsVer requests
6262
*/
63-
public static final String FMS_VERSION = "RED5/1,2,10,0";
63+
public static final String FMS_VERSION = "RED5/1,2,15,0";
6464

6565
/**
6666
* Server capabilities

src/main/java/org/red5/server/api/stream/IClientBroadcastStream.java

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,40 +49,63 @@ public interface IClientBroadcastStream extends IClientStream, IBroadcastStream
4949
Map<String, String> getParameters();
5050

5151
/**
52-
* Adds a stream name alias.
52+
* Adds a stream name subscribe-side alias.
5353
*
5454
* @param alias
5555
* @return true if added to the aliases, false otherwise
5656
*/
5757
boolean addAlias(String alias);
5858

5959
/**
60-
* Returns whether or not an alias for this stream exists.
60+
* Returns whether or not an subscribe-side alias for this stream exists.
6161
*
6262
* @return true if an alias has been added and false otherwise
6363
*/
6464
boolean hasAlias();
6565

6666
/**
67-
* Returns an alias.
67+
* Returns an subscribe-side alias.
6868
*
6969
* @return alias if at least one exists or null when there are none
7070
*/
7171
String getAlias();
7272

7373
/**
74-
* Returns whether or not a given alias exists.
74+
* Returns whether or not a given subscribe-side alias exists.
7575
*
7676
* @param alias
7777
* @return true if found and false otherwise
7878
*/
7979
boolean containsAlias(String alias);
8080

8181
/**
82-
* Returns all the aliases.
82+
* Returns all the subscribe-side aliases.
8383
*
8484
* @return all aliases for this instance or an empty set
8585
*/
8686
Set<String> getAliases();
8787

88+
/**
89+
* Sets the publish-side alias for the streams name. Subsequent calls will replace an existing alias if already set.
90+
*
91+
* @param nameAlias alias to set for the streams name or null to clear it
92+
*/
93+
void setNameAlias(String nameAlias);
94+
95+
/**
96+
* Returns the publish-side alias, if configured.
97+
*
98+
* @return alias for the streams name or null if not set
99+
*/
100+
String getNameAlias();
101+
102+
/**
103+
* Returns whether or not an alias is in-use / registered already; this includes both publish and subscribe aliases
104+
* within a server instance.
105+
*
106+
* @param alias the name to check against publish and subscribe aliases
107+
* @return true if registered and false otherwise
108+
*/
109+
boolean aliasRegistered(String alias);
110+
88111
}

0 commit comments

Comments
 (0)