[Monotone-commits-diffs] net.venge.monotone.visualc: c7690b80b6a7d6a65029e8e377c29225dd2d0574

[code]

revision:            c7690b80b6a7d6a65029e8e377c29225dd2d0574
date:                2010-12-22T22:57:40
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone.visualc
changelog:
Hm, the sockaddr members have different types in MSVC and MinGW,
even with both using the Winsock2 headers.

manifest:
format_version "1"

new_manifest [2eeeb7cfcfea0f9bfe41344d07ffe86cfadc0cd3]

old_revision [8d707e5ee0b0b3a9a35f2e15f797550f7356be44]

patch "win32/tester-check-net.cc"
 from [2287668986d3d9048fba937142222ae3703556ab]
   to [cc199fd3782d8741c278841c37d8b428769fdcee]
============================================================
--- win32/tester-check-net.cc	2287668986d3d9048fba937142222ae3703556ab
+++ win32/tester-check-net.cc	cc199fd3782d8741c278841c37d8b428769fdcee
@@ -53,22 +53,28 @@ int main(void)
   if (use_ip6)
   {
       my_addr_6.sin6_family = AF_INET6;
-      my_addr_6.sin6_port = 0x5555;
-      for (int i = 0; i < 15; ++i)
-        my_addr_6.sin6_addr.u.Byte[i] = 0;
-      my_addr_6.sin6_addr.u.Byte[15] = 1;
 
       my_addr = (struct sockaddr *) &my_addr_6;
       my_addr_size = sizeof(my_addr_6);
+      
+      if (WSAStringToAddressA("[::1]:21845", AF_INET6, 0, my_addr, &my_addr_size) != 0)
+      {
+          fprintf(stderr, "%s: could not parse PIv6 address: %d\n", myname, WSAGetLastError());
+          ExitProcess(1);
+      }
   }
   else
   {
       my_addr_4.sin_family = AF_INET;
-      my_addr_4.sin_port = 0x5555;
-      WSAHtonl(listen_sock, 0x7f000001, &my_addr_4.sin_addr.S_un.S_addr);
 
       my_addr = (struct sockaddr *) &my_addr_4;
       my_addr_size = sizeof(my_addr_4);
+      
+      if (WSAStringToAddressA("127.0.0.1:21845", AF_INET, 0, my_addr, &my_addr_size) != 0)
+      {
+          fprintf(stderr, "%s: could not parse PIv4 address: %d\n", myname, WSAGetLastError());
+          ExitProcess(1);
+      }
   }
 
   if (bind(listen_sock, my_addr, my_addr_size) != 0)