kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip cli: Change Identify to show CIDR notation instead of netmasks.

Browse Source 
* Added ast_sockaddr_cidr_bits() to count the 1 bits in an ast_sockaddr.
* Added ast_ha_join_cidr() which uses ast_sockaddr_cidr_bits() for the netmask
  instead of ast_sockaddr_stringify_addr.
* Changed res_pjsip_endpoint_identifier_ip to call ast_ha_join_cidr() instead
  of ast_ha_join() for the CLI output.

This is a CLI change only.  AMI was not affected.

Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3652/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@416737 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
George Joseph
2014-06-19 20:12:15 +00:00
parent 252187f955
commit 43e0a4ddea
5 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/acl.c
View File

@@ -677,6 +677,19 @@ void ast_ha_join(const struct ast_ha *ha, struct ast_str **buf)
}
}
void ast_ha_join_cidr(const struct ast_ha *ha, struct ast_str **buf)
{
for (; ha; ha = ha->next) {
const char *addr = ast_sockaddr_stringify_addr(&ha->addr);
ast_str_append(buf, 0, "%s%s/%d",
ha->sense == AST_SENSE_ALLOW ? "!" : "",
addr, ast_sockaddr_cidr_bits(&ha->netmask));
if (ha->next) {
ast_str_append(buf, 0, ",");
}
}
}
enum ast_acl_sense ast_apply_acl(struct ast_acl_list *acl_list, const struct ast_sockaddr *addr, const char *purpose)
{
struct ast_acl *acl;