Diff for /embedaddon/quagga/ospf6d/ospf6_spf.c between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2012/02/21 17:26:12 version 1.1.1.3, 2013/07/21 23:54:40
Line 391  ospf6_spf_calculation (u_int32_t router_id, Line 391  ospf6_spf_calculation (u_int32_t router_id,
   caddr_t lsdesc;    caddr_t lsdesc;
   struct ospf6_lsa *lsa;    struct ospf6_lsa *lsa;
   
     ospf6_spf_table_finish (result_table);
   
   /* Install the calculating router itself as the root of the SPF tree */    /* Install the calculating router itself as the root of the SPF tree */
   /* construct root vertex */    /* construct root vertex */
   lsa = ospf6_lsdb_lookup (htons (OSPF6_LSTYPE_ROUTER), htonl (0),    lsa = ospf6_lsdb_lookup (htons (OSPF6_LSTYPE_ROUTER), htonl (0),
Line 402  ospf6_spf_calculation (u_int32_t router_id, Line 404  ospf6_spf_calculation (u_int32_t router_id,
   candidate_list = pqueue_create ();    candidate_list = pqueue_create ();
   candidate_list->cmp = ospf6_vertex_cmp;    candidate_list->cmp = ospf6_vertex_cmp;
   
   ospf6_spf_table_finish (result_table);  
   
   root = ospf6_vertex_create (lsa);    root = ospf6_vertex_create (lsa);
   root->area = oa;    root->area = oa;
   root->cost = 0;    root->cost = 0;
Line 473  ospf6_spf_calculation (u_int32_t router_id, Line 473  ospf6_spf_calculation (u_int32_t router_id,
     }      }
   
   pqueue_delete (candidate_list);    pqueue_delete (candidate_list);
   
     oa->spf_calculation++;
 }  }
   
 static void  static void

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


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