mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 18:58:22 +00:00
Minor cleanups (bug #1618 included)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Asterisk -- A telephony toolkit for Linux.
|
* Asterisk -- A telephony toolkit for Linux.
|
||||||
*
|
*
|
||||||
* Time of day - Report the time of day
|
* Transfer a caller
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999, Mark Spencer
|
* Copyright (C) 1999, Mark Spencer
|
||||||
*
|
*
|
||||||
|
@@ -467,7 +467,6 @@ static int globalcanreinvite = REINVITE_INVITE;
|
|||||||
|
|
||||||
|
|
||||||
static struct sockaddr_in bindaddr;
|
static struct sockaddr_in bindaddr;
|
||||||
static struct sockaddr_in localnet;
|
|
||||||
static struct sockaddr_in externip;
|
static struct sockaddr_in externip;
|
||||||
static struct ast_ha *localaddr;
|
static struct ast_ha *localaddr;
|
||||||
|
|
||||||
@@ -7195,7 +7194,6 @@ static int reload_config(void)
|
|||||||
sip_prefs_free();
|
sip_prefs_free();
|
||||||
|
|
||||||
memset(&bindaddr, 0, sizeof(bindaddr));
|
memset(&bindaddr, 0, sizeof(bindaddr));
|
||||||
memset(&localnet, 0, sizeof(localnet));
|
|
||||||
memset(&localaddr, 0, sizeof(localaddr));
|
memset(&localaddr, 0, sizeof(localaddr));
|
||||||
memset(&externip, 0, sizeof(externip));
|
memset(&externip, 0, sizeof(externip));
|
||||||
|
|
||||||
@@ -7274,7 +7272,7 @@ static int reload_config(void)
|
|||||||
else
|
else
|
||||||
localaddr = na;
|
localaddr = na;
|
||||||
} else if (!strcasecmp(v->name, "localmask")) {
|
} 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")) {
|
} else if (!strcasecmp(v->name, "externip")) {
|
||||||
if (!(hp = ast_gethostbyname(v->value, &ahp)))
|
if (!(hp = ast_gethostbyname(v->value, &ahp)))
|
||||||
ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);
|
ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);
|
||||||
|
Reference in New Issue
Block a user