ntpd: allow peer-less (standalone stratum 1 server) operation

Based on patch by Jean-Christophe Dubois (jcd@tribudubois.net)

function                                             old     new   delta
ntp_init                                             384     399     +15
recv_and_process_client_pkt                          469     480     +11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-10-04 01:20:44 +02:00
parent 9d113cac42
commit d678257c26

View File

@ -1765,6 +1765,10 @@ recv_and_process_client_pkt(void /*int fd*/)
/* this time was obtained between poll() and recv() */ /* this time was obtained between poll() and recv() */
msg.m_rectime = d_to_lfp(G.cur_time); msg.m_rectime = d_to_lfp(G.cur_time);
msg.m_xmttime = d_to_lfp(gettime1900d()); /* this instant */ msg.m_xmttime = d_to_lfp(gettime1900d()); /* this instant */
if (G.peer_cnt == 0) {
/* we have no peers: "stratum 1 server" mode. reftime = our own time */
G.reftime = G.cur_time;
}
msg.m_reftime = d_to_lfp(G.reftime); msg.m_reftime = d_to_lfp(G.reftime);
msg.m_orgtime = query_xmttime; msg.m_orgtime = query_xmttime;
msg.m_rootdelay = d_to_sfp(G.rootdelay); msg.m_rootdelay = d_to_sfp(G.rootdelay);
@ -1902,8 +1906,13 @@ static NOINLINE void ntp_init(char **argv)
bb_show_usage(); bb_show_usage();
// if (opts & OPT_x) /* disable stepping, only slew is allowed */ // if (opts & OPT_x) /* disable stepping, only slew is allowed */
// G.time_was_stepped = 1; // G.time_was_stepped = 1;
while (peers) if (peers) {
add_peers(llist_pop(&peers)); while (peers)
add_peers(llist_pop(&peers));
} else {
/* -l but no peers: "stratum 1 server" mode */
G.stratum = 1;
}
if (!(opts & OPT_n)) { if (!(opts & OPT_n)) {
bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv); bb_daemonize_or_rexec(DAEMON_DEVNULL_STDIO, argv);
logmode = LOGMODE_NONE; logmode = LOGMODE_NONE;