Diff for /embedaddon/quagga/ospfd/ospf_network.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 17:26:12 version 1.1.1.2, 2013/07/21 23:54:40
Line 228  ospf_sock_init (void) Line 228  ospf_sock_init (void)
 }  }
   
 void  void
ospf_adjust_sndbuflen (struct ospf * ospf, int buflen)ospf_adjust_sndbuflen (struct ospf * ospf, unsigned int buflen)
 {  {
   int ret, newbuflen;    int ret, newbuflen;
   /* Check if any work has to be done at all. */    /* Check if any work has to be done at all. */
Line 249  ospf_adjust_sndbuflen (struct ospf * ospf, int buflen) Line 249  ospf_adjust_sndbuflen (struct ospf * ospf, int buflen)
    */     */
   ret = setsockopt_so_sendbuf (ospf->fd, buflen);    ret = setsockopt_so_sendbuf (ospf->fd, buflen);
   newbuflen = getsockopt_so_sendbuf (ospf->fd);    newbuflen = getsockopt_so_sendbuf (ospf->fd);
  if (ret < 0 || newbuflen < buflen)  if (ret < 0 || newbuflen < 0 || newbuflen < (int) buflen)
    zlog_warn ("%s: tried to set SO_SNDBUF to %d, but got %d",    zlog_warn ("%s: tried to set SO_SNDBUF to %u, but got %d",
       __func__, buflen, newbuflen);        __func__, buflen, newbuflen);
   if (newbuflen >= 0)    if (newbuflen >= 0)
    ospf->maxsndbuflen = newbuflen;    ospf->maxsndbuflen = (unsigned int)newbuflen;
   else    else
     zlog_warn ("%s: failed to get SO_SNDBUF", __func__);      zlog_warn ("%s: failed to get SO_SNDBUF", __func__);
   if (ospfd_privs.change (ZPRIVS_LOWER))    if (ospfd_privs.change (ZPRIVS_LOWER))

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


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