From ab0520e03c9c8e2ca2434b1e86d5933fa5847aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=9C=B0=E5=B9=B3=E7=BA=BF?= <22250530@qq.com>
Date: Thu, 23 Jul 2015 17:05:54 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml         |   2 +-
 src/com/wentch/redkale/boot/Application.java  |  13 +-
 src/com/wentch/redkale/net/SSLBuilder.java    | 160 ------------------
 .../wentch/redkale/net/sncp/SncpServer.java   |   8 +-
 4 files changed, 15 insertions(+), 168 deletions(-)
 delete mode 100644 src/com/wentch/redkale/net/SSLBuilder.java

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index e14122b8f..264570b09 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -43,7 +43,7 @@
         </properties>
     </resources> 
     <!--
-        protocol: required  server所启动的协议，有HTTP、HTTPS、SNCP， 目前只支持HTTP、SNCP; 
+        protocol: required  server所启动的协议，有HTTP、SNCP， 目前只支持HTTP、SNCP。SNCP也分TCP、UDP实现，默认使用UDP实现，TCP实现则使用SNCP.TCP值; 
         host:  服务所占address ， 默认: 0.0.0.0
         port:  服务所占端口 ，默认: 80
         root:  如果是web类型服务，则包含页面  默认:{APP_HOME}/root
