Changeset 66 for vtcross

Timestamp:

11/20/08 22:00:50 (16 years ago)

Author:

ahe

Message:

update socket

Location:

vtcross/branches/trnewman/CR_shell

Files:

• Makefile (modified) (2 diffs)
• src/main_cognitive_radio.cpp (modified) (12 diffs)
• src/socket/simple_client_main.cpp (modified) (1 diff)

vtcross/branches/trnewman/CR_shell/Makefile

@@ -3 +3 @@
 #
 
-TESTS = cognitive_radio
-all: $(TESTS)
+TESTS = cognitive_radio cognitive_engine
+#CTESTS = client
+all: $(TESTS) $(CTESTS)
 
 CC = g++
+cc = gcc
 CFLAGS = -Wall -O3
 LDFLAGS = -lm -ldl -pthread -lnsl
@@ -30 +32 @@
         $(CC) $(CFLAGS) $(OBJS) $(SOCKET_OBJS) $(LDFLAGS) $< -o $@
 
+$(CTESTS) : % : src/main_%.c
+                $(cc) $(CFLAGS) $(LDFLAGS) $< -o $@
+
 clean:
         rm -rf *.o socket/*.o $(TESTS)

vtcross/branches/trnewman/CR_shell/src/main_cognitive_radio.cpp

@@ -215 +215 @@
 }
 
-int ReceiveMessage(int socketfd) {
+int ReceiveMessage(int socketfd, string message) {
         
         char buffer[256];
@@ -221 +221 @@
 
         // Clear incoming data buffer
-        bzero(buffer,256);
+    bzero(buffer,256);
     
         // Wait for incoming message
@@ -227 +227 @@
         
         // Print message
-        if (n > 0) printf("Here is the message: %s\n",buffer);
-
-        return n;
+    if (n > 0) 
+        printf("Here is the message: %s\n",buffer);
+    //printf("n = %d\n",n);
+        
+    return n;
 }
 
@@ -236 +238 @@
 
         // Write message back to client
-        n = send(socketfd,message.c_str(),(message.size()+1),MSG_NOSIGNAL);
-        return n;
-
+    n = send(socketfd,message.c_str(),(message.size()+1),MSG_NOSIGNAL);
+        
+    return n;
 }
 
@@ -245 +247 @@
         char counter[55];
         char var[50];
-        int k;
-
-
-//      while(1) {
+
+    
+    while(1) {
                 // Send parameters from struct
                 sprintf(counter,"%d",ce_info->numUtilities);
                 SendMessage(socketfd,counter);
                 
-                for(i = 0; i < ce_info->numUtilities ; i++) {
+                // utilities
+        for(i = 0; i < ce_info->numUtilities; i++) {
                         SendMessage(socketfd,uList[i]->name);
                         SendMessage(socketfd,uList[i]->units);
@@ -260 +262 @@
                         SendMessage(socketfd,var);
                 }
-                sprintf(counter,"%i",ce_info->numParameters);
+
+                // parameters
+        sprintf(counter,"%i",ce_info->numParameters);
                 SendMessage(socketfd,counter);
                 for(i = 0; i < ce_info->numParameters; i++) {
@@ -279 +283 @@
                         }
                 }
+
+        // observables
                 sprintf(counter,"%i",ce_info->numObservables);
                 SendMessage(socketfd,counter);
@@ -291 +297 @@
                         }
                 }
-/*              
+        
 
                 // Receive a message
-                n = ReceiveMessage(socketfd);   
-                if (n < 0) {
-                        printf("ERROR reading from socket");
+        string message;
+                n = ReceiveMessage(socketfd, message);
+        //cout << message << endl;
+
+
+        //printf("n = %d\n", n);
+                /*if (n < 0) {
+                        printf("ERROR reading from socket\n");
                         close(socketfd);
                         return;
@@ -303 +314 @@
                         printf("Client has closed the connection.\n");
                         return;
-                }
-*/      
-//      }
+                }*/
+        
+    }
 }
 
@@ -328 +339 @@
         clilen = sizeof(cli_addr);
 
-        while(1) {
+        //while(1) {
                 newsockfd = accept(sockfd, 
                         (struct sockaddr *) &cli_addr, 
@@ -337 +348 @@
                 // Begin parsing the messages
                 StartMessaging(newsockfd,uList, pList, oList, ce_info);
-        }
+        //}
         return 0;
 }
@@ -379 +390 @@
         } else {
                 // In parent process - open cognitive engine port.
-                StartShell(30000,uList, pList, oList, &ce_info);
+                StartShell(30003,uList, pList, oList, &ce_info);
         } 
         

vtcross/branches/trnewman/CR_shell/src/socket/simple_client_main.cpp

@@ -9 +9 @@
     {
 
-      ClientSocket client_socket ( "localhost", 30000 );
+      ClientSocket client_socket ( "localhost", 30001 );
 
       std::string reply;