Diff for /embedaddon/quagga/ospf6d/ospf6_interface.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, 2012/10/09 09:22:28
Line 108  ospf6_interface_create (struct interface *ifp) Line 108  ospf6_interface_create (struct interface *ifp)
   oi->neighbor_list = list_new ();    oi->neighbor_list = list_new ();
   oi->neighbor_list->cmp = ospf6_neighbor_cmp;    oi->neighbor_list->cmp = ospf6_neighbor_cmp;
   oi->linklocal_addr = (struct in6_addr *) NULL;    oi->linklocal_addr = (struct in6_addr *) NULL;
  oi->instance_id = 0;  oi->instance_id = OSPF6_INTERFACE_INSTANCE_ID;
  oi->transdelay = 1;  oi->transdelay = OSPF6_INTERFACE_TRANSDELAY;
  oi->priority = 1;  oi->priority = OSPF6_INTERFACE_PRIORITY;
   
  oi->hello_interval = 10;  oi->hello_interval = OSPF6_INTERFACE_HELLO_INTERVAL;
  oi->dead_interval = 40;  oi->dead_interval = OSPF6_INTERFACE_DEAD_INTERVAL;
  oi->rxmt_interval = 5;  oi->rxmt_interval = OSPF6_INTERFACE_RXMT_INTERVAL;
  oi->cost = 1;  oi->cost = OSPF6_INTERFACE_COST;
   oi->state = OSPF6_INTERFACE_DOWN;    oi->state = OSPF6_INTERFACE_DOWN;
   oi->flag = 0;    oi->flag = 0;
   oi->mtu_ignore = 0;    oi->mtu_ignore = 0;
Line 399  ospf6_interface_state_change (u_char next_state, struc Line 399  ospf6_interface_state_change (u_char next_state, struc
        prev_state == OSPF6_INTERFACE_BDR) &&         prev_state == OSPF6_INTERFACE_BDR) &&
       (next_state != OSPF6_INTERFACE_DR &&        (next_state != OSPF6_INTERFACE_DR &&
        next_state != OSPF6_INTERFACE_BDR))         next_state != OSPF6_INTERFACE_BDR))
    ospf6_leave_alldrouters (oi->interface->ifindex);    ospf6_sso (oi->interface->ifindex, &alldrouters6, IPV6_LEAVE_GROUP);
   if ((prev_state != OSPF6_INTERFACE_DR &&    if ((prev_state != OSPF6_INTERFACE_DR &&
        prev_state != OSPF6_INTERFACE_BDR) &&         prev_state != OSPF6_INTERFACE_BDR) &&
       (next_state == OSPF6_INTERFACE_DR ||        (next_state == OSPF6_INTERFACE_DR ||
        next_state == OSPF6_INTERFACE_BDR))         next_state == OSPF6_INTERFACE_BDR))
    ospf6_join_alldrouters (oi->interface->ifindex);    ospf6_sso (oi->interface->ifindex, &alldrouters6, IPV6_JOIN_GROUP);
   
   OSPF6_ROUTER_LSA_SCHEDULE (oi->area);    OSPF6_ROUTER_LSA_SCHEDULE (oi->area);
   if (next_state == OSPF6_INTERFACE_DOWN)    if (next_state == OSPF6_INTERFACE_DOWN)
Line 612  interface_up (struct thread *thread) Line 612  interface_up (struct thread *thread)
     }      }
   
   /* Join AllSPFRouters */    /* Join AllSPFRouters */
  ospf6_join_allspfrouters (oi->interface->ifindex);  ospf6_sso (oi->interface->ifindex, &allspfrouters6, IPV6_JOIN_GROUP);
   
   /* Update interface route */    /* Update interface route */
   ospf6_interface_connected_route_update (oi->interface);    ospf6_interface_connected_route_update (oi->interface);
Line 707  interface_down (struct thread *thread) Line 707  interface_down (struct thread *thread)
   
   /* Leave AllSPFRouters */    /* Leave AllSPFRouters */
   if (oi->state > OSPF6_INTERFACE_DOWN)    if (oi->state > OSPF6_INTERFACE_DOWN)
    ospf6_leave_allspfrouters (oi->interface->ifindex);    ospf6_sso (oi->interface->ifindex, &allspfrouters6, IPV6_LEAVE_GROUP);
   
   ospf6_interface_state_change (OSPF6_INTERFACE_DOWN, oi);    ospf6_interface_state_change (OSPF6_INTERFACE_DOWN, oi);
   
Line 1522  config_write_ospf6_interface (struct vty *vty) Line 1522  config_write_ospf6_interface (struct vty *vty)
   
       if (ifp->desc)        if (ifp->desc)
         vty_out (vty, " description %s%s", ifp->desc, VNL);          vty_out (vty, " description %s%s", ifp->desc, VNL);
   
       if (ifp->mtu6 != oi->ifmtu)        if (ifp->mtu6 != oi->ifmtu)
         vty_out (vty, " ipv6 ospf6 ifmtu %d%s", oi->ifmtu, VNL);          vty_out (vty, " ipv6 ospf6 ifmtu %d%s", oi->ifmtu, VNL);
      vty_out (vty, " ipv6 ospf6 cost %d%s",
               oi->cost, VNL);      if (oi->cost != OSPF6_INTERFACE_COST)
      vty_out (vty, " ipv6 ospf6 hello-interval %d%s",        vty_out (vty, " ipv6 ospf6 cost %d%s",
               oi->hello_interval, VNL);                 oi->cost, VNL);
      vty_out (vty, " ipv6 ospf6 dead-interval %d%s",
               oi->dead_interval, VNL);      if (oi->hello_interval != OSPF6_INTERFACE_HELLO_INTERVAL)
      vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s",        vty_out (vty, " ipv6 ospf6 hello-interval %d%s",
               oi->rxmt_interval, VNL);                 oi->hello_interval, VNL);
      vty_out (vty, " ipv6 ospf6 priority %d%s",
               oi->priority, VNL);      if (oi->dead_interval != OSPF6_INTERFACE_DEAD_INTERVAL)
      vty_out (vty, " ipv6 ospf6 transmit-delay %d%s",        vty_out (vty, " ipv6 ospf6 dead-interval %d%s",
               oi->transdelay, VNL);                 oi->dead_interval, VNL);
      vty_out (vty, " ipv6 ospf6 instance-id %d%s",
               oi->instance_id, VNL);      if (oi->rxmt_interval != OSPF6_INTERFACE_RXMT_INTERVAL)
         vty_out (vty, " ipv6 ospf6 retransmit-interval %d%s",
                  oi->rxmt_interval, VNL);
 
       if (oi->priority != OSPF6_INTERFACE_PRIORITY)
         vty_out (vty, " ipv6 ospf6 priority %d%s",
                  oi->priority, VNL);
 
       if (oi->transdelay != OSPF6_INTERFACE_TRANSDELAY)
         vty_out (vty, " ipv6 ospf6 transmit-delay %d%s",
                  oi->transdelay, VNL);
 
       if (oi->instance_id != OSPF6_INTERFACE_INSTANCE_ID)
         vty_out (vty, " ipv6 ospf6 instance-id %d%s",
                  oi->instance_id, VNL);
   
       if (oi->plist_name)        if (oi->plist_name)
         vty_out (vty, " ipv6 ospf6 advertise prefix-list %s%s",          vty_out (vty, " ipv6 ospf6 advertise prefix-list %s%s",

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


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