diff --git a/src/com/wentch/redkale/boot/Application.java b/src/com/wentch/redkale/boot/Application.java
index aa0dabcfa..ecd56e924 100644
--- a/src/com/wentch/redkale/boot/Application.java
+++ b/src/com/wentch/redkale/boot/Application.java
@@ -358,11 +358,18 @@ public final class Application {
                     try {
                         //Thread ctd = Thread.currentThread();
                         //ctd.setContextClassLoader(new URLClassLoader(new URL[0], ctd.getContextClassLoader()));
+                        String protocol = entry.getValue("protocol", "");
+                        String subprotocol = "UDP";
+                        int pos = protocol.indexOf('.');
+                        if (pos > 0) {
+                            subprotocol = protocol.substring(pos + 1);
+                            protocol = protocol.substring(0, pos);
+                        }
                         NodeServer server = null;
-                        if ("HTTP".equalsIgnoreCase(entry.getValue("protocol", ""))) {
+                        if ("HTTP".equalsIgnoreCase(protocol)) {
                             server = new NodeHttpServer(Application.this, servicecdl, new HttpServer(startTime, watch));
-                        } else if ("SNCP".equalsIgnoreCase(entry.getValue("protocol", ""))) {
-                            server = new NodeSncpServer(Application.this, servicecdl, new SncpServer(startTime, watch));
+                        } else if ("SNCP".equalsIgnoreCase(protocol)) {
+                            server = new NodeSncpServer(Application.this, servicecdl, new SncpServer(startTime, subprotocol, watch));
                         }
                         if (server == null) {
                             logger.log(Level.SEVERE, "Not found Server Class for protocol({0})", entry.getValue("protocol"));
diff --git a/src/com/wentch/redkale/net/SSLBuilder.java b/src/com/wentch/redkale/net/SSLBuilder.java
deleted file mode 100644
index a1cf9ee69..000000000
--- a/src/com/wentch/redkale/net/SSLBuilder.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.wentch.redkale.net;
-
-import java.nio.*;
-import java.security.*;
-import javax.net.ssl.*;
-
-/**
- *
- * @author zhangjx
- */
-public class SSLBuilder {
-
-    private static SSLContext sslContext;
-
-    static {
-        try {
-            char[] keypasswd = new char[32];
-            final KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(null, keypasswd);
-            final String algorithm = System.getProperty("ssl.algorithm", KeyManagerFactory.getDefaultAlgorithm());
-            final KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
-            kmf.init(keyStore, keypasswd);
-            SSLContext sslContext0 = SSLContext.getInstance("TLS");
-            sslContext0.init(kmf.getKeyManagers(), null, new SecureRandom());
-            sslContext = sslContext0;
-        } catch (Exception e) {
-            throw new Error(e);
-        }
-    }
-
-    private final SSLEngine sslEngine;
-
-    private int appBufferSize;
-
-    private int netBufferSize;
-
-    public SSLBuilder() {
-        sslEngine = sslContext.createSSLEngine();
-        //sslEngine.setEnabledCipherSuites(null);
-        //sslEngine.setEnabledProtocols(null);
-
-        sslEngine.setUseClientMode(false);
-        sslEngine.setWantClientAuth(false);
-        sslEngine.setNeedClientAuth(false);
-        //---------------------------
-        updateBufferSizes();
-    }
-
-    private void updateBufferSizes() {
-        final SSLSession session = sslEngine.getSession();
-        appBufferSize = session.getApplicationBufferSize();
-        netBufferSize = session.getPacketBufferSize();
-    }
-
-    public static void main(String[] args) throws Exception {
-
-    }
-
-    private static int getSSLPacketSize(final ByteBuffer buf) throws SSLException {
-
-        /*
-         * SSLv2 length field is in bytes 0/1
-         * SSLv3/TLS length field is in bytes 3/4
-         */
-        if (buf.remaining() < 5) return -1;
-
-        final byte byte0;
-        final byte byte1;
-        final byte byte2;
-        final byte byte3;
-        final byte byte4;
-
-        if (buf.hasArray()) {
-            final byte[] array = buf.array();
-            int pos = buf.arrayOffset() + buf.position();
-            byte0 = array[pos++];
-            byte1 = array[pos++];
-            byte2 = array[pos++];
-            byte3 = array[pos++];
-            byte4 = array[pos];
-        } else {
-            int pos = buf.position();
-            byte0 = buf.get(pos++);
-            byte1 = buf.get(pos++);
-            byte2 = buf.get(pos++);
-            byte3 = buf.get(pos++);
-            byte4 = buf.get(pos);
-        }
-
-        int len;
-
-        /*
-         * If we have already verified previous packets, we can
-         * ignore the verifications steps, and jump right to the
-         * determination.  Otherwise, try one last hueristic to
-         * see if it's SSL/TLS.
-         */
-        if (byte0 >= 20 && byte0 <= 23) {
-            /*
-             * Last sanity check that it's not a wild record
-             */
-            final byte major = byte1;
-            final byte minor = byte2;
-            final int v = (major << 8) | minor & 0xff;
-
-            // Check if too old (currently not possible)
-            // or if the major version does not match.
-            // The actual version negotiation is in the handshaker classes
-            if ((v < 0x0300) || (major > 0x03)) {
-                throw new SSLException("Unsupported record version major=" + major + " minor=" + minor);
-            }
-
-            /*
-             * One of the SSLv3/TLS message types.
-             */
-            len = ((byte3 & 0xff) << 8) + (byte4 & 0xff) + 5; // SSLv3 record header
-
-        } else {
-            /*
-             * Must be SSLv2 or something unknown.
-             * Check if it's short (2 bytes) or
-             * long (3) header.
-             *
-             * Internals can warn about unsupported SSLv2
-             */
-            boolean isShort = ((byte0 & 0x80) != 0);
-
-            if (isShort && ((byte2 == 1) || byte2 == 4)) {
-
-                final byte major = byte3;
-                final byte minor = byte4;
-                final int v = (major << 8) | minor & 0xff;
-
-                // Check if too old (currently not possible)
-                // or if the major version does not match.
-                // The actual version negotiation is in the handshaker classes
-                if ((v < 0x0300) || (major > 0x03)) {
-                    // if it's not SSLv2, we're out of here.
-                    if (v != 0x0002) throw new SSLException("Unsupported record version major=" + major + " minor=" + minor);
-                }
-
-                /*
-                 * Client or Server Hello
-                 */
-                int mask = 0x7f;
-                len = ((byte0 & mask) << 8) + (byte1 & 0xff) + (2);
-            } else {
-                // Gobblygook!
-                throw new SSLException("Unrecognized SSL message, plaintext connection?");
-            }
-        }
-
-        return len;
-    }
-}
diff --git a/src/com/wentch/redkale/net/sncp/SncpServer.java b/src/com/wentch/redkale/net/sncp/SncpServer.java
index 09a91a1b0..97436527f 100644
--- a/src/com/wentch/redkale/net/sncp/SncpServer.java
+++ b/src/com/wentch/redkale/net/sncp/SncpServer.java
@@ -22,12 +22,12 @@ public final class SncpServer extends Server {
 
     private final List<ServiceEntry> services = new ArrayList<>();
 
-    public SncpServer() {
-        this(System.currentTimeMillis(), null);
+    public SncpServer(String protocol) {
+        this(System.currentTimeMillis(), protocol, null);
     }
 
-    public SncpServer(long serverStartTime, final WatchFactory watch) {
-        super(serverStartTime, "UDP", watch);
+    public SncpServer(long serverStartTime, String protocol, final WatchFactory watch) {
+        super(serverStartTime, protocol, watch);
     }
 
     public void addService(ServiceEntry entry) {