From 81fd2f29de4eda544cc113dd85f96b95ed741acd Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Sat, 10 Jan 2004 21:43:17 +0000
Subject: [PATCH] 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
---
acl.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/acl.c b/acl.c
index 067e36d09e..ea45af8380 100755
--- a/acl.c
+++ b/acl.c
@@ -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;
}
--
GitLab