diff options
| author | Mark Spencer <markster@digium.com> | 2003-08-22 16:36:33 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2003-08-22 16:36:33 +0000 |
| commit | 438ed9e5f89179fc6e42fc58686c10a3f2626e18 (patch) | |
| tree | df407c745a8bc3e82013b6afc93813f015aed6d9 | |
| parent | 46059b071467780e22f7eb515495725a9bcf3bb0 (diff) | |
Minor fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1406 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rwxr-xr-x | apps/app_qcall.c | 2 | ||||
| -rwxr-xr-x | channels/chan_sip.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/app_qcall.c b/apps/app_qcall.c index 6d89f0d2b..78e83eef8 100755 --- a/apps/app_qcall.c +++ b/apps/app_qcall.c @@ -363,7 +363,7 @@ int unload_module(void) int load_module(void) { snprintf((char *)qdir,sizeof(qdir)-1,"%s/%s",(char *)ast_config_AST_SPOOL_DIR,"qcall"); - mkdir(qdir,0660); + mkdir(qdir,0760); pthread_create(&qcall_thread,NULL,qcall,NULL); return 0; } diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 0d9a0179f..5df946698 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3726,7 +3726,9 @@ static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, cha ast_rtp_setnat(p->vrtp, p->nat); } p->canreinvite = peer->canreinvite; + if (strlen(peer->username)) strncpy(p->username, peer->name, sizeof(p->username) - 1); + strncpy(p->peername, peer->name, sizeof(p->peername) - 1); if (strlen(peer->context)) strncpy(p->context, peer->context, sizeof(p->context) - 1); p->callgroup = peer->callgroup; @@ -4413,8 +4415,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ p->needdestroy = 1; } } else if (!strcasecmp(msg, "BYE")) { - if (!strlen(p->username)) - ast_log(LOG_WARNING, "Acked to authenticate BYE, to %s:%d but we have no matching peer!\n", + if (!strlen(p->peername)) + ast_log(LOG_WARNING, "Asked to authenticate BYE, to %s:%d but we have no matching peer!\n", inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port)); if ((p->authtries > 1) || do_proxy_auth(p, req, "BYE", 0)) { ast_log(LOG_NOTICE, "Failed to authenticate on BYE to '%s'\n", get_header(&p->initreq, "From")); @@ -4485,8 +4487,8 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_ break; case 407: if (!strcasecmp(msg, "BYE")) { - if (!strlen(p->username)) - ast_log(LOG_WARNING, "Acked to authenticate BYE, to %s:%d but we have no matching peer!\n", + if (!strlen(p->peername)) + ast_log(LOG_WARNING, "Asked to authenticate BYE, to %s:%d but we have no matching peer!\n", inet_ntoa(p->recv.sin_addr), ntohs(p->recv.sin_port)); if ((p->authtries > 1) || do_proxy_auth(p, req, "BYE", 0)) { ast_log(LOG_NOTICE, "Failed to authenticate on BYE to '%s'\n", get_header(&p->initreq, "From")); |