Don't write on a closed channel

Update to cope with junit cve
steely-glint · Oct 13, 2020 · 154c8bf · 154c8bf
1 parent 73bc9ac
commit 154c8bf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.ipseorama</groupId>
     <artifactId>slice</artifactId>
-    <version>1.0.92-local</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/com/ipseorama/slice/SingleThreadNioIceEngine.java b/src/main/java/com/ipseorama/slice/SingleThreadNioIceEngine.java
@@ -331,10 +331,14 @@ private Long tx() {
                         if (far != null) {
                             Log.verb(StunPacket.hexString(sp.getTid()) + " sending packet type " + sp.getClass().getSimpleName() + " length " + o.length + "  to " + far);
                             ByteBuffer src = ByteBuffer.wrap(o);
-                            if (ch.isConnected()) {
-                                ch.write(src);
+                            if (ch.isOpen()) {
+                                if (ch.isConnected()) {
+                                    ch.write(src);
+                                } else {
+                                    ch.send(src, far);
+                                }
                             } else {
-                                ch.send(src, far);
+                                Log.debug("chanel is closed "+ch);
                             }
                         } else {
                             Log.verb("not sending packet to unresolved address");

diff --git a/src/main/java/com/ipseorama/slice/stun/IceStunBindingTransaction.java b/src/main/java/com/ipseorama/slice/stun/IceStunBindingTransaction.java
@@ -106,7 +106,7 @@ public void receivedReply(StunPacket r) {
                 if (this._far.equals(reflex)){
                     Log.debug("far ip confirmed as "+reflex);
                 } else {
-                    Log.info("new Ip found (peer reflexive) "+reflex+" on "+this.candidatePair);
+                    Log.debug("new Ip found (peer reflexive) "+reflex+" on "+this.candidatePair);
                 }
                 if (oncomplete != null) {
                     oncomplete.onEvent(this);