Revert "Reverting the new API changes to get the API reviewed" This reverts commit afa4fab2ec801f1e3e23e533446430268d80883a.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8b16a765 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b16a765 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b16a765 Branch: refs/heads/master Commit: 8b16a765519b560e73c12d76775601859750cd21 Parents: b80c6ca Author: Sudheer Vinukonda <[email protected]> Authored: Wed Nov 19 16:23:49 2014 +0000 Committer: Sudheer Vinukonda <[email protected]> Committed: Wed Nov 19 16:23:49 2014 +0000 ---------------------------------------------------------------------- plugins/experimental/sni_proto_nego/sni_proto_nego.cc | 4 ++-- proxy/InkAPI.cc | 10 ++++++++++ proxy/api/ts/ts.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b16a765/plugins/experimental/sni_proto_nego/sni_proto_nego.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/sni_proto_nego/sni_proto_nego.cc b/plugins/experimental/sni_proto_nego/sni_proto_nego.cc index 59b6db1..8b4afc1 100644 --- a/plugins/experimental/sni_proto_nego/sni_proto_nego.cc +++ b/plugins/experimental/sni_proto_nego/sni_proto_nego.cc @@ -160,11 +160,11 @@ init_sni_callback(void *sslNetVC) SSL_CTX_set_next_protos_advertised_cb(ctx, NULL, NULL); } else { TSDebug(PLUGIN_NAME, "setting NPN advertised list for %s", serverName); - //TSSslAdvertiseProtocolSet(ssl_vc, (const unsigned char **)sniProtoConfig.npn_proto_list, sniProtoConfig.npn_proto_list_count); + TSSslAdvertiseProtocolSet(ssl_vc, (const unsigned char **)sniProtoConfig.npn_proto_list, sniProtoConfig.npn_proto_list_count); } } else { TSDebug(PLUGIN_NAME, "setting NPN advertised list for %s", serverName); - //TSSslAdvertiseProtocolSet(ssl_vc, NULL, 0); + TSSslAdvertiseProtocolSet(ssl_vc, NULL, 0); } } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b16a765/proxy/InkAPI.cc ---------------------------------------------------------------------- diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc index 62f0870..d61e997 100644 --- a/proxy/InkAPI.cc +++ b/proxy/InkAPI.cc @@ -8757,6 +8757,16 @@ tsapi int TSVConnIsSsl(TSVConn sslp) return ssl_vc != NULL; } +tsapi TSReturnCode +TSSslAdvertiseProtocolSet(TSVConn sslp, const unsigned char ** list, unsigned int count) +{ + NetVConnection *vc = reinterpret_cast<NetVConnection*>(sslp); + SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection*>(vc); + sdk_assert(sdk_sanity_check_null_ptr((void*)ssl_vc) == TS_SUCCESS); + ssl_vc->setAdvertiseProtocols(list, count); + return TS_SUCCESS; +} + void TSVConnReenable(TSVConn vconn) { http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8b16a765/proxy/api/ts/ts.h ---------------------------------------------------------------------- diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h index b5b0abe..8950b5c 100644 --- a/proxy/api/ts/ts.h +++ b/proxy/api/ts/ts.h @@ -1238,6 +1238,7 @@ extern "C" tsapi TSSslContext TSSslContextFindByAddr(struct sockaddr const*); // Returns 1 if the sslp argument refers to a SSL connection tsapi int TSVConnIsSsl(TSVConn sslp); + tsapi TSReturnCode TSSslAdvertiseProtocolSet(TSVConn sslp, const unsigned char ** list, unsigned int count); /* -------------------------------------------------------------------------- HTTP transactions */
