Revision: 14891 Author: adrian.chadd Date: Sun Jul 10 03:07:10 2011 Log: .. add the missing bits needed for icp IPv6 compilation.
http://code.google.com/p/lusca-cache/source/detail?r=14891 Modified: /playpen/LUSCA_HEAD_ipv6/libiapp/comm_generic.c /playpen/LUSCA_HEAD_ipv6/libiapp/globals.c /playpen/LUSCA_HEAD_ipv6/libiapp/globals.h ======================================= --- /playpen/LUSCA_HEAD_ipv6/libiapp/comm_generic.c Mon Feb 8 01:08:16 2010 +++ /playpen/LUSCA_HEAD_ipv6/libiapp/comm_generic.c Sun Jul 10 03:07:10 2011 @@ -161,10 +161,18 @@ int i; for (i = 0; i < NHttpSockets; i++) do_call_incoming(HttpSockets[i]); - if (theInIcpConnection >= 0) - do_call_incoming(theInIcpConnection); - if (theOutIcpConnection != theInIcpConnection) - do_call_incoming(theOutIcpConnection); + + /* IPv4 */ + if (theInIcpConnection4 >= 0) + do_call_incoming(theInIcpConnection4); + if (theOutIcpConnection4 != theInIcpConnection4) + do_call_incoming(theOutIcpConnection4); + + /* IPv6 */ + if (theInIcpConnection6 >= 0) + do_call_incoming(theInIcpConnection6); + if (theOutIcpConnection6 != theInIcpConnection6) + do_call_incoming(theOutIcpConnection6); } static inline void ======================================= --- /playpen/LUSCA_HEAD_ipv6/libiapp/globals.c Tue Jan 6 13:43:43 2009 +++ /playpen/LUSCA_HEAD_ipv6/libiapp/globals.c Sun Jul 10 03:07:10 2011 @@ -11,7 +11,9 @@ const char * iapp_useAcceptFilter = NULL; int NHttpSockets = 0; int HttpSockets[MAXHTTPPORTS]; -int theInIcpConnection = -1; -int theOutIcpConnection = -1; +int theInIcpConnection4 = -1; +int theOutIcpConnection4 = -1; +int theInIcpConnection6 = -1; +int theOutIcpConnection6 = -1; StatHist select_fds_hist; int need_linux_tproxy = 0; ======================================= --- /playpen/LUSCA_HEAD_ipv6/libiapp/globals.h Tue Jan 6 13:43:43 2009 +++ /playpen/LUSCA_HEAD_ipv6/libiapp/globals.h Sun Jul 10 03:07:10 2011 @@ -10,8 +10,10 @@ extern const char * iapp_useAcceptFilter; extern int NHttpSockets; /* 0 */ extern int HttpSockets[MAXHTTPPORTS]; -extern int theInIcpConnection; /* -1 */ -extern int theOutIcpConnection; /* -1 */ +extern int theInIcpConnection4; /* -1 */ +extern int theOutIcpConnection4; /* -1 */ +extern int theInIcpConnection6; /* -1 */ +extern int theOutIcpConnection6; /* -1 */ extern int iapp_incomingRate; extern StatHist select_fds_hist; extern int need_linux_tproxy; /* 0 */ -- You received this message because you are subscribed to the Google Groups "lusca-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/lusca-commit?hl=en.
