diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2015-04-07 08:29:34 +0000 |
---|---|---|
committer | <> | 2015-04-13 18:52:43 +0000 |
commit | b2ccf8dd31d1457ae9f0ae270054117179220370 (patch) | |
tree | 4ccd4a16d5e9ef5869630ba624e822665a6e248c /ntpd/ntp_request.c | |
parent | bdab5265fcbf3f472545073a23f8999749a9f2b9 (diff) | |
download | ntp-4.2.8p2.tar.gz |
Imported from /home/lorry/working-area/delta_ntp/ntp-4.2.8p2.tar.gz.HEADntp-4.2.8p2master
Diffstat (limited to 'ntpd/ntp_request.c')
-rw-r--r-- | ntpd/ntp_request.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c index 157304b..8ffebad 100644 --- a/ntpd/ntp_request.c +++ b/ntpd/ntp_request.c @@ -58,7 +58,7 @@ struct req_proc { * Universal request codes */ static const struct req_proc univ_codes[] = { - { NO_REQUEST, NOAUTH, 0, 0 } + { NO_REQUEST, NOAUTH, 0, 0, NULL } }; static void req_ack (sockaddr_u *, endpt *, struct req_pkt *, int); @@ -231,7 +231,7 @@ static endpt *frominter; void init_request (void) { - int i; + size_t i; numrequests = 0; numresppkts = 0; @@ -261,7 +261,7 @@ req_ack( rpkt.auth_seq = AUTH_SEQ(0, 0); rpkt.implementation = inpkt->implementation; rpkt.request = inpkt->request; - rpkt.err_nitems = ERR_NITEMS(errcode, 0); + rpkt.err_nitems = ERR_NITEMS(errcode, 0); rpkt.mbz_itemsize = MBZ_ITEMSIZE(0); /* @@ -448,7 +448,7 @@ process_private( || (++ec, INFO_SEQ(inpkt->auth_seq) != 0) || (++ec, INFO_ERR(inpkt->err_nitems) != 0) || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0) - || (++ec, rbufp->recv_length < REQ_LEN_HDR) + || (++ec, rbufp->recv_length < (int)REQ_LEN_HDR) ) { NLOG(NLOG_SYSEVENT) if (current_time >= quiet_until) { @@ -599,11 +599,10 @@ process_private( return; } if (recv_len > REQ_LEN_NOMAC + MAX_MAC_LEN) { - DPRINTF(5, ("bad pkt length %lu\n", - (u_long)recv_len)); + DPRINTF(5, ("bad pkt length %zu\n", recv_len)); msyslog(LOG_ERR, - "process_private: bad pkt length %lu", - (u_long)recv_len); + "process_private: bad pkt length %zu", + recv_len); req_ack(srcadr, inter, inpkt, INFO_ERR_FMT); return; } @@ -2076,7 +2075,7 @@ req_get_traps( { struct info_trap *it; struct ctl_trap *tr; - int i; + size_t i; if (num_ctl_traps == 0) { req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA); |