Revision: 14871 Author: adrian.chadd Date: Sat Jul 9 07:28:53 2011 Log: Begin breaking out the comm2.c related stuff.
Since the setup path for this code is going to be a bit more tricky, we should likely break things out into multiple function calls.. http://code.google.com/p/lusca-cache/source/detail?r=14871 Added: /playpen/LUSCA_HEAD_ipv6/src/comm2.h Modified: /playpen/LUSCA_HEAD_ipv6/src/comm2.c /playpen/LUSCA_HEAD_ipv6/src/forward.c /playpen/LUSCA_HEAD_ipv6/src/protos.h ======================================= --- /dev/null +++ /playpen/LUSCA_HEAD_ipv6/src/comm2.h Sat Jul 9 07:28:53 2011 @@ -0,0 +1,23 @@ +#ifndef __SQUID_COMM2_H__ +#define __SQUID_COMM2_H__ + +typedef struct { + char *host; + u_short port; + CNCB *callback; + void *data; + sqaddr_t in_addr6; + int fd; + int tries; + int addrcount; + int connstart; + const char *comm_note; + int comm_tos; + int comm_flags; +} ConnectStateDataNew; + +extern void +commConnectStartNew(const char *host, u_short port, CNCB * callback, + void *data, sqaddr_t *addr6, int flags, int tos, const char *note); + +#endif /* __SQUID_COMM2_H__ */ ======================================= --- /playpen/LUSCA_HEAD_ipv6/src/comm2.c Sat Jul 9 01:45:26 2011 +++ /playpen/LUSCA_HEAD_ipv6/src/comm2.c Sat Jul 9 07:28:53 2011 @@ -47,21 +47,6 @@ #include <netinet/tcp.h> #endif -typedef struct { - char *host; - u_short port; - CNCB *callback; - void *data; - sqaddr_t in_addr6; - int fd; - int tries; - int addrcount; - int connstart; - const char *comm_note; - int comm_tos; - int comm_flags; -} ConnectStateDataNew; - static PF commConnectFree; static PF commConnectHandle; static IPH commConnectDnsHandle; ======================================= --- /playpen/LUSCA_HEAD_ipv6/src/forward.c Sat Jul 9 01:39:23 2011 +++ /playpen/LUSCA_HEAD_ipv6/src/forward.c Sat Jul 9 07:28:53 2011 @@ -37,6 +37,7 @@ #include "squid.h" #include "pconn.h" #include "hierarchy_entry.h" +#include "comm2.h" /* new connect style framework */ #if LINUX_NETFILTER #include <linux/types.h> ======================================= --- /playpen/LUSCA_HEAD_ipv6/src/protos.h Sat Jul 2 01:02:04 2011 +++ /playpen/LUSCA_HEAD_ipv6/src/protos.h Sat Jul 9 07:28:53 2011 @@ -1061,9 +1061,6 @@ /* comm.c */ extern void commConnectStart(int fd, const char *, u_short, CNCB *, void *, sqaddr_t *addr6); -extern void -commConnectStartNew(const char *host, u_short port, CNCB * callback, - void *data, sqaddr_t *addr6, int flags, int tos, const char *note); /* client_side_location_rewrite.c */ extern void clientHttpLocationRewriteCheck(clientHttpRequest * http); -- 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.
