Adds a watermark to SCTP cookie

reverts the order, ensuring that the AssociationListener's callbacks are called in a consistent order for the first inbound stream.
pipe · Mar 1, 2022 · d29f9c2 · d29f9c2
1 parent e7ae727
commit d29f9c2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/main/java/pe/pi/sctp4j/sctp/Association.java b/src/main/java/pe/pi/sctp4j/sctp/Association.java
@@ -111,7 +111,7 @@ public enum State {
      AUTH // Assume DTLS will cover this for us if we never send ASCONF packets.
      */
 
-    public static int COOKIESIZE = 32;
+    public static int COOKIESIZE = 40;
     private static long VALIDCOOKIELIFE = 60000;
     /*
      RTO.Initial - 3 seconds
@@ -633,6 +633,11 @@ protected Chunk[] inboundInit(InitChunk init) {
         cookie.cookieData = new byte[Association.COOKIESIZE];
         cookie.cookieTime = System.currentTimeMillis();
         _random.nextBytes(cookie.cookieData);
+        byte[] watermark = " |pi.pe|".getBytes();
+        int wlen = Math.min(watermark.length, cookie.cookieData.length);
+        for (int w=0;w<wlen;w++){
+            cookie.cookieData[w] = watermark[w]; // tell google who we are.
+        }
         iac.setCookie(cookie.cookieData);
         _cookies.add(cookie);
 

diff --git a/src/main/java/pe/pi/sctp4j/sctp/SCTPStream.java b/src/main/java/pe/pi/sctp4j/sctp/SCTPStream.java
@@ -182,12 +182,15 @@ int stashCap() {
 
     public void setSCTPStreamListener(SCTPStreamListener sl) {
         _sl = sl;
+        Log.debug("adding listener for "+this._label+" of "+sl.getClass().getName());
         if (_earlyQueue != null) {
             Log.debug("delivering early " + _earlyQueue.size() + " messages to "+sl.getClass().getSimpleName());
             SCTPMessage e = null;
             while (null != (e = _earlyQueue.poll())) {
                 e.deliver(_sl);
             }
+        } else {
+            Log.debug("no early queue for "+_label);
         }
     }
 

diff --git a/src/main/java/pe/pi/sctp4j/sctp/small/BlockingSCTPStream.java b/src/main/java/pe/pi/sctp4j/sctp/small/BlockingSCTPStream.java
@@ -24,9 +24,6 @@
 import pe.pi.sctp4j.sctp.dataChannel.DECP.DCOpen;
 import com.phono.srtplight.Log;
 import java.util.concurrent.ExecutorService;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import pe.pi.sctp4j.sctp.SCTPStreamListener;
 
 /**
  *

diff --git a/src/main/java/pe/pi/sctp4j/sctp/small/ThreadedAssociation.java b/src/main/java/pe/pi/sctp4j/sctp/small/ThreadedAssociation.java
@@ -896,8 +896,13 @@ public void onDisAssociated(Association a) {
 
         @Override
         public void onDCEPStream(SCTPStream s, String label, int type) throws Exception {
-            // we do this on the SCTPStream's thread.
-            _appAl.onDCEPStream(s, label, type);
+            if (_appAl != null) {_ex.execute(() -> {
+                try {
+                    _appAl.onDCEPStream(s,label,type);
+                } catch (Exception ex) {
+                    Log.warn("onDCEPStream threw exception "+ex.getMessage());
+                }
+            });}
         }
 
         @Override

diff --git a/src/test/java/pe/pi/sctp4j/sctp/small/ThreadedAssociationTest.java b/src/test/java/pe/pi/sctp4j/sctp/small/ThreadedAssociationTest.java
@@ -346,7 +346,7 @@ public void onRawStream(SCTPStream s) {
     @Test
     public void testMakeMessage_String_BlockingSCTPStream() throws Exception {
         System.out.println("---->makeMessage string");
-        //Log.setLevel(Log.VERB);
+        //Log.setLevel(Log.DEBUG);
         final StringBuffer rightout = new StringBuffer();
         final SCTPStreamListener rsl = new ASCTPStreamListener() {
             @Override