From owner-p4-projects@FreeBSD.ORG  Sat Aug 20 12:29:21 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DCE391065670; Sat, 20 Aug 2011 12:29:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F6FB106564A
	for <perforce@freebsd.org>; Sat, 20 Aug 2011 12:29:20 +0000 (UTC)
	(envelope-from cnicutar@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C4668FC17
	for <perforce@freebsd.org>; Sat, 20 Aug 2011 12:29:20 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p7KCTKrc038775
	for <perforce@freebsd.org>; Sat, 20 Aug 2011 12:29:20 GMT
	(envelope-from cnicutar@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p7KCTKcs038772
	for perforce@freebsd.org; Sat, 20 Aug 2011 12:29:20 GMT
	(envelope-from cnicutar@freebsd.org)
Date: Sat, 20 Aug 2011 12:29:20 GMT
Message-Id: <201108201229.p7KCTKcs038772@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	cnicutar@freebsd.org using -f
From: Catalin Nicutar <cnicutar@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 197913 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2011 12:29:21 -0000

http://p4web.freebsd.org/@@197913?ac=10

Change 197913 by cnicutar@cnicutar_cronos on 2011/08/20 12:28:18

	Add conditional compilation for UTO support in telnet.

Affected files ...

.. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/commands.c#3 edit
.. //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnetd/telnetd.c#3 edit

Differences ...

==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnet/commands.c#3 (text+ko) ====

@@ -924,6 +924,7 @@
 void
 set_timeout(char *s)
 {
+#ifdef TCP_SNDUTO_TIMEOUT
 	if (s == NULL) {
 		uto = 0;
 		/* There is not way to "take it back". */
@@ -934,6 +935,9 @@
 	if (uto && net > 0 && setsockopt(net, IPPROTO_TCP, TCP_SNDUTO_TIMEOUT,
 	    &uto, sizeof(uto)))
 		perror("setsockopt UTO");
+#else
+	fprintf(stderr, "Warning: UTO not supported. timeout ignored\n");
+#endif
 }
 
 static int

==== //depot/projects/soc2011/cnicutar_tcputo_9/src/contrib/telnet/telnetd/telnetd.c#3 (text+ko) ====

@@ -288,8 +288,12 @@
 			break;
 
 		case 't':
+#ifdef TCP_RCVUTO_TIMEOUT
 			 /* Enable TCP_RCVUTO_TIMEOUT after authentication.*/
 			uto = 1;
+#else
+			warnx("UTO not supported.");
+#endif
 			break;
 
 		case 'u':