aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapps/app_directory.c4
-rwxr-xr-xchannels/chan_sip.c2
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);