trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject trafficserver git commit: TS-3546: For global plugin registration with TSPluginRegister API and remove version information
Date Fri, 19 Jun 2015 21:42:24 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master ba792a96a -> a68557a84


TS-3546: For global plugin registration with TSPluginRegister API and remove version information


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a68557a8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a68557a8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a68557a8

Branch: refs/heads/master
Commit: a68557a842c6f8d282a3144f7b58a813dccb0b38
Parents: ba792a9
Author: Bryan Call <bcall@apache.org>
Authored: Fri Jun 19 13:33:36 2015 -0700
Committer: Bryan Call <bcall@apache.org>
Committed: Fri Jun 19 13:34:41 2015 -0700

----------------------------------------------------------------------
 doc/reference/api/TSPluginInit.en.rst                     |  4 ++--
 doc/reference/api/TSTrafficServerVersionGet.en.rst        |  2 +-
 .../plugin-registration-and-version-checking.en.rst       |  2 +-
 doc/sdk/sample-source-code.en.rst                         |  2 +-
 example/add-header/add-header.c                           |  2 +-
 example/append-transform/append-transform.c               |  2 +-
 example/basic-auth/basic-auth.c                           |  2 +-
 example/blacklist-0/blacklist-0.c                         |  2 +-
 example/blacklist-1/blacklist-1.c                         |  2 +-
 example/bnull-transform/bnull-transform.c                 |  2 +-
 example/file-1/file-1.c                                   |  2 +-
 example/hello/hello.c                                     |  2 +-
 example/intercept/intercept.cc                            |  2 +-
 example/lifecycle-plugin/lifecycle-plugin.c               |  2 +-
 example/null-transform/null-transform.c                   |  2 +-
 example/output-header/output-header.c                     |  2 +-
 example/protocol/Protocol.c                               |  2 +-
 example/redirect-1/redirect-1.c                           |  2 +-
 example/remap/remap.cc                                    |  2 +-
 example/replace-header/replace-header.c                   |  2 +-
 example/response-header-1/response-header-1.c             |  2 +-
 example/server-transform/server-transform.c               |  2 +-
 example/session-1/session-1.c                             |  2 +-
 example/ssl-preaccept/ssl-preaccept.cc                    |  2 +-
 example/ssl-sni-whitelist/ssl-sni-whitelist.cc            |  2 +-
 example/ssl-sni/ssl-sni.cc                                |  2 +-
 example/thread-1/thread-1.c                               |  2 +-
 example/thread-pool/psi.c                                 |  2 +-
 example/version/version.c                                 |  8 ++------
 lib/ts/apidefs.h.in                                       |  5 -----
 plugins/cacheurl/cacheurl.cc                              |  2 +-
 plugins/experimental/ats_pagespeed/ats_pagespeed.cc       |  2 +-
 plugins/experimental/ats_pagespeed/gzip/misc.cc           |  2 +-
 plugins/experimental/authproxy/authproxy.cc               |  2 +-
 plugins/experimental/background_fetch/background_fetch.cc |  2 +-
 plugins/experimental/buffer_upload/buffer_upload.cc       |  2 +-
 .../cache_range_requests/cache_range_requests.cc          |  2 +-
 plugins/experimental/channel_stats/channel_stats.cc       |  2 +-
 .../collapsed_connection/collapsed_connection.cc          |  2 +-
 plugins/experimental/custom_redirect/custom_redirect.cc   |  4 +---
 plugins/experimental/epic/epic.cc                         |  2 +-
 plugins/experimental/generator/generator.cc               |  2 +-
 plugins/experimental/healthchecks/healthchecks.c          |  2 +-
 plugins/experimental/memcached_remap/memcached_remap.cc   |  2 +-
 plugins/experimental/metalink/metalink.cc                 |  2 +-
 plugins/experimental/mysql_remap/mysql_remap.cc           |  2 +-
 plugins/experimental/regex_revalidate/regex_revalidate.c  |  2 +-
 plugins/experimental/remap_stats/remap_stats.c            |  2 +-
 plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc   |  2 +-
 plugins/experimental/sslheaders/sslheaders.cc             |  2 +-
 .../stale_while_revalidate/stale_while_revalidate.c       |  2 +-
 plugins/experimental/ts_lua/ts_lua.c                      |  2 +-
 plugins/experimental/xdebug/xdebug.cc                     |  2 +-
 plugins/gzip/misc.cc                                      |  2 +-
 plugins/header_rewrite/header_rewrite.cc                  |  2 +-
 plugins/libloader/libloader.c                             |  2 +-
 plugins/stats_over_http/stats_over_http.c                 |  2 +-
 plugins/tcpinfo/tcpinfo.cc                                |  2 +-
 proxy/InkAPI.cc                                           | 10 +---------
 proxy/InkAPITest.cc                                       |  8 --------
 proxy/Plugin.cc                                           |  8 ++++++--
 proxy/api/ts/ts.h                                         |  4 +---
 62 files changed, 67 insertions(+), 92 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/doc/reference/api/TSPluginInit.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSPluginInit.en.rst b/doc/reference/api/TSPluginInit.en.rst
