From 415ac6a2ce70e6822b8f08044de1c5c09e61263a Mon Sep 17 00:00:00 2001
From: prabatuty <prabatuty>
Date: Thu, 17 Mar 2011 15:27:54 +0000
Subject: [PATCH] windows porting changesw

---
 src/network/TCPClient.cxx |  6 +++---
 src/network/UDPClient.cxx | 10 +++++-----
 src/network/UDPServer.cxx |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/network/TCPClient.cxx b/src/network/TCPClient.cxx
index 51679152..87c9a667 100644
--- a/src/network/TCPClient.cxx
+++ b/src/network/TCPClient.cxx
@@ -56,7 +56,7 @@ DbRetVal TCPClient::send(NetworkPacketType type)
             return ErrNoConnection;
         }
         printError(ErrOS, "Unable to send the packet");
-        close(sockfd);
+        os::close(sockfd);
         sockfd = -1;
         isConnectedFlag = false;
         return ErrNoConnection;
@@ -149,7 +149,7 @@ DbRetVal TCPClient::receive()
     int ret = os::select(sockfd+1, &fdset, 0, 0, &timeout);
     if (ret <= 0) {
         printError(ErrPeerTimeOut,"Response timeout for peer site");
-        close(sockfd);
+        os::close(sockfd);
         sockfd = -1;
         isConnectedFlag = false;
         return ErrPeerTimeOut;
@@ -159,7 +159,7 @@ DbRetVal TCPClient::receive()
     if (numbytes == -1)
     {
        printError(ErrOS, "Unable to receive response from peer");
-        close(sockfd);
+        os::close(sockfd);
         sockfd = -1;
         isConnectedFlag = false;
         return ErrNoConnection;
diff --git a/src/network/UDPClient.cxx b/src/network/UDPClient.cxx
index 41c0e175..476c5de8 100644
--- a/src/network/UDPClient.cxx
+++ b/src/network/UDPClient.cxx
@@ -57,7 +57,7 @@ DbRetVal UDPClient::send(NetworkPacketType type, char *buf, int len)
     }
 */
     int numbytes=0;
-    if ((numbytes=sendto(sockfd, hdr, sizeof(PacketHeader), 0,
+    if ((numbytes=sendto(sockfd, (const char*)hdr, sizeof(PacketHeader), 0,
            (struct sockaddr *)&srvAddr, sizeof(struct sockaddr))) == -1) {
         printError(ErrOS, "Unable to send the packet\n");
         return ErrOS;
@@ -91,7 +91,7 @@ DbRetVal UDPClient::receive()
 
     int response =0;
     socklen_t len = sizeof(struct sockaddr);
-    int numbytes = recvfrom(sockfd, &response, 4, 0,
+    int numbytes = recvfrom(sockfd, (char*)&response, 4, 0,
                    (struct sockaddr *)&fromAddr, &len);
     if (numbytes !=4)
     {
@@ -136,7 +136,7 @@ DbRetVal UDPClient::connect()
     hdr->packetLength = 0;
     hdr->srcNetworkID = 
     hdr->version = 1;
-    if ((numbytes=sendto(sockfd, hdr, sizeof(PacketHeader), 0,
+    if ((numbytes=sendto(sockfd, (const char*) hdr, sizeof(PacketHeader), 0,
            (struct sockaddr *)&srvAddr, sizeof(struct sockaddr))) == -1) {
         printError(ErrOS, "Unable to send the packet\n");
         return ErrOS;
@@ -157,8 +157,8 @@ DbRetVal UDPClient::connect()
 
     int response =0;
     socklen_t len = sizeof(struct sockaddr);
-    numbytes = recvfrom(sockfd, &response, 4, 0,
-                   (struct sockaddr *)&fromAddr, &len);
+    numbytes = recvfrom(sockfd, (char*)&response, 4, 0,
+                   (struct sockaddr *)&fromAddr,  &len);
     if (numbytes !=4)
     {
        printf("Unable to receive response from peer\n");
diff --git a/src/network/UDPServer.cxx b/src/network/UDPServer.cxx
index 73715a20..43b0ad01 100644
--- a/src/network/UDPServer.cxx
+++ b/src/network/UDPServer.cxx
@@ -59,7 +59,7 @@ DbRetVal UDPServer::handleClient()
    PacketHeader header;
    socklen_t addressLen = sizeof(struct sockaddr);
    //printf("UDP Server receives packet\n");
-   int numbytes = recvfrom(sockfd, &header,  sizeof(PacketHeader), 0,
+   int numbytes = recvfrom(sockfd, (char*) &header,  sizeof(PacketHeader), 0,
                         (struct sockaddr*) &clientAddress, &addressLen);
    if (numbytes == -1)
    {
@@ -71,7 +71,7 @@ DbRetVal UDPServer::handleClient()
    if (header.packetType == NW_PKT_CONNECT)
    {
        int response =1;
-       numbytes = sendto(sockfd, &response, 4, 0,
+       numbytes = sendto(sockfd, (const char*) &response, 4, 0,
               (struct sockaddr*) &clientAddress, addressLen);
        if (numbytes != 4)
        {
@@ -94,7 +94,7 @@ DbRetVal UDPServer::handleClient()
     }
 
    numbytes = recvfrom(sockfd, buffer, header.packetLength, 0,
-                        (struct sockaddr*) &clientAddress, &addressLen);
+                        (struct sockaddr*) &clientAddress,  &addressLen);
 
    //printf("Bytes read %d\n", numbytes);
    if (numbytes == -1)
@@ -105,7 +105,7 @@ DbRetVal UDPServer::handleClient()
    SqlNetworkHandler handler;
    // following line is changed may  not work
    void * response = (void *) handler.process(header, buffer); 
-   numbytes = sendto(sockfd, &response, 4, 0,
+   numbytes = ::sendto(sockfd, (const char*) &response, 4, 0,
               (struct sockaddr*) &clientAddress, addressLen);
    if (numbytes != 4)
    {
-- 
2.11.4.GIT