Revision: 14861
Author: adrian.chadd
Date: Fri Jul 8 21:30:40 2011
Log: Convert fwdip_addr to sqaddr_t
http://code.google.com/p/lusca-cache/source/detail?r=14861
Modified:
/playpen/LUSCA_HEAD_ipv6/src/acl.c
/playpen/LUSCA_HEAD_ipv6/src/structs.h
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/acl.c Fri Jul 8 21:24:30 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/acl.c Fri Jul 8 21:30:40 2011
@@ -2351,9 +2351,9 @@
case ACL_DSTFWD_IP:
/* make sure this checks that the dstfwdip is SET to something non-blank
and
* error out in case. */
- if (IsAnyAddr(&checklist->fwdip_addr))
+ if (sqinet_is_anyaddr(&checklist->fwdip_addr))
return -1;
- return aclMatchIp4(&ae->data, checklist->fwdip_addr);
+ return aclMatchIp(&ae->data, &checklist->fwdip_addr);
/* NOTREACHED */
case ACL_NONE:
case ACL_ENUM_MAX:
@@ -2739,6 +2739,9 @@
sqinet_init(&ch->my_address);
sqinet_init(&ch->src_address);
sqinet_init(&ch->dst_addr);
+ sqinet_init(&ch->fwdip_addr);
+ sqinet_set_family(&ch->fwdip_addr, AF_INET);
+ sqinet_set_anyaddr(&ch->fwdip_addr);
}
void
@@ -2747,6 +2750,7 @@
sqinet_done(&ch->my_address);
sqinet_done(&ch->src_address);
sqinet_done(&ch->dst_addr);
+ sqinet_done(&ch->fwdip_addr);
}
CBDATA_TYPE(aclCheck_t);
=======================================
--- /playpen/LUSCA_HEAD_ipv6/src/structs.h Fri Jul 8 21:24:30 2011
+++ /playpen/LUSCA_HEAD_ipv6/src/structs.h Fri Jul 8 21:30:40 2011
@@ -288,7 +288,7 @@
const acl_access *access_list;
sqaddr_t src_address;
sqaddr_t dst_addr;
- struct in_addr fwdip_addr;
+ sqaddr_t fwdip_addr;
sqaddr_t my_address;
request_t *request;
/* for acls that look at reply data */
--
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.