index d4637c1..86e30f1 100644
--- a/doc/reference/api/TSPluginInit.en.rst
+++ b/doc/reference/api/TSPluginInit.en.rst
@@ -28,7 +28,7 @@ Synopsis
 `#include <ts/ts.h>`
 
 .. function:: void TSPluginInit(int argc, const char* argv[])
-.. function:: TSReturnCode TSPluginRegister(TSSDKVersion sdk_version, TSPluginRegistrationInfo* plugin_info)
+.. function:: TSReturnCode TSPluginRegister(TSPluginRegistrationInfo* plugin_info)
 
 Description
 ===========
@@ -66,7 +66,7 @@ Examples
         info.vendor_name = "MyCompany";
         info.support_email = "ts-api-support@MyCompany.com";
 
-        if (TSPluginRegister(TS_SDK_VERSION_3_0 , &info) != TS_SUCCESS) {
+        if (TSPluginRegister(&info) != TS_SUCCESS) {
             TSError("Plugin registration failed. 0);
         }
     }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/doc/reference/api/TSTrafficServerVersionGet.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSTrafficServerVersionGet.en.rst b/doc/reference/api/TSTrafficServerVersionGet.en.rst
index 9f7681f..c02e41a 100644
--- a/doc/reference/api/TSTrafficServerVersionGet.en.rst
+++ b/doc/reference/api/TSTrafficServerVersionGet.en.rst
@@ -82,7 +82,7 @@ Example
         info.vendor_name = "MyCompany";
         info.support_email = "ts-api-support@MyCompany.com";
 
-        if (TSPluginRegister(TS_SDK_VERSION_3_0 , &info) != TS_SUCCESS) {
+        if (TSPluginRegister(&info) != TS_SUCCESS) {
             TSError("Plugin registration failed. 0);
         }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/doc/sdk/getting-started/plugin-registration-and-version-checking.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/getting-started/plugin-registration-and-version-checking.en.rst b/doc/sdk/getting-started/plugin-registration-and-version-checking.en.rst
index 22ad893..10de7d7 100644
--- a/doc/sdk/getting-started/plugin-registration-and-version-checking.en.rst
+++ b/doc/sdk/getting-started/plugin-registration-and-version-checking.en.rst
@@ -71,7 +71,7 @@ ensures it's running with a compatible version of Traffic Server.
           info.vendor_name = "MyCompany";
           info.support_email = "ts-api-support@MyCompany.com";
 
-          if (!TSPluginRegister (TS_SDK_VERSION_2_0 , &info)) {
+          if (!TSPluginRegister(&info)) {
              TSError ("Plugin registration failed. \n");
           }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/doc/sdk/sample-source-code.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/sample-source-code.en.rst b/doc/sdk/sample-source-code.en.rst
index 454795f..11192a8 100644
--- a/doc/sdk/sample-source-code.en.rst
+++ b/doc/sdk/sample-source-code.en.rst
@@ -272,7 +272,7 @@ This plugin illustrates:
            info.vendor_name = "DsCompany";
            info.support_email = "ts-api-support@DsCompany.com";
 
-           if (!TSPluginRegister (TS_SDK_VERSION_2_0 , &info)) {
+           if (!TSPluginRegister (&info)) {
                TSError ("Plugin registration failed.\n");
            }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/add-header/add-header.c
----------------------------------------------------------------------
diff --git a/example/add-header/add-header.c b/example/add-header/add-header.c
index 7583028..e156a34 100644
--- a/example/add-header/add-header.c
+++ b/example/add-header/add-header.c
@@ -131,7 +131,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[PluginInit] Plugin registration failed.\n");
     goto error;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/append-transform/append-transform.c
----------------------------------------------------------------------
diff --git a/example/append-transform/append-transform.c b/example/append-transform/append-transform.c
index 7ff3848..6463556 100644
--- a/example/append-transform/append-transform.c
+++ b/example/append-transform/append-transform.c
@@ -352,7 +352,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
     goto Lerror;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/basic-auth/basic-auth.c
----------------------------------------------------------------------
diff --git a/example/basic-auth/basic-auth.c b/example/basic-auth/basic-auth.c
index 7baceec..2a95963 100644
--- a/example/basic-auth/basic-auth.c
+++ b/example/basic-auth/basic-auth.c
@@ -219,7 +219,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/blacklist-0/blacklist-0.c
----------------------------------------------------------------------
diff --git a/example/blacklist-0/blacklist-0.c b/example/blacklist-0/blacklist-0.c
index c48e735..1205d60 100644
--- a/example/blacklist-0/blacklist-0.c
+++ b/example/blacklist-0/blacklist-0.c
@@ -155,7 +155,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/blacklist-1/blacklist-1.c
----------------------------------------------------------------------
diff --git a/example/blacklist-1/blacklist-1.c b/example/blacklist-1/blacklist-1.c
index 322df1c..cdaf0b6 100644
--- a/example/blacklist-1/blacklist-1.c
+++ b/example/blacklist-1/blacklist-1.c
@@ -315,7 +315,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/bnull-transform/bnull-transform.c
----------------------------------------------------------------------
diff --git a/example/bnull-transform/bnull-transform.c b/example/bnull-transform/bnull-transform.c
index 40f4ae6..778a146 100644
--- a/example/bnull-transform/bnull-transform.c
+++ b/example/bnull-transform/bnull-transform.c
@@ -315,7 +315,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[bnull-transform] Plugin registration failed.\n");
     goto Lerror;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/file-1/file-1.c
----------------------------------------------------------------------
diff --git a/example/file-1/file-1.c b/example/file-1/file-1.c
index f61df8b..88fecdf 100644
--- a/example/file-1/file-1.c
+++ b/example/file-1/file-1.c
@@ -48,7 +48,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/hello/hello.c
----------------------------------------------------------------------
diff --git a/example/hello/hello.c b/example/hello/hello.c
index e8906d3..5b248d7 100644
--- a/example/hello/hello.c
+++ b/example/hello/hello.c
@@ -35,7 +35,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed. \n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/intercept/intercept.cc
----------------------------------------------------------------------
diff --git a/example/intercept/intercept.cc b/example/intercept/intercept.cc
index 6248957..c133e9d 100644
--- a/example/intercept/intercept.cc
+++ b/example/intercept/intercept.cc
@@ -537,7 +537,7 @@ TSPluginInit(int /* argc */, const char * /* argv */ [])
   info.vendor_name = (char *)"MyCompany";
   info.support_email = (char *)"ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     VERROR("plugin registration failed\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/lifecycle-plugin/lifecycle-plugin.c
----------------------------------------------------------------------
diff --git a/example/lifecycle-plugin/lifecycle-plugin.c b/example/lifecycle-plugin/lifecycle-plugin.c
index 5f1ed3e..f98ac02 100644
--- a/example/lifecycle-plugin/lifecycle-plugin.c
+++ b/example/lifecycle-plugin/lifecycle-plugin.c
@@ -88,7 +88,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "My Company";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[lifecycle-plugin] Plugin registration failed.\n");
     goto Lerror;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/null-transform/null-transform.c
----------------------------------------------------------------------
diff --git a/example/null-transform/null-transform.c b/example/null-transform/null-transform.c
index d5b94d4..bbb428f 100644
--- a/example/null-transform/null-transform.c
+++ b/example/null-transform/null-transform.c
@@ -313,7 +313,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[null-transform] Plugin registration failed.\n");
     goto Lerror;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/output-header/output-header.c
----------------------------------------------------------------------
diff --git a/example/output-header/output-header.c b/example/output-header/output-header.c
index 56ca24e..b619396 100644
--- a/example/output-header/output-header.c
+++ b/example/output-header/output-header.c
@@ -157,7 +157,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[PluginInit] Plugin registration failed.\n");
     goto error;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/protocol/Protocol.c
----------------------------------------------------------------------
diff --git a/example/protocol/Protocol.c b/example/protocol/Protocol.c
index 0151c68..f2a2d5e 100644
--- a/example/protocol/Protocol.c
+++ b/example/protocol/Protocol.c
@@ -111,7 +111,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[PluginInit] Plugin registration failed.\n");
     goto error;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/redirect-1/redirect-1.c
----------------------------------------------------------------------
diff --git a/example/redirect-1/redirect-1.c b/example/redirect-1/redirect-1.c
index 06865f2..d36f164 100644
--- a/example/redirect-1/redirect-1.c
+++ b/example/redirect-1/redirect-1.c
@@ -345,7 +345,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/remap/remap.cc
----------------------------------------------------------------------
diff --git a/example/remap/remap.cc b/example/remap/remap.cc
index f8311d7..fcf465b 100644
--- a/example/remap/remap.cc
+++ b/example/remap/remap.cc
@@ -145,7 +145,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = (char *)"Apache";
   info.support_email = (char *)"";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed. \n");
   }
   TSDebug("debug-remap", "TSPluginInit: Remap plugin started\n");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/replace-header/replace-header.c
----------------------------------------------------------------------
diff --git a/example/replace-header/replace-header.c b/example/replace-header/replace-header.c
index 75ca390..8eb2622 100644
--- a/example/replace-header/replace-header.c
+++ b/example/replace-header/replace-header.c
@@ -102,7 +102,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed. \n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/response-header-1/response-header-1.c
----------------------------------------------------------------------
diff --git a/example/response-header-1/response-header-1.c b/example/response-header-1/response-header-1.c
index 2dd9abb..04e0c7e 100644
--- a/example/response-header-1/response-header-1.c
+++ b/example/response-header-1/response-header-1.c
@@ -238,7 +238,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/server-transform/server-transform.c
----------------------------------------------------------------------
diff --git a/example/server-transform/server-transform.c b/example/server-transform/server-transform.c
index a5c9573..c802a58 100644
--- a/example/server-transform/server-transform.c
+++ b/example/server-transform/server-transform.c
@@ -642,7 +642,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/session-1/session-1.c
----------------------------------------------------------------------
diff --git a/example/session-1/session-1.c b/example/session-1/session-1.c
index 1dde8c7..201cd27 100644
--- a/example/session-1/session-1.c
+++ b/example/session-1/session-1.c
@@ -97,7 +97,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[PluginInit] Plugin registration failed.\n");
     goto error;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/ssl-preaccept/ssl-preaccept.cc
----------------------------------------------------------------------
diff --git a/example/ssl-preaccept/ssl-preaccept.cc b/example/ssl-preaccept/ssl-preaccept.cc
index 59b18dc..10384ab 100644
--- a/example/ssl-preaccept/ssl-preaccept.cc
+++ b/example/ssl-preaccept/ssl-preaccept.cc
@@ -183,7 +183,7 @@ TSPluginInit(int argc, const char *argv[])
     TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
   }
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError(PCP "registration failed.");
   } else if (TSTrafficServerVersionGetMajor() < 2) {
     TSError(PCP "requires Traffic Server 2.0 or later.");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
----------------------------------------------------------------------
diff --git a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
index f7f0115..206da35 100644
--- a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
+++ b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
@@ -131,7 +131,7 @@ TSPluginInit(int argc, const char *argv[])
     TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
   }
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError(PCP "registration failed.");
   } else if (TSTrafficServerVersionGetMajor() < 2) {
     TSError(PCP "requires Traffic Server 2.0 or later.");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/ssl-sni/ssl-sni.cc
----------------------------------------------------------------------
diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
index 1c47921..cf81cef 100644
--- a/example/ssl-sni/ssl-sni.cc
+++ b/example/ssl-sni/ssl-sni.cc
@@ -154,7 +154,7 @@ TSPluginInit(int argc, const char *argv[])
     TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
   }
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError(PCP "registration failed.");
   } else if (TSTrafficServerVersionGetMajor() < 2) {
     TSError(PCP "requires Traffic Server 2.0 or later.");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/thread-1/thread-1.c
----------------------------------------------------------------------
diff --git a/example/thread-1/thread-1.c b/example/thread-1/thread-1.c
index a504acf..a29678b 100644
--- a/example/thread-1/thread-1.c
+++ b/example/thread-1/thread-1.c
@@ -74,7 +74,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/thread-pool/psi.c
----------------------------------------------------------------------
diff --git a/example/thread-pool/psi.c b/example/thread-pool/psi.c
index 4601297..9a47ef0 100644
--- a/example/thread-pool/psi.c
+++ b/example/thread-pool/psi.c
@@ -997,7 +997,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "Apache";
   info.support_email = "";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/example/version/version.c
----------------------------------------------------------------------
diff --git a/example/version/version.c b/example/version/version.c
index 77c824b..292a090 100644
--- a/example/version/version.c
+++ b/example/version/version.c
@@ -53,12 +53,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
   info.vendor_name = "MyCompany";
   info.support_email = "ts-api-support@MyCompany.com";
 
-// partial compilation
-#if (TS_VERSION_NUMBER < 3000000)
-  if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
-#else
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
-#endif
+
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed. \n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/lib/ts/apidefs.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 984498a..6379b8f 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -510,11 +510,6 @@ typedef enum {
   TS_IOBUFFER_SIZE_INDEX_2M = 14
 } TSIOBufferSizeIndex;
 
-/**
-    Starting 2.0, SDK now follows same versioning as Traffic Server.
- */
-typedef enum { TS_SDK_VERSION_2_0 = 0, TS_SDK_VERSION_3_0 } TSSDKVersion;
-
 typedef enum { TS_ERROR = -1, TS_SUCCESS = 0 } TSReturnCode;
 
 typedef enum { NO_CALLBACK = 0, AFTER_HEADER, AFTER_BODY } TSFetchWakeUpOptions;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/cacheurl/cacheurl.cc
----------------------------------------------------------------------
diff --git a/plugins/cacheurl/cacheurl.cc b/plugins/cacheurl/cacheurl.cc
index d17c732..6cfef24 100644
--- a/plugins/cacheurl/cacheurl.cc
+++ b/plugins/cacheurl/cacheurl.cc
@@ -440,7 +440,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSDebug(PLUGIN_NAME, "ERROR, Plugin registration failed");
     initialization_error("Plugin registration failed.");
     return;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
index 2ca0a24..591126e 100644
--- a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
+++ b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
@@ -1163,7 +1163,7 @@ RegisterPlugin()
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Failed to register ATSSpeed");
     return false;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/ats_pagespeed/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.cc b/plugins/experimental/ats_pagespeed/gzip/misc.cc
index 252b0a9..2784dff 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.cc
@@ -148,7 +148,7 @@ register_plugin()
   info.vendor_name = (char *)"Apache";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     return 0;
   }
   return 1;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/authproxy/authproxy.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/authproxy/authproxy.cc b/plugins/experimental/authproxy/authproxy.cc
