dynamic audio ports

Author: serezhka

src/main/java/com/github/serezhka/jap2server/internal/AudioControlServer.java

@@ -19,9 +19,16 @@ public class AudioControlServer implements Runnable {
 
     private static final Logger log = LoggerFactory.getLogger(AudioControlServer.class);
 
+    private final Object monitor;
+
+    private int port;
+
+    public AudioControlServer(Object monitor) {
+        this.monitor = monitor;
+    }
+
     @Override
     public void run() {
-        var port = 4999;
         var bootstrap = new Bootstrap();
         var workerGroup = eventLoopGroup();
         var audioControlHandler = new AudioControlHandler();
@@ -30,15 +37,23 @@ public void run() {
             bootstrap
                     .group(workerGroup)
                     .channel(datagramChannelClass())
-                    .localAddress(new InetSocketAddress(port))
+                    .localAddress(new InetSocketAddress(0)) // bind random port
                     .handler(new ChannelInitializer<DatagramChannel>() {
                         @Override
                         public void initChannel(final DatagramChannel ch) {
                             ch.pipeline().addLast(audioControlHandler);
                         }
                     });
+
             var channelFuture = bootstrap.bind().sync();
-            log.info("Audio control server listening on port: {}", port);
+
+            log.info("Audio control server listening on port: {}",
+                    port = ((InetSocketAddress) channelFuture.channel().localAddress()).getPort());
+
+            synchronized (monitor) {
+                monitor.notify();
+            }
+
             channelFuture.channel().closeFuture().sync();
         } catch (InterruptedException e) {
             log.info("Audio control server interrupted");
@@ -48,6 +63,10 @@ public void initChannel(final DatagramChannel ch) {
         }
     }
 
+    public int getPort() {
+        return port;
+    }
+
     private EventLoopGroup eventLoopGroup() {
         return Epoll.isAvailable() ? new EpollEventLoopGroup() : new NioEventLoopGroup();
     }

src/main/java/com/github/serezhka/jap2server/internal/AudioReceiver.java

@@ -3,7 +3,6 @@
 import com.github.serezhka.jap2server.internal.handler.audio.AudioHandler;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.epoll.Epoll;
 import io.netty.channel.epoll.EpollDatagramChannel;
@@ -21,31 +20,40 @@ public class AudioReceiver implements Runnable {
     private static final Logger log = LoggerFactory.getLogger(AudioReceiver.class);
 
     private final AudioHandler audioHandler;
+    private final Object monitor;
 
-    public AudioReceiver(AudioHandler audioHandler) {
+    private int port;
+
+    public AudioReceiver(AudioHandler audioHandler, Object monitor) {
         this.audioHandler = audioHandler;
+        this.monitor = monitor;
     }
 
     @Override
     public void run() {
-        var port = 4998;
         var bootstrap = new Bootstrap();
         var workerGroup = eventLoopGroup();
 
         try {
             bootstrap
                     .group(workerGroup)
                     .channel(datagramChannelClass())
-                    .localAddress(new InetSocketAddress(port))
-                    .option(ChannelOption.SO_KEEPALIVE, true)
+                    .localAddress(new InetSocketAddress(0)) // bind random port
                     .handler(new ChannelInitializer<DatagramChannel>() {
                         @Override
                         public void initChannel(final DatagramChannel ch) {
                             ch.pipeline().addLast(audioHandler);
                         }
                     });
             var channelFuture = bootstrap.bind().sync();
-            log.info("Audio receiver listening on port: {}", port);
+
+            log.info("Audio receiver listening on port: {}",
+                    port = ((InetSocketAddress) channelFuture.channel().localAddress()).getPort());
+
+            synchronized (monitor) {
+                monitor.notify();
+            }
+
             channelFuture.channel().closeFuture().sync();
         } catch (InterruptedException e) {
             log.info("Audio receiver interrupted");
@@ -55,6 +63,10 @@ public void initChannel(final DatagramChannel ch) {
         }
     }
 
+    public int getPort() {
+        return port;
+    }
+
     private EventLoopGroup eventLoopGroup() {
         return Epoll.isAvailable() ? new EpollEventLoopGroup() : new NioEventLoopGroup();
     }

src/main/java/com/github/serezhka/jap2server/internal/handler/control/RTSPHandler.java

@@ -57,17 +57,24 @@ protected boolean handleRequest(ChannelHandlerContext ctx, Session session, Full
                         }
 
                         var audioHandler = new AudioHandler(session.getAirPlay(), airplayDataConsumer);
-                        var audioReceiver = new AudioReceiver(audioHandler);
+                        var audioReceiver = new AudioReceiver(audioHandler, this);
                         var audioReceiverThread = new Thread(audioReceiver);
                         session.setAudioReceiverThread(audioReceiverThread);
                         audioReceiverThread.start();
+                        synchronized (this) {
+                            wait();
+                        }
 
-                        var audioControlServer = new AudioControlServer();
+                        var audioControlServer = new AudioControlServer(this);
                         var audioControlServerThread = new Thread(audioControlServer);
                         session.setAudioControlServerThread(audioControlServerThread);
                         audioControlServerThread.start();
+                        synchronized (this) {
+                            wait();
+                        }
 
-                        session.getAirPlay().rtspSetupAudio(new ByteBufOutputStream(response.content()), 4998, 4999);
+                        session.getAirPlay().rtspSetupAudio(new ByteBufOutputStream(response.content()),
+                                audioReceiver.getPort(), audioControlServer.getPort());
                         break;
 
                     case VIDEO: