kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup of acl.c

Browse Source 
Reported by dimas
Closes issue #10784


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-10-18 07:23:41 +00:00
parent 7e23779b01
commit 9203f4fedb
1 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
main/acl.c
View File

@@ -123,64 +123,71 @@ struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original)
struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path, int *error) struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path, int *error)
{ {
struct ast_ha *ha; struct ast_ha *ha;
char *nm = "255.255.255.255"; char *nm;
char tmp[256];
struct ast_ha *prev = NULL; struct ast_ha *prev = NULL;
struct ast_ha *ret; struct ast_ha *ret;
int x, z; int x;
unsigned int y; char *tmp = strdupa(stuff);
ret = path; ret = path;
while (path) { while (path) {
prev = path; prev = path;
path = path->next; path = path->next;
} }
if ((ha = ast_malloc(sizeof(*ha)))) {
ast_copy_string(tmp, stuff, sizeof(tmp)); ha = ast_malloc(sizeof(*ha));
nm = strchr(tmp, '/'); if (!ha)
if (!nm) { return ret;
nm = "255.255.255.255";
} else { nm = strchr(tmp, '/');
*nm = '\0'; if (!nm) {
nm++; /* assume /32. Yes, htonl does not do anything for this particular mask
} but we better use it to show we remember about byte order */
ha->netmask.s_addr = htonl(0xFFFFFFFF);
} else {
*nm = '\0';
nm++;
if (!strchr(nm, '.')) { if (!strchr(nm, '.')) {
if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32)) { if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32))
y = 0; ha->netmask.s_addr = htonl(0xFFFFFFFF << (32 - x));
for (z = 0; z < x; z++) { else {
y >>= 1; ast_log(LOG_WARNING, "Invalid CIDR in %s\n", stuff);
y |= 0x80000000; ast_free(ha);
} if (error)
ha->netmask.s_addr = htonl(y); *error = 1;
return ret;
} }
} else if (!inet_aton(nm, &ha->netmask)) { } else if (!inet_aton(nm, &ha->netmask)) {
ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm); ast_log(LOG_WARNING, "Invalid mask in %s\n", stuff);
ast_free(ha);
if (error) if (error)
*error = 1; *error = 1;
ast_free(ha);
return ret; return ret;
} }
if (!inet_aton(tmp, &ha->netaddr)) {
ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp);
if (error)
*error = 1;
ast_free(ha);
return ret;
}
ha->netaddr.s_addr &= ha->netmask.s_addr;
if (!strncasecmp(sense, "p", 1)) {
ha->sense = AST_SENSE_ALLOW;
} else {
ha->sense = AST_SENSE_DENY;
}
ha->next = NULL;
if (prev) {
prev->next = ha;
} else {
ret = ha;
}
} }
ast_debug(1, "%s/%s appended to acl for peer\n", stuff, nm);
if (!inet_aton(tmp, &ha->netaddr)) {
ast_log(LOG_WARNING, "Invalid IP address in %s\n", stuff);
ast_free(ha);
if (error)
*error = 1;
return ret;
}
ha->netaddr.s_addr &= ha->netmask.s_addr;
ha->sense = strncasecmp(sense, "p", 1) ? AST_SENSE_DENY : AST_SENSE_ALLOW;
ha->next = NULL;
if (prev) {
prev->next = ha;
} else {
ret = ha;
}
ast_debug(1, "%s/%s sense %d appended to acl for peer\n", ast_strdupa(ast_inet_ntoa(ha->netaddr)), ast_strdupa(ast_inet_ntoa(ha->netmask)), ha->sense);
return ret; return ret;
} }