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

hostname set via command line not config

Browse source
This commit is contained in:
Brendan O'Dea 2004-10-28 03:31:39 +00:00
parent 4fa1b8bbfa
commit 290f8d05ab
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // vim: sw=8 ts=8
char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.31 2004-10-25 15:07:51 bodea Exp $"; char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.32 2004-10-28 03:31:39 bodea Exp $";
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -57,7 +57,7 @@ int snoopfd = -1; // UDP file handle for sending out intercept data
int *radfds = NULL; // RADIUS requests file handles int *radfds = NULL; // RADIUS requests file handles
int ifrfd = -1; // File descriptor for routing, etc int ifrfd = -1; // File descriptor for routing, etc
time_t basetime = 0; // base clock time_t basetime = 0; // base clock
char *hostname = NULL; // us. char hostname[1000] = ""; // us.
int tunidx; // ifr_ifindex of tun device int tunidx; // ifr_ifindex of tun device
u32 sessionid = 0; // session id for radius accounting u32 sessionid = 0; // session id for radius accounting
int syslog_log = 0; // are we logging to syslog int syslog_log = 0; // are we logging to syslog
@ -95,7 +95,6 @@ struct config_descriptt config_values[] = {
CONFIG("debug", debug, INT), CONFIG("debug", debug, INT),
CONFIG("log_file", log_filename, STRING), CONFIG("log_file", log_filename, STRING),
CONFIG("pid_file", pid_file, STRING), CONFIG("pid_file", pid_file, STRING),
CONFIG("hostname", hostname, STRING),
CONFIG("l2tp_secret", l2tpsecret, STRING), CONFIG("l2tp_secret", l2tpsecret, STRING),
CONFIG("primary_dns", default_dns1, IP), CONFIG("primary_dns", default_dns1, IP),
CONFIG("secondary_dns", default_dns2, IP), CONFIG("secondary_dns", default_dns2, IP),
@ -2180,6 +2179,7 @@ int regular_cleanups(void)
if (++count >= MAX_ACTIONS) break; if (++count >= MAX_ACTIONS) break;
} }
} }
if (*config->accounting_dir && next_acct <= TIME) if (*config->accounting_dir && next_acct <= TIME)
{ {
// Dump accounting data // Dump accounting data
@ -2360,14 +2360,17 @@ void mainloop(void)
for (i = 0; i < config->num_radfds; i++) for (i = 0; i < config->num_radfds; i++)
if (FD_ISSET(radfds[i], &r)) if (FD_ISSET(radfds[i], &r))
processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i); processrad(buf, recv(radfds[i], buf, sizeof(buf), 0), i);
if (FD_ISSET(cluster_sockfd, &r)) if (FD_ISSET(cluster_sockfd, &r))
{ {
int size; int size;
size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen); size = recvfrom(cluster_sockfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
processcluster(buf, size, addr.sin_addr.s_addr); processcluster(buf, size, addr.sin_addr.s_addr);
} }
if (FD_ISSET(controlfd, &r)) if (FD_ISSET(controlfd, &r))
processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr); processcontrol(buf, recvfrom(controlfd, buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen), &addr);
if (FD_ISSET(clifd, &r)) if (FD_ISSET(clifd, &r))
{ {
struct sockaddr_in addr; struct sockaddr_in addr;
@ -2547,10 +2550,13 @@ void initdata(int optdebug, char *optconfig)
for (i = 1; i < MAXTUNNEL- 1; i++) for (i = 1; i < MAXTUNNEL- 1; i++)
tunnel[i].state = TUNNELUNDEF; // mark it as not filled in. tunnel[i].state = TUNNELUNDEF; // mark it as not filled in.
if (!*hostname)
{
char *p;
// Grab my hostname unless it's been specified // Grab my hostname unless it's been specified
gethostname(config->hostname, sizeof(config->hostname)); gethostname(hostname, sizeof(hostname));
if ((p = strchr(config->hostname, '.'))) *p = 0; if ((p = strchr(hostname, '.'))) *p = 0;
hostname = config->hostname; }
_statistics->start_time = _statistics->last_reset = time(NULL); _statistics->start_time = _statistics->last_reset = time(NULL);
@ -2956,7 +2962,7 @@ int main(int argc, char *argv[])
initdata(optdebug, optconfig); initdata(optdebug, optconfig);
init_tbf(); init_tbf();
init_cli(); init_cli(hostname);
read_config_file(); read_config_file();
log(0, 0, 0, 0, "L2TPNS version " VERSION "\n"); log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");

4
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.21 2004-10-25 15:07:52 bodea Exp $ // $Id: l2tpns.h,v 1.22 2004-10-28 03:31:39 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -547,7 +547,7 @@ int sessionsetup(tunnelidt t, sessionidt s);
int cluster_send_session(int s); int cluster_send_session(int s);
int cluster_send_tunnel(int t); int cluster_send_tunnel(int t);
int cluster_send_goodbye(); int cluster_send_goodbye();
void init_cli(); void init_cli(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, ...);