Clean up some loose ends in the network code, including the X.25 and ISO

#ifdefs.  Clean out unused netisr's and leftover netisr linker set gunk.
Tested on x86 and alpha, including world.

Approved by:	jkh

6 files changed, 2 insertions, 73 deletions

diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 28fce31..2e19721 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -74,9 +74,6 @@
 #include <nfs/nfsrtt.h>
 
 #include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
 
 /*
  * Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
 		    inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
 			return (1);
 		break;
-#ifdef ISO
-	case AF_ISO:
-	    {
-		register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
-		isoaddr1 = (struct sockaddr_iso *)nam;
-		isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
-		if (isoaddr1->siso_family == AF_ISO &&
-		    isoaddr1->siso_nlen > 0 &&
-		    isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
-		    SAME_ISOADDR(isoaddr1, isoaddr2))
-			return (1);
-		break;
-	    }
-#endif	/* ISO */
 	default:
 		break;
 	};
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index fb02f2c..fea4a99 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -393,11 +393,6 @@ nqsrv_addhost(lph, slp, nam)
 		lph->lph_flag |= (LC_VALID | LC_UDP);
 		lph->lph_inetaddr = saddr->sin_addr.s_addr;
 		lph->lph_port = saddr->sin_port;
-#ifdef ISO
-	} else if (nsso && nsso->so_proto->pr_protocol == ISOPROTO_CLTP) {
-		lph->lph_nam = dup_sockaddr(nam, 1);
-		lph->lph_flag |= (LC_VALID | LC_CLTP);
-#endif
 	} else {
 		lph->lph_flag |= (LC_VALID | LC_SREF);
 		slp->ns_sref++;
@@ -467,17 +462,11 @@ nqsrv_cmpnam(slp, nam, lph)
 	nsso = slp->ns_so;
 	if (nsso && nsso->so_proto->pr_protocol == IPPROTO_UDP) {
 		addr = nam;
-#ifdef ISO
-	} else if (nsso && nsso->so_proto->pr_protocol == ISOPROTO_CLTP) {
-		addr = nam;
-#endif
 	} else {
 		addr = slp->ns_nam;
 	}
 	if (lph->lph_flag & LC_UDP) {
 		ret = netaddr_match(AF_INET, &lph->lph_haddr, addr);
-	} else if (lph->lph_flag & LC_CLTP) {
-		ret = netaddr_match(AF_ISO, &lph->lph_claddr, addr);
 	} else {
 		if ((lph->lph_slp->ns_flag & SLP_VALID) == 0)
 			return (0);
@@ -531,8 +520,6 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
 				saddr->sin_family = AF_INET;
 				saddr->sin_addr.s_addr = lph->lph_inetaddr;
 				saddr->sin_port = lph->lph_port;
-			} else if (lph->lph_flag & LC_CLTP) {
-				nam2 = lph->lph_nam;
 			} else if (lph->lph_slp->ns_flag & SLP_VALID) {
 				nam2 = (struct sockaddr *)0;
 			} else {
@@ -575,7 +562,7 @@ nqsrv_send_eviction(vp, lp, slp, nam, cred)
 			 * nfs_sndlock if PR_CONNREQUIRED XXX
 			 */
 
-			if ((lph->lph_flag & (LC_UDP | LC_CLTP)) == 0 &&
+			if ((lph->lph_flag & LC_UDP) == 0 &&
 			    ((lph->lph_slp->ns_flag & SLP_VALID) == 0 ||
 			    nfs_slplock(lph->lph_slp, 0) == 0)) {
 				m_freem(m);
@@ -700,8 +687,6 @@ nqnfs_serverd()
 			i = 0;
 			ok = 1;
 			while (ok && (lph->lph_flag & LC_VALID)) {
-				if (lph->lph_flag & LC_CLTP)
-					FREE(lph->lph_nam, M_SONAME);
 				if (lph->lph_flag & LC_SREF)
 					nfsrv_slpderef(lph->lph_slp);
 				if (++i == len) {
diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c
index 6f9d42f..9eb168f 100644
--- a/sys/nfs/nfs_srvcache.c
+++ b/sys/nfs/nfs_srvcache.c
@@ -51,9 +51,6 @@
 #include <sys/socketvar.h>	/* for dup_sockaddr */
 
 #include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 28fce31..2e19721 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -74,9 +74,6 @@
 #include <nfs/nfsrtt.h>
 
 #include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
 
 /*
  * Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
 		    inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
 			return (1);
 		break;
-#ifdef ISO
-	case AF_ISO:
-	    {
-		register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
-		isoaddr1 = (struct sockaddr_iso *)nam;
-		isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
-		if (isoaddr1->siso_family == AF_ISO &&
-		    isoaddr1->siso_nlen > 0 &&
-		    isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
-		    SAME_ISOADDR(isoaddr1, isoaddr2))
-			return (1);
-		break;
-	    }
-#endif	/* ISO */
 	default:
 		break;
 	};
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 15c6231..14ff8d1 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -59,9 +59,6 @@
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
 #include <nfs/xdr_subs.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
@@ -339,15 +336,6 @@ nfssvc_addsock(fp, mynam, p)
 				FREE(mynam, M_SONAME);
 			return (EPERM);
 		}
-#ifdef ISO
-	} else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
-		tslp = nfs_cltpsock;
-		if (tslp->ns_flag & SLP_VALID) {
-			if (mynam != NULL)
-				FREE(mynam, M_SONAME);
-			return (EPERM);
-		}
-#endif /* ISO */
 	}
 #endif
 	if (so->so_type == SOCK_STREAM)
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 36e5006..15b5af5 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -96,17 +96,12 @@ struct nqhost {
 			union nethostaddr udp_haddr;
 		} un_udp;
 		struct {
-			union nethostaddr connless_haddr;
-		} un_connless;
-		struct {
 			int	dummy;
 		} un_conn;
 	} lph_un;
 };
 #define	lph_haddr	lph_un.un_udp.udp_haddr
 #define	lph_inetaddr	lph_un.un_udp.udp_haddr.had_inetaddr
-#define	lph_claddr	lph_un.un_connless.connless_haddr
-#define	lph_nam		lph_un.un_connless.connless_haddr.had_nam
 
 struct nqlease {
 	LIST_ENTRY(nqlease) lc_hash;	/* Fhandle hash list */
@@ -128,7 +123,7 @@ struct nqlease {
 #define	LC_WANTED	0x0010	/* Lock wanted */
 #define	LC_EXPIREDWANTED 0x0020	/* Want lease when expired */
 #define	LC_UDP		0x0040	/* Host address for udp socket */
-#define	LC_CLTP		0x0080	/* Host address for other connectionless */
+/* 0x0080 free */
 #define	LC_LOCAL	0x0100	/* Host is server */
 #define	LC_VACATED	0x0200	/* Host has vacated lease */
 #define	LC_WRITTEN	0x0400	/* Recently wrote to the leased file */