index 31d831e..d27bf41 100644
--- a/plugins/experimental/authproxy/authproxy.cc
+++ b/plugins/experimental/authproxy/authproxy.cc
@@ -739,7 +739,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     AuthLogError("plugin registration failed");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/background_fetch/background_fetch.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index 63f8c59..2f10f43 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -543,7 +543,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_3_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError("%s: plugin registration failed.\n", PLUGIN_NAME);
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/buffer_upload/buffer_upload.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index c90948a..014f288 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -1227,7 +1227,7 @@ TSPluginInit(int argc, const char *argv[])
     uconfig->use_disk_buffer = 0;
   }
 
-  if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/cache_range_requests/cache_range_requests.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/cache_range_requests/cache_range_requests.cc b/plugins/experimental/cache_range_requests/cache_range_requests.cc
index f67ca2b..0eeb376 100644
--- a/plugins/experimental/cache_range_requests/cache_range_requests.cc
+++ b/plugins/experimental/cache_range_requests/cache_range_requests.cc
@@ -373,7 +373,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Comcast";
   info.support_email = (char *)"John_Rushford@cable.comcast.com";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[%s] TSPluginInit(): Plugin registration failed.\n", PLUGIN_NAME);
     TSError("[%s] Unable to initialize plugin (disabled).\n", PLUGIN_NAME);
     return;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/channel_stats/channel_stats.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/channel_stats/channel_stats.cc b/plugins/experimental/channel_stats/channel_stats.cc
