welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set hostname /after/ having read the config file.

Browse source 
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
This commit is contained in:
Benjamin Cama 2011-09-19 18:10:03 +02:00
parent bf41bf2eac
commit 0b06de8105
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli.c
View file

@ -133,7 +133,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
/* match if b is a substr of a */ /* match if b is a substr of a */
#define MATCH(a,b) (!strncmp((a), (b), strlen(b))) #define MATCH(a,b) (!strncmp((a), (b), strlen(b)))
void init_cli(char *hostname) void init_cli()
{ {
FILE *f; FILE *f;
char buf[4096]; char buf[4096];
@ -143,10 +143,6 @@ void init_cli(char *hostname)
struct sockaddr_in addr; struct sockaddr_in addr;
cli = cli_init(); cli = cli_init();
if (hostname && *hostname)
cli_set_hostname(cli, hostname);
else
cli_set_hostname(cli, "l2tpns");
c = cli_register_command(cli, NULL, "show", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL); c = cli_register_command(cli, NULL, "show", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
cli_register_command(cli, c, "banana", cmd_show_banana, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a banana"); cli_register_command(cli, c, "banana", cmd_show_banana, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a banana");
@ -301,6 +297,14 @@ void init_cli(char *hostname)
} }
} }
void cli_init_hostname(char *hostname)
{
if (hostname && *hostname)
cli_set_hostname(cli, hostname);
else
cli_set_hostname(cli, "l2tpns");
}
void cli_do(int sockfd) void cli_do(int sockfd)
{ {
int require_auth = 1; int require_auth = 1;

17
l2tpns.c
View file

@ -4294,14 +4294,9 @@ static void initdata(int optdebug, char *optconfig)
if (!*hostname) if (!*hostname)
{ {
if (!*config->hostname) // Grab my hostname unless it's been specified
{ gethostname(hostname, sizeof(hostname));
// Grab my hostname unless it's been specified stripdomain(hostname);
gethostname(hostname, sizeof(hostname));
stripdomain(hostname);
}
else
strcpy(hostname, config->hostname);
} }
_statistics->start_time = _statistics->last_reset = time(NULL); _statistics->start_time = _statistics->last_reset = time(NULL);
@ -4716,8 +4711,12 @@ int main(int argc, char *argv[])
initplugins(); initplugins();
initdata(optdebug, optconfig); initdata(optdebug, optconfig);
init_cli(hostname); init_cli();
read_config_file(); read_config_file();
/* set hostname /after/ having read the config file */
if (*config->hostname)
strcpy(hostname, config->hostname);
cli_init_hostname(hostname);
update_config(); update_config();
init_tbf(config->num_tbfs); init_tbf(config->num_tbfs);

3
l2tpns.h
View file

@ -907,7 +907,8 @@ void become_master(void); // We're the master; kick off any required master init
// cli.c // cli.c
void init_cli(char *hostname); void init_cli();
void cli_init_hostname(char *hostname);
void cli_do_file(FILE *fh); void cli_do_file(FILE *fh);
void cli_do(int sockfd); void cli_do(int sockfd);
int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...); int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...);