diff options
author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-01 19:20:46 +0000 |
---|---|---|
committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-01 19:20:46 +0000 |
commit | 98cbdc7b3c2b1c3e0184d30f7b3c48e703c06e6e (patch) | |
tree | cdfc30ab8c71535d91b2f6486a4ad42838bdf612 /main/acl.c | |
parent | c3751a767534313fd94de14368c5691380ed4f74 (diff) |
- Implement error handling in ast_append_ha
- Use this in chan_sip
- Document ha functions in acl.c
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49092 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/acl.c')
-rw-r--r-- | main/acl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/main/acl.c b/main/acl.c index 7e50d1f9d..e2caa2eee 100644 --- a/main/acl.c +++ b/main/acl.c @@ -137,7 +137,7 @@ struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original) return ret; /* Return start of list */ } -struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path) +struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path, int *error) { struct ast_ha *ha; char *nm = "255.255.255.255"; @@ -172,11 +172,15 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path) } } else if (!inet_aton(nm, &ha->netmask)) { ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm); + if (error) + *error = 1; free(ha); return ret; } if (!inet_aton(tmp, &ha->netaddr)) { ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp); + if (error) + *error = 1; free(ha); return ret; } @@ -193,7 +197,8 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path) ret = ha; } } - ast_log(LOG_DEBUG, "%s/%s appended to acl for peer\n", stuff, nm); + if (option_debug) + ast_log(LOG_DEBUG, "%s/%s appended to acl for peer\n", stuff, nm); return ret; } |