Changeset 96

Timestamp:

02/12/09 10:13:34 (15 years ago)

Author:

trnewman

Message:

Removed uneeded files.

Location:

vtcross/trunk/CR_shell/src

Files:

• main_cognitive_engine.cpp (deleted)
• main_cognitive_radio.cpp (modified) (3 diffs)
• socket (deleted)

vtcross/trunk/CR_shell/src/main_cognitive_radio.cpp

@@ -2 +2 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
 #include "tinyxml.h"
 #include "tinystr.h"
-#include "socket/ServerSocket.h"
-#include "socket/SocketException.h"
+#include <arpa/inet.h>
+//#include "socket/ServerSocket.h"
+//#include "socket/SocketException.h"
 
 using namespace std;
@@ -471 +475 @@
         // Start socket server
         int sockfd, newsockfd, clilen;
-        int peer_len = sizeof(struct sockaddr);
         struct sockaddr_in serv_addr, cli_addr;
-        struct sockaddr_in peer;
-
+        char str[20];
 
         // Setup server socket connection
@@ -497 +499 @@
                         error("ERROR on accept");
 
-        if(getpeername(newsockfd, (struct sockaddr *) &peer, (socklen_t*)&peer_len) == -1) {
-            perror("getpeername() failed");
-            return -1;
-        }
-
-        printf("Received a connection from a Cognitive Engine with IP address: %s\n\n",inet_ntoa(peer.sin_addr));
+        inet_ntop(AF_INET,&(cli_addr.sin_addr),str,20); 
+        printf("Received a connection from a Cognitive Engine with IP address: %s\n\n",str);
 
                 // Begin parsing the messages