Diff for /embedaddon/quagga/ospf6d/ospf6_neighbor.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:39
Line 89  ospf6_neighbor_create (u_int32_t router_id, struct osp Line 89  ospf6_neighbor_create (u_int32_t router_id, struct osp
             buf, oi->interface->name);              buf, oi->interface->name);
   on->ospf6_if = oi;    on->ospf6_if = oi;
   on->state = OSPF6_NEIGHBOR_DOWN;    on->state = OSPF6_NEIGHBOR_DOWN;
     on->state_change = 0;
   quagga_gettime (QUAGGA_CLK_MONOTONIC, &on->last_changed);    quagga_gettime (QUAGGA_CLK_MONOTONIC, &on->last_changed);
   on->router_id = router_id;    on->router_id = router_id;
   
Line 154  ospf6_neighbor_state_change (u_char next_state, struct Line 155  ospf6_neighbor_state_change (u_char next_state, struct
   if (prev_state == next_state)    if (prev_state == next_state)
     return;      return;
   
     on->state_change++;
   quagga_gettime (QUAGGA_CLK_MONOTONIC, &on->last_changed);    quagga_gettime (QUAGGA_CLK_MONOTONIC, &on->last_changed);
   
   /* log */    /* log */
Line 180  ospf6_neighbor_state_change (u_char next_state, struct Line 182  ospf6_neighbor_state_change (u_char next_state, struct
       (next_state != OSPF6_NEIGHBOR_EXCHANGE &&        (next_state != OSPF6_NEIGHBOR_EXCHANGE &&
        next_state != OSPF6_NEIGHBOR_LOADING))         next_state != OSPF6_NEIGHBOR_LOADING))
     ospf6_maxage_remove (on->ospf6_if->area->ospf6);      ospf6_maxage_remove (on->ospf6_if->area->ospf6);
   
   #ifdef HAVE_SNMP
     /* Terminal state or regression */ 
     if ((next_state == OSPF6_NEIGHBOR_FULL)  ||
         (next_state == OSPF6_NEIGHBOR_TWOWAY) ||
         (next_state < prev_state))
       ospf6TrapNbrStateChange (on);
   #endif
   
 }  }
   
 /* RFC2328 section 10.4 */  /* RFC2328 section 10.4 */

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


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