Updated Branches: refs/heads/maste [created] 9a1ab902d
TS-1408: Fix RFC5861 plugin build Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9a1ab902 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9a1ab902 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9a1ab902 Branch: refs/heads/maste Commit: 9a1ab902d5c1c7cfd60dd87c5d26cc5b8703ea8b Parents: a506b90 Author: James Peach <[email protected]> Authored: Mon Aug 20 20:21:52 2012 -0700 Committer: James Peach <[email protected]> Committed: Mon Aug 20 20:21:52 2012 -0700 ---------------------------------------------------------------------- plugins/experimental/rfc5861/rfc5861.c | 30 +++----------------------- 1 files changed, 4 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9a1ab902/plugins/experimental/rfc5861/rfc5861.c ---------------------------------------------------------------------- diff --git a/plugins/experimental/rfc5861/rfc5861.c b/plugins/experimental/rfc5861/rfc5861.c index d77ed14..788ca2f 100644 --- a/plugins/experimental/rfc5861/rfc5861.c +++ b/plugins/experimental/rfc5861/rfc5861.c @@ -12,18 +12,6 @@ #include <ts/experimental.h> -#ifdef TS_VERSION_NUMBER - #if ((TS_VERSION_NUMBER >= 3000000) && (TS_VERSION_NUMBER < 3001000)) - #define TS_API_30X - #elif ((TS_VERSION_NUMBER >= 3001000) && (TS_VERSION_NUMBER < 3003000)) - #define TS_API_32X - #else - #error Cannot determine API version! - #endif -#else - #error TS_VERSION_NUMBER not defined! -#endif - #define LOG_PREFIX "rfc5861" //#define ENABLE_SAVE_ORIGINAL_REQUEST @@ -674,11 +662,10 @@ rfc5861_plugin(TSCont cont, TSEvent event, void *edata) return 0; } -static int +static bool check_ts_version() { const char *ts_version = TSTrafficServerVersionGet(); - int result = 0; if (ts_version) { @@ -688,22 +675,17 @@ check_ts_version() if (sscanf(ts_version, "%d.%d.%d", &major_ts_version, &minor_ts_version, &patch_ts_version) != 3) { - return 0; + return false; } -#ifdef TS_API_32X - /* We need Traffic Server 3.2.x */ - if ((major_ts_version == 3) && (minor_ts_version >= 1) && (minor_ts_version <= 2)) -#elif defined TS_API_30X /* We need Traffic Server 3.0.x */ if ((major_ts_version >= 3) && (minor_ts_version == 0)) -#endif { - result = 1; + return true; } } - return result; + return false; } void @@ -728,11 +710,7 @@ TSPluginInit (int argc, const char *argv[]) if (!check_ts_version()) { -#ifdef TS_API_32X - TSError("Plugin requires Traffic Server 3.2\n"); -#elif defined TS_API_30X TSError("Plugin requires Traffic Server 3.0\n"); -#endif return; }
