From owner-p4-projects@FreeBSD.ORG  Thu Jan 25 13:59:06 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CCC9C16A403; Thu, 25 Jan 2007 13:59:05 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A6B8B16A400
	for <perforce@FreeBSD.org>; Thu, 25 Jan 2007 13:59:05 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 972E113C44B
	for <perforce@FreeBSD.org>; Thu, 25 Jan 2007 13:59:05 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0PDx5jv033715
	for <perforce@FreeBSD.org>; Thu, 25 Jan 2007 13:59:05 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0PDx5Xo033712
	for perforce@freebsd.org; Thu, 25 Jan 2007 13:59:05 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Thu, 25 Jan 2007 13:59:05 GMT
Message-Id: <200701251359.l0PDx5Xo033712@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 113499 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 25 Jan 2007 13:59:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=113499

Change 113499 by rdivacky@rdivacky_witten on 2007/01/25 13:58:16

	Introduce some more SO_ option equivalents from linux to FreeBSD.

Affected files ...

.. //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#15 edit
.. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#11 edit
.. //depot/projects/linuxolator/src/sys/i386/linux/linux.h#12 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/amd64/linux32/linux.h#15 (text+ko) ====

@@ -674,6 +674,12 @@
 #define	LINUX_SO_PRIORITY	12
 #define	LINUX_SO_LINGER		13
 #define	LINUX_SO_PEERCRED	17
+#define	LINUX_SO_RCVLOWAT	18
+#define	LINUX_SO_SNDLOWAT	19
+#define	LINUX_SO_RCVTIMEO	20
+#define	LINUX_SO_SNDTIMEO	21
+#define	LINUX_SO_TIMESTAMP	29
+#define LINUX_SO_ACCEPTCONN	30
 
 #define	LINUX_IP_TOS		1
 #define	LINUX_IP_TTL		2

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#11 (text+ko) ====

@@ -296,6 +296,18 @@
 		return (SO_LINGER);
 	case LINUX_SO_PEERCRED:
 		return (LOCAL_PEERCRED);
+	case LINUX_SO_RCVLOWAT:
+		return (SO_RCVLOWAT);
+	case LINUX_SO_SNDLOWAT:
+		return (SO_SNDLOWAT);
+	case LINUX_SO_RCVTIMEO:
+		return (SO_RCVTIMEO);
+	case LINUX_SO_SNDTIMEO:
+		return (SO_SNDTIMEO);
+	case LINUX_SO_TIMESTAMP:
+		return (SO_TIMESTAMP);
+	case LINUX_SO_ACCEPTCONN:
+		return (SO_ACCEPTCONN);
 	}
 	return (-1);
 }

==== //depot/projects/linuxolator/src/sys/i386/linux/linux.h#12 (text+ko) ====

@@ -645,6 +645,12 @@
 #define	LINUX_SO_PRIORITY	12
 #define	LINUX_SO_LINGER		13
 #define	LINUX_SO_PEERCRED	17
+#define	LINUX_SO_RCVLOWAT	18
+#define	LINUX_SO_SNDLOWAT	19
+#define	LINUX_SO_RCVTIMEO	20
+#define	LINUX_SO_SNDTIMEO	21
+#define	LINUX_SO_TIMESTAMP	29
+#define	LINUX_SO_ACCEPTCONN	30
 
 #define	LINUX_IP_TOS		1
 #define	LINUX_IP_TTL		2