Revision df49d4e1

View differences:

proto/ospf/dbdes.c
133 133
      break;
134 134

  
135 135
    default:				/* Ignore it */
136
      die("Bug in dbdes sending\n");
136
      die("Bug in dbdes sending");
137 137
      break;
138 138
  }
139 139
}
......
358 358
        }
359 359
      break;
360 360
    defaut:
361
      die("%s: Received dbdes from %I in unknown state.\n", p->name, n->ip);
361
      die("%s: Received dbdes from %I in unknown state.", p->name, n->ip);
362 362
      break;
363 363
   }
364 364
}
proto/ospf/hello.c
62 62

  
63 63
  if((unsigned)ipa_mklen(ipa_ntoh(ps->netmask))!=ifa->iface->addr->pxlen)
64 64
  {
65
    log("%s%s%I%s%Ibad netmask %I.\n", p->name, beg, nrid, rec,
65
    log("%s%s%I%s%Ibad netmask %I.", p->name, beg, nrid, rec,
66 66
      ipa_ntoh(ps->netmask));
67 67
    return;
68 68
  }
69 69
  
70 70
  if(ntohs(ps->helloint)!=ifa->helloint)
71 71
  {
72
    log("%s%s%I%shello interval mismatch.\n", p->name, beg, faddr, rec);
72
    log("%s%s%I%shello interval mismatch.", p->name, beg, faddr, rec);
73 73
    return;
74 74
  }
75 75

  
76 76
  if(ntohl(ps->deadint)!=ifa->helloint*ifa->deadc)
77 77
  {
78
    log("%s%s%I%sdead interval mismatch.\n", p->name, beg, faddr, rec);
78
    log("%s%s%I%sdead interval mismatch.", p->name, beg, faddr, rec);
79 79
    return;
80 80
  }
81 81

  
82 82
  if(ps->options!=ifa->options)
83 83
  {
84
    log("%s%s%I%soptions mismatch.\n", p->name, beg, faddr, rec);
84
    log("%s%s%I%soptions mismatch.", p->name, beg, faddr, rec);
85 85
    return;
86 86
  }
87 87

  
88 88
  if((n=find_neigh(ifa, nrid))==NULL)
89 89
  {
90
    debug("%s: New neighbor found: %I on %s.\n", p->name,faddr,
90
    debug("%s: New neighbor found: %I on %s.", p->name,faddr,
91 91
      ifa->iface->name);
92 92
    n=mb_allocz(p->pool, sizeof(struct ospf_neighbor));
93 93
    add_tail(&ifa->neigh_list, NODE n);
proto/ospf/iface.c
362 362
        log("%s: Huh? could not open mc socket on interface %s?", p->name,
363 363
          iface->name);
364 364
	mb_free(ifa);
365
	log("%s: Ignoring this interface\n", p->name);
365
	log("%s: Ignoring this interface.", p->name);
366 366
	return;
367 367
      }
368 368
      ifa->dr_sk=NULL;
......
372 372
        log("%s: Huh? could not open ip socket on interface %s?", p->name,
373 373
          iface->name);
374 374
	mb_free(ifa);
375
	log("%s: Ignoring this interface\n", p->name);
375
	log("%s: Ignoring this interface", p->name);
376 376
	return;
377 377
      }
378 378

  
proto/ospf/lsack.c
178 178
  if((nolsa<1)||((lenn-sizeof(struct ospf_lsack_packet))!=
179 179
    (nolsa*sizeof(struct ospf_lsa_header))))
180 180
  {
181
    log("%s: Received corrupted LS ack from %I\n", p->name, n->ip);
181
    log("%s: Received corrupted LS ack from %I", p->name, n->ip);
182 182
    return;
183 183
  }
184 184

  
proto/ospf/lsalib.c
172 172
      }
173 173
      break;
174 174
    }
175
    default: die("(hton): Unknown LSA\n");
175
    default: die("(hton): Unknown LSA");
176 176
  }
177 177
};
178 178

  
......
269 269
      }
270 270
      break;
271 271
    }
272
    default: die("(ntoh): Unknown LSA\n");
272
    default: die("(ntoh): Unknown LSA");
273 273
  }
274 274
};
275 275

  
proto/ospf/lsupd.c
64 64
	      ospf_hash_delete(nn->lsrqh,en);
65 65
	      if(EMPTY_SLIST(nn->lsrql)) ospf_neigh_sm(nn, INM_LOADDONE);
