Diff: doTCPIP.cpp

Revision:

6:4fb3776a9b92

Parent:

2:13ced2cb5933

--- a/doTCPIP.cpp	Fri Sep 20 07:40:44 2013 +0000
+++ b/doTCPIP.cpp	Sun Sep 22 15:00:19 2013 +0000
@@ -36,13 +36,14 @@
 #include "doTCPIP.h"
 
 volatile unsigned char newData;
-//int server_running;
+int server_running;
 unsigned char ForceFixedSSID;
 char runSmartConfig;            // Flag indicating whether user requested to perform Smart Config
 volatile unsigned long ulCC3000Connected;
 unsigned char ConnectUsingSmartConfig;
 unsigned char myMAC[8];
 userFS_t userFS;
+int do_mDNS = 0;
 
 // Setup the functions to handle our CGI parameters
 tNetappIpconfigRetArgs ipinfo2;
@@ -58,7 +59,97 @@
 char DevServname[] = "CC3000";
 volatile unsigned long SendmDNSAdvertisment;
 
+/*int sendTCPIP(int port)
+{
+    long temp, stat, skip, skipc;
+    //socket descriptor 
+    long sock;
+    //new TCP socket descriptor
+    long newsock;
+    //destination address
+    sockaddr destAddr;
+    //local address
+    sockaddr LocalAddr;
 
+//    char buf2[40];
+    socklen_t addrlen;
+    memset(&LocalAddr, 0, 8);
+    LocalAddr.sa_family = AF_INET;
+    LocalAddr.sa_data[0] = (port >> 8) & 0xff;
+    LocalAddr.sa_data[1] = port & 0xff;  
+    memset (&LocalAddr.sa_data[2], 0, 4);
+    sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    while(sock == -1) sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_TCP);
+    temp = bind(sock,&LocalAddr,sizeof(sockaddr));
+    temp = listen(sock, 1);
+    addrlen = sizeof(destAddr);
+    skip = 0;
+    skipc = 0;
+    while(1)
+    {
+        newsock = -2;
+        printf("Server waiting for connection\n");
+        LED_D2_ON;
+        while((newsock == -1) || (newsock == -2))
+        {
+            newsock = accept(sock,&destAddr, &addrlen);
+            if(do_mDNS)
+            {
+                printf("mDNS= 0x%08x\n", mdnsAdvertiser(1, DevServname, sizeof(DevServname)));
+                do_mDNS = 0;
+            }
+        }
+        printf("Connected\n");
+ //       sss = seconds;
+        //receive TCP data
+        temp = 0;   
+        if(newsock >= 0)
+        {
+            recv(newsock, requestBuffer,20,0);
+            printf("Input = %s\n", requestBuffer);
+            while(1)
+            {
+                while(!newData) __wfi();
+                newData = 0;
+                LED_D2_ON;  
+                stat = -2;
+                //if(tSLInformation.usNumberOfFreeBuffers <= 2)
+                //{
+                //    printf("LOW= %d\n", tSLInformation.usNumberOfFreeBuffers);
+                //}
+                //Disable sys tick interrupts for debugging
+                //SysTick->CTRL &= ~SysTick_CTRL_TICKINT_Msk;       // *** Disable SysTick Timer Interrupt
+//                stat = send(newsock,&axis6, sizeof(axis6), 0);
+                // Disable sys tick interrupts for debugging
+                //SysTick->CTRL |= SysTick_CTRL_TICKINT_Msk;        // *** Enable SysTick Timer Interrupt   
+                LED_D2_OFF;
+                if(stat != 96)
+                {
+                    if(stat == -2)
+                    {
+                        skip++;
+                        skipc++;
+                    }
+                    //printf("status= %d\n", stat);
+                    if(stat == -1) break;
+                }
+                else
+                {
+                    temp++;
+                    skipc = 0;
+                }
+                if(skipc > 150)
+                {
+//                    printf("Zero Buffer Error Sent\n", temp, seconds - sss);
+                    return(-1);
+                }
+            }   
+        } else printf("bad socket= %d\n", newsock);
+        closesocket(newsock);
+//        printf("Done %d, time= %d, skipped= %d\n", temp, seconds - sss, skip);
+        skip = 0;
+    }
+}*/
 
 void sendPython(int port)
 {
@@ -132,11 +223,71 @@
         closesocket(newsock);
         printf("Done, press any key to repeat\n");
         getchar();
-//        printf("\x1B[2J");    //VT100 erase screen
-//        printf("\x1B[H");     //VT100 home
     }
 } 
 
