diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-07-11 18:33:36 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-07-11 18:33:36 +0000 |
| commit | 10afdf3a2abd7e45d5c1841b29744de5b852d722 (patch) | |
| tree | efd6960cc2e8a9f2642d8ac950904ba6c51371e9 /channels/sip | |
| parent | 6190ae4430f2bdfb02d2ce8f4941cd9b4e65f5a0 (diff) | |
Named ACLs: Introduces a system for creating and sharing ACLs
This patch adds Named ACL functionality to Asterisk. This allows system
administrators to define an ACL and refer to it by a unique name. Configurable
items can then refer to that name when specifying access control lists.
It also includes updates to all core supported consumers of ACLs. That includes
manager, chan_sip, and chan_iax2. This feature is based on the deluxepine-trunk
by Olle E. Johansson and provides a subset of the Named ACL functionality
implemented in that branch. For more information on this feature, see acl.conf
and/or the Asterisk wiki.
Review: https://reviewboard.asterisk.org/r/1978/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369959 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip')
| -rw-r--r-- | channels/sip/include/sip.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index 72f9d2b6f..1e659a749 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -757,7 +757,7 @@ struct sip_settings { char default_subscribecontext[AST_MAX_CONTEXT]; char default_record_on_feature[FEATURE_MAX_LEN]; char default_record_off_feature[FEATURE_MAX_LEN]; - struct ast_ha *contact_ha; /*! \brief Global list of addresses dynamic peers are not allowed to use */ + struct ast_acl_list *contact_acl; /*! \brief Global list of addresses dynamic peers are not allowed to use */ struct ast_format_cap *caps; /*!< Supported codecs */ int tcp_enabled; int default_max_forwards; /*!< Default max forwards (SIP Anti-loop) */ @@ -1117,7 +1117,7 @@ struct sip_pvt { int rtptimeout; /*!< RTP timeout time */ int rtpholdtimeout; /*!< RTP timeout time on hold*/ int rtpkeepalive; /*!< RTP send packets for keepalive */ - struct ast_ha *directmediaha; /*!< Which IPs are allowed to interchange direct media with this peer - copied from sip_peer */ + struct ast_acl_list *directmediaacl; /*!< Which IPs are allowed to interchange direct media with this peer - copied from sip_peer */ struct ast_sockaddr recv; /*!< Received as */ struct ast_sockaddr ourip; /*!< Our IP (as seen from the outside) */ enum transfermodes allowtransfer; /*!< REFER: restriction scheme */ @@ -1335,9 +1335,9 @@ struct sip_peer { int keepalive; /*!< Keepalive: How often to send keep alive packet */ int keepalivesend; /*!< Keepalive: Scheduled item for sending keep alive packet */ struct ast_sockaddr defaddr; /*!< Default IP address, used until registration */ - struct ast_ha *ha; /*!< Access control list */ - struct ast_ha *contactha; /*!< Restrict what IPs are allowed in the Contact header (for registration) */ - struct ast_ha *directmediaha; /*!< Restrict what IPs are allowed to interchange direct media with */ + struct ast_acl_list *acl; /*!< Access control list */ + struct ast_acl_list *contactacl; /*!< Restrict what IPs are allowed in the Contact header (for registration) */ + struct ast_acl_list *directmediaacl; /*!< Restrict what IPs are allowed to interchange direct media with */ struct ast_variable *chanvars; /*!< Variables to set for channel created by user */ struct sip_pvt *mwipvt; /*!< Subscription for MWI */ struct sip_st_cfg stimer; /*!< SIP Session-Timers */ |