← Back to branch summary

~ubuntu-branches/debian/sid/ntp/sid

« back to all changes in this revision

Viewing changes to ntpd/ntp_request.c

  • Committer: Package Import Robot
  • Author(s): Peter Eisentraut
  • Date: 2012-02-27 13:55:56 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20120227135556-dkx4mkod5trl5bgt
Tags: 1:4.2.6.p5+dfsg-1
http://bugs.debian.org/644673
* New upstream release (closes: #644673)
* Updated instructions on generating autotools.patch
* Updated standards version

Show diffs side-by-side

added added

removed removed

Lines of Context:
ntpd/ntp_request.c
852
852
                addr.sa.sa_len = SOCKLEN(&addr);
853
853
#endif
854
854
                ipl++;
855
 
                if ((pp = findexistingpeer(&addr, (struct peer *)0, -1)) == 0)
 
855
                pp = findexistingpeer(&addr, NULL, -1, 0);
 
856
                if (NULL == pp)
856
857
                        continue;
857
858
                if (IS_IPV6(srcadr)) {
858
859
                        if (pp->dstadr)
990
991
                ipl = (struct info_peer_list *)((char *)ipl +
991
992
                    INFO_ITEMSIZE(inpkt->mbz_itemsize));
992
993
 
993
 
                if ((pp = findexistingpeer(&addr, (struct peer *)0, -1)) == NULL)
 
994
                pp = findexistingpeer(&addr, NULL, -1, 0);
 
995
                if (NULL == pp)
994
996
                        continue;
995
997
 
996
998
                DPRINTF(1, ("peer_stats: found %s\n", stoa(&addr)));
1255
1257
 */
1256
1258
static void
1257
1259
timer_stats(
1258
 
        sockaddr_u *srcadr,
1259
 
        struct interface *inter,
1260
 
        struct req_pkt *inpkt
 
1260
        sockaddr_u *            srcadr,
 
1261
        struct interface *      inter,
 
1262
        struct req_pkt *        inpkt
1261
1263
        )
1262
1264
{
1263
 
        register struct info_timer_stats *ts;
1264
 
 
1265
 
        /*
1266
 
         * Importations from the timer module
1267
 
         */
1268
 
        extern u_long timer_timereset;
1269
 
        extern u_long timer_overflows;
1270
 
        extern u_long timer_xmtcalls;
1271
 
 
1272
 
        ts = (struct info_timer_stats *)prepare_pkt(srcadr, inter, inpkt,
1273
 
                                                    sizeof(struct info_timer_stats));
1274
 
 
1275
 
        ts->timereset = htonl((u_int32)(current_time - timer_timereset));
1276
 
        ts->alarms = htonl((u_int32)alarm_overflow);
1277
 
        ts->overflows = htonl((u_int32)timer_overflows);
 
1265
        struct info_timer_stats *       ts;
 
1266
        u_long                          sincereset;
 
1267
 
 
1268
        ts = (struct info_timer_stats *)prepare_pkt(srcadr, inter,
 
1269
                                                    inpkt, sizeof(*ts));
 
1270
 
 
1271
        sincereset = current_time - timer_timereset;
 
1272
        ts->timereset = htonl((u_int32)sincereset);
 
1273
        ts->alarms = ts->timereset;
 
1274
        ts->overflows = htonl((u_int32)alarm_overflow);
1278
1275
        ts->xmtcalls = htonl((u_int32)timer_xmtcalls);
1279
1276
 
1280
1277
        (void) more_pkt();
1580
1577
                DPRINTF(1, ("searching for %s\n", stoa(&peeraddr)));
1581
1578
 
1582
1579
                while (!found) {
1583
 
                        peer = findexistingpeer(&peeraddr, peer, -1);
 
1580
                        peer = findexistingpeer(&peeraddr, peer, -1, 0);
1584
1581
                        if (!peer)
1585
1582
                                break;
1586
1583
                        if (peer->flags & FLAG_CONFIG)
1623
1620
                peer = NULL;
1624
1621
 
1625
1622
                while (!found) {
1626
 
                        peer = findexistingpeer(&peeraddr, peer, -1);
 
1623
                        peer = findexistingpeer(&peeraddr, peer, -1, 0);
1627
1624
                        if (!peer)
1628
1625
                                break;
1629
1626
                        if (peer->flags & FLAG_CONFIG)
2140
2137
#ifdef ISC_PLATFORM_HAVESALEN
2141
2138
                peeraddr.sa.sa_len = SOCKLEN(&peeraddr);
2142
2139
#endif
2143
 
                peer = findexistingpeer(&peeraddr, NULL, -1);
 
2140
                peer = findexistingpeer(&peeraddr, NULL, -1, 0);
2144
2141
                if (NULL == peer)
2145
2142
                        bad++;
2146
2143
                cp = (struct conf_unpeer *)((char *)cp +
2171
2168
#ifdef ISC_PLATFORM_HAVESALEN
2172
2169
                peeraddr.sa.sa_len = SOCKLEN(&peeraddr);
2173
2170
#endif
2174
 
                peer = findexistingpeer(&peeraddr, NULL, -1);
 
2171
                peer = findexistingpeer(&peeraddr, NULL, -1, 0);
2175
2172
                while (peer != NULL) {
2176
2173
                        peer_reset(peer);
2177
 
                        peer = findexistingpeer(&peeraddr, peer, -1);
 
2174
                        peer = findexistingpeer(&peeraddr, peer, -1, 0);
2178
2175
                }
2179
2176
                cp = (struct conf_unpeer *)((char *)cp +
2180
2177
                    INFO_ITEMSIZE(inpkt->mbz_itemsize));
2687
2684
        while (items-- > 0) {
2688
2685
                NSRCADR(&addr) = *clkaddr++;
2689
2686
                if (!ISREFCLOCKADR(&addr) ||
2690
 
                    findexistingpeer(&addr, NULL, -1) == NULL) {
 
2687
                    findexistingpeer(&addr, NULL, -1, 0) == NULL) {
2691
2688
                        req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
2692
2689
                        return;
2693
2690
                }
2711
2708
                DTOLFP(clock_stat.fudgetime2, &ltmp);
2712
2709
                HTONL_FP(&ltmp, &ic->fudgetime2);
2713
2710
                ic->fudgeval1 = htonl((u_int32)clock_stat.fudgeval1);
2714
 
                ic->fudgeval2 = htonl((u_int32)clock_stat.fudgeval2);
 
2711
                ic->fudgeval2 = htonl(clock_stat.fudgeval2);
2715
2712
 
2716
2713
                free_varlist(clock_stat.kv_list);
2717
2714
 
2751
2748
#endif
2752
2749
                SET_PORT(&addr, NTP_PORT);
2753
2750
                if (!ISREFCLOCKADR(&addr) ||
2754
 
                    findexistingpeer(&addr, NULL, -1) == 0) {
 
2751
                    findexistingpeer(&addr, NULL, -1, 0) == 0) {
2755
2752
                        req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
2756
2753
                        return;
2757
2754
                }
2826
2823
        while (items-- > 0) {
2827
2824
                NSRCADR(&addr) = *clkaddr++;
2828
2825
                if (!ISREFCLOCKADR(&addr) ||
2829
 
                    findexistingpeer(&addr, NULL, -1) == 0) {
 
2826
                    findexistingpeer(&addr, NULL, -1, 0) == 0) {
2830
2827
                        req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
2831
2828
                        return;
2832
2829
                }