From dea3dc96152b5e5d09f7f19a99bfd0db88287a68 Mon Sep 17 00:00:00 2001 From: Keith Sklower Date: Wed, 17 Jan 1990 08:01:40 -0800 Subject: [PATCH] changes for cltp SCCS-vsn: sys/netiso/clnp_raw.c 7.6 --- usr/src/sys/netiso/clnp_raw.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/usr/src/sys/netiso/clnp_raw.c b/usr/src/sys/netiso/clnp_raw.c index 465c855589..5514e14453 100644 --- a/usr/src/sys/netiso/clnp_raw.c +++ b/usr/src/sys/netiso/clnp_raw.c @@ -26,7 +26,7 @@ SOFTWARE. */ /* $Header: clnp_raw.c,v 4.2 88/06/29 14:58:56 hagens Exp $ */ /* $Source: /usr/argo/sys/netiso/RCS/clnp_raw.c,v $ */ -/* @(#)clnp_raw.c 7.5 (Berkeley) %G% */ +/* @(#)clnp_raw.c 7.6 (Berkeley) %G% */ #ifndef lint static char *rcsid = "$Header: clnp_raw.c,v 4.2 88/06/29 14:58:56 hagens Exp $"; #endif lint @@ -52,8 +52,6 @@ static char *rcsid = "$Header: clnp_raw.c,v 4.2 88/06/29 14:58:56 hagens Exp $"; #include "tp_user.h"/* XXX -- defines SOL_NETWORK */ -struct sockaddr_iso rclnp_src = { sizeof(rclnp_src), AF_ISO }; -struct sockaddr_iso rclnp_dst = { sizeof(rclnp_src), AF_ISO }; struct sockproto rclnp_proto = { PF_ISO, 0 }; /* * FUNCTION: rclnp_input @@ -71,8 +69,8 @@ struct sockproto rclnp_proto = { PF_ISO, 0 }; */ rclnp_input(m, src, dst, hdrlen) struct mbuf *m; /* ptr to packet */ -struct iso_addr *src; /* ptr to src address */ -struct iso_addr *dst; /* ptr to dest address */ +struct sockaddr_iso *src; /* ptr to src address */ +struct sockaddr_iso *dst; /* ptr to dest address */ int hdrlen; /* length (in bytes) of clnp header */ { #ifdef TROLL @@ -82,10 +80,8 @@ int hdrlen; /* length (in bytes) of clnp header */ } #endif TROLL - rclnp_src.siso_addr = *src; - rclnp_dst.siso_addr = *dst; - if (raw_input(m, &rclnp_proto, (struct sockaddr *)&rclnp_src, - (struct sockaddr *)&rclnp_dst) == 0) { + if (raw_input(m, &rclnp_proto, (struct sockaddr *)src, + (struct sockaddr *)dst) == 0) { clnp_stat.cns_delivered--; clnp_stat.cns_noproto++; } -- 2.20.1