Diff for /embedaddon/libnet/src/libnet_build_vrrp.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.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_vrrp(u_int8_t version, u_int8_t type, u_int8_t vrouter_id, libnet_build_vrrp(uint8_t version, uint8_t type, uint8_t vrouter_id, 
u_int8_t priority, u_int8_t ip_count, u_int8_t auth_type, u_int8_t advert_int,uint8_t priority, uint8_t ip_count, uint8_t auth_type, uint8_t advert_int,
u_int16_t sum, u_int8_t *payload, u_int32_t payload_s, libnet_t *l,uint16_t sum, const uint8_t *payload, uint32_t payload_s, libnet_t *l,
 libnet_ptag_t ptag)  libnet_ptag_t ptag)
 {  {
    u_int32_t n, h;    uint32_t n, h;
     libnet_pblock_t *p;      libnet_pblock_t *p;
     struct libnet_vrrp_hdr vrrp_hdr;      struct libnet_vrrp_hdr vrrp_hdr;
   
Line 77  libnet_ptag_t ptag) Line 77  libnet_ptag_t ptag)
     vrrp_hdr.vrrp_advert_int = advert_int;      vrrp_hdr.vrrp_advert_int = advert_int;
     vrrp_hdr.vrrp_sum        = (sum ? htons(sum) : 0);      vrrp_hdr.vrrp_sum        = (sum ? htons(sum) : 0);
   
    n = libnet_pblock_append(l, p, (u_int8_t *)&vrrp_hdr, LIBNET_VRRP_H);    n = libnet_pblock_append(l, p, (uint8_t *)&vrrp_hdr, LIBNET_VRRP_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; 
        } 
    } 
   
     if (sum == 0)      if (sum == 0)
     {      {

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


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