Revision: 14876
Author: adrian.chadd
Date: Sat Jul 9 08:25:03 2011
Log: Break out TOS whilst I'm at it.
http://code.google.com/p/lusca-cache/source/detail?r=14876
Modified:
/playpen/LUSCA_HEAD_ipv6/src/comm2.c
/playpen/LUSCA_HEAD_ipv6/src/comm2.h
/playpen/LUSCA_HEAD_ipv6/src/forward.c
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/comm2.c Sat Jul 9 08:19:48 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/comm2.c Sat Jul 9 08:25:03 2011
@@ -65,7 +65,7 @@
*/
ConnectStateDataNew *
commConnectStartNewSetup(const char *host, u_short port, CNCB *callback,
- void *data, sqaddr_t *addr6, int flags, int tos, const char *note)
+ void *data, sqaddr_t *addr6, int flags, const char *note)
{
ConnectStateDataNew *cs;
debug(5, 3) ("%s: new connection to %s:%d\n", __func__, host, (int)
port);
@@ -77,7 +77,7 @@
cs->callback = callback;
cs->data = data;
cs->comm_flags = flags;
- cs->comm_tos = tos;
+ cs->comm_tos = 0;
cs->comm_flags = flags;
cs->start_time = cs->timeout = 0;
@@ -121,6 +121,12 @@
{
cs->timeout = timeout;
}
+
+void
+commConnectNewSetTOS(ConnectStateDataNew *cs, int tos)
+{
+ cs->comm_tos = tos;
+}
/*
* Attempt to connect to host:port.
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/comm2.h Sat Jul 9 08:19:48 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/comm2.h Sat Jul 9 08:25:03 2011
@@ -29,7 +29,7 @@
extern ConnectStateDataNew *commConnectStartNewSetup(const char *host,
u_short port, CNCB * callback, void *data, sqaddr_t *addr6, int flags,
- int tos, const char *note);
+ const char *note);
extern void commConnectStartNewBegin(ConnectStateDataNew *cs);
extern void commConnectNewSetupOutgoingV4(ConnectStateDataNew *cs,
@@ -38,5 +38,6 @@
sqaddr_t *lcl);
extern void commConnectNewSetTimeout(ConnectStateDataNew *cs,
int timeout);
+extern void commConnectNewSetTOS(ConnectStateDataNew *cs, int tos);
#endif /* __SQUID_COMM2_H__ */
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/forward.c Sat Jul 9 08:19:48 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/forward.c Sat Jul 9 08:25:03 2011
@@ -775,8 +775,9 @@
* there's no transparency support just yet.
*/
cs = commConnectStartNewSetup(host, port, fwdConnectDone, fwdState,
- NULL, 0, tos, url);
+ NULL, 0, url);
commConnectNewSetTimeout(cs, ctimeout);
+ commConnectNewSetTOS(cs, tos);
commConnectStartNewBegin(cs);
}
--
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.
