Changeset 176

Timestamp:

03/21/09 17:47:25 (15 years ago)

Author:

bhilburn

Message:

Moved three functions from the shell's implementation to the socket library.
Have not yet cleaned them up.

Location:

vtcross/trunk/src

Files:

• include/vtcross/socketcomm.h (modified) (1 diff)
• lib/socketcomm/socketcomm.cpp (modified) (2 diffs)

vtcross/trunk/src/include/vtcross/socketcomm.h

@@ -41 +41 @@
         struct CE_Info *ce_info);
 
+
+/* TODO
+ */
+int32_t  AcceptTCPConnection(int32_t servSock);
+
+
+/* TODO
+ */
+int32_t CreateTCPServerSocket(unsigned short port);
+
+
+/* TODO
+ */
+void HandleTCPClient(int32_t socketfd, Utility * uList[], Parameter * pList[], \
+        Observable * oList[], CE_Info * ce_info);
+
 #endif

vtcross/trunk/src/lib/socketcomm/socketcomm.cpp

@@ -76 +76 @@
 
     
-/*
+/* TODO I'm fairly certain this function is unnecessary, see function below for more details...
 int32_t
 SendMessage(int32_t socketFD, char* message) 
@@ -189 +189 @@
 }
 
+
+int32_t 
+AcceptTCPConnection(int32_t servSock)
+{
+    int32_t clntSock;                    /* Socket descriptor for client */
+    struct sockaddr_in echoClntAddr;
+    uint32_t clntLen;
+
+    /* Set the size of the in-out parameter */
+    clntLen = sizeof(echoClntAddr);
+
+    /* Wait for a client to connect */
+    //if ((clntSock = accept(servSock, (struct sockaddr *) &echoClntAddr, &clntLen)) < 0) {
+    if ((clntSock = accept(servSock, NULL, NULL)) < 0) {
+        return -1;
+    } 
+   
+    /* clntSock is connected to a client! */
+    
+    printf("Handling client %s\n", inet_ntoa(echoClntAddr.sin_addr));
+
+    return clntSock;
+}
+
+int32_t 
+CreateTCPServerSocket(uint16_t port)
+{
+    int32_t sock;                        /* socket to create */
+    struct sockaddr_in echoServAddr; /* Local address */
+
+    /* Create socket for incoming connections */
+    if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
+        ERROR(1, "socket() failed\n");
+      
+    /* Construct local address structure */
+    memset(&echoServAddr, 0, sizeof(echoServAddr));   /* Zero out structure */
+    echoServAddr.sin_family = AF_INET;                /* int32_ternet address family */
+    echoServAddr.sin_addr.s_addr = htonl(INADDR_ANY); /* Any incoming int32_terface */
+    echoServAddr.sin_port = htons(port);              /* Local port */
+
+    /* Bind to the local address */
+    if (bind(sock, (struct sockaddr *) &echoServAddr, sizeof(echoServAddr)) < 0)
+        ERROR(1, "bind() failed\n");
+
+    /* Mark the socket so it will listen for incoming connections */
+    if (listen(sock, 5) < 0) {
+        printf("listen() failed\n");
+        return 0;
+    }
+
+    return sock;
+}
+
+void 
+HandleTCPClient(int32_t socketfd, Utility * uList[], Parameter * pList[], \
+        Observable * oList[], CE_Info * ce_info) 
+{
+    char buffer[256];        /* Buffer for echo string */
+
+    /* Receive message from client */
+    bzero(buffer,256);
+    ReadMessage(socketfd,buffer);
+
+    printf("Cognitive Radio:: Message Received - %s.\n\n", buffer);
+
+    if(strcmp(buffer,"c_register") == 0) 
+            InitializeCE(socketfd, uList, pList, oList, ce_info);
+
+    if(strcmp(buffer,"p_register") == 0)
+            InitializePE(socketfd, ce_info);
+
+    if(strcmp(buffer,"optimize") == 0)
+            RunSimulator(socketfd, uList, pList, oList, ce_info);
+        
+    //close(socketfd);    /* Close client socket */
+}