Removed T/TCP bits.

3 files changed, 3 insertions, 26 deletions

diff --git a/usr.sbin/inetd/inetd.8 b/usr.sbin/inetd/inetd.8
index fcd793b..9b30226 100644
--- a/usr.sbin/inetd/inetd.8
+++ b/usr.sbin/inetd/inetd.8
@@ -28,7 +28,7 @@
 .\"     from: @(#)inetd.8	8.3 (Berkeley) 4/13/94
 .\" $FreeBSD$
 .\"
-.Dd February 4, 2006
+.Dd September 14, 2006
 .Dt INETD 8
 .Os
 .Sh NAME
@@ -286,21 +286,6 @@ specify that the entry accepts both IPv4 and IPv6 connections
 via a wildcard
 .Dv AF_INET6
 socket.
-If it is desired that the service is reachable via T/TCP, one should
-specify
-.Dq tcp/ttcp ,
-which implies IPv4 for backward compatibility.
-The name
-.Dq tcp4/ttcp
-specifies IPv4 only, while
-.Dq tcp6/ttcp
-specifies IPv6 only.
-The name
-.Dq tcp46/ttcp
-specifies that the entry accepts both IPv6 and IPv6 connections
-via a wildcard
-.Dv AF_INET6
-socket.
 Rpc based services
 are specified with the
 .Dq rpc/tcp
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index e5f7365..96400e0 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
  *					or name a tcpmux service 
  *					or specify a unix domain socket
  *	socket type			stream/dgram/raw/rdm/seqpacket
- *	protocol			tcp[4][6][/faith,ttcp], udp[4][6], unix
+ *	protocol			tcp[4][6][/faith], udp[4][6], unix
  *	wait/nowait			single-threaded/multi-threaded
  *	user				user to run daemon as
  *	server program			full path name
@@ -1301,10 +1301,6 @@ setsockopt(fd, SOL_SOCKET, opt, (char *)&on, sizeof (on))
 			syslog(LOG_ERR, "setsockopt (IPV6_V6ONLY): %m");
 	}
 #undef turnon
-	if (sep->se_type == TTCP_TYPE)
-		if (setsockopt(sep->se_fd, IPPROTO_TCP, TCP_NOPUSH,
-		    (char *)&on, sizeof (on)) < 0)
-			syslog(LOG_ERR, "setsockopt (TCP_NOPUSH): %m");
 #ifdef IPV6_FAITH
 	if (sep->se_type == FAITH_TYPE) {
 		if (setsockopt(sep->se_fd, IPPROTO_IPV6, IPV6_FAITH, &on,
@@ -1746,9 +1742,7 @@ more:
 	if (strncmp(arg, "tcp", 3) == 0) {
 		sep->se_proto = newstr(strsep(&arg, "/"));
 		if (arg != NULL) {
-			if (strcmp(arg, "ttcp") == 0)
-				sep->se_type = TTCP_TYPE;
-			else if (strcmp(arg, "faith") == 0)
+			if (strcmp(arg, "faith") == 0)
 				sep->se_type = FAITH_TYPE;
 		}
 	} else {
diff --git a/usr.sbin/inetd/inetd.h b/usr.sbin/inetd/inetd.h
index 8c05ed9..e0a83bd 100644
--- a/usr.sbin/inetd/inetd.h
+++ b/usr.sbin/inetd/inetd.h
@@ -44,12 +44,10 @@
 #define NORM_TYPE	0
 #define MUX_TYPE	1
 #define MUXPLUS_TYPE	2
-#define TTCP_TYPE	3
 #define FAITH_TYPE	4
 #define ISMUX(sep)	(((sep)->se_type == MUX_TYPE) || \
 			 ((sep)->se_type == MUXPLUS_TYPE))
 #define ISMUXPLUS(sep)	((sep)->se_type == MUXPLUS_TYPE)
-#define ISTTCP(sep)	((sep)->se_type == TTCP_TYPE)
 
 struct procinfo {
 	LIST_ENTRY(procinfo) pr_link;