bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed the access member of struct acl_s to acl_access.

Browse Source 
Changed some of the types for the various variables to better reflect what
they are actually being used for.
This commit is contained in:
Robert James Kaes 2001-05-27 02:20:54 +00:00
parent 8045684c69
commit bf477e9dff
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/acl.c
View File

@ -1,4 +1,4 @@
/* $Id: acl.c,v 1.3 2001-05-23 17:57:22 rjkaes Exp $ /* $Id: acl.c,v 1.4 2001-05-27 02:20:54 rjkaes Exp $
* *
* This system handles Access Control for use of this daemon. A list of * This system handles Access Control for use of this daemon. A list of
* domains, or IP addresses (including IP blocks) are stored in a list * domains, or IP addresses (including IP blocks) are stored in a list
@ -26,7 +26,7 @@
#include "sock.h" #include "sock.h"
struct acl_s { struct acl_s {
acl_access_t access; acl_access_t acl_access;
enum { ACL_STRING, ACL_NUMERIC } type; enum { ACL_STRING, ACL_NUMERIC } type;
char *location; char *location;
int netmask; int netmask;
@ -69,7 +69,7 @@ static in_addr_t make_netmask(int netmask_num)
*/ */
int insert_acl(char *location, acl_access_t access_type) int insert_acl(char *location, acl_access_t access_type)
{ {
unsigned int i; size_t i;
struct acl_s **rev_acl_ptr, *acl_ptr, *new_acl_ptr; struct acl_s **rev_acl_ptr, *acl_ptr, *new_acl_ptr;
char *nptr; char *nptr;
@ -78,8 +78,8 @@ int insert_acl(char *location, acl_access_t access_type)
/* /*
* First check to see if the location is a string or numeric. * First check to see if the location is a string or numeric.
*/ */
for (i = 0; i < strlen(location); i++) { for (i = 0; i < strlen((char *)location); i++) {
if (isdigit(location[i]) != 0 && location[i] != '.') { if (isdigit((unsigned char)location[i]) != 0 && location[i] != '.') {
break; break;
} }
} }
@ -98,7 +98,7 @@ int insert_acl(char *location, acl_access_t access_type)
return -1; return -1;
} }
new_acl_ptr->access = access_type; new_acl_ptr->acl_access = access_type;
if (i != strlen(location)) { if (i != strlen(location)) {
/* We did break early, so this a numeric location. /* We did break early, so this a numeric location.
@ -165,8 +165,8 @@ int check_acl(int fd)
while (aclptr) { while (aclptr) {
if (aclptr->type == ACL_STRING) { if (aclptr->type == ACL_STRING) {
int test_length = strlen(string_address); size_t test_length = strlen(string_address);
int match_length = strlen(aclptr->location); size_t match_length = strlen(aclptr->location);
if (test_length < match_length) { if (test_length < match_length) {
aclptr = aclptr->next; aclptr = aclptr->next;
@ -174,8 +174,8 @@ int check_acl(int fd)
} }
if (strcasecmp(string_address + (test_length - match_length), aclptr->location) == 0) { if (strcasecmp(string_address + (test_length - match_length), aclptr->location) == 0) {
if (aclptr->access == ACL_DENY) { if (aclptr->acl_access == ACL_DENY) {
log(LOG_NOTICE, "Unauthorized access from %s", string_address); log_message(LOG_NOTICE, "Unauthorized access from %s", string_address);
return 0; return 0;
} else { } else {
return 1; return 1;
@ -196,8 +196,8 @@ int check_acl(int fd)
netmask_addr = make_netmask(aclptr->netmask); netmask_addr = make_netmask(aclptr->netmask);
if ((test_addr.s_addr & netmask_addr) == (match_addr.s_addr & netmask_addr)) { if ((test_addr.s_addr & netmask_addr) == (match_addr.s_addr & netmask_addr)) {
if (aclptr->access == ACL_DENY) { if (aclptr->acl_access == ACL_DENY) {
log(LOG_NOTICE, "Unauthorized access from %s", ip_address); log_message(LOG_NOTICE, "Unauthorized access from %s", ip_address);
return 0; return 0;
} else { } else {
return 1; return 1;
@ -215,6 +215,6 @@ int check_acl(int fd)
/* /*
* Deny all connections by default. * Deny all connections by default.
*/ */
log(LOG_NOTICE, "Unauthorized connection from %s [%s]", string_address, ip_address); log_message(LOG_NOTICE, "Unauthorized connection from %s [%s]", string_address, ip_address);
return 0; return 0;
} }