kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 230247 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r230247 | kpfleming | 2009-11-15 11:23:02 -0600 (Sun, 15 Nov 2009) | 12 lines
  
  Merged revisions 230246 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r230246 | kpfleming | 2009-11-15 11:19:06 -0600 (Sun, 15 Nov 2009) | 6 lines
    
    Correct mistaken option name in error message.
    
    The configuration option for allowing hosts to make non-token-based calls
    is 'calltokenoptional', not 'calltokenignore'. (reported on asterisk-users)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@230248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2009-11-15 17:23:50 +00:00
parent dbca3dc939
commit 67f257a067
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_iax2.c
View File

@@ -4542,7 +4542,7 @@ static int handle_call_token(struct ast_iax2_full_hdr *fh, struct iax_ies *ies,
/* ----- Case 3 ----- */
} else { /* calltokens are not supported for this client, how do we respond? */
if (calltoken_required(sin, ies->username, subclass)) {
ast_log(LOG_ERROR, "Call rejected, CallToken Support required. If unexpected, resolve by placing address %s in the calltokenignore list or setting user %s requirecalltoken=no\n", ast_inet_ntoa(sin->sin_addr), S_OR(ies->username, "guest"));
ast_log(LOG_ERROR, "Call rejected, CallToken Support required. If unexpected, resolve by placing address %s in the calltokenoptional list or setting user %s requirecalltoken=no\n", ast_inet_ntoa(sin->sin_addr), S_OR(ies->username, "guest"));
goto reject;
}
return 0; /* calltoken is not required for this addr, so permit it. */