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

Less error messages in case sk_open fails.

Browse source
This commit is contained in:
Pavel Machek 2000-05-19 16:44:25 +00:00
parent eb4097e4e4
commit 9511a483b1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
proto/rip/rip.c
View file

@ -642,8 +642,12 @@ new_iface(struct proto *p, struct iface *new, unsigned long flags, struct iface_
if (!(rif->mode & IM_NOLISTEN)) if (!(rif->mode & IM_NOLISTEN))
if (sk_open(rif->sock)<0) { if (sk_open(rif->sock)<0) {
log( L_ERR "%s: could not listen on %s", P_NAME, rif->iface ? rif->iface->name : "(dummy)" ); log( L_ERR "%s: could not listen on %s", P_NAME, rif->iface ? rif->iface->name : "(dummy)" );
/* Don't try to transmit into this one? Well, why not? This should not happen, anyway :-) */ if (rif->iface) {
/* FIXME: This is *wrong*! Try it. */ rfree(rif->sock);
mb_free(rif);
return NULL;
}
/* On dummy, we just return non-working socket, so that user gets error every time anyone requests table */
} }
TRACE(D_EVENTS, "Listening on %s, port %d, mode %s (%I)", rif->iface ? rif->iface->name : "(dummy)", P_CF->port, rif->multicast ? "multicast" : "broadcast", rif->sock->daddr ); TRACE(D_EVENTS, "Listening on %s, port %d, mode %s (%I)", rif->iface ? rif->iface->name : "(dummy)", P_CF->port, rif->multicast ? "multicast" : "broadcast", rif->sock->daddr );
@ -663,9 +667,11 @@ rip_real_if_add(struct object_lock *lock)
bug("This can not happen! It existed few seconds ago!" ); bug("This can not happen! It existed few seconds ago!" );
DBG("adding interface %s\n", iface->name ); DBG("adding interface %s\n", iface->name );
rif = new_iface(p, iface, iface->flags, k); rif = new_iface(p, iface, iface->flags, k);
add_head( &P->interfaces, NODE rif ); if (rif) {
DBG("Adding object lock of %p for %p\n", lock, rif); add_head( &P->interfaces, NODE rif );
rif->lock = lock; DBG("Adding object lock of %p for %p\n", lock, rif);
rif->lock = lock;
} else { rfree(rif->lock); }
} }
static void static void