+int getTCPIP( char a1, char a2, char a3, char a4, int port)
+{
+    long temp;
+    //socket descriptor 
+    long sock;
+    char msg1[] = "GET / HTTP/1.1\r\n\r\n\0";
+    //destination address
+    sockaddr destAddr;
+    //num of bytes received
+    long numofbytes = 0;
+    //data buffer
+    char buff[256];
+    
+    memset(&destAddr, 0, 8);
+    destAddr.sa_family = AF_INET;
+    destAddr.sa_data[0] = (port >> 8) & 0xff;
+    destAddr.sa_data[1] = port & 0xff;  
+    destAddr.sa_data[2] = a1;   
+    destAddr.sa_data[3] = a2;   
+    destAddr.sa_data[4] = a3;       
+    destAddr.sa_data[5] = a4;   
+    
+    //open socket
+    sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    while(sock == -1) sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_TCP);
+    
+    //hci_unsolicited_event_handler();
+    
+    printf( "Client attempting connection\n");
+    if( connect(sock, &destAddr, sizeof(destAddr)) < 0) 
+        return(-1);
+    
+    printf("Connected\n");
+    
+    //receive TCP data
+    temp = 0;
+    //hci_unsolicited_event_handler();
+    
+    send(sock, &msg1, strlen(msg1), 0);
+    printf("Receiving Data\n");
+    
+    //printf("Input = %s\n", msg1);
+    while(1) {
+        numofbytes = recv(sock, &buff, 256,0);
+        
+        //printf("R %d\n", numofbytes);
+        newData = 1;    
+        if(numofbytes != -1) { 
+            closesocket(sock);
+            printf("Done [%d]\n", temp);
+            printf("Data: %s\n", buff);
+
+            //hci_unsolicited_event_handler();
+
+            return(1);
+        }
+        temp++;
+    }
+         
+return(0); // We'll never get here
+}
+
 void initTCPIP(void)
 {
     int t;  
@@ -186,8 +337,48 @@
         printf("\n\nStarting TCP/IP Server\n");
         initTCPIP();
         sendPython(TCPIP_PORT);
+//        sendTCPIP(TCPIP_PORT);
     }   
 }
+
+/*void runTCPIPclient(int a1, int a2, int a3, int a4)
+{
+    while(1)
+    {
+        LED_D3_OFF;
+        LED_D2_OFF;
+        printf("\n\nStarting TCP/IP Client connection\n");
+        initTCPIP();
+        getTCPIP( a1, a2, a3, a4, 80); // IP Address and Port of server
+    }  
+}*/
+
+void runTCPIPclient(int a1, int a2, int a3, int a4, int port)
+{
+    int res;
+    int i;
+    
+    LED_D3_OFF;
+    // LAN_Connected = 0;
+    LED_D2_OFF;
+    printf("\n\nStarting TCP/IP Client connection (3 attempts)\n");
+    //
+    if ( LAN_Connected == 0)
+        initTCPIP();
+    
+    i=0;
+    while( i<3) {
+        res=getTCPIP( a1, a2, a3, a4, port); // IP Address and Port of server
+        if ( res != 1) {
+            printf("[%d] Error connecting to: %d.%d.%d.%d:%d\n", ++i, a1, a2, a3, a4, port);
+        } else {
+            printf("Receiving Done. \n");
+            wait(1);
+            return;
+        }
+        wait(3);
+    }
+}
     
 unsigned char checkWiFiConnected(void)
 {
@@ -245,7 +436,7 @@
 void do_FTC(void)
 {
     printf("Running First Time Configuration\n");
-//    server_running = 1;
+    server_running = 1;
     runSmartConfig = 1;
     initTCPIP();
     RED_OFF;
@@ -261,3 +452,5 @@
 
 
 
+
+