diff options
| author | Jonathan Rose <jrose@digium.com> | 2013-05-17 17:36:10 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2013-05-17 17:36:10 +0000 |
| commit | b90bba7a303bf57c3c874a1c8f506d39d4e78a9c (patch) | |
| tree | 56e6ca0d885b1e9e11856a6be44b4b92582f5606 /main/manager.c | |
| parent | 15945a7185187a3d79c7c7247a297bf92b49c139 (diff) | |
Stasis: Update security events to use Stasis
Also moves ACL messages to the security topic and gets rid of the
ACL topic
(closes issue ASTERISK-21103)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2496/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@388975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/manager.c b/main/manager.c index 6e7ea1e20..4d2923eb5 100644 --- a/main/manager.c +++ b/main/manager.c @@ -1070,7 +1070,7 @@ static void acl_change_stasis_cb(void *data, struct stasis_subscription *sub, st static void acl_change_stasis_subscribe(void) { if (!acl_change_sub) { - acl_change_sub = stasis_subscribe(ast_acl_topic(), + acl_change_sub = stasis_subscribe(ast_security_topic(), acl_change_stasis_cb, NULL); } } @@ -2361,10 +2361,10 @@ static int set_eventmask(struct mansession *s, const char *eventmask) return maskint; } -static enum ast_security_event_transport_type mansession_get_transport(const struct mansession *s) +static enum ast_transport mansession_get_transport(const struct mansession *s) { - return s->tcptls_session->parent->tls_cfg ? AST_SECURITY_EVENT_TRANSPORT_TLS : - AST_SECURITY_EVENT_TRANSPORT_TCP; + return s->tcptls_session->parent->tls_cfg ? AST_TRANSPORT_TLS : + AST_TRANSPORT_TCP; } static void report_invalid_user(const struct mansession *s, const char *username) |