commit db263442af565fde0d54398da7cc80a66469d273 Author: Steven Chamberlain steven@pyro.eu.org Date: Mon Feb 29 14:15:20 2016 +0000

enable and test transproxy on FreeBSD derivatives #18448

The transproxy feature is only enabled when __FreeBSD__ is defined, and only regular FreeBSD does that. Change this to __FreeBSD_kernel__ which is defined on derivatives as well.

This enables the relevant options/validate__transproxy test on FreeBSD derivatives. --- src/or/config.c | 2 +- src/test/test_options.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index 544b032..ad4138a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2861,7 +2861,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->TransProxyType_parsed = TPT_TPROXY; #endif } else if (!strcasecmp(options->TransProxyType, "ipfw")) { -#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) /* Earlier versions of OS X have ipfw */ REJECT("ipfw is a FreeBSD-specific" "and OS X/Darwin-specific feature."); diff --git a/src/test/test_options.c b/src/test/test_options.c index ff1eb18..9458ade 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1058,7 +1058,7 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, -1);

-#if !defined(__FreeBSD__) && !defined( DARWIN ) +#if !defined(__FreeBSD_kernel__) && !defined( DARWIN ) tt_str_op(msg, OP_EQ, "ipfw is a FreeBSD-specificand OS X/Darwin-specific " "feature."); #else @@ -1086,7 +1086,7 @@ test_options_validate__transproxy(void *ignored) tt_int_op(ret, OP_EQ, -1); tt_assert(!msg); #endif -#if defined(__FreeBSD__) || defined( DARWIN ) +#if defined(__FreeBSD_kernel__) || defined( DARWIN ) tdata = get_options_test_data("TransProxyType ipfw\n" "TransPort 127.0.0.1:123\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);