Diff for /embedaddon/libnet/src/libnet_build_ntp.c between versions 1.1 and 1.1.1.2

version 1.1, 2012/02/21 22:14:23 version 1.1.1.2, 2013/07/22 11:54:42
Line 40 Line 40
 #endif  #endif
   
 libnet_ptag_t  libnet_ptag_t
libnet_build_ntp(u_int8_t leap_indicator, u_int8_t version, u_int8_t mode,libnet_build_ntp(uint8_t leap_indicator, uint8_t version, uint8_t mode,
u_int8_t stratum, u_int8_t poll, u_int8_t precision, u_int16_t delay_int,uint8_t stratum, uint8_t poll, uint8_t precision, uint16_t delay_int,
u_int16_t delay_frac, u_int16_t dispersion_int, u_int16_t dispersion_frac,uint16_t delay_frac, uint16_t dispersion_int, uint16_t dispersion_frac,
u_int32_t reference_id, u_int32_t ref_ts_int, u_int32_t ref_ts_frac,uint32_t reference_id, uint32_t ref_ts_int, uint32_t ref_ts_frac,
u_int32_t orig_ts_int, u_int32_t orig_ts_frac, u_int32_t rec_ts_int,uint32_t orig_ts_int, uint32_t orig_ts_frac, uint32_t rec_ts_int,
u_int32_t rec_ts_frac, u_int32_t xmt_ts_int, u_int32_t xmt_ts_frac,uint32_t rec_ts_frac, uint32_t xmt_ts_int, uint32_t xmt_ts_frac,
u_int8_t *payload, u_int32_t payload_s, libnet_t *l, libnet_ptag_t ptag)const uint8_t *payload, uint32_t payload_s, libnet_t *l, libnet_ptag_t ptag)
 {  {
    u_int32_t n, h;    uint32_t n, h;
     libnet_pblock_t *p;      libnet_pblock_t *p;
     struct libnet_ntp_hdr ntp_hdr;      struct libnet_ntp_hdr ntp_hdr;
   
Line 85  u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l Line 85  u_int8_t *payload, u_int32_t payload_s, libnet_t *l, l
     ntp_hdr.ntp_ref_ts.fraction     = htonl(ref_ts_frac);      ntp_hdr.ntp_ref_ts.fraction     = htonl(ref_ts_frac);
     ntp_hdr.ntp_orig_ts.integer     = htonl(orig_ts_int);      ntp_hdr.ntp_orig_ts.integer     = htonl(orig_ts_int);
     ntp_hdr.ntp_orig_ts.fraction    = htonl(orig_ts_frac);      ntp_hdr.ntp_orig_ts.fraction    = htonl(orig_ts_frac);
    ntp_hdr.ntp_rec_ts.integer      = htonl(orig_ts_int);    ntp_hdr.ntp_rec_ts.integer      = htonl(rec_ts_int);
    ntp_hdr.ntp_rec_ts.fraction     = htonl(orig_ts_frac);    ntp_hdr.ntp_rec_ts.fraction     = htonl(rec_ts_frac);
     ntp_hdr.ntp_xmt_ts.integer      = htonl(xmt_ts_int);      ntp_hdr.ntp_xmt_ts.integer      = htonl(xmt_ts_int);
     ntp_hdr.ntp_xmt_ts.fraction     = htonl(xmt_ts_frac);      ntp_hdr.ntp_xmt_ts.fraction     = htonl(xmt_ts_frac);
   
    n = libnet_pblock_append(l, p, (u_int8_t *)&ntp_hdr, LIBNET_NTP_H);    n = libnet_pblock_append(l, p, (uint8_t *)&ntp_hdr, LIBNET_NTP_H);
     if (n == -1)      if (n == -1)
     {      {
         goto bad;          goto bad;
     }      }
   
    if ((payload && !payload_s) || (!payload && payload_s))    /* boilerplate payload sanity check / append macro */
    {    LIBNET_DO_PAYLOAD(l, p);
        snprintf(l->err_buf, LIBNET_ERRBUF_SIZE, 
                "%s(): payload inconsistency\n", __func__); 
        goto bad; 
    } 
 
    if (payload && payload_s) 
    { 
        n = libnet_pblock_append(l, p, payload, payload_s); 
        if (n == -1) 
        { 
            goto bad; 
        } 
    } 
   
     return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_NTP_H));      return (ptag ? ptag : libnet_pblock_update(l, p, h, LIBNET_PBLOCK_NTP_H));
 bad:  bad:

Removed from v.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>