[BACK]Return to ospfd.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / ospfd

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

version 1.1.1.2, 2012/10/09 09:22:29 version 1.1.1.3, 2013/07/21 23:54:40
Line 182  ospf_new (void) Line 182  ospf_new (void)
       
   new->stub_router_startup_time = OSPF_STUB_ROUTER_UNCONFIGURED;    new->stub_router_startup_time = OSPF_STUB_ROUTER_UNCONFIGURED;
   new->stub_router_shutdown_time = OSPF_STUB_ROUTER_UNCONFIGURED;    new->stub_router_shutdown_time = OSPF_STUB_ROUTER_UNCONFIGURED;
    new->stub_router_admin_set     = OSPF_STUB_ROUTER_ADMINISTRATIVE_UNSET;
 
   /* Distribute parameter init. */    /* Distribute parameter init. */
   for (i = 0; i <= ZEBRA_ROUTE_MAX; i++)    for (i = 0; i <= ZEBRA_ROUTE_MAX; i++)
     {      {
Line 200  ospf_new (void) Line 201  ospf_new (void)
   
   /* MaxAge init. */    /* MaxAge init. */
   new->maxage_delay = OSFP_LSA_MAXAGE_REMOVE_DELAY_DEFAULT;    new->maxage_delay = OSFP_LSA_MAXAGE_REMOVE_DELAY_DEFAULT;
  new->maxage_lsa = list_new ();  new->maxage_lsa = route_table_init();
   new->t_maxage_walker =    new->t_maxage_walker =
     thread_add_timer (master, ospf_lsa_maxage_walker,      thread_add_timer (master, ospf_lsa_maxage_walker,
                       new, OSPF_LSA_MAXAGE_CHECK_INTERVAL);                        new, OSPF_LSA_MAXAGE_CHECK_INTERVAL);
Line 222  ospf_new (void) Line 223  ospf_new (void)
     }      }
   new->maxsndbuflen = getsockopt_so_sendbuf (new->fd);    new->maxsndbuflen = getsockopt_so_sendbuf (new->fd);
   if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE))    if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE))
    zlog_debug ("%s: starting with OSPF send buffer size %d",    zlog_debug ("%s: starting with OSPF send buffer size %u",
       __func__, new->maxsndbuflen);        __func__, new->maxsndbuflen);
   if ((new->ibuf = stream_new(OSPF_MAX_PACKET_SIZE+1)) == NULL)    if ((new->ibuf = stream_new(OSPF_MAX_PACKET_SIZE+1)) == NULL)
     {      {
Line 501  ospf_finish_final (struct ospf *ospf) Line 502  ospf_finish_final (struct ospf *ospf)
   ospf_lsdb_delete_all (ospf->lsdb);    ospf_lsdb_delete_all (ospf->lsdb);
   ospf_lsdb_free (ospf->lsdb);    ospf_lsdb_free (ospf->lsdb);
   
  for (ALL_LIST_ELEMENTS (ospf->maxage_lsa, node, nnode, lsa))  for (rn = route_top (ospf->maxage_lsa); rn; rn = route_next (rn))
    ospf_lsa_unlock (&lsa); /* maxage_lsa */    {
       struct ospf_lsa *lsa;
   
  list_delete (ospf->maxage_lsa);      if ((lsa = rn->info) != NULL)
         {
           ospf_lsa_unlock (&lsa);
           rn->info = NULL;
         }
       route_unlock_node (rn);
     }
   route_table_finish (ospf->maxage_lsa);
   
   if (ospf->old_table)    if (ospf->old_table)
     ospf_route_table_free (ospf->old_table);      ospf_route_table_free (ospf->old_table);
Line 676  ospf_area_get (struct ospf *ospf, struct in_addr area_ Line 685  ospf_area_get (struct ospf *ospf, struct in_addr area_
       area->format = format;        area->format = format;
       listnode_add_sort (ospf->areas, area);        listnode_add_sort (ospf->areas, area);
       ospf_check_abr_status (ospf);          ospf_check_abr_status (ospf);  
         if (ospf->stub_router_admin_set == OSPF_STUB_ROUTER_ADMINISTRATIVE_SET)
           {
             SET_FLAG (area->stub_router_state, OSPF_AREA_ADMIN_STUB_ROUTED);
           }
     }      }
   
   return area;    return area;
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

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