66 66
	      break;
67
	    default: bug("Bug in lsa_comp?\n");
67
	    default: bug("Bug in lsa_comp?");
68 68
	  }
69 69
	}
70 70
      }
......
279 279

  
280 280
    if(((diff+sizeof(struct ospf_lsa_header))>=size) ||
281 281
      ((ntohs(lsa->length)+diff)>size))
282
      log("%s: Received lsupd from %I is too short.\n", p->name,n->ip);
282
      log("%s: Received lsupd from %I is too short.", p->name,n->ip);
283 283

  
284 284
    lenn=ntohs(lsa->length);
285 285

  
286 286
    if((lenn<=sizeof(struct ospf_lsa_header))||(lenn!=(4*(lenn/4))))
287 287
    {
288
      log("Received LSA with bad length\n");
288
      log("Received LSA with bad length");
289 289
      ospf_neigh_sm(n,INM_BADLSREQ);
290 290
      break;
291 291
    }
292 292
    /* pg 143 (1) */
293 293
    if(lsa->checksum!=lsasum_check(lsa,NULL,po))
294 294
    {
295
      log("Received bad lsa checksum from %I\n",n->rid);
295
      log("Received bad lsa checksum from %I",n->rid);
296 296
      continue;
297 297
    }
298 298
    /* pg 143 (2) */
299 299
    if((lsa->type<LSA_T_RT)||(lsa->type>LSA_T_EXT))
300 300
    {
301
      log("Unknown LSA type from %I\n",n->rid);
301
      log("Unknown LSA type from %I",n->rid);
302 302
      continue;
303 303
    }
304 304
    /* pg 143 (3) */
305 305
    if((lsa->type==LSA_T_EXT)&&oa->stub)
306 306
    {
307
      log("Received External LSA in stub area from %I\n",n->rid);
307
      log("Received External LSA in stub area from %I",n->rid);
308 308
      continue;
309 309
    }
310 310
    ntohlsah(lsa,&lsatmp);
proto/ospf/neighbor.c
249 249
	tm_start(n->lsrr_timer,n->ifa->rxmtint);
250 250
	tm_start(n->ackd_timer,n->ifa->rxmtint/2);
251 251
      }
252
      else die("NEGDONE and I'm not in EXSTART?\n");
252
      else die("NEGDONE and I'm not in EXSTART?");
253 253
      break;
254 254
    case INM_EXDONE:
255 255
        neigh_chstate(n,NEIGHBOR_LOADING);
......
358 358
  else
359 359
  {
360 360
    if((tmp=find_neigh(ifa,ndrid))==NULL)
361
      die("Error in DR election.\n");
361
      die("Error in DR election.");
362 362
    ifa->drid=ndrid;
363 363
    ifa->drip=tmp->ip;
364 364
  }
......
371 371
  else
372 372
  {
373 373
    if((tmp=find_neigh(ifa,nbdrid))==NULL)
374
      die("Error in BDR election.\n");
374
      die("Error in BDR election.");
375 375
    ifa->bdrid=nbdrid;
376 376
    ifa->bdrip=tmp->ip;
377 377
  }
proto/ospf/rt.c
127 127
	      DBG("PTP searched.\n");
128 128
	      break;
129 129
	    default:
130
	      log("Unknown link type in router lsa.\n");
130
	      log("Unknown link type in router lsa.");
131 131
	      break;
132 132
	  }
133 133
	  add_cand(&oa->cand,tmp,act,act->dist+rtl->metric,oa);
......
287 287
    mlen=ipa_mklen(le->netmask);
288 288
    if((mlen<0)||(mlen>32))
