Date: Mon, 5 Jan 2009 14:27:05 +0000 (UTC) From: Paolo Pisati <piso@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r186777 - user/piso/sys/netinet/libalias Message-ID: <200901051427.n05ER5AW098644@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: piso Date: Mon Jan 5 14:27:04 2009 New Revision: 186777 URL: http://svn.freebsd.org/changeset/base/186777 Log: protect code not ready yet for userland with _KERNEL. Modified: user/piso/sys/netinet/libalias/alias.c Modified: user/piso/sys/netinet/libalias/alias.c ============================================================================== --- user/piso/sys/netinet/libalias/alias.c Mon Jan 5 14:21:49 2009 (r186776) +++ user/piso/sys/netinet/libalias/alias.c Mon Jan 5 14:27:04 2009 (r186777) @@ -111,13 +111,6 @@ __FBSDID("$FreeBSD$"); See HISTORY file for additional revisions. */ -/** - * Modifications to add sctp functionality by David A. Hayes - * $Id: alias.c 122 2008-06-25 06:50:47Z dhayes $ - * All are inclosed in #ifdef _ALIAS_SCTP - * - */ - #ifdef _KERNEL #include <sys/param.h> #include <sys/systm.h> @@ -144,17 +137,11 @@ __FBSDID("$FreeBSD$"); #include <netinet/libalias/alias.h> #include <netinet/libalias/alias_local.h> #include <netinet/libalias/alias_mod.h> -#ifdef _ALIAS_SCTP -#include <netinet/libalias/alias_sctp.h> -#endif #else #include <err.h> #include "alias.h" #include "alias_local.h" #include "alias_mod.h" -#ifdef _ALIAS_SCTP -#include "alias_sctp.h" -#endif #endif /* @@ -1360,7 +1347,7 @@ LibAliasInLocked(struct libalias *la, ch case IPPROTO_TCP: iresult = TcpAliasIn(la, pip); break; -#ifdef _ALIAS_SCTP +#ifdef _KERNEL case IPPROTO_SCTP: iresult = SctpAlias(la, pip, SN_TO_LOCAL); break; @@ -1510,7 +1497,7 @@ LibAliasOutLocked(struct libalias *la, c case IPPROTO_TCP: iresult = TcpAliasOut(la, pip, maxpacketsize, create); break; - #ifdef _ALIAS_SCTP +#ifdef _KERNEL case IPPROTO_SCTP: iresult = SctpAlias(la, pip, SN_TO_GLOBAL); break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901051427.n05ER5AW098644>