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

Diff for /embedaddon/quagga/isisd/isis_spf.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/21 23:54:38 version 1.1.1.4, 2016/11/02 10:09:10
Line 189  isis_vertex_new (void *id, enum vertextype vtype) Line 189  isis_vertex_new (void *id, enum vertextype vtype)
   struct isis_vertex *vertex;    struct isis_vertex *vertex;
   
   vertex = XCALLOC (MTYPE_ISIS_VERTEX, sizeof (struct isis_vertex));    vertex = XCALLOC (MTYPE_ISIS_VERTEX, sizeof (struct isis_vertex));
   if (vertex == NULL)  
     {  
       zlog_err ("isis_vertex_new Out of memory!");  
       return NULL;  
     }  
   
   vertex->type = vtype;    vertex->type = vtype;
   switch (vtype)    switch (vtype)
Line 1072  isis_spf_preload_tent (struct isis_spftree *spftree, i Line 1067  isis_spf_preload_tent (struct isis_spftree *spftree, i
             {              {
               zlog_warn ("ISIS-Spf: No lsp (%p) found from root "                zlog_warn ("ISIS-Spf: No lsp (%p) found from root "
                   "to L%d DR %s on %s (ID %d)",                    "to L%d DR %s on %s (ID %d)",
                  lsp, level, rawlspid_print (lsp_id),                   (void *)lsp, level, rawlspid_print (lsp_id),
                  circuit->interface->name, circuit->circuit_id);                  circuit->interface->name, circuit->circuit_id);
               continue;                continue;
             }              }
           isis_spf_process_pseudo_lsp (spftree, lsp,            isis_spf_process_pseudo_lsp (spftree, lsp,
Line 1456  isis_spf_schedule6 (struct isis_area *area, int level) Line 1451  isis_spf_schedule6 (struct isis_area *area, int level)
   assert (area->is_type & level);    assert (area->is_type & level);
   
   if (isis->debugs & DEBUG_SPF_EVENTS)    if (isis->debugs & DEBUG_SPF_EVENTS)
    zlog_debug ("ISIS-Spf (%s) L%d SPF schedule called, lastrun %d sec ago",    zlog_debug ("ISIS-Spf (%s) L%d SPF schedule called, lastrun %lld sec ago",
                area->area_tag, level, diff);                area->area_tag, level, (long long)diff);
   
   if (spftree->pending)    if (spftree->pending)
     return ISIS_OK;      return ISIS_OK;
Line 1476  isis_spf_schedule6 (struct isis_area *area, int level) Line 1471  isis_spf_schedule6 (struct isis_area *area, int level)
                      area->min_spf_interval[1] - diff);                       area->min_spf_interval[1] - diff);
   
   if (isis->debugs & DEBUG_SPF_EVENTS)    if (isis->debugs & DEBUG_SPF_EVENTS)
    zlog_debug ("ISIS-Spf (%s) L%d SPF scheduled %d sec from now",    zlog_debug ("ISIS-Spf (%s) L%d SPF scheduled %lld sec from now",
                area->area_tag, level, area->min_spf_interval[level-1] - diff);                area->area_tag, level,
                 (long long)(area->min_spf_interval[level-1] - diff));
   
   spftree->pending = 1;    spftree->pending = 1;
   
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

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