Changeset 168

Timestamp:

03/20/09 00:04:05 (15 years ago)

Author:

bhilburn

Message:

Making everything play nicely. Note that the shell is a huge mess right now...
it will compile, but its a long ways from being warning-free and tight code.

Location:

vtcross/trunk/src/shell

Files:

• Makefile.am (modified) (1 diff)
• cr_shell.cpp (modified) (6 diffs)

vtcross/trunk/src/shell/Makefile.am

@@ -6 +6 @@
 
 shell_demo_SOURCES = cr_shell.cpp
-shell_demo_LDADD = ../lib/tinyxml/libtinyxml.a
+shell_demo_LDADD = ../lib/tinyxml/libtinyxml.a ../lib/socketcomm/libsocketcomm.a
 

vtcross/trunk/src/shell/cr_shell.cpp

@@ -223 +223 @@
     n = recv(socket,buffer,i+1,0);
     if (n < 0)
-        error("ERROR reading from socket");
+        ERROR(1, "Error reading from socket!\n");
     //    printf("ReadMessage:%s %d\n",buffer,n);
 
@@ -239 +239 @@
     n = send(socketfd,message.c_str(),(message.size()+1),0);
     if (n<0)
-        error("Error sending to client\n");
+        ERROR(1, "Error sending to client\n");
     if(n == 0)
-        printtf("Client closed the socket.\n");
+        printf("Client closed the socket.\n");
 
         //printf("SendMessage:%s %d\n",message.c_str(),n);      
@@ -255 +255 @@
         //int32_t total_bytes;   
 
-        printtf("Cognitive Radio:: Sending Radio Operating Profile to Cognitive Engine.\n\n");
+        printf("Cognitive Radio:: Sending Radio Operating Profile to Cognitive Engine.\n\n");
  
         // utilities
@@ -513 +513 @@
     int32_t clntSock;                    /* Socket descriptor for client */
     struct sockaddr_in echoClntAddr;
-    unsigned int32_t clntLen;
+    uint32_t clntLen;
 
     /* Set the size of the in-out parameter */
@@ -538 +538 @@
     /* Create socket for incoming connections */
     if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
-        DieWithError("socket() failed");
+        ERROR(1, "socket() failed\n");
       
     /* Construct local address structure */
@@ -548 +548 @@
     /* Bind to the local address */
     if (bind(sock, (struct sockaddr *) &echoServAddr, sizeof(echoServAddr)) < 0)
-        DieWithError("bind() failed");
+        ERROR(1, "bind() failed\n");
 
     /* Mark the socket so it will listen for incoming connections */