Changeset 1943 for trunk/src

Timestamp:

Dec 2, 1999, 5:12:24 PM (26 years ago)

Author:

achimha

Message:

async gethostbyname fixes

Location:

trunk/src/wsock32/new

Files:

• relaywin.cpp (modified) (2 diffs)
• wsock32.cpp (modified) (4 diffs)

trunk/src/wsock32/new/relaywin.cpp

@@ -1 @@
-/* $Id: relaywin.cpp,v 1.5 1999-12-02 16:01:45 achimha Exp $ */
+/* $Id: relaywin.cpp,v 1.6 1999-12-02 16:12:23 achimha Exp $ */
 
 /*
@@ -216 +216 @@
         /* we need to convert the hostent structure here */
         Whostent *WinHostent = (Whostent*)pHM->pvUserData1;
-        hostent *OS2Hostent = (hostent*)pHM->pvUserData2;
-        WinHostent->h_name = OS2Hostent->h_name;
-        WinHostent->h_aliases = OS2Hostent->h_aliases;
-        WinHostent->h_addrtype = (short)OS2Hostent->h_addrtype;
-        WinHostent->h_length = (short)OS2Hostent->h_length;
-        WinHostent->h_addr_list = OS2Hostent->h_addr_list;
-        /* free our temporary OS2 hostent buffer */
-  //TODO: how can we free this? we will end up with a memory leak :(
-  // this memory block not only contains the hostent structure but also the strings it points to
-  // I think we should copy the strings after the Whostent into the Win32 buffer
-  //      free(pHM->pvUserData2);
+        hostent *OS2Hostent = (hostent*)pHM->pvUserData1;
+        short h_addrtype = (short)OS2Hostent->h_addrtype;
+        WinHostent->h_addrtype = h_addrtype;
+        short h_length = (short)OS2Hostent->h_length;
+        WinHostent->h_length = h_length;
+        char **h_addr_list = OS2Hostent->h_addr_list;
+        WinHostent->h_addr_list = h_addr_list;
   //TODO: the size of OS/2 hostent is 4 bytes bigger so the original buffer *might* be too small
 

trunk/src/wsock32/new/wsock32.cpp

@@ -1 @@
-/* $Id: wsock32.cpp,v 1.9 1999-12-02 15:22:05 achimha Exp $ */
+/* $Id: wsock32.cpp,v 1.10 1999-12-02 16:12:24 achimha Exp $ */
 
 /*
@@ -1272 +1272 @@
   HWND  hwndOS2 = Win32ToOS2Handle(hWnd);
   ULONG ulNewID;
-  char *OS2Hostent = (char*)malloc(MAXGETHOSTSTRUCT);
 
   if (hwndRelay == NULL) // already initialized ?
@@ -1285 +1284 @@
   else
     // add entry to list, we need to store both our temp buffer and the apps buffer
-    ulNewID = RelayAlloc(hWnd, wMsg, ASYNCREQUEST_GETHOSTBYNAME, buf, OS2Hostent);
+    ulNewID = RelayAlloc(hWnd, wMsg, ASYNCREQUEST_GETHOSTBYNAME, buf);
 
   // call pmwsock function, will fill our temp buffer
@@ -1291 +1290 @@
                              ulNewID,
                              name,
-                             OS2Hostent,
+                             buf,
                              buflen);