aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-12 17:30:55 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-12 17:30:55 +0000
commit599ae6849712999d9f9fd7b9b077281c7e06a26f (patch)
tree8093f7b05d36e2e9e761e35f7dadb7eaddccac09
parent20dde4c8fc681f8e610b47176c5b019364f14e92 (diff)
Minor cleanups (bug #1618 included)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2951 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xapps/app_transfer.c2
-rwxr-xr-xchannels/chan_sip.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 5482a2f92..239161d58 100755
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -1,7 +1,7 @@
/*
* Asterisk -- A telephony toolkit for Linux.
*
- * Time of day - Report the time of day
+ * Transfer a caller
*
* Copyright (C) 1999, Mark Spencer
*
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c38a3697d..fa664ce94 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -467,7 +467,6 @@ static int globalcanreinvite = REINVITE_INVITE;
static struct sockaddr_in bindaddr;
-static struct sockaddr_in localnet;
static struct sockaddr_in externip;
static struct ast_ha *localaddr;
@@ -7195,7 +7194,6 @@ static int reload_config(void)
sip_prefs_free();
memset(&bindaddr, 0, sizeof(bindaddr));
- memset(&localnet, 0, sizeof(localnet));
memset(&localaddr, 0, sizeof(localaddr));
memset(&externip, 0, sizeof(externip));
@@ -7274,7 +7272,7 @@ static int reload_config(void)
else
localaddr = na;
} else if (!strcasecmp(v->name, "localmask")) {
- ast_log(LOG_WARNING, "Use of localmask is deprecated; use localnet with mask syntax\n");
+ ast_log(LOG_WARNING, "Use of localmask is no long supported -- use localnet with mask syntax\n");
} else if (!strcasecmp(v->name, "externip")) {
if (!(hp = ast_gethostbyname(v->value, &ahp)))
ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);