index 065d801..459f1a5 100644
--- a/plugins/experimental/channel_stats/channel_stats.cc
+++ b/plugins/experimental/channel_stats/channel_stats.cc
@@ -798,7 +798,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     fatal("plugin registration failed.");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/collapsed_connection/collapsed_connection.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/collapsed_connection/collapsed_connection.cc b/plugins/experimental/collapsed_connection/collapsed_connection.cc
index a2c8fd5..ad35b21 100644
--- a/plugins/experimental/collapsed_connection/collapsed_connection.cc
+++ b/plugins/experimental/collapsed_connection/collapsed_connection.cc
@@ -1113,7 +1113,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = const_cast<char *>(PLUGIN_VENDOR);
   info.support_email = const_cast<char *>(PLUGIN_SUPPORT);
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_3_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError("Plugin registration failed");
     return;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/custom_redirect/custom_redirect.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/custom_redirect/custom_redirect.cc b/plugins/experimental/custom_redirect/custom_redirect.cc
index 8de940c..78bd9f9 100644
--- a/plugins/experimental/custom_redirect/custom_redirect.cc
+++ b/plugins/experimental/custom_redirect/custom_redirect.cc
@@ -155,11 +155,9 @@ TSPluginInit(int argc, const char *argv[])
     redirect_url_header = TSstrdup("x-redirect-url");
     redirect_url_header_len = strlen(redirect_url_header);
   }
