Fix application of global DTMF when a peer exists
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@699 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
00e61bc623
commit
1280358f12
|
@ -130,6 +130,10 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
|
|||
int found=0;
|
||||
char *start, *pos, *conv,*stringp=NULL;
|
||||
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));
|
||||
ext[0] = digit;
|
||||
res = 0;
|
||||
|
|
|
@ -232,7 +232,6 @@ struct sip_peer {
|
|||
int expire;
|
||||
int expirey;
|
||||
int capability;
|
||||
int nonCodecCapability;
|
||||
int insecure;
|
||||
int nat;
|
||||
int canreinvite;
|
||||
|
@ -397,7 +396,6 @@ static int create_addr(struct sip_pvt *r, char *peer)
|
|||
if (!strcasecmp(p->name, peer)) {
|
||||
found++;
|
||||
r->capability = p->capability;
|
||||
r->nonCodecCapability = p->nonCodecCapability;
|
||||
r->nat = p->nat;
|
||||
if (r->rtp) {
|
||||
ast_log(LOG_DEBUG, "Setting NAT on RTP to %d\n", r->nat);
|
||||
|
|
Reference in New Issue