mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
Fix application of global DTMF when a peer exists
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@699 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -130,6 +130,10 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
|
|||||||
int found=0;
|
int found=0;
|
||||||
char *start, *pos, *conv,*stringp=NULL;
|
char *start, *pos, *conv,*stringp=NULL;
|
||||||
char fn[256];
|
char fn[256];
|
||||||
|
if (!context || !strlen(context)) {
|
||||||
|
ast_log(LOG_WARNING, "Directory must be called with an argument (context in which to interpret extensions)\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
memset(ext, 0, sizeof(ext));
|
memset(ext, 0, sizeof(ext));
|
||||||
ext[0] = digit;
|
ext[0] = digit;
|
||||||
res = 0;
|
res = 0;
|
||||||
|
@@ -232,7 +232,6 @@ struct sip_peer {
|
|||||||
int expire;
|
int expire;
|
||||||
int expirey;
|
int expirey;
|
||||||
int capability;
|
int capability;
|
||||||
int nonCodecCapability;
|
|
||||||
int insecure;
|
int insecure;
|
||||||
int nat;
|
int nat;
|
||||||
int canreinvite;
|
int canreinvite;
|
||||||
@@ -397,7 +396,6 @@ static int create_addr(struct sip_pvt *r, char *peer)
|
|||||||
if (!strcasecmp(p->name, peer)) {
|
if (!strcasecmp(p->name, peer)) {
|
||||||
found++;
|
found++;
|
||||||
r->capability = p->capability;
|
r->capability = p->capability;
|
||||||
r->nonCodecCapability = p->nonCodecCapability;
|
|
||||||
r->nat = p->nat;
|
r->nat = p->nat;
|
||||||
if (r->rtp) {
|
if (r->rtp) {
|
||||||
ast_log(LOG_DEBUG, "Setting NAT on RTP to %d\n", r->nat);
|
ast_log(LOG_DEBUG, "Setting NAT on RTP to %d\n", r->nat);
|
||||||
|
Reference in New Issue
Block a user