-  /*
-  if (TSPluginRegister (TS_SDK_VERSION_5_2 , &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
       TSError ("[custom_redirect] Plugin registration failed.");
   }
-  */
   TSError("[custom_redirect] Plugin registered successfully.");
   TSCont mainCont = TSContCreate(plugin_main_handler, NULL);
   TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, mainCont);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/epic/epic.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/epic/epic.cc b/plugins/experimental/epic/epic.cc
index 291502e..0551454 100644
--- a/plugins/experimental/epic/epic.cc
+++ b/plugins/experimental/epic/epic.cc
@@ -309,7 +309,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     error("plugin registration failed");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/generator/generator.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/generator/generator.cc b/plugins/experimental/generator/generator.cc
index 839e670..466ffc8 100644
--- a/plugins/experimental/generator/generator.cc
+++ b/plugins/experimental/generator/generator.cc
@@ -596,7 +596,7 @@ TSPluginInit(int /* argc */, const char * /* argv */ [])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     VERROR("plugin registration failed\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/healthchecks/healthchecks.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/healthchecks/healthchecks.c b/plugins/experimental/healthchecks/healthchecks.c
index 60398ca..bb4fbb2 100644
--- a/plugins/experimental/healthchecks/healthchecks.c
+++ b/plugins/experimental/healthchecks/healthchecks.c
@@ -547,7 +547,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_3_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError("Plugin registration failed. \n");
     return;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/memcached_remap/memcached_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/memcached_remap/memcached_remap.cc b/plugins/experimental/memcached_remap/memcached_remap.cc
index b82a05e..7f8320e 100644
--- a/plugins/experimental/memcached_remap/memcached_remap.cc
+++ b/plugins/experimental/memcached_remap/memcached_remap.cc
@@ -172,7 +172,7 @@ TSPluginInit(int argc, const char *argv[])
   info.support_email = const_cast<char *>("dev@trafficserver.apache.org");
 
   TSDebug(PLUGIN_NAME, "about to init memcached\n");
-  if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("memcached_remap: plugin registration failed.\n");
     return;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/metalink/metalink.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/metalink/metalink.cc b/plugins/experimental/metalink/metalink.cc
index a321355..0b34ca1 100644
--- a/plugins/experimental/metalink/metalink.cc
+++ b/plugins/experimental/metalink/metalink.cc
@@ -909,7 +909,7 @@ TSPluginInit(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/mysql_remap/mysql_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/mysql_remap/mysql_remap.cc b/plugins/experimental/mysql_remap/mysql_remap.cc
index 7d51938..bba3563 100644
--- a/plugins/experimental/mysql_remap/mysql_remap.cc
+++ b/plugins/experimental/mysql_remap/mysql_remap.cc
@@ -190,7 +190,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = const_cast<char *>("Apache Software Foundation");
   info.support_email = const_cast<char *>("dev@trafficserver.apache.org");
 
-  if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("mysql_remap: plugin registration failed.\n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/regex_revalidate/regex_revalidate.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/regex_revalidate/regex_revalidate.c b/plugins/experimental/regex_revalidate/regex_revalidate.c
index f25c36f..d711e4e 100644
--- a/plugins/experimental/regex_revalidate/regex_revalidate.c
+++ b/plugins/experimental/regex_revalidate/regex_revalidate.c
@@ -503,7 +503,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.");
     free_plugin_state_t(pstate);
     return;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/remap_stats/remap_stats.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/remap_stats/remap_stats.c b/plugins/experimental/remap_stats/remap_stats.c
index e231ec2..c82401b 100644
--- a/plugins/experimental/remap_stats/remap_stats.c
+++ b/plugins/experimental/remap_stats/remap_stats.c
@@ -243,7 +243,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.");
     return;
   } else

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index eabdd5e..a9169f1 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -506,7 +506,7 @@ TSPluginInit(int argc, const char *argv[])
     TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
   }
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError(PCP "registration failed.");
   } else if (TSTrafficServerVersionGetMajor() < 5) {
     TSError(PCP "requires Traffic Server 5.0 or later.");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/sslheaders/sslheaders.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/sslheaders/sslheaders.cc b/plugins/experimental/sslheaders/sslheaders.cc
index ce5ba9e..15eeec1 100644
--- a/plugins/experimental/sslheaders/sslheaders.cc
+++ b/plugins/experimental/sslheaders/sslheaders.cc
@@ -224,7 +224,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     SslHdrError("plugin registration failed");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
index b98fa20..6576e7d 100644
--- a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
+++ b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
@@ -615,7 +615,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed.\n");
     return;
   } else {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/ts_lua/ts_lua.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua.c b/plugins/experimental/ts_lua/ts_lua.c
index d0e6345..cea09ed 100644
--- a/plugins/experimental/ts_lua/ts_lua.c
+++ b/plugins/experimental/ts_lua/ts_lua.c
@@ -352,7 +352,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("Plugin registration failed. \n");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/experimental/xdebug/xdebug.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/xdebug/xdebug.cc b/plugins/experimental/xdebug/xdebug.cc
index ca45c30..9adcd73 100644
--- a/plugins/experimental/xdebug/xdebug.cc
+++ b/plugins/experimental/xdebug/xdebug.cc
@@ -350,7 +350,7 @@ TSPluginInit(int /* argc */, const char * /*argv */ [])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("xdebug plugin registration failed");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/gzip/misc.cc b/plugins/gzip/misc.cc
index 9f2600b..65789df 100644
--- a/plugins/gzip/misc.cc
+++ b/plugins/gzip/misc.cc
@@ -148,7 +148,7 @@ register_plugin()
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     return 0;
   }
   return 1;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/header_rewrite/header_rewrite.cc
