This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 19e8041 Removes unreferenced, unused bits of code
19e8041 is described below
commit 19e804144f92c76a35fbb35417a1d85c4f4e5d38
Author: Randall Meyer <[email protected]>
AuthorDate: Thu Jul 18 12:33:50 2019 -0700
Removes unreferenced, unused bits of code
---
include/tscore/MMH.h | 54 ----------
include/tscore/Scalar.h | 1 -
include/tscore/ink_sock.h | 1 -
.../eventsystem/unit_tests/test_MIOBufferWriter.cc | 57 ----------
iocore/hostdb/test_RefCountCache.cc | 6 --
iocore/net/P_SNIActionPerformer.h | 11 --
iocore/net/Socks.cc | 8 --
iocore/net/UnixNetAccept.cc | 3 -
iocore/net/UnixNetPages.cc | 6 --
iocore/net/UnixUDPNet.cc | 17 ++-
iocore/utils/I_OneWayMultiTunnel.h | 16 ---
iocore/utils/OneWayMultiTunnel.cc | 13 ---
lib/records/I_RecProcess.h | 1 -
lib/records/RecRawStats.cc | 22 ----
lib/records/test_I_RecLocal.cc | 2 -
lib/records/test_RecProcess.i | 2 +-
lib/records/test_RecTree.cc | 3 +-
mgmt/Alarms.cc | 11 --
mgmt/Alarms.h | 1 -
mgmt/LocalManager.cc | 1 -
mgmt/RecordsConfig.h | 3 +-
mgmt/RecordsConfigUtils.cc | 33 ------
mgmt/api/EventCallback.cc | 2 +-
plugins/authproxy/utils.cc | 76 --------------
plugins/authproxy/utils.h | 9 --
plugins/cachekey/tests/pattern_test.cc | 2 +-
plugins/esi/esi.cc | 2 +-
plugins/esi/lib/EsiGzip.cc | 9 --
.../experimental/cache_key_genid/cache_key_genid.c | 2 +-
.../collapsed_forwarding/collapsed_forwarding.cc | 1 -
plugins/experimental/mysql_remap/mysql_remap.cc | 3 +-
plugins/experimental/sslheaders/sslheaders.cc | 5 -
plugins/experimental/sslheaders/sslheaders.h | 2 -
plugins/regex_remap/regex_remap.cc | 11 --
plugins/s3_auth/s3_auth.cc | 3 -
proxy/CacheControl.cc | 6 --
proxy/ControlMatcher.cc | 2 +-
proxy/hdrs/HTTP.cc | 12 ---
proxy/hdrs/HdrHeap.cc | 4 +-
proxy/hdrs/HdrTest.cc | 35 +------
proxy/hdrs/URL.cc | 5 -
proxy/http/HttpSM.cc | 29 ------
proxy/http/HttpSM.h | 2 -
proxy/http/HttpTransact.cc | 115 +--------------------
proxy/http/HttpTransact.h | 2 -
proxy/http/HttpTransactCache.cc | 5 -
proxy/http/HttpTransactHeaders.cc | 37 -------
proxy/http/HttpTransactHeaders.h | 3 -
proxy/http/remap/UrlRewrite.cc | 26 -----
proxy/http/remap/UrlRewrite.h | 1 -
proxy/http2/HTTP2.cc | 7 --
proxy/logging/LogFilter.cc | 8 --
proxy/shared/DiagsConfig.cc | 20 ----
proxy/shared/DiagsConfig.h | 1 -
src/traffic_cache_tool/CacheDefs.cc | 5 -
src/traffic_server/CoreUtils.cc | 8 --
src/traffic_server/InkAPITest.cc | 21 ----
src/traffic_server/traffic_server.cc | 11 --
src/tscore/ink_sock.cc | 19 ----
src/tscore/unit_tests/test_List.cc | 5 -
60 files changed, 24 insertions(+), 764 deletions(-)
diff --git a/include/tscore/MMH.h b/include/tscore/MMH.h
index e5f0240..6ab5bbd 100644
--- a/include/tscore/MMH.h
+++ b/include/tscore/MMH.h
@@ -59,58 +59,4 @@ public:
bool update(void const *data, int length) override;
/// Finalize and extract the @a hash.
bool finalize(CryptoHash &hash) override;
-#if 0
- MMH & loadFromBuffer(char *MMH_buf)
- {
- int i;
- char *s, *d;
-
- for (i = 0, s = MMH_buf, d = (char *) (&(b[0])); i < 8; i++, *d++ = *s++);
- for (i = 0, d = (char *) (&(b[1])); i < 8; i++, *d++ = *s++);
- return *this;
- }
- MMH & storeToBuffer(char *MMH_buf) {
- int i;
- char *s, *d;
-
- for (i = 0, d = MMH_buf, s = (char *) (&(b[0])); i < 8; i++, *d++ = *s++);
- for (i = 0, s = (char *) (&(b[1])); i < 8; i++, *d++ = *s++);
- return *this;
- }
- MMH & operator =(char *MMH) {
- return loadFromBuffer(MMH);
- }
- MMH & operator =(unsigned char *MMH) {
- return loadFromBuffer(reinterpret_cast<char *>(MMH));
- }
-
- char *toStr(char *MMH_str) const
- {
- int i;
- char *s, *d;
-
- for (i = 0, d = MMH_str, s = (char *) (&(b[0])); i < 8; i++, *d++ = *s++);
- for (i = 0, s = (char *) (&(b[1])); i < 8; i++, *d++ = *s++);
-
- return MMH_str;
- }
- void encodeBuffer(unsigned char *buffer, int len)
- {
- unsigned char MMH[16];
- ink_code_MMH(buffer, len, MMH);
- *this = MMH;
- }
- void encodeBuffer(char *buffer, int len)
- {
- encodeBuffer((unsigned char *) buffer, len);
- }
- char *str()
- {
- return reinterpret_cast<char *>(b);
- }
- char *toHexStr(char hex_MMH[33])
- {
- return ink_code_md5_stringify_fast(hex_MMH, str());
- }
-#endif
};
diff --git a/include/tscore/Scalar.h b/include/tscore/Scalar.h
index 5eb0dff..327a178 100644
--- a/include/tscore/Scalar.h
+++ b/include/tscore/Scalar.h
@@ -117,7 +117,6 @@ namespace detail
// Unit value, to be rounded up.
template <typename C> struct scalar_unit_round_up_t {
C _n;
- // template <typename I> constexpr operator scalar_unit_round_up_t<I>()
{ return {static_cast<I>(_n)}; }
template <intmax_t N, typename I>
constexpr I
scale() const
diff --git a/include/tscore/ink_sock.h b/include/tscore/ink_sock.h
index d87b049..3ea127e 100644
--- a/include/tscore/ink_sock.h
+++ b/include/tscore/ink_sock.h
@@ -50,7 +50,6 @@ int safe_clr_fl(int fd, int arg);
int safe_blocking(int fd);
int safe_nonblocking(int fd);
-int write_ready(int fd, int timeout_msec = 0);
int read_ready(int fd, int timeout_msec = 0);
char fd_read_char(int fd);
diff --git a/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
b/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
index 955bea0..c75d59e 100644
--- a/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
+++ b/iocore/eventsystem/unit_tests/test_MIOBufferWriter.cc
@@ -70,37 +70,6 @@ genData(int numBytes)
return s;
}
-void
-writeOnce(MIOBufferWriter &bw, std::size_t len)
-{
- static bool toggle;
-
- std::string s{genData(len)};
-
- if (len == 1) {
- bw.write(s[0]);
-
- } else if (toggle) {
- std::size_t cap{bw.auxBufferCapacity()};
-
- if (cap >= len) {
- memcpy(bw.auxBuffer(), s.data(), len);
- bw.fill(len);
-
- } else {
- memcpy(bw.auxBuffer(), s.data(), cap);
- bw.fill(cap);
- bw.write(s.data() + cap, len - cap);
- }
- } else {
- bw.write(s.data(), len);
- }
-
- toggle = !toggle;
-
- REQUIRE(bw.auxBufferCapacity() <= DEFAULT_BUFFER_NUMBER);
-}
-
class InkAssertExcept
{
};
@@ -109,30 +78,4 @@ TEST_CASE("MIOBufferWriter", "[MIOBW]")
{
MIOBuffer *theMIOBuffer = new_MIOBuffer(default_large_iobuffer_size);
MIOBufferWriter bw(theMIOBuffer);
-
-#if 0
- writeOnce(bw, 0);
- writeOnce(bw, 1);
- writeOnce(bw, 1);
- writeOnce(bw, 1);
- writeOnce(bw, 10);
- writeOnce(bw, 1000);
- writeOnce(bw, 1);
- writeOnce(bw, 0);
- writeOnce(bw, 1);
- writeOnce(bw, 2000);
- writeOnce(bw, 69);
- writeOnce(bw, 666);
-
- std::cout << "Pre Loop" << std::endl;
- for (int i = 0; i < 3000; i += 13) {
- writeOnce(bw, i);
- }
- std::cout << "Post Loop" << std::endl;
-
- writeOnce(bw, 0);
- writeOnce(bw, 1);
-
- REQUIRE(bw.extent() == 3000);
-#endif
}
diff --git a/iocore/hostdb/test_RefCountCache.cc
b/iocore/hostdb/test_RefCountCache.cc
index cfa8854..585b0da 100644
--- a/iocore/hostdb/test_RefCountCache.cc
+++ b/iocore/hostdb/test_RefCountCache.cc
@@ -124,12 +124,6 @@ verifyCache(RefCountCache<ExampleStruct> *cache, int
start, int end)
printf("IDX of ExampleStruct%d incorrect! (%d)\n", i, tmp->idx);
return 1; // TODO: spin over all?
}
-
- // check that the name is correct
- // if (strcmp(tmp->name, name.c_str())){
- // printf("Name of ExampleStruct%d incorrect! %s %s\n", i, tmp->name,
name.c_str());
- // exit(1);
- //}
}
return 0;
}
diff --git a/iocore/net/P_SNIActionPerformer.h
b/iocore/net/P_SNIActionPerformer.h
index 957ff3c..a045410 100644
--- a/iocore/net/P_SNIActionPerformer.h
+++ b/iocore/net/P_SNIActionPerformer.h
@@ -38,17 +38,6 @@
extern std::unordered_map<int, SSLNextProtocolSet *> snpsMap;
-/*// enum of all the actions
-enum AllActions {
- TS_DISABLE_H2 = 0,
- TS_VERIFY_CLIENT, // this applies to server side vc only
- TS_TUNNEL_ROUTE, // blind tunnel action
-};
-*/
-
-/** action for setting next hop properties should be listed in the following
enum*/
-/* enum PropertyActions { TS_VERIFY_SERVER = 200, TS_CLIENT_CERT }; */
-
class ActionItem
{
public:
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index ab1044f..8274b68 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -689,8 +689,6 @@ socks5PasswdAuthHandler(int event, unsigned char *p, void
(**h_ptr)(void))
break;
case SOCKS_AUTH_READ_COMPLETE:
-
- // if (p[0] == 1) { // skip this. its not clear what this should be.
// NEC thinks it is 5 RFC seems to indicate 1.
switch (p[1]) {
case 0:
@@ -702,12 +700,6 @@ socks5PasswdAuthHandler(int event, unsigned char *p, void
(**h_ptr)(void))
Debug("Socks", "Username/Passwd authentication failed ret_code: %d",
(int)p[1]);
ret = -1;
}
- //}
- // else {
- // Debug("Socks", "authPassEvent got wrong version %d from "
- // "Socks server\n", (int)p[0]);
- // ret = -1;
- //}
break;
diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc
index c10c03d..e3c96f8 100644
--- a/iocore/net/UnixNetAccept.cc
+++ b/iocore/net/UnixNetAccept.cc
@@ -369,9 +369,6 @@ NetAccept::acceptEvent(int event, void *ep)
return EVENT_DONE;
}
- // ink_assert(ifd < 0 || event == EVENT_INTERVAL || (pd->nfds > ifd &&
pd->pfd[ifd].fd == server.fd));
- // if (ifd < 0 || event == EVENT_INTERVAL || (pd->pfd[ifd].revents &
(POLLIN | POLLERR | POLLHUP | POLLNVAL))) {
- // ink_assert(!"incomplete");
int res;
if ((res = accept_fn(this, e, false)) < 0) {
NET_DECREMENT_DYN_STAT(net_accepts_currently_open_stat);
diff --git a/iocore/net/UnixNetPages.cc b/iocore/net/UnixNetPages.cc
index 34a3520..240e9f2 100644
--- a/iocore/net/UnixNetPages.cc
+++ b/iocore/net/UnixNetPages.cc
@@ -184,12 +184,6 @@ struct ShowNet : public ShowCont {
return EVENT_CONT;
}
int
- showSingleConnection(int event, Event *e)
- {
- CHECK_SHOW(begin("Net Connection"));
- return complete(event, e);
- }
- int
showHostnames(int event, Event *e)
{
CHECK_SHOW(begin("Net Connections to/from Host"));
diff --git a/iocore/net/UnixUDPNet.cc b/iocore/net/UnixUDPNet.cc
index f4c22e1..eb9824c 100644
--- a/iocore/net/UnixUDPNet.cc
+++ b/iocore/net/UnixUDPNet.cc
@@ -438,9 +438,9 @@ UDPReadContinuation::readPollEvent(int event_, Event *e)
if (event->cancelled) {
e->cancel();
free();
- // delete this;
return EVENT_DONE;
}
+
// See if the request has timed out
if (timeout_interval) {
elapsed_time += -period;
@@ -450,14 +450,10 @@ UDPReadContinuation::readPollEvent(int event_, Event *e)
c->handleEvent(NET_EVENT_DATAGRAM_READ_ERROR, event);
e->cancel();
free();
- // delete this;
return EVENT_DONE;
}
}
- // ink_assert(ifd < 0 || event_ == EVENT_INTERVAL || (event_ == EVENT_POLL
&& pc->pollDescriptor->nfds > ifd &&
- // pc->pollDescriptor->pfd[ifd].fd == fd));
- // if (ifd < 0 || event_ == EVENT_INTERVAL ||
(pc->pollDescriptor->pfd[ifd].revents & POLLIN)) {
- // ink_assert(!"incomplete");
+
c = completionUtil::getContinuation(event);
// do read
socklen_t tmp_fromlen = *fromaddrlen;
@@ -474,7 +470,7 @@ UDPReadContinuation::readPollEvent(int event_, Event *e)
c->handleEvent(NET_EVENT_DATAGRAM_READ_COMPLETE, event);
e->cancel();
free();
- // delete this;
+
return EVENT_DONE;
} else if (rlen < 0 && rlen != -EAGAIN) {
// signal error.
@@ -485,7 +481,7 @@ UDPReadContinuation::readPollEvent(int event_, Event *e)
c->handleEvent(NET_EVENT_DATAGRAM_READ_ERROR, event);
e->cancel();
free();
- // delete this;
+
return EVENT_DONE;
} else {
completionUtil::setThread(event, nullptr);
@@ -494,7 +490,7 @@ UDPReadContinuation::readPollEvent(int event_, Event *e)
if (event->cancelled) {
e->cancel();
free();
- // delete this;
+
return EVENT_DONE;
}
// reestablish poll
@@ -1089,7 +1085,7 @@ UDPNetHandler::waitForActivity(ink_hrtime timeout)
udpOutQueue.service(this);
// handle UDP read operations
- int i, nread = 0;
+ int i = 0;
EventIO *epd = nullptr;
for (i = 0; i < pc->pollDescriptor->result; i++) {
epd = (EventIO *)get_ev_data(pc->pollDescriptor, i);
@@ -1105,7 +1101,6 @@ UDPNetHandler::waitForActivity(ink_hrtime timeout)
uc->Release();
} else {
udpNetInternal.udp_read_from_net(this, uc);
- nread++;
}
} else {
Debug("iocore_udp_main", "Unhandled epoll event: 0x%04x",
get_ev_events(pc->pollDescriptor, i));
diff --git a/iocore/utils/I_OneWayMultiTunnel.h
b/iocore/utils/I_OneWayMultiTunnel.h
index c4973e6..4705a87 100644
--- a/iocore/utils/I_OneWayMultiTunnel.h
+++ b/iocore/utils/I_OneWayMultiTunnel.h
@@ -57,22 +57,6 @@ struct OneWayMultiTunnel : public OneWayTunnel {
// Public Interface
//
- // Use these to construct/destruct OneWayMultiTunnel objects
-
- /**
- Allocates a OneWayMultiTunnel object.
-
- @return new OneWayTunnel object.
-
- */
- static OneWayMultiTunnel *OneWayMultiTunnel_alloc();
-
- /**
- Deallocates a OneWayTunnel object.
-
- */
- static void OneWayMultiTunnel_free(OneWayMultiTunnel *);
-
OneWayMultiTunnel();
// Use One of the following init functions to start the tunnel.
diff --git a/iocore/utils/OneWayMultiTunnel.cc
b/iocore/utils/OneWayMultiTunnel.cc
index 078450a..a62eb74 100644
--- a/iocore/utils/OneWayMultiTunnel.cc
+++ b/iocore/utils/OneWayMultiTunnel.cc
@@ -44,19 +44,6 @@ OneWayMultiTunnel::OneWayMultiTunnel() : OneWayTunnel()
ink_zero(vioTargets);
}
-OneWayMultiTunnel *
-OneWayMultiTunnel::OneWayMultiTunnel_alloc()
-{
- return OneWayMultiTunnelAllocator.alloc();
-}
-
-void
-OneWayMultiTunnel::OneWayMultiTunnel_free(OneWayMultiTunnel *pOWT)
-{
- pOWT->mutex = nullptr;
- OneWayMultiTunnelAllocator.free(pOWT);
-}
-
void
OneWayMultiTunnel::init(VConnection *vcSource, VConnection **vcTargets, int
n_vcTargets, Continuation *aCont, int size_estimate,
int64_t nbytes, bool asingle_buffer, /* = true */
diff --git a/lib/records/I_RecProcess.h b/lib/records/I_RecProcess.h
index c7a6faa..13dee87 100644
--- a/lib/records/I_RecProcess.h
+++ b/lib/records/I_RecProcess.h
@@ -68,7 +68,6 @@ int RecRawStatSyncCount(const char *name, RecDataT data_type,
RecData *data, Rec
int RecRawStatSyncAvg(const char *name, RecDataT data_type, RecData *data,
RecRawStatBlock *rsb, int id);
int RecRawStatSyncHrTimeAvg(const char *name, RecDataT data_type, RecData
*data, RecRawStatBlock *rsb, int id);
int RecRawStatSyncIntMsecsToFloatSeconds(const char *name, RecDataT data_type,
RecData *data, RecRawStatBlock *rsb, int id);
-int RecRawStatSyncMHrTimeAvg(const char *name, RecDataT data_type, RecData
*data, RecRawStatBlock *rsb, int id);
int RecRegisterRawStatSyncCb(const char *name, RecRawStatSyncCb sync_cb,
RecRawStatBlock *rsb, int id);
int RecRawStatUpdateSum(RecRawStatBlock *rsb, int id);
diff --git a/lib/records/RecRawStats.cc b/lib/records/RecRawStats.cc
index c83d75c..a5706ef 100644
--- a/lib/records/RecRawStats.cc
+++ b/lib/records/RecRawStats.cc
@@ -379,28 +379,6 @@ RecRawStatSyncIntMsecsToFloatSeconds(const char *name,
RecDataT data_type, RecDa
return REC_ERR_OKAY;
}
-int
-RecRawStatSyncMHrTimeAvg(const char *name, RecDataT data_type, RecData *data,
RecRawStatBlock *rsb, int id)
-{
- RecRawStat total;
- RecFloat r;
-
- Debug("stats", "raw sync:mhr-timeavg for %s", name);
- raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
- total.count = rsb->global[id]->count;
-
- if (total.count == 0) {
- r = 0.0f;
- } else {
- r = (float)((double)total.sum / (double)total.count);
- r = r / (float)(HRTIME_MSECOND);
- }
-
- RecDataSetFromFloat(data_type, data, r);
- return REC_ERR_OKAY;
-}
-
//-------------------------------------------------------------------------
// RecSetRawStatXXX
//-------------------------------------------------------------------------
diff --git a/lib/records/test_I_RecLocal.cc b/lib/records/test_I_RecLocal.cc
index f5ba0ab..9bc006b 100644
--- a/lib/records/test_I_RecLocal.cc
+++ b/lib/records/test_I_RecLocal.cc
@@ -74,7 +74,6 @@ Test01()
{
g_config_update_result = 0;
printf("\n[Test01: Callback Tests]\n");
- int failures = 0;
printf(" [RecRegisterConfigUpdateCb]\n");
@@ -139,7 +138,6 @@ Test02()
{
g_config_update_result = 0;
printf("\n[Test02: Callback (Multi-lock) Test]\n");
- int failures = 0;
printf(" [RecRegisterConfigUpdateCb]\n");
diff --git a/lib/records/test_RecProcess.i b/lib/records/test_RecProcess.i
index 09ec08e..963c45d 100644
--- a/lib/records/test_RecProcess.i
+++ b/lib/records/test_RecProcess.i
@@ -187,7 +187,7 @@ Test02()
}
printf(" [RecGetRecordXXX]\n");
- failures = 0;
+
RecString rec_string = 0;
const int buf_len = 1024;
char buf[buf_len];
diff --git a/lib/records/test_RecTree.cc b/lib/records/test_RecTree.cc
index e8abef3..109ded1 100644
--- a/lib/records/test_RecTree.cc
+++ b/lib/records/test_RecTree.cc
@@ -21,8 +21,7 @@
limitations under the License.
*/
-#include "P_RecTree.h"
-#include "stdio.h"
+#include <stdio.h>
int
main(int argc, char **argv)
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index 0d9752c..1b4aa08 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -315,17 +315,6 @@ Alarms::clearUnSeen(char *ip)
return;
} /* End Alarms::clearUnSeen */
-/*
- * checkSystemNAlert(...)
- * This function should test the system and signal local alarms. Sending
- * out remote notification commands if necessary.
- */
-void
-Alarms::checkSystemNAlert()
-{
- return;
-} /* End Alarms::checkSystemNAlert */
-
void
Alarms::execAlarmBin(const char *desc)
{
diff --git a/mgmt/Alarms.h b/mgmt/Alarms.h
index 6e65e71..d42da31 100644
--- a/mgmt/Alarms.h
+++ b/mgmt/Alarms.h
@@ -84,7 +84,6 @@ public:
void resetSeenFlag(char *ip);
void clearUnSeen(char *ip);
- void checkSystemNAlert();
void execAlarmBin(const char *desc);
const char *getAlarmText(alarm_t id);
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index 2a0d3d7..c1b7477 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -188,7 +188,6 @@ LocalManager::processRunning()
LocalManager::LocalManager(bool proxy_on, bool listen) : BaseManager(),
run_proxy(proxy_on), listen_for_proxy(listen)
{
bool found;
- std::string rundir(RecConfigReadRuntimeDir());
std::string bindir(RecConfigReadBinDir());
std::string sysconfdir(RecConfigReadConfigDir());
diff --git a/mgmt/RecordsConfig.h b/mgmt/RecordsConfig.h
index c45cd3d..01ac4ef 100644
--- a/mgmt/RecordsConfig.h
+++ b/mgmt/RecordsConfig.h
@@ -49,5 +49,4 @@ struct RecordElement {
typedef void (*RecordElementCallback)(const RecordElement *, void *);
void RecordsConfigIterate(RecordElementCallback, void *);
-void LibRecordsConfigInit(); // initializes RecordsConfigIndex
-void RecordsConfigOverrideFromEnvironment(); // Override records from the
environment
+void LibRecordsConfigInit(); // initializes RecordsConfigIndex
diff --git a/mgmt/RecordsConfigUtils.cc b/mgmt/RecordsConfigUtils.cc
index f3d5366..e0dd8f8 100644
--- a/mgmt/RecordsConfigUtils.cc
+++ b/mgmt/RecordsConfigUtils.cc
@@ -25,39 +25,6 @@
#include "RecordsConfig.h"
//-------------------------------------------------------------------------
-// RecordsConfigOverrideFromEnvironment
-//-------------------------------------------------------------------------
-
-static void
-override_record(const RecordElement *record, void *)
-{
- if (REC_TYPE_IS_CONFIG(record->type)) {
- const char *value;
- RecData data = {0};
-
- if ((value = RecConfigOverrideFromEnvironment(record->name, nullptr))) {
- if (RecDataSetFromString(record->value_type, &data, value)) {
- // WARNING: If we are not the record owner, RecSetRecord() doesn't set
our copy
- // of the record. It sends a set message to the local manager. This
can cause
- // "interesting" results if you are trying to override configuration
values
- // early in startup (before we have synced with the local manager).
- RecSetRecord(record->type, record->name, record->value_type, &data,
nullptr, REC_SOURCE_ENV, false);
- RecDataZero(record->value_type, &data);
- }
- }
- }
-}
-
-// We process environment variable overrides when we parse the records.config
configuration file, but the
-// operator might choose to override a variable that is not present in
records.config so we have to post-
-// process the full set of configuration variables as well.
-void
-RecordsConfigOverrideFromEnvironment()
-{
- RecordsConfigIterate(override_record, nullptr);
-}
-
-//-------------------------------------------------------------------------
// LibRecordsConfigInit
//-------------------------------------------------------------------------
diff --git a/mgmt/api/EventCallback.cc b/mgmt/api/EventCallback.cc
index 59bdf93..289f22b 100644
--- a/mgmt/api/EventCallback.cc
+++ b/mgmt/api/EventCallback.cc
@@ -298,7 +298,7 @@ cb_table_unregister(CallbackTable *cb_table, const char
*event_name, TSEventSign
i = nullptr;
}
}
- } // end for (int i = 0; i < NUM_EVENTS; i++) {
+ } // end for (int i = 0; i < NUM_EVENTS; i++)
} else {
// unregister for specific event
int id = get_event_id(event_name);
diff --git a/plugins/authproxy/utils.cc b/plugins/authproxy/utils.cc
index 8199b03..e7cc443 100644
--- a/plugins/authproxy/utils.cc
+++ b/plugins/authproxy/utils.cc
@@ -27,42 +27,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-const void *
-SockaddrGetAddress(const sockaddr *saddr)
-{
- union {
- const sockaddr *sa;
- const sockaddr_in *sin;
- const sockaddr_in6 *sin6;
- } addr;
-
- addr.sa = saddr;
- if (addr.sa->sa_family == PF_INET6) {
- return &addr.sin6->sin6_addr;
- } else {
- TSReleaseAssert(addr.sin->sin_family == PF_INET);
- return &addr.sin->sin_addr;
- }
-}
-
-uint16_t
-SockaddrGetPort(const sockaddr *saddr)
-{
- union {
- const sockaddr *sa;
- const sockaddr_in *sin;
- const sockaddr_in6 *sin6;
- } addr;
-
- addr.sa = saddr;
- if (addr.sa->sa_family == PF_INET6) {
- return addr.sin6->sin6_port;
- } else {
- TSReleaseAssert(addr.sin->sin_family == PF_INET);
- return addr.sin->sin_port;
- }
-}
-
void
HttpDebugHeader(TSMBuffer mbuf, TSMLoc mhdr)
{
@@ -153,44 +117,4 @@ HttpIsChunkedEncoding(TSMBuffer mbuf, TSMLoc mhdr)
return ischunked;
}
-bool
-HttpGetOriginHost(TSMBuffer mbuf, TSMLoc mhdr, char *name, size_t namelen)
-{
- const char *host;
- int len;
- TSMLoc mloc;
-
- // First, try to get it from the Host header. The Host header this returns
- // depends on whether pristine_host_hdr is set.
- mloc = TSMimeHdrFieldFind(mbuf, mhdr, TS_MIME_FIELD_HOST, -1);
- if (mloc != TS_NULL_MLOC) {
- host = TSMimeHdrFieldValueStringGet(mbuf, mhdr, mloc, -1 /* index */,
&len);
- TSHandleMLocRelease(mbuf, mhdr, mloc);
-
- if (host) {
- AuthLogDebug("using origin %.*s from host header", len, host);
- len = std::min(len, (int)namelen - 1);
- memcpy(name, host, len);
- name[len] = '\0';
- return true;
- }
- }
-
- // If that didn't work, try to get the origin host from the request URL.
- if (TSHttpHdrUrlGet(mbuf, mhdr, &mloc) == TS_SUCCESS) {
- host = TSUrlHostGet(mbuf, mloc, &len);
- TSHandleMLocRelease(mbuf, mhdr, mloc);
-
- if (host) {
- AuthLogDebug("using origin %.*s from request URL", len, host);
- len = std::min(len, (int)namelen - 1);
- memcpy(name, host, len);
- name[len] = '\0';
- return true;
- }
- }
-
- return false;
-}
-
// vim: set ts=4 sw=4 et :
diff --git a/plugins/authproxy/utils.h b/plugins/authproxy/utils.h
index 72a5830..fae4b90 100644
--- a/plugins/authproxy/utils.h
+++ b/plugins/authproxy/utils.h
@@ -101,16 +101,7 @@ unsigned HttpGetContentLength(TSMBuffer mbuf, TSMLoc mhdr);
void HttpSetMimeHeader(TSMBuffer mbuf, TSMLoc mhdr, const char *name, const
char *value);
void HttpSetMimeHeader(TSMBuffer mbuf, TSMLoc mhdr, const char *name, unsigned
value);
-// Get the origin server name for the given request. Takes the URL and the Host
-// header into account (preferring the former).
-bool HttpGetOriginHost(TSMBuffer mbuf, TSMLoc mhdr, char *name, size_t
namelen);
-
// Dump the given HTTP header to the debug log.
void HttpDebugHeader(TSMBuffer mbuf, TSMLoc mhdr);
-// Return the sockaddr port (if any);
-uint16_t SockaddrGetPort(const sockaddr *saddr);
-// Return a pointer to the sockaddr address.
-const void *SockaddrGetAddress(const sockaddr *saddr);
-
// vim: set ts=4 sw=4 et :
diff --git a/plugins/cachekey/tests/pattern_test.cc
b/plugins/cachekey/tests/pattern_test.cc
index c5de31d..efefef8 100644
--- a/plugins/cachekey/tests/pattern_test.cc
+++ b/plugins/cachekey/tests/pattern_test.cc
@@ -58,7 +58,7 @@ main(int argc, char *argv[])
std::cout << "--- replace ---" << std::endl;
String r;
result = p.replace(subject, r);
- std::cout << "replacement result:'" << r << "'" << std::endl;
+ std::cout << "replacement result:'" << result << "'" << std::endl;
} else {
std::cout << "pattern: '" << pattern << "' failed to compile" << std::endl;
diff --git a/plugins/esi/esi.cc b/plugins/esi/esi.cc
index 1011618..9de1875 100644
--- a/plugins/esi/esi.cc
+++ b/plugins/esi/esi.cc
@@ -175,7 +175,7 @@ public:
{
g_stat_indices[handle] = TSStatCreate(Stats::STAT_NAMES[handle],
TS_RECORDDATATYPE_INT, TS_STAT_PERSISTENT, TS_STAT_SYNC_COUNT);
}
- // void increment(int handle, TSMgmtInt step = 1) {
+
void
increment(int handle, int step = 1)
{
diff --git a/plugins/esi/lib/EsiGzip.cc b/plugins/esi/lib/EsiGzip.cc
index 0786d59..35855f9 100644
--- a/plugins/esi/lib/EsiGzip.cc
+++ b/plugins/esi/lib/EsiGzip.cc
@@ -78,15 +78,6 @@ EsiGzip::stream_encode(const char *data, int data_len,
std::string &cdata)
cdata[2] = Z_DEFLATED;
cdata[9] = OS_TYPE;
- //_zstrm.zalloc = Z_NULL;
- //_zstrm.zfree = Z_NULL;
- //_zstrm.opaque = Z_NULL;
- // if (deflateInit2(&_zstrm, COMPRESSION_LEVEL, Z_DEFLATED, -MAX_WBITS,
- // ZLIB_MEM_LEVEL, Z_DEFAULT_STRATEGY) != Z_OK) {
- // _errorLog("[%s] deflateInit2 failed!", __FUNCTION__);
- // return false;
- //}
-
_crc = crc32(0, Z_NULL, 0);
}
diff --git a/plugins/experimental/cache_key_genid/cache_key_genid.c
b/plugins/experimental/cache_key_genid/cache_key_genid.c
index 020b4b1..5435b43 100644
--- a/plugins/experimental/cache_key_genid/cache_key_genid.c
+++ b/plugins/experimental/cache_key_genid/cache_key_genid.c
@@ -20,7 +20,7 @@
#include <ts/ts.h>
#include <stdio.h>
#include <string.h>
-#include "kclangc.h"
+#include <kclangc.h>
#define PLUGIN_NAME "cache-key-genid"
diff --git a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
index 28561e5..5c8f8d1 100644
--- a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
+++ b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
@@ -172,7 +172,6 @@ on_immediate(RequestData *req, TSCont &contp)
TSDebug(DEBUG_TAG, "continuation delayed, scheduling now..for url: %s",
req->req_url.c_str());
// add retry_done header to prevent looping
- std::string value;
TSMBuffer bufp;
TSMLoc hdr_loc;
if (TSHttpTxnClientRespGet(req->txnp, &bufp, &hdr_loc) != TS_SUCCESS) {
diff --git a/plugins/experimental/mysql_remap/mysql_remap.cc
b/plugins/experimental/mysql_remap/mysql_remap.cc
index 1cba55a..271873e 100644
--- a/plugins/experimental/mysql_remap/mysql_remap.cc
+++ b/plugins/experimental/mysql_remap/mysql_remap.cc
@@ -21,7 +21,8 @@
#include <cstdio>
#include <unistd.h>
-#include "mysql/mysql.h"
+#include <mysql/mysql.h>
+
#include "lib/iniparser.h"
#include "default.h"
diff --git a/plugins/experimental/sslheaders/sslheaders.cc
b/plugins/experimental/sslheaders/sslheaders.cc
index bbda70d..7e4b7cf 100644
--- a/plugins/experimental/sslheaders/sslheaders.cc
+++ b/plugins/experimental/sslheaders/sslheaders.cc
@@ -338,8 +338,3 @@ SslHdrInstance::~SslHdrInstance()
{
TSContDestroy(cont);
}
-
-void
-SslHdrInstance::register_hooks()
-{
-}
diff --git a/plugins/experimental/sslheaders/sslheaders.h
b/plugins/experimental/sslheaders/sslheaders.h
index 99f8fbd..571ea57 100644
--- a/plugins/experimental/sslheaders/sslheaders.h
+++ b/plugins/experimental/sslheaders/sslheaders.h
@@ -84,8 +84,6 @@ struct SslHdrInstance {
AttachOptions attach = SSL_HEADERS_ATTACH_SERVER;
TSCont cont;
- void register_hooks();
-
// noncopyable
SslHdrInstance(const SslHdrInstance &) = delete;
SslHdrInstance &operator=(const SslHdrInstance &) = delete;
diff --git a/plugins/regex_remap/regex_remap.cc
b/plugins/regex_remap/regex_remap.cc
index 28b5223..7c71f53 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -196,17 +196,6 @@ public:
{
return !_rex_string || !*_rex_string;
}
- inline const char *
- substitution() const
- {
- return _subst;
- }
- inline int
- substitutions_used() const
- {
- return _num_subs;
- }
-
inline TSHttpStatus
status_option() const
{
diff --git a/plugins/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
index c8debe8..f87dd51 100644
--- a/plugins/s3_auth/s3_auth.cc
+++ b/plugins/s3_auth/s3_auth.cc
@@ -78,7 +78,6 @@ loadRegionMap(StringMap &m, const String &filename)
std::ifstream ifstr;
String line;
- unsigned lineno = 0;
ifstr.open(path.c_str());
if (!ifstr) {
@@ -93,8 +92,6 @@ loadRegionMap(StringMap &m, const String &filename)
while (std::getline(ifstr, line)) {
String::size_type pos;
- ++lineno;
-
// Allow #-prefixed comments.
pos = line.find_first_of('#');
if (pos != String::npos) {
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index d41b56d..072c470 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -64,12 +64,6 @@ typedef ControlMatcher<CacheControlRecord,
CacheControlResult> CC_table;
static Ptr<ProxyMutex> reconfig_mutex;
CC_table *CacheControlTable = nullptr;
-void
-CC_delete_table()
-{
- delete CacheControlTable;
-}
-
// struct CC_FreerContinuation
// Continuation to free old cache control lists after
// a timeout
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 57c1869..1772280 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -763,7 +763,7 @@ ControlMatcher<Data, MatchResult>::Match(RequestData
*rdata, MatchResult *result
}
}
-// int ControlMatcher::BuildTable() {
+// int ControlMatcher::BuildTable()
//
// Reads the cache.config file and build the records array
// from it
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index e475284..3a10ffc 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -45,11 +45,6 @@
* *
***********************************************************************/
-// TODO: We should enable the creation and use of these WKS. XXXX
-#if 0
-static const char *cache_control_values[SIZEOF(cache_control_names)];
-#endif
-
const char *HTTP_METHOD_CONNECT;
const char *HTTP_METHOD_DELETE;
const char *HTTP_METHOD_GET;
@@ -276,13 +271,6 @@ http_init()
HTTP_LEN_S_MAXAGE =
hdrtoken_wks_to_length(HTTP_VALUE_S_MAXAGE);
HTTP_LEN_NEED_REVALIDATE_ONCE =
hdrtoken_wks_to_length(HTTP_VALUE_NEED_REVALIDATE_ONCE);
HTTP_LEN_100_CONTINUE =
hdrtoken_wks_to_length(HTTP_VALUE_100_CONTINUE);
-
-// TODO: We need to look into enable these CC values as WKS XXX
-#if 0
- for (int i = 0; i < (int) SIZEOF(cache_control_values); i++) {
- cache_control_values[i] = hdrtoken_string_to_wks(cache_control_names[i]);
- }
-#endif
}
}
diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index b8e8254..17578ba 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -814,7 +814,7 @@ Failed:
return -1;
}
-// bool HdrHeap::check_marshalled(char* buf, int buf_length) {
+// bool HdrHeap::check_marshalled(char* buf, int buf_length)
//
// Takes in marshalled buffer and verifies whether stuff appears
// to be sane. Returns true is sane. Returns false if corrupt
@@ -855,7 +855,7 @@ HdrHeap::check_marshalled(uint32_t buf_length)
// int HdrHeap::unmarshal(int buf_length, int obj_type,
// HdrHeapObjImpl** found_obj,
-// RefCountObj* block_ref) {
+// RefCountObj* block_ref)
//
// Takes a marshalled representation and swizzles offsets
// so they become live pointers and make the heap usable.
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index 6fe2d87..1684c1f 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -337,21 +337,6 @@ HdrTest::test_url()
}
}
-#if 0
- if (!failed) {
- Note("URL performance test start");
- for (int j = 0 ; j < 100000 ; ++j) {
- for (i = 0 ; i < countof(strs) ; ++i) {
- const char* x = strs[i];
- url.create(NULL);
- err = url.parse(x, strlen(x));
- url.destroy();
- }
- }
- Note("URL performance test end");
- }
-#endif
-
return (failures_to_status("test_url", failed));
}
@@ -985,23 +970,11 @@ HdrTest::test_http_hdr_copy_over_aux(int testnum, const
char *request, const cha
goto done;
}
-// The APIs for copying headers uses memcpy() which can be unsafe for
-// overlapping memory areas. It's unclear to me why these tests were
-// created in the first place honestly, since nothing else does this.
-#if 0
- /*** (4) Copying over yourself ***/
- copy1.copy(©1);
- comp_str = comp_http_hdr(&req_hdr, ©1);
- if (comp_str)
- goto done;
-
- copy2.copy(©2);
- comp_str = comp_http_hdr(&resp_hdr, ©2);
- if (comp_str)
- goto done;
-#endif
+ // The APIs for copying headers uses memcpy() which can be unsafe for
+ // overlapping memory areas. It's unclear to me why these tests were
+ // created in the first place honestly, since nothing else does this.
- /*** (5) Gender bending copying ***/
+ /*** (4) Gender bending copying ***/
copy1.copy(&resp_hdr);
comp_str = comp_http_hdr(&resp_hdr, ©1);
if (comp_str) {
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index 58f76d9..f28ed91 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -1525,12 +1525,7 @@ url_print(URLImpl *url, char *buf_start, int buf_length,
int *buf_index_inout, i
if (url->m_ptr_scheme) {
TRY((normalize ? mime_mem_print_lc : mime_mem_print)(url->m_ptr_scheme,
url->m_len_scheme, buf_start, buf_length,
buf_index_inout,
buf_chars_to_skip_inout));
- // [amc] Why is "file:" special cased to be wrong?
- // if ((url->m_scheme_wks_idx >= 0) &&
(hdrtoken_index_to_wks(url->m_scheme_wks_idx) == URL_SCHEME_FILE)) {
- // TRY(mime_mem_print(":", 1, buf_start, buf_length, buf_index_inout,
buf_chars_to_skip_inout));
- // } else {
TRY(mime_mem_print("://", 3, buf_start, buf_length, buf_index_inout,
buf_chars_to_skip_inout));
- // }
}
if (url->m_ptr_user) {
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 5751e2f..a530522 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -3231,11 +3231,6 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer
*c)
// successful keep-alive
close_connection = false;
}
- // else { the authenticated server connection (cache
- // authenticated feature) closed during the serve-from-cache.
- // We want the client to issue a new connection for the
- // session based authenticated mechanism like NTLM, instead
- // of still using the existing client connection. }
}
break;
case VC_EVENT_WRITE_READY:
@@ -3916,29 +3911,6 @@ HttpSM::tunnel_handler_plugin_agent(int event,
HttpTunnelConsumer *c)
}
int
-HttpSM::state_srv_lookup(int event, void *data)
-{
- STATE_ENTER(&HttpSM::state_srv_lookup, event);
-
- ink_assert(t_state.req_flavor == HttpTransact::REQ_FLAVOR_SCHEDULED_UPDATE ||
- t_state.req_flavor == HttpTransact::REQ_FLAVOR_REVPROXY ||
ua_entry->vc != nullptr);
-
- switch (event) {
- case EVENT_SRV_LOOKUP:
- pending_action = nullptr;
- process_srv_info((HostDBInfo *)data);
- break;
- case EVENT_SRV_IP_REMOVED:
- ink_assert(!"Unexpected SRV event from HostDB. What up, Eric?");
- break;
- default:
- ink_assert(!"Unexpected event");
- }
-
- return 0;
-}
-
-int
HttpSM::state_remap_request(int event, void * /* data ATS_UNUSED */)
{
STATE_ENTER(&HttpSM::state_remap_request, event);
@@ -6920,7 +6892,6 @@ HttpSM::kill_this()
#endif
SMDebug("http", "[%" PRId64 "] deallocating sm", sm_id);
- // authAdapter.destroyState();
destroy();
}
}
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index 829958b..be81331 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -352,7 +352,6 @@ protected:
public:
ProxyTransaction *ua_txn = nullptr;
BackgroundFill_t background_fill = BACKGROUND_FILL_NONE;
- // AuthHttpAdapter authAdapter;
void set_http_schedule(Continuation *);
int get_http_schedule(int event, void *data);
@@ -406,7 +405,6 @@ protected:
int state_read_client_request_header(int event, void *data);
int state_watch_for_client_abort(int event, void *data);
int state_read_push_response_header(int event, void *data);
- int state_srv_lookup(int event, void *data);
int state_hostdb_lookup(int event, void *data);
int state_hostdb_reverse_lookup(int event, void *data);
int state_mark_os_down(int event, void *data);
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 00e7c3b..2e708ec 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1735,6 +1735,7 @@ HttpTransact::OSDNSLookup(State *s)
if (s->cdn_remap_complete) {
TxnDebug("cdn", "This is a late DNS lookup. We are going to the OS, "
"not to HandleFiltering.");
+
ink_assert(s->cdn_saved_next_action == SM_ACTION_ORIGIN_SERVER_OPEN ||
s->cdn_saved_next_action == SM_ACTION_ORIGIN_SERVER_RAW_OPEN);
TxnDebug("cdn", "outgoing version -- (pre conversion) %d",
s->hdr_info.server_request.m_http->m_version);
@@ -1753,9 +1754,6 @@ HttpTransact::OSDNSLookup(State *s)
// 'AuthHttpAdapter' should do the rev-dns if needed, not here .
TRANSACT_RETURN(SM_ACTION_DNS_REVERSE_LOOKUP,
HttpTransact::StartAccessControl);
} else {
- //(s->state_machine->authAdapter).StartLookup (s);
- // TRANSACT_RETURN(SM_ACTION_AUTH_LOOKUP, NULL);
-
if (s->force_dns) {
StartAccessControl(s); // If skip_dns is enabled and no ip based rules
in cache.config and parent.config
// Access Control is called after DNS response
@@ -1786,29 +1784,12 @@ HttpTransact::OSDNSLookup(State *s)
void
HttpTransact::StartAccessControl(State *s)
{
- // if (s->cop_test_page || (s->state_machine->authAdapter.disabled() ==
true)) {
- // Heartbeats should always be allowed.
- // s->content_control.access = ACCESS_ALLOW;
HandleRequestAuthorized(s);
- // return;
- // }
- // ua_txn is NULL for scheduled updates.
- // Don't use req_flavor to do the test because if updated
- // urls are remapped, the req_flavor is changed to REV_PROXY.
- // if (s->state_machine->ua_txn == NULL) {
- // Scheduled updates should always be allowed
- // return;
- //}
- // pass the access control logic to the ACC module.
- //(s->state_machine->authAdapter).StartLookup(s);
}
void
HttpTransact::HandleRequestAuthorized(State *s)
{
- //(s->state_machine->authAdapter).SetState(s);
- //(s->state_machine->authAdapter).UserAuthorized(NULL);
- // TRANSACT_RETURN(HTTP_API_OS_DNS, HandleFiltering);
if (s->force_dns) {
TRANSACT_RETURN(SM_ACTION_API_OS_DNS, HttpTransact::DecideCacheLookup);
} else {
@@ -1817,34 +1798,6 @@ HttpTransact::HandleRequestAuthorized(State *s)
}
void
-HttpTransact::HandleFiltering(State *s)
-{
- ink_release_assert(!"Fix-Me AUTH MERGE");
-
- if (s->method == HTTP_WKSIDX_PUSH &&
s->http_config_param->push_method_enabled == 0) {
- // config file says this request is not authorized.
- // send back error response to client.
- TxnDebug("http_trans", "[HandleFiltering] access denied.");
- TxnDebug("http_seq", "[HttpTransact::HandleFiltering] Access Denied.");
-
- SET_VIA_STRING(VIA_DETAIL_TUNNEL, VIA_DETAIL_TUNNEL_NO_FORWARD);
- // adding a comment so that cvs recognizes that I added a space in the
text below
- build_error_response(s, HTTP_STATUS_FORBIDDEN, "Access Denied",
"access#denied");
- // s->cache_info.action = CACHE_DO_NO_ACTION;
- TRANSACT_RETURN(SM_ACTION_SEND_ERROR_CACHE_NOOP, nullptr);
- }
-
- TxnDebug("http_seq", "[HttpTransact::HandleFiltering] Request Authorized.");
- //////////////////////////////////////////////////////////////
- // ok, the config file says that the request is authorized. //
- //////////////////////////////////////////////////////////////
-
- // request is not black listed so now decided if we ought to
- // lookup the cache
- DecideCacheLookup(s);
-}
-
-void
HttpTransact::DecideCacheLookup(State *s)
{
// Check if a client request is lookupable.
@@ -4748,17 +4701,11 @@ HttpTransact::set_headers_for_cache_write(State *s,
HTTPInfo *cache_info, HTTPHd
// server 200 Ok for Range request
cache_info->request_get()->field_delete(MIME_FIELD_RANGE, MIME_LEN_RANGE);
- // If we're ignoring auth, then we don't want to cache WWW-Auth
- // headers
+ // If we're ignoring auth, then we don't want to cache WWW-Auth headers
if (s->txn_conf->cache_ignore_auth) {
cache_info->response_get()->field_delete(MIME_FIELD_WWW_AUTHENTICATE,
MIME_LEN_WWW_AUTHENTICATE);
}
- // if (s->cache_control.cache_auth_content && s->www_auth_content !=
CACHE_AUTH_NONE) {
- // decided to cache authenticated content because of cache.config
- // add one marker to the content in cache
- // cache_info->response_get()->value_set("@WWW-Auth", 9, "true", 4);
- //}
DUMP_HEADER("http_hdrs", cache_info->request_get(), s->state_machine_id,
"Cached Request Hdr");
}
@@ -5285,24 +5232,12 @@ HttpTransact::check_response_validity(State *s, HTTPHdr
*incoming_hdr)
if (!incoming_hdr->presence(MIME_PRESENCE_DATE)) {
incoming_hdr->set_date(s->current.now);
}
- // if (! incoming_hdr->get_reason_phrase()) {
- // return MISSING_REASON_PHRASE;
- // }
#ifdef REALLY_NEED_TO_CHECK_DATE_VALIDITY
if (incoming_hdr->presence(MIME_PRESENCE_DATE)) {
time_t date_value = incoming_hdr->get_date();
if (date_value <= 0) {
- // following lines commented out because of performance
- // concerns
- // if (s->http_config_param->errors_log_error_pages) {
- // const char *date_string =
- // incoming_hdr->value_get(MIME_FIELD_DATE);
- // Log::error ("Incoming response has bogus date value: %d:
%s",
- // date_value, date_string ? date_string :
"(null)");
- // }
-
TxnDebug("http_trans", "[check_response_validity] Bogus date in
response");
return BOGUS_OR_NO_DATE_IN_RESPONSE;
}
@@ -5437,23 +5372,6 @@ HttpTransact::handle_trace_and_options_requests(State
*s, HTTPHdr *incoming_hdr)
}
void
-HttpTransact::initialize_state_variables_for_origin_server(State *s, HTTPHdr
*incoming_request, bool second_time)
-{
- if (s->server_info.name && !second_time) {
- ink_assert(s->server_info.dst_addr.port() != 0);
- }
-
- int host_len;
- const char *host = incoming_request->host_get(&host_len);
- s->server_info.name = s->arena.str_store(host, host_len);
-
- if (second_time) {
- s->dns_info.attempts = 0;
- s->dns_info.lookup_name = s->server_info.name;
- }
-}
-
-void
HttpTransact::bootstrap_state_variables_from_request(State *s, HTTPHdr
*incoming_request)
{
s->current.now = s->client_request_time = ink_local_time();
@@ -6153,18 +6071,6 @@ HttpTransact::is_response_cacheable(State *s, HTTPHdr
*request, HTTPHdr *respons
// else no indication by cache control header
// continue to determine cacheability
- // if client contains Authorization header,
- // only cache if response has proper Cache-Control
- // if (s->www_auth_content == CACHE_AUTH_FRESH) {
- // response to the HEAD request
- // return false;
- //} else if (s->www_auth_content == CACHE_AUTH_TRUE ||
- // (s->www_auth_content == CACHE_AUTH_NONE &&
request->presence(MIME_PRESENCE_AUTHORIZATION))) {
- // if (!s->cache_control.cache_auth_content || response_code !=
HTTP_STATUS_OK || req_method != HTTP_WKSIDX_GET)
- // return false;
- //}
- // s->www_auth_content == CACHE_AUTH_STALE silently continues
-
if (response->presence(MIME_PRESENCE_EXPIRES)) {
TxnDebug("http_trans", "[is_response_cacheable] YES response w/ Expires");
return true;
@@ -6208,22 +6114,6 @@ HttpTransact::is_response_cacheable(State *s, HTTPHdr
*request, HTTPHdr *respons
I've moved this check to is_request_cache_lookupable().
We should consider this matter further. It is unclear
how many sites actually add Cache-Control headers for Authorized content.
-
- // if client contains Authorization header, only cache if response
- // has proper Cache-Control flags, as in RFC2068, section 14.8.
- if (request->field_presence(MIME_PRESENCE_AUTHORIZATION)) {
- // if (!
(response->is_cache_control_set(HTTP_VALUE_MUST_REVALIDATE)) &&
- // !
(response->is_cache_control_set(HTTP_VALUE_PROXY_REVALIDATE)) &&
- // ! (response->is_cache_control_set(HTTP_VALUE_PUBLIC))) {
-
- TxnDebug("http_trans", "[is_response_cacheable] request has
AUTHORIZATION - not cacheable");
- return(false);
- // }
- // else {
- // TxnDebug("http_trans","[is_response_cacheable] request has
AUTHORIZATION, "
- // "but response has a cache-control that allows caching");
- // }
- }
*/
}
@@ -6924,7 +6814,6 @@ HttpTransact::handle_response_keep_alive_headers(State
*s, HTTPVersion ver, HTTP
ink_assert(s->client_info.keep_alive != HTTP_NO_KEEPALIVE);
// This is a hack, we send the keep-alive header for both 1.0
// and 1.1, to be "compatible" with Akamai.
- // if (ver == HTTPVersion (1, 0)) {
heads->value_set(c_hdr_field_str, c_hdr_field_len, "keep-alive", 10);
// NOTE: if the version is 1.1 we don't need to do
// anything since keep-alive is assumed
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index a1f5b47..6c713d3 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -939,7 +939,6 @@ public:
static void Forbidden(State *s);
static void PostActiveTimeoutResponse(State *s);
static void PostInactiveTimeoutResponse(State *s);
- static void HandleFiltering(State *s);
static void DecideCacheLookup(State *s);
static void LookupSkipOpenServer(State *s);
@@ -1010,7 +1009,6 @@ public:
static bool handle_internal_request(State *s, HTTPHdr *incoming_hdr);
static bool handle_trace_and_options_requests(State *s, HTTPHdr
*incoming_hdr);
static void bootstrap_state_variables_from_request(State *s, HTTPHdr
*incoming_request);
- static void initialize_state_variables_for_origin_server(State *s, HTTPHdr
*incoming_request, bool second_time);
static void initialize_state_variables_from_request(State *s, HTTPHdr
*obsolete_incoming_request);
static void initialize_state_variables_from_response(State *s, HTTPHdr
*incoming_response);
static bool is_server_negative_cached(State *s);
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 56b574f..6faef9b 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -1034,11 +1034,6 @@ match_accept_content_language(const char *c_raw,
MIMEField *accept_field, bool *
return true;
} else if (does_language_range_match(a_range, c_raw)) {
*q = tq;
- // This is disabled, so removed max_a_range_length from prototype
- // if (*a_range_length > *max_a_range_length) {
- // *q = tq;
- // *max_a_range_length = *a_range_length;
- // }
return true;
} else {
}
diff --git a/proxy/http/HttpTransactHeaders.cc
b/proxy/http/HttpTransactHeaders.cc
index b6d62ef..eba9982 100644
--- a/proxy/http/HttpTransactHeaders.cc
+++ b/proxy/http/HttpTransactHeaders.cc
@@ -684,14 +684,6 @@
HttpTransactHeaders::insert_time_and_age_headers_in_response(ink_time_t request_
}
}
-void
-HttpTransactHeaders::insert_server_header_in_response(const char *server_tag,
int server_tag_size, HTTPHdr *h)
-{
- if (likely(server_tag && server_tag_size > 0 && h)) {
- h->set_server(server_tag, server_tag_size);
- }
-}
-
/// write the protocol stack to the @a via_string.
/// If @a detailed then do the full stack, otherwise just the "top level"
protocol.
/// Returns the number of characters appended to hdr_string (no nul appended).
@@ -935,35 +927,6 @@
HttpTransactHeaders::insert_via_header_in_response(HttpTransact::State *s, HTTPH
header->value_append(MIME_FIELD_VIA, MIME_LEN_VIA, new_via_string,
via_string - new_via_string, true);
}
-///////////////////////////////////////////////////////////////////////////////
-// Name: insert_basic_realm_in_proxy_authenticate
-// Description: insert Basic realm into Proxy-Authenticate based on
-// configuration
-// fix for INKqa09089
-///////////////////////////////////////////////////////////////////////////////
-void
-HttpTransactHeaders::insert_basic_realm_in_proxy_authenticate(const char
*realm, HTTPHdr *header, bool bRevPrxy)
-{
- char new_basic_realm[128];
- char *basic_realm;
-
- basic_realm = new_basic_realm;
- basic_realm += nstrcpy(basic_realm, "Basic realm=\"");
- basic_realm += nstrcpy(basic_realm, (char *)realm);
- *basic_realm++ = '"';
- *basic_realm = 0;
-
- MIMEField *auth;
- if (false == bRevPrxy) {
- auth = header->field_create(MIME_FIELD_PROXY_AUTHENTICATE,
MIME_LEN_PROXY_AUTHENTICATE);
- } else {
- auth = header->field_create(MIME_FIELD_WWW_AUTHENTICATE,
MIME_LEN_WWW_AUTHENTICATE);
- }
-
- header->field_value_set(auth, new_basic_realm, strlen(new_basic_realm));
- header->field_attach(auth);
-}
-
void
HttpTransactHeaders::remove_conditional_headers(HTTPHdr *outgoing)
{
diff --git a/proxy/http/HttpTransactHeaders.h b/proxy/http/HttpTransactHeaders.h
index 657340d..96b236a 100644
--- a/proxy/http/HttpTransactHeaders.h
+++ b/proxy/http/HttpTransactHeaders.h
@@ -74,7 +74,6 @@ public:
const char *warn_text = nullptr, int
warn_text_len = 0);
static void insert_time_and_age_headers_in_response(ink_time_t
request_sent_time, ink_time_t response_received_time,
ink_time_t now, HTTPHdr
*base, HTTPHdr *outgoing);
- static void insert_server_header_in_response(const char *server_tag, int
server_tag_size, HTTPHdr *header);
static void insert_via_header_in_request(HttpTransact::State *s, HTTPHdr
*header);
static void insert_via_header_in_response(HttpTransact::State *s, HTTPHdr
*header);
static void insert_hsts_header_in_response(HttpTransact::State *s, HTTPHdr
*header);
@@ -85,8 +84,6 @@ public:
static void normalize_accept_encoding(const OverridableHttpConfigParams
*ohcp, HTTPHdr *header);
- static void insert_basic_realm_in_proxy_authenticate(const char *realm,
HTTPHdr *header, bool bRevPrxy);
-
static void remove_conditional_headers(HTTPHdr *outgoing);
static void remove_100_continue_headers(HttpTransact::State *s, HTTPHdr
*outgoing);
static void remove_host_name_from_url(HTTPHdr *outgoing_request);
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index 91aa3e8..6fd8d83 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -117,32 +117,6 @@ UrlRewrite::SetReverseFlag(int flag)
}
}
-/**
- Allocaites via new, and adds a mapping like this map /ink/rh
- http://{backdoor}/ink/rh
-
- These {backdoor} things are then rewritten in a request-hdr hook. (In the
- future it might make sense to move the rewriting into HttpSM directly.)
-
-*/
-url_mapping *
-UrlRewrite::SetupBackdoorMapping()
-{
- const char from_url[] = "/ink/rh";
- const char to_url[] = "http://{backdoor}/ink/rh";;
-
- url_mapping *mapping = new url_mapping;
-
- mapping->fromURL.create(nullptr);
- mapping->fromURL.parse(from_url, sizeof(from_url) - 1);
- mapping->fromURL.scheme_set(URL_SCHEME_HTTP, URL_LEN_HTTP);
-
- mapping->toURL.create(nullptr);
- mapping->toURL.parse(to_url, sizeof(to_url) - 1);
-
- return mapping;
-}
-
/** Deallocated a hash table and all the url_mappings in it. */
void
UrlRewrite::_destroyTable(std::unique_ptr<URLTable> &h_table)
diff --git a/proxy/http/remap/UrlRewrite.h b/proxy/http/remap/UrlRewrite.h
index 84386ee..054e631 100644
--- a/proxy/http/remap/UrlRewrite.h
+++ b/proxy/http/remap/UrlRewrite.h
@@ -144,7 +144,6 @@ public:
};
void PerformACLFiltering(HttpTransact::State *s, url_mapping *mapping);
- url_mapping *SetupBackdoorMapping();
void PrintStore(MappingsStore &store);
void
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index 535f3a3..7d79cbe 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -662,13 +662,6 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t
*buf_start, const uint32_
return Http2ErrorCode::HTTP2_ERROR_PROTOCOL_ERROR;
}
}
- // Check whether header field name is lower case
- // This check should be here but it will fail because WKSs in MIMEField is
old fashioned.
- // for (uint32_t i = 0; i < len; ++i) {
- // if (ParseRules::is_upalpha(value[i])) {
- // return Http2ErrorCode::HTTP2_ERROR_PROTOCOL_ERROR;
- // }
- // }
}
// rfc7540,sec8.1.2.2: Any message containing connection-specific header
diff --git a/proxy/logging/LogFilter.cc b/proxy/logging/LogFilter.cc
index 685ccdb..4bdec48 100644
--- a/proxy/logging/LogFilter.cc
+++ b/proxy/logging/LogFilter.cc
@@ -851,15 +851,7 @@ LogFilterIP::toss_this_entry(LogAccess *lad)
bool
LogFilterIP::wipe_this_entry(LogAccess *)
{
-#if 0
- bool zret = WIPE_FIELD_VALUE == m_action && this->is_match(lad);
- if (zret) {
- // set to ADDR_ANY.
- }
- return zret;
-#else
return false;
-#endif
}
/*-------------------------------------------------------------------------
diff --git a/proxy/shared/DiagsConfig.cc b/proxy/shared/DiagsConfig.cc
index 98848ea..dc0e4b7 100644
--- a/proxy/shared/DiagsConfig.cc
+++ b/proxy/shared/DiagsConfig.cc
@@ -244,26 +244,6 @@ DiagsConfig::config_diags_norecords()
#endif
}
-void
-DiagsConfig::RegisterDiagConfig()
-{
- RecRegisterConfigInt(RECT_CONFIG, "proxy.config.diags.debug.enabled", 0,
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.debug.tags", "",
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigInt(RECT_CONFIG, "proxy.config.diags.action.enabled", 0,
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.action.tags", "",
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigInt(RECT_CONFIG, "proxy.config.diags.show_location", 1,
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.diag", "L",
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.debug", "L",
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.status",
"L", RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.note", "L",
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.warning",
"L", RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.error",
"SL", RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.fatal",
"SL", RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.alert", "L",
RECU_NULL, RECC_NULL, nullptr, REC_SOURCE_DEFAULT);
- RecRegisterConfigString(RECT_CONFIG, "proxy.config.diags.output.emergency",
"SL", RECU_NULL, RECC_NULL, nullptr,
- REC_SOURCE_DEFAULT);
-}
-
DiagsConfig::DiagsConfig(const char *prefix_string, const char *filename,
const char *tags, const char *actions, bool use_records)
: callbacks_established(false), diags_log(nullptr), diags(nullptr)
{
diff --git a/proxy/shared/DiagsConfig.h b/proxy/shared/DiagsConfig.h
index e76f2df..76877c9 100644
--- a/proxy/shared/DiagsConfig.h
+++ b/proxy/shared/DiagsConfig.h
@@ -30,7 +30,6 @@ struct DiagsConfig {
void reconfigure_diags();
void config_diags_norecords();
void parse_output_string(char *s, DiagsModeOutput *o);
- void RegisterDiagConfig();
void register_diags_callbacks();
DiagsConfig(const char *prefix_string, const char *filename, const char
*tags, const char *actions, bool use_records = true);
diff --git a/src/traffic_cache_tool/CacheDefs.cc
b/src/traffic_cache_tool/CacheDefs.cc
index 062cd42..6360014 100644
--- a/src/traffic_cache_tool/CacheDefs.cc
+++ b/src/traffic_cache_tool/CacheDefs.cc
@@ -950,11 +950,6 @@ Stripe::loadMeta()
delta = _meta_pos[A][FOOT] - _meta_pos[A][HEAD];
// Header B should be immediately after Footer A. If at the end of the
last read,
// do another read.
- // if (data.size() < CacheStoreBlocks::SCALE) {
- // pos += round_up(N);
- // n = Bytes(pread(fd, stripe_buff, CacheStoreBlocks::SCALE, pos));
- // data.assign(stripe_buff, n);
- // }
pos = this->_start + Bytes(vol_dirlen());
meta = static_cast<StripeMeta *>(data.data());
if (this->validateMeta(meta)) {
diff --git a/src/traffic_server/CoreUtils.cc b/src/traffic_server/CoreUtils.cc
index 0ae7ba3..9261afc 100644
--- a/src/traffic_server/CoreUtils.cc
+++ b/src/traffic_server/CoreUtils.cc
@@ -164,14 +164,6 @@ CoreUtils::find_vaddr(intptr_t vaddr, intptr_t upper,
intptr_t lower)
void
CoreUtils::insert_table(intptr_t vaddr1, intptr_t offset1, intptr_t fsize1)
{
-// TODO: What was this intended for??
-#if 0
- memTable m;
- m.vaddr = vaddr1;
- m.offset = offset1;
- m.fsize = fsize1;
-#endif
-
if (arrayMem.empty()) {
arrayMem.push_back({vaddr1, offset1, fsize1});
} else {
diff --git a/src/traffic_server/InkAPITest.cc b/src/traffic_server/InkAPITest.cc
index 08cecb6..4206a20 100644
--- a/src/traffic_server/InkAPITest.cc
+++ b/src/traffic_server/InkAPITest.cc
@@ -1967,22 +1967,6 @@ REGRESSION_TEST(SDK_API_TSCache)(RegressionTest *test,
int /* atype ATS_UNUSED *
TSCacheKeyDigestSet(key, key_name, strlen(key_name));
TSCacheKeyDigestSet(key_cmp, key_name, strlen(key_name));
-// TODO: This comparison makes no sense, since TSCacheKey is an opaque struct
-#if 0
- if (memcmp(key, key_cmp, sizeof(TSCacheKey)) != 0) {
- SDK_RPRINT(test, "TSCacheKeySetDigest", "TestCase1", TC_FAIL, "digest is
wrong");
-
- // no need to continue, return
- *pstatus = REGRESSION_TEST_FAILED;
- TSCacheKeyDestroy(key);
- TSCacheKeyDestroy(key_cmp);
- return;
- } else {
- SDK_RPRINT(test, "TSCacheKeySetDigest", "TestCase1", TC_PASS, "ok");
- TSCacheKeyDestroy(key_cmp);
- }
-#endif
-
// prepare caching content
// string, null-terminated.
for (int i = 0; i < (OBJECT_SIZE - 1); i++) {
@@ -7788,11 +7772,6 @@ transformable(TSHttpTxn txnp, TransformTestData *data)
if (TS_HTTP_STATUS_OK == TSHttpHdrStatusGet(bufp, hdr_loc)) {
ret = 1;
}
- // XXX - Can't return TS_ERROR because that is a different type
- // -bcall 7/24/07
- // if (resp_status == TS_ERROR) {
- //
SDK_RPRINT(data->test,"TSHttpTxnTransform","",TC_FAIL,"[transformable]:
TSHttpHdrStatusGet returns TS_ERROR");
- // }
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
return ret; /* not a 200 */
diff --git a/src/traffic_server/traffic_server.cc
b/src/traffic_server/traffic_server.cc
index 464b528..6d50bbb 100644
--- a/src/traffic_server/traffic_server.cc
+++ b/src/traffic_server/traffic_server.cc
@@ -771,17 +771,6 @@ cmd_check_internal(char * /* cmd ATS_UNUSED */, bool fix =
false)
printf("%s\n\n", n);
-#if 0
- printf("Host Database\n");
- HostDBCache hd;
- if (hd.start(fix) < 0) {
- printf("\tunable to open Host Database, %s failed\n", n);
- return CMD_OK;
- }
- hd.check("hostdb.config", fix);
- hd.reset();
-#endif
-
cacheProcessor.afterInitCallbackSet(&CB_cmd_cache_check);
if (cacheProcessor.start_internal(PROCESSOR_CHECK) < 0) {
printf("\nbad cache configuration, %s failed\n", n);
diff --git a/src/tscore/ink_sock.cc b/src/tscore/ink_sock.cc
index ccb5d99..9e562c5 100644
--- a/src/tscore/ink_sock.cc
+++ b/src/tscore/ink_sock.cc
@@ -124,25 +124,6 @@ safe_blocking(int fd)
}
int
-write_ready(int fd, int timeout_msec)
-{
- struct pollfd p;
- p.events = POLLOUT;
- p.fd = fd;
- int r = poll(&p, 1, timeout_msec);
- if (r <= 0) {
- return r;
- }
- if (p.revents & (POLLERR | POLLNVAL)) {
- return -1;
- }
- if (p.revents & (POLLOUT | POLLHUP)) {
- return 1;
- }
- return 0;
-}
-
-int
read_ready(int fd, int timeout_msec)
{
struct pollfd p;
diff --git a/src/tscore/unit_tests/test_List.cc
b/src/tscore/unit_tests/test_List.cc
index ad6dad0..c0cbb81 100644
--- a/src/tscore/unit_tests/test_List.cc
+++ b/src/tscore/unit_tests/test_List.cc
@@ -30,11 +30,6 @@ class Foo
public:
int x;
- void
- foo()
- {
- }
-
SLINK(Foo, slink);
LINK(Foo, dlink);
