Revision: 14860
Author: adrian.chadd
Date: Fri Jul 8 21:24:30 2011
Log: Change dst_addr to sqaddr_t.
http://code.google.com/p/lusca-cache/source/detail?r=14860
Modified:
/playpen/LUSCA_HEAD_ipv6/src/acl.c
/playpen/LUSCA_HEAD_ipv6/src/structs.h
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/acl.c Fri Jul 1 07:50:26 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/acl.c Fri Jul 8 21:24:30 2011
@@ -2508,14 +2508,9 @@
checklist->state[ACL_DST_DOMAIN] = ACL_LOOKUP_DONE;
return;
}
- /* XXX dst_addr will eventually grow ipv4/ipv6 awareness */
- /*
- * XXX and how the heck this is supposed to work in that instance is
going
- * XXX to need to be figured out. -adrian
- */
- checklist->dst_addr = ipcacheGetAddrV4(ia, 0);
+ ipcacheGetAddr(ia, 0, &checklist->dst_addr);
checklist->state[ACL_DST_DOMAIN] = ACL_LOOKUP_PENDING;
- fqdncache_nbgethostbyaddr(checklist->dst_addr,
+ fqdncache_nbgethostbyaddr6(&checklist->dst_addr,
aclLookupDstFQDNDone, checklist);
return;
} else if (checklist->state[ACL_PROXY_AUTH] == ACL_LOOKUP_NEEDED) {
@@ -2743,6 +2738,7 @@
{
sqinet_init(&ch->my_address);
sqinet_init(&ch->src_address);
+ sqinet_init(&ch->dst_addr);
}
void
@@ -2750,6 +2746,7 @@
{
sqinet_done(&ch->my_address);
sqinet_done(&ch->src_address);
+ sqinet_done(&ch->dst_addr);
}
CBDATA_TYPE(aclCheck_t);
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/structs.h Sat Jul 2 20:40:06 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/structs.h Fri Jul 8 21:24:30 2011
@@ -287,7 +287,7 @@
struct _aclCheck_t {
const acl_access *access_list;
sqaddr_t src_address;
- struct in_addr dst_addr;
+ sqaddr_t dst_addr;
struct in_addr fwdip_addr;
sqaddr_t my_address;
request_t *request;
--
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.
