Diff: main.cpp

Revision:

4:4ddfbdaafbac

Parent:

3:aaf055cd9d06

--- a/main.cpp	Mon Jun 04 21:46:29 2018 +0000
+++ b/main.cpp	Tue Jun 05 08:11:10 2018 +0000
@@ -2,233 +2,299 @@
 #include "EthernetInterface.h"
 #include "SDFileSystem.h"
 
-#define EnDebugMSG  false //true-> print debug message to PC USB terminal, false->not print
+#define EnDebugMSG  false                               //true-> print debug message to PC USB terminal, false->not print
+
 #include "filelib.h"
 
-#define IP      "192.168.100.100"
+#define IP      "192.168.1.184"
 #define MASK    "255.255.255.0"
-#define GATEWAY "192.168.100.1"
+#define GATEWAY "192.168.1.1"
 #define PORT    80
 
-Serial pc (USBTX,USBRX);    // tx, rx
-SDFileSystem sd(PC_3, PC_2, PB_10, PC_0, "wfs");  // mosi, miso, sck, cs
-
-char sMethod[7];
-char sURL[250];
-char sProtocol[8];
-
-EthernetInterface eth;
-
-TCPSocketServer svr;
-bool serverIsListened = false;
+Serial              pc(USBTX, USBRX);                   // tx, rx
+SDFileSystem        sd(PC_3, PC_2, PB_10, PC_0, "wfs"); // mosi, miso, sck, cs
+char                sMethod[7];
+char                sURL[250];
+char                sProtocol[8];
+EthernetInterface   eth;
+TCPSocketServer     svr;
+bool                serverIsListened = false;
+TCPSocketConnection client;
+bool                clientIsConnected = false;
+char                sentBuffer[1608] = { };             // 2*536=1072, 3*536=1608, 4*536=2144   !1500
+char                line_response[256] = { 0 };
+char                file_path[256] = { 0 };
+DigitalOut          led1(PA_6);                         //server listning status
+Ticker              ledTick;
 
