Diff: Tests/Test00.cpp

Revision:

67:a61d60fa342c

Parent:

66:6b00a764e549

Child:

69:4fc3b0ad12c7

--- a/Tests/Test00.cpp	Thu Nov 01 11:19:47 2012 +0000
+++ b/Tests/Test00.cpp	Thu Nov 01 15:49:08 2012 +0000
@@ -1,34 +1,6 @@
 #include "Test00.h"
 #include "socket.h"
-
-bool connectToSocket(char *ipAddress, int port, int *sockfd) {
-  *sockfd = -1;
-  // create the socket
-  if((*sockfd=socket(AF_INET,SOCK_STREAM,0))<0) {
-     LOG("Error opening socket\r\n");
-     return false;
-  } else {
-     LOG("Socket open\r\n");
-  }
-         
-  // create the socket address
-  sockaddr_in serverAddress;
-  std::memset(&serverAddress, 0, sizeof(struct sockaddr_in));
-  serverAddress.sin_addr.s_addr = inet_addr(ipAddress);
-  serverAddress.sin_family = AF_INET;
-  serverAddress.sin_port = htons(port);
-
-  // do socket connect
-  LOG("Connecting socket to %s:%d", inet_ntoa(serverAddress.sin_addr), ntohs(serverAddress.sin_port));
-  if(connect(*sockfd, (const struct sockaddr *)&serverAddress, sizeof(serverAddress))<0) {
-     ::close(*sockfd);
-     LOG("Could not connect");
-     return false;
-  } else {
-     LOG("Connection OK");
-  }
-  return true;
-}
+#include "TestHelper.h"
 
 const char *gTest00DNSIn[5] = {
    "m2mthings.com",