diff options
| author | George Joseph <george.joseph@fairview5.com> | 2014-06-19 20:13:20 +0000 |
|---|---|---|
| committer | George Joseph <george.joseph@fairview5.com> | 2014-06-19 20:13:20 +0000 |
| commit | d87f8c429e6852d11f7a3bddf6981e2f754c1ea8 (patch) | |
| tree | 1ad84131a2d570ce903a00ac292e46ce18b6e493 /include | |
| parent | bd36288efa8fdb4cda14c1ff99862911aaa70b53 (diff) | |
pjsip cli: Change Identify to show CIDR notation instead of netmasks.
* 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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/acl.h | 7 | ||||
| -rw-r--r-- | include/asterisk/netsock2.h | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/asterisk/acl.h b/include/asterisk/acl.h index d1773b6b1..bda1c7606 100644 --- a/include/asterisk/acl.h +++ b/include/asterisk/acl.h @@ -142,6 +142,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 * * \details diff --git a/include/asterisk/netsock2.h b/include/asterisk/netsock2.h index 2db8b8081..3ede99087 100644 --- a/include/asterisk/netsock2.h +++ b/include/asterisk/netsock2.h @@ -263,6 +263,16 @@ static inline char *ast_sockaddr_stringify_addr(const struct ast_sockaddr *addr) } /*! + * \since 12.4 + * + * \brief + * Count the 1 bits in a netmask + * + * \return number of 1 bits + */ +int ast_sockaddr_cidr_bits(const struct ast_sockaddr *sa); + +/*! * \since 1.8 * * \brief |