Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added #if 0 to rip_postconfig(), so that it doesn't crash whole daemon

Browse source 
when RIP is unconfigured.

die() -> bug()
This commit is contained in:
Martin Mares 1998-12-20 14:26:57 +00:00
parent 98e87c8628
commit ee969ea7f4
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
proto/rip/rip.c
View file

@ -194,7 +194,7 @@ rip_sendto( struct proto *p, ip_addr daddr, int dport, struct rip_interface *rif
c->dport = dport; c->dport = dport;
c->daddr = daddr; c->daddr = daddr;
if (c->rif->sock->data != rif) if (c->rif->sock->data != rif)
die("not enough send magic\n"); bug("not enough send magic\n");
#if 0 #if 0
if (sk_open(c->send)<0) { if (sk_open(c->send)<0) {
log( L_ERR "Could not open socket for data send to %I:%d on %s\n", daddr, dport, rif->iface->name ); log( L_ERR "Could not open socket for data send to %I:%d on %s\n", daddr, dport, rif->iface->name );
@ -532,6 +532,7 @@ new_iface(struct proto *p, struct iface *new, unsigned long flags)
if (sk_open(rif->sock)<0) if (sk_open(rif->sock)<0)
die( "RIP/%s: could not listen on %s\n", p->name, rif->iface->name ); die( "RIP/%s: could not listen on %s\n", p->name, rif->iface->name );
/* FIXME: Should not be fatal, since the interface might have gone */
return rif; return rif;
} }
@ -657,7 +658,9 @@ rip_preconfig(struct protocol *x)
static void static void
rip_postconfig(struct protocol *p) rip_postconfig(struct protocol *p)
{ {
#if 0 /* Cannot do this since it crashes when RIP is unconfigured */
new_iface(p, NULL, 0); new_iface(p, NULL, 0);
#endif
} }
struct protocol proto_rip = { struct protocol proto_rip = {

2
proto/rip/rip.h
View file

@ -88,6 +88,6 @@ struct rip_proto {
#define E ((struct rip_entry *) e) #define E ((struct rip_entry *) e)
#define RIP_MAGIC 81861253 #define RIP_MAGIC 81861253
#define CHK_MAGIC do { if (P->magic != RIP_MAGIC) die( "Not enough magic\n" ); } while (0) #define CHK_MAGIC do { if (P->magic != RIP_MAGIC) bug( "Not enough magic\n" ); } while (0)
void rip_init_instance(struct proto *p); void rip_init_instance(struct proto *p);