refactoring

Author: JavaSaBr

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketReader.java

@@ -16,6 +16,7 @@
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLException;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousSocketChannel;
 
@@ -32,7 +33,6 @@ public abstract class AbstractSSLPacketReader<R extends ReadablePacket, C extend
         NetworkUtils.EMPTY_BUFFER
     };
 
-    private static final int MINIMAL_SSL_BUFFER = 512;
     private static final int SKIP_READ_PACKETS = -1;
 
     protected final @NotNull SSLEngine sslEngine;
@@ -63,11 +63,6 @@ protected AbstractSSLPacketReader(
         return sslNetworkBuffer;
     }
 
-    @Override
-    public void startRead() {
-        super.startRead();
-    }
-
     @Override
     protected void handleReadData(@NotNull Integer result) {
 
@@ -241,12 +236,11 @@ private void increaseDataBuffer() {
     }
 
     protected void closeConnection() {
-       /* try {
+       try {
             sslEngine.closeOutbound();
-            //doHandshake(readBuffer.clear(), 0);
             channel.close();
         } catch (IOException e) {
             throw new RuntimeException(e);
-        }*/
+        }
     }
 }

rlib-network/src/main/java/com/ss/rlib/network/packet/impl/AbstractSSLPacketWriter.java

@@ -18,6 +18,7 @@
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLException;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.AsynchronousSocketChannel;
 
@@ -76,11 +77,10 @@ public AbstractSSLPacketWriter(
 
             switch (result.getStatus()) {
                 case BUFFER_UNDERFLOW:
-                    // peerNetData = handleBufferUnderflow(engine, peerNetData);
+                    increaseNetworkBuffer();
                     break;
                 case BUFFER_OVERFLOW:
-                    // peerAppData = enlargeApplicationBuffer(engine, peerAppData);
-                    break;
+                    throw new IllegalStateException("Unexpected state");
                 case OK:
                     return sslNetworkBuffer.flip();
                 case CLOSED:
@@ -187,13 +187,20 @@ public AbstractSSLPacketWriter(
         return null;
     }
 
+    private void increaseNetworkBuffer() {
+        sslNetworkBuffer = NetworkUtils.increasePacketBuffer(
+            sslNetworkBuffer,
+            bufferAllocator,
+            sslEngine
+        );
+    }
+
     protected void closeConnection() {
-        /**try {
+        try {
             sslEngine.closeOutbound();
-            doHandshake(NULL_PACKET);
             channel.close();
         } catch (IOException e) {
             throw new RuntimeException(e);
-        }*/
+        }
     }
 }