From moncrg@dominus.ma.ultranet.com  Mon Jul 27 15:34:27 1998
Received: from dominus.ma.ultranet.com (d60.dial-2.cmb.ma.ultra.net [209.6.65.60])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA26111
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 27 Jul 1998 15:34:22 -0700 (PDT)
          (envelope-from moncrg@dominus.ma.ultranet.com)
Received: (from root@localhost)
	by dominus.ma.ultranet.com (8.8.8/8.8.7) id SAA00370;
	Mon, 27 Jul 1998 18:35:14 -0500 (EST)
	(envelope-from moncrg)
Message-Id: <199807272335.SAA00370@dominus.ma.ultranet.com>
Date: Mon, 27 Jul 1998 18:35:14 -0500 (EST)
From: "Gregory D. Moncreaff" <moncrg@dominus.ma.ultranet.com>
Reply-To: moncrg@dominus.ma.ultranet.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: cleanup for ISO
X-Send-Pr-Version: 3.2

>Number:         7419
>Category:       bin
>Synopsis:       [PATCH] cleanup for ISO
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 27 15:40:00 PDT 1998
>Closed-Date:    Thu Aug 6 23:37:01 PDT 1998
>Last-Modified:  Thu Aug  6 23:37:31 PDT 1998
>Originator:     Gregory D. Moncreaff
>Release:        FreeBSD 2.2.6-STABLE i386
>Organization:
>Environment:

	

>Description:

some prototype and other compile/cleanup for ISO protocol support
[in the hopes of the eventual resurection of netiso]

>How-To-Repeat:

	

>Fix:

changes to 1.19.2.2
	
*** ifconfig.c	Mon Jul 27 18:27:48 1998
--- new_ifconfig.c	Fri Jul 24 20:55:13 1998
***************
*** 139,144 ****
--- 139,145 ----
  
  #ifdef ISO
  c_func	setsnpaoffset, setnsellength;
+ void adjust_nsellength(void);
  #endif
  
  #define	NEXTARG		0xffffff
***************
*** 515,521 ****
  		argc--, argv++;
  	}
  #ifdef ISO
! 	if (af == AF_ISO)
  		adjust_nsellength();
  #endif
  	if (setipdst && ifr.ifr_addr.sa_family == AF_IPX) {
--- 516,522 ----
  		argc--, argv++;
  	}
  #ifdef ISO
! 	if (afp->af_af == AF_ISO)
  		adjust_nsellength();
  #endif
  	if (setipdst && ifr.ifr_addr.sa_family == AF_IPX) {
***************
*** 714,722 ****
  
  #ifdef ISO
  void
! setsnpaoffset(val, dummy)
! 	char *val;
! 	int dummy __unused;
  {
  	iso_addreq.ifra_snpaoffset = atoi(val);
  }
--- 715,725 ----
  
  #ifdef ISO
  void
! setsnpaoffset(val, arg, s, afp)
! 	const char *val;
! 	int arg __unused;
! 	int s __unused;
! 	const struct afswtch *afp __unused;
  {
  	iso_addreq.ifra_snpaoffset = atoi(val);
  }
***************
*** 1183,1195 ****
  struct sockaddr_iso *sisotab[] = {
  SISO(iso_ridreq.ifr_Addr), SISO(iso_addreq.ifra_addr),
  SISO(iso_addreq.ifra_mask), SISO(iso_addreq.ifra_dstaddr)};
  
  void
  iso_getaddr(addr, which)
! char *addr;
  {
  	register struct sockaddr_iso *siso = sisotab[which];
- 	struct iso_addr *iso_addr();
  	siso->siso_addr = *iso_addr(addr);
  
  	if (which == MASK) {
--- 1186,1200 ----
  struct sockaddr_iso *sisotab[] = {
  SISO(iso_ridreq.ifr_Addr), SISO(iso_addreq.ifra_addr),
  SISO(iso_addreq.ifra_mask), SISO(iso_addreq.ifra_dstaddr)};
+ struct iso_addr *iso_addr();
+ void fixnsel(struct sockaddr_iso *);
  
  void
  iso_getaddr(addr, which)
! const char *addr;
! int which;
  {
  	register struct sockaddr_iso *siso = sisotab[which];
  	siso->siso_addr = *iso_addr(addr);
  
  	if (which == MASK) {
***************
*** 1202,1209 ****
  }
  
  void
! setnsellength(val)
! 	char *val;
  {
  	nsellength = atoi(val);
  	if (nsellength < 0)
--- 1207,1217 ----
  }
  
  void
! setnsellength(val,arg,s,afp)
! 	const char *val; 
! 	int arg __unused; 
! 	int s __unused; 
! 	const struct afswtch *afp;
  {
  	nsellength = atoi(val);
  	if (nsellength < 0)
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->analyzed 
State-Changed-By: phk 
State-Changed-When: Tue Jul 28 02:07:44 PDT 1998 
State-Changed-Why:  
we cannot apply the patch since the code is currently "dead" in our 
repository.  I suggest you maintain (and provide for anybody interested) 
a separate CVS tree with this stuff. 
State-Changed-From-To: analyzed->closed 
State-Changed-By: phk 
State-Changed-When: Thu Aug 6 23:37:01 PDT 1998 
State-Changed-Why:  
No screams of anguish from massive hordes of ISO users. 
>Unformatted:
