This commit is contained in:
dyoung 2006-12-04 02:53:17 +00:00
parent a2ab81c489
commit a291eaf06c
2 changed files with 10 additions and 10 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: clnp_subr.c,v 1.21 2006/11/16 01:33:51 christos Exp $ */
/* $NetBSD: clnp_subr.c,v 1.22 2006/12/04 02:53:17 dyoung Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -59,7 +59,7 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clnp_subr.c,v 1.21 2006/11/16 01:33:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: clnp_subr.c,v 1.22 2006/12/04 02:53:17 dyoung Exp $");
#include "opt_iso.h"
@ -491,7 +491,7 @@ clnp_route(
* If there is a cached route, check that it is still up and to
* the same destination. If not, free it and try again.
*/
if (ro->ro_rt && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
if (ro->ro_rt != NULL && ((ro->ro_rt->rt_flags & RTF_UP) == 0 ||
(Bcmp(ro->ro_dst.siso_data, dst->isoa_genaddr, dst->isoa_len)))) {
#ifdef ARGO_DEBUG
if (argo_debug[D_ROUTE]) {
@ -513,7 +513,7 @@ clnp_route(
#endif
}
if (ro->ro_rt == 0) {
if (ro->ro_rt == NULL) {
/* set up new route structure */
bzero((caddr_t) & ro->ro_dst, sizeof(ro->ro_dst));
ro->ro_dst.siso_len = sizeof(ro->ro_dst);
@ -526,13 +526,13 @@ clnp_route(
clnp_iso_addrp(dst));
}
#endif
rtalloc((struct route *) ro);
rtalloc((struct route *)ro);
}
if (ro->ro_rt == 0)
if (ro->ro_rt == NULL)
return (ENETUNREACH); /* rtalloc failed */
ro->ro_rt->rt_use++;
if (ifa)
if ((*ifa = (struct iso_ifaddr *) ro->ro_rt->rt_ifa) == 0)
if ((*ifa = (struct iso_ifaddr *)ro->ro_rt->rt_ifa) == 0)
panic("clnp_route");
if (first_hop) {
if (ro->ro_rt->rt_flags & RTF_GATEWAY)

View File

@ -1,4 +1,4 @@
/* $NetBSD: tp_iso.c,v 1.24 2006/11/16 01:33:51 christos Exp $ */
/* $NetBSD: tp_iso.c,v 1.25 2006/12/04 02:53:17 dyoung Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -75,7 +75,7 @@ SOFTWARE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tp_iso.c,v 1.24 2006/11/16 01:33:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: tp_iso.c,v 1.25 2006/12/04 02:53:17 dyoung Exp $");
#include "opt_iso.h"
#ifdef ISO
@ -340,7 +340,7 @@ tpclnp_mtu(void *v)
printf("tpclnp_mtu(tpcb %p)\n", tpcb);
}
#endif
tpcb->tp_routep = &(isop->isop_route.ro_rt);
tpcb->tp_routep = &isop->isop_route.ro_rt;
if (tpcb->tp_netservice == ISO_CONS)
return 0;
else