kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-09 14:36:48 +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/
........

Merged revisions 416737 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@416738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
George Joseph
2014-06-19 20:13:20 +00:00
parent bd36288efa
commit d87f8c429e
5 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/asterisk/acl.h
View File

@@ -141,6 +141,13 @@ struct ast_ha *ast_append_ha(const char *sense, const char *stuff, struct ast_ha
*/
void ast_ha_join(const struct ast_ha *ha, struct ast_str **buf);
/*!
* \brief Convert HAs to a comma separated string value using CIDR notation
* \param ha the starting ha head
* \param buf string buffer to convert data to
*/
void ast_ha_join_cidr(const struct ast_ha *ha, struct ast_str **buf);
/*!
* \brief Add a rule to an ACL struct
*