Repository: trafficserver Updated Branches: refs/heads/master 8e6d037ef -> 2b64392d8
TS-3006: Fix compile warnings and errors. This closes #116. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2b64392d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2b64392d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2b64392d Branch: refs/heads/master Commit: 2b64392d807fc4d8e75d3170f60a41a1c881cf8f Parents: 8e6d037 Author: shinrich <[email protected]> Authored: Mon Sep 22 16:27:39 2014 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Mon Sep 22 16:41:35 2014 -0500 ---------------------------------------------------------------------- example/ssl-sni-whitelist/ssl-sni-whitelist.cc | 2 +- iocore/net/P_SSLNetVConnection.h | 3 +++ iocore/net/SSLCertLookup.cc | 2 +- plugins/experimental/ssl_cert_loader/Makefile.am | 2 +- proxy/http/HttpTransact.cc | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b64392d/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 4cd1aaa..24ffa15 100644 --- a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc +++ b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc @@ -75,7 +75,7 @@ ts::ConstBuffer text; } int -CB_servername_whitelist(TSCont contp, TSEvent event, void *edata) { +CB_servername_whitelist(TSCont /* contp */, TSEvent /* event */, void *edata) { TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata); TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc); SSL *ssl = reinterpret_cast<SSL *>(sslobj); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b64392d/iocore/net/P_SSLNetVConnection.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h index 863b5da..0e033a6 100644 --- a/iocore/net/P_SSLNetVConnection.h +++ b/iocore/net/P_SSLNetVConnection.h @@ -123,6 +123,9 @@ public: sslClientRenegotiationAbort = state; }; + // Copy up here so we overload but don't override + using super::reenable; + /// Reenable the VC after a pre-accept or SNI hook is called. virtual void reenable(NetHandler* nh); /// Set the SSL context. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b64392d/iocore/net/SSLCertLookup.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc index 19c22ca..dc3bfab 100644 --- a/iocore/net/SSLCertLookup.cc +++ b/iocore/net/SSLCertLookup.cc @@ -304,7 +304,7 @@ SSLContextStorage::insert(const char* name, int idx) } else { InkHashTableValue value; - if (ink_hash_table_lookup(this->hostnames, name, &value) && (void *)idx != value) { + if (ink_hash_table_lookup(this->hostnames, name, &value) && reinterpret_cast<InkHashTableValue>(idx) != value) { Warning("previously indexed '%s' with SSL_CTX %p, cannot index it with SSL_CTX #%d now", name, value, idx); } else { inserted = true; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b64392d/plugins/experimental/ssl_cert_loader/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/ssl_cert_loader/Makefile.am b/plugins/experimental/ssl_cert_loader/Makefile.am index def7a7f..016beb8 100644 --- a/plugins/experimental/ssl_cert_loader/Makefile.am +++ b/plugins/experimental/ssl_cert_loader/Makefile.am @@ -20,7 +20,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_srcdir)/lib/ts pkglib_LTLIBRARIES = ssl_cert_loader.la -ssl_cert_loader_la_SOURCES = ssl-cert-loader.cc ip.cc IpMap.cc domain-tree.cc +ssl_cert_loader_la_SOURCES = ssl-cert-loader.cc domain-tree.cc ssl_cert_loader_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS) -L$(top_srcdir)/lib/tsconfig/.libs -ltsconfig http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2b64392d/proxy/http/HttpTransact.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index d6986b4..568b2d3 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -598,7 +598,7 @@ HttpTransact::HandleBlindTunnel(State* s) { bool inbound_transparent_p = s->state_machine->ua_session->get_netvc()->get_is_transparent(); URL u; - IpEndpoint dest_addr; + //IpEndpoint dest_addr; //ip_text_buffer new_host; DebugTxn("http_trans", "[HttpTransact::HandleBlindTunnel]");
