Diff: main.cpp

Revision:

6:7585e2996cd3

Parent:

5:962734db89e5

--- a/main.cpp	Mon Dec 08 13:17:25 2014 +0000
+++ b/main.cpp	Wed Jul 22 08:05:36 2015 +0000
@@ -1,39 +1,13 @@
+// http_access  main.cpp
 #include "mbed.h"
 #include "EthernetInterface.h"
 
-/*** SSL #include <cyassl/ssl.h> ***/
-
 #define PORT 80 /*** SSL 443 ***/ 
 
 #define err_sys(m) puts(m)
 
 TCPSocketConnection socket;
 
-/*** SSL
-static int SocketReceive(CYASSL* ssl, char *buf, int sz, void *ctx)
-{
-    int n ;
-    int i ;
-#define RECV_RETRY 3
-    for(i=0; i<RECV_RETRY; i++) {
-        n = socket.receive(buf, sz) ;
-        if(n >= 0)return n  ;
-    }
-    printf("SocketReceive:%d/%d\n", n, sz)  ;
-    return n ;
-}
-
-static int SocketSend(CYASSL* ssl, char *buf, int sz, void *ctx)
-{
-    int n ;
-
-    n = socket.send(buf, sz);
-    if(n > 0) {
-        return n ;
-    } else  printf("SocketSend:%d/%d\n", n, sz);
-    return n ;
-}
-***/
 
 EthernetInterface eth;
 
@@ -43,9 +17,6 @@
 
     eth.init(); //Use DHCP
     printf("===== Simple TCP Client ========\n") ;
-    /*** SSL
-    printf("===== Simple SSL Client ========\n") ;
-    ***/
     
     while(1) {
         if(eth.connect()== 0)break ;
@@ -53,22 +24,6 @@
     }
     printf("Client IP: %s\n", eth.getIPAddress());
 
-    /*** SSL
-    CYASSL_CTX*     ctx     = 0;
-    CYASSL*         ssl     = 0;
-
-    CYASSL_METHOD* method = CyaTLSv1_2_client_method();
-    ***/
-
-    /* Initialize CyaSSL Context */
-    /*** SSL
-    ctx = CyaSSL_CTX_new(method);
-    if (ctx == NULL)
-        err_sys("unable to get ctx");
-    CyaSSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, 0);
-    CyaSSL_SetIORecv(ctx, SocketReceive) ;
-    CyaSSL_SetIOSend(ctx, SocketSend) ;
-    end SSL ***/
 
     socket.set_blocking(false, 300) ;
     printf("Server IP: ") ;
@@ -86,25 +41,10 @@
     }
     printf("TCP Connected\n") ;
 
-    /*** SSL
-    ssl = CyaSSL_new(ctx);
-    if (ssl == NULL)
-        err_sys("unable to get SSL object");
-    if (CyaSSL_connect(ssl) != SSL_SUCCESS) {
-        int  err = CyaSSL_get_error(ssl, 0);
-        printf("err = %d, %s\n", err,
-               CyaSSL_ERR_error_string(err, "\n"));
-        err_sys("SSL Connection Error");
-    }
-    printf("SSL Connected\n") ;
-    ***/
-
     char msg[] = "GET /congrats.html  HTTP/1.0\r\nConnection: Close\r\n\r\n" ;
     // const char msg[] = "Hello World\r\n" ;
 
     if (
-        /*** SSL   
-        CyaSSL_write(ssl, msg, sizeof(msg)-1) != (sizeof(msg)-1)) ***/
         socket.send(msg, sizeof(msg)-1) != (sizeof(msg)-1))
         err_sys("CyaSSL_write failed");
 
@@ -112,22 +52,18 @@
     int n ;
     puts("Server Response:\n") ;
     do {
-        n = /*** SSL  CyaSSL_read(ssl, buf, sizeof(buf)-1); ***/
-            socket.receive(buf, sizeof(buf)-1);
+        n = socket.receive(buf, sizeof(buf)-1);
         if (n >= 0) {
             buf[n] = 0;
             printf("%s", buf);
         } else break ;
     } while(n > 0) ;
     puts("=== === === ===") ;
-    /*** SSL    CyaSSL_free(ssl) ; ***/
     socket.close();
-    /*** SSL    CyaSSL_CTX_free(ctx) ; ***/
     eth.disconnect();
 }
 
-main()
-{
+main(){
  
 #define STACK_SIZE 20000
     Thread t(net_main, NULL, osPriorityNormal, STACK_SIZE);