----------------------------------------------------------------------
diff --git a/plugins/header_rewrite/header_rewrite.cc b/plugins/header_rewrite/header_rewrite.cc
index 95b6a1a..db78745 100644
--- a/plugins/header_rewrite/header_rewrite.cc
+++ b/plugins/header_rewrite/header_rewrite.cc
@@ -295,7 +295,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TS_SUCCESS != TSPluginRegister(TS_SDK_VERSION_3_0, &info)) {
+  if (TS_SUCCESS != TSPluginRegister(&info)) {
     TSError("%s: plugin registration failed.\n", PLUGIN_NAME);
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/libloader/libloader.c
----------------------------------------------------------------------
diff --git a/plugins/libloader/libloader.c b/plugins/libloader/libloader.c
index 57f478e..fe4fe52 100644
--- a/plugins/libloader/libloader.c
+++ b/plugins/libloader/libloader.c
@@ -62,7 +62,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[libloader] Plugin registration failed.\n");
     return;
   }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/stats_over_http/stats_over_http.c
----------------------------------------------------------------------
diff --git a/plugins/stats_over_http/stats_over_http.c b/plugins/stats_over_http/stats_over_http.c
index 39c9c69..828fc52 100644
--- a/plugins/stats_over_http/stats_over_http.c
+++ b/plugins/stats_over_http/stats_over_http.c
@@ -295,7 +295,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = "Apache Software Foundation";
   info.support_email = "dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[%s] registration failed", PLUGIN_NAME);
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/plugins/tcpinfo/tcpinfo.cc
----------------------------------------------------------------------
diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index 91e5c33..b1975cc 100644
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -320,7 +320,7 @@ TSPluginInit(int argc, const char *argv[])
   info.vendor_name = (char *)"Apache Software Foundation";
   info.support_email = (char *)"dev@trafficserver.apache.org";
 