-TCPSocketConnection client;
-bool clientIsConnected = false;
-
-char sentBuffer[1608] = {}; // 2*536=1072, 3*536=1608, 4*536=2144   !1500
-char line_response[256]= {0};
-char file_path[256] = {0};
-
-DigitalOut led1(LED1); //server listning status
-DigitalOut led2(LED2); //socket connecting status
-
-Ticker ledTick;
-
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 void ledTickfunc()
 {
-    if(serverIsListened)  {
+    if (serverIsListened)
         led1 = !led1;
-    } else {
+    else
         led1 = false;
-    }
 }
 
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 void send_HTTP_header(char* protocol, int code, char* title, char* mime_type, long long lengthBody)
 {
-    snprintf(line_response, sizeof(line_response),"%s %d %s\r\n", protocol, code, title );
-    snprintf(sentBuffer, sizeof(sentBuffer),"%s",line_response);
+    snprintf(line_response, sizeof(line_response), "%s %d %s\r\n", protocol, code, title);
+    snprintf(sentBuffer, sizeof(sentBuffer), "%s", line_response);
 
-    if ( mime_type != NULL ) {
-        snprintf(line_response, sizeof(line_response), "Content-Type: %s\r\n", mime_type );
-        snprintf(sentBuffer, sizeof(sentBuffer), "%s%s",sentBuffer,line_response);    //append to sentBuffer
+    if (mime_type != NULL)
+    {
+        snprintf(line_response, sizeof(line_response), "Content-Type: %s\r\n", mime_type);
+        snprintf(sentBuffer, sizeof(sentBuffer), "%s%s", sentBuffer, line_response);    //append to sentBuffer
     }
-    if ( lengthBody >= 0 ) {
-        snprintf(line_response, sizeof(line_response), "Content-Length: %lld\r\n", lengthBody );
-        snprintf(sentBuffer, sizeof(sentBuffer), "%s%s",sentBuffer,line_response);    //append to sentBuffer
+
+    if (lengthBody >= 0)
+    {
+        snprintf(line_response, sizeof(line_response), "Content-Length: %lld\r\n", lengthBody);
+        snprintf(sentBuffer, sizeof(sentBuffer), "%s%s", sentBuffer, line_response);    //append to sentBuffer
     }
-    snprintf(line_response, sizeof(line_response), "Connection: close\r\n" );
-    snprintf(sentBuffer, sizeof(sentBuffer),"%s%s\r\n",sentBuffer,line_response);    //append to sentBuffer
 
+    snprintf(line_response, sizeof(line_response), "Connection: close\r\n");
+    snprintf(sentBuffer, sizeof(sentBuffer), "%s%s\r\n", sentBuffer, line_response);    //append to sentBuffer
     if (EnDebugMSG)
         printf("\n-->sent Header--\n");
 
-    client.send_all(sentBuffer,strlen(sentBuffer));
-    if (EnDebugMSG) {
+    client.send_all(sentBuffer, strlen(sentBuffer));
+    if (EnDebugMSG)
+    {
         printf(sentBuffer);
-        printf("\n--end Header-- bytes:%d",strlen(sentBuffer));
+        printf("\n--end Header-- bytes:%d", strlen(sentBuffer));
     }
+
     Thread::wait(200);  //200ms important for browser!
 }
 
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 void send_HTML_line(char* line, unsigned int length_line)
 {
-    client.send_all(line,length_line);
+    client.send_all(line, length_line);
     if (EnDebugMSG)
-        printf("\n-->send HTML line:\n%s ...Ok!",line);
+        printf("\n-->send HTML line:\n%s ...Ok!", line);
     Thread::wait(10);
 }
 
-void send_HTML_error( int status_code, char* title, char* body_text)
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+void send_HTML_error(int status_code, char* title, char* body_text)
 {
     send_HTTP_header("HTTP/1.1", status_code, title, "text/html", -1);
     if (EnDebugMSG)
         printf("\n-->send_error...\n");
-    sentBuffer[0]=NULL; //clear buffer
-    sprintf(line_response, "<!DOCTYPE html>\r\n<html>\r\n<head>\r\n<title>%d %s</title>\r\n</head>\r\n", status_code, title);
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
-    sprintf(line_response, "<body><center><h2><center>%d %s</center></h2>\r\n",status_code, title );
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
-    sprintf(line_response, "%s\r\n", body_text );
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
+    sentBuffer[0] = NULL;   //clear buffer
+    sprintf
+    (
+        line_response,
+        "<!DOCTYPE html>\r\n<html>\r\n<head>\r\n<title>%d %s</title>\r\n</head>\r\n",
+        status_code,
+        title
+    );
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    sprintf(line_response, "<body><center><h2><center>%d %s</center></h2>\r\n", status_code, title);
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    sprintf(line_response, "%s\r\n", body_text);
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
     sprintf(line_response, "<p>mbed HTTP File Server</p>\r\n</center></body></html>\r\n");
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
     send_HTML_line(sentBuffer, strlen(sentBuffer));
 }
 
-int send_file(char *path_file)
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+int send_file(char* path_file)
 {
-    char *mime_type = {0};
-    unsigned int bytes_for_send=0;
-    long long filesize, all_send_bytes = 0;
+    char*           mime_type = { 0 };
+    unsigned int    bytes_for_send = 0;
+    long long       filesize, all_send_bytes = 0;
 
-    mime_type =  get_mime_type( path_file );
-    snprintf(file_path, sizeof(file_path),"/wfs/%s",path_file);
-    if (EnDebugMSG) {
-        printf("\n-->from send_file:%s",file_path);
-        printf("\n-->from send_file mime type:%s",mime_type);
+    mime_type = get_mime_type(path_file);
+    snprintf(file_path, sizeof(file_path), "/wfs/%s", path_file);
+    if (EnDebugMSG)
+    {
+        printf("\n-->from send_file:%s", file_path);
+        printf("\n-->from send_file mime type:%s", mime_type);
     }
 
-    if (Mystat(path_file, &myStatBuf)) { //fault with file
-        send_HTML_error( 403, "Forbidden", "403 - File access forbidden.");
+    if (Mystat(path_file, &myStatBuf))
+    {   //fault with file
+        send_HTML_error(403, "Forbidden", "403 - File access forbidden.");
         return 403;
     }
-    FILE* fp = NULL;
-    fp = fopen(file_path,"r");
-    if (fp==NULL ) {
-        send_HTML_error( 403, "Forbidden", "403 - File access forbidden.");
+
+    FILE*   fp = NULL;
+    fp = fopen(file_path, "r");
+    if (fp == NULL)
+    {
+        send_HTML_error(403, "Forbidden", "403 - File access forbidden.");
         return 403;
     }
 
     filesize = myStatBuf.st_size;
     send_HTTP_header("HTTP/1.1", 200, "Ok", mime_type, myStatBuf.st_size);
     //binary send
-    all_send_bytes=0;
-    while(filesize)  {  //check for EOF !feof(fp)
+    all_send_bytes = 0;
+    while (filesize)
+    {   //check for EOF !feof(fp)
         bytes_for_send = filesize;
-        if (bytes_for_send > sizeof(sentBuffer)) {
+        if (bytes_for_send > sizeof(sentBuffer))
             bytes_for_send = sizeof(sentBuffer);
-        }
-        fread (sentBuffer,1,bytes_for_send,fp);
+
+        fread(sentBuffer, 1, bytes_for_send, fp);
         filesize -= bytes_for_send;
         if (EnDebugMSG)
-            printf("\n---bytes_for_send...%d",bytes_for_send);
-        client.send_all(sentBuffer,bytes_for_send);
+            printf("\n---bytes_for_send...%d", bytes_for_send);
+        client.send_all(sentBuffer, bytes_for_send);
         //Thread::wait(10);
         all_send_bytes += bytes_for_send;
     }
+
     if (EnDebugMSG)
         printf("\n---buffer fill end - all ...%lld", all_send_bytes);
     //binary send
-
     sprintf(line_response, "\r\n");
-    client.send_all(line_response,strlen(line_response));
-    if ( fp != NULL )
+    client.send_all(line_response, strlen(line_response));
+    if (fp != NULL)
         fclose(fp);
     //Thread::wait(10);
     return 0;
 }
 
-int send_directory(char *path)
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
+int send_directory(char* path)
 {
-    char process_name[64]= {0};
-
-    char posOfLastSlash;
-    char *pLS;
-
-    struct dirent *p;
-    struct sMystat sb;
-    struct tm *timeinfo;
-    char timeBuf[40];
+    char            process_name[64] = { 0 };
+    char            posOfLastSlash;
+    char*           pLS;
+    struct dirent*  p;
+    struct sMystat  sb;
+    struct tm*      timeinfo;
+    char            timeBuf[40];
 
     if (EnDebugMSG)
-        printf("\n-->from send_directory:%s",path);
-    snprintf(file_path,sizeof(file_path),"/wfs%s",path);
-    DIR *d = opendir(file_path);
-    if (EnDebugMSG && d!=NULL)
-        printf("\n-->from send_directory:%s ...open OK",file_path);
-    if (d==NULL) {   //error open dir
-        send_HTML_error( 403, "Forbidden", "403 - Directory access forbidden.");
+        printf("\n-->from send_directory:%s", path);
+    snprintf(file_path, sizeof(file_path), "/wfs%s", path);
+
+    DIR*    d = opendir(file_path);
+    if (EnDebugMSG && d != NULL)
+        printf("\n-->from send_directory:%s ...open OK", file_path);
+    if (d == NULL)
+    {   //error open dir
+        send_HTML_error(403, "Forbidden", "403 - Directory access forbidden.");
         return -1;
     }
-    send_HTTP_header("HTTP/1.1", 200, "Ok",NULL, -1);
-    sentBuffer[0]=NULL;
-    sprintf(line_response,"<!DOCTYPE html>\r\n<html>\n<head><title>Index of %s</title>\n",path);
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
 
-    sprintf(line_response,"<meta content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\"></head>\n");
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
-
-
-    sprintf(line_response,"<body><center>\n<h3>Index of %s</h3>\n", path);
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
+    send_HTTP_header("HTTP/1.1", 200, "Ok", NULL, -1);
+    sentBuffer[0] = NULL;
+    sprintf(line_response, "<!DOCTYPE html>\r\n<html>\n<head><title>Index of %s</title>\n", path);
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    sprintf(line_response, "<meta content=\"text/html; charset=iso-8859-1\" http-equiv=\"Content-Type\"></head>\n");
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    sprintf(line_response, "<body><center>\n<h3>Index of %s</h3>\n", path);
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
     send_HTML_line(sentBuffer, strlen(sentBuffer));
-//begin table
-    sentBuffer[0]=NULL; //clear buffer
-    sprintf(line_response,"<table border=\"0\">\n");
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
-    sprintf(line_response,"<tr><th align=\"left\" width=\"200\">Name</th><th align=\"right\" width=\"100\">Size(bytes)</th><th align=\"right\" width=\"200\">Date/Time</th></tr>\n");
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
-//begin table
-
-    pLS=strrchr(path,'/');
-    posOfLastSlash=pLS-path+1;
+    //begin table
+    sentBuffer[0] = NULL;   //clear buffer
+    sprintf(line_response, "<table border=\"0\">\n");
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    sprintf
+    (
+        line_response,
+        "<tr><th align=\"left\" width=\"200\">Name</th><th align=\"right\" width=\"100\">Size(bytes)</th><th align=\"right\" width=\"200\">Date/Time</th></tr>\n"
+    );
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    //begin table
+    pLS = strrchr(path, '/');
+    posOfLastSlash = pLS - path + 1;
     if (EnDebugMSG)
-        printf("\r\n>>posOfLastSlash=%d",posOfLastSlash);
-    snprintf(process_name,posOfLastSlash+1,"%s",path);
+        printf("\r\n>>posOfLastSlash=%d", posOfLastSlash);
+    snprintf(process_name, posOfLastSlash + 1, "%s", path);
     if (EnDebugMSG)
-        printf("\r\n>>process_name=%s",process_name);
-    sprintf(line_response,"<tr><td align=\"left\"><a href=\"%s\">../</a></td></tr>\n",process_name);
-    snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
-    while((p = readdir(d)) != NULL) {
+        printf("\r\n>>process_name=%s", process_name);
+    sprintf(line_response, "<tr><td align=\"left\"><a href=\"%s\">../</a></td></tr>\n", process_name);
+    snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+    while ((p = readdir(d)) != NULL)
+    {
         if (EnDebugMSG)
-            printf("\n   :%s",p->d_name);
-        sprintf(file_path,"%s/%s",path,p->d_name);
-        Mystat( file_path, &sb );
-        if (get_dirInfo(file_path)==0 ) { //this is directory path
+            printf("\n   :%s", p->d_name);
+        sprintf(file_path, "%s/%s", path, p->d_name);
+        Mystat(file_path, &sb);
+        if (get_dirInfo(file_path) == 0)
+        {                               //this is directory path
             if (EnDebugMSG)
                 printf("\nDIR");
-            sprintf(line_response, "<tr><td align=\"left\"><a href=\"%s\">%s</a><br></td></tr>\n",file_path,p->d_name);
-            if (strlen(line_response)>(sizeof(sentBuffer)-strlen(sentBuffer))) { //buffer must be sent
+            sprintf
+            (
+                line_response,
+                "<tr><td align=\"left\"><a href=\"%s\">%s</a><br></td></tr>\n",
+                file_path,
+                p->d_name
+            );
+            if (strlen(line_response) > (sizeof(sentBuffer) - strlen(sentBuffer)))
+            {                           //buffer must be sent
                 send_HTML_line(sentBuffer, strlen(sentBuffer));
-                sentBuffer[0]=NULL; //clear buffer
+                sentBuffer[0] = NULL;   //clear buffer
             }
-            snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
 
-        } else {    //this is file
+            snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
+        }
+        else
+        {                               //this is file
             if (EnDebugMSG)
                 printf("\nFILE");
-            timeinfo = localtime (&sb.st_mtime);
+            timeinfo = localtime(&sb.st_mtime);
             //strftime(timeBuf,40, "%I:%M:%S %p (%Y/%m/%d)\r\n", localtime(&sb.st_mtime));
             strftime(timeBuf, 40, "%c", timeinfo);
-            sprintf(line_response, "<tr><td align=\"left\"><a href=\"%s\">%s</a></td><td align=\"right\">%lld</td><td align=\"right\">%s</td></tr>\n", file_path, p->d_name,(long long) sb.st_size,timeBuf);    // asctime(timeinfo) );
-
-            if (strlen(line_response)>(sizeof(sentBuffer)-strlen(sentBuffer))) { //buffer must be sent
+            sprintf
+            (
+                line_response,
+                "<tr><td align=\"left\"><a href=\"%s\">%s</a></td><td align=\"right\">%lld</td><td align=\"right\">%s</td></tr>\n",
+                file_path,
+                p->d_name,
+                (long long)sb.st_size,
+                timeBuf
+            );                          // asctime(timeinfo) );
+            if (strlen(line_response) > (sizeof(sentBuffer) - strlen(sentBuffer)))
+            {                           //buffer must be sent
                 send_HTML_line(sentBuffer, strlen(sentBuffer));
-                sentBuffer[0]=NULL; //clear buffer
+                sentBuffer[0] = NULL;   //clear buffer
             }
-            snprintf(&(sentBuffer[strlen(sentBuffer)]),sizeof(sentBuffer),"%s",line_response); //append to buffer
+
+            snprintf(&(sentBuffer[strlen(sentBuffer)]), sizeof(sentBuffer), "%s", line_response);   //append to buffer
         }
     }
+
     send_HTML_line(sentBuffer, strlen(sentBuffer));
     closedir(d);
 
@@ -238,6 +304,12 @@
     return 0;
 }
 
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 void parseHTTPRequest(char* buffer)
 {
     char    space1Pos, space2Pos, newlinePos;
@@ -259,48 +331,70 @@
     printf("\n\r\n");
 }
 
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 int processHTTP(char* sMethod, char* sURL, char* sProtocol)
 {
-    int gdi, gfi;   //status of get_dir_info(xxx), and get_file_info(xxx)
+    int gdi, gfi;                                       //status of get_dir_info(xxx), and get_file_info(xxx)
 
-    if (strcmp(sMethod,"GET")!=0) {
-        send_HTML_error( 501, "501 Not Implemented", "501 - The server either does not recognize the request method");
+    if (strcmp(sMethod, "GET") != 0)
+    {
+        send_HTML_error(501, "501 Not Implemented", "501 - The server either does not recognize the request method");
         return 501;
     }
-    if (sURL[0]!= '/') {
-        send_HTML_error( 400, "Bad Request", "400 - The request cannot be fulfilled due to bad syntax.");
+
+    if (sURL[0] != '/')
+    {
+        send_HTML_error(400, "Bad Request", "400 - The request cannot be fulfilled due to bad syntax.");
         return 400;
     }
-    if (sURL[strlen(sURL)-1]=='/') {
-        sURL[strlen(sURL)-1]=sURL[strlen(sURL)];  //delete last symbol
+
+    if (sURL[strlen(sURL) - 1] == '/')
+    {
+        sURL[strlen(sURL) - 1] = sURL[strlen(sURL)];    //delete last symbol
         if (EnDebugMSG)
-            printf("\n delete last:%s",sURL);
+            printf("\n delete last:%s", sURL);
     }
-    gdi= get_dirInfo(sURL);
-    gfi= get_fileInfo(sURL);
-    if (gfi!=0) {   //!=0 file not found
-        if (gdi==0) { //0-ok this is directory
+
+    gdi = get_dirInfo(sURL);
+    gfi = get_fileInfo(sURL);
+    if (gfi != 0)
+    {                   //!=0 file not found
+        if (gdi == 0)
+        {               //0-ok this is directory
             return send_directory(sURL);
         }
+
         if (EnDebugMSG)
-            printf("\n404-br File not found or...(Fresult is:%d)",gfi);
-        send_HTML_error( 404, "Not Found","404 - The requested resource could not be found.");
+            printf("\n404-br File not found or...(Fresult is:%d)", gfi);
+        send_HTML_error(404, "Not Found", "404 - The requested resource could not be found.");
         return 404;
-    } else {    //==0  found
-        if (gdi==0)  //0-ok this is directory
+    }
+    else
+    {                   //==0  found
+        if (gdi == 0)   //0-ok this is directory
             return send_directory(sURL);
         else
             return send_file(sURL);
     }
 }
 
+/**
+ * @brief
+ * @note
+ * @param
+ * @retval
+ */
 int main()
 {
     printf("\r\n---- HTTP Server ----\r\n");
 
-    ledTick.attach(&ledTickfunc,0.5);
+    ledTick.attach(&ledTickfunc, 0.5);
     //ledTick.detach();
-
     printf("\r\n");
     printf("Mounting file system...\r\n");
 
@@ -308,68 +402,81 @@
     printf("%s\r\n", (err ? "Failed :(\r\n" : "OK\r\n"));
     if (err)
         return err;
-        
+
     //setup ethernet interface
-    eth.init(); //Use DHCP
+    eth.init();             //Use DHCP
     // eth.init(IP,MASK,GATEWAY);  //IP,mask,Gateway
     eth.connect();
     printf("IP Address is %s\n\r", eth.getIPAddress());
 
     //setup tcp socket
-    if(svr.bind(PORT)< 0) {
+    if (svr.bind(PORT) < 0)
+    {
         printf("tcp server bind failed.\n\r");
         return -1;
-    } else {
+    }
+    else
+    {
         printf("tcp server bind successed.\n\r");
         serverIsListened = true;
     }
 
-    if(svr.listen(1) < 0) {
+    if (svr.listen(1) < 0)
+    {
         printf("tcp server listen failed.\n\r");
         return -1;
-    } else {
+    }
+    else
+    {
         printf("tcp server is listening...\n\r");
     }
 
     //listening for http GET request
-    while (serverIsListened) {
+    while (serverIsListened)
+    {
         //blocking mode(never timeout)
-        if(svr.accept(client)<0) {
+        if (svr.accept(client) < 0)
+        {
             printf("failed to accept connection.\n\r");
-        } else {
+        }
+        else
+        {
             //client.set_blocking(false,5000);    //5000=5sec
-            printf("connection success!\n\rIP: %s\n\r",client.get_address());
+            printf("connection success!\n\rIP: %s\n\r", client.get_address());
             clientIsConnected = true;
-            led2 = true;
-            while(clientIsConnected) {
-                char buffer[1024] = {};
-                switch(client.receive(buffer, 1023)) {
+            while (clientIsConnected)
+            {
+                char    buffer[1024] = { };
+                switch (client.receive(buffer, 1023)) {
                     case 0:
                         printf("recieved buffer is empty.\n\r");
                         clientIsConnected = false;
                         break;
+
                     case -1:
                         printf("failed to read data from client.\n\r");
                         clientIsConnected = false;
                         break;
+
                     default:
-                        printf("Recieved Data: %d\n\r\n\r%.*s\n\r",strlen(buffer),strlen(buffer),buffer);
+                        printf("Recieved Data: %d\n\r\n\r%.*s\n\r", strlen(buffer), strlen(buffer), buffer);
                         parseHTTPRequest(buffer);
                         //if(buffer[0] == 'G' && buffer[1] == 'E' && buffer[2] == 'T' ) {
-                        if (strcmp(sMethod, "GET" ) == 0 ) {
+                        if (strcmp(sMethod, "GET") == 0)
+                        {
                             printf("GET request incomming.\n\r");
                             processHTTP(sMethod, sURL, sProtocol);
                             clientIsConnected = false;
-                        }//if get
+                        }   //if get
                         break;
-                }   //switch
+                }           //switch
+
                 //ledTick.attach(&ledTickfunc,0.5);
-            }//while
+            }               //while
+
             printf("close connection.\n\rHTTP server is listening...\n\r\n");
             client.close();
             Thread::wait(50);
-            led2 = false;
         }
     }
-
 }