--------------------- PatchSet 5472 Date: 2007/08/22 03:29:34 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Part 2: ensure backwards compatible external helpers (force IPv4 for now) Members: src/ipc.cc:1.9.4.14->1.9.4.15 Index: squid3/src/ipc.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/ipc.cc,v retrieving revision 1.9.4.14 retrieving revision 1.9.4.15 diff -u -r1.9.4.14 -r1.9.4.15 --- squid3/src/ipc.cc 22 Aug 2007 02:27:04 -0000 1.9.4.14 +++ squid3/src/ipc.cc 22 Aug 2007 03:29:34 -0000 1.9.4.15 @@ -1,6 +1,6 @@ /* - * $Id: ipc.cc,v 1.9.4.14 2007/08/22 02:27:04 amosjeffries Exp $ + * $Id: ipc.cc,v 1.9.4.15 2007/08/22 03:29:34 amosjeffries Exp $ * * DEBUG: section 54 Interprocess Communication * AUTHOR: Duane Wessels @@ -104,10 +104,12 @@ *hIpc = NULL; /* AYJ INET6 TODO : Some external helpers may require IPv4-localhost */ -/* Find a way to migrate a config option down here per-helper */ -/* once here we can set local_addr.SetLocalhost(AF_*) */ +/* Find a way to migrate the config option down here per-helper */ +/* once here we can set (config)->local_addr */ +/* until then we must use IPv4-localhost here for compatability */ if (type == IPC_TCP_SOCKET) { + local_addr.SetIPv4(); // force IPv4 crfd = cwfd = comm_open(SOCK_STREAM, 0, local_addr, @@ -118,7 +120,9 @@ local_addr, 0, /* blocking */ name); + local_addr.SetLocalhost(); // reset } else if (type == IPC_UDP_SOCKET) { + local_addr.SetIPv4(); // force IPv4 crfd = cwfd = comm_open(SOCK_DGRAM, 0, local_addr, @@ -129,6 +133,7 @@ local_addr, 0, name); + local_addr.SetLocalhost(); // reset } else if (type == IPC_FIFO) { int p2c[2]; int c2p[2];