--------------------- PatchSet 1477 Date: 2005/06/27 13:14:06 Author: rmartinez Branch: squid3-ipv6 Tag: squid3-ipv6-20050627 Log: Final step previous to merge. IPv4 default is ready too Members: include/config.h:1.7.4.7->1.7.4.8 Index: squid3/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid3/include/config.h,v retrieving revision 1.7.4.7 retrieving revision 1.7.4.8 diff -u -r1.7.4.7 -r1.7.4.8 --- squid3/include/config.h 16 Jun 2005 10:39:31 -0000 1.7.4.7 +++ squid3/include/config.h 27 Jun 2005 13:14:06 -0000 1.7.4.8 @@ -1,5 +1,5 @@ /* - * $Id: config.h,v 1.7.4.7 2005/06/16 10:39:31 rmartinez Exp $ + * $Id: config.h,v 1.7.4.8 2005/06/27 13:14:06 rmartinez Exp $ * * AUTHOR: Duane Wessels * @@ -205,9 +205,10 @@ * so you can control de compilation modes from this _only_ file */ +typedef int ASN; + #ifdef INET6 -typedef int ASN; #define IN_ADDR in6_addr @@ -259,8 +260,46 @@ * the above macros for IPv4. * If transition is O.K, at least IPv4 will be kept */ + #define IN_ADDR in_addr +#define SOCKADDR_IN sockaddr_in #define IP_MREQ ip_mreq +#define INADDR_ANY_ASSIGN any_addr +#define INADDR_ANY_INIT htonl(INADDR_ANY) +#define MAXIPSTRLEN INET_ADDRSTRLEN +#define AF_FAMILY AF_INET +#define PF_FAMILY PF_INET +#define SA_IS_ANYADDR(s) \ + ((s).sin_addr.s_addr == INADDR_ANY) +#define INET_NTOA(s) \ + inet_ntoa(s) +#define SA_NTOA(s) \ + inet_ntoa((s).sin_addr) +#define ADDR_FROM_SA(s) \ + ((s).sin_addr) +#define PORT_FROM_SA(s) \ + ((s).sin_port) +#define FAMILY_FROM_SA(s) \ + ((s).sin_family) + +#define SAFE_INET_ADDR(host, addr) \ + safe_inet_addr(host,addr) + +#define ADDR_EQUALS(s1,s2) \ + (memcmp(&(s1), &(s2), sizeof(struct IN_ADDR)) == 0) + +#define ADDR_IS_ANYADDR(s) \ + ((s).s_addr == 0x00000000) + +#define ADDR_IS_NOADDR(s) \ + ((s).s_addr == 0xFFFFFFFF) + +#define GETHOSTBYNAME(name) \ + gethostbyname(name) + +#define NEEDS_BRACKETS(s) \ + 0 + #define RFC1035BUILD_A_QUERY(name,buf,size) \ rfc1035BuildAQuery(name,buf,size)