Merge NSR/NCR server and peer functions

This commit is contained in:
Miroslav Lichvar
2010-04-26 15:04:00 +02:00
parent ab68a9d1d3
commit 2458325c09
6 changed files with 31 additions and 91 deletions

19
conf.c
View File

@@ -260,10 +260,6 @@ static int line_number;
/* ================================================== */
typedef enum {
SERVER, PEER
} NTP_Source_Type;
typedef struct {
NTP_Source_Type type;
IPAddr ip_addr;
@@ -433,7 +429,7 @@ parse_lockall(const char *line)
static void
parse_server(const char *line)
{
parse_source(line, SERVER);
parse_source(line, NTP_SERVER);
}
/* ================================================== */
@@ -441,7 +437,7 @@ parse_server(const char *line)
static void
parse_peer(const char *line)
{
parse_source(line, PEER);
parse_source(line, NTP_PEER);
}
/* ================================================== */
@@ -1199,16 +1195,7 @@ CNF_AddSources(void) {
memset(&server.local_ip_addr, 0, sizeof (server.local_ip_addr));
server.port = ntp_sources[i].port;
switch (ntp_sources[i].type) {
case SERVER:
NSR_AddServer(&server, &ntp_sources[i].params);
break;
case PEER:
NSR_AddPeer(&server, &ntp_sources[i].params);
break;
}
NSR_AddSource(&server, ntp_sources[i].type, &ntp_sources[i].params);
}
return;