Revision 6f8bbaa1 proto/ospf/ospf.c

View differences:

proto/ospf/ospf.c
235 235
  p->asbr = c->asbr;
236 236
  p->ecmp = c->ecmp;
237 237
  p->tick = c->tick;
238
  p->disp_timer = tm_new(P->pool);
239
  p->disp_timer->data = p;
240
  p->disp_timer->randomize = 0;
241
  p->disp_timer->hook = ospf_disp;
242
  p->disp_timer->recurrent = p->tick;
238
  p->disp_timer = tm_new_set(P->pool, ospf_disp, p, 0, p->tick);
243 239
  tm_start(p->disp_timer, 1);
244 240
  p->lsab_size = 256;
245 241
  p->lsab_used = 0;
......
252 248
  p->gr = ospf_top_new(p, P->pool);
253 249
  s_init_list(&(p->lsal));
254 250

  
251
  p->flood_event = ev_new(P->pool);
252
  p->flood_event->hook = ospf_flood_event;
253
  p->flood_event->data = p;
254

  
255 255
  p->log_pkt_tbf = (struct tbf){ .rate = 1, .burst = 5 };
256 256
  p->log_lsa_tbf = (struct tbf){ .rate = 4, .burst = 20 };
257 257

  
......
1439 1439
	break;
1440 1440
      }
1441 1441
      cli_msg(-1017, "");
1442
      cli_msg(-1017," Type   LS ID           Router           Age  Sequence  Checksum");
1442
      cli_msg(-1017," Type   LS ID           Router          Sequence   Age  Checksum");
1443 1443

  
1444 1444
      last_dscope = dscope;
1445 1445
      last_domain = hea[i]->domain;
1446 1446
    }
1447 1447

  
1448
    cli_msg(-1017," %04x  %-15R %-15R %5u  %08x    %04x",
1449
	    lsa_type, lsa->id, lsa->rt, lsa->age, lsa->sn, lsa->checksum);
1448
    cli_msg(-1017," %04x  %-15R %-15R  %08x %5u    %04x",
1449
	    lsa_type, lsa->id, lsa->rt, lsa->sn, lsa->age, lsa->checksum);
1450 1450
  }
1451 1451
  cli_msg(0, "");
1452 1452
}

Also available in: Unified diff