diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-03-26 21:09:56 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-03-26 21:09:56 +0000 |
| commit | 1280358f12562decbfed39ee3bf6d7d98e764d81 (patch) | |
| tree | abc800809216096a1687aa50e16c3b8a9207868c | |
| parent | 00e61bc623314e3d4170baef0a2985c0bb847f06 (diff) | |
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
| -rwxr-xr-x | apps/app_directory.c | 4 | ||||
| -rwxr-xr-x | channels/chan_sip.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 868badb02..00c19be64 100755 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -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; diff --git a/channels/chan_sip.c b/channels/chan_sip.c index bca7cb76a..e26350a80 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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); |