d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed T/TCP bits.

Browse Source
This commit is contained in:
ru 2006-09-14 08:36:53 +00:00
parent 2ad94565b4
commit c58b7af845
3 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.sbin/inetd/inetd.8
View File

@ -28,7 +28,7 @@
.\" from: @(#)inetd.8 8.3 (Berkeley) 4/13/94 .\" from: @(#)inetd.8 8.3 (Berkeley) 4/13/94
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd February 4, 2006 .Dd September 14, 2006
.Dt INETD 8 .Dt INETD 8
.Os .Os
.Sh NAME .Sh NAME
@ -286,21 +286,6 @@ specify that the entry accepts both IPv4 and IPv6 connections
via a wildcard via a wildcard
.Dv AF_INET6 .Dv AF_INET6
socket. 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 Rpc based services
are specified with the are specified with the
.Dq rpc/tcp .Dq rpc/tcp

10
usr.sbin/inetd/inetd.c
View File

@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$");
* or name a tcpmux service * or name a tcpmux service
* or specify a unix domain socket * or specify a unix domain socket
* socket type stream/dgram/raw/rdm/seqpacket * 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 * wait/nowait single-threaded/multi-threaded
* user user to run daemon as * user user to run daemon as
* server program full path name * 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"); syslog(LOG_ERR, "setsockopt (IPV6_V6ONLY): %m");
} }
#undef turnon #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 #ifdef IPV6_FAITH
if (sep->se_type == FAITH_TYPE) { if (sep->se_type == FAITH_TYPE) {
if (setsockopt(sep->se_fd, IPPROTO_IPV6, IPV6_FAITH, &on, if (setsockopt(sep->se_fd, IPPROTO_IPV6, IPV6_FAITH, &on,
@ -1746,9 +1742,7 @@ getconfigent(void)
if (strncmp(arg, "tcp", 3) == 0) { if (strncmp(arg, "tcp", 3) == 0) {
sep->se_proto = newstr(strsep(&arg, "/")); sep->se_proto = newstr(strsep(&arg, "/"));
if (arg != NULL) { if (arg != NULL) {
if (strcmp(arg, "ttcp") == 0) if (strcmp(arg, "faith") == 0)
sep->se_type = TTCP_TYPE;
else if (strcmp(arg, "faith") == 0)
sep->se_type = FAITH_TYPE; sep->se_type = FAITH_TYPE;
} }
} else { } else {

2
usr.sbin/inetd/inetd.h
View File

@ -44,12 +44,10 @@
#define NORM_TYPE 0 #define NORM_TYPE 0
#define MUX_TYPE 1 #define MUX_TYPE 1
#define MUXPLUS_TYPE 2 #define MUXPLUS_TYPE 2
#define TTCP_TYPE 3
#define FAITH_TYPE 4 #define FAITH_TYPE 4
#define ISMUX(sep) (((sep)->se_type == MUX_TYPE) || \ #define ISMUX(sep) (((sep)->se_type == MUX_TYPE) || \
((sep)->se_type == MUXPLUS_TYPE)) ((sep)->se_type == MUXPLUS_TYPE))
#define ISMUXPLUS(sep) ((sep)->se_type == MUXPLUS_TYPE) #define ISMUXPLUS(sep) ((sep)->se_type == MUXPLUS_TYPE)
#define ISTTCP(sep) ((sep)->se_type == TTCP_TYPE)
struct procinfo { struct procinfo {
LIST_ENTRY(procinfo) pr_link; LIST_ENTRY(procinfo) pr_link;