Revision 44724025

View differences:

proto/ospf/dbdes.c
38 38
      op->length=htons(length);
39 39
      ospf_pkt_finalize(ifa, op);
40 40
      sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO);
41
      debug("%s: DB_DES (I) sent for %u.\n", p->name, n->rid);
41
      debug("%s: DB_DES (I) sent for %I.\n", p->name, n->rid);
42 42
      break;
43 43

  
44 44
    case NEIGHBOR_EXCHANGE:
......
128 128
      }
129 129

  
130 130
      sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO);
131
      debug("%s: DB_DES sent to %u.\n", p->name, n->rid);
131
      debug("%s: DB_DES sent to %I.\n", p->name, n->rid);
132 132
      if(n->myimms.bit.ms) tm_start(n->rxmt_timer,ifa->rxmtint);
133 133
      else
134 134
      {
......
158 158
  n=(struct ospf_neighbor *)timer->data;
159 159
  ifa=n->ifa;
160 160
  p=(struct proto *)(ifa->proto);
161
  debug("%s: RXMT timer fired on interface %s for neigh: %u.\n",
161
  debug("%s: RXMT timer fired on interface %s for neigh: %I.\n",
162 162
    p->name, ifa->iface->name, n->rid);
163 163
  if(n->state<NEIGHBOR_LOADING) ospf_dbdes_tx(n);
164 164
  else
......
218 218

  
219 219
  if((n=find_neigh(ifa, nrid))==NULL)
220 220
  {
221
    debug("%s: Received dbdes from unknown neigbor! (%u)\n", p->name,
221
    debug("%s: Received dbdes from unknown neigbor! (%I)\n", p->name,
222 222
      nrid);
223 223
    return ;
224 224
  }
225 225

  
226 226
  if(ifa->iface->mtu<size)
227 227
  {
228
    debug("%s: Received dbdes larger than MTU from (%u)!\n", p->name, nrid);
228
    debug("%s: Received dbdes larger than MTU from (%I)!\n", p->name, nrid);
229 229
    return ;
230 230
  }
231 231

  
......
234 234
    case NEIGHBOR_DOWN:
235 235
    case NEIGHBOR_ATTEMPT:
236 236
    case NEIGHBOR_2WAY:
237
        debug("%s: Received dbdes from %u in bad state. (%u)\n", p->name, nrid);
237
        debug("%s: Received dbdes from %I in bad state.\n", p->name, nrid);
238 238
        return;
239 239
      break;
240 240
    case NEIGHBOR_INIT:
......
251 251
	  n->options=ps->options;
252 252
	  n->myimms.bit.ms=0;
253 253
	  n->imms.byte=ps->imms.byte;
254
          debug("%s: I'm slave to %u. \n", p->name, nrid);
254
          debug("%s: I'm slave to %I. \n", p->name, nrid);
255 255
	  ospf_neigh_sm(n, INM_NEGDONE);
256 256
	  tm_stop(n->rxmt_timer);
257 257
	  ospf_dbdes_tx(n);
......
266 266
	    n->options=ps->options;
267 267
            n->ddr=ntohl(ps->ddseq)-1;
268 268
            n->imms.byte=ps->imms.byte;
269
            debug("%s: I'm master to %u. \n", p->name, nrid);
269
            debug("%s: I'm master to %I. \n", p->name, nrid);
270 270
	    ospf_neigh_sm(n, INM_NEGDONE);
271 271
          }
272 272
	  else
273 273
          {
274
            debug("%s: Nothing happend to %u (imms=%u)", p->name, nrid,
274
            debug("%s: Nothing happend to %I (imms=%u)", p->name, nrid,
275 275
              ps->imms.byte);
276 276
            break;
277 277
          }
......
281 281
	  (ntohl(ps->ddseq)==n->ddr))
282 282
        {
283 283
          /* Duplicate packet */
284
          debug("%s: Received duplicate dbdes from (%u)!\n", p->name, nrid);
284
          debug("%s: Received duplicate dbdes from (%I)!\n", p->name, nrid);
285 285
	  if(n->imms.bit.ms==0)
286 286
	  {
287 287
            ospf_dbdes_tx(n);
......
355 355
	if((ps->imms.byte==n->imms.byte) && (ps->options=n->options) &&
356 356
	  (ps->ddseq==n->dds)) /* Only duplicate are accepted */
357 357
        {
358
          debug("%s: Received duplicate dbdes from (%u)!\n", p->name, nrid);
358
          debug("%s: Received duplicate dbdes from (%I)!\n", p->name, nrid);
359 359
          return;
360 360
        }
361 361
	else
......
364 364
        }
365 365
      break;
366 366
    defaut:
367
      die("%s: Received dbdes from %u in unknown state. (%u)\n", p->name, nrid);
367
      die("%s: Received dbdes from %I in unknown state.\n", p->name, nrid);
368 368
      break;
369 369
   }
370 370
}
proto/ospf/lsreq.c
42 42
    lsh->type=en->lsa.type;
43 43
    lsh->rt=htonl(en->lsa.rt);
44 44
    lsh->id=htonl(en->lsa.id);
45
    DBG("Requesting %uth LSA: Type: %u, Id: %u, RT: %u\n",i, en->lsa.type,
45
    DBG("Requesting %uth LSA: Type: %u, Id: %I, RT: %I\n",i, en->lsa.type,
46 46
		    en->lsa.id, en->lsa.rt);
47 47
    lsh++;
48 48
    if(sn==STAIL(n->lsrql)) break;
......
54 54
  op->length=htons(length);
55 55
  ospf_pkt_finalize(n->ifa, op);
56 56
  sk_send_to(n->ifa->ip_sk,length, n->ip, OSPF_PROTO);
57
  DBG("Lsreq send to: %u\n", n->rid);
57
  DBG("Lsreq send to: %I\n", n->rid);
58 58
}
59 59

  
60 60
void
......
67 67
  n=(struct ospf_neighbor *)timer->data;
68 68
  ifa=n->ifa;
69 69
  p=(struct proto *)(ifa->proto);
70
  debug("%s: LSRR timer fired on interface %s for neigh: %u.\n",
70
  debug("%s: LSRR timer fired on interface %s for neigh: %I.\n",
71 71
    p->name, ifa->iface->name, n->rid);
72 72
  ospf_lsreq_tx(n);
73 73
}
......
91 91

  
92 92
  if((n=find_neigh(ifa, nrid))==NULL)
93 93
  {
94
    debug("%s: Received lsreq from unknown neigbor! (%u)\n", p->name,
94
    debug("%s: Received lsreq from unknown neigbor! (%I)\n", p->name,
95 95
      nrid);
96 96
    return ;
97 97
  }
......
105 105
  for(i=0;i<(length-sizeof(struct ospf_lsreq_packet))/
106 106
    sizeof(struct ospf_lsreq_header);i++);
107 107
  {
108
    DBG("Processing LSA: ID=%u, Type=%u, Router=%u\n", ntohl(lsh->id),
108
    DBG("Processing LSA: ID=%I, Type=%u, Router=%I\n", ntohl(lsh->id),
109 109
    lsh->type, ntohl(lsh->rt));
110 110
    llsh=sl_alloc(upslab);
111 111
    llsh->lsh.id=ntohl(lsh->id);
proto/ospf/lsupd.c
59 59
	      break;
60 60
	    case CMP_SAME:
61 61
              s_rem_node(SNODE en);
62
	      DBG("Removing from lsreq list for neigh %u\n", nn->rid);
62
	      DBG("Removing from lsreq list for neigh %I\n", nn->rid);
63 63
	      ospf_hash_delete(nn->lsrqh,en);
64 64
	      if(EMPTY_SLIST(nn->lsrql)) ospf_neigh_sm(nn, INM_LOADDONE);
65 65
	      continue;
66 66
	      break;
67 67
	    case CMP_NEWER:
68 68
              s_rem_node(SNODE en);
69
	      DBG("Removing from lsreq list for neigh %u\n", nn->rid);
69
	      DBG("Removing from lsreq list for neigh %I\n", nn->rid);
70 70
	      ospf_hash_delete(nn->lsrqh,en);
71 71
	      if(EMPTY_SLIST(nn->lsrql)) ospf_neigh_sm(nn, INM_LOADDONE);
72 72
	      break;
......
162 162
  WALK_LIST(llsh, *l)
163 163
  {
164 164
    en=ospf_hash_find(n->ifa->oa->gr,llsh->lsh.id,llsh->lsh.rt,llsh->lsh.type);
165
    DBG("Sending ID=%u, Type=%u, RT=%u\n", llsh->lsh.id, llsh->lsh.type,
165
    DBG("Sending ID=%I, Type=%u, RT=%I\n", llsh->lsh.id, llsh->lsh.type,
166 166
      llsh->lsh.rt);
167 167
    if((len+sizeof(struct ospf_lsa_header)+en->lsa.length)>n->ifa->iface->mtu)
168 168
    {
......
217 217

  
218 218
  if((n=find_neigh(ifa, nrid))==NULL)
219 219
  {
220
    debug("%s: Received lsupd from unknown neigbor! (%u)\n", p->name,
220
    debug("%s: Received lsupd from unknown neigbor! (%I)\n", p->name,
221 221
      nrid);
222 222
    return ;
223 223
  }
224 224
  if(n->state<NEIGHBOR_EXCHANGE)
225 225
  {
226
    debug("%s: Received lsupd in lesser state than EXCHANGE from (%u)\n",
226
    debug("%s: Received lsupd in lesser state than EXCHANGE from (%I)\n",
227 227
      p->name);
228 228
    return;
229 229
  }
......
239 239
    /* pg 143 (1) */
240 240
    if(lsa->checksum!=lsasum_check(lsa,NULL,po))
241 241
    {
242
      log("Received bad lsa checksum from %u\n",n->rid);
242
      log("Received bad lsa checksum from %I\n",n->rid);
243 243
      continue;
244 244
    }
245 245
    /* pg 143 (2) */
246 246
    if((lsa->type<LSA_T_RT)||(lsa->type>LSA_T_EXT))
247 247
    {
248
      log("Unknown LSA type from %u\n",n->rid);
248
      log("Unknown LSA type from %I\n",n->rid);
249 249
      continue;
250 250
    }
251 251
    /* pg 143 (3) */
252 252
    if((lsa->type==LSA_T_EXT)&&oa->stub)
253 253
    {
254
      log("Received External LSA in stub area from %u\n",n->rid);
254
      log("Received External LSA in stub area from %I\n",n->rid);
255 255
      continue;
256 256
    }
257 257
    ntohlsah(lsa,&lsatmp);
258
    DBG("Processing update Type: %u ID: %u RT: %u\n",lsatmp.type,
258
    DBG("Processing update Type: %u ID: %I RT: %I\n",lsatmp.type,
259 259
        lsatmp.id, lsatmp.rt);
260 260
    lsadb=ospf_hash_find_header(oa->gr, &lsatmp);
261 261

  

Also available in: Unified diff