Added flag to prevent handshake validation failure with youtube

Author: mondain

src/main/java/org/red5/client/net/rtmp/OutboundHandshake.java

@@ -56,6 +56,9 @@ public class OutboundHandshake extends RTMPHandshake {
     // server initial response S1
     private byte[] s1 = null;
 
+    // whether or not verification is mandatory
+    private boolean forceVerification;
+
     public OutboundHandshake() {
         super(RTMPConnection.RTMP_NON_ENCRYPTED);
         log = LoggerFactory.getLogger(OutboundHandshake.class);
@@ -377,6 +380,10 @@ private boolean getServerDigestPosition() {
             log.debug("Server digest position offset: {}", digestPosServer);
             if (!(result = verifyDigest(digestPosServer, s1, GENUINE_FMS_KEY, 36))) {
                 log.warn("Server digest verification failed");
+                // if we dont mind that verification routines failed
+                if (!forceVerification) {
+                    return true;
+                }
             } else {
                 log.debug("Server digest verified");
             }
@@ -463,4 +470,8 @@ public byte[] getHandshakeBytes() {
         return c1;
     }
 
+    public void setForceVerification(boolean forceVerification) {
+        this.forceVerification = forceVerification;
+    }
+
 }

src/test/java/org/red5/client/net/rtmp/YouTubeConnectTest.java

@@ -44,11 +44,12 @@ public void testYouTubePublish() throws InterruptedException {
         String youtubeHost = "a.rtmp.youtube.com";
         int youtubePort = 1935;
         String youtubeApp = "live2";
-        final String youtubePublishName = System.getProperty("youtube.streamname");
-        if (youtubePublishName == null) {
-            log.info("You forgot to set a 'youtube.streamname' system property");
-            return;
-        }
+        final String youtubePublishName = "dybx-y3ph-uqzx-30vx"; //System.getProperty("youtube.streamname");
+        log.info("youtubePublishName: {}", youtubePublishName);
+//        if (youtubePublishName == null) {
+//            log.info("You forgot to set a 'youtube.streamname' system property");
+//            return;
+//        }
 
         final RTMPClient client = new RTMPClient();
         client.setConnectionClosedHandler(new Runnable() {
@@ -66,13 +67,13 @@ public void handleException(Throwable throwable) {
         client.setStreamEventDispatcher(new IEventDispatcher() {
             @Override
             public void dispatchEvent(IEvent event) {
-                log.info("ClientStream.dispachEvent() {}", event);
+                log.info("ClientStream.dispachEvent: {}", event);
             }
         });
         final INetStreamEventHandler netStreamEventHandler = new INetStreamEventHandler() {
             @Override
             public void onStreamEvent(Notify notify) {
-                log.info("ClientStream.dispachEvent() {}", notify);
+                log.info("ClientStream.onStreamEvent: {}", notify);
             }
         };
         client.setStreamEventHandler(netStreamEventHandler);
@@ -91,7 +92,7 @@ public void resultReceived(IPendingServiceCall call) {
                     client.createStream(new IPendingServiceCallback() {
                         @Override
                         public void resultReceived(IPendingServiceCall call) {
-                            int streamId = (Integer) call.getResult();
+                            double streamId = (Double) call.getResult();
                             // live buffer 0.5s
                             @SuppressWarnings("unused")
                             RTMPConnection conn = (RTMPConnection) Red5.getConnectionLocal();