-  if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
+  if (TSPluginRegister(&info) != TS_SUCCESS) {
     TSError("[tcpinfo] plugin registration failed");
   }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 96dede2..1e4093d 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -1774,7 +1774,7 @@ TSPluginDirGet(void)
 ////////////////////////////////////////////////////////////////////
 
 TSReturnCode
-TSPluginRegister(TSSDKVersion sdk_version, TSPluginRegistrationInfo *plugin_info)
+TSPluginRegister(TSPluginRegistrationInfo *plugin_info)
 {
   sdk_assert(sdk_sanity_check_null_ptr((void *)plugin_info) == TS_SUCCESS);
 
@@ -1782,14 +1782,6 @@ TSPluginRegister(TSSDKVersion sdk_version, TSPluginRegistrationInfo *plugin_info
     return TS_ERROR;
   }
 
-  switch (sdk_version) {
-  case TS_SDK_VERSION_2_0:
-  case TS_SDK_VERSION_3_0:
-    break;
-  default:
-    return TS_ERROR;
-  }
-
   plugin_reg_current->plugin_registered = true;
 
   if (plugin_info->plugin_name) {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/proxy/InkAPITest.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index a8507b1..f5058e5 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -5520,11 +5520,6 @@ typedef enum {
 } ORIG_TSVConnCloseFlags;
 
 typedef enum {
-  ORIG_TS_SDK_VERSION_2_0 = 0,
-  ORIG_TS_SDK_VERSION_3_0,
-} ORIG_TSSDKVersion;
-
-typedef enum {
   ORIG_TS_ERROR = -1,
   ORIG_TS_SUCCESS = 0,
 } ORIG_TSReturnCode;
@@ -5667,9 +5662,6 @@ REGRESSION_TEST(SDK_API_TSConstant)(RegressionTest *test, int /* atype ATS_UNUSE
   PRINT_DIFF(TS_VC_CLOSE_ABORT);
   PRINT_DIFF(TS_VC_CLOSE_NORMAL);
 
-  PRINT_DIFF(TS_SDK_VERSION_2_0);
-  PRINT_DIFF(TS_SDK_VERSION_3_0);
-
   PRINT_DIFF(TS_ERROR);
   PRINT_DIFF(TS_SUCCESS);
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/proxy/Plugin.cc
----------------------------------------------------------------------
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 85db1ea..438362d 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -116,12 +116,16 @@ plugin_load(int argc, char *argv[], bool validateOnly)
     plugin_reg_current->dlh = handle;
 
     init = (init_func_t)dlsym(plugin_reg_current->dlh, "TSPluginInit");
-    if (!init) {
+    if (!init || plugin_reg_current->plugin_registered == false) {
       delete plugin_reg_current;
       if (validateOnly) {
         return false;
       }
-      Fatal("unable to find TSPluginInit function in '%s': %s", path, dlerror());
+      if (!init) {
+        Fatal("unable to find TSPluginInit function in '%s': %s", path, dlerror());
+      } else {
+        Fatal("plugin not registered by calling TSPluginRegister");
+      }
       return false; // this line won't get called since Fatal brings down ATS
     }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a68557a8/proxy/api/ts/ts.h
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index a6aa14c..779f99c 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -148,14 +148,12 @@ int TSTrafficServerVersionGetPatch(void);
     Traffic Server version currently running also supports your plugin.
     See the SDK sample code for usage.
 
-    @param sdk_version earliest version of the Traffic Server SDK that
-      supports your plugin.
     @param plugin_info contains registration information about your
       plugin. See TSPluginRegistrationInfo.
     @return TS_ERROR if the plugin registration failed.
 
  */
-tsapi TSReturnCode TSPluginRegister(TSSDKVersion sdk_version, TSPluginRegistrationInfo *plugin_info);
+tsapi TSReturnCode TSPluginRegister(TSPluginRegistrationInfo *plugin_info);
 
 /* --------------------------------------------------------------------------
    Files */


Mime
View raw message