summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2000-06-06 01:00:34 +0000
committerOndrej Filip <feela@network.cz>2000-06-06 01:00:34 +0000
commitfef1badfcfb0519cca10f3561e5cb79ef9f9e969 (patch)
tree0638140f861b146c2654b625b5a8a038a35bd390
parent80787d418bd028f59e34ffb08c1c221992fe3b41 (diff)
All die() renamed to bug().
-rw-r--r--proto/ospf/dbdes.c4
-rw-r--r--proto/ospf/iface.c2
-rw-r--r--proto/ospf/lsalib.c4
-rw-r--r--proto/ospf/lsreq.c2
-rw-r--r--proto/ospf/neighbor.c14
5 files changed, 13 insertions, 13 deletions
diff --git a/proto/ospf/dbdes.c b/proto/ospf/dbdes.c
index 7278ccb1..4b737333 100644
--- a/proto/ospf/dbdes.c
+++ b/proto/ospf/dbdes.c
@@ -133,7 +133,7 @@ ospf_dbdes_tx(struct ospf_neighbor *n)
break;
default: /* Ignore it */
- die("Bug in dbdes sending");
+ bug("Bug in dbdes sending");
break;
}
}
@@ -357,7 +357,7 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
}
break;
defaut:
- die("%s: Received dbdes from %I in unknown state.", p->name, n->ip);
+ bug("%s: Received dbdes from %I in undefined state.", p->name, n->ip);
break;
}
}
diff --git a/proto/ospf/iface.c b/proto/ospf/iface.c
index 62beb3b7..ff29a1fd 100644
--- a/proto/ospf/iface.c
+++ b/proto/ospf/iface.c
@@ -184,7 +184,7 @@ ospf_int_sm(struct ospf_iface *ifa, int event)
schedule_rt_lsa(ifa->oa);
break;
default:
- die("%s: ISM - Unknown event?",p->name);
+ bug("%s: ISM - Unknown event?",p->name);
break;
}
diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c
index 181f78bb..0741c795 100644
--- a/proto/ospf/lsalib.c
+++ b/proto/ospf/lsalib.c
@@ -176,7 +176,7 @@ htonlsab(void *h, void *n, u8 type, u16 len)
}
break;
}
- default: die("(hton): Unknown LSA");
+ default: bug("(hton): Unknown LSA");
}
};
@@ -273,7 +273,7 @@ ntohlsab(void *n, void *h, u8 type, u16 len)
}
break;
}
- default: die("(ntoh): Unknown LSA");
+ default: bug("(ntoh): Unknown LSA");
}
};
diff --git a/proto/ospf/lsreq.c b/proto/ospf/lsreq.c
index c9c4b1d1..504ab588 100644
--- a/proto/ospf/lsreq.c
+++ b/proto/ospf/lsreq.c
@@ -86,7 +86,7 @@ lsrr_timer_hook(timer *timer)
WALK_SLIST(SNODE en,n->lsrtl)
{
- if((SNODE en)->next==(SNODE en)) die("BUGGGGGG");
+ if((SNODE en)->next==(SNODE en)) bug("RTList is cycled");
llsh=sl_alloc(upslab);
llsh->lsh.id=en->lsa.id;
llsh->lsh.rt=en->lsa.rt;
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 9e04bacc..72930cc3 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -176,7 +176,7 @@ can_do_adj(struct ospf_neighbor *n)
switch(ifa->state)
{
case OSPF_IS_DOWN:
- die("%s: Iface %s in down state?", p->name, ifa->iface->name);
+ bug("%s: Iface %s in down state?", p->name, ifa->iface->name);
break;
case OSPF_IS_WAITING:
DBG("%s: Neighbor? on iface %s\n",p->name, ifa->iface->name);
@@ -191,12 +191,12 @@ can_do_adj(struct ospf_neighbor *n)
if(n->state>=NEIGHBOR_2WAY) i=1;
break;
default:
- die("%s: Iface %s in unknown state?",p->name, ifa->iface->name);
+ bug("%s: Iface %s in unknown state?",p->name, ifa->iface->name);
break;
}
break;
default:
- die("%s: Iface %s is unknown type?",p->name, ifa->iface->name);
+ bug("%s: Iface %s is unknown type?",p->name, ifa->iface->name);
break;
}
DBG("%s: Iface %s can_do_adj=%d\n",p->name, ifa->iface->name,i);
@@ -249,7 +249,7 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
tm_start(n->lsrr_timer,n->ifa->rxmtint);
tm_start(n->ackd_timer,n->ifa->rxmtint/2);
}
- else die("NEGDONE and I'm not in EXSTART?");
+ else bug("NEGDONE and I'm not in EXSTART?");
break;
case INM_EXDONE:
neigh_chstate(n,NEIGHBOR_LOADING);
@@ -293,7 +293,7 @@ ospf_neigh_sm(struct ospf_neighbor *n, int event)
neigh_chstate(n,NEIGHBOR_INIT);
break;
default:
- die("%s: INM - Unknown event?",p->name);
+ bug("%s: INM - Unknown event?",p->name);
break;
}
}
@@ -358,7 +358,7 @@ bdr_election(struct ospf_iface *ifa, struct proto *p)
else
{
if((tmp=find_neigh(ifa,ndrid))==NULL)
- die("Error in DR election.");
+ bug("Error in DR election.");
ifa->drid=ndrid;
ifa->drip=tmp->ip;
}
@@ -371,7 +371,7 @@ bdr_election(struct ospf_iface *ifa, struct proto *p)
else
{
if((tmp=find_neigh(ifa,nbdrid))==NULL)
- die("Error in BDR election.");
+ bug("Error in BDR election.");
ifa->bdrid=nbdrid;
ifa->bdrip=tmp->ip;
}