diff options
author | Mark Spencer <markster@digium.com> | 2004-01-10 21:43:17 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-01-10 21:43:17 +0000 |
commit | 81fd2f29de4eda544cc113dd85f96b95ed741acd (patch) | |
tree | dfaa5c58e84b06bf72c88993f3baa8c10464c573 /acl.c | |
parent | 571c8be2de7adcd46fe68e0685c54562242d1c78 (diff) |
Allow /x for subnetmask identification (e.g. 192.168.0.0/16)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'acl.c')
-rwxr-xr-x | acl.c | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -72,6 +72,8 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path) char tmp[256] = ""; struct ast_ha *prev = NULL; struct ast_ha *ret; + int x,z; + unsigned int y; ret = path; while(path) { prev = path; @@ -86,13 +88,22 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path) *nm = '\0'; nm++; } - if (!inet_aton(tmp, &ha->netaddr)) { - ast_log(LOG_WARNING, "%s not a valid IP\n", tmp); + if (!strchr(nm, '.')) { + if ((sscanf(nm, "%i", &x) == 1) && (x >= 0) && (x <= 32)) { + y = 0; + for (z=0;z<x;z++) { + y >>= 1; + y |= 0x8000000; + } + ha->netmask.s_addr = htonl(y); + } + } else if (!inet_aton(nm, &ha->netmask)) { + ast_log(LOG_WARNING, "%s not a valid netmask\n", nm); free(ha); return path; } - if (!inet_aton(nm, &ha->netmask)) { - ast_log(LOG_WARNING, "%s not a valid netmask\n", nm); + if (!inet_aton(tmp, &ha->netaddr)) { + ast_log(LOG_WARNING, "%s not a valid IP\n", tmp); free(ha); return path; } |