Minor cleanups (bug #1618 included)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index 5482a2f929e6e83de4c2e0f0ecf746fcb92294b4..239161d585a5ff12bacb2caf533a48b59885f85f 100755 (executable)
--- 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 c38a3697ddbef4a880fe1e23dfe9ad2cc3f746fb..fa664ce9458718686ac6fad8e6d19b28b1503958 100755 (executable)
--- 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);