Changeset 184

Timestamp:

03/22/09 15:00:48 (15 years ago)

Author:

bhilburn

Message:

Added a new CreateClientSocket? function, using the new RemoteComponent? struct
type, to replace the old ClientSocket? function. Note that the old function is
left in until the new stuff gets tested and reviewed.

Location:

vtcross/trunk/src

Files:

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

vtcross/trunk/src/include/vtcross/containers.h

@@ -81 +81 @@
  * that this information is independent of component type, but technically will
  * only ever be the SML or shell.
+ *
+ * TODO I'm not 100% certain I'm doing this in the most efficient way.  Need
+ * someone to look it over.
  */
 struct RemoteComponent {
     struct hostent *server;
     std::string serverName;
-    std::string serverPort;
+    int32_t serverPort;
     int32_t socketFD;
 };

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

@@ -13 +13 @@
 #include <stdint.h>
 
+#include "vtcross/containers.h"
+
 
 /* TODO
  */
 void ReadMessage(int32_t socketFD, char* msgBuffer);
-
-
-/* TODO
- */
-int32_t ClientSocket(const char* serverName, const char* portNumber);
 
 
@@ -43 +40 @@
 
 /* TODO
+ * This is meant as the future replacement for the function below it.  It is
+ * still a work in progress, and needs a code-review before we move to it
+ * entirely.
+ */
+void CreateClientSocket(struct RemoteComponent* serverInfo);
+
+
+/* This is the original function that does what the above function is supposed
+ * to do.
+ */
+int32_t ClientSocket(const char* serverName, const char* portNumber);
+
+
+/* TODO
  */
 int32_t  AcceptTCPConnection(int32_t servSock);

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

@@ -76 +76 @@
 }
 
+
+/* TODO see notes in socketcomm.h. This function, and the RemoteComponent
+ * struct, need a code review.
+ */
+void
+CreateClientSocket(struct RemoteComponent* serverInfo)
+{
+    if(serverInfo == NULL)
+        ERROR(1, "CreateClientSocket received null struct pointer.\n");
+
+    struct hostent *server = gethostbyname(serverInfo->serverName.c_str());
+    if(server == NULL)
+        ERROR(1, "No server found by that hostname.");
+        
+    memcpy(serverInfo, server, sizeof(struct hostent));
+
+    serverInfo->socketFD = socket(AF_INET, SOCK_STREAM, 0);
+    if(serverInfo->socketFD < 0) 
+        ERROR(1, "Error opening socket");
+
+    struct sockaddr_in serv_addr;
+    memset((void *) &serv_addr, 0, sizeof(serv_addr));
+    serv_addr.sin_family = AF_INET;
+    serv_addr.sin_port = htons(serverInfo->serverPort);
+    memcpy((char *) &serv_addr.sin_addr.s_addr, (char *) server->h_addr, \
+            server->h_length);
+
+    if(connect(serverInfo->socketFD, (struct sockaddr *) &serv_addr, \
+            sizeof(serv_addr)) < 0) 
+        ERROR(1, "Error connecting to remote socket.");
+}
+
     
 /* TODO I'm fairly certain this function is unnecessary, see function below for more details...