289 289
    {
290
      log("%s: Invalid mask in LSA.\nID: %I, RT: %I, Type: %u, Mask %I",
290
      log("%s: Invalid mask in LSA. ID: %I, RT: %I, Type: %u, Mask %I",
291 291
        p->name,en->lsa.id,en->lsa.rt,en->lsa.type,le->netmask);
292 292
      continue;
293 293
    }
proto/rip/auth.c
4 4
 *	Copyright (c) 1999 Pavel Machek <pavel@ucw.cz>
5 5
 *
6 6
 *	Can be freely distributed and used under the terms of the GNU GPL.
7
 *
8 7
 */
9 8

  
10 9
#define LOCAL_DEBUG
......
38 37
      struct password_item *passwd = get_best_password( P_CF->passwords, 0 );
39 38
      DBG( "Plaintext passwd" );
40 39
      if (!passwd) {
41
	log( L_AUTH "no passwords set and password authentication came\n" );
40
	log( L_AUTH "No passwords set and password authentication came" );
42 41
	return 1;
43 42
      }
44 43
      if (strncmp( (char *) (&block->packetlen), passwd->password, 16)) {
45
	log( L_AUTH "Passwd authentication failed!\n" );
44
	log( L_AUTH "Passwd authentication failed!" );
46 45
	DBG( "Expected %s, got %s\n", passwd->password, &block->packetlen );
47 46
	return 1;
48 47
      }
......
55 54
      struct rip_md5_tail *tail;
56 55

  
57 56
      if (block->packetlen != PACKETLEN(num)) {
58
	log( L_ERR "packetlen in md5 does not match computed value\n" );
57
	log( L_ERR "Packet length in MD5 does not match computed value" );
59 58
	return 1;
60 59
      }
61 60

  
62 61
      tail = (struct rip_md5_tail *) ((char *) packet + (block->packetlen - sizeof(struct rip_block_auth)));
63 62
      if ((tail->mustbeFFFF != 0xffff) || (tail->mustbe0001 != 0x0001)) {
64
	log( L_ERR "md5 tail signature is not there\n" );
63
	log( L_ERR "MD5 tail signature is not there" );
65 64
	return 1;
66 65
      }
67 66

  
......
73 72
	if (block->seq) {
74 73
	  struct neighbor *neigh = neigh_find(p, &whotoldme, 0);
75 74
	  if (!neigh) {
76
	    log( L_AUTH "Non-neighbour md5 checksummed packet?\n" );
75
	    log( L_AUTH "Non-neighbour MD5 checksummed packet?" );
77 76
	  } else {
78 77
	    if (neigh->aux > block->seq) {
79
	      log( L_AUTH "md5 prottected packet with lower numbers\n" );
78
	      log( L_AUTH "MD5 protected packet with lower numbers" );
80 79
	      return 0;
81 80
	    }
82 81
	    neigh->aux = block->seq;
......
120 119
  DBG( "Outgoing authentication: " );
121 120

  
122 121
  if (!passwd) {
123
    log( L_ERR "no suitable password found for authentication\n" );
122
    log( L_ERR "No suitable password found for authentication" );
124 123
    return PACKETLEN(num);
125 124
  }
126 125

  
......
137 136
      static int sequence = 0;
138 137

  
139 138
      if (num > PACKET_MD5_MAX)
140
	bug(  "we can not add MD5 authentication to this long packet\n" );
139
	bug(  "We can not add MD5 authentication to this long packet" );
141 140

  
142 141
      block->keyid = passwd->id;
143 142
      block->authlen = 20;
......
157 156
      return PACKETLEN(num) + block->authlen;
158 157
    }
159 158
  default:
160
    bug( "Uknown authtype in outgoing authentication?\n" );
159
    bug( "Unknown authtype in outgoing authentication?" );
161 160
  }
162 161
}
proto/rip/rip.h
152 152

  
153 153

  
154 154
#define RIP_MAGIC 81861253
155
#define CHK_MAGIC do { if (P->magic != RIP_MAGIC) bug( "Not enough magic\n" ); } while (0)
155
#define CHK_MAGIC do { if (P->magic != RIP_MAGIC) bug( "Not enough magic" ); } while (0)
156 156

  
157 157
void rip_init_instance(struct proto *p);
158 158
void rip_init_config(struct rip_proto_config *c);
proto/static/static.c
98 98
	      static_install(p, r, n->iface);
99 99
	  }
100 100
	else
101
	  log(L_ERR "Static route destination %I is invalid. Ignoring.\n", r->via);
101
	  log(L_ERR "Static route destination %I is invalid. Ignoring.", r->via);
102 102
	break;
103 103
      }
104 104
    case RTD_DEVICE:
sysdep/linux/netlink/netlink.c
348 348
  ifi = if_find_by_index(i->ifa_index);
349 349
  if (!ifi)
350 350
    {
351
      log(L_ERR "KIF: Received address message for unknown interface %d\n", i->ifa_index);
351
      log(L_ERR "KIF: Received address message for unknown interface %d", i->ifa_index);
352 352
      return;
353 353
    }
354 354

  

Also available in: Unified diff