Diff for /embedaddon/quagga/ospfd/ospf_packet.c between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 11:53:41 version 1.1.1.3, 2012/10/09 09:22:29
Line 300  ospf_packet_dup (struct ospf_packet *op) Line 300  ospf_packet_dup (struct ospf_packet *op)
 }  }
   
 /* XXX inline */  /* XXX inline */
static inline unsigned intstatic unsigned int
 ospf_packet_authspace (struct ospf_interface *oi)  ospf_packet_authspace (struct ospf_interface *oi)
 {  {
   int auth = 0;    int auth = 0;
Line 1592  ospf_ls_upd_list_lsa (struct ospf_neighbor *nbr, struc Line 1592  ospf_ls_upd_list_lsa (struct ospf_neighbor *nbr, struc
       sum = lsah->checksum;        sum = lsah->checksum;
       if (sum != ospf_lsa_checksum (lsah))        if (sum != ospf_lsa_checksum (lsah))
         {          {
          zlog_warn ("Link State Update: LSA checksum error %x, %x.",          /* (bug #685) more details in a one-line message make it possible
                     sum, lsah->checksum);           * to identify problem source on the one hand and to have a better
            * chance to compress repeated messages in syslog on the other */
           zlog_warn ("Link State Update: LSA checksum error %x/%x, ID=%s from: nbr %s, router ID %s, adv router %s",
                      sum, lsah->checksum, inet_ntoa (lsah->id),
                      inet_ntoa (nbr->src), inet_ntoa (nbr->router_id),
                      inet_ntoa (lsah->adv_router));
           continue;            continue;
         }          }
   
Line 2140  ospf_recv_packet (int fd, struct interface **ifp, stru Line 2145  ospf_recv_packet (int fd, struct interface **ifp, stru
       
   ip_len = iph->ip_len;    ip_len = iph->ip_len;
       
#if !defined(GNU_LINUX) && (OpenBSD < 200311)#if !defined(GNU_LINUX) && (OpenBSD < 200311) && (__FreeBSD_version < 1000000)
   /*    /*
    * Kernel network code touches incoming IP header parameters,     * Kernel network code touches incoming IP header parameters,
    * before protocol specific processing.     * before protocol specific processing.
Line 2232  ospf_associate_packet_vl (struct ospf *ospf, struct in Line 2237  ospf_associate_packet_vl (struct ospf *ospf, struct in
   return NULL;    return NULL;
 }  }
   
static inline intstatic int
 ospf_check_area_id (struct ospf_interface *oi, struct ospf_header *ospfh)  ospf_check_area_id (struct ospf_interface *oi, struct ospf_header *ospfh)
 {  {
   /* Check match the Area ID of the receiving interface. */    /* Check match the Area ID of the receiving interface. */

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


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