Revision 23d67029

View differences:

proto/ospf/dbdes.c
148 148
    OSPF_TRACE(D_PACKETS, "DB_DES (M) sent to %I via %s.", n->ip,
149 149
	       ifa->iface->name);
150 150

  
151
    DBG("DB_DES PS=%u, M=%u.", ntohl(pkt->ddseq), pkt->imms.bit.m);
151
    DBG("DB_DES PS=%u, M=%u\n", ntohl(pkt->ddseq), pkt->imms.bit.m);
152 152

  
153 153
    if (!n->myimms.bit.ms)
154 154
    {
......
210 210
  OSPF_TRACE(D_PACKETS, "Received dbdes from %I via %s.", n->ip,
211 211
	     ifa->iface->name);
212 212

  
213
  DBG("DB_DES PS=%u, M=%u SIZE=%u.", ntohl(ps->ddseq), ps->imms.bit.m, size);
213
  DBG("DB_DES PS=%u, M=%u SIZE=%u\n", ntohl(ps->ddseq), ps->imms.bit.m, size);
214 214

  
215 215
  ospf_neigh_sm(n, INM_HELLOREC);
216 216

  
......
349 349
    {
350 350
      OSPF_TRACE(D_PACKETS, "dbdes - sequence mismatch neighbor %I (full)",
351 351
		 n->ip);
352
      DBG("PS=%u, DDR=%u, DDS=%u", ntohl(ps->ddseq), n->ddr, n->dds);
352
      DBG("PS=%u, DDR=%u, DDS=%u\n", ntohl(ps->ddseq), n->ddr, n->dds);
353 353
      ospf_neigh_sm(n, INM_SEQMIS);
354 354
    }
355 355
    break;
proto/ospf/iface.c
230 230
{
231 231
  struct ospf_area *oa = ifa->oa;
232 232

  
233
  DBG("SM on iface %s. Event is \"%s\".", ifa->iface->name, ospf_ism[event]);
233
  DBG("SM on iface %s. Event is '%s'\n", ifa->iface->name, ospf_ism[event]);
234 234

  
235 235
  switch (event)
236 236
  {
proto/ospf/lsreq.c
45 45
    lsh->type = en->lsa.type;
46 46
    lsh->rt = htonl(en->lsa.rt);
47 47
    lsh->id = htonl(en->lsa.id);
48
    DBG("Requesting %uth LSA: Type: %u, Id: %I, RT: %I\n", i, en->lsa.type,
49
	en->lsa.id, en->lsa.rt);
48
    DBG("Requesting %uth LSA: Type: %u, ID: %I, RT: %I, SN: 0x%x, Age %u\n",
49
	i, en->lsa.type, en->lsa.id, en->lsa.rt, en->lsa.sn, en->lsa.age);
50 50
    lsh++;
51 51
    if (sn == STAIL(n->lsrql))
52 52
      break;
......
93 93
  {
94 94
    u32 hid = ntohl(lsh->id);
95 95
    u32 hrt = ntohl(lsh->rt);
96
    DBG("Processing LSA: ID=%I, Type=%u, Router=%I\n", hid, lsh->type, hrt);
96
    DBG("Processing requested LSA: Type: %u, ID: %I, RT: %I\n", lsh->type, hid, hrt);
97 97
    llsh = sl_alloc(upslab);
98 98
    llsh->lsh.id = hid;
99 99
    llsh->lsh.rt = hrt;
......
103 103
		       llsh->lsh.type) == NULL)
104 104
    {
105 105
      log(L_WARN
106
	  "Received bad LS req from: %I looking: RT: %I, ID: %I, Type: %u",
107
	  n->ip, hrt, hid, lsh->type);
106
	  "Received bad LS req from: %I looking: Type: %u, ID: %I, RT: %I",
107
	  n->ip, lsh->type, hid, hrt);
108 108
      ospf_neigh_sm(n, INM_BADLSREQ);
109 109
      rfree(upslab);
110 110
      return;
proto/ospf/lsupd.c
50 50
      if (ifa->oa != oa)
51 51
        continue;
52 52
    }
53

  
54
    DBG("Wanted to flood LSA: Type: %u, ID: %I, RT: %I, SN: 0x%x, Age %u\n",
55
	hh->type, hh->id, hh->rt, hh->sn, hh->age);
56

  
53 57
    ret = 0;
54 58
    WALK_LIST(nn, ifa->neigh_list)
55 59
    {
......
59 63
      {
60 64
	if ((en = ospf_hash_find_header(nn->lsrqh, nn->ifa->oa->areaid, hh)) != NULL)
61 65
	{
66
	  DBG("That LSA found in lsreq list for neigh %I\n", nn->rid);
67

  
62 68
	  switch (lsa_comp(hh, &en->lsa))
63 69
	  {
64 70
	  case CMP_OLDER:
......
106 112
	}
107 113
	s_add_tail(&nn->lsrtl, SNODE en);
108 114
	memcpy(&en->lsa, hh, sizeof(struct ospf_lsa_header));
109
	DBG("Adding LSA lsrt RT: %I, Id: %I, Type: %u for n: %I\n",
110
	    en->lsa.rt, en->lsa.id, en->lsa.type, nn->ip);
115
	DBG("Adding that LSA for flood to %I\n", nn->ip);
111 116
      }
112 117
      else
113 118
      {
......
245 250
      continue;			/* Probably flushed LSA */
246 251
    /* FIXME This is a bug! I cannot flush LSA that is in lsrt */
247 252

  
248
    DBG("Sending ID=%I, Type=%u, RT=%I Sn: 0x%x Age: %u\n",
249
	llsh->lsh.id, llsh->lsh.type, llsh->lsh.rt, en->lsa.sn, en->lsa.age);
253
    DBG("Sending LSA: Type=%u, ID=%I, RT=%I, SN: 0x%x, Age: %u\n",
254
	llsh->lsh.type, llsh->lsh.id, llsh->lsh.rt, en->lsa.sn, en->lsa.age);
250 255
    if (((u32) (len + en->lsa.length)) > ospf_pkt_maxsize(n->ifa))
251 256
    {
252 257
      pk->lsano = htonl(lsano);
proto/ospf/neighbor.c
293 293
  struct proto_ospf *po = n->ifa->oa->po;
294 294
  struct proto *p = &po->proto;
295 295

  
296
  DBG("Neighbor state machine for neighbor %I, event \"%s\".", n->ip,
296
  DBG("Neighbor state machine for neighbor %I, event '%s'\n", n->ip,
297 297
	     ospf_inm[event]);
298 298

  
299 299
  switch (event)
......
600 600
rxmt_timer_hook(timer * timer)
601 601
{
602 602
  struct ospf_neighbor *n = (struct ospf_neighbor *) timer->data;
603
  struct proto *p = &n->ifa->oa->po->proto;
603 604
  struct top_hash_entry *en;
604 605

  
605 606
  DBG("%s: RXMT timer fired on interface %s for neigh: %I.\n",
606
      p->name, ifa->iface->name, n->ip);
607
      p->name, n->ifa->iface->name, n->ip);
607 608

  
608 609
  if(n->state < NEIGHBOR_EXSTART) return;
609 610

  
proto/ospf/topology.c
539 539
  if ((nf->n.type > RTS_OSPF_IA) && (nf->o.type > RTS_OSPF_IA)) return;
540 540

  
541 541
#ifdef LOCAL_DEBUG
542
  DBG("Checking...dest = %d, %I/%d", dest, nf->fn.prefix, nf->fn.pxlen);
543
  if (nf->n.oa) DBG("New: met=%d, oa=%d", nf->n.metric1, nf->n.oa->areaid);
544
  if (nf->o.oa) DBG("Old: met=%d, oa=%d", nf->o.metric1, nf->o.oa->areaid);
542
  DBG("Checking...dest = %d, %I/%d\n", dest, nf->fn.prefix, nf->fn.pxlen);
543
  if (nf->n.oa) DBG("New: met=%d, oa=%d\n", nf->n.metric1, nf->n.oa->areaid);
544
  if (nf->o.oa) DBG("Old: met=%d, oa=%d\n", nf->o.metric1, nf->o.oa->areaid);
545 545
#endif
546 546

  
547 547
  WALK_LIST(oa, po->area_list)

Also available in: Unified diff