You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2016/06/22 21:40:20 UTC
[trafficserver] branch 6.2.x updated (81faf97 -> cfd7bc0)
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a change to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git.
from 81faf97 Add tests for TS-3959
new e2ad1b6 Adding CHANGELOG-6.2.0
new e0c34ff TS-4534 Remove redundant comma-- to make the json actually valid (#715)
new 5482e17 TS-4527: Removing unneeded do_io_read and do_io_write that were cause error messages to be logged
new 251e5e9 [TS-4529] Adjust thread with the right continuation. This closes #703.
new b1ca1a9 TS-4560: Fix C++ API shared_ptr detection.
new 0c022bf TS-4560: Fix the out-of-tree build
new 8451d51 TS-4560: Add generated shared_ptr.h to gitignore.
new d4af235 TS-4543: Fix core in HttpSM::tunnel_handler_post. This closes #718.
new d7419a9 TS-4470: ASAN stack-buffer-overflow when slow log is enabled
new 8d9bfb3 TS-4470: ASAN stack-buffer-overflow when slow log is enabled Update to use offset
new 1034f6c TS-4571: Fix "pointer to local outside scope" (CID 1356978) (#727)
new fbbe33e TS-4568: Milestones where changed from seconds to milliseconds
new e384a7e TS-4565 Enables clang_format AlignConsecutiveAssignments
new cfd7bc0 TS-4565: Update code with new .clang-format config change
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.clang-format | 2 +-
.gitignore | 3 +-
CHANGELOG-6.2.0 | 200 +++++
build/plugins.mk | 2 +
cmd/traffic_cop/traffic_cop.cc | 92 +--
cmd/traffic_crashlog/procinfo.cc | 2 +-
cmd/traffic_crashlog/traffic_crashlog.cc | 24 +-
cmd/traffic_ctl/config.cc | 8 +-
cmd/traffic_ctl/server.cc | 2 +-
cmd/traffic_ctl/traffic_ctl.cc | 6 +-
cmd/traffic_line/traffic_line.cc | 46 +-
cmd/traffic_manager/MgmtHandlers.cc | 6 +-
cmd/traffic_manager/StatProcessor.cc | 26 +-
cmd/traffic_manager/StatType.cc | 54 +-
cmd/traffic_manager/WebOverview.cc | 40 +-
cmd/traffic_manager/metrics.cc | 4 +-
cmd/traffic_manager/traffic_manager.cc | 68 +-
cmd/traffic_top/stats.h | 40 +-
cmd/traffic_top/traffic_top.cc | 40 +-
cmd/traffic_via/traffic_via.cc | 26 +-
cmd/traffic_wccp/wccp_client.cc | 24 +-
configure.ac | 13 +-
example/add-header/add-header.c | 4 +-
example/append-transform/append-transform.c | 14 +-
example/basic-auth/basic-auth.c | 8 +-
example/blacklist-0/blacklist-0.c | 4 +-
example/blacklist-1/blacklist-1.c | 10 +-
example/bnull-transform/bnull-transform.c | 12 +-
example/cache-scan/cache-scan.cc | 28 +-
example/file-1/file-1.c | 4 +-
example/hello/hello.c | 4 +-
example/intercept/intercept.cc | 32 +-
example/lifecycle-plugin/lifecycle-plugin.c | 6 +-
example/null-transform/null-transform.c | 12 +-
example/output-header/output-header.c | 8 +-
example/protocol/Protocol.c | 4 +-
example/protocol/TxnSM.c | 98 +--
example/query-remap/query-remap.c | 8 +-
example/redirect-1/redirect-1.c | 32 +-
example/remap/remap.cc | 20 +-
example/remap_header_add/remap_header_add.cc | 8 +-
example/replace-header/replace-header.c | 4 +-
example/response-header-1/response-header-1.c | 6 +-
example/secure-link/secure-link.c | 6 +-
example/server-transform/server-transform.c | 68 +-
example/session-1/session-1.c | 8 +-
example/ssl-preaccept/ssl-preaccept.cc | 10 +-
example/ssl-sni-whitelist/ssl-sni-whitelist.cc | 12 +-
example/ssl-sni/ssl-sni.cc | 14 +-
example/thread-1/thread-1.c | 4 +-
example/thread-pool/psi.c | 82 +-
example/thread-pool/test/SDKTest/psi_server.c | 12 +-
example/thread-pool/thread.c | 24 +-
example/txn-data-sink/txn-data-sink.c | 12 +-
example/version/version.c | 4 +-
iocore/aio/AIO.cc | 90 +-
iocore/aio/test_AIO.cc | 132 +--
iocore/cache/Cache.cc | 490 +++++------
iocore/cache/CacheDir.cc | 170 ++--
iocore/cache/CacheDisk.cc | 104 +--
iocore/cache/CacheHosting.cc | 122 +--
iocore/cache/CacheHttp.cc | 4 +-
iocore/cache/CacheLink.cc | 18 +-
iocore/cache/CachePages.cc | 32 +-
iocore/cache/CachePagesInternal.cc | 8 +-
iocore/cache/CacheRead.cc | 146 ++--
iocore/cache/CacheTest.cc | 114 +--
iocore/cache/CacheVol.cc | 76 +-
iocore/cache/CacheWrite.cc | 202 ++---
iocore/cache/I_Cache.h | 20 +-
iocore/cache/I_CacheDefs.h | 26 +-
iocore/cache/I_Store.h | 4 +-
iocore/cache/P_CacheArray.h | 4 +-
iocore/cache/P_CacheDir.h | 2 +-
iocore/cache/P_CacheHosting.h | 6 +-
iocore/cache/P_CacheHttp.h | 4 +-
iocore/cache/P_CacheInternal.h | 46 +-
iocore/cache/P_CacheVol.h | 14 +-
iocore/cache/RamCacheCLFUS.cc | 86 +-
iocore/cache/RamCacheLRU.cc | 20 +-
iocore/cache/Store.cc | 80 +-
iocore/cluster/ClusterAPI.cc | 32 +-
iocore/cluster/ClusterCache.cc | 416 +++++-----
iocore/cluster/ClusterConfig.cc | 58 +-
iocore/cluster/ClusterHandler.cc | 254 +++---
iocore/cluster/ClusterHandlerBase.cc | 98 +--
iocore/cluster/ClusterHash.cc | 24 +-
iocore/cluster/ClusterLib.cc | 38 +-
iocore/cluster/ClusterLoadMonitor.cc | 16 +-
iocore/cluster/ClusterMachine.cc | 14 +-
iocore/cluster/ClusterProcessor.cc | 90 +-
iocore/cluster/ClusterRPC.cc | 24 +-
iocore/cluster/ClusterVConnection.cc | 56 +-
iocore/cluster/P_ClusterCache.h | 20 +-
iocore/cluster/P_ClusterCacheInternal.h | 28 +-
iocore/cluster/P_ClusterHandler.h | 120 +--
iocore/cluster/P_ClusterInline.h | 60 +-
iocore/cluster/P_ClusterInternal.h | 20 +-
iocore/cluster/P_TimeTrace.h | 2 +-
iocore/dns/DNS.cc | 164 ++--
iocore/dns/DNSConnection.cc | 12 +-
iocore/dns/P_DNSProcessor.h | 12 +-
iocore/dns/SplitDNS.cc | 32 +-
iocore/dns/test_P_DNS.cc | 8 +-
iocore/eventsystem/IOBuffer.cc | 32 +-
iocore/eventsystem/I_Event.h | 2 +-
iocore/eventsystem/I_IOBuffer.h | 2 +-
iocore/eventsystem/I_Lock.h | 26 +-
iocore/eventsystem/I_PriorityEventQueue.h | 4 +-
iocore/eventsystem/I_ProxyAllocator.h | 12 +-
iocore/eventsystem/I_Thread.h | 2 +-
iocore/eventsystem/PQ-List.cc | 10 +-
iocore/eventsystem/P_IOBuffer.h | 104 +--
iocore/eventsystem/P_UnixEThread.h | 38 +-
iocore/eventsystem/P_UnixEvent.h | 8 +-
iocore/eventsystem/P_UnixEventProcessor.h | 14 +-
iocore/eventsystem/P_UnixSocketManager.h | 4 +-
iocore/eventsystem/ProtectedQueue.cc | 8 +-
iocore/eventsystem/ProxyAllocator.cc | 10 +-
iocore/eventsystem/Thread.cc | 10 +-
iocore/eventsystem/UnixEThread.cc | 2 +-
iocore/eventsystem/UnixEvent.cc | 22 +-
iocore/eventsystem/UnixEventProcessor.cc | 10 +-
iocore/eventsystem/test_Buffer.cc | 4 +-
iocore/eventsystem/test_Event.cc | 4 +-
iocore/hostdb/HostDB.cc | 328 ++++----
iocore/hostdb/I_HostDBProcessor.h | 38 +-
iocore/hostdb/MultiCache.cc | 138 ++--
iocore/hostdb/P_HostDBProcessor.h | 14 +-
iocore/hostdb/P_MultiCache.h | 24 +-
iocore/hostdb/test_P_HostDB.cc | 8 +-
iocore/net/Connection.cc | 18 +-
iocore/net/I_Socks.h | 2 +-
iocore/net/Net.cc | 8 +-
iocore/net/NetTest-http-server.c | 8 +-
iocore/net/NetVCTest.cc | 30 +-
iocore/net/OCSPStapling.cc | 28 +-
iocore/net/P_LibBulkIO.h | 50 +-
iocore/net/P_SSLConfig.h | 4 +-
iocore/net/P_SSLNetVConnection.h | 14 +-
iocore/net/P_SSLUtils.h | 2 +-
iocore/net/P_Socks.h | 2 +-
iocore/net/P_UDPConnection.h | 10 +-
iocore/net/P_UDPIOEvent.h | 14 +-
iocore/net/P_UDPNet.h | 20 +-
iocore/net/P_UDPPacket.h | 18 +-
iocore/net/P_UnixCompletionUtil.h | 4 +-
iocore/net/P_UnixNet.h | 30 +-
iocore/net/P_UnixNetVConnection.h | 34 +-
iocore/net/P_UnixPollDescriptor.h | 2 +-
iocore/net/P_UnixUDPConnection.h | 10 +-
iocore/net/SSLCertLookup.cc | 14 +-
iocore/net/SSLClientUtils.cc | 12 +-
iocore/net/SSLConfig.cc | 76 +-
iocore/net/SSLNetAccept.cc | 6 +-
iocore/net/SSLNetVConnection.cc | 140 ++--
iocore/net/SSLNextProtocolAccept.cc | 2 +-
iocore/net/SSLNextProtocolSet.cc | 4 +-
iocore/net/SSLSessionCache.cc | 14 +-
iocore/net/SSLUtils.cc | 60 +-
iocore/net/Socks.cc | 54 +-
iocore/net/UnixConnection.cc | 12 +-
iocore/net/UnixNet.cc | 50 +-
iocore/net/UnixNetAccept.cc | 46 +-
iocore/net/UnixNetPages.cc | 14 +-
iocore/net/UnixNetProcessor.cc | 78 +-
iocore/net/UnixNetVConnection.cc | 124 +--
iocore/net/UnixUDPConnection.cc | 10 +-
iocore/net/UnixUDPNet.cc | 82 +-
iocore/net/test_I_Net.cc | 2 +-
iocore/net/test_P_Net.cc | 8 +-
iocore/net/test_certlookup.cc | 18 +-
iocore/utils/I_Machine.h | 4 +-
iocore/utils/Machine.cc | 10 +-
iocore/utils/OneWayMultiTunnel.cc | 24 +-
iocore/utils/OneWayTunnel.cc | 50 +-
.../examples/async_http_fetch/AsyncHttpFetch.cc | 2 +-
.../AsyncHttpFetchStreaming.cc | 2 +-
lib/atscppapi/examples/async_timer/AsyncTimer.cc | 10 +-
.../examples/clientrequest/ClientRequest.cc | 6 +-
.../GzipTransformationPlugin.cc | 4 +-
lib/atscppapi/examples/remap_plugin/RemapPlugin.cc | 4 +-
lib/atscppapi/src/AsyncHttpFetch.cc | 22 +-
lib/atscppapi/src/AsyncTimer.cc | 6 +-
lib/atscppapi/src/GlobalPlugin.cc | 4 +-
lib/atscppapi/src/GzipDeflateTransformation.cc | 18 +-
lib/atscppapi/src/GzipInflateTransformation.cc | 10 +-
lib/atscppapi/src/Headers.cc | 20 +-
lib/atscppapi/src/InterceptPlugin.cc | 14 +-
lib/atscppapi/src/Logger.cc | 12 +-
lib/atscppapi/src/Makefile.am | 5 +-
lib/atscppapi/src/Plugin.cc | 4 +-
lib/atscppapi/src/RemapPlugin.cc | 6 +-
lib/atscppapi/src/Request.cc | 10 +-
lib/atscppapi/src/Transaction.cc | 2 +-
lib/atscppapi/src/TransactionPlugin.cc | 4 +-
lib/atscppapi/src/TransformationPlugin.cc | 8 +-
.../src/include/atscppapi/AsyncHttpFetch.h | 2 +-
lib/atscppapi/src/include/atscppapi/HttpStatus.h | 98 +--
lib/atscppapi/src/include/atscppapi/Logger.h | 6 +-
.../atscppapi/{shared_ptr.h => shared_ptr.h.in} | 12 +-
lib/atscppapi/src/utils_internal.cc | 4 +-
lib/raft/raft.h | 4 +-
lib/raft/raft_impl.h | 60 +-
lib/raft/raft_test.cc | 24 +-
lib/records/I_RecDefs.h | 12 +-
lib/records/I_RecHttp.h | 4 +-
lib/records/P_RecCore.cc | 46 +-
lib/records/RecConfigParse.cc | 26 +-
lib/records/RecCore.cc | 70 +-
lib/records/RecFile.cc | 8 +-
lib/records/RecHttp.cc | 94 +--
lib/records/RecLocal.cc | 4 +-
lib/records/RecMessage.cc | 28 +-
lib/records/RecMutex.cc | 2 +-
lib/records/RecProcess.cc | 6 +-
lib/records/RecRawStats.cc | 34 +-
lib/records/RecUtils.cc | 18 +-
lib/ts/Allocator.h | 2 +-
lib/ts/Arena.cc | 8 +-
lib/ts/Arena.h | 4 +-
lib/ts/BaseLogFile.cc | 36 +-
lib/ts/BaseLogFile.h | 2 +-
lib/ts/Bitops.h | 10 +-
lib/ts/CompileParseRules.cc | 6 +-
lib/ts/Diags.cc | 56 +-
lib/ts/Diags.h | 2 +-
lib/ts/DynArray.h | 4 +-
lib/ts/EventNotify.cc | 2 +-
lib/ts/Hash.h | 2 +-
lib/ts/HashMD5.cc | 4 +-
lib/ts/HashSip.cc | 14 +-
lib/ts/HostLookup.cc | 86 +-
lib/ts/HostLookup.h | 2 +-
lib/ts/IntrusiveDList.h | 22 +-
lib/ts/IpMap.cc | 24 +-
lib/ts/IpMapConf.cc | 8 +-
lib/ts/IpMapTest.cc | 4 +-
lib/ts/Layout.cc | 26 +-
lib/ts/List.h | 40 +-
lib/ts/MMH.cc | 24 +-
lib/ts/Map.h | 52 +-
lib/ts/MatcherUtils.cc | 46 +-
lib/ts/ParseRules.cc | 14 +-
lib/ts/ParseRules.h | 4 +-
lib/ts/PriorityQueue.h | 4 +-
lib/ts/Ptr.h | 4 +-
lib/ts/RawHashTable.h | 8 +-
lib/ts/RbTree.cc | 50 +-
lib/ts/Regex.cc | 18 +-
lib/ts/Regex.h | 4 +-
lib/ts/Regression.cc | 22 +-
lib/ts/SimpleTokenizer.h | 16 +-
lib/ts/TestHttpHeader.cc | 4 +-
lib/ts/TextBuffer.cc | 18 +-
lib/ts/Tokenizer.cc | 46 +-
lib/ts/Trie.h | 14 +-
lib/ts/TsBuffer.h | 12 +-
lib/ts/Vec.cc | 8 +-
lib/ts/Vec.h | 34 +-
lib/ts/Version.cc | 2 +-
lib/ts/X509HostnameValidator.cc | 10 +-
lib/ts/apidefs.h.in | 315 ++++---
lib/ts/fastlz.c | 48 +-
lib/ts/ink_args.cc | 8 +-
lib/ts/ink_atomic.h | 2 +-
lib/ts/ink_base64.cc | 14 +-
lib/ts/ink_cap.cc | 16 +-
lib/ts/ink_cap.h | 6 +-
lib/ts/ink_config.h.in | 96 ++-
lib/ts/ink_defs.cc | 14 +-
lib/ts/ink_error.cc | 2 +-
lib/ts/ink_file.cc | 10 +-
lib/ts/ink_hash_table.cc | 10 +-
lib/ts/ink_hash_table.h | 6 +-
lib/ts/ink_hrtime.cc | 22 +-
lib/ts/ink_hrtime.h | 6 +-
lib/ts/ink_inet.cc | 30 +-
lib/ts/ink_inet.h | 28 +-
lib/ts/ink_memory.cc | 6 +-
lib/ts/ink_memory.h | 8 +-
lib/ts/ink_queue.cc | 50 +-
lib/ts/ink_queue_utils.cc | 2 +-
lib/ts/ink_rand.cc | 8 +-
lib/ts/ink_res_init.cc | 80 +-
lib/ts/ink_res_mkquery.cc | 36 +-
lib/ts/ink_resolver.h | 32 +-
lib/ts/ink_resource.cc | 8 +-
lib/ts/ink_rwlock.cc | 2 +-
lib/ts/ink_sock.cc | 10 +-
lib/ts/ink_sprintf.cc | 2 +-
lib/ts/ink_string++.cc | 8 +-
lib/ts/ink_string++.h | 32 +-
lib/ts/ink_string.cc | 10 +-
lib/ts/ink_string.h | 12 +-
lib/ts/ink_thread.h | 2 +-
lib/ts/ink_time.cc | 4 +-
lib/ts/llqueue.cc | 8 +-
lib/ts/load_http_hdr.cc | 20 +-
lib/ts/lockfile.cc | 6 +-
lib/ts/mkdfa.c | 46 +-
lib/ts/signals.cc | 6 +-
lib/ts/test_List.cc | 2 +-
lib/ts/test_PriorityQueue.cc | 4 +-
lib/ts/test_Vec.cc | 2 +-
lib/ts/test_X509HostnameValidator.cc | 14 +-
lib/ts/test_arena.cc | 12 +-
lib/ts/test_atomic.cc | 10 +-
lib/ts/test_freelist.cc | 2 +-
lib/wccp/Wccp.h | 26 +-
lib/wccp/WccpConfig.cc | 72 +-
lib/wccp/WccpEndPoint.cc | 90 +-
lib/wccp/WccpLocal.h | 52 +-
lib/wccp/WccpMsg.cc | 114 +--
lib/wccp/WccpStatic.cc | 12 +-
lib/wccp/WccpUtil.h | 2 +-
lib/wccp/wccp-test-router.cc | 16 +-
mgmt/Alarms.cc | 32 +-
mgmt/BaseManager.cc | 22 +-
mgmt/Cop.h | 6 +-
mgmt/FileManager.cc | 24 +-
mgmt/LocalManager.cc | 78 +-
mgmt/MgmtDefs.h | 10 +-
mgmt/MultiFile.cc | 20 +-
mgmt/ProcessManager.cc | 18 +-
mgmt/ProxyConfig.cc | 18 +-
mgmt/RecordsConfigUtils.cc | 10 +-
mgmt/Rollback.cc | 38 +-
mgmt/WebMgmtUtils.cc | 84 +-
mgmt/api/APITestCliRemote.cc | 104 +--
mgmt/api/CfgContextImpl.cc | 116 +--
mgmt/api/CfgContextImpl.h | 4 +-
mgmt/api/CfgContextManager.cc | 32 +-
mgmt/api/CfgContextUtils.cc | 158 ++--
mgmt/api/CoreAPI.cc | 16 +-
mgmt/api/CoreAPIRemote.cc | 86 +-
mgmt/api/CoreAPIShared.cc | 10 +-
mgmt/api/EventCallback.cc | 10 +-
mgmt/api/EventControlMain.cc | 14 +-
mgmt/api/GenericParser.cc | 26 +-
mgmt/api/INKMgmtAPI.cc | 302 +++----
mgmt/api/NetworkMessage.cc | 10 +-
mgmt/api/NetworkUtilsLocal.cc | 4 +-
mgmt/api/NetworkUtilsRemote.cc | 44 +-
mgmt/api/TSControlMain.cc | 80 +-
mgmt/api/include/mgmtapi.h | 4 +-
mgmt/cluster/ClusterCom.cc | 126 +--
mgmt/cluster/VMap.cc | 38 +-
mgmt/utils/ExpandingArray.cc | 4 +-
mgmt/utils/MgmtHashTable.h | 2 +-
mgmt/utils/MgmtMarshall.cc | 20 +-
mgmt/utils/MgmtSocket.cc | 6 +-
mgmt/utils/MgmtUtils.cc | 16 +-
mgmt/utils/test_marshall.cc | 44 +-
plugins/cacheurl/cacheurl.cc | 22 +-
plugins/conf_remap/conf_remap.cc | 12 +-
plugins/experimental/acme/acme.c | 18 +-
.../experimental/ats_pagespeed/ats_base_fetch.cc | 18 +-
.../ats_pagespeed/ats_beacon_intercept.cc | 14 +-
plugins/experimental/ats_pagespeed/ats_config.cc | 2 +-
.../experimental/ats_pagespeed/ats_pagespeed.cc | 108 +--
.../ats_pagespeed/ats_process_context.cc | 6 +-
.../ats_pagespeed/ats_resource_intercept.cc | 34 +-
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 2 +-
.../ats_pagespeed/ats_rewrite_options.cc | 14 +-
.../ats_pagespeed/gzip/configuration.cc | 6 +-
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 64 +-
plugins/experimental/ats_pagespeed/gzip/misc.cc | 14 +-
plugins/experimental/ats_pagespeed/gzip/misc.h | 10 +-
plugins/experimental/authproxy/authproxy.cc | 22 +-
plugins/experimental/authproxy/utils.cc | 4 +-
.../background_fetch/background_fetch.cc | 18 +-
plugins/experimental/background_fetch/configs.cc | 8 +-
plugins/experimental/background_fetch/headers.cc | 6 +-
plugins/experimental/background_fetch/rules.cc | 2 +-
plugins/experimental/balancer/balancer.cc | 4 +-
plugins/experimental/balancer/hash.cc | 2 +-
.../experimental/buffer_upload/buffer_upload.cc | 88 +-
.../experimental/cache_key_genid/cache_key_genid.c | 6 +-
.../experimental/cache_promote/cache_promote.cc | 14 +-
.../cache_range_requests/cache_range_requests.cc | 14 +-
plugins/experimental/cachekey/configs.cc | 2 +-
plugins/experimental/cachekey/pattern.cc | 20 +-
plugins/experimental/cachekey/pattern.h | 4 +-
.../experimental/channel_stats/channel_stats.cc | 22 +-
.../collapsed_connection/MurmurHash3.cc | 4 +-
.../collapsed_connection/collapsed_connection.cc | 98 +--
.../collapsed_forwarding/collapsed_forwarding.cc | 12 +-
.../custom_redirect/custom_redirect.cc | 12 +-
plugins/experimental/epic/epic.cc | 4 +-
plugins/experimental/escalate/escalate.cc | 2 +-
plugins/experimental/esi/combo_handler.cc | 54 +-
plugins/experimental/esi/esi.cc | 66 +-
plugins/experimental/esi/fetcher/HttpDataFetcher.h | 4 +-
.../esi/fetcher/HttpDataFetcherImpl.cc | 12 +-
.../experimental/esi/fetcher/HttpDataFetcherImpl.h | 10 +-
plugins/experimental/esi/lib/DocNode.h | 26 +-
plugins/experimental/esi/lib/EsiGunzip.cc | 22 +-
plugins/experimental/esi/lib/EsiGzip.cc | 14 +-
plugins/experimental/esi/lib/EsiParser.cc | 40 +-
plugins/experimental/esi/lib/EsiProcessor.cc | 26 +-
plugins/experimental/esi/lib/Expression.cc | 20 +-
plugins/experimental/esi/lib/FailureInfo.cc | 2 +-
plugins/experimental/esi/lib/FailureInfo.h | 6 +-
plugins/experimental/esi/lib/HandlerManager.cc | 2 +-
.../experimental/esi/lib/SpecialIncludeHandler.h | 2 +-
plugins/experimental/esi/lib/Stats.cc | 2 +-
plugins/experimental/esi/lib/Stats.h | 14 +-
plugins/experimental/esi/lib/Utils.cc | 22 +-
plugins/experimental/esi/lib/Variables.cc | 18 +-
plugins/experimental/esi/lib/Variables.h | 12 +-
plugins/experimental/esi/lib/gzip.cc | 28 +-
plugins/experimental/esi/lib/gzip.h | 6 +-
plugins/experimental/esi/serverIntercept.cc | 16 +-
.../experimental/esi/test/StubIncludeHandler.cc | 12 +-
.../experimental/esi/test/TestHandlerManager.cc | 2 +-
.../experimental/esi/test/TestHttpDataFetcher.h | 2 +-
plugins/experimental/esi/test/docnode_test.cc | 2 +-
plugins/experimental/esi/test/parser_test.cc | 6 +-
plugins/experimental/esi/test/processor_test.cc | 6 +-
plugins/experimental/esi/test/sampleProb.cc | 14 +-
plugins/experimental/generator/generator.cc | 14 +-
plugins/experimental/geoip_acl/acl.cc | 12 +-
plugins/experimental/geoip_acl/acl.h | 4 +-
.../header_normalize/header_normalize.cc | 150 ++--
plugins/experimental/hipes/hipes.cc | 24 +-
plugins/experimental/inliner/ats-inliner.cc | 10 +-
plugins/experimental/inliner/cache-handler.h | 12 +-
plugins/experimental/inliner/chunk-decoder.cc | 2 +-
plugins/experimental/inliner/fetcher.cc | 4 +-
plugins/experimental/inliner/fetcher.h | 4 +-
plugins/experimental/inliner/html-parser.cc | 2 +-
plugins/experimental/inliner/inliner-handler.cc | 4 +-
plugins/experimental/inliner/png.h | 6 +-
plugins/experimental/inliner/ts.cc | 6 +-
plugins/experimental/inliner/ts.h | 4 +-
plugins/experimental/memcache/protocol_binary.h | 98 +--
plugins/experimental/memcache/tsmemcache.cc | 132 +--
.../memcached_remap/memcached_remap.cc | 10 +-
plugins/experimental/metalink/metalink.cc | 20 +-
plugins/experimental/mp4/mp4.cc | 30 +-
plugins/experimental/mp4/mp4_common.h | 2 +-
plugins/experimental/mp4/mp4_meta.cc | 102 +--
plugins/experimental/multiplexer/Makefile.am | 2 +-
.../experimental/multiplexer/ats-multiplexer.cc | 2 +-
plugins/experimental/multiplexer/chunk-decoder.cc | 2 +-
plugins/experimental/multiplexer/dispatch.cc | 16 +-
plugins/experimental/multiplexer/fetcher.cc | 4 +-
plugins/experimental/multiplexer/fetcher.h | 4 +-
.../experimental/multiplexer/original-request.cc | 6 +-
plugins/experimental/multiplexer/ts.cc | 2 +-
plugins/experimental/mysql_remap/lib/dictionary.c | 12 +-
plugins/experimental/mysql_remap/lib/iniparser.c | 8 +-
plugins/experimental/mysql_remap/mysql_remap.cc | 18 +-
.../regex_revalidate/regex_revalidate.c | 62 +-
plugins/experimental/remap_stats/remap_stats.c | 24 +-
plugins/experimental/s3_auth/s3_auth.cc | 14 +-
.../experimental/ssl_cert_loader/domain-tree.cc | 32 +-
plugins/experimental/ssl_cert_loader/domain-tree.h | 8 +-
.../ssl_cert_loader/ssl-cert-loader.cc | 30 +-
plugins/experimental/sslheaders/expand.cc | 4 +-
plugins/experimental/sslheaders/sslheaders.cc | 4 +-
plugins/experimental/sslheaders/test_sslheaders.cc | 6 +-
.../stale_while_revalidate.c | 58 +-
.../experimental/stream_editor/stream_editor.cc | 46 +-
plugins/experimental/ts_lua/ts_lua.c | 34 +-
.../experimental/ts_lua/ts_lua_client_request.c | 4 +-
.../experimental/ts_lua/ts_lua_client_response.c | 6 +-
plugins/experimental/ts_lua/ts_lua_coroutine.c | 8 +-
plugins/experimental/ts_lua/ts_lua_crypto.c | 20 +-
plugins/experimental/ts_lua/ts_lua_fetch.c | 40 +-
plugins/experimental/ts_lua/ts_lua_http.c | 4 +-
plugins/experimental/ts_lua/ts_lua_http_cntl.c | 6 +-
plugins/experimental/ts_lua/ts_lua_http_config.c | 214 ++---
.../experimental/ts_lua/ts_lua_http_intercept.c | 18 +-
.../experimental/ts_lua/ts_lua_http_milestone.c | 42 +-
plugins/experimental/ts_lua/ts_lua_io.c | 4 +-
plugins/experimental/ts_lua/ts_lua_misc.c | 12 +-
plugins/experimental/ts_lua/ts_lua_package.c | 20 +-
plugins/experimental/ts_lua/ts_lua_remap.c | 8 +-
.../experimental/ts_lua/ts_lua_server_request.c | 2 +-
.../experimental/ts_lua/ts_lua_server_response.c | 4 +-
plugins/experimental/ts_lua/ts_lua_stat.c | 8 +-
plugins/experimental/ts_lua/ts_lua_transform.c | 28 +-
plugins/experimental/ts_lua/ts_lua_util.c | 44 +-
plugins/experimental/url_sig/url_sig.c | 30 +-
.../experimental/webp_transform/ImageTransform.cc | 4 +-
plugins/experimental/webp_transform/Makefile.am | 4 +-
plugins/experimental/xdebug/xdebug.cc | 12 +-
plugins/gzip/configuration.cc | 6 +-
plugins/gzip/gzip.cc | 70 +-
plugins/gzip/misc.cc | 12 +-
plugins/gzip/misc.h | 6 +-
plugins/header_rewrite/condition.h | 12 +-
plugins/header_rewrite/conditions.cc | 44 +-
plugins/header_rewrite/conditions.h | 4 +-
plugins/header_rewrite/expander.cc | 2 +-
plugins/header_rewrite/header_rewrite.cc | 12 +-
plugins/header_rewrite/header_rewrite_test.cc | 2 +-
plugins/header_rewrite/operator.h | 2 +-
plugins/header_rewrite/operators.cc | 24 +-
plugins/header_rewrite/parser.cc | 14 +-
plugins/header_rewrite/regex_helper.cc | 4 +-
plugins/header_rewrite/resources.cc | 4 +-
plugins/header_rewrite/resources.h | 8 +-
plugins/header_rewrite/ruleset.cc | 4 +-
plugins/header_rewrite/statement.cc | 6 +-
plugins/header_rewrite/value.h | 2 +-
plugins/healthchecks/healthchecks.c | 34 +-
plugins/libloader/libloader.c | 12 +-
plugins/regex_remap/regex_remap.cc | 64 +-
plugins/stats_over_http/stats_over_http.c | 16 +-
plugins/tcpinfo/tcpinfo.cc | 26 +-
proxy/AbstractBuffer.cc | 10 +-
proxy/CacheControl.cc | 62 +-
proxy/ControlBase.cc | 16 +-
proxy/ControlMatcher.cc | 46 +-
proxy/ControlMatcher.h | 4 +-
proxy/CoreUtils.cc | 144 ++--
proxy/Crash.cc | 10 +-
proxy/FetchSM.cc | 28 +-
proxy/FetchSM.h | 32 +-
proxy/ICP.cc | 214 ++---
proxy/ICP.h | 42 +-
proxy/ICPConfig.cc | 86 +-
proxy/ICPevents.h | 4 +-
proxy/IPAllow.cc | 22 +-
proxy/InkAPI.cc | 906 ++++++++++-----------
proxy/InkAPIInternal.h | 14 +-
proxy/InkAPITest.cc | 780 +++++++++---------
proxy/InkAPITestTool.cc | 52 +-
proxy/InkIOCoreAPI.cc | 18 +-
proxy/Main.cc | 68 +-
proxy/Milestones.h | 12 +-
proxy/ParentConsistentHash.cc | 48 +-
proxy/ParentConsistentHash.h | 2 +-
proxy/ParentRoundRobin.cc | 22 +-
proxy/ParentSelection.cc | 126 +--
proxy/ParentSelection.h | 6 +-
proxy/Plugin.cc | 14 +-
proxy/PluginVC.cc | 70 +-
proxy/PluginVC.h | 2 +-
proxy/Prefetch.cc | 164 ++--
proxy/Prefetch.h | 12 +-
proxy/ProtocolProbeSessionAccept.cc | 10 +-
proxy/ProxyClientSession.cc | 16 +-
proxy/ProxyClientSession.h | 2 +-
proxy/ProxyClientTransaction.cc | 8 +-
proxy/ProxyClientTransaction.h | 8 +-
proxy/RegressionSM.cc | 72 +-
proxy/ReverseProxy.cc | 2 +-
proxy/Show.h | 14 +-
proxy/SocksProxy.cc | 28 +-
proxy/StatPages.cc | 10 +-
proxy/StufferUdpReceiver.cc | 34 +-
proxy/TestClock.cc | 2 +-
proxy/TestClusterHash.cc | 14 +-
proxy/TestDNS.cc | 28 +-
proxy/TestPreProc.cc | 6 +-
proxy/TestProxy.cc | 34 +-
proxy/TestSimpleProxy.cc | 8 +-
proxy/TimeTrace.h | 2 +-
proxy/Transform.cc | 40 +-
proxy/UDPAPIClientTest.cc | 10 +-
proxy/UDPAPITest.cc | 12 +-
proxy/UnixCompletionUtil.h | 4 +-
proxy/api/ts/InkAPIPrivateIOCore.h | 2 +-
proxy/api/ts/experimental.h | 14 +-
proxy/api/ts/remap.h | 6 +-
proxy/api/ts/ts.h | 2 +-
proxy/congest/Congestion.cc | 114 +--
proxy/congest/Congestion.h | 2 +-
proxy/congest/CongestionDB.cc | 54 +-
proxy/congest/CongestionTest.cc | 20 +-
proxy/congest/MT_hashtable.h | 44 +-
proxy/hdrs/HTTP.cc | 286 +++----
proxy/hdrs/HTTP.h | 320 ++++----
proxy/hdrs/HdrHeap.cc | 124 +--
proxy/hdrs/HdrHeap.h | 86 +-
proxy/hdrs/HdrTSOnly.cc | 12 +-
proxy/hdrs/HdrTest.cc | 74 +-
proxy/hdrs/HdrToken.cc | 40 +-
proxy/hdrs/HdrToken.h | 16 +-
proxy/hdrs/HdrUtils.cc | 8 +-
proxy/hdrs/HdrUtils.h | 8 +-
proxy/hdrs/HttpCompat.cc | 96 +--
proxy/hdrs/MIME.cc | 688 ++++++++--------
proxy/hdrs/MIME.h | 40 +-
proxy/hdrs/URL.cc | 236 +++---
proxy/hdrs/load_http_hdr.cc | 26 +-
proxy/hdrs/test_header.cc | 30 +-
proxy/hdrs/test_urlhash.cc | 6 +-
proxy/http/Http1ClientSession.cc | 24 +-
proxy/http/Http1ClientTransaction.cc | 8 +-
proxy/http/HttpBodyFactory.cc | 76 +-
proxy/http/HttpCacheSM.cc | 20 +-
proxy/http/HttpCacheSM.h | 2 +-
proxy/http/HttpConfig.cc | 230 +++---
proxy/http/HttpConfig.h | 10 +-
proxy/http/HttpPages.cc | 18 +-
proxy/http/HttpPages.h | 2 +-
proxy/http/HttpProxyServerMain.cc | 24 +-
proxy/http/HttpSM.cc | 534 ++++++------
proxy/http/HttpSM.h | 26 +-
proxy/http/HttpServerSession.h | 4 +-
proxy/http/HttpSessionAccept.cc | 14 +-
proxy/http/HttpSessionManager.cc | 12 +-
proxy/http/HttpTransact.cc | 458 +++++------
proxy/http/HttpTransact.h | 162 ++--
proxy/http/HttpTransactCache.cc | 110 +--
proxy/http/HttpTransactHeaders.cc | 62 +-
proxy/http/HttpTunnel.cc | 118 +--
proxy/http/HttpTunnel.h | 12 +
proxy/http/HttpUpdateSM.cc | 10 +-
proxy/http/RegressionHttpTransact.cc | 2 +-
proxy/http/TestUrl.cc | 18 +-
proxy/http/remap/AclFiltering.cc | 8 +-
proxy/http/remap/AclFiltering.h | 4 +-
proxy/http/remap/RemapConfig.cc | 58 +-
proxy/http/remap/RemapPluginInfo.cc | 4 +-
proxy/http/remap/RemapPlugins.cc | 14 +-
proxy/http/remap/RemapProcessor.cc | 34 +-
proxy/http/remap/UrlMapping.cc | 24 +-
proxy/http/remap/UrlMapping.h | 6 +-
proxy/http/remap/UrlRewrite.cc | 48 +-
proxy/http/test_socket_close.cc | 44 +-
proxy/http2/HPACK.cc | 80 +-
proxy/http2/HTTP2.cc | 82 +-
proxy/http2/HTTP2.h | 92 +--
proxy/http2/Http2ClientSession.cc | 10 +-
proxy/http2/Http2ClientSession.h | 10 +-
proxy/http2/Http2ConnectionState.cc | 40 +-
proxy/http2/Http2ConnectionState.h | 24 +-
proxy/http2/Http2DependencyTree.h | 2 +-
proxy/http2/Http2SessionAccept.cc | 4 +-
proxy/http2/Http2Stream.cc | 38 +-
proxy/http2/Http2Stream.h | 6 +-
proxy/http2/HuffmanCodec.cc | 26 +-
proxy/http2/RegressionHPACK.cc | 18 +-
proxy/http2/test_Huffmancode.cc | 14 +-
proxy/logcat.cc | 20 +-
proxy/logging/Log.cc | 32 +-
proxy/logging/Log.h | 14 +-
proxy/logging/LogAccess.cc | 62 +-
proxy/logging/LogAccess.h | 2 +-
proxy/logging/LogAccessHttp.cc | 58 +-
proxy/logging/LogAccessICP.cc | 14 +-
proxy/logging/LogAccessTest.cc | 10 +-
proxy/logging/LogBuffer.cc | 84 +-
proxy/logging/LogBuffer.h | 2 +-
proxy/logging/LogCollationAccept.cc | 6 +-
proxy/logging/LogCollationClientSM.cc | 4 +-
proxy/logging/LogCollationHostSM.cc | 16 +-
proxy/logging/LogConfig.cc | 100 +--
proxy/logging/LogField.cc | 4 +-
proxy/logging/LogField.h | 4 +-
proxy/logging/LogFieldAliasMap.cc | 10 +-
proxy/logging/LogFieldAliasMap.h | 8 +-
proxy/logging/LogFile.cc | 22 +-
proxy/logging/LogFilter.cc | 38 +-
proxy/logging/LogFilter.h | 4 +-
proxy/logging/LogFormat.cc | 44 +-
proxy/logging/LogFormat.h | 2 +-
proxy/logging/LogHost.cc | 22 +-
proxy/logging/LogLimits.h | 4 +-
proxy/logging/LogObject.cc | 60 +-
proxy/logging/LogObject.h | 6 +-
proxy/logging/LogSock.cc | 28 +-
proxy/logging/LogSock.h | 22 +-
proxy/logging/LogStandalone.cc | 22 +-
proxy/logging/LogUtils.cc | 28 +-
proxy/logstats.cc | 124 +--
proxy/sac.cc | 6 +-
proxy/shared/DiagsConfig.cc | 42 +-
proxy/shared/InkXml.cc | 34 +-
proxy/shared/InkXml.h | 2 +-
proxy/shared/UglyLogStubs.cc | 20 +-
proxy/spdy/SpdyCallbacks.cc | 50 +-
proxy/spdy/SpdyClientSession.cc | 24 +-
proxy/spdy/SpdyCommon.cc | 26 +-
proxy/spdy/SpdySessionAccept.cc | 4 +-
proxy/test_xml_parser.cc | 6 +-
tools/http_load/http_load.c | 216 ++---
tools/http_load/timers.c | 52 +-
tools/jtest/jtest.cc | 588 ++++++-------
tools/lighttpd_mod_generator/mod_generator.c | 20 +-
686 files changed, 12685 insertions(+), 12481 deletions(-)
create mode 100644 CHANGELOG-6.2.0
rename lib/atscppapi/src/include/atscppapi/{shared_ptr.h => shared_ptr.h.in} (84%)
--
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].
[trafficserver] 03/14: TS-4527: Removing unneeded do_io_read and
do_io_write that were cause error messages to be logged
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 5482e17ae91908c91a0de63a68cc0885ea1603fe
Author: Bryan Call <bc...@apache.org>
AuthorDate: Tue Jun 14 10:24:20 2016 -0700
TS-4527: Removing unneeded do_io_read and do_io_write that were cause error
messages to be logged
(cherry picked from commit 029a9cce67ad5d1881789ce262ab8d79392db0bf)
---
proxy/http2/Http2ClientSession.h | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index 48e6c84..b0ddc69 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -180,13 +180,7 @@ public:
virtual void
release_netvc()
{
- // Make sure the vio's are also released to avoid
- // later surprises in inactivity timeout
- if (client_vc) {
- client_vc->do_io_read(NULL, 0, NULL);
- client_vc->do_io_write(NULL, 0, NULL);
- client_vc = NULL;
- }
+ client_vc = NULL;
}
sockaddr const *
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 02/14: TS-4534 Remove redundant comma-- to make the
json actually valid (#715)
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit e0c34ff6db3db2f2374200d1972c47aaf12a2fe6
Author: Thomas Jackson <ja...@gmail.com>
AuthorDate: Tue Jun 14 12:24:16 2016 -0700
TS-4534 Remove redundant comma-- to make the json actually valid (#715)
this closes #715
(cherry picked from commit 005ef6128cbdd915023221ef32f81d2dfa787d4f)
---
iocore/hostdb/HostDB.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index b0be662..ab1a7dd 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -2542,7 +2542,7 @@ struct ShowHostDB : public ShowCont {
CHECK_SHOW(show("\"%s\":\"%d\",", "port", r->data.srv.srv_port));
CHECK_SHOW(show("\"%s\":\"%x\",", "key", r->data.srv.key));
} else if (!r->is_srv) {
- CHECK_SHOW(show("\"%s\":\"%s\",", "ip", ats_ip_ntop(r->ip(), b, sizeof b)));
+ CHECK_SHOW(show("\"%s\":\"%s\"", "ip", ats_ip_ntop(r->ip(), b, sizeof b)));
}
// Let's display the MD5.
CHECK_SHOW(show("\"%s\":\"%0.16llx %0.8x %0.8x\"", "md5", r->md5_high, r->md5_low, r->md5_low_low));
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 01/14: Adding CHANGELOG-6.2.0
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit e2ad1b644c4326c451d786d91b084da96daf9902
Author: Phil Sorber <so...@apache.org>
AuthorDate: Wed Jun 8 14:24:50 2016 -0600
Adding CHANGELOG-6.2.0
---
CHANGELOG-6.2.0 | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 200 insertions(+)
diff --git a/CHANGELOG-6.2.0 b/CHANGELOG-6.2.0
new file mode 100644
index 0000000..9f9e82c
--- /dev/null
+++ b/CHANGELOG-6.2.0
@@ -0,0 +1,200 @@
+Changes with Apache Traffic Server 6.2.0
+
+Bug:
+ *) [TS-1007] SSN Close called before TXN Close
+ *) [TS-2449] I find INKUDPRecvFrom can not work .
+ *) [TS-3214] request is not forwarded to parent
+ *) [TS-3235] PluginVC crashed with unrecognized event
+ *) [TS-3429] TSContScheduleEvery does not increment event count correctly
+ *) [TS-3485] We should honor ip_allow.config ACLs for HTTP/2 streams
+ *) [TS-3584] SPDY and H2 requests should not trigger connection keep-alive processing
+ *) [TS-3645] After TS-3033, some traffic_line commands result in "requested command failed"
+ *) [TS-3857] Suppress a logging related error message to Note to avoid flooding.
+ *) [TS-3909] SSLNextProtocolTrampoline heap-use-after-free
+ *) [TS-3917] Sending only SETTINGS_INITIAL_WINDOW_SIZE in SETTINGS Frame
+ *) [TS-3949] Ignore timeout event on PluginVC after it's already closed.
+ *) [TS-3959] Dropped keep-alive connections not being re-established
+ *) [TS-3979] Deprecate allow empty doc cache setting.
+ *) [TS-4020] Cache_promote/background_fetch plugin LRU should use cachekey instead of url
+ *) [TS-4024] Wire tracing enhancements
+ *) [TS-4043] Prevent bogus FQDN characters in host header
+ *) [TS-4046] HdrHeap and HdrStrHeap leak in HttpTransact::EndRemapRequest
+ *) [TS-4048] Broken Vagrantfile in a lot of ways
+ *) [TS-4056] MemLeak: \uff5eNetAccept() do not free alloc_cache(vc)
+ *) [TS-4065] change metrics to counters where appropriate
+ *) [TS-4067] Memory leaks in parent selection regression tests
+ *) [TS-4074] build_* variables need to be escaped
+ *) [TS-4075] Segmentation fault due to reenable in SNI Hook for a closed ssl connection
+ *) [TS-4083] CID 1343347: Error handling issues in ts_lua_http.c
+ *) [TS-4096] ts_lua - ts.now() should return subsecond information
+ *) [TS-4101] remove proxy.config.stats.config_file
+ *) [TS-4104] wrong return value while create a new ticket on ssl_callback_session_ticket()
+ *) [TS-4105] RecDumpRecords passes the wrong record type to its callback
+ *) [TS-4107] proxy.process.ssl.total_success_handshake_count_in has wrong record type
+ *) [TS-4108] SSL metrics have wrong data type
+ *) [TS-4109] ts_lua plugin - ts.debug/ts.error problem with long string
+ *) [TS-4113] Docs: Add value 4 to proxy.config.http.cache.cache_responses_to_cookies
+ *) [TS-4117] Write tool to compare changes in configs/metrics between ATS versions
+ *) [TS-4135] C++ api coredumps when used with other plugins using TSHttpTxnRedirectUrlSet.
+ *) [TS-4136] incoming http connection stats should be correct regardless of the HTTP version
+ *) [TS-4142] Compile errors on OmniOS
+ *) [TS-4143] Validate host in GET URL
+ *) [TS-4145] ATS 6.0.0 - Address cross-site scripting exploits in error messages
+ *) [TS-4153] incorrect sphinx version check
+ *) [TS-4154] missing Cryptohash.h file
+ *) [TS-4157] traffic_via uses files names in it tests that are illegal on shared drives
+ *) [TS-4158] Fix a few plugins missing to release URL MLocs
+ *) [TS-4160] MLocRelease for txn buffers called too late in CPP API resulting buffer corruption
+ *) [TS-4161] ProcessManager prone to stack-overflow
+ *) [TS-4162] Http2ClientSession close connection by INACTIVITY_TIMEOUT event, even if the connection is still active
+ *) [TS-4165] Logging breaks if changing log format
+ *) [TS-4166] Memory leak in traffic_top
+ *) [TS-4168] Only close inactive and active connections that have a non-zero timeout
+ *) [TS-4170] Error receiving data frame on closed connection for HTTP/2
+ *) [TS-4175] unset INSTALL_BASE when installing
+ *) [TS-4177] Memory leak in LogFieldAliasTable
+ *) [TS-4178] Memory leak in SplitDNSConfig when shutting down
+ *) [TS-4181] Memory leak in aio threads when shutting down
+ *) [TS-4185] Request::getMethod does not return HTTP_METHOD_PUSH
+ *) [TS-4187] connections_currently_open stat not accurate with global server session pools
+ *) [TS-4188] Client initial window size is set incorrectly in HTTP/2
+ *) [TS-4190] Disabling LuaJIT in configure still builds portions with Lua
+ *) [TS-4191] Typo of debug tags setting name in Developer Guide
+ *) [TS-4196] Memory leak from main_thread on shutdown
+ *) [TS-4198] Excessive memory allocations from HostDB with huge tables enabled
+ *) [TS-4199] Parent Selection - parents not marked down due to race
+ *) [TS-4200] Wrong return value for TSHashTable::ExpansionPolicy
+ *) [TS-4201] OneWayTunnel::connection_closed callback handleEvent with wrong continuation
+ *) [TS-4202] missing define _HTTP_CONNECTION_COUNT_H_
+ *) [TS-4203] Multiple PD init/alloc in PollCont
+ *) [TS-4207] Crash in HostDB, likely a regression from 5.x
+ *) [TS-4208] The TOTAL from freelist memory debug dump is wrong
+ *) [TS-4209] Limit concurrent streams correctly
+ *) [TS-4212] Add option to track memory allocation with OpenSSL
+ *) [TS-4214] Fix incorrect HttpSM debug message
+ *) [TS-4222] Seg faults while processing ssl_multicert.config
+ *) [TS-4228] traffic_manager can hang in a tight read() loop
+ *) [TS-4229] proxy.config.http.cache.open_write_fail_action is not in the regression tests
+ *) [TS-4231] Coverity issues in inlined plugin: CID 1352204 and CID 1352203
+ *) [TS-4248] assertions triggered by metric type changes
+ *) [TS-4250] Clang-format breaks on Centos 6
+ *) [TS-4252] Some plugins are causing seg-faults when using getopt_long with optind = 1.
+ *) [TS-4257] Handle unset client request scheme in log field
+ *) [TS-4258] server_session should be NULL'd out after being closed.
+ *) [TS-4259] ua_session should not be NULL'd out if not closed
+ *) [TS-4266] ATS memory statistics shows that memory utilization is doubled after \u201ctraffic_ctlconfig reload\u201d. And it is fa...
+ *) [TS-4271] metrics fail to clear
+ *) [TS-4272] HostDB not clearing HostDBInfos for hosts file entries
+ *) [TS-4280] Refactor gzip plugin to eliminate memory leak and reduce global hooks
+ *) [TS-4282] Socket read failure isn't handled in AdminClient.pm
+ *) [TS-4296] Assertion in Epic plugin
+ *) [TS-4299] FetchSM / H2 streams can hang if e.g. a plugin adds a Connection: close header
+ *) [TS-4302] Compiler warnings on OmniOS w. gcc 5.1
+ *) [TS-4305] Coverity issues in geoip_acl plugin: 1353618, 1353617, 1353616, 1353615
+ *) [TS-4307] Check for existence of alloca.h consistently
+ *) [TS-4308] Coverity issues 1353631, 1353632, 1353633, 1353634
+ *) [TS-4310] Coverity issues 1353635, 1353636 and 1353637
+ *) [TS-4313] MIMEHdr fails to find header fields
+ *) [TS-4315] Mistype Conditional ? : Operator
+ *) [TS-4317] Cache recovery can stall, prevent disk from becoming ready.
+ *) [TS-4318] geoip_acl: regressions introduced with refactoring in acd06a7d230e7c8a
+ *) [TS-4321] H2 truncates certain contents on master
+ *) [TS-4323] Should the H2 DATA frame default to 16KB?
+ *) [TS-4327] Fix bug introduced with the addition of multi-site origin to parent selection.
+ *) [TS-4328] Connect_retries re-connects even if request made it to origin (TS-3440 repeat)
+ *) [TS-4329] Off-by-one error in NULL terminator for aname in hostdb
+ *) [TS-4340] `proxy.config.http.origin_max_connections` only matches on IP
+ *) [TS-4348] proxy.process.net.connections_currently_open does not match OS in terms of number of open connections
+ *) [TS-4355] Assert in HttpTunnel fails when access with HTTP/2
+ *) [TS-4378] Periodic warning from TSContInternal::destroy()
+ *) [TS-4387] Add enforcement of TSCont having MUTEX when passed to TSContSchedule()/TSContScheduleEvery()
+ *) [TS-4388] parent proxy crashes with TSHttpTxnParentProxySet
+ *) [TS-4397] Build on i386 fails due to lua_Integer type mismatch in traffic_manager metrics
+ *) [TS-4403] HostDB's "stale while revalidate" doesn't span failed DNS lookups
+ *) [TS-4406] The %<cqpv> log tag now always shows http/1.1
+ *) [TS-4410] Fix i386 compiler warning - unsigned-vs-signed comparison in hostdb.
+ *) [TS-4413] Fix potential consistent hash iterator race.
+ *) [TS-4420] crash on downed API parent
+ *) [TS-4427] traffic_logstats: Count TCP_MEM_HIT as a "normal" hit
+ *) [TS-4431] Atscppapi needs a mutex with intercept plugins
+ *) [TS-4436] ATS' tracking of host failures is broken for entries acquired through the hosts file
+ *) [TS-4440] ATS' missing StatsPages have incorrect content-type
+ *) [TS-4444] Segfault accessing NULL connection buffer reader
+ *) [TS-4445] HttpSM disables read eventing twice before settup up a tunnel binding
+ *) [TS-4461] Not closing client connections
+ *) [TS-4469] TS-3612 changes cause crashes with some plugins
+ *) [TS-4472] Number of active connections is incorrect
+ *) [TS-4473] Parent proxy test configuration race.
+ *) [TS-4477] Decrement proxy.process.http.current_client_transactions in HTTP/2
+ *) [TS-4478] AsyncHttpFetch hangs forever after ProxyClientSession changes
+ *) [TS-4485] MultiCache sync causes significant stalls to various in-flight requests
+ *) [TS-4489] Assert fails at Http2ConnectionState::delete_stream
+ *) [TS-4494] Assert fails at ink_code_md5_stringify with origin_max_connections
+
+Improvement:
+ *) [TS-1775] Cleanup of ink_hrtime.{cc,h}
+ *) [TS-3535] Add priority feature to the HTTP/2 implementation
+ *) [TS-3612] Restructure Proxy Client Sessions to support transaction oriented Sessions execute transaction hooks and connecti...
+ *) [TS-3863] Add support for ASAN leak detection
+ *) [TS-3922] Add independent WebSocket timeouts
+ *) [TS-4064] Customizable congestion control algorithms
+ *) [TS-4092] Decouple HPACK from HTTP/2
+ *) [TS-4094] Clean up RD type junk in ControlMatcher
+ *) [TS-4120] Doc: proxy.config.http.response_server_str default value includes version
+ *) [TS-4122] Doc: Add proxy.config.http.response_via_str
+ *) [TS-4123] Doc: Fix image URLs in the Security page
+ *) [TS-4133] Update url_sig plugin to pass application query parameters
+ *) [TS-4137] Improve stripe inspector diagnostic output
+ *) [TS-4144] Add custom error response support in RemapPlugin of cppapi
+ *) [TS-4147] Allow gzip plugin to be a remap plugin
+ *) [TS-4148] Add a log field for connection attempts made to origin
+ *) [TS-4164] Update clang-format binaries and configs
+ *) [TS-4169] tsxs utility and .lo files on input
+ *) [TS-4172] Cleanup debug logs of Http2ConnectionState
+ *) [TS-4176] s3_auth plugin matrix parameters support
+ *) [TS-4180] support for serving multiple intermediate cert chains
+ *) [TS-4183] cachekey: URI and URI path capture/replacement
+ *) [TS-4197] Add memory debugging
+ *) [TS-4211] Allocate only what we need for debugging
+ *) [TS-4230] support matrix style parameters in ts_lua plugin
+ *) [TS-4235] Deprecate fuzzy cache revalidation ?
+ *) [TS-4253] Better debug messages in ssl_read_from_net()
+ *) [TS-4255] remove StatSystem metrics
+ *) [TS-4261] Split statistic update logic from process handling.
+ *) [TS-4267] HTTP/2 Updates to debugging
+ *) [TS-4283] Remove some remnant comments and code from 64-bit conversion
+ *) [TS-4284] Modernize the geoip_acl plugin
+ *) [TS-4285] Add support for overriding proxy.config.http.attach_server_session_to_client
+ *) [TS-4288] Better error handling of invalid qualifier strings in header_rewrite plugin
+ *) [TS-4290] Cleanup header_rewrite, such that we don't pollute the statement base class
+ *) [TS-4295] Add Priority Queue in lib/ts/
+ *) [TS-4298] Breakdown parameter checks in Http2::init()
+ *) [TS-4339] Remove .pr file
+ *) [TS-4359] Deprecate the SPDY protocol
+ *) [TS-4361] Remove TS_FETCH_EVENT_* handlers from Http2ClientSession
+ *) [TS-4364] Remove some remnants from http/2 refactoring
+ *) [TS-4401] Make some more configurations overridable
+ *) [TS-4418] Change .clang-format to allow ConstructorInitializerAllOnOneLineOrOnePerLine
+ *) [TS-4486] Add release method to MutexLock
+
+New Feature:
+ *) [TS-2642] header_rewrite Time based Rules
+ *) [TS-3123] Make proxy.config.http.transaction_active_timeout_in overridable
+ *) [TS-3639] Add GeoIP info to header_rewrite plugin
+ *) [TS-4087] H2 flexible resource limitation
+ *) [TS-4095] New cppapi plugin for converting image formats to wepb
+ *) [TS-4099] replace XML statistics with Lua
+ *) [TS-4115] Add a multi origin hierarchy to parent selection.
+ *) [TS-4129] Support TSContSchedule in ts_lua plugin
+ *) [TS-4132] Open source Yahoo's ats-inliner plug-in
+ *) [TS-4243] Collapsed Forwarding Plugin
+ *) [TS-4256] fix abort with ats-inliner plug-in
+ *) [TS-4287] Add a simple and unavailable server retry feature to Parent Selection.
+ *) [TS-4297] A script to compare two memory/freelist dumps
+ *) [TS-4320] Implement a letsencrypt / ACME plugin for ATS
+ *) [TS-4369] add VIA_ERROR_MOVED_TEMPORARILY to deal with redirect by remapping correctly for instrumentation (logging, metrics)
+ *) [TS-4476] CLONE - Make proxy.config.http.transaction_active_timeout_in overridable
+
+Task:
+ *) [TS-4356] Deprecate cacheurl plugin
+ *) [TS-4428] Update Japanese documentations
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 07/14: TS-4560: Add generated shared_ptr.h to
gitignore.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 8451d51b3e8295cfd3b637611d6fdca26eda9069
Author: James Peach <jp...@apache.org>
AuthorDate: Tue Jun 21 09:02:55 2016 -0700
TS-4560: Add generated shared_ptr.h to gitignore.
(cherry picked from commit 647469508a73713cda83e02142df005fb5f68810)
---
.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index af55f7b..c3d024a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -140,9 +140,10 @@ GTAGS
ETAGS
CTAGS
+lib/atscppapi/src/include/atscppapi/shared_ptr.h
lib/tsconfig/TsConfigGrammar.hpp
-lib/tsconfig/test-tsconfig
lib/tsconfig/TsConfigSyntax.c
+lib/tsconfig/test-tsconfig
tools/http_load/http_load
tools/jtest/jtest
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 11/14: TS-4571: Fix "pointer to local outside
scope" (CID 1356978) (#727)
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 1034f6cc764104457f31b6c4369c28bce8241fa5
Author: Phil Sorber <so...@apache.org>
AuthorDate: Wed Jun 22 14:43:23 2016 -0600
TS-4571: Fix "pointer to local outside scope" (CID 1356978) (#727)
(cherry picked from commit 0597cfefed63ec29fd210953226da89b25bf9f15)
---
proxy/ParentSelection.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index 41ccef5..d6626c8 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -534,6 +534,7 @@ ParentRecord::Init(matcher_line *line_info)
char *val;
bool used = false;
ParentRR_t round_robin = P_NO_ROUND_ROBIN;
+ char buf[128];
this->line_num = line_info->line_num;
this->scheme = NULL;
@@ -613,8 +614,8 @@ ParentRecord::Init(matcher_line *line_info)
max_simple_retries = v;
used = true;
} else {
- char buf[128];
- sprintf(buf, "invalid argument to max_simple_retries. Argument must be between 1 and %d.", MAX_SIMPLE_RETRIES);
+ snprintf(buf, sizeof(buf), "invalid argument to max_simple_retries. Argument must be between 1 and %d.",
+ MAX_SIMPLE_RETRIES);
errPtr = buf;
}
} else if (strcasecmp(label, "max_unavailable_server_retries") == 0) {
@@ -623,9 +624,8 @@ ParentRecord::Init(matcher_line *line_info)
max_unavailable_server_retries = v;
used = true;
} else {
- char buf[128];
- sprintf(buf, "invalid argument to max_unavailable_server_retries. Argument must be between 1 and %d.",
- MAX_UNAVAILABLE_SERVER_RETRIES);
+ snprintf(buf, sizeof(buf), "invalid argument to max_unavailable_server_retries. Argument must be between 1 and %d.",
+ MAX_UNAVAILABLE_SERVER_RETRIES);
errPtr = buf;
}
}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 04/14: [TS-4529] Adjust thread with the right
continuation. This closes #703.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 251e5e95a4e56f33f1ca30be3ea2fbb82234dcfa
Author: David Calavera <da...@gmail.com>
AuthorDate: Mon Jun 13 09:49:15 2016 -0700
[TS-4529] Adjust thread with the right continuation. This closes #703.
Signed-off-by: David Calavera <da...@gmail.com>
(cherry picked from commit bb4d873356a7760044f026c09811ae41134fc751)
---
proxy/ProxyClientTransaction.cc | 4 ++--
proxy/ProxyClientTransaction.h | 2 +-
proxy/http/HttpSM.cc | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/proxy/ProxyClientTransaction.cc b/proxy/ProxyClientTransaction.cc
index 067bb93..f33f712 100644
--- a/proxy/ProxyClientTransaction.cc
+++ b/proxy/ProxyClientTransaction.cc
@@ -86,13 +86,13 @@ ProxyClientTransaction::attach_server_session(HttpServerSession *ssession, bool
}
Action *
-ProxyClientTransaction::adjust_thread(int event, void *data)
+ProxyClientTransaction::adjust_thread(Continuation *cont, int event, void *data)
{
NetVConnection *vc = this->get_netvc();
EThread *this_thread = this_ethread();
if (vc && vc->thread != this_thread) {
if (vc->thread->is_event_type(ET_NET) || vc->thread->is_event_type(SSLNetProcessor::ET_SSL)) {
- return vc->thread->schedule_imm(this, event, data);
+ return vc->thread->schedule_imm(cont, event, data);
} else { // Not a net thread, take over this thread
vc->thread = this_thread;
}
diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyClientTransaction.h
index e724aaf..f2bbcb9 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyClientTransaction.h
@@ -51,7 +51,7 @@ public:
// See if we need to schedule on the primary thread for the transaction or change the thread that is associated with the VC.
// If we reschedule, the scheduled action is returned. Otherwise, NULL is returned
- Action *adjust_thread(int event, void *data);
+ Action *adjust_thread(Continuation *cont, int event, void *data);
int
get_transact_count() const
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 2996250..8237a56 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2456,7 +2456,7 @@ HttpSM::state_cache_open_write(int event, void *data)
// Make sure we are on the "right" thread
if (ua_session) {
- if ((pending_action = ua_session->adjust_thread(event, data))) {
+ if ((pending_action = ua_session->adjust_thread(this, event, data))) {
return 0; // Go away if we reschedule
}
}
@@ -4664,7 +4664,7 @@ HttpSM::do_http_server_open(bool raw)
// Make sure we are on the "right" thread
if (ua_session) {
- if ((pending_action = ua_session->adjust_thread(EVENT_INTERVAL, NULL))) {
+ if ((pending_action = ua_session->adjust_thread(this, EVENT_INTERVAL, NULL))) {
return; // Go away if we reschedule
}
}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 14/14: TS-4565: Update code with new .clang-format
config change
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit cfd7bc06e0a2b49877f39ad1f260e1be91346954
Author: Phil Sorber <so...@apache.org>
AuthorDate: Wed Jun 22 15:12:11 2016 -0600
TS-4565: Update code with new .clang-format config change
---
cmd/traffic_cop/traffic_cop.cc | 92 +--
cmd/traffic_crashlog/procinfo.cc | 2 +-
cmd/traffic_crashlog/traffic_crashlog.cc | 24 +-
cmd/traffic_ctl/config.cc | 8 +-
cmd/traffic_ctl/server.cc | 2 +-
cmd/traffic_ctl/traffic_ctl.cc | 6 +-
cmd/traffic_line/traffic_line.cc | 46 +-
cmd/traffic_manager/MgmtHandlers.cc | 6 +-
cmd/traffic_manager/StatProcessor.cc | 26 +-
cmd/traffic_manager/StatType.cc | 54 +-
cmd/traffic_manager/WebOverview.cc | 40 +-
cmd/traffic_manager/metrics.cc | 4 +-
cmd/traffic_manager/traffic_manager.cc | 68 +-
cmd/traffic_top/stats.h | 40 +-
cmd/traffic_top/traffic_top.cc | 40 +-
cmd/traffic_via/traffic_via.cc | 26 +-
cmd/traffic_wccp/wccp_client.cc | 24 +-
example/add-header/add-header.c | 4 +-
example/append-transform/append-transform.c | 14 +-
example/basic-auth/basic-auth.c | 8 +-
example/blacklist-0/blacklist-0.c | 4 +-
example/blacklist-1/blacklist-1.c | 10 +-
example/bnull-transform/bnull-transform.c | 12 +-
example/cache-scan/cache-scan.cc | 28 +-
example/file-1/file-1.c | 4 +-
example/hello/hello.c | 4 +-
example/intercept/intercept.cc | 32 +-
example/lifecycle-plugin/lifecycle-plugin.c | 6 +-
example/null-transform/null-transform.c | 12 +-
example/output-header/output-header.c | 8 +-
example/protocol/Protocol.c | 4 +-
example/protocol/TxnSM.c | 98 +--
example/query-remap/query-remap.c | 8 +-
example/redirect-1/redirect-1.c | 32 +-
example/remap/remap.cc | 20 +-
example/remap_header_add/remap_header_add.cc | 8 +-
example/replace-header/replace-header.c | 4 +-
example/response-header-1/response-header-1.c | 6 +-
example/secure-link/secure-link.c | 6 +-
example/server-transform/server-transform.c | 68 +-
example/session-1/session-1.c | 8 +-
example/ssl-preaccept/ssl-preaccept.cc | 10 +-
example/ssl-sni-whitelist/ssl-sni-whitelist.cc | 12 +-
example/ssl-sni/ssl-sni.cc | 14 +-
example/thread-1/thread-1.c | 4 +-
example/thread-pool/psi.c | 82 +-
example/thread-pool/test/SDKTest/psi_server.c | 12 +-
example/thread-pool/thread.c | 24 +-
example/txn-data-sink/txn-data-sink.c | 12 +-
example/version/version.c | 4 +-
iocore/aio/AIO.cc | 90 +-
iocore/aio/test_AIO.cc | 132 +--
iocore/cache/Cache.cc | 490 +++++------
iocore/cache/CacheDir.cc | 170 ++--
iocore/cache/CacheDisk.cc | 104 +--
iocore/cache/CacheHosting.cc | 122 +--
iocore/cache/CacheHttp.cc | 4 +-
iocore/cache/CacheLink.cc | 18 +-
iocore/cache/CachePages.cc | 32 +-
iocore/cache/CachePagesInternal.cc | 8 +-
iocore/cache/CacheRead.cc | 146 ++--
iocore/cache/CacheTest.cc | 114 +--
iocore/cache/CacheVol.cc | 76 +-
iocore/cache/CacheWrite.cc | 202 ++---
iocore/cache/I_Cache.h | 20 +-
iocore/cache/I_CacheDefs.h | 26 +-
iocore/cache/I_Store.h | 4 +-
iocore/cache/P_CacheArray.h | 4 +-
iocore/cache/P_CacheDir.h | 2 +-
iocore/cache/P_CacheHosting.h | 6 +-
iocore/cache/P_CacheHttp.h | 4 +-
iocore/cache/P_CacheInternal.h | 46 +-
iocore/cache/P_CacheVol.h | 14 +-
iocore/cache/RamCacheCLFUS.cc | 86 +-
iocore/cache/RamCacheLRU.cc | 20 +-
iocore/cache/Store.cc | 80 +-
iocore/cluster/ClusterAPI.cc | 32 +-
iocore/cluster/ClusterCache.cc | 416 +++++-----
iocore/cluster/ClusterConfig.cc | 58 +-
iocore/cluster/ClusterHandler.cc | 254 +++---
iocore/cluster/ClusterHandlerBase.cc | 98 +--
iocore/cluster/ClusterHash.cc | 24 +-
iocore/cluster/ClusterLib.cc | 38 +-
iocore/cluster/ClusterLoadMonitor.cc | 16 +-
iocore/cluster/ClusterMachine.cc | 14 +-
iocore/cluster/ClusterProcessor.cc | 90 +-
iocore/cluster/ClusterRPC.cc | 24 +-
iocore/cluster/ClusterVConnection.cc | 56 +-
iocore/cluster/P_ClusterCache.h | 20 +-
iocore/cluster/P_ClusterCacheInternal.h | 28 +-
iocore/cluster/P_ClusterHandler.h | 120 +--
iocore/cluster/P_ClusterInline.h | 60 +-
iocore/cluster/P_ClusterInternal.h | 20 +-
iocore/cluster/P_TimeTrace.h | 2 +-
iocore/dns/DNS.cc | 164 ++--
iocore/dns/DNSConnection.cc | 12 +-
iocore/dns/P_DNSProcessor.h | 12 +-
iocore/dns/SplitDNS.cc | 32 +-
iocore/dns/test_P_DNS.cc | 8 +-
iocore/eventsystem/IOBuffer.cc | 32 +-
iocore/eventsystem/I_Event.h | 2 +-
iocore/eventsystem/I_IOBuffer.h | 2 +-
iocore/eventsystem/I_Lock.h | 26 +-
iocore/eventsystem/I_PriorityEventQueue.h | 4 +-
iocore/eventsystem/I_ProxyAllocator.h | 12 +-
iocore/eventsystem/I_Thread.h | 2 +-
iocore/eventsystem/PQ-List.cc | 10 +-
iocore/eventsystem/P_IOBuffer.h | 104 +--
iocore/eventsystem/P_UnixEThread.h | 38 +-
iocore/eventsystem/P_UnixEvent.h | 8 +-
iocore/eventsystem/P_UnixEventProcessor.h | 14 +-
iocore/eventsystem/P_UnixSocketManager.h | 4 +-
iocore/eventsystem/ProtectedQueue.cc | 8 +-
iocore/eventsystem/ProxyAllocator.cc | 10 +-
iocore/eventsystem/Thread.cc | 10 +-
iocore/eventsystem/UnixEThread.cc | 2 +-
iocore/eventsystem/UnixEvent.cc | 22 +-
iocore/eventsystem/UnixEventProcessor.cc | 10 +-
iocore/eventsystem/test_Buffer.cc | 4 +-
iocore/eventsystem/test_Event.cc | 4 +-
iocore/hostdb/HostDB.cc | 326 ++++----
iocore/hostdb/I_HostDBProcessor.h | 38 +-
iocore/hostdb/MultiCache.cc | 138 ++--
iocore/hostdb/P_HostDBProcessor.h | 14 +-
iocore/hostdb/P_MultiCache.h | 24 +-
iocore/hostdb/test_P_HostDB.cc | 8 +-
iocore/net/Connection.cc | 18 +-
iocore/net/I_Socks.h | 2 +-
iocore/net/Net.cc | 8 +-
iocore/net/NetTest-http-server.c | 8 +-
iocore/net/NetVCTest.cc | 30 +-
iocore/net/OCSPStapling.cc | 28 +-
iocore/net/P_LibBulkIO.h | 50 +-
iocore/net/P_SSLConfig.h | 4 +-
iocore/net/P_SSLNetVConnection.h | 14 +-
iocore/net/P_SSLUtils.h | 2 +-
iocore/net/P_Socks.h | 2 +-
iocore/net/P_UDPConnection.h | 10 +-
iocore/net/P_UDPIOEvent.h | 14 +-
iocore/net/P_UDPNet.h | 20 +-
iocore/net/P_UDPPacket.h | 18 +-
iocore/net/P_UnixCompletionUtil.h | 4 +-
iocore/net/P_UnixNet.h | 30 +-
iocore/net/P_UnixNetVConnection.h | 34 +-
iocore/net/P_UnixPollDescriptor.h | 2 +-
iocore/net/P_UnixUDPConnection.h | 10 +-
iocore/net/SSLCertLookup.cc | 14 +-
iocore/net/SSLClientUtils.cc | 12 +-
iocore/net/SSLConfig.cc | 76 +-
iocore/net/SSLNetAccept.cc | 6 +-
iocore/net/SSLNetVConnection.cc | 140 ++--
iocore/net/SSLNextProtocolAccept.cc | 2 +-
iocore/net/SSLNextProtocolSet.cc | 4 +-
iocore/net/SSLSessionCache.cc | 14 +-
iocore/net/SSLUtils.cc | 60 +-
iocore/net/Socks.cc | 54 +-
iocore/net/UnixConnection.cc | 12 +-
iocore/net/UnixNet.cc | 50 +-
iocore/net/UnixNetAccept.cc | 46 +-
iocore/net/UnixNetPages.cc | 14 +-
iocore/net/UnixNetProcessor.cc | 78 +-
iocore/net/UnixNetVConnection.cc | 124 +--
iocore/net/UnixUDPConnection.cc | 10 +-
iocore/net/UnixUDPNet.cc | 82 +-
iocore/net/test_I_Net.cc | 2 +-
iocore/net/test_P_Net.cc | 8 +-
iocore/net/test_certlookup.cc | 18 +-
iocore/utils/I_Machine.h | 4 +-
iocore/utils/Machine.cc | 10 +-
iocore/utils/OneWayMultiTunnel.cc | 24 +-
iocore/utils/OneWayTunnel.cc | 50 +-
.../examples/async_http_fetch/AsyncHttpFetch.cc | 2 +-
.../AsyncHttpFetchStreaming.cc | 2 +-
lib/atscppapi/examples/async_timer/AsyncTimer.cc | 10 +-
.../examples/clientrequest/ClientRequest.cc | 6 +-
.../GzipTransformationPlugin.cc | 4 +-
lib/atscppapi/examples/remap_plugin/RemapPlugin.cc | 4 +-
lib/atscppapi/src/AsyncHttpFetch.cc | 22 +-
lib/atscppapi/src/AsyncTimer.cc | 6 +-
lib/atscppapi/src/GlobalPlugin.cc | 4 +-
lib/atscppapi/src/GzipDeflateTransformation.cc | 18 +-
lib/atscppapi/src/GzipInflateTransformation.cc | 10 +-
lib/atscppapi/src/Headers.cc | 20 +-
lib/atscppapi/src/InterceptPlugin.cc | 14 +-
lib/atscppapi/src/Logger.cc | 12 +-
lib/atscppapi/src/Plugin.cc | 4 +-
lib/atscppapi/src/RemapPlugin.cc | 6 +-
lib/atscppapi/src/Request.cc | 10 +-
lib/atscppapi/src/Transaction.cc | 2 +-
lib/atscppapi/src/TransactionPlugin.cc | 4 +-
lib/atscppapi/src/TransformationPlugin.cc | 8 +-
.../src/include/atscppapi/AsyncHttpFetch.h | 2 +-
lib/atscppapi/src/include/atscppapi/HttpStatus.h | 98 +--
lib/atscppapi/src/include/atscppapi/Logger.h | 6 +-
lib/atscppapi/src/utils_internal.cc | 4 +-
lib/raft/raft.h | 4 +-
lib/raft/raft_impl.h | 60 +-
lib/raft/raft_test.cc | 24 +-
lib/records/I_RecDefs.h | 12 +-
lib/records/I_RecHttp.h | 4 +-
lib/records/P_RecCore.cc | 46 +-
lib/records/RecConfigParse.cc | 26 +-
lib/records/RecCore.cc | 70 +-
lib/records/RecFile.cc | 8 +-
lib/records/RecHttp.cc | 94 +--
lib/records/RecLocal.cc | 4 +-
lib/records/RecMessage.cc | 28 +-
lib/records/RecMutex.cc | 2 +-
lib/records/RecProcess.cc | 6 +-
lib/records/RecRawStats.cc | 34 +-
lib/records/RecUtils.cc | 18 +-
lib/ts/Allocator.h | 2 +-
lib/ts/Arena.cc | 8 +-
lib/ts/Arena.h | 4 +-
lib/ts/BaseLogFile.cc | 36 +-
lib/ts/BaseLogFile.h | 2 +-
lib/ts/Bitops.h | 10 +-
lib/ts/CompileParseRules.cc | 6 +-
lib/ts/Diags.cc | 56 +-
lib/ts/Diags.h | 2 +-
lib/ts/DynArray.h | 4 +-
lib/ts/EventNotify.cc | 2 +-
lib/ts/Hash.h | 2 +-
lib/ts/HashMD5.cc | 4 +-
lib/ts/HashSip.cc | 14 +-
lib/ts/HostLookup.cc | 86 +-
lib/ts/HostLookup.h | 2 +-
lib/ts/IntrusiveDList.h | 22 +-
lib/ts/IpMap.cc | 24 +-
lib/ts/IpMapConf.cc | 8 +-
lib/ts/IpMapTest.cc | 4 +-
lib/ts/Layout.cc | 26 +-
lib/ts/List.h | 40 +-
lib/ts/MMH.cc | 24 +-
lib/ts/Map.h | 52 +-
lib/ts/MatcherUtils.cc | 46 +-
lib/ts/ParseRules.cc | 14 +-
lib/ts/ParseRules.h | 4 +-
lib/ts/PriorityQueue.h | 4 +-
lib/ts/Ptr.h | 4 +-
lib/ts/RawHashTable.h | 8 +-
lib/ts/RbTree.cc | 50 +-
lib/ts/Regex.cc | 18 +-
lib/ts/Regex.h | 4 +-
lib/ts/Regression.cc | 22 +-
lib/ts/SimpleTokenizer.h | 16 +-
lib/ts/TestHttpHeader.cc | 4 +-
lib/ts/TextBuffer.cc | 18 +-
lib/ts/Tokenizer.cc | 46 +-
lib/ts/Trie.h | 14 +-
lib/ts/TsBuffer.h | 12 +-
lib/ts/Vec.cc | 8 +-
lib/ts/Vec.h | 34 +-
lib/ts/Version.cc | 2 +-
lib/ts/X509HostnameValidator.cc | 10 +-
lib/ts/apidefs.h.in | 315 ++++---
lib/ts/fastlz.c | 48 +-
lib/ts/ink_args.cc | 8 +-
lib/ts/ink_atomic.h | 2 +-
lib/ts/ink_base64.cc | 14 +-
lib/ts/ink_cap.cc | 16 +-
lib/ts/ink_cap.h | 6 +-
lib/ts/ink_config.h.in | 96 ++-
lib/ts/ink_defs.cc | 14 +-
lib/ts/ink_error.cc | 2 +-
lib/ts/ink_file.cc | 10 +-
lib/ts/ink_hash_table.cc | 10 +-
lib/ts/ink_hash_table.h | 6 +-
lib/ts/ink_hrtime.cc | 22 +-
lib/ts/ink_hrtime.h | 6 +-
lib/ts/ink_inet.cc | 30 +-
lib/ts/ink_inet.h | 28 +-
lib/ts/ink_memory.cc | 6 +-
lib/ts/ink_memory.h | 8 +-
lib/ts/ink_queue.cc | 50 +-
lib/ts/ink_queue_utils.cc | 2 +-
lib/ts/ink_rand.cc | 8 +-
lib/ts/ink_res_init.cc | 80 +-
lib/ts/ink_res_mkquery.cc | 36 +-
lib/ts/ink_resolver.h | 32 +-
lib/ts/ink_resource.cc | 8 +-
lib/ts/ink_rwlock.cc | 2 +-
lib/ts/ink_sock.cc | 10 +-
lib/ts/ink_sprintf.cc | 2 +-
lib/ts/ink_string++.cc | 8 +-
lib/ts/ink_string++.h | 32 +-
lib/ts/ink_string.cc | 10 +-
lib/ts/ink_string.h | 12 +-
lib/ts/ink_thread.h | 2 +-
lib/ts/ink_time.cc | 4 +-
lib/ts/llqueue.cc | 8 +-
lib/ts/load_http_hdr.cc | 20 +-
lib/ts/lockfile.cc | 6 +-
lib/ts/mkdfa.c | 46 +-
lib/ts/signals.cc | 6 +-
lib/ts/test_List.cc | 2 +-
lib/ts/test_PriorityQueue.cc | 4 +-
lib/ts/test_Vec.cc | 2 +-
lib/ts/test_X509HostnameValidator.cc | 14 +-
lib/ts/test_arena.cc | 12 +-
lib/ts/test_atomic.cc | 10 +-
lib/ts/test_freelist.cc | 2 +-
lib/wccp/Wccp.h | 26 +-
lib/wccp/WccpConfig.cc | 72 +-
lib/wccp/WccpEndPoint.cc | 90 +-
lib/wccp/WccpLocal.h | 52 +-
lib/wccp/WccpMsg.cc | 114 +--
lib/wccp/WccpStatic.cc | 12 +-
lib/wccp/WccpUtil.h | 2 +-
lib/wccp/wccp-test-router.cc | 16 +-
mgmt/Alarms.cc | 32 +-
mgmt/BaseManager.cc | 22 +-
mgmt/Cop.h | 6 +-
mgmt/FileManager.cc | 24 +-
mgmt/LocalManager.cc | 78 +-
mgmt/MgmtDefs.h | 10 +-
mgmt/MultiFile.cc | 20 +-
mgmt/ProcessManager.cc | 18 +-
mgmt/ProxyConfig.cc | 18 +-
mgmt/RecordsConfigUtils.cc | 10 +-
mgmt/Rollback.cc | 38 +-
mgmt/WebMgmtUtils.cc | 84 +-
mgmt/api/APITestCliRemote.cc | 104 +--
mgmt/api/CfgContextImpl.cc | 116 +--
mgmt/api/CfgContextImpl.h | 4 +-
mgmt/api/CfgContextManager.cc | 32 +-
mgmt/api/CfgContextUtils.cc | 158 ++--
mgmt/api/CoreAPI.cc | 16 +-
mgmt/api/CoreAPIRemote.cc | 86 +-
mgmt/api/CoreAPIShared.cc | 10 +-
mgmt/api/EventCallback.cc | 10 +-
mgmt/api/EventControlMain.cc | 14 +-
mgmt/api/GenericParser.cc | 26 +-
mgmt/api/INKMgmtAPI.cc | 302 +++----
mgmt/api/NetworkMessage.cc | 10 +-
mgmt/api/NetworkUtilsLocal.cc | 4 +-
mgmt/api/NetworkUtilsRemote.cc | 44 +-
mgmt/api/TSControlMain.cc | 80 +-
mgmt/api/include/mgmtapi.h | 4 +-
mgmt/cluster/ClusterCom.cc | 126 +--
mgmt/cluster/VMap.cc | 38 +-
mgmt/utils/ExpandingArray.cc | 4 +-
mgmt/utils/MgmtHashTable.h | 2 +-
mgmt/utils/MgmtMarshall.cc | 20 +-
mgmt/utils/MgmtSocket.cc | 6 +-
mgmt/utils/MgmtUtils.cc | 16 +-
mgmt/utils/test_marshall.cc | 44 +-
plugins/cacheurl/cacheurl.cc | 22 +-
plugins/conf_remap/conf_remap.cc | 12 +-
plugins/experimental/acme/acme.c | 18 +-
.../experimental/ats_pagespeed/ats_base_fetch.cc | 18 +-
.../ats_pagespeed/ats_beacon_intercept.cc | 14 +-
plugins/experimental/ats_pagespeed/ats_config.cc | 2 +-
.../experimental/ats_pagespeed/ats_pagespeed.cc | 108 +--
.../ats_pagespeed/ats_process_context.cc | 6 +-
.../ats_pagespeed/ats_resource_intercept.cc | 34 +-
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 2 +-
.../ats_pagespeed/ats_rewrite_options.cc | 14 +-
.../ats_pagespeed/gzip/configuration.cc | 6 +-
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 64 +-
plugins/experimental/ats_pagespeed/gzip/misc.cc | 14 +-
plugins/experimental/ats_pagespeed/gzip/misc.h | 10 +-
plugins/experimental/authproxy/authproxy.cc | 22 +-
plugins/experimental/authproxy/utils.cc | 4 +-
.../background_fetch/background_fetch.cc | 18 +-
plugins/experimental/background_fetch/configs.cc | 8 +-
plugins/experimental/background_fetch/headers.cc | 6 +-
plugins/experimental/background_fetch/rules.cc | 2 +-
plugins/experimental/balancer/balancer.cc | 4 +-
plugins/experimental/balancer/hash.cc | 2 +-
.../experimental/buffer_upload/buffer_upload.cc | 88 +-
.../experimental/cache_key_genid/cache_key_genid.c | 6 +-
.../experimental/cache_promote/cache_promote.cc | 14 +-
.../cache_range_requests/cache_range_requests.cc | 14 +-
plugins/experimental/cachekey/configs.cc | 2 +-
plugins/experimental/cachekey/pattern.cc | 20 +-
plugins/experimental/cachekey/pattern.h | 4 +-
.../experimental/channel_stats/channel_stats.cc | 22 +-
.../collapsed_connection/MurmurHash3.cc | 4 +-
.../collapsed_connection/collapsed_connection.cc | 98 +--
.../collapsed_forwarding/collapsed_forwarding.cc | 12 +-
.../custom_redirect/custom_redirect.cc | 12 +-
plugins/experimental/epic/epic.cc | 4 +-
plugins/experimental/escalate/escalate.cc | 2 +-
plugins/experimental/esi/combo_handler.cc | 54 +-
plugins/experimental/esi/esi.cc | 66 +-
plugins/experimental/esi/fetcher/HttpDataFetcher.h | 4 +-
.../esi/fetcher/HttpDataFetcherImpl.cc | 12 +-
.../experimental/esi/fetcher/HttpDataFetcherImpl.h | 10 +-
plugins/experimental/esi/lib/DocNode.h | 26 +-
plugins/experimental/esi/lib/EsiGunzip.cc | 22 +-
plugins/experimental/esi/lib/EsiGzip.cc | 14 +-
plugins/experimental/esi/lib/EsiParser.cc | 40 +-
plugins/experimental/esi/lib/EsiProcessor.cc | 26 +-
plugins/experimental/esi/lib/Expression.cc | 20 +-
plugins/experimental/esi/lib/FailureInfo.cc | 2 +-
plugins/experimental/esi/lib/FailureInfo.h | 6 +-
plugins/experimental/esi/lib/HandlerManager.cc | 2 +-
.../experimental/esi/lib/SpecialIncludeHandler.h | 2 +-
plugins/experimental/esi/lib/Stats.cc | 2 +-
plugins/experimental/esi/lib/Stats.h | 14 +-
plugins/experimental/esi/lib/Utils.cc | 22 +-
plugins/experimental/esi/lib/Variables.cc | 18 +-
plugins/experimental/esi/lib/Variables.h | 12 +-
plugins/experimental/esi/lib/gzip.cc | 28 +-
plugins/experimental/esi/lib/gzip.h | 6 +-
plugins/experimental/esi/serverIntercept.cc | 16 +-
.../experimental/esi/test/StubIncludeHandler.cc | 12 +-
.../experimental/esi/test/TestHandlerManager.cc | 2 +-
.../experimental/esi/test/TestHttpDataFetcher.h | 2 +-
plugins/experimental/esi/test/docnode_test.cc | 2 +-
plugins/experimental/esi/test/parser_test.cc | 6 +-
plugins/experimental/esi/test/processor_test.cc | 6 +-
plugins/experimental/esi/test/sampleProb.cc | 14 +-
plugins/experimental/generator/generator.cc | 14 +-
plugins/experimental/geoip_acl/acl.cc | 12 +-
plugins/experimental/geoip_acl/acl.h | 4 +-
.../header_normalize/header_normalize.cc | 150 ++--
plugins/experimental/hipes/hipes.cc | 24 +-
plugins/experimental/inliner/ats-inliner.cc | 10 +-
plugins/experimental/inliner/cache-handler.h | 12 +-
plugins/experimental/inliner/chunk-decoder.cc | 2 +-
plugins/experimental/inliner/fetcher.cc | 4 +-
plugins/experimental/inliner/fetcher.h | 4 +-
plugins/experimental/inliner/html-parser.cc | 2 +-
plugins/experimental/inliner/inliner-handler.cc | 4 +-
plugins/experimental/inliner/png.h | 6 +-
plugins/experimental/inliner/ts.cc | 6 +-
plugins/experimental/inliner/ts.h | 4 +-
plugins/experimental/memcache/protocol_binary.h | 98 +--
plugins/experimental/memcache/tsmemcache.cc | 132 +--
.../memcached_remap/memcached_remap.cc | 10 +-
plugins/experimental/metalink/metalink.cc | 20 +-
plugins/experimental/mp4/mp4.cc | 30 +-
plugins/experimental/mp4/mp4_common.h | 2 +-
plugins/experimental/mp4/mp4_meta.cc | 102 +--
.../experimental/multiplexer/ats-multiplexer.cc | 2 +-
plugins/experimental/multiplexer/chunk-decoder.cc | 2 +-
plugins/experimental/multiplexer/dispatch.cc | 16 +-
plugins/experimental/multiplexer/fetcher.cc | 4 +-
plugins/experimental/multiplexer/fetcher.h | 4 +-
.../experimental/multiplexer/original-request.cc | 6 +-
plugins/experimental/multiplexer/ts.cc | 2 +-
plugins/experimental/mysql_remap/lib/dictionary.c | 12 +-
plugins/experimental/mysql_remap/lib/iniparser.c | 8 +-
plugins/experimental/mysql_remap/mysql_remap.cc | 18 +-
.../regex_revalidate/regex_revalidate.c | 62 +-
plugins/experimental/remap_stats/remap_stats.c | 24 +-
plugins/experimental/s3_auth/s3_auth.cc | 14 +-
.../experimental/ssl_cert_loader/domain-tree.cc | 32 +-
plugins/experimental/ssl_cert_loader/domain-tree.h | 8 +-
.../ssl_cert_loader/ssl-cert-loader.cc | 30 +-
plugins/experimental/sslheaders/expand.cc | 4 +-
plugins/experimental/sslheaders/sslheaders.cc | 4 +-
plugins/experimental/sslheaders/test_sslheaders.cc | 6 +-
.../stale_while_revalidate.c | 58 +-
.../experimental/stream_editor/stream_editor.cc | 46 +-
plugins/experimental/ts_lua/ts_lua.c | 34 +-
.../experimental/ts_lua/ts_lua_client_request.c | 4 +-
.../experimental/ts_lua/ts_lua_client_response.c | 6 +-
plugins/experimental/ts_lua/ts_lua_coroutine.c | 8 +-
plugins/experimental/ts_lua/ts_lua_crypto.c | 20 +-
plugins/experimental/ts_lua/ts_lua_fetch.c | 40 +-
plugins/experimental/ts_lua/ts_lua_http.c | 4 +-
plugins/experimental/ts_lua/ts_lua_http_cntl.c | 6 +-
plugins/experimental/ts_lua/ts_lua_http_config.c | 214 ++---
.../experimental/ts_lua/ts_lua_http_intercept.c | 18 +-
.../experimental/ts_lua/ts_lua_http_milestone.c | 42 +-
plugins/experimental/ts_lua/ts_lua_io.c | 4 +-
plugins/experimental/ts_lua/ts_lua_misc.c | 12 +-
plugins/experimental/ts_lua/ts_lua_package.c | 20 +-
plugins/experimental/ts_lua/ts_lua_remap.c | 8 +-
.../experimental/ts_lua/ts_lua_server_request.c | 2 +-
.../experimental/ts_lua/ts_lua_server_response.c | 4 +-
plugins/experimental/ts_lua/ts_lua_stat.c | 8 +-
plugins/experimental/ts_lua/ts_lua_transform.c | 28 +-
plugins/experimental/ts_lua/ts_lua_util.c | 44 +-
plugins/experimental/url_sig/url_sig.c | 30 +-
.../experimental/webp_transform/ImageTransform.cc | 4 +-
plugins/experimental/xdebug/xdebug.cc | 12 +-
plugins/gzip/configuration.cc | 6 +-
plugins/gzip/gzip.cc | 70 +-
plugins/gzip/misc.cc | 12 +-
plugins/gzip/misc.h | 6 +-
plugins/header_rewrite/condition.h | 12 +-
plugins/header_rewrite/conditions.cc | 44 +-
plugins/header_rewrite/conditions.h | 4 +-
plugins/header_rewrite/expander.cc | 2 +-
plugins/header_rewrite/header_rewrite.cc | 12 +-
plugins/header_rewrite/header_rewrite_test.cc | 2 +-
plugins/header_rewrite/operator.h | 2 +-
plugins/header_rewrite/operators.cc | 24 +-
plugins/header_rewrite/parser.cc | 14 +-
plugins/header_rewrite/regex_helper.cc | 4 +-
plugins/header_rewrite/resources.cc | 4 +-
plugins/header_rewrite/resources.h | 8 +-
plugins/header_rewrite/ruleset.cc | 4 +-
plugins/header_rewrite/statement.cc | 6 +-
plugins/header_rewrite/value.h | 2 +-
plugins/healthchecks/healthchecks.c | 34 +-
plugins/libloader/libloader.c | 12 +-
plugins/regex_remap/regex_remap.cc | 64 +-
plugins/stats_over_http/stats_over_http.c | 16 +-
plugins/tcpinfo/tcpinfo.cc | 26 +-
proxy/AbstractBuffer.cc | 10 +-
proxy/CacheControl.cc | 62 +-
proxy/ControlBase.cc | 16 +-
proxy/ControlMatcher.cc | 46 +-
proxy/ControlMatcher.h | 4 +-
proxy/CoreUtils.cc | 144 ++--
proxy/Crash.cc | 10 +-
proxy/FetchSM.cc | 28 +-
proxy/FetchSM.h | 32 +-
proxy/ICP.cc | 214 ++---
proxy/ICP.h | 42 +-
proxy/ICPConfig.cc | 86 +-
proxy/ICPevents.h | 4 +-
proxy/IPAllow.cc | 22 +-
proxy/InkAPI.cc | 906 ++++++++++-----------
proxy/InkAPIInternal.h | 14 +-
proxy/InkAPITest.cc | 780 +++++++++---------
proxy/InkAPITestTool.cc | 52 +-
proxy/InkIOCoreAPI.cc | 18 +-
proxy/Main.cc | 68 +-
proxy/ParentConsistentHash.cc | 48 +-
proxy/ParentConsistentHash.h | 2 +-
proxy/ParentRoundRobin.cc | 22 +-
proxy/ParentSelection.cc | 116 +--
proxy/ParentSelection.h | 6 +-
proxy/Plugin.cc | 14 +-
proxy/PluginVC.cc | 70 +-
proxy/PluginVC.h | 2 +-
proxy/Prefetch.cc | 164 ++--
proxy/Prefetch.h | 12 +-
proxy/ProtocolProbeSessionAccept.cc | 10 +-
proxy/ProxyClientSession.cc | 16 +-
proxy/ProxyClientSession.h | 2 +-
proxy/ProxyClientTransaction.cc | 4 +-
proxy/ProxyClientTransaction.h | 6 +-
proxy/RegressionSM.cc | 72 +-
proxy/ReverseProxy.cc | 2 +-
proxy/Show.h | 14 +-
proxy/SocksProxy.cc | 28 +-
proxy/StatPages.cc | 10 +-
proxy/StufferUdpReceiver.cc | 34 +-
proxy/TestClock.cc | 2 +-
proxy/TestClusterHash.cc | 14 +-
proxy/TestDNS.cc | 28 +-
proxy/TestPreProc.cc | 6 +-
proxy/TestProxy.cc | 34 +-
proxy/TestSimpleProxy.cc | 8 +-
proxy/TimeTrace.h | 2 +-
proxy/Transform.cc | 40 +-
proxy/UDPAPIClientTest.cc | 10 +-
proxy/UDPAPITest.cc | 12 +-
proxy/UnixCompletionUtil.h | 4 +-
proxy/api/ts/InkAPIPrivateIOCore.h | 2 +-
proxy/api/ts/experimental.h | 14 +-
proxy/api/ts/remap.h | 6 +-
proxy/api/ts/ts.h | 2 +-
proxy/congest/Congestion.cc | 114 +--
proxy/congest/Congestion.h | 2 +-
proxy/congest/CongestionDB.cc | 54 +-
proxy/congest/CongestionTest.cc | 20 +-
proxy/congest/MT_hashtable.h | 44 +-
proxy/hdrs/HTTP.cc | 286 +++----
proxy/hdrs/HTTP.h | 320 ++++----
proxy/hdrs/HdrHeap.cc | 124 +--
proxy/hdrs/HdrHeap.h | 86 +-
proxy/hdrs/HdrTSOnly.cc | 12 +-
proxy/hdrs/HdrTest.cc | 74 +-
proxy/hdrs/HdrToken.cc | 40 +-
proxy/hdrs/HdrToken.h | 16 +-
proxy/hdrs/HdrUtils.cc | 8 +-
proxy/hdrs/HdrUtils.h | 8 +-
proxy/hdrs/HttpCompat.cc | 96 +--
proxy/hdrs/MIME.cc | 688 ++++++++--------
proxy/hdrs/MIME.h | 40 +-
proxy/hdrs/URL.cc | 236 +++---
proxy/hdrs/load_http_hdr.cc | 26 +-
proxy/hdrs/test_header.cc | 30 +-
proxy/hdrs/test_urlhash.cc | 6 +-
proxy/http/Http1ClientSession.cc | 24 +-
proxy/http/Http1ClientTransaction.cc | 8 +-
proxy/http/HttpBodyFactory.cc | 76 +-
proxy/http/HttpCacheSM.cc | 20 +-
proxy/http/HttpCacheSM.h | 2 +-
proxy/http/HttpConfig.cc | 230 +++---
proxy/http/HttpConfig.h | 10 +-
proxy/http/HttpPages.cc | 18 +-
proxy/http/HttpPages.h | 2 +-
proxy/http/HttpProxyServerMain.cc | 24 +-
proxy/http/HttpSM.cc | 488 +++++------
proxy/http/HttpSM.h | 26 +-
proxy/http/HttpServerSession.h | 4 +-
proxy/http/HttpSessionAccept.cc | 14 +-
proxy/http/HttpSessionManager.cc | 12 +-
proxy/http/HttpTransact.cc | 458 +++++------
proxy/http/HttpTransact.h | 162 ++--
proxy/http/HttpTransactCache.cc | 110 +--
proxy/http/HttpTransactHeaders.cc | 62 +-
proxy/http/HttpTunnel.cc | 118 +--
proxy/http/HttpUpdateSM.cc | 10 +-
proxy/http/RegressionHttpTransact.cc | 2 +-
proxy/http/TestUrl.cc | 18 +-
proxy/http/remap/AclFiltering.cc | 8 +-
proxy/http/remap/AclFiltering.h | 4 +-
proxy/http/remap/RemapConfig.cc | 58 +-
proxy/http/remap/RemapPluginInfo.cc | 4 +-
proxy/http/remap/RemapPlugins.cc | 14 +-
proxy/http/remap/RemapProcessor.cc | 34 +-
proxy/http/remap/UrlMapping.cc | 24 +-
proxy/http/remap/UrlMapping.h | 6 +-
proxy/http/remap/UrlRewrite.cc | 48 +-
proxy/http/test_socket_close.cc | 44 +-
proxy/http2/HPACK.cc | 80 +-
proxy/http2/HTTP2.cc | 82 +-
proxy/http2/HTTP2.h | 92 +--
proxy/http2/Http2ClientSession.cc | 10 +-
proxy/http2/Http2ClientSession.h | 2 +-
proxy/http2/Http2ConnectionState.cc | 40 +-
proxy/http2/Http2ConnectionState.h | 24 +-
proxy/http2/Http2DependencyTree.h | 2 +-
proxy/http2/Http2SessionAccept.cc | 4 +-
proxy/http2/Http2Stream.cc | 38 +-
proxy/http2/Http2Stream.h | 6 +-
proxy/http2/HuffmanCodec.cc | 26 +-
proxy/http2/RegressionHPACK.cc | 18 +-
proxy/http2/test_Huffmancode.cc | 14 +-
proxy/logcat.cc | 20 +-
proxy/logging/Log.cc | 32 +-
proxy/logging/Log.h | 14 +-
proxy/logging/LogAccess.cc | 62 +-
proxy/logging/LogAccess.h | 2 +-
proxy/logging/LogAccessHttp.cc | 58 +-
proxy/logging/LogAccessICP.cc | 14 +-
proxy/logging/LogAccessTest.cc | 10 +-
proxy/logging/LogBuffer.cc | 84 +-
proxy/logging/LogBuffer.h | 2 +-
proxy/logging/LogCollationAccept.cc | 6 +-
proxy/logging/LogCollationClientSM.cc | 4 +-
proxy/logging/LogCollationHostSM.cc | 16 +-
proxy/logging/LogConfig.cc | 100 +--
proxy/logging/LogField.cc | 4 +-
proxy/logging/LogField.h | 4 +-
proxy/logging/LogFieldAliasMap.cc | 10 +-
proxy/logging/LogFieldAliasMap.h | 8 +-
proxy/logging/LogFile.cc | 22 +-
proxy/logging/LogFilter.cc | 38 +-
proxy/logging/LogFilter.h | 4 +-
proxy/logging/LogFormat.cc | 44 +-
proxy/logging/LogFormat.h | 2 +-
proxy/logging/LogHost.cc | 22 +-
proxy/logging/LogLimits.h | 4 +-
proxy/logging/LogObject.cc | 60 +-
proxy/logging/LogObject.h | 6 +-
proxy/logging/LogSock.cc | 28 +-
proxy/logging/LogSock.h | 22 +-
proxy/logging/LogStandalone.cc | 22 +-
proxy/logging/LogUtils.cc | 28 +-
proxy/logstats.cc | 124 +--
proxy/sac.cc | 6 +-
proxy/shared/DiagsConfig.cc | 42 +-
proxy/shared/InkXml.cc | 34 +-
proxy/shared/InkXml.h | 2 +-
proxy/shared/UglyLogStubs.cc | 20 +-
proxy/spdy/SpdyCallbacks.cc | 50 +-
proxy/spdy/SpdyClientSession.cc | 24 +-
proxy/spdy/SpdyCommon.cc | 26 +-
proxy/spdy/SpdySessionAccept.cc | 4 +-
proxy/test_xml_parser.cc | 6 +-
tools/http_load/http_load.c | 216 ++---
tools/http_load/timers.c | 52 +-
tools/jtest/jtest.cc | 588 ++++++-------
tools/lighttpd_mod_generator/mod_generator.c | 20 +-
675 files changed, 12403 insertions(+), 12424 deletions(-)
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index c6a1336..75aedcb 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -77,31 +77,31 @@ static char manager_lockfile[PATH_NAME_MAX];
static char server_lockfile[PATH_NAME_MAX];
static int check_memory_min_swapfree_kb = 0;
-static int check_memory_min_memfree_kb = 0;
+static int check_memory_min_memfree_kb = 0;
-static int syslog_facility = LOG_DAEMON;
+static int syslog_facility = LOG_DAEMON;
static char syslog_fac_str[PATH_NAME_MAX] = "LOG_DAEMON";
static int killsig = SIGKILL;
static int coresig = 0;
-static int debug_flag = false;
+static int debug_flag = false;
static int stdout_flag = false;
-static int stop_flag = false;
+static int stop_flag = false;
static char *admin_user;
static uid_t admin_uid;
static gid_t admin_gid;
-static bool admin_user_p = false;
+static bool admin_user_p = false;
static char manager_binary[PATH_NAME_MAX] = "traffic_manager";
-static char server_binary[PATH_NAME_MAX] = "traffic_server";
+static char server_binary[PATH_NAME_MAX] = "traffic_server";
static char log_file[PATH_NAME_MAX] = "traffic.out";
-static int synthetic_port = 8083;
-static int rs_port = 8088;
+static int synthetic_port = 8083;
+static int rs_port = 8088;
static MgmtClusterType cluster_type = NO_CLUSTER;
-static int http_backdoor_port = 8084;
+static int http_backdoor_port = 8084;
#if defined(linux)
// TS-1075 : auto-port ::connect DoS on high traffic linux systems
@@ -109,26 +109,26 @@ static int source_port = 0;
#endif
static int manager_failures = 0;
-static int server_failures = 0;
+static int server_failures = 0;
static int server_not_found = 0;
-static int init_sleep_time = cop_sleep_time; // 10 sec
+static int init_sleep_time = cop_sleep_time; // 10 sec
// traffic_manager flap detection
#define MANAGER_FLAP_DETECTION 1
#if defined(MANAGER_FLAP_DETECTION)
-#define MANAGER_MAX_FLAP_COUNT 3 // if flap this many times, give up for a while
-#define MANAGER_FLAP_INTERVAL_MSEC 60000 // if x number of flaps happen in this interval, declare flapping
-#define MANAGER_FLAP_RETRY_MSEC 60000 // if flapping, don't try to restart until after this retry duration
-static bool manager_flapping = false; // is the manager flapping?
-static int manager_flap_count = 0; // how many times has the manager flapped?
-static ink_hrtime manager_flap_interval_start_time = 0; // first time we attempted to start the manager in past little while)
-static ink_hrtime manager_flap_retry_start_time = 0; // first time we attempted to start the manager in past little while)
+#define MANAGER_MAX_FLAP_COUNT 3 // if flap this many times, give up for a while
+#define MANAGER_FLAP_INTERVAL_MSEC 60000 // if x number of flaps happen in this interval, declare flapping
+#define MANAGER_FLAP_RETRY_MSEC 60000 // if flapping, don't try to restart until after this retry duration
+static bool manager_flapping = false; // is the manager flapping?
+static int manager_flap_count = 0; // how many times has the manager flapped?
+static ink_hrtime manager_flap_interval_start_time = 0; // first time we attempted to start the manager in past little while)
+static ink_hrtime manager_flap_retry_start_time = 0; // first time we attempted to start the manager in past little while)
#endif
// transient syscall error timeout
#define TRANSIENT_ERROR_WAIT_MS 500
-static int child_pid = 0;
+static int child_pid = 0;
static int child_status = 0;
AppVersionInfo appVersionInfo;
@@ -184,7 +184,7 @@ cop_log(int priority, const char *format, ...)
struct timeval now;
double now_f;
- now = ink_gettimeofday();
+ now = ink_gettimeofday();
now_f = now.tv_sec + now.tv_usec / 1000000.0f;
fprintf(stdout, "<%.4f> [%s]: ", now_f, priority_name(priority));
@@ -213,7 +213,7 @@ chown_file_to_admin_user(const char *file)
static void
sig_child(int signum)
{
- pid_t pid = 0;
+ pid_t pid = 0;
int status = 0;
cop_log_trace("Entering sig_child(%d)\n", signum);
@@ -229,7 +229,7 @@ sig_child(int signum)
// next time through the event loop. We will occasionally
// lose some information if we get two sig childs in rapid
// succession
- child_pid = pid;
+ child_pid = pid;
child_status = status;
}
cop_log_trace("Leaving sig_child(%d)\n", signum);
@@ -238,7 +238,7 @@ sig_child(int signum)
static void
sig_term(int signum)
{
- pid_t pid = 0;
+ pid_t pid = 0;
int status = 0;
// killsig = SIGTERM;
@@ -263,7 +263,7 @@ sig_term(int signum)
// next time through the event loop. We will occasionally
// lose some information if we get two sig childs in rapid
// succession
- child_pid = pid;
+ child_pid = pid;
child_status = status;
}
cop_log_trace("Leaving sig_term(%d), exiting traffic_cop\n", signum);
@@ -330,14 +330,14 @@ set_alarm_death()
cop_log_trace("Entering set_alarm_death()\n");
#if defined(solaris)
- action.sa_handler = NULL;
+ action.sa_handler = NULL;
action.sa_sigaction = sig_fatal;
sigemptyset(&action.sa_mask);
action.sa_flags = SA_SIGINFO;
#else
action.sa_handler = sig_fatal;
sigemptyset(&action.sa_mask);
- action.sa_flags = 0;
+ action.sa_flags = 0;
#endif
sigaction(SIGALRM, &action, NULL);
@@ -351,7 +351,7 @@ set_alarm_warn()
cop_log_trace("Entering set_alarm_warn()\n");
#if defined(solaris)
- action.sa_handler = NULL;
+ action.sa_handler = NULL;
action.sa_sigaction = sig_alarm_warn;
sigemptyset(&action.sa_mask);
action.sa_flags = SA_SIGINFO;
@@ -430,7 +430,7 @@ millisleep(int ms)
struct timespec ts;
cop_log_trace("Entering millisleep(%d)\n", ms);
- ts.tv_sec = ms / 1000;
+ ts.tv_sec = ms / 1000;
ts.tv_nsec = (ms - ts.tv_sec * 1000) * 1000 * 1000;
nanosleep(&ts, NULL);
cop_log_trace("Leaving millisleep(%d)\n", ms);
@@ -700,8 +700,8 @@ get_admin_user()
}
if (pwd) {
- admin_uid = pwd->pw_uid;
- admin_gid = pwd->pw_gid;
+ admin_uid = pwd->pw_uid;
+ admin_gid = pwd->pw_gid;
admin_user_p = true;
} else {
cop_log(COP_FATAL, "can't get passwd entry for the admin user '%s' - [%d] %s\n", admin_user, errno, strerror(errno));
@@ -762,8 +762,8 @@ poll_read_or_write(int fd, int timeout, int inorout)
struct pollfd info;
int err;
- info.fd = fd;
- info.events = inorout;
+ info.fd = fd;
+ info.events = inorout;
info.revents = 0;
do {
@@ -794,10 +794,10 @@ open_socket(int port, const char *ip = NULL, char const *ip_to_bind = NULL)
{
int sock = 0;
struct addrinfo hints;
- struct addrinfo *result = NULL;
+ struct addrinfo *result = NULL;
struct addrinfo *result_to_bind = NULL;
- char port_str[8] = {'\0'};
- int err = 0;
+ char port_str[8] = {'\0'};
+ int err = 0;
cop_log_trace("Entering open_socket(%d, %s, %s)\n", port, ip, ip_to_bind);
if (!ip) {
@@ -814,7 +814,7 @@ open_socket(int port, const char *ip = NULL, char const *ip_to_bind = NULL)
snprintf(port_str, sizeof(port_str), "%d", port);
memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_UNSPEC;
+ hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
err = getaddrinfo(ip, port_str, &hints, &result);
@@ -835,7 +835,7 @@ open_socket(int port, const char *ip = NULL, char const *ip_to_bind = NULL)
if (ip_to_bind) {
memset(&hints, 0, sizeof(hints));
- hints.ai_family = result->ai_family;
+ hints.ai_family = result->ai_family;
hints.ai_socktype = result->ai_socktype;
err = getaddrinfo(ip_to_bind, NULL, &hints, &result_to_bind);
@@ -1137,7 +1137,7 @@ static int
test_mgmt_cli_port()
{
TSString val = NULL;
- int ret = 0;
+ int ret = 0;
if (TSRecordGetString("proxy.config.manager_binary", &val) != TS_ERR_OKAY) {
cop_log(COP_WARNING, "(cli test) unable to retrieve manager_binary\n");
@@ -1305,7 +1305,7 @@ static int
server_up()
{
static int old_val = 0;
- int val = -1;
+ int val = -1;
int err;
cop_log_trace("Entering server_up()\n");
@@ -1322,9 +1322,9 @@ server_up()
}
if (val != old_val) {
- server_failures = 0;
+ server_failures = 0;
server_not_found = 0;
- old_val = val;
+ old_val = val;
}
if (val == 1) {
@@ -1398,7 +1398,7 @@ check_programs()
if (manager_flap_count >= MANAGER_MAX_FLAP_COUNT) {
// we've flapped too many times, hold off for a while
cop_log(COP_WARNING, "unable to start traffic_manager, retrying in %d second(s)\n", MANAGER_FLAP_RETRY_MSEC / 1000);
- manager_flapping = true;
+ manager_flapping = true;
manager_flap_retry_start_time = now;
} else {
// try to spawn traffic_manager
@@ -1414,7 +1414,7 @@ check_programs()
// we were flapping, take some time off and don't call
// spawn_manager
if (now - manager_flap_retry_start_time > MANAGER_FLAP_RETRY_MSEC) {
- manager_flapping = false;
+ manager_flapping = false;
manager_flap_interval_start_time = 0;
}
}
@@ -1568,7 +1568,7 @@ check(void *arg)
cop_log(COP_WARNING, "child terminated due to signal %d: %s\n", sig, strsignal(sig));
}
- child_pid = 0;
+ child_pid = 0;
child_status = 0;
}
@@ -1655,7 +1655,7 @@ init_signals()
// difficulty with generating core files when linking with libthread
// under solaris.
#if defined(solaris)
- action.sa_handler = NULL;
+ action.sa_handler = NULL;
action.sa_sigaction = sig_fatal;
#else
action.sa_handler = sig_fatal;
@@ -1664,7 +1664,7 @@ init_signals()
#if defined(solaris)
action.sa_flags = SA_SIGINFO;
#else
- action.sa_flags = 0;
+ action.sa_flags = 0;
#endif
sigaction(SIGQUIT, &action, NULL);
diff --git a/cmd/traffic_crashlog/procinfo.cc b/cmd/traffic_crashlog/procinfo.cc
index cb15b87..2650543 100644
--- a/cmd/traffic_crashlog/procinfo.cc
+++ b/cmd/traffic_crashlog/procinfo.cc
@@ -167,7 +167,7 @@ bool
crashlog_write_records(FILE *fp, const crashlog_target &)
{
TSMgmtError mgmterr;
- TSList list = TSListCreate();
+ TSList list = TSListCreate();
bool success = false;
if ((mgmterr = TSRecordGetMatchMlt(".", list)) != TS_ERR_OKAY) {
diff --git a/cmd/traffic_crashlog/traffic_crashlog.cc b/cmd/traffic_crashlog/traffic_crashlog.cc
index a965d82..696d018 100644
--- a/cmd/traffic_crashlog/traffic_crashlog.cc
+++ b/cmd/traffic_crashlog/traffic_crashlog.cc
@@ -31,11 +31,11 @@
#include "RecordsConfig.h"
#include "ts/BaseLogFile.h"
-static int syslog_mode = false;
-static int debug_mode = false;
-static int wait_mode = false;
+static int syslog_mode = false;
+static int debug_mode = false;
+static int wait_mode = false;
static char *host_triplet = NULL;
-static int target_pid = getppid();
+static int target_pid = getppid();
// If pid_t is not sizeof(int), we will have to jiggle argument parsing.
extern char __pid_size_static_assert[sizeof(pid_t) == sizeof(int) ? 0 : -1];
@@ -135,13 +135,13 @@ main(int /* argc ATS_UNUSED */, const char **argv)
}
openlog(appVersionInfo.AppStr, LOG_PID | LOG_NDELAY | LOG_NOWAIT, facility);
- diags->config.outputs[DL_Debug].to_syslog = true;
- diags->config.outputs[DL_Status].to_syslog = true;
- diags->config.outputs[DL_Note].to_syslog = true;
- diags->config.outputs[DL_Warning].to_syslog = true;
- diags->config.outputs[DL_Error].to_syslog = true;
- diags->config.outputs[DL_Fatal].to_syslog = true;
- diags->config.outputs[DL_Alert].to_syslog = true;
+ diags->config.outputs[DL_Debug].to_syslog = true;
+ diags->config.outputs[DL_Status].to_syslog = true;
+ diags->config.outputs[DL_Note].to_syslog = true;
+ diags->config.outputs[DL_Warning].to_syslog = true;
+ diags->config.outputs[DL_Error].to_syslog = true;
+ diags->config.outputs[DL_Fatal].to_syslog = true;
+ diags->config.outputs[DL_Alert].to_syslog = true;
diags->config.outputs[DL_Emergency].to_syslog = true;
}
@@ -156,7 +156,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
}
ink_zero(target);
- target.pid = (pid_t)target_pid;
+ target.pid = (pid_t)target_pid;
target.timestamp = timestamp();
if (host_triplet && strncmp(host_triplet, "x86_64-unknown-linux", sizeof("x86_64-unknown-linux") - 1) == 0) {
diff --git a/cmd/traffic_ctl/config.cc b/cmd/traffic_ctl/config.cc
index 4295407..3b9ba99 100644
--- a/cmd/traffic_ctl/config.cc
+++ b/cmd/traffic_ctl/config.cc
@@ -192,7 +192,7 @@ format_record(const CtrlMgmtRecord &record, bool recfmt)
static int
config_get(unsigned argc, const char **argv)
{
- int recfmt = 0;
+ int recfmt = 0;
const ArgumentDescription opts[] = {
{"records", '-', "Emit output in records.config format", "F", &recfmt, NULL, NULL},
};
@@ -301,7 +301,7 @@ config_set(unsigned argc, const char **argv)
static int
config_match(unsigned argc, const char **argv)
{
- int recfmt = 0;
+ int recfmt = 0;
const ArgumentDescription opts[] = {
{"records", '-', "Emit output in records.config format", "F", &recfmt, NULL, NULL},
};
@@ -393,7 +393,7 @@ config_status(unsigned argc, const char **argv)
static int
config_defaults(unsigned argc, const char **argv)
{
- int recfmt = 0;
+ int recfmt = 0;
const ArgumentDescription opts[] = {
{"records", '-', "Emit output in records.config format", "F", &recfmt, NULL, NULL},
};
@@ -430,7 +430,7 @@ config_defaults(unsigned argc, const char **argv)
static int
config_diff(unsigned argc, const char **argv)
{
- int recfmt = 0;
+ int recfmt = 0;
const ArgumentDescription opts[] = {
{"records", '-', "Emit output in records.config format", "F", &recfmt, NULL, NULL},
};
diff --git a/cmd/traffic_ctl/server.cc b/cmd/traffic_ctl/server.cc
index 70db76f..32a6db3 100644
--- a/cmd/traffic_ctl/server.cc
+++ b/cmd/traffic_ctl/server.cc
@@ -23,7 +23,7 @@
#include "traffic_ctl.h"
-static int drain = 0;
+static int drain = 0;
static int manager = 0;
const ArgumentDescription opts[] = {
diff --git a/cmd/traffic_ctl/traffic_ctl.cc b/cmd/traffic_ctl/traffic_ctl.cc
index eb2698c..bc66746 100644
--- a/cmd/traffic_ctl/traffic_ctl.cc
+++ b/cmd/traffic_ctl/traffic_ctl.cc
@@ -105,7 +105,7 @@ CtrlMgmtRecordValue::init(TSRecordT _t, TSRecordValueT _v)
}
break;
default:
- rec_type = TS_REC_STRING;
+ rec_type = TS_REC_STRING;
this->fmt.str = "(invalid)";
}
}
@@ -229,7 +229,7 @@ main(int argc, const char **argv)
};
BaseLogFile *base_log_file = new BaseLogFile("stderr");
- diags = new Diags("" /* tags */, "" /* actions */, base_log_file);
+ diags = new Diags("" /* tags */, "" /* actions */, base_log_file);
// Process command line arguments and dump into variables
if (!CtrlProcessArguments(argc, argv, argument_descriptions, countof(argument_descriptions))) {
@@ -239,7 +239,7 @@ main(int argc, const char **argv)
if (debug) {
diags->activate_taglist("traffic_ctl", DiagsTagType_Debug);
diags->config.enabled[DiagsTagType_Debug] = true;
- diags->show_location = true;
+ diags->show_location = true;
}
CtrlDebug("debug logging active");
diff --git a/cmd/traffic_line/traffic_line.cc b/cmd/traffic_line/traffic_line.cc
index a0194ad..dca27c8 100644
--- a/cmd/traffic_line/traffic_line.cc
+++ b/cmd/traffic_line/traffic_line.cc
@@ -80,7 +80,7 @@ handleArgInvocation()
} else if (*ZeroNode != '\0' || *ZeroCluster != '\0') {
TSMgmtError err;
TSRecordEle *rec_ele = TSRecordEleCreate();
- char *name = *ZeroNode ? ZeroNode : ZeroCluster;
+ char *name = *ZeroNode ? ZeroNode : ZeroCluster;
if ((err = TSRecordGet(name, rec_ele)) != TS_ERR_OKAY) {
fprintf(stderr, "%s: %s\n", program_name, TSGetErrorMessage(err));
@@ -121,7 +121,7 @@ handleArgInvocation()
} else if (*ClearAlarms != '\0') {
// Clear (some) active alarms, this was moved from the old traffic_shell implementation (config:alarm)
TSList events = TSListCreate();
- size_t len = strlen(ClearAlarms);
+ size_t len = strlen(ClearAlarms);
if (TS_ERR_OKAY != TSActiveEventGetMlt(events)) {
TSListDestroy(events);
@@ -138,8 +138,8 @@ handleArgInvocation()
}
int errors = 0;
- bool all = false;
- int num = -1;
+ bool all = false;
+ int num = -1;
if ((3 == len) && (0 == strncasecmp(ClearAlarms, "all", len))) {
all = true;
@@ -313,26 +313,26 @@ main(int /* argc ATS_UNUSED */, const char **argv)
program_name = appVersionInfo.AppStr;
- ReadVar[0] = '\0';
- MatchVar[0] = '\0';
- SetVar[0] = '\0';
- VarValue[0] = '\0';
- ReRead = 0;
- Shutdown = 0;
- BounceCluster = 0;
- BounceLocal = 0;
- QueryDeadhosts = 0;
- Startup = 0;
+ ReadVar[0] = '\0';
+ MatchVar[0] = '\0';
+ SetVar[0] = '\0';
+ VarValue[0] = '\0';
+ ReRead = 0;
+ Shutdown = 0;
+ BounceCluster = 0;
+ BounceLocal = 0;
+ QueryDeadhosts = 0;
+ Startup = 0;
ShutdownMgmtCluster = 0;
- ShutdownMgmtLocal = 0;
- ClearCluster = 0;
- ClearNode = 0;
- ZeroCluster[0] = '\0';
- ZeroNode[0] = '\0';
- *StorageCmdOffline = 0;
- ShowAlarms = 0;
- ShowStatus = 0;
- ClearAlarms[0] = '\0';
+ ShutdownMgmtLocal = 0;
+ ClearCluster = 0;
+ ClearNode = 0;
+ ZeroCluster[0] = '\0';
+ ZeroNode[0] = '\0';
+ *StorageCmdOffline = 0;
+ ShowAlarms = 0;
+ ShowStatus = 0;
+ ClearAlarms[0] = '\0';
/* Argument description table used to describe how to parse command line args, */
/* see 'ink_args.h' for meanings of the various fields */
diff --git a/cmd/traffic_manager/MgmtHandlers.cc b/cmd/traffic_manager/MgmtHandlers.cc
index 3f667e5..891d02d 100644
--- a/cmd/traffic_manager/MgmtHandlers.cc
+++ b/cmd/traffic_manager/MgmtHandlers.cc
@@ -69,8 +69,8 @@ newTcpSocket(int port)
}
// Specify our port number is network order
memset(&socketInfo, 0, sizeof(socketInfo));
- socketInfo.sin_family = AF_INET;
- socketInfo.sin_port = htons(port);
+ socketInfo.sin_family = AF_INET;
+ socketInfo.sin_port = htons(port);
socketInfo.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
// Allow for immediate re-binding to port
@@ -222,7 +222,7 @@ void *
mgmt_synthetic_main(void *)
{
int autoconfFD = -1; // FD for incoming autoconf connections
- int clientFD = -1; // FD for accepted connections
+ int clientFD = -1; // FD for accepted connections
int publicPort = -1; // Port for incoming autoconf connections
#if !defined(linux)
diff --git a/cmd/traffic_manager/StatProcessor.cc b/cmd/traffic_manager/StatProcessor.cc
index 7dbcb3d..e8d40c0 100644
--- a/cmd/traffic_manager/StatProcessor.cc
+++ b/cmd/traffic_manager/StatProcessor.cc
@@ -38,9 +38,9 @@
#define STAT_CONFIG_FILE "stats.config.xml"
StatObjectList statObjectList;
-StatXMLTag currentTag = INVALID_TAG;
-StatObject *statObject = NULL;
-char *exprContent = NULL;
+StatXMLTag currentTag = INVALID_TAG;
+StatObject *statObject = NULL;
+char *exprContent = NULL;
static unsigned statCount = 0; // global statistics object counter
bool nodeVar;
bool sumClusterVar;
@@ -92,10 +92,10 @@ elementStart(void * /* userData ATS_UNUSED */, const xmlchar *name, const xmlcha
if (!xml_strcmp(atts[i], "minimum")) {
statObject->m_stats_min = (MgmtFloat)xml_atof(atts[i + 1]);
- statObject->m_has_min = true;
+ statObject->m_has_min = true;
} else if (!xml_strcmp(atts[i], "maximum")) {
statObject->m_stats_max = (MgmtFloat)xml_atof(atts[i + 1]);
- statObject->m_has_max = true;
+ statObject->m_has_max = true;
} else if (!xml_strcmp(atts[i], "interval")) {
statObject->m_update_interval = (ink_hrtime)xml_atoi(atts[i + 1]);
} else if (!xml_strcmp(atts[i], "debug")) {
@@ -112,7 +112,7 @@ elementStart(void * /* userData ATS_UNUSED */, const xmlchar *name, const xmlcha
break;
case DST_TAG:
- nodeVar = true;
+ nodeVar = true;
sumClusterVar = true; // Should only be used with cluster variable
if (atts)
@@ -186,8 +186,8 @@ void
StatProcessor::rereadConfig(FileManager *configFiles)
{
textBuffer *fileContent = NULL;
- Rollback *fileRB = NULL;
- char *fileBuffer = NULL;
+ Rollback *fileRB = NULL;
+ char *fileBuffer = NULL;
version_t fileVersion;
int fileLen;
@@ -201,7 +201,7 @@ StatProcessor::rereadConfig(FileManager *configFiles)
fileVersion = fileRB->getCurrentVersion();
fileRB->getVersion(fileVersion, &fileContent);
fileBuffer = fileContent->bufPtr();
- fileLen = strlen(fileBuffer);
+ fileLen = strlen(fileBuffer);
#if HAVE_LIBEXPAT
/*
@@ -238,10 +238,10 @@ StatProcessor::rereadConfig(FileManager *configFiles)
/* Parse XML with libxml2 */
xmlSAXHandler sax;
memset(&sax, 0, sizeof(xmlSAXHandler));
- sax.startElement = elementStart;
- sax.endElement = elementEnd;
- sax.characters = charDataHandler;
- sax.initialized = 1;
+ sax.startElement = elementStart;
+ sax.endElement = elementEnd;
+ sax.characters = charDataHandler;
+ sax.initialized = 1;
xmlParserCtxtPtr parser = xmlCreatePushParserCtxt(&sax, NULL, NULL, 0, NULL);
int status = xmlParseChunk(parser, fileBuffer, fileLen, 1);
diff --git a/cmd/traffic_manager/StatType.cc b/cmd/traffic_manager/StatType.cc
index bea1ec0..abfb2d4 100644
--- a/cmd/traffic_manager/StatType.cc
+++ b/cmd/traffic_manager/StatType.cc
@@ -66,21 +66,21 @@ StatExprToken::copy(const StatExprToken &source)
m_token_name = ats_strdup(source.m_token_name);
}
- m_token_type = source.m_token_type;
- m_token_value = source.m_token_value;
+ m_token_type = source.m_token_type;
+ m_token_value = source.m_token_value;
m_token_value_min = source.m_token_value_min;
m_token_value_max = source.m_token_value_max;
if (source.m_token_value_delta) {
- m_token_value_delta = new StatDataSamples();
- m_token_value_delta->previous_time = source.m_token_value_delta->previous_time;
- m_token_value_delta->current_time = source.m_token_value_delta->current_time;
+ m_token_value_delta = new StatDataSamples();
+ m_token_value_delta->previous_time = source.m_token_value_delta->previous_time;
+ m_token_value_delta->current_time = source.m_token_value_delta->current_time;
m_token_value_delta->previous_value = source.m_token_value_delta->previous_value;
- m_token_value_delta->current_value = source.m_token_value_delta->current_value;
+ m_token_value_delta->current_value = source.m_token_value_delta->current_value;
}
m_node_var = source.m_node_var;
- m_sum_var = source.m_sum_var;
+ m_sum_var = source.m_sum_var;
}
/**
@@ -463,7 +463,7 @@ StatObject::assignDst(const char *str, bool m_node_var, bool m_sum_var)
statToken->assignTokenName(str);
statToken->m_node_var = m_node_var;
- statToken->m_sum_var = m_sum_var;
+ statToken->m_sum_var = m_sum_var;
// The type of dst token should be always not NULL
if (statToken->m_token_type == RECD_NULL) {
@@ -531,10 +531,10 @@ StatObject::assignExpr(char *str)
// delta
if (token[0] == '#') {
token += 1; // skip '#'
- statToken->m_token_value_delta = new StatDataSamples();
+ statToken->m_token_value_delta = new StatDataSamples();
statToken->m_token_value_delta->previous_time = (ink_hrtime)0;
- statToken->m_token_value_delta->current_time = (ink_hrtime)0;
- statToken->m_token_value_delta->data_type = RECD_NULL;
+ statToken->m_token_value_delta->current_time = (ink_hrtime)0;
+ statToken->m_token_value_delta->data_type = RECD_NULL;
RecDataZero(RECD_NULL, &statToken->m_token_value_delta->previous_value);
RecDataZero(RECD_NULL, &statToken->m_token_value_delta->current_value);
}
@@ -566,8 +566,8 @@ StatObject::infix2postfix()
{
StatExprList stack;
StatExprToken *tempToken = NULL;
- StatExprToken *curToken = NULL;
- m_postfix = new StatExprList();
+ StatExprToken *curToken = NULL;
+ m_postfix = new StatExprList();
while (m_expression->top()) {
curToken = m_expression->dequeue();
@@ -637,9 +637,9 @@ RecData
StatObject::NodeStatEval(RecDataT *result_type, bool cluster)
{
StatExprList stack;
- StatExprToken *left = NULL;
- StatExprToken *right = NULL;
- StatExprToken *result = NULL;
+ StatExprToken *left = NULL;
+ StatExprToken *right = NULL;
+ StatExprToken *result = NULL;
StatExprToken *curToken = NULL;
RecData tempValue;
RecDataZero(RECD_NULL, &tempValue);
@@ -682,7 +682,7 @@ StatObject::NodeStatEval(RecDataT *result_type, bool cluster)
} else {
ink_assert(isOperator(curToken->m_arith_symbol));
right = stack.pop();
- left = stack.pop();
+ left = stack.pop();
if (left->m_token_type == RECD_NULL) {
left->assignTokenType();
@@ -707,7 +707,7 @@ StatObject::NodeStatEval(RecDataT *result_type, bool cluster)
}
*result_type = stack.top()->m_token_type;
- tempValue = stack.top()->m_token_value;
+ tempValue = stack.top()->m_token_value;
}
return tempValue;
@@ -816,7 +816,7 @@ StatObject::StatBinaryEval(StatExprToken *left, char op, StatExprToken *right, b
{
RecData l, r;
StatExprToken *result = new StatExprToken();
- result->m_token_type = RECD_INT;
+ result->m_token_type = RECD_INT;
if (left->m_token_type == RECD_NULL && right->m_token_type == RECD_NULL) {
return result;
@@ -909,10 +909,10 @@ StatObject::StatBinaryEval(StatExprToken *left, char op, StatExprToken *right, b
result->m_token_type = RECD_FLOAT;
- t = (RecFloat)l.rec_int;
+ t = (RecFloat)l.rec_int;
l.rec_float = t;
- t = (RecFloat)r.rec_int;
+ t = (RecFloat)r.rec_int;
r.rec_float = t;
}
@@ -988,8 +988,8 @@ StatObjectList::Eval()
RecData result;
RecDataT result_type;
ink_hrtime threshold = 0;
- ink_hrtime delta = 0;
- short count = 0;
+ ink_hrtime delta = 0;
+ short count = 0;
RecDataZero(RECD_NULL, &tempValue);
RecDataZero(RECD_NULL, &result);
@@ -1022,7 +1022,7 @@ StatObjectList::Eval()
object->m_current_time = ink_get_hrtime_internal();
threshold = object->m_update_interval * HRTIME_SECOND;
- delta = object->m_current_time - object->m_last_update;
+ delta = object->m_current_time - object->m_last_update;
if (StatDebug) {
Debug(MODULE, "\tUPDATE:%" PRId64 " THRESHOLD:%" PRId64 ", DELTA:%" PRId64 "\n", object->m_update_interval, threshold,
@@ -1080,10 +1080,10 @@ StatObjectList::Eval()
RecDataZero(RECD_NULL, &tempValue);
}
- token->m_token_value_delta->previous_time = token->m_token_value_delta->current_time;
+ token->m_token_value_delta->previous_time = token->m_token_value_delta->current_time;
token->m_token_value_delta->previous_value = token->m_token_value_delta->current_value;
- token->m_token_value_delta->current_time = object->m_current_time;
- token->m_token_value_delta->current_value = tempValue;
+ token->m_token_value_delta->current_time = object->m_current_time;
+ token->m_token_value_delta->current_value = tempValue;
}
}
diff --git a/cmd/traffic_manager/WebOverview.cc b/cmd/traffic_manager/WebOverview.cc
index 9eb8b89..c6ee5f0 100644
--- a/cmd/traffic_manager/WebOverview.cc
+++ b/cmd/traffic_manager/WebOverview.cc
@@ -53,7 +53,7 @@ overviewRecord::overviewRecord(unsigned long inet_addr, bool local, ClusterPeerI
inetAddr = inet_addr;
- this->up = false;
+ this->up = false;
this->localNode = local;
// If this is the local node, there is no cluster peer info
@@ -63,13 +63,13 @@ overviewRecord::overviewRecord(unsigned long inet_addr, bool local, ClusterPeerI
// Set up the copy of the records array and initialize it
if (local == true) {
node_rec_data.num_recs = 0;
- node_rec_data.recs = NULL;
- recordArraySize = 0;
- node_rec_first_ix = 0;
+ node_rec_data.recs = NULL;
+ recordArraySize = 0;
+ node_rec_first_ix = 0;
} else {
node_rec_data.num_recs = cpi->node_rec_data.num_recs;
- recordArraySize = node_rec_data.num_recs * sizeof(RecRecord);
- node_rec_data.recs = new RecRecord[recordArraySize];
+ recordArraySize = node_rec_data.num_recs * sizeof(RecRecord);
+ node_rec_data.recs = new RecRecord[recordArraySize];
memcpy(node_rec_data.recs, cpi->node_rec_data.recs, recordArraySize);
// Recaculate the old relative index
@@ -87,7 +87,7 @@ overviewRecord::overviewRecord(unsigned long inet_addr, bool local, ClusterPeerI
}
const size_t hostNameLen = strlen(name_l) + 1;
- this->hostname = new char[hostNameLen];
+ this->hostname = new char[hostNameLen];
ink_strlcpy(this->hostname, name_l, hostNameLen);
ats_free(name_l);
}
@@ -145,9 +145,9 @@ overviewRecord::updateStatus(time_t currentTime, ClusterPeerInfo *cpi)
RecInt
overviewRecord::readInteger(const char *name, bool *found)
{
- RecInt rec = 0;
+ RecInt rec = 0;
int rec_status = REC_ERR_OKAY;
- int order = -1;
+ int order = -1;
if (localNode == false) {
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
@@ -171,9 +171,9 @@ overviewRecord::readInteger(const char *name, bool *found)
RecFloat
overviewRecord::readFloat(const char *name, bool *found)
{
- RecFloat rec = 0.0;
+ RecFloat rec = 0.0;
int rec_status = REC_ERR_OKAY;
- int order = -1;
+ int order = -1;
if (localNode == false) {
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
@@ -197,9 +197,9 @@ overviewRecord::readFloat(const char *name, bool *found)
RecString
overviewRecord::readString(const char *name, bool *found)
{
- RecString rec = NULL;
+ RecString rec = NULL;
int rec_status = REC_ERR_OKAY;
- int order = -1;
+ int order = -1;
if (localNode == false) {
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
@@ -235,7 +235,7 @@ RecData
overviewRecord::readData(RecDataT varType, const char *name, bool *found)
{
int rec_status = REC_ERR_OKAY;
- int order = -1;
+ int order = -1;
RecData rec;
RecDataZero(RECD_NULL, &rec);
@@ -275,8 +275,8 @@ overviewPage::overviewPage() : sortRecords(10, false)
{
ink_mutex_init(&accessLock, "overviewRecord");
nodeRecords = ink_hash_table_create(InkHashTableKeyType_Word);
- numHosts = 0;
- ourAddr = 0; // We will update this when we add the record for
+ numHosts = 0;
+ ourAddr = 0; // We will update this when we add the record for
// this machine
}
@@ -383,7 +383,7 @@ overviewPage::addSelfRecord()
// from cluster com
this->ourAddr = lmgmt->ccom->getIP();
- newRec = new overviewRecord(ourAddr, true);
+ newRec = new overviewRecord(ourAddr, true);
newRec->up = true;
ink_hash_table_insert(nodeRecords, (InkHashTableKey)this->ourAddr, (InkHashTableEntry *)newRec);
@@ -404,7 +404,7 @@ overviewRecord *
overviewPage::findNodeByName(const char *nodeName)
{
overviewRecord *current = NULL;
- bool nodeFound = false;
+ bool nodeFound = false;
// Do a linear search of the nodes for this nodeName.
// Yes, I know this is slow but the current word is ten
@@ -522,7 +522,7 @@ overviewPage::readFloat(const char *nodeName, const char *name, bool *found)
int
overviewPage::clusterSumData(RecDataT varType, const char *nodeVar, RecData *sum)
{
- int numUsed = 0;
+ int numUsed = 0;
int numHosts_local = sortRecords.getNumEntries();
overviewRecord *current;
bool found;
@@ -536,7 +536,7 @@ overviewPage::clusterSumData(RecDataT varType, const char *nodeVar, RecData *sum
if (current->up == true) {
numUsed++;
recTmp = current->readData(varType, nodeVar, &found);
- *sum = RecDataAdd(varType, *sum, recTmp);
+ *sum = RecDataAdd(varType, *sum, recTmp);
if (found == false) {
}
}
diff --git a/cmd/traffic_manager/metrics.cc b/cmd/traffic_manager/metrics.cc
index dfe0834..8e3d19d 100644
--- a/cmd/traffic_manager/metrics.cc
+++ b/cmd/traffic_manager/metrics.cc
@@ -187,7 +187,7 @@ metrics_register_evaluator(lua_State *L)
// The evaluation chunk is the (only) argument.
chunk = lua_tostring(L, -1);
- binding = BindingInstance::self(L);
+ binding = BindingInstance::self(L);
evaluators = (EvaluatorList *)binding->retrieve_ptr("evaluators");
ink_release_assert(evaluators != NULL);
@@ -204,7 +204,7 @@ metrics_create_record(lua_State *L, RecDataT data_type)
{
const char *name;
RecT rec_type = RECT_NULL;
- int error = REC_ERR_FAIL;
+ int error = REC_ERR_FAIL;
BindingInstance::typecheck(L, "record.create", LUA_TSTRING, LUA_TNONE);
diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc
index 7096874..196e253 100644
--- a/cmd/traffic_manager/traffic_manager.cc
+++ b/cmd/traffic_manager/traffic_manager.cc
@@ -81,11 +81,11 @@ static StatProcessor *statProcessor; // Statistics Processors
static AppVersionInfo appVersionInfo; // Build info for this application
static inkcoreapi DiagsConfig *diagsConfig;
-static char debug_tags[1024] = "";
+static char debug_tags[1024] = "";
static char action_tags[1024] = "";
-static bool proxy_off = false;
-static char bind_stdout[512] = "";
-static char bind_stderr[512] = "";
+static bool proxy_off = false;
+static char bind_stdout[512] = "";
+static char bind_stderr[512] = "";
static const char *mgmt_path = NULL;
@@ -119,12 +119,12 @@ rotateLogs()
// The reason being is that it is difficult to send a notification from TS to
// TM, informing TM that outputlog has been rolled. It is much easier sending
// a notification (in the form of SIGUSR2) from TM -> TS.
- int output_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_interval_sec");
- int output_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_size_mb");
+ int output_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_interval_sec");
+ int output_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_size_mb");
int output_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_enabled");
- int diags_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_interval_sec");
- int diags_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_size_mb");
- int diags_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_enabled");
+ int diags_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_interval_sec");
+ int diags_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_size_mb");
+ int diags_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_enabled");
diags->config_roll_diagslog((RollingEnabledValues)diags_log_roll_enable, diags_log_roll_int, diags_log_roll_size);
diags->config_roll_outputlog((RollingEnabledValues)output_log_roll_enable, output_log_roll_int, output_log_roll_size);
@@ -150,7 +150,7 @@ rotateLogs()
static bool
is_server_idle()
{
- RecInt active = 0;
+ RecInt active = 0;
RecInt threshold = 0;
if (RecGetRecordInt("proxy.config.restart.active_client_threshold", &threshold) != REC_ERR_OKAY) {
@@ -236,10 +236,10 @@ initSignalHandlers()
// Set up the signal handler
#if !defined(linux) && !defined(freebsd) && !defined(darwin)
- sigHandler.sa_handler = NULL;
+ sigHandler.sa_handler = NULL;
sigHandler.sa_sigaction = SignalHandler;
#else
- sigHandler.sa_handler = SignalHandler;
+ sigHandler.sa_handler = SignalHandler;
#endif
sigemptyset(&sigHandler.sa_mask);
@@ -258,7 +258,7 @@ initSignalHandlers()
#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sigHandler.sa_flags = SA_RESETHAND | SA_SIGINFO;
#else
- sigHandler.sa_flags = SA_RESETHAND;
+ sigHandler.sa_flags = SA_RESETHAND;
#endif
sigaction(SIGINT, &sigHandler, NULL);
sigaction(SIGQUIT, &sigHandler, NULL);
@@ -268,7 +268,7 @@ initSignalHandlers()
sigaction(SIGTERM, &sigHandler, NULL);
#if !defined(linux) && !defined(freebsd) && !defined(darwin)
- sigAlrmHandler.sa_handler = NULL;
+ sigAlrmHandler.sa_handler = NULL;
sigAlrmHandler.sa_sigaction = SignalAlrmHandler;
#else
sigAlrmHandler.sa_handler = SignalAlrmHandler;
@@ -278,7 +278,7 @@ initSignalHandlers()
#if !defined(linux) && !defined(freebsd) && !defined(darwin)
sigAlrmHandler.sa_flags = SA_SIGINFO;
#else
- sigAlrmHandler.sa_flags = 0;
+ sigAlrmHandler.sa_flags = 0;
#endif
sigaction(SIGALRM, &sigAlrmHandler, NULL);
@@ -305,7 +305,7 @@ initSignalHandlers()
// a problem with Solaris 2.6 and strange waitpid()
// behavior
sigChldHandler.sa_handler = SigChldHandler;
- sigChldHandler.sa_flags = SA_RESTART;
+ sigChldHandler.sa_flags = SA_RESTART;
sigemptyset(&sigChldHandler.sa_mask);
sigaction(SIGCHLD, &sigChldHandler, NULL);
}
@@ -394,7 +394,7 @@ Errata_Logger(ts::Errata const &err)
char buff[SIZE];
if (err.size()) {
ts::Errata::Code code = err.top().getCode();
- n = err.write(buff, SIZE, 1, 0, 2, "> ");
+ n = err.write(buff, SIZE, 1, 0, 2, "> ");
// strip trailing newlines.
while (n && (buff[n - 1] == '\n' || buff[n - 1] == '\r'))
buff[--n] = 0;
@@ -420,7 +420,7 @@ millisleep(int ms)
{
struct timespec ts;
- ts.tv_sec = ms / 1000;
+ ts.tv_sec = ms / 1000;
ts.tv_nsec = (ms - ts.tv_sec * 1000) * 1000 * 1000;
nanosleep(&ts, NULL); // we use nanosleep instead of sleep because it does not interact with signals
}
@@ -437,22 +437,22 @@ main(int argc, const char **argv)
// Set up the application version info
appVersionInfo.setup(PACKAGE_NAME, "traffic_manager", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, "");
- bool found = false;
- int just_started = 0;
+ bool found = false;
+ int just_started = 0;
int cluster_mcport = -1, cluster_rsport = -1;
// TODO: This seems completely incomplete, disabled for now
// int dump_config = 0, dump_process = 0, dump_node = 0, dump_cluster = 0, dump_local = 0;
- char *proxy_port = 0;
+ char *proxy_port = 0;
int proxy_backdoor = -1;
char *group_addr = NULL, *tsArgs = NULL;
bool disable_syslog = false;
- RecBool enable_lua = false;
+ RecBool enable_lua = false;
char userToRunAs[MAX_LOGIN + 1];
RecInt fds_throttle = -1;
time_t ticker;
ink_thread synthThrId;
- int binding_version = 0;
+ int binding_version = 0;
BindingInstance *binding = NULL;
ArgumentDescription argument_descriptions[] = {
@@ -505,7 +505,7 @@ main(int argc, const char **argv)
// Bootstrap the Diags facility so that we can use it while starting
// up the manager
diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, debug_tags, action_tags, false);
- diags = diagsConfig->diags;
+ diags = diagsConfig->diags;
diags->set_stdout_output(bind_stdout);
diags->set_stderr_output(bind_stderr);
diags->prefix_str = "Manager ";
@@ -552,7 +552,7 @@ main(int argc, const char **argv)
// INKqa11968: need to set up callbacks and diags data structures
// using configuration in records.config
diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, debug_tags, action_tags, true);
- diags = diagsConfig->diags;
+ diags = diagsConfig->diags;
RecSetDiags(diags);
diags->prefix_str = "Manager ";
diags->set_stdout_output(bind_stdout);
@@ -572,7 +572,7 @@ main(int argc, const char **argv)
RecSetRecordString("proxy.node.version.manager.build_person", appVersionInfo.BldPersonStr, REC_SOURCE_DEFAULT);
if (!disable_syslog) {
- char sys_var[] = "proxy.config.syslog_facility";
+ char sys_var[] = "proxy.config.syslog_facility";
char *facility_str = NULL;
int facility_int;
@@ -671,8 +671,8 @@ main(int argc, const char **argv)
ink_assert(found);
}
- in_addr_t min_ip = inet_network("224.0.0.255");
- in_addr_t max_ip = inet_network("239.255.255.255");
+ in_addr_t min_ip = inet_network("224.0.0.255");
+ in_addr_t max_ip = inet_network("239.255.255.255");
in_addr_t group_addr_ip = inet_network(group_addr);
if (!(min_ip < group_addr_ip && group_addr_ip < max_ip)) {
@@ -707,8 +707,8 @@ main(int argc, const char **argv)
mode_t oldmask = umask(0);
mode_t newmode = api_socket_is_restricted() ? 00700 : 00777;
- int mgmtapiFD = -1; // FD for the api interface to issue commands
- int eventapiFD = -1; // FD for the api and clients to handle event callbacks
+ int mgmtapiFD = -1; // FD for the api interface to issue commands
+ int eventapiFD = -1; // FD for the api and clients to handle event callbacks
char mgmtapiFailMsg[] = "Traffic server management API service Interface Failed to Initialize.";
mgmtapiFD = bind_unix_domain_socket(apisock, newmode);
@@ -743,7 +743,7 @@ main(int argc, const char **argv)
#if !TS_USE_LUAJIT
if (enable_lua) {
static bool warned = false;
- enable_lua = false;
+ enable_lua = false;
if (!warned) {
Warning("missing Lua support, disabling Lua derived metrics");
@@ -849,7 +849,7 @@ main(int argc, const char **argv)
}
if (lmgmt->startProxy()) {
just_started = 0;
- sleep_time = 0;
+ sleep_time = 0;
} else {
just_started++;
}
@@ -859,7 +859,7 @@ main(int argc, const char **argv)
/* This will catch the case were the proxy dies before it can connect to manager */
if (lmgmt->proxy_launch_outstanding && !lmgmt->processRunning() && just_started >= 120) {
- just_started = 0;
+ just_started = 0;
lmgmt->proxy_launch_outstanding = false;
if (lmgmt->proxy_launch_pid != -1) {
int res;
@@ -1103,7 +1103,7 @@ fileUpdated(char *fname, bool incVersion)
int
restoreCapabilities()
{
- int zret = 0; // return value.
+ int zret = 0; // return value.
cap_t cap_set = cap_get_proc(); // current capabilities
// Make a list of the capabilities we want turned on.
cap_value_t cap_list[] = {
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index a1e2f86..14d2a5f 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -49,10 +49,10 @@ extern string response;
namespace constant
{
-const char global[] = "\"global\": {\n";
-const char start[] = "\"proxy.process.";
+const char global[] = "\"global\": {\n";
+const char start[] = "\"proxy.process.";
const char seperator[] = "\": \"";
-const char end[] = "\",\n";
+const char end[] = "\",\n";
};
//----------------------------------------------------------------------------
@@ -69,9 +69,9 @@ public:
// set the host
size_t start = _url.find(":");
- size_t end = _url.find("/", start + 3);
- _host = _url.substr(start + 3, end - start - 3);
- end = _host.find(":");
+ size_t end = _url.find("/", start + 3);
+ _host = _url.substr(start + 3, end - start - 3);
+ end = _host.find(":");
if (end != string::npos) {
_host = _host.substr(0, end);
}
@@ -82,9 +82,9 @@ public:
_host = hostname;
}
- _stats = NULL;
+ _stats = NULL;
_old_stats = NULL;
- _absolute = false;
+ _absolute = false;
lookup_table.insert(make_pair("version", LookupItem("Version", "proxy.process.version.server.short", 1)));
lookup_table.insert(make_pair("disk_used", LookupItem("Disk Used", "proxy.process.cache.bytes_used", 1)));
lookup_table.insert(make_pair("disk_total", LookupItem("Disk Total", "proxy.process.cache.bytes_total", 1)));
@@ -246,7 +246,7 @@ public:
_old_stats = NULL;
}
_old_stats = _stats;
- _stats = new map<string, string>;
+ _stats = new map<string, string>;
gettimeofday(&_time, NULL);
double now = _time.tv_sec + (double)_time.tv_usec / 1000000;
@@ -259,7 +259,7 @@ public:
// special case for Version information
TSString strValue = NULL;
assert(TSRecordGetString(item.name, &strValue) == TS_ERR_OKAY);
- string key = item.name;
+ string key = item.name;
(*_stats)[key] = strValue;
TSfree(strValue);
} else {
@@ -271,13 +271,13 @@ public:
string key = item.name;
char buffer[32];
sprintf(buffer, "%" PRId64, value);
- string foo = buffer;
+ string foo = buffer;
(*_stats)[key] = foo;
}
}
}
- _old_time = _now;
- _now = now;
+ _old_time = _now;
+ _now = now;
_time_diff = _now - _old_time;
} else {
CURL *curl;
@@ -304,12 +304,12 @@ public:
_old_stats = NULL;
}
_old_stats = _stats;
- _stats = new map<string, string>;
+ _stats = new map<string, string>;
// parse
parseResponse(response);
- _old_time = _now;
- _now = now;
+ _old_time = _now;
+ _now = now;
_time_diff = _now - _old_time;
} else {
fprintf(stderr, "Can't fetch url %s", _url.c_str());
@@ -360,7 +360,7 @@ public:
map<string, LookupItem>::const_iterator lookup_it = lookup_table.find(key);
assert(lookup_it != lookup_table.end());
const LookupItem &item = lookup_it->second;
- prettyName = item.pretty;
+ prettyName = item.pretty;
if (overrideType != 0)
type = overrideType;
else
@@ -380,7 +380,7 @@ public:
value = (value - old) / _time_diff;
}
} else if (type == 3 || type == 4) {
- double numerator = 0;
+ double numerator = 0;
double denominator = 0;
getStat(item.numerator, numerator);
getStat(item.denominator, denominator);
@@ -440,9 +440,9 @@ public:
// find parts of the line
while (1) {
- size_t start = response.find(constant::start, pos);
+ size_t start = response.find(constant::start, pos);
size_t seperator = response.find(constant::seperator, pos);
- size_t end = response.find(constant::end, pos);
+ size_t end = response.find(constant::end, pos);
if (start == string::npos || seperator == string::npos || end == string::npos)
return;
diff --git a/cmd/traffic_top/traffic_top.cc b/cmd/traffic_top/traffic_top.cc
index 64a549c..34d0aef 100644
--- a/cmd/traffic_top/traffic_top.cc
+++ b/cmd/traffic_top/traffic_top.cc
@@ -59,13 +59,13 @@ string response;
namespace colorPair
{
-const short red = 1;
+const short red = 1;
const short yellow = 2;
-const short green = 3;
-const short blue = 4;
+const short green = 3;
+const short blue = 4;
// const short black = 5;
-const short grey = 6;
-const short cyan = 7;
+const short grey = 6;
+const short cyan = 7;
const short border = 8;
};
@@ -74,25 +74,25 @@ static void
prettyPrint(const int x, const int y, const double number, const int type)
{
char buffer[32];
- char exp = ' ';
+ char exp = ' ';
double my_number = number;
short color;
if (number > 1000000000000LL) {
my_number = number / 1000000000000LL;
- exp = 'T';
- color = colorPair::red;
+ exp = 'T';
+ color = colorPair::red;
} else if (number > 1000000000) {
my_number = number / 1000000000;
- exp = 'G';
- color = colorPair::red;
+ exp = 'G';
+ color = colorPair::red;
} else if (number > 1000000) {
my_number = number / 1000000;
- exp = 'M';
- color = colorPair::yellow;
+ exp = 'M';
+ color = colorPair::yellow;
} else if (number > 1000) {
my_number = number / 1000;
- exp = 'K';
- color = colorPair::cyan;
+ exp = 'K';
+ color = colorPair::cyan;
} else if (my_number <= .09) {
color = colorPair::grey;
} else {
@@ -220,7 +220,7 @@ help(const string &host, const string &version)
while (1) {
clear();
- time_t now = time(NULL);
+ time_t now = time(NULL);
struct tm *nowtm = localtime(&now);
char timeBuf[32];
strftime(timeBuf, sizeof(timeBuf), "%H:%M:%S", nowtm);
@@ -385,7 +385,7 @@ int
main(int argc, char **argv)
{
int sleep_time = 6000;
- bool absolute = false;
+ bool absolute = false;
int opt;
while ((opt = getopt(argc, argv, "s:")) != -1) {
switch (opt) {
@@ -428,7 +428,7 @@ main(int argc, char **argv)
MAIN_PAGE,
RESPONSE_PAGE,
};
- Page page = MAIN_PAGE;
+ Page page = MAIN_PAGE;
string page_alt = "(r)esponse";
while (1) {
@@ -436,7 +436,7 @@ main(int argc, char **argv)
attron(A_BOLD);
string version;
- time_t now = time(NULL);
+ time_t now = time(NULL);
struct tm *nowtm = localtime(&now);
char timeBuf[32];
strftime(timeBuf, sizeof(timeBuf), "%H:%M:%S", nowtm);
@@ -464,11 +464,11 @@ main(int argc, char **argv)
case 'q':
goto quit;
case 'm':
- page = MAIN_PAGE;
+ page = MAIN_PAGE;
page_alt = "(r)esponse";
break;
case 'r':
- page = RESPONSE_PAGE;
+ page = RESPONSE_PAGE;
page_alt = "(m)ain";
break;
case 'a':
diff --git a/cmd/traffic_via/traffic_via.cc b/cmd/traffic_via/traffic_via.cc
index c816f5a..8df1a9b 100644
--- a/cmd/traffic_via/traffic_via.cc
+++ b/cmd/traffic_via/traffic_via.cc
@@ -59,7 +59,7 @@ detailViaLookup(char flag)
// Detailed via codes after ":"
switch (flag) {
case 't':
- viaTable = new VIA("Tunnel info");
+ viaTable = new VIA("Tunnel info");
viaTable->viaData[(unsigned char)' '] = "no tunneling";
viaTable->viaData[(unsigned char)'U'] = "tunneling because of url (url suggests dynamic content)";
viaTable->viaData[(unsigned char)'M'] = "tunneling due to a method (e.g. CONNECT)";
@@ -70,7 +70,7 @@ detailViaLookup(char flag)
break;
case 'c':
// Cache type
- viaTable = new VIA("Cache Type");
+ viaTable = new VIA("Cache Type");
viaTable->viaData[(unsigned char)'C'] = "cache";
viaTable->viaData[(unsigned char)'L'] = "cluster, (not used)";
viaTable->viaData[(unsigned char)'I'] = "icp";
@@ -79,7 +79,7 @@ detailViaLookup(char flag)
viaTable->viaData[(unsigned char)' '] = "unknown";
// Cache Lookup Result
- viaTable->next = new VIA("Cache Lookup Result");
+ viaTable->next = new VIA("Cache Lookup Result");
viaTable->next->viaData[(unsigned char)'C'] = "cache hit but config forces revalidate";
viaTable->next->viaData[(unsigned char)'I'] = "conditional miss (client sent conditional, fresh in cache, returned 412)";
viaTable->next->viaData[(unsigned char)' '] = "cache miss or no cache lookup";
@@ -92,19 +92,19 @@ detailViaLookup(char flag)
viaTable->next->viaData[(unsigned char)'K'] = "cookie miss";
break;
case 'i':
- viaTable = new VIA("ICP status");
+ viaTable = new VIA("ICP status");
viaTable->viaData[(unsigned char)' '] = "no icp";
viaTable->viaData[(unsigned char)'S'] = "connection opened successfully";
viaTable->viaData[(unsigned char)'F'] = "connection open failed";
break;
case 'p':
- viaTable = new VIA("Parent proxy connection status");
+ viaTable = new VIA("Parent proxy connection status");
viaTable->viaData[(unsigned char)' '] = "no parent proxy or unknown";
viaTable->viaData[(unsigned char)'S'] = "connection opened successfully";
viaTable->viaData[(unsigned char)'F'] = "connection open failed";
break;
case 's':
- viaTable = new VIA("Origin server connection status");
+ viaTable = new VIA("Origin server connection status");
viaTable->viaData[(unsigned char)' '] = "no server connection needed";
viaTable->viaData[(unsigned char)'S'] = "connection opened successfully";
viaTable->viaData[(unsigned char)'F'] = "connection open failed";
@@ -127,7 +127,7 @@ standardViaLookup(char flag)
// Via codes before ":"
switch (flag) {
case 'u':
- viaTable = new VIA("Request headers received from client");
+ viaTable = new VIA("Request headers received from client");
viaTable->viaData[(unsigned char)'C'] = "cookie";
viaTable->viaData[(unsigned char)'E'] = "error in request";
viaTable->viaData[(unsigned char)'S'] = "simple request (not conditional)";
@@ -136,7 +136,7 @@ standardViaLookup(char flag)
viaTable->viaData[(unsigned char)' '] = "unknown";
break;
case 'c':
- viaTable = new VIA("Result of Traffic Server cache lookup for URL");
+ viaTable = new VIA("Result of Traffic Server cache lookup for URL");
viaTable->viaData[(unsigned char)'A'] = "in cache, not acceptable (a cache \"MISS\")";
viaTable->viaData[(unsigned char)'H'] = "in cache, fresh (a cache \"HIT\")";
viaTable->viaData[(unsigned char)'S'] = "in cache, stale (a cache \"MISS\")";
@@ -145,28 +145,28 @@ standardViaLookup(char flag)
viaTable->viaData[(unsigned char)' '] = "no cache lookup";
break;
case 's':
- viaTable = new VIA("Response information received from origin server");
+ viaTable = new VIA("Response information received from origin server");
viaTable->viaData[(unsigned char)'E'] = "error in response";
viaTable->viaData[(unsigned char)'S'] = "connection opened successfully";
viaTable->viaData[(unsigned char)'N'] = "not-modified";
viaTable->viaData[(unsigned char)' '] = "no server connection needed";
break;
case 'f':
- viaTable = new VIA("Result of document write-to-cache:");
+ viaTable = new VIA("Result of document write-to-cache:");
viaTable->viaData[(unsigned char)'U'] = "updated old cache copy";
viaTable->viaData[(unsigned char)'D'] = "cached copy deleted";
viaTable->viaData[(unsigned char)'W'] = "written into cache (new copy)";
viaTable->viaData[(unsigned char)' '] = "no cache write performed";
break;
case 'p':
- viaTable = new VIA("Proxy operation result");
+ viaTable = new VIA("Proxy operation result");
viaTable->viaData[(unsigned char)'R'] = "origin server revalidated";
viaTable->viaData[(unsigned char)' '] = "unknown";
viaTable->viaData[(unsigned char)'S'] = "served or connection opened successfully";
viaTable->viaData[(unsigned char)'N'] = "not-modified";
break;
case 'e':
- viaTable = new VIA("Error codes (if any)");
+ viaTable = new VIA("Error codes (if any)");
viaTable->viaData[(unsigned char)'A'] = "authorization failure";
viaTable->viaData[(unsigned char)'H'] = "header syntax unacceptable";
viaTable->viaData[(unsigned char)'C'] = "connection to server failed";
@@ -308,7 +308,7 @@ filterViaHeader()
char *subStringBegin = viaHeader + subStringVector[2 * i];
// Get length of matched substring
int subStringLen = subStringVector[2 * i + 1] - subStringVector[2 * i];
- viaHeaderString = subStringBegin;
+ viaHeaderString = subStringBegin;
sprintf(viaHeaderString, "%.*s", subStringLen, subStringBegin);
// Decode matched substring
decodeViaHeader(viaHeaderString);
diff --git a/cmd/traffic_wccp/wccp_client.cc b/cmd/traffic_wccp/wccp_client.cc
index 312772c..0baaecd 100644
--- a/cmd/traffic_wccp/wccp_client.cc
+++ b/cmd/traffic_wccp/wccp_client.cc
@@ -44,7 +44,7 @@
#define WCCP_LOCK "wccp.pid"
-bool do_debug = false;
+bool do_debug = false;
bool do_daemon = false;
static char const USAGE_TEXT[] = "%s\n"
@@ -117,11 +117,11 @@ main(int argc, char **argv)
// getopt return values. Selected to avoid collisions with
// short arguments.
static int const OPT_ADDRESS = 257; ///< Bind to IP address option.
- static int const OPT_HELP = 258; ///< Print help message.
- static int const OPT_ROUTER = 259; ///< Seeded router IP address.
+ static int const OPT_HELP = 258; ///< Print help message.
+ static int const OPT_ROUTER = 259; ///< Seeded router IP address.
static int const OPT_SERVICE = 260; ///< Service group definition.
- static int const OPT_DEBUG = 261; ///< Enable debug printing
- static int const OPT_DAEMON = 262; ///< Disconnect and run as daemon
+ static int const OPT_DEBUG = 261; ///< Enable debug printing
+ static int const OPT_DAEMON = 262; ///< Disconnect and run as daemon
static option OPTIONS[] = {
{"address", 1, 0, OPT_ADDRESS},
@@ -133,34 +133,34 @@ main(int argc, char **argv)
{0, 0, 0, 0} // required terminator.
};
- in_addr ip_addr = {INADDR_ANY};
+ in_addr ip_addr = {INADDR_ANY};
in_addr router_addr = {INADDR_ANY};
int zret; // getopt return.
int zidx; // option index.
- bool fail = false;
+ bool fail = false;
char const *FAIL_MSG = "";
while (-1 != (zret = getopt_long_only(argc, argv, "", OPTIONS, &zidx))) {
switch (zret) {
case OPT_HELP:
FAIL_MSG = "Usage:";
- fail = true;
+ fail = true;
break;
case '?':
FAIL_MSG = "Invalid option specified.";
- fail = true;
+ fail = true;
break;
case OPT_ADDRESS:
if (0 == inet_aton(optarg, &ip_addr)) {
FAIL_MSG = "Invalid IP address specified for client.";
- fail = true;
+ fail = true;
}
break;
case OPT_ROUTER:
if (0 == inet_aton(optarg, &router_addr)) {
FAIL_MSG = "Invalid IP address specified for router.";
- fail = true;
+ fail = true;
}
break;
case OPT_SERVICE: {
@@ -205,7 +205,7 @@ main(int argc, char **argv)
pollfd pfa[POLL_FD_COUNT];
// Poll on the socket.
- pfa[0].fd = wcp.getSocket();
+ pfa[0].fd = wcp.getSocket();
pfa[0].events = POLLIN;
wcp.housekeeping();
diff --git a/example/add-header/add-header.c b/example/add-header/add-header.c
index 4647a6e..50257b1 100644
--- a/example/add-header/add-header.c
+++ b/example/add-header/add-header.c
@@ -126,8 +126,8 @@ TSPluginInit(int argc, const char *argv[])
int i, retval;
TSPluginRegistrationInfo info;
- info.plugin_name = "add-header";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "add-header";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/append-transform/append-transform.c b/example/append-transform/append-transform.c
index 5ede811..122c437 100644
--- a/example/append-transform/append-transform.c
+++ b/example/append-transform/append-transform.c
@@ -64,7 +64,7 @@ my_data_alloc()
data = (MyData *)TSmalloc(sizeof(MyData));
TSReleaseAssert(data);
- data->output_vio = NULL;
+ data->output_vio = NULL;
data->output_buffer = NULL;
data->output_reader = NULL;
data->append_needed = 1;
@@ -110,10 +110,10 @@ handle_transform(TSCont contp)
if (towrite != INT64_MAX) {
towrite += append_buffer_length;
}
- data = my_data_alloc();
+ data = my_data_alloc();
data->output_buffer = TSIOBufferCreate();
data->output_reader = TSIOBufferReaderAlloc(data->output_buffer);
- data->output_vio = TSVConnWrite(output_conn, contp, data->output_reader, towrite);
+ data->output_vio = TSVConnWrite(output_conn, contp, data->output_reader, towrite);
TSContDataSet(contp, data);
}
@@ -322,12 +322,12 @@ load(const char *filename)
return 0;
}
- append_buffer = TSIOBufferCreate();
+ append_buffer = TSIOBufferCreate();
append_buffer_reader = TSIOBufferReaderAlloc(append_buffer);
for (;;) {
blk = TSIOBufferStart(append_buffer);
- p = TSIOBufferBlockWriteStart(blk, &avail);
+ p = TSIOBufferBlockWriteStart(blk, &avail);
err = TSfread(fp, p, avail);
if (err > 0) {
@@ -348,8 +348,8 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = "append-transform";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "append-transform";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/basic-auth/basic-auth.c b/example/basic-auth/basic-auth.c
index 8c22472..b83ec11 100644
--- a/example/basic-auth/basic-auth.c
+++ b/example/basic-auth/basic-auth.c
@@ -126,7 +126,7 @@ handle_dns(TSHttpTxn txnp, TSCont contp)
ptr += 1;
}
- user = base64_decode(ptr);
+ user = base64_decode(ptr);
password = strchr(user, ':');
if (!password) {
TSError("[basic_auth] No password in authorization information");
@@ -164,7 +164,7 @@ handle_response(TSHttpTxn txnp)
TSMLoc hdr_loc;
TSMLoc field_loc;
const char *insert = "Basic realm=\"proxy\"";
- int len = strlen(insert);
+ int len = strlen(insert);
if (TSHttpTxnClientRespGet(txnp, &bufp, &hdr_loc) != TS_SUCCESS) {
TSError("[basic_auth] Couldn't retrieve client response header");
@@ -212,8 +212,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
int i, cc;
TSPluginRegistrationInfo info;
- info.plugin_name = "basic-authorization";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "basic-authorization";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/blacklist-0/blacklist-0.c b/example/blacklist-0/blacklist-0.c
index 003f5c0..d61cc83 100644
--- a/example/blacklist-0/blacklist-0.c
+++ b/example/blacklist-0/blacklist-0.c
@@ -151,8 +151,8 @@ TSPluginInit(int argc, const char *argv[])
int i;
TSPluginRegistrationInfo info;
- info.plugin_name = "blacklist-0";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "blacklist-0";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/blacklist-1/blacklist-1.c b/example/blacklist-1/blacklist-1.c
index 5b178f9..1a5c0f6 100644
--- a/example/blacklist-1/blacklist-1.c
+++ b/example/blacklist-1/blacklist-1.c
@@ -178,7 +178,7 @@ read_blacklist(TSCont contp)
TSFile file;
sprintf(blacklist_file, "%s/blacklist.txt", TSPluginDirGet());
- file = TSfopen(blacklist_file, "r");
+ file = TSfopen(blacklist_file, "r");
nsites = 0;
/* If the Mutext lock is not successful try again in RETRY_TIME */
@@ -233,7 +233,7 @@ blacklist_plugin(TSCont contp, TSEvent event, void *edata)
return 0;
case TS_EVENT_HTTP_OS_DNS:
if (contp != global_contp) {
- cd = (cdata *)TSContDataGet(contp);
+ cd = (cdata *)TSContDataGet(contp);
cd->cf = HANDLE_DNS;
handle_dns(cd->txnp, contp);
return 0;
@@ -248,7 +248,7 @@ blacklist_plugin(TSCont contp, TSEvent event, void *edata)
break;
case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
if (contp != global_contp) {
- cd = (cdata *)TSContDataGet(contp);
+ cd = (cdata *)TSContDataGet(contp);
cd->cf = HANDLE_RESPONSE;
handle_response(cd->txnp, contp);
return 0;
@@ -309,8 +309,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
TSPluginRegistrationInfo info;
TSReturnCode error;
- info.plugin_name = "blacklist-1";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "blacklist-1";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/bnull-transform/bnull-transform.c b/example/bnull-transform/bnull-transform.c
index 5dbdf99..e8e3f0f 100644
--- a/example/bnull-transform/bnull-transform.c
+++ b/example/bnull-transform/bnull-transform.c
@@ -55,9 +55,9 @@ my_data_alloc()
{
MyData *data;
- data = (MyData *)TSmalloc(sizeof(MyData));
- data->state = STATE_BUFFER_DATA;
- data->output_vio = NULL;
+ data = (MyData *)TSmalloc(sizeof(MyData));
+ data->state = STATE_BUFFER_DATA;
+ data->output_vio = NULL;
data->output_buffer = NULL;
data->output_reader = NULL;
@@ -266,7 +266,7 @@ transformable(TSHttpTxn txnp)
if (TS_SUCCESS == TSHttpTxnServerRespGet(txnp, &bufp, &hdr_loc)) {
resp_status = TSHttpHdrStatusGet(bufp, hdr_loc);
- retv = (resp_status == TS_HTTP_STATUS_OK);
+ retv = (resp_status == TS_HTTP_STATUS_OK);
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
}
@@ -308,8 +308,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
TSPluginRegistrationInfo info;
TSMutex mutex = TS_NULL_MUTEX;
- info.plugin_name = "buffered-null-transform";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "buffered-null-transform";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/cache-scan/cache-scan.cc b/example/cache-scan/cache-scan.cc
index 998a2fb..73c77fc 100644
--- a/example/cache-scan/cache-scan.cc
+++ b/example/cache-scan/cache-scan.cc
@@ -67,10 +67,10 @@ handle_scan(TSCont contp, TSEvent event, void *edata)
cache_scan_state *cstate = (cache_scan_state *)TSContDataGet(contp);
if (event == TS_EVENT_CACHE_REMOVE) {
- cstate->done = 1;
+ cstate->done = 1;
const char error[] = "Cache remove operation succeeded";
- cstate->cache_vc = (TSVConn)edata;
- cstate->write_vio = TSVConnWrite(cstate->net_vc, contp, cstate->resp_reader, INT64_MAX);
+ cstate->cache_vc = (TSVConn)edata;
+ cstate->write_vio = TSVConnWrite(cstate->net_vc, contp, cstate->resp_reader, INT64_MAX);
cstate->total_bytes += TSIOBufferWrite(cstate->resp_buffer, error, sizeof(error) - 1);
TSVIONBytesSet(cstate->write_vio, cstate->total_bytes);
TSVIOReenable(cstate->write_vio);
@@ -78,11 +78,11 @@ handle_scan(TSCont contp, TSEvent event, void *edata)
}
if (event == TS_EVENT_CACHE_REMOVE_FAILED) {
- cstate->done = 1;
+ cstate->done = 1;
const char error[] = "Cache remove operation failed error=";
char rc[12];
snprintf(rc, 12, "%p", edata);
- cstate->cache_vc = (TSVConn)edata;
+ cstate->cache_vc = (TSVConn)edata;
cstate->write_vio = TSVConnWrite(cstate->net_vc, contp, cstate->resp_reader, INT64_MAX);
cstate->total_bytes += TSIOBufferWrite(cstate->resp_buffer, error, sizeof(error) - 1);
cstate->total_bytes += TSIOBufferWrite(cstate->resp_buffer, rc, strlen(rc));
@@ -94,7 +94,7 @@ handle_scan(TSCont contp, TSEvent event, void *edata)
// first scan event, save vc and start write
if (event == TS_EVENT_CACHE_SCAN) {
- cstate->cache_vc = (TSVConn)edata;
+ cstate->cache_vc = (TSVConn)edata;
cstate->write_vio = TSVConnWrite(cstate->net_vc, contp, cstate->resp_reader, INT64_MAX);
return TS_EVENT_CONTINUE;
}
@@ -187,7 +187,7 @@ handle_accept(TSCont contp, TSEvent event, TSVConn vc)
// setup vc, buffers
cstate->net_vc = vc;
- cstate->req_buffer = TSIOBufferCreate();
+ cstate->req_buffer = TSIOBufferCreate();
cstate->resp_buffer = TSIOBufferCreate();
cstate->resp_reader = TSIOBufferReaderAlloc(cstate->resp_buffer);
@@ -258,7 +258,7 @@ handle_io(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */)
// we don't care about the request, so just shut down the read vc
TSVConnShutdown(cstate->net_vc, 1, 0);
// setup the response headers so we are ready to write body
- char hdrs[] = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n";
+ char hdrs[] = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n";
cstate->total_bytes = TSIOBufferWrite(cstate->resp_buffer, hdrs, sizeof(hdrs) - 1);
if (cstate->key_to_delete) {
@@ -341,7 +341,7 @@ cache_intercept(TSCont contp, TSEvent event, void *edata)
int
unescapifyStr(char *buffer)
{
- char *read = buffer;
+ char *read = buffer;
char *write = buffer;
char subStr[3];
@@ -350,7 +350,7 @@ unescapifyStr(char *buffer)
if (*read == '%' && *(read + 1) != '\0' && *(read + 2) != '\0') {
subStr[0] = *(++read);
subStr[1] = *(++read);
- *write = (char)strtol(subStr, (char **)NULL, 16);
+ *write = (char)strtol(subStr, (char **)NULL, 16);
read++;
write++;
} else if (*read == '+') {
@@ -415,18 +415,18 @@ setup_request(TSCont contp, TSHttpTxn txnp)
if (query && query_len > 11) {
char querybuf[2048];
- query_len = (unsigned)query_len > sizeof(querybuf) - 1 ? sizeof(querybuf) - 1 : query_len;
+ query_len = (unsigned)query_len > sizeof(querybuf) - 1 ? sizeof(querybuf) - 1 : query_len;
char *start = querybuf, *end = querybuf + query_len;
size_t del_url_len;
memcpy(querybuf, query, query_len);
- *end = '\0';
+ *end = '\0';
start = strstr(querybuf, "remove_url=");
if (start && (start == querybuf || *(start - 1) == '&')) {
start += 11;
if ((end = strstr(start, "&")) != NULL)
- *end = '\0';
+ *end = '\0';
del_url_len = unescapifyStr(start);
- end = start + del_url_len;
+ end = start + del_url_len;
cstate->key_to_delete = TSCacheKeyCreate();
TSDebug("cache_iter", "deleting url: %s", start);
diff --git a/example/file-1/file-1.c b/example/file-1/file-1.c
index b671599..dae5e6a 100644
--- a/example/file-1/file-1.c
+++ b/example/file-1/file-1.c
@@ -44,8 +44,8 @@ TSPluginInit(int argc, const char *argv[])
int i;
TSPluginRegistrationInfo info;
- info.plugin_name = "file_plugin";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "file_plugin";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/hello/hello.c b/example/hello/hello.c
index 765fa15..66c96cf 100644
--- a/example/hello/hello.c
+++ b/example/hello/hello.c
@@ -31,8 +31,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
TSPluginRegistrationInfo info;
- info.plugin_name = "hello-world";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "hello-world";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/intercept/intercept.cc b/example/intercept/intercept.cc
index e36351d..78d035c 100644
--- a/example/intercept/intercept.cc
+++ b/example/intercept/intercept.cc
@@ -120,7 +120,7 @@ struct InterceptIO {
if (this->vc) {
TSVConnClose(this->vc);
}
- this->vc = NULL;
+ this->vc = NULL;
this->readio.vio = this->writeio.vio = NULL;
}
};
@@ -282,7 +282,7 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void *edata)
socket_type addr;
argument_type cdata(TSContDataGet(contp));
InterceptState *istate = new InterceptState();
- int fd = -1;
+ int fd = -1;
// This event is delivered by the continuation that we
// attached in InterceptTxnHook, so the continuation data is
@@ -292,9 +292,9 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void *edata)
// Set up a connection to our real origin, which will be
// 127.0.0.1:$PORT.
memset(&addr, 0, sizeof(addr));
- addr.sin.sin_family = AF_INET;
+ addr.sin.sin_family = AF_INET;
addr.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); // XXX config option
- addr.sin.sin_port = htons(PORT); // XXX config option
+ addr.sin.sin_port = htons(PORT); // XXX config option
// Normally, we would use TSNetConnect to connect to a secondary service, but to demonstrate
// the use of TSVConnFdCreate, we do a blocking connect inline. This it not recommended for
@@ -318,7 +318,7 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void *edata)
VDEBUG("binding client vc=%p to %s:%u", istate->client.vc, inet_ntop(AF_INET, &addr.sin.sin_addr, buf, sizeof(buf)),
(unsigned)ntohs(addr.sin.sin_port));
- istate->txn = cdata.txn;
+ istate->txn = cdata.txn;
istate->client.vc = arg.vc;
istate->server.vc = TSVConnFdCreate(fd);
@@ -369,9 +369,9 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void *edata)
case TS_EVENT_VCONN_READ_READY: {
argument_type cdata = TSContDataGet(contp);
- TSVConn vc = TSVIOVConnGet(arg.vio);
- InterceptIO *from = InterceptGetThisSide(cdata.istate, vc);
- InterceptIO *to = InterceptGetOtherSide(cdata.istate, vc);
+ TSVConn vc = TSVIOVConnGet(arg.vio);
+ InterceptIO *from = InterceptGetThisSide(cdata.istate, vc);
+ InterceptIO *to = InterceptGetOtherSide(cdata.istate, vc);
;
int64_t nbytes;
@@ -416,9 +416,9 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void *edata)
// The exception is where one side of the proxied connection
// has been closed. Then we want to close the other side.
argument_type cdata = TSContDataGet(contp);
- TSVConn vc = TSVIOVConnGet(arg.vio);
- InterceptIO *to = InterceptGetThisSide(cdata.istate, vc);
- InterceptIO *from = InterceptGetOtherSide(cdata.istate, vc);
+ TSVConn vc = TSVIOVConnGet(arg.vio);
+ InterceptIO *to = InterceptGetThisSide(cdata.istate, vc);
+ InterceptIO *from = InterceptGetOtherSide(cdata.istate, vc);
;
// If the other side is closed, close this side too, but only if there
@@ -445,11 +445,11 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void *edata)
// to receiving EOS from the intercepted origin server, and
// when handling errors.
- TSVConn vc = TSVIOVConnGet(arg.vio);
+ TSVConn vc = TSVIOVConnGet(arg.vio);
argument_type cdata = TSContDataGet(contp);
InterceptIO *from = InterceptGetThisSide(cdata.istate, vc);
- InterceptIO *to = InterceptGetOtherSide(cdata.istate, vc);
+ InterceptIO *to = InterceptGetOtherSide(cdata.istate, vc);
;
VIODEBUG(arg.vio, "received EOS or ERROR from %s side", InterceptProxySideVC(cdata.istate, vc));
@@ -531,8 +531,8 @@ TSPluginInit(int /* argc */, const char * /* argv */ [])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)PLUGIN;
- info.vendor_name = (char *)"MyCompany";
+ info.plugin_name = (char *)PLUGIN;
+ info.vendor_name = (char *)"MyCompany";
info.support_email = (char *)"ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -541,7 +541,7 @@ TSPluginInit(int /* argc */, const char * /* argv */ [])
// XXX accept hostname and port arguments
- TxnHook = InterceptContCreate(InterceptTxnHook, NULL, NULL);
+ TxnHook = InterceptContCreate(InterceptTxnHook, NULL, NULL);
InterceptHook = InterceptContCreate(InterceptInterceptionHook, NULL, NULL);
// Wait until after the cache lookup to decide whether to
diff --git a/example/lifecycle-plugin/lifecycle-plugin.c b/example/lifecycle-plugin/lifecycle-plugin.c
index 5cda67b..1e15cb1 100644
--- a/example/lifecycle-plugin/lifecycle-plugin.c
+++ b/example/lifecycle-plugin/lifecycle-plugin.c
@@ -55,7 +55,7 @@ int
CheckVersion()
{
const char *ts_version = TSTrafficServerVersionGet();
- int result = 0;
+ int result = 0;
if (ts_version) {
int major_ts_version = 0;
@@ -84,8 +84,8 @@ TSPluginInit(int argc, const char *argv[])
(void)argc;
(void)argv;
- info.plugin_name = "lifecycle-plugin";
- info.vendor_name = "My Company";
+ info.plugin_name = "lifecycle-plugin";
+ info.vendor_name = "My Company";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/null-transform/null-transform.c b/example/null-transform/null-transform.c
index b9b94d4..d52847c 100644
--- a/example/null-transform/null-transform.c
+++ b/example/null-transform/null-transform.c
@@ -49,8 +49,8 @@ my_data_alloc()
{
MyData *data;
- data = (MyData *)TSmalloc(sizeof(MyData));
- data->output_vio = NULL;
+ data = (MyData *)TSmalloc(sizeof(MyData));
+ data->output_vio = NULL;
data->output_buffer = NULL;
data->output_reader = NULL;
@@ -97,7 +97,7 @@ handle_transform(TSCont contp)
*/
data = TSContDataGet(contp);
if (!data) {
- data = my_data_alloc();
+ data = my_data_alloc();
data->output_buffer = TSIOBufferCreate();
data->output_reader = TSIOBufferReaderAlloc(data->output_buffer);
TSDebug("null-transform", "\tWriting %" PRId64 " bytes on VConn", TSVIONBytesGet(input_vio));
@@ -261,7 +261,7 @@ transformable(TSHttpTxn txnp)
if (TS_SUCCESS == TSHttpTxnServerRespGet(txnp, &bufp, &hdr_loc)) {
resp_status = TSHttpHdrStatusGet(bufp, hdr_loc);
- retv = (resp_status == TS_HTTP_STATUS_OK);
+ retv = (resp_status == TS_HTTP_STATUS_OK);
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
}
@@ -306,8 +306,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
TSPluginRegistrationInfo info;
- info.plugin_name = "null-transform";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "null-transform";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/output-header/output-header.c b/example/output-header/output-header.c
index 59388be..0b59771 100644
--- a/example/output-header/output-header.c
+++ b/example/output-header/output-header.c
@@ -64,7 +64,7 @@ handle_dns(TSHttpTxn txnp, TSCont contp ATS_UNUSED)
}
output_buffer = TSIOBufferCreate();
- reader = TSIOBufferReaderAlloc(output_buffer);
+ reader = TSIOBufferReaderAlloc(output_buffer);
/* This will print just MIMEFields and not
the http request line */
@@ -85,7 +85,7 @@ handle_dns(TSHttpTxn txnp, TSCont contp ATS_UNUSED)
/* Allocate the string with an extra byte for the string
terminator */
output_string = (char *)TSmalloc(total_avail + 1);
- output_len = 0;
+ output_len = 0;
/* We need to loop over all the buffer blocks to make
sure we get the complete header since the header can
@@ -153,8 +153,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
TSPluginRegistrationInfo info;
- info.plugin_name = "output-header";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "output-header";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/protocol/Protocol.c b/example/protocol/Protocol.c
index cdf1074..6732880 100644
--- a/example/protocol/Protocol.c
+++ b/example/protocol/Protocol.c
@@ -106,8 +106,8 @@ TSPluginInit(int argc, const char *argv[])
char *end;
int tmp;
- info.plugin_name = "output-header";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "output-header";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/protocol/TxnSM.c b/example/protocol/TxnSM.c
index b905c11..75a166d 100644
--- a/example/protocol/TxnSM.c
+++ b/example/protocol/TxnSM.c
@@ -72,7 +72,7 @@ TSCacheKey CacheKeyCreate(char *file_name);
int
main_handler(TSCont contp, TSEvent event, void *data)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
TxnSMHandler q_current_handler = txn_sm->q_current_handler;
TSDebug("protocol", "main_handler (contp %p event %d)", contp, event);
@@ -102,7 +102,7 @@ TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port)
txn_sm = (TxnSM *)TSmalloc(sizeof(TxnSM));
- txn_sm->q_mutex = pmutex;
+ txn_sm->q_mutex = pmutex;
txn_sm->q_pending_action = NULL;
/* Txn will use this server port to connect to the origin server. */
@@ -112,34 +112,34 @@ TxnSMCreate(TSMutex pmutex, TSVConn client_vc, int server_port)
/* The server_vc will be created if Txn connects to the origin server. */
txn_sm->q_server_vc = NULL;
- txn_sm->q_client_read_vio = NULL;
- txn_sm->q_client_write_vio = NULL;
- txn_sm->q_client_request_buffer = NULL;
- txn_sm->q_client_response_buffer = NULL;
- txn_sm->q_client_request_buffer_reader = NULL;
+ txn_sm->q_client_read_vio = NULL;
+ txn_sm->q_client_write_vio = NULL;
+ txn_sm->q_client_request_buffer = NULL;
+ txn_sm->q_client_response_buffer = NULL;
+ txn_sm->q_client_request_buffer_reader = NULL;
txn_sm->q_client_response_buffer_reader = NULL;
- txn_sm->q_server_read_vio = NULL;
- txn_sm->q_server_write_vio = NULL;
- txn_sm->q_server_request_buffer = NULL;
- txn_sm->q_server_response_buffer = NULL;
+ txn_sm->q_server_read_vio = NULL;
+ txn_sm->q_server_write_vio = NULL;
+ txn_sm->q_server_request_buffer = NULL;
+ txn_sm->q_server_response_buffer = NULL;
txn_sm->q_server_request_buffer_reader = NULL;
/* Char buffers to store client request and server response. */
txn_sm->q_client_request = (char *)TSmalloc(sizeof(char) * (MAX_REQUEST_LENGTH + 1));
memset(txn_sm->q_client_request, '\0', (sizeof(char) * (MAX_REQUEST_LENGTH + 1)));
- txn_sm->q_server_response = NULL;
- txn_sm->q_server_response_length = 0;
- txn_sm->q_block_bytes_read = 0;
- txn_sm->q_cache_vc = NULL;
- txn_sm->q_cache_response_length = 0;
- txn_sm->q_cache_read_buffer = NULL;
+ txn_sm->q_server_response = NULL;
+ txn_sm->q_server_response_length = 0;
+ txn_sm->q_block_bytes_read = 0;
+ txn_sm->q_cache_vc = NULL;
+ txn_sm->q_cache_response_length = 0;
+ txn_sm->q_cache_read_buffer = NULL;
txn_sm->q_cache_read_buffer_reader = NULL;
txn_sm->q_server_name = (char *)TSmalloc(sizeof(char) * (MAX_SERVER_NAME_LENGTH + 1));
- txn_sm->q_file_name = (char *)TSmalloc(sizeof(char) * (MAX_FILE_NAME_LENGTH + 1));
+ txn_sm->q_file_name = (char *)TSmalloc(sizeof(char) * (MAX_FILE_NAME_LENGTH + 1));
- txn_sm->q_key = NULL;
+ txn_sm->q_key = NULL;
txn_sm->q_magic = TXN_SM_ALIVE;
/* Set the current handler to be state_start. */
@@ -160,7 +160,7 @@ state_start(TSCont contp, TSEvent event ATS_UNUSED, void *data ATS_UNUSED)
return prepare_to_die(contp);
}
- txn_sm->q_client_request_buffer = TSIOBufferCreate();
+ txn_sm->q_client_request_buffer = TSIOBufferCreate();
txn_sm->q_client_request_buffer_reader = TSIOBufferReaderAlloc(txn_sm->q_client_request_buffer);
if (!txn_sm->q_client_request_buffer || !txn_sm->q_client_request_buffer_reader) {
@@ -227,7 +227,7 @@ state_read_request_from_client(TSCont contp, TSEvent event, TSVIO vio ATS_UNUSED
temp_buf = (char *)TSmalloc(sizeof(char) * (strlen(txn_sm->q_client_request) + 1));
memcpy(temp_buf, txn_sm->q_client_request, strlen(txn_sm->q_client_request));
temp_buf[strlen(txn_sm->q_client_request)] = '\0';
- parse_result = parse_request(temp_buf, txn_sm->q_server_name, txn_sm->q_file_name);
+ parse_result = parse_request(temp_buf, txn_sm->q_server_name, txn_sm->q_file_name);
TSfree(temp_buf);
if (parse_result != 1)
@@ -276,17 +276,17 @@ state_handle_cache_lookup(TSCont contp, TSEvent event, TSVConn vc)
if (ret_val != TS_SUCCESS)
TSError("[protocol] Fail to write into log");
- txn_sm->q_cache_vc = vc;
+ txn_sm->q_cache_vc = vc;
txn_sm->q_pending_action = NULL;
/* Get the size of the cached doc. */
response_size = TSVConnCacheObjectSizeGet(txn_sm->q_cache_vc);
/* Allocate IOBuffer to store data from the cache. */
- txn_sm->q_client_response_buffer = TSIOBufferCreate();
+ txn_sm->q_client_response_buffer = TSIOBufferCreate();
txn_sm->q_client_response_buffer_reader = TSIOBufferReaderAlloc(txn_sm->q_client_response_buffer);
- txn_sm->q_cache_read_buffer = TSIOBufferCreate();
- txn_sm->q_cache_read_buffer_reader = TSIOBufferReaderAlloc(txn_sm->q_cache_read_buffer);
+ txn_sm->q_cache_read_buffer = TSIOBufferCreate();
+ txn_sm->q_cache_read_buffer_reader = TSIOBufferReaderAlloc(txn_sm->q_cache_read_buffer);
if (!txn_sm->q_client_response_buffer || !txn_sm->q_client_response_buffer_reader || !txn_sm->q_cache_read_buffer ||
!txn_sm->q_cache_read_buffer_reader) {
@@ -358,13 +358,13 @@ state_handle_cache_read_response(TSCont contp, TSEvent event, TSVIO vio ATS_UNUS
case TS_EVENT_VCONN_READ_COMPLETE:
load_buffer_cache_data(txn_sm);
TSVConnClose(txn_sm->q_cache_vc);
- txn_sm->q_cache_vc = NULL;
- txn_sm->q_cache_read_vio = NULL;
+ txn_sm->q_cache_vc = NULL;
+ txn_sm->q_cache_read_vio = NULL;
txn_sm->q_cache_write_vio = NULL;
TSIOBufferReaderFree(txn_sm->q_cache_read_buffer_reader);
TSIOBufferDestroy(txn_sm->q_cache_read_buffer);
txn_sm->q_cache_read_buffer_reader = NULL;
- txn_sm->q_cache_read_buffer = NULL;
+ txn_sm->q_cache_read_buffer = NULL;
return send_response_to_client(contp);
case TS_EVENT_VCONN_READ_READY:
@@ -377,8 +377,8 @@ state_handle_cache_read_response(TSCont contp, TSEvent event, TSVIO vio ATS_UNUS
/* Error */
if (txn_sm->q_cache_vc) {
TSVConnClose(txn_sm->q_cache_vc);
- txn_sm->q_cache_vc = NULL;
- txn_sm->q_cache_read_vio = NULL;
+ txn_sm->q_cache_vc = NULL;
+ txn_sm->q_cache_read_vio = NULL;
txn_sm->q_cache_write_vio = NULL;
}
@@ -428,10 +428,10 @@ state_build_and_send_request(TSCont contp, TSEvent event ATS_UNUSED, void *data
txn_sm->q_pending_action = NULL;
- txn_sm->q_server_request_buffer = TSIOBufferCreate();
+ txn_sm->q_server_request_buffer = TSIOBufferCreate();
txn_sm->q_server_request_buffer_reader = TSIOBufferReaderAlloc(txn_sm->q_server_request_buffer);
- txn_sm->q_server_response_buffer = TSIOBufferCreate();
+ txn_sm->q_server_response_buffer = TSIOBufferCreate();
txn_sm->q_cache_response_buffer_reader = TSIOBufferReaderAlloc(txn_sm->q_server_response_buffer);
if (!txn_sm->q_server_request_buffer || !txn_sm->q_server_request_buffer_reader || !txn_sm->q_server_response_buffer ||
@@ -478,7 +478,7 @@ state_dns_lookup(TSCont contp, TSEvent event, TSHostLookupResult host_info)
TSAssert(q_server_addr->sa_family == AF_INET); /* NO IPv6 in this plugin */
memcpy(&ip_addr, q_server_addr, sizeof(ip_addr));
- ip_addr.sin_port = txn_sm->q_server_port;
+ ip_addr.sin_port = txn_sm->q_server_port;
txn_sm->q_pending_action = TSNetConnect(contp, (struct sockaddr const *)&ip_addr);
return TS_SUCCESS;
@@ -571,7 +571,7 @@ state_interface_with_server(TSCont contp, TSEvent event, TSVIO vio)
TSVConnClose(txn_sm->q_server_vc);
txn_sm->q_server_vc = NULL;
}
- txn_sm->q_server_read_vio = NULL;
+ txn_sm->q_server_read_vio = NULL;
txn_sm->q_server_write_vio = NULL;
/* Check if the response is good */
@@ -581,7 +581,7 @@ state_interface_with_server(TSCont contp, TSEvent event, TSVIO vio)
TSVConnClose(txn_sm->q_client_vc);
txn_sm->q_client_vc = NULL;
}
- txn_sm->q_client_read_vio = NULL;
+ txn_sm->q_client_read_vio = NULL;
txn_sm->q_client_write_vio = NULL;
/* Close cache_vc as well. */
@@ -596,7 +596,7 @@ state_interface_with_server(TSCont contp, TSEvent event, TSVIO vio)
if (txn_sm->q_cache_response_length >= txn_sm->q_server_response_length) {
/* Write is complete, close the cache_vc. */
TSVConnClose(txn_sm->q_cache_vc);
- txn_sm->q_cache_vc = NULL;
+ txn_sm->q_cache_vc = NULL;
txn_sm->q_cache_write_vio = NULL;
TSIOBufferReaderFree(txn_sm->q_cache_response_buffer_reader);
@@ -626,7 +626,7 @@ state_interface_with_server(TSCont contp, TSEvent event, TSVIO vio)
int
state_read_response_from_server(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
{
- TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
+ TxnSM *txn_sm = (TxnSM *)TSContDataGet(contp);
int bytes_read = 0;
TSDebug("protocol", "enter state_read_response_from_server");
@@ -692,7 +692,7 @@ state_write_to_cache(TSCont contp, TSEvent event, TSVIO vio)
TSDebug("protocol", "close cache_vc, cache_response_length is %d, server_response_lenght is %d",
txn_sm->q_cache_response_length, txn_sm->q_server_response_length);
TSVConnClose(txn_sm->q_cache_vc);
- txn_sm->q_cache_vc = NULL;
+ txn_sm->q_cache_vc = NULL;
txn_sm->q_cache_write_vio = NULL;
TSIOBufferReaderFree(txn_sm->q_cache_response_buffer_reader);
@@ -738,7 +738,7 @@ state_send_response_to_client(TSCont contp, TSEvent event, TSVIO vio)
TSVConnClose(txn_sm->q_client_vc);
txn_sm->q_client_vc = NULL;
}
- txn_sm->q_client_read_vio = NULL;
+ txn_sm->q_client_read_vio = NULL;
txn_sm->q_client_write_vio = NULL;
return state_done(contp, 0, NULL);
@@ -765,21 +765,21 @@ prepare_to_die(TSCont contp)
TSVConnAbort(txn_sm->q_client_vc, 1);
txn_sm->q_client_vc = NULL;
}
- txn_sm->q_client_read_vio = NULL;
+ txn_sm->q_client_read_vio = NULL;
txn_sm->q_client_write_vio = NULL;
if (txn_sm->q_server_vc) {
TSVConnAbort(txn_sm->q_server_vc, 1);
txn_sm->q_server_vc = NULL;
}
- txn_sm->q_server_read_vio = NULL;
+ txn_sm->q_server_read_vio = NULL;
txn_sm->q_server_write_vio = NULL;
if (txn_sm->q_cache_vc) {
TSVConnAbort(txn_sm->q_cache_vc, 1);
txn_sm->q_cache_vc = NULL;
}
- txn_sm->q_cache_read_vio = NULL;
+ txn_sm->q_cache_read_vio = NULL;
txn_sm->q_cache_write_vio = NULL;
return state_done(contp, 0, NULL);
@@ -800,13 +800,13 @@ state_done(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
}
txn_sm->q_pending_action = NULL;
- txn_sm->q_mutex = NULL;
+ txn_sm->q_mutex = NULL;
if (txn_sm->q_client_request_buffer) {
if (txn_sm->q_client_request_buffer_reader)
TSIOBufferReaderFree(txn_sm->q_client_request_buffer_reader);
TSIOBufferDestroy(txn_sm->q_client_request_buffer);
- txn_sm->q_client_request_buffer = NULL;
+ txn_sm->q_client_request_buffer = NULL;
txn_sm->q_client_request_buffer_reader = NULL;
}
@@ -815,7 +815,7 @@ state_done(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
TSIOBufferReaderFree(txn_sm->q_client_response_buffer_reader);
TSIOBufferDestroy(txn_sm->q_client_response_buffer);
- txn_sm->q_client_response_buffer = NULL;
+ txn_sm->q_client_response_buffer = NULL;
txn_sm->q_client_response_buffer_reader = NULL;
}
@@ -823,7 +823,7 @@ state_done(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
if (txn_sm->q_cache_read_buffer_reader)
TSIOBufferReaderFree(txn_sm->q_cache_read_buffer_reader);
TSIOBufferDestroy(txn_sm->q_cache_read_buffer);
- txn_sm->q_cache_read_buffer = NULL;
+ txn_sm->q_cache_read_buffer = NULL;
txn_sm->q_cache_read_buffer_reader = NULL;
}
@@ -831,7 +831,7 @@ state_done(TSCont contp, TSEvent event ATS_UNUSED, TSVIO vio ATS_UNUSED)
if (txn_sm->q_server_request_buffer_reader)
TSIOBufferReaderFree(txn_sm->q_server_request_buffer_reader);
TSIOBufferDestroy(txn_sm->q_server_request_buffer);
- txn_sm->q_server_request_buffer = NULL;
+ txn_sm->q_server_request_buffer = NULL;
txn_sm->q_server_request_buffer_reader = NULL;
}
@@ -880,7 +880,7 @@ send_response_to_client(TSCont contp)
TSDebug("protocol", "enter send_response_to_client");
- txn_sm = (TxnSM *)TSContDataGet(contp);
+ txn_sm = (TxnSM *)TSContDataGet(contp);
response_len = TSIOBufferReaderAvail(txn_sm->q_client_response_buffer_reader);
TSDebug("protocol", " . resp_len is %d", response_len);
@@ -942,7 +942,7 @@ int
parse_request(char *request, char *server_name, char *file_name)
{
char *saveptr = NULL;
- char *temp = strtok_r(request, " ", &saveptr);
+ char *temp = strtok_r(request, " ", &saveptr);
if (temp != NULL)
TSstrlcpy(server_name, temp, MAX_SERVER_NAME_LENGTH + 1);
diff --git a/example/query-remap/query-remap.c b/example/query-remap/query-remap.c
index 97ab869..247032e 100644
--- a/example/query-remap/query-remap.c
+++ b/example/query-remap/query-remap.c
@@ -71,9 +71,9 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf ATS_UNUSED, i
query_remap_info *qri = (query_remap_info *)TSmalloc(sizeof(query_remap_info));
qri->param_name = TSstrdup(argv[2]);
- qri->param_len = strlen(qri->param_name);
- qri->num_hosts = argc - 3;
- qri->hosts = (char **)TSmalloc(qri->num_hosts * sizeof(char *));
+ qri->param_len = strlen(qri->param_name);
+ qri->num_hosts = argc - 3;
+ qri->hosts = (char **)TSmalloc(qri->num_hosts * sizeof(char *));
TSDebug(PLUGIN_NAME, " - Hash using query parameter [%s] with %d hosts", qri->param_name, qri->num_hosts);
@@ -111,7 +111,7 @@ TSRemapDeleteInstance(void *ih)
TSRemapStatus
TSRemapDoRemap(void *ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
{
- int hostidx = -1;
+ int hostidx = -1;
query_remap_info *qri = (query_remap_info *)ih;
if (!qri || !rri) {
diff --git a/example/redirect-1/redirect-1.c b/example/redirect-1/redirect-1.c
index 17f54a0..806b6e3 100644
--- a/example/redirect-1/redirect-1.c
+++ b/example/redirect-1/redirect-1.c
@@ -102,7 +102,7 @@ handle_client_lookup(TSHttpTxn txnp, TSCont contp)
/*
* Create the local copies of the global coupled stats:
*/
- local_requests_all = INKStatCoupledLocalAdd(local_request_outcomes, "requests.all.local", INKSTAT_TYPE_FLOAT);
+ local_requests_all = INKStatCoupledLocalAdd(local_request_outcomes, "requests.all.local", INKSTAT_TYPE_FLOAT);
local_requests_redirects = INKStatCoupledLocalAdd(local_request_outcomes, "requests.redirects.local", INKSTAT_TYPE_INT64);
local_requests_unchanged = INKStatCoupledLocalAdd(local_request_outcomes, "requests.unchanged.local", INKSTAT_TYPE_INT64);
@@ -258,21 +258,21 @@ void
init_stats(void)
{
/* noncoupled: */
- method_count_redirected_connect = INKStatCreate("method.count.redirected.connect", INKSTAT_TYPE_INT64);
- method_count_redirected_delete = INKStatCreate("method.count.redirected.delete", INKSTAT_TYPE_INT64);
- method_count_redirected_get = INKStatCreate("method.count.redirected.get", INKSTAT_TYPE_INT64);
- method_count_redirected_head = INKStatCreate("method.count.redirected.head", INKSTAT_TYPE_FLOAT);
+ method_count_redirected_connect = INKStatCreate("method.count.redirected.connect", INKSTAT_TYPE_INT64);
+ method_count_redirected_delete = INKStatCreate("method.count.redirected.delete", INKSTAT_TYPE_INT64);
+ method_count_redirected_get = INKStatCreate("method.count.redirected.get", INKSTAT_TYPE_INT64);
+ method_count_redirected_head = INKStatCreate("method.count.redirected.head", INKSTAT_TYPE_FLOAT);
method_count_redirected_icp_query = INKStatCreate("method.count.redirected.icp_query", INKSTAT_TYPE_FLOAT);
- method_count_redirected_options = INKStatCreate("method.count.redirected.options", INKSTAT_TYPE_INT64);
- method_count_redirected_post = INKStatCreate("method.count.redirected.post", INKSTAT_TYPE_INT64);
- method_count_redirected_purge = INKStatCreate("method.count.redirected.purge", INKSTAT_TYPE_INT64);
- method_count_redirected_put = INKStatCreate("method.count.redirected.put", INKSTAT_TYPE_INT64);
- method_count_redirected_trace = INKStatCreate("method.count.redirected.trace", INKSTAT_TYPE_INT64);
- method_count_redirected_unknown = INKStatCreate("method.count.redirected.unknown", INKSTAT_TYPE_INT64);
+ method_count_redirected_options = INKStatCreate("method.count.redirected.options", INKSTAT_TYPE_INT64);
+ method_count_redirected_post = INKStatCreate("method.count.redirected.post", INKSTAT_TYPE_INT64);
+ method_count_redirected_purge = INKStatCreate("method.count.redirected.purge", INKSTAT_TYPE_INT64);
+ method_count_redirected_put = INKStatCreate("method.count.redirected.put", INKSTAT_TYPE_INT64);
+ method_count_redirected_trace = INKStatCreate("method.count.redirected.trace", INKSTAT_TYPE_INT64);
+ method_count_redirected_unknown = INKStatCreate("method.count.redirected.unknown", INKSTAT_TYPE_INT64);
/* coupled: */
- request_outcomes = INKStatCoupledGlobalCategoryCreate("request_outcomes");
- requests_all = INKStatCoupledGlobalAdd(request_outcomes, "requests.all", INKSTAT_TYPE_FLOAT);
+ request_outcomes = INKStatCoupledGlobalCategoryCreate("request_outcomes");
+ requests_all = INKStatCoupledGlobalAdd(request_outcomes, "requests.all", INKSTAT_TYPE_FLOAT);
requests_redirects = INKStatCoupledGlobalAdd(request_outcomes, "requests.redirects", INKSTAT_TYPE_INT64);
requests_unchanged = INKStatCoupledGlobalAdd(request_outcomes, "requests.unchanged", INKSTAT_TYPE_INT64);
}
@@ -332,8 +332,8 @@ TSPluginInit(int argc, const char *argv[])
int uri_len;
TSPluginRegistrationInfo info;
- info.plugin_name = "redirect-1";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "redirect-1";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -348,7 +348,7 @@ TSPluginInit(int argc, const char *argv[])
*/
url_redirect = TSstrdup(argv[2]);
- uri_len = strlen(prefix) + strlen(url_redirect) + 1;
+ uri_len = strlen(prefix) + strlen(url_redirect) + 1;
uri_redirect = TSmalloc(uri_len);
TSstrlcpy(uri_redirect, prefix, uri_len);
TSstrlcat(uri_redirect, url_redirect, uri_len);
diff --git a/example/remap/remap.cc b/example/remap/remap.cc
index ee4ef24..85ea9f3 100644
--- a/example/remap/remap.cc
+++ b/example/remap/remap.cc
@@ -73,9 +73,9 @@ remap_entry::remap_entry(int _argc, char *_argv[]) : next(NULL), argc(0), argv(N
if (_argc > 0 && _argv && (argv = (char **)TSmalloc(sizeof(char *) * (_argc + 1))) != 0) {
argc = _argc;
- for (i = 0; i < argc; i++)
+ for (i = 0; i < argc; i++)
argv[i] = TSstrdup(_argv[i]);
- argv[i] = NULL;
+ argv[i] = NULL;
}
}
@@ -97,7 +97,7 @@ remap_entry::add_to_list(remap_entry *re)
{
if (likely(re && plugin_init_counter)) {
pthread_mutex_lock(&mutex);
- re->next = active_list;
+ re->next = active_list;
active_list = re;
pthread_mutex_unlock(&mutex);
}
@@ -139,8 +139,8 @@ void
TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"remap_plugin";
- info.vendor_name = (char *)"Apache";
+ info.plugin_name = (char *)"remap_plugin";
+ info.vendor_name = (char *)"Apache";
info.support_email = (char *)"";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -238,7 +238,7 @@ TSRemapDeleteInstance(void *ih)
}
static volatile unsigned long processing_counter = 0; // sequential counter
-static int arg_index = 0;
+static int arg_index = 0;
/* -------------------------- TSRemapDoRemap -------------------------------- */
TSRemapStatus
@@ -303,7 +303,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
// How to cancel request processing and return error message to the client
// We wiil do it each other request
if (_processing_counter & 1) {
- char *tmp = (char *)TSmalloc(256);
+ char *tmp = (char *)TSmalloc(256);
static int my_local_counter = 0;
size_t len = snprintf(tmp, 255, "This is very small example of TS API usage!\nIteration %d!\nHTTP return code %d\n",
@@ -314,9 +314,9 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
}
// hardcoded case for remapping
// You need to check host and port if you are using the same plugin for multiple remapping rules
- temp = TSUrlHostGet(rri->requestBufp, rri->requestUrl, &len);
+ temp = TSUrlHostGet(rri->requestBufp, rri->requestUrl, &len);
temp2 = TSUrlPathGet(rri->requestBufp, rri->requestUrl, &len2);
- port = TSUrlPortGet(rri->requestBufp, rri->requestUrl);
+ port = TSUrlPortGet(rri->requestBufp, rri->requestUrl);
if (len == 10 && !memcmp("flickr.com", temp, 10) && port == 80 && len2 >= 3 && !memcmp("47/", temp2, 3)) {
char new_path[8192];
@@ -347,7 +347,7 @@ void
TSRemapOSResponse(void *ih ATS_UNUSED, TSHttpTxn rh, int os_response_type)
{
int request_id = -1;
- void *data = TSHttpTxnArgGet((TSHttpTxn)rh, arg_index); // read counter (we store it in TSRemapDoRemap function call)
+ void *data = TSHttpTxnArgGet((TSHttpTxn)rh, arg_index); // read counter (we store it in TSRemapDoRemap function call)
if (data)
request_id = *((int *)data);
diff --git a/example/remap_header_add/remap_header_add.cc b/example/remap_header_add/remap_header_add.cc
index beb79be..a5e522c 100644
--- a/example/remap_header_add/remap_header_add.cc
+++ b/example/remap_header_add/remap_header_add.cc
@@ -60,7 +60,7 @@ ParseArgIntoNv(const char *arg, char **n, char **v)
}
size_t name_len = colon_pos - arg;
- *n = (char *)TSmalloc(name_len + 1);
+ *n = (char *)TSmalloc(name_len + 1);
memcpy(*n, arg, colon_pos - arg);
(*n)[name_len] = '\0';
@@ -99,13 +99,13 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, NOWARN_UNUSED char *errbuf
// print all arguments for this particular remapping
- rl = (remap_line *)TSmalloc(sizeof(remap_line));
+ rl = (remap_line *)TSmalloc(sizeof(remap_line));
rl->argc = argc;
rl->argv = argv;
- rl->nvc = argc - 2; // the first two are the remap from and to
+ rl->nvc = argc - 2; // the first two are the remap from and to
if (rl->nvc) {
rl->name = (char **)TSmalloc(sizeof(char *) * rl->nvc);
- rl->val = (char **)TSmalloc(sizeof(char *) * rl->nvc);
+ rl->val = (char **)TSmalloc(sizeof(char *) * rl->nvc);
}
TSDebug(TAG, "NewInstance:");
diff --git a/example/replace-header/replace-header.c b/example/replace-header/replace-header.c
index 8fea65d..58ee88c 100644
--- a/example/replace-header/replace-header.c
+++ b/example/replace-header/replace-header.c
@@ -98,8 +98,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
TSPluginRegistrationInfo info;
- info.plugin_name = "replace-header";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "replace-header";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/response-header-1/response-header-1.c b/example/response-header-1/response-header-1.c
index cc9b7f9..b6d7187 100644
--- a/example/response-header-1/response-header-1.c
+++ b/example/response-header-1/response-header-1.c
@@ -231,8 +231,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
- info.plugin_name = "response-header-1";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "response-header-1";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -256,7 +256,7 @@ TSPluginInit(int argc, const char *argv[])
hdr_bufp = TSMBufferCreate();
TSMimeHdrCreate(hdr_bufp, &hdr_loc);
- mimehdr1_name = TSstrdup("x-num-served-from-cache");
+ mimehdr1_name = TSstrdup("x-num-served-from-cache");
mimehdr1_value = TSstrdup("0");
/* Create name here and set DateTime value when o.s.
diff --git a/example/secure-link/secure-link.c b/example/secure-link/secure-link.c
index 3e6646f..501a223 100644
--- a/example/secure-link/secure-link.c
+++ b/example/secure-link/secure-link.c
@@ -55,7 +55,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
in = (struct sockaddr_in *)TSHttpTxnClientAddrGet(rh);
ip = inet_ntoa(in->sin_addr);
- s = TSUrlStringGet(rri->requestBufp, rri->requestUrl, &len);
+ s = TSUrlStringGet(rri->requestBufp, rri->requestUrl, &len);
TSDebug(PLUGIN_NAME, "request [%.*s] from [%s]", len, s, ip);
TSfree(s);
@@ -79,7 +79,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
} else {
TSError("[secure_link] strtok didn't find a & in the query string");
/* this is just example, so set fake params to prevent plugin crash */
- token = TSstrdup("d41d8cd98f00b204e9800998ecf8427e");
+ token = TSstrdup("d41d8cd98f00b204e9800998ecf8427e");
expire = TSstrdup("00000000");
}
TSfree(s);
@@ -154,7 +154,7 @@ TSRemapNewInstance(int argc, char **argv, void **ih, char *errbuf, int errbuf_si
(void)errbuf;
(void)errbuf_size;
- sli = (secure_link_info *)TSmalloc(sizeof(secure_link_info));
+ sli = (secure_link_info *)TSmalloc(sizeof(secure_link_info));
sli->secret = NULL;
sli->strict = 0;
diff --git a/example/server-transform/server-transform.c b/example/server-transform/server-transform.c
index b99e951..6cd7c51 100644
--- a/example/server-transform/server-transform.c
+++ b/example/server-transform/server-transform.c
@@ -98,18 +98,18 @@ transform_create(TSHttpTxn txnp)
contp = TSTransformCreate(transform_handler, txnp);
- data = (TransformData *)TSmalloc(sizeof(TransformData));
- data->state = STATE_BUFFER;
- data->txn = txnp;
- data->input_buf = NULL;
- data->input_reader = NULL;
- data->output_buf = NULL;
- data->output_reader = NULL;
- data->output_vio = NULL;
- data->output_vc = NULL;
+ data = (TransformData *)TSmalloc(sizeof(TransformData));
+ data->state = STATE_BUFFER;
+ data->txn = txnp;
+ data->input_buf = NULL;
+ data->input_reader = NULL;
+ data->output_buf = NULL;
+ data->output_reader = NULL;
+ data->output_vio = NULL;
+ data->output_vc = NULL;
data->pending_action = NULL;
- data->server_vc = NULL;
- data->server_vio = NULL;
+ data->server_vc = NULL;
+ data->server_vio = NULL;
data->content_length = 0;
TSContDataSet(contp, data);
@@ -167,7 +167,7 @@ transform_connect(TSCont contp, TransformData *data)
TSIOBuffer temp;
TSIOBufferReader tempReader;
- temp = TSIOBufferCreate();
+ temp = TSIOBufferCreate();
tempReader = TSIOBufferReaderAlloc(temp);
TSIOBufferWrite(temp, (const char *)&content_length, sizeof(int));
@@ -175,7 +175,7 @@ transform_connect(TSCont contp, TransformData *data)
TSIOBufferReaderFree(data->input_reader);
TSIOBufferDestroy(data->input_buf);
- data->input_buf = temp;
+ data->input_buf = temp;
data->input_reader = tempReader;
}
} else {
@@ -186,9 +186,9 @@ transform_connect(TSCont contp, TransformData *data)
/* TODO: This only supports IPv4, probably should be changed at some point, but
it's an example ... */
memset(&ip_addr, 0, sizeof(ip_addr));
- ip_addr.sin_family = AF_INET;
+ ip_addr.sin_family = AF_INET;
ip_addr.sin_addr.s_addr = server_ip; /* Should be in network byte order */
- ip_addr.sin_port = server_port;
+ ip_addr.sin_port = server_port;
TSDebug("strans", "net connect..");
action = TSNetConnect(contp, (struct sockaddr const *)&ip_addr);
@@ -220,7 +220,7 @@ transform_read_status(TSCont contp, TransformData *data)
{
data->state = STATE_READ_STATUS;
- data->output_buf = TSIOBufferCreate();
+ data->output_buf = TSIOBufferCreate();
data->output_reader = TSIOBufferReaderAlloc(data->output_buf);
if (data->output_reader != NULL) {
data->server_vio = TSVConnRead(data->server_vc, contp, data->output_buf, sizeof(int));
@@ -237,11 +237,11 @@ transform_read(TSCont contp, TransformData *data)
data->state = STATE_READ;
TSIOBufferDestroy(data->input_buf);
- data->input_buf = NULL;
+ data->input_buf = NULL;
data->input_reader = NULL;
data->server_vio = TSVConnRead(data->server_vc, contp, data->output_buf, data->content_length);
- data->output_vc = TSTransformOutputVConnGet((TSVConn)contp);
+ data->output_vc = TSTransformOutputVConnGet((TSVConn)contp);
if (data->output_vc == NULL) {
TSError("[server_transform] TSTransformOutputVConnGet returns NULL");
} else {
@@ -261,13 +261,13 @@ transform_bypass(TSCont contp, TransformData *data)
if (data->server_vc) {
TSVConnAbort(data->server_vc, 1);
- data->server_vc = NULL;
+ data->server_vc = NULL;
data->server_vio = NULL;
}
if (data->output_buf) {
TSIOBufferDestroy(data->output_buf);
- data->output_buf = NULL;
+ data->output_buf = NULL;
data->output_reader = NULL;
}
@@ -292,7 +292,7 @@ transform_buffer_event(TSCont contp, TransformData *data, TSEvent event ATS_UNUS
int avail;
if (!data->input_buf) {
- data->input_buf = TSIOBufferCreate();
+ data->input_buf = TSIOBufferCreate();
data->input_reader = TSIOBufferReaderAlloc(data->input_buf);
}
@@ -363,7 +363,7 @@ transform_connect_event(TSCont contp, TransformData *data, TSEvent event, void *
TSDebug("strans", "connected");
data->pending_action = NULL;
- data->server_vc = (TSVConn)edata;
+ data->server_vc = (TSVConn)edata;
return transform_write(contp, data);
case TS_EVENT_NET_CONNECT_FAILED:
TSDebug("strans", "connect failed");
@@ -413,12 +413,12 @@ transform_read_status_event(TSCont contp, TransformData *data, TSEvent event, vo
void *buf_ptr;
int64_t avail;
int64_t read_nbytes = sizeof(int);
- int64_t read_ndone = 0;
+ int64_t read_ndone = 0;
buf_ptr = &data->content_length;
while (read_nbytes > 0) {
- blk = TSIOBufferReaderStart(data->output_reader);
- buf = (char *)TSIOBufferBlockReadStart(blk, data->output_reader, &avail);
+ blk = TSIOBufferReaderStart(data->output_reader);
+ buf = (char *)TSIOBufferBlockReadStart(blk, data->output_reader, &avail);
read_ndone = (avail >= read_nbytes) ? read_nbytes : avail;
memcpy(buf_ptr, buf, read_ndone);
if (read_ndone > 0) {
@@ -445,25 +445,25 @@ transform_read_event(TSCont contp ATS_UNUSED, TransformData *data, TSEvent event
switch (event) {
case TS_EVENT_ERROR:
TSVConnAbort(data->server_vc, 1);
- data->server_vc = NULL;
+ data->server_vc = NULL;
data->server_vio = NULL;
TSVConnAbort(data->output_vc, 1);
- data->output_vc = NULL;
+ data->output_vc = NULL;
data->output_vio = NULL;
break;
case TS_EVENT_VCONN_EOS:
TSVConnAbort(data->server_vc, 1);
- data->server_vc = NULL;
+ data->server_vc = NULL;
data->server_vio = NULL;
TSVConnAbort(data->output_vc, 1);
- data->output_vc = NULL;
+ data->output_vc = NULL;
data->output_vio = NULL;
break;
case TS_EVENT_VCONN_READ_COMPLETE:
TSVConnClose(data->server_vc);
- data->server_vc = NULL;
+ data->server_vc = NULL;
data->server_vio = NULL;
TSVIOReenable(data->output_vio);
@@ -638,8 +638,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
TSPluginRegistrationInfo info;
TSCont cont;
- info.plugin_name = "server-transform";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "server-transform";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -647,8 +647,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
}
/* connect to the echo port on localhost */
- server_ip = (127 << 24) | (0 << 16) | (0 << 8) | (1);
- server_ip = htonl(server_ip);
+ server_ip = (127 << 24) | (0 << 16) | (0 << 8) | (1);
+ server_ip = htonl(server_ip);
server_port = 7;
cont = TSContCreate(transform_plugin, NULL);
diff --git a/example/session-1/session-1.c b/example/session-1/session-1.c
index aa36bce..cd92f78 100644
--- a/example/session-1/session-1.c
+++ b/example/session-1/session-1.c
@@ -91,8 +91,8 @@ TSPluginInit(int argc, const char *argv[])
TSCont contp;
TSPluginRegistrationInfo info;
- info.plugin_name = "session-1";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "session-1";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -102,8 +102,8 @@ TSPluginInit(int argc, const char *argv[])
}
transaction_count = INKStatCreate("transaction.count", INKSTAT_TYPE_INT64);
- session_count = INKStatCreate("session.count", INKSTAT_TYPE_INT64);
- av_transaction = INKStatCreate("avg.transactions", INKSTAT_TYPE_FLOAT);
+ session_count = INKStatCreate("session.count", INKSTAT_TYPE_INT64);
+ av_transaction = INKStatCreate("avg.transactions", INKSTAT_TYPE_FLOAT);
contp = TSContCreate(ssn_handler, NULL);
TSHttpHookAdd(TS_HTTP_SSN_START_HOOK, contp);
diff --git a/example/ssl-preaccept/ssl-preaccept.cc b/example/ssl-preaccept/ssl-preaccept.cc
index 189dc36..9b365b1 100644
--- a/example/ssl-preaccept/ssl-preaccept.cc
+++ b/example/ssl-preaccept/ssl-preaccept.cc
@@ -62,7 +62,7 @@ Parse_Addr_String(ts::ConstBuffer const &text, IpRange &range)
range.second.load(ts::ConstBuffer(addr2.c_str(), addr2.length()));
} else { // Assume it is a single address
newAddr.load(text);
- range.first = newAddr;
+ range.first = newAddr;
range.second = newAddr;
}
}
@@ -158,12 +158,12 @@ TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
- TSCont cb_pa = 0; // pre-accept callback continuation
+ TSCont cb_pa = 0; // pre-accept callback continuation
static const struct option longopt[] = {{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
- info.plugin_name = const_cast<char *>("SSL Preaccept test");
- info.vendor_name = const_cast<char *>("Network Geographics");
+ info.plugin_name = const_cast<char *>("SSL Preaccept test");
+ info.vendor_name = const_cast<char *>("Network Geographics");
info.support_email = const_cast<char *>("shinrich@network-geographics.com");
int opt = 0;
@@ -178,7 +178,7 @@ TSPluginInit(int argc, const char *argv[])
}
if (ConfigPath.length() == 0) {
static char const *const DEFAULT_CONFIG_PATH = "ssl_preaccept.config";
- ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
+ ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
}
diff --git a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
index c30eeed..ab578cf 100644
--- a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
+++ b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
@@ -72,9 +72,9 @@ Load_Configuration()
int
CB_servername_whitelist(TSCont /* contp */, TSEvent /* event */, void *edata)
{
- TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
+ TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc);
- SSL *ssl = reinterpret_cast<SSL *>(sslobj);
+ SSL *ssl = reinterpret_cast<SSL *>(sslobj);
const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
bool do_blind_tunnel = true;
@@ -107,12 +107,12 @@ TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
- TSCont cb_sni = 0; // sni callback continuation
+ TSCont cb_sni = 0; // sni callback continuation
static const struct option longopt[] = {{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
- info.plugin_name = const_cast<char *>("SSL SNI whitelist");
- info.vendor_name = const_cast<char *>("Network Geographics");
+ info.plugin_name = const_cast<char *>("SSL SNI whitelist");
+ info.vendor_name = const_cast<char *>("Network Geographics");
info.support_email = const_cast<char *>("shinrich@network-geographics.com");
int opt = 0;
@@ -127,7 +127,7 @@ TSPluginInit(int argc, const char *argv[])
}
if (ConfigPath.length() == 0) {
static char const *const DEFAULT_CONFIG_PATH = "ssl_sni_whitelist.config";
- ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
+ ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
}
diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
index 58263f9..a284c35 100644
--- a/example/ssl-sni/ssl-sni.cc
+++ b/example/ssl-sni/ssl-sni.cc
@@ -83,12 +83,12 @@ Load_Configuration()
int
CB_servername(TSCont /* contp */, TSEvent /* event */, void *edata)
{
- TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
+ TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc);
- SSL *ssl = reinterpret_cast<SSL *>(sslobj);
+ SSL *ssl = reinterpret_cast<SSL *>(sslobj);
const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
if (servername != NULL) {
- int servername_len = strlen(servername);
+ int servername_len = strlen(servername);
int facebook_name_len = strlen("facebook.com");
if (servername_len >= facebook_name_len) {
const char *server_ptr = servername + (servername_len - facebook_name_len);
@@ -128,12 +128,12 @@ TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
- TSCont cb_cert = 0; // Certificate callback continuation
+ TSCont cb_cert = 0; // Certificate callback continuation
static const struct option longopt[] = {{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
- info.plugin_name = const_cast<char *>("SSL SNI callback test");
- info.vendor_name = const_cast<char *>("Network Geographics");
+ info.plugin_name = const_cast<char *>("SSL SNI callback test");
+ info.vendor_name = const_cast<char *>("Network Geographics");
info.support_email = const_cast<char *>("shinrich@network-geographics.com");
int opt = 0;
@@ -148,7 +148,7 @@ TSPluginInit(int argc, const char *argv[])
}
if (ConfigPath.length() == 0) {
static char const *const DEFAULT_CONFIG_PATH = "ssl_sni.config";
- ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
+ ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
}
diff --git a/example/thread-1/thread-1.c b/example/thread-1/thread-1.c
index 2a98344..ff6daa7 100644
--- a/example/thread-1/thread-1.c
+++ b/example/thread-1/thread-1.c
@@ -69,8 +69,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
{
TSPluginRegistrationInfo info;
- info.plugin_name = "thread-1";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "thread-1";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/thread-pool/psi.c b/example/thread-pool/psi.c
index d9befe7..9702597 100644
--- a/example/thread-pool/psi.c
+++ b/example/thread-pool/psi.c
@@ -75,8 +75,8 @@
typedef enum {
STATE_READ_DATA = 1,
- STATE_READ_PSI = 2,
- STATE_DUMP_PSI = 3,
+ STATE_READ_PSI = 2,
+ STATE_DUMP_PSI = 3,
} PluginState;
typedef enum {
@@ -134,21 +134,21 @@ cont_data_alloc()
{
ContData *data;
- data = (ContData *)TSmalloc(sizeof(ContData));
- data->magic = MAGIC_ALIVE;
- data->output_vio = NULL;
+ data = (ContData *)TSmalloc(sizeof(ContData));
+ data->magic = MAGIC_ALIVE;
+ data->output_vio = NULL;
data->output_buffer = NULL;
data->output_reader = NULL;
- data->psi_buffer = NULL;
- data->psi_reader = NULL;
- data->psi_filename[0] = '\0';
+ data->psi_buffer = NULL;
+ data->psi_reader = NULL;
+ data->psi_filename[0] = '\0';
data->psi_filename_len = 0;
- data->psi_success = 0;
+ data->psi_success = 0;
data->parse_state = PARSE_SEARCH;
- data->state = STATE_READ_DATA;
+ data->state = STATE_READ_DATA;
data->transform_bytes = 0;
return data;
@@ -208,9 +208,9 @@ cont_data_destroy(ContData *data)
static StrOperationResult
strsearch_ioreader(TSIOBufferReader reader, const char *pattern, int *nparse)
{
- int index = 0;
+ int index = 0;
TSIOBufferBlock block = TSIOBufferReaderStart(reader);
- int slen = strlen(pattern);
+ int slen = strlen(pattern);
if (slen <= 0) {
return STR_FAIL;
@@ -274,10 +274,10 @@ strsearch_ioreader(TSIOBufferReader reader, const char *pattern, int *nparse)
static int
strextract_ioreader(TSIOBufferReader reader, int offset, const char *end_pattern, char *buffer, int *buflen)
{
- int buf_idx = 0;
- int p_idx = 0;
+ int buf_idx = 0;
+ int p_idx = 0;
int nbytes_so_far = 0;
- int plen = strlen(end_pattern);
+ int plen = strlen(end_pattern);
const char *ptr;
TSIOBufferBlock block = TSIOBufferReaderStart(reader);
@@ -325,7 +325,7 @@ strextract_ioreader(TSIOBufferReader reader, int offset, const char *end_pattern
/* Full Match */
if (p_idx == plen) {
/* Nul terminate the filename, remove the end_pattern copied into the buffer */
- *buflen = buf_idx - plen;
+ *buflen = buf_idx - plen;
buffer[*buflen] = '\0';
TSDebug(DBG_TAG, "strextract: filename = |%s|", buffer);
return STR_SUCCESS;
@@ -370,21 +370,21 @@ parse_data(TSCont contp, TSIOBufferReader input_reader, int avail, int *toconsum
switch (status) {
case STR_FAIL:
/* We didn't found the pattern */
- *toconsume = avail;
- *towrite = avail;
+ *toconsume = avail;
+ *towrite = avail;
data->parse_state = PARSE_SEARCH;
return 0;
case STR_PARTIAL:
/* We need to read some more data */
- *toconsume = nparse;
- *towrite = nparse;
+ *toconsume = nparse;
+ *towrite = nparse;
data->parse_state = PARSE_SEARCH;
return 0;
case STR_SUCCESS:
/* We found the start_pattern, let's go ahead */
data->psi_filename_len = 0;
- data->psi_filename[0] = '\0';
- data->parse_state = PARSE_EXTRACT;
+ data->psi_filename[0] = '\0';
+ data->parse_state = PARSE_EXTRACT;
break;
default:
TSAssert(!"strsearch_ioreader returned unexpected status");
@@ -396,20 +396,20 @@ parse_data(TSCont contp, TSIOBufferReader input_reader, int avail, int *toconsum
switch (status) {
case STR_FAIL:
/* We couldn't extract a valid filename */
- *toconsume = nparse;
- *towrite = nparse;
+ *toconsume = nparse;
+ *towrite = nparse;
data->parse_state = PARSE_SEARCH;
return 0;
case STR_PARTIAL:
/* We need to read some more data */
- *toconsume = nparse;
- *towrite = nparse;
+ *toconsume = nparse;
+ *towrite = nparse;
data->parse_state = PARSE_EXTRACT;
return 0;
case STR_SUCCESS:
/* We got a valid filename */
- *toconsume = nparse + PSI_START_TAG_LEN + data->psi_filename_len + PSI_END_TAG_LEN;
- *towrite = nparse;
+ *toconsume = nparse + PSI_START_TAG_LEN + data->psi_filename_len + PSI_END_TAG_LEN;
+ *towrite = nparse;
data->parse_state = PARSE_SEARCH;
return 1;
default:
@@ -492,14 +492,14 @@ psi_include(TSCont contp, void *edata ATS_UNUSED)
int64_t len, avail, ndone, ntodo, towrite;
char *ptr_block;
- len = strlen(buf);
+ len = strlen(buf);
ndone = 0;
ntodo = len;
while (ntodo > 0) {
/* TSIOBufferStart allocates more blocks if required */
- block = TSIOBufferStart(data->psi_buffer);
+ block = TSIOBufferStart(data->psi_buffer);
ptr_block = TSIOBufferBlockWriteStart(block, &avail);
- towrite = MIN(ntodo, avail);
+ towrite = MIN(ntodo, avail);
memcpy(ptr_block, buf + ndone, towrite);
TSIOBufferProduce(data->psi_buffer, towrite);
@@ -528,7 +528,7 @@ psi_include(TSCont contp, void *edata ATS_UNUSED)
TSContSchedule(contp, 0, TS_THREAD_POOL_DEFAULT);
data->psi_success = 0;
- data->state = STATE_READ_DATA;
+ data->state = STATE_READ_DATA;
TSMutexUnlock(TSContMutexGet(contp));
return 0;
@@ -558,7 +558,7 @@ wake_up_streams(TSCont contp)
TSAssert(data->magic == MAGIC_ALIVE);
input_vio = TSVConnWriteVIOGet(contp);
- ntodo = TSVIONTodoGet(input_vio);
+ ntodo = TSVIONTodoGet(input_vio);
if (ntodo > 0) {
TSVIOReenable(data->output_vio);
@@ -602,7 +602,7 @@ handle_transform(TSCont contp)
/* Get upstream vio */
input_vio = TSVConnWriteVIOGet(contp);
- data = TSContDataGet(contp);
+ data = TSContDataGet(contp);
TSAssert(data->magic == MAGIC_ALIVE);
if (!data->output_buffer) {
@@ -626,7 +626,7 @@ handle_transform(TSCont contp)
if (toread > 0) {
input_reader = TSVIOReaderGet(input_vio);
- avail = TSIOBufferReaderAvail(input_reader);
+ avail = TSIOBufferReaderAvail(input_reader);
/* There are some data available for reading. Let's parse it */
if (avail > 0) {
@@ -635,9 +635,9 @@ handle_transform(TSCont contp)
if (toread > (PSI_START_TAG_LEN + PSI_END_TAG_LEN)) {
psi = parse_data(contp, input_reader, avail, &toconsume, &towrite);
} else {
- towrite = avail;
+ towrite = avail;
toconsume = avail;
- psi = 0;
+ psi = 0;
}
if (towrite > 0) {
@@ -758,7 +758,7 @@ transform_handler(TSCont contp, TSEvent event, void *edata ATS_UNUSED)
/* Handle TryLock result */
if (TSMutexLockTry(TSContMutexGet(contp)) != TS_SUCCESS) {
- TSCont c = TSContCreate(trylock_handler, NULL);
+ TSCont c = TSContCreate(trylock_handler, NULL);
TryLockData *d = TSmalloc(sizeof(TryLockData));
d->contp = contp;
@@ -922,7 +922,7 @@ transform_add(TSHttpTxn txnp)
ContData *data;
contp = TSTransformCreate(transform_handler, txnp);
- data = cont_data_alloc();
+ data = cont_data_alloc();
TSContDataSet(contp, data);
TSHttpTxnHookAdd(txnp, TS_HTTP_RESPONSE_TRANSFORM_HOOK, contp);
@@ -977,8 +977,8 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
int i;
TSReturnCode retval;
- info.plugin_name = "psi";
- info.vendor_name = "Apache";
+ info.plugin_name = "psi";
+ info.vendor_name = "Apache";
info.support_email = "";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/thread-pool/test/SDKTest/psi_server.c b/example/thread-pool/test/SDKTest/psi_server.c
index ebced59..2f4a73c 100644
--- a/example/thread-pool/test/SDKTest/psi_server.c
+++ b/example/thread-pool/test/SDKTest/psi_server.c
@@ -108,7 +108,7 @@ TSResponsePrepare(char *req_hdr, int req_len, void **response_id)
len_string += strlen("length");
resp_id->request_length = atoi(len_string);
resp_id->bytes_not_sent = resp_id->request_length;
- resp_id->status_code = 200;
+ resp_id->status_code = 200;
if (resp_id->psi) {
sprintf(resp_id->header_response, "%s\r\n%s\r\n%s%ld\r\n%s\r\n\r\n", "HTTP/1.0 200 OK", "Content-type: text/plain",
@@ -119,7 +119,7 @@ TSResponsePrepare(char *req_hdr, int req_len, void **response_id)
}
} else {
resp_id->request_length = -1;
- resp_id->status_code = 404;
+ resp_id->status_code = 404;
resp_id->bytes_not_sent = 0;
sprintf(resp_id->header_response, "%s\r\n%s\r\n\r\n", "HTTP/1.0 404 Not Found", "Content-type: text/plain");
}
@@ -132,15 +132,15 @@ void
TSResponsePut(void **resp_id /* return */, void *resp_buffer /* return */, int *resp_bytes /* return */, int resp_buffer_size,
int bytes_last_response)
{
- int i = 0;
+ int i = 0;
RequestInfo *rid = *((RequestInfo **)resp_id);
- int psi = 0;
+ int psi = 0;
int len;
char psi_tag[PSI_TAG_MAX_SIZE];
/* copy the header into the response buffer */
if (!rid->done_sent_header) {
- i = sprintf((char *)resp_buffer, "%s", rid->header_response);
+ i = sprintf((char *)resp_buffer, "%s", rid->header_response);
rid->done_sent_header = TRUE;
}
@@ -174,7 +174,7 @@ TSResponsePut(void **resp_id /* return */, void *resp_buffer /* return */, int *
}
memset((void *)((char *)resp_buffer + i), 'X', rid->bytes_not_sent);
memset((void *)((char *)resp_buffer + i + rid->bytes_not_sent - 1), 'E', 1);
- *resp_bytes = rid->bytes_not_sent + i;
+ *resp_bytes = rid->bytes_not_sent + i;
rid->bytes_not_sent = 0;
}
}
diff --git a/example/thread-pool/thread.c b/example/thread-pool/thread.c
index d49ffbe..6a6c1bd 100644
--- a/example/thread-pool/thread.c
+++ b/example/thread-pool/thread.c
@@ -41,10 +41,10 @@ static pthread_mutex_t cond_mutex;
void
init_queue(Queue *q)
{
- q->head = NULL; /* Pointer on head cell */
- q->tail = NULL; /* Pointer on tail cell */
- q->nb_elem = 0; /* Nb elem in the queue */
- q->mutex = TSMutexCreate();
+ q->head = NULL; /* Pointer on head cell */
+ q->tail = NULL; /* Pointer on tail cell */
+ q->nb_elem = 0; /* Nb elem in the queue */
+ q->mutex = TSMutexCreate();
}
void
@@ -56,8 +56,8 @@ add_to_queue(Queue *q, void *data)
if (data != NULL) {
TSMutexLock(q->mutex);
/* Init the new cell */
- new_cell = TSmalloc(sizeof(Cell));
- new_cell->magic = MAGIC_ALIVE;
+ new_cell = TSmalloc(sizeof(Cell));
+ new_cell->magic = MAGIC_ALIVE;
new_cell->ptr_data = data;
new_cell->ptr_next = q->tail;
new_cell->ptr_prev = NULL;
@@ -71,7 +71,7 @@ add_to_queue(Queue *q, void *data)
} else {
TSAssert(q->tail->magic == MAGIC_ALIVE);
q->tail->ptr_prev = new_cell;
- q->tail = new_cell;
+ q->tail = new_cell;
}
n = q->nb_elem++;
TSMutexUnlock(q->mutex);
@@ -93,7 +93,7 @@ remove_from_queue(Queue *q)
remove_cell = q->head;
TSAssert(remove_cell->magic == MAGIC_ALIVE);
- data = remove_cell->ptr_data;
+ data = remove_cell->ptr_data;
q->head = remove_cell->ptr_prev;
if (q->head == NULL) {
TSAssert(q->nb_elem == 1);
@@ -127,11 +127,11 @@ job_create(TSCont contp, ExecFunc func, void *data)
{
Job *new_job;
- new_job = TSmalloc(sizeof(Job));
+ new_job = TSmalloc(sizeof(Job));
new_job->magic = MAGIC_ALIVE;
- new_job->cont = contp;
- new_job->func = func;
- new_job->data = data;
+ new_job->cont = contp;
+ new_job->func = func;
+ new_job->data = data;
return new_job;
}
diff --git a/example/txn-data-sink/txn-data-sink.c b/example/txn-data-sink/txn-data-sink.c
index 3016257..c2b95a8 100644
--- a/example/txn-data-sink/txn-data-sink.c
+++ b/example/txn-data-sink/txn-data-sink.c
@@ -41,7 +41,7 @@
// Activate the data sink if this field is present in the request.
static char const FLAG_MIME_FIELD[] = "TS-Agent";
-static size_t const FLAG_MIME_LEN = sizeof(FLAG_MIME_FIELD) - 1;
+static size_t const FLAG_MIME_LEN = sizeof(FLAG_MIME_FIELD) - 1;
typedef struct {
int64_t total;
@@ -65,7 +65,7 @@ client_reader(TSCont contp, TSEvent event, void *edata)
TSVIO input_vio = TSVConnWriteVIOGet(contp);
if (!data) {
- data = TSmalloc(sizeof(SinkData));
+ data = TSmalloc(sizeof(SinkData));
data->total = 0;
TSContDataSet(contp, data);
}
@@ -84,7 +84,7 @@ client_reader(TSCont contp, TSEvent event, void *edata)
// Look for data and if we find any, consume.
if (TSVIOBufferGet(input_vio)) {
TSIOBufferReader reader = TSVIOReaderGet(input_vio);
- int64_t n = TSIOBufferReaderAvail(reader);
+ int64_t n = TSIOBufferReaderAvail(reader);
if (n > 0) {
TSIOBufferReaderConsume(reader, n);
TSVIONDoneSet(input_vio, TSVIONDoneGet(input_vio) + n);
@@ -120,7 +120,7 @@ enable_agent_check(TSHttpTxn txnp)
// Enable the sink agent if the header is present.
if (TS_SUCCESS == TSHttpTxnClientReqGet(txnp, &req_buf, &req_loc)) {
TSMLoc range_field = TSMimeHdrFieldFind(req_buf, req_loc, FLAG_MIME_FIELD, FLAG_MIME_LEN);
- zret = NULL == range_field ? 0 : 1;
+ zret = NULL == range_field ? 0 : 1;
}
return zret;
@@ -162,8 +162,8 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = PLUGIN_NAME;
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = PLUGIN_NAME;
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/example/version/version.c b/example/version/version.c
index a0a7b50..2b3ecc7 100644
--- a/example/version/version.c
+++ b/example/version/version.c
@@ -48,8 +48,8 @@ TSPluginInit(int argc, const char *argv[])
}
TSPluginRegistrationInfo info;
- info.plugin_name = "version-plugin";
- info.vendor_name = "MyCompany";
+ info.plugin_name = "version-plugin";
+ info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
// partial compilation
diff --git a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc
index ad1536d..10e8a93 100644
--- a/iocore/aio/AIO.cc
+++ b/iocore/aio/AIO.cc
@@ -48,14 +48,14 @@ static ink_mutex insert_mutex;
int thread_is_created = 0;
#endif // AIO_MODE == AIO_MODE_NATIVE
RecInt cache_config_threads_per_disk = 12;
-RecInt api_config_threads_per_disk = 12;
+RecInt api_config_threads_per_disk = 12;
-RecRawStatBlock *aio_rsb = NULL;
+RecRawStatBlock *aio_rsb = NULL;
Continuation *aio_err_callbck = 0;
// AIO Stats
-uint64_t aio_num_read = 0;
-uint64_t aio_bytes_read = 0;
-uint64_t aio_num_write = 0;
+uint64_t aio_num_read = 0;
+uint64_t aio_bytes_read = 0;
+uint64_t aio_num_write = 0;
uint64_t aio_bytes_written = 0;
/*
@@ -68,7 +68,7 @@ aio_stats_cb(const char * /* name ATS_UNUSED */, RecDataT data_type, RecData *da
(void)data_type;
(void)rsb;
int64_t new_val = 0;
- int64_t diff = 0;
+ int64_t diff = 0;
int64_t count, sum;
ink_hrtime now = Thread::get_hrtime();
// The RecGetGlobalXXX stat functions are cheaper than the
@@ -115,9 +115,9 @@ static AIOTestData *data;
int
AIOTestData::ink_aio_stats(int event, void *d)
{
- ink_hrtime now = Thread::get_hrtime();
+ ink_hrtime now = Thread::get_hrtime();
double time_msec = (double)(now - start) / (double)HRTIME_MSECOND;
- int i = (aio_reqs[0] == NULL) ? 1 : 0;
+ int i = (aio_reqs[0] == NULL) ? 1 : 0;
for (; i < num_filedes; ++i)
printf("%0.2f\t%i\t%i\t%i\n", time_msec, aio_reqs[i]->filedes, aio_reqs[i]->pending, aio_reqs[i]->queued);
printf("Num Requests: %i Num Queued: %i num Moved: %i\n\n", data->num_req, data->num_queue, data->num_temp);
@@ -227,16 +227,16 @@ aio_init_fildes(int fildes, int fromAPI = 0)
RecInt thread_num;
if (fromAPI) {
- request->index = 0;
- request->filedes = -1;
- aio_reqs[0] = request;
+ request->index = 0;
+ request->filedes = -1;
+ aio_reqs[0] = request;
thread_is_created = 1;
- thread_num = api_config_threads_per_disk;
+ thread_num = api_config_threads_per_disk;
} else {
- request->index = num_filedes;
- request->filedes = fildes;
+ request->index = num_filedes;
+ request->filedes = fildes;
aio_reqs[num_filedes] = request;
- thread_num = cache_config_threads_per_disk;
+ thread_num = cache_config_threads_per_disk;
}
/* create the main thread */
@@ -301,15 +301,15 @@ aio_move(AIO_Reqs *req)
if (!cb)
return;
while (cb->link.next) {
- next = (AIOCallback *)cb->link.next;
+ next = (AIOCallback *)cb->link.next;
cb->link.next = prev;
- prev = cb;
- cb = next;
+ prev = cb;
+ cb = next;
}
/* fix the last pointer */
cb->link.next = prev;
for (; cb; cb = next) {
- next = (AIOCallback *)cb->link.next;
+ next = (AIOCallback *)cb->link.next;
cb->link.next = NULL;
cb->link.prev = NULL;
aio_insert(cb, req);
@@ -321,8 +321,8 @@ static void
aio_queue_req(AIOCallbackInternal *op, int fromAPI = 0)
{
int thread_ndx = 1;
- AIO_Reqs *req = op->aio_req;
- op->link.next = NULL;
+ AIO_Reqs *req = op->aio_req;
+ op->link.next = NULL;
;
op->link.prev = NULL;
#ifdef AIO_STATS
@@ -451,9 +451,9 @@ void *
aio_thread_main(void *arg)
{
AIOThreadInfo *thr_info = (AIOThreadInfo *)arg;
- AIO_Reqs *my_aio_req = (AIO_Reqs *)thr_info->req;
- AIO_Reqs *current_req = NULL;
- AIOCallback *op = NULL;
+ AIO_Reqs *my_aio_req = (AIO_Reqs *)thr_info->req;
+ AIO_Reqs *current_req = NULL;
+ AIOCallback *op = NULL;
ink_mutex_acquire(&my_aio_req->aio_mutex);
for (;;) {
do {
@@ -483,10 +483,10 @@ aio_thread_main(void *arg)
ink_mutex_release(¤t_req->aio_mutex);
if (cache_op((AIOCallbackInternal *)op) <= 0) {
if (aio_err_callbck) {
- AIOCallback *callback_op = new AIOCallbackInternal();
+ AIOCallback *callback_op = new AIOCallbackInternal();
callback_op->aiocb.aio_fildes = op->aiocb.aio_fildes;
- callback_op->mutex = aio_err_callbck->mutex;
- callback_op->action = aio_err_callbck;
+ callback_op->mutex = aio_err_callbck->mutex;
+ callback_op->action = aio_err_callbck;
eventProcessor.schedule_imm(callback_op);
}
}
@@ -496,7 +496,7 @@ aio_thread_main(void *arg)
#endif
op->link.prev = NULL;
op->link.next = NULL;
- op->mutex = op->action.mutex;
+ op->mutex = op->action.mutex;
if (op->thread == AIO_CALLBACK_THREAD_AIO) {
SCOPED_MUTEX_LOCK(lock, op->mutex, thr_info->mutex->thread_holding);
if (!op->action.cancelled)
@@ -529,7 +529,7 @@ DiskHandler::mainAIOEvent(int event, Event *e)
Lagain:
int ret = io_getevents(ctx, 0, MAX_AIO_EVENTS, events, NULL);
for (int i = 0; i < ret; i++) {
- op = (AIOCallback *)events[i].data;
+ op = (AIOCallback *)events[i].data;
op->aio_result = events[i].res;
ink_assert(op->action.continuation);
complete_list.enqueue(op);
@@ -578,10 +578,10 @@ Lagain:
int
ink_aio_read(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
{
- op->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
+ op->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
op->aiocb.aio_lio_opcode = IO_CMD_PREAD;
- op->aiocb.data = op;
- EThread *t = this_ethread();
+ op->aiocb.data = op;
+ EThread *t = this_ethread();
#ifdef HAVE_EVENTFD
io_set_eventfd(&op->aiocb, t->evfd);
#endif
@@ -593,10 +593,10 @@ ink_aio_read(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
int
ink_aio_write(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
{
- op->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
+ op->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
op->aiocb.aio_lio_opcode = IO_CMD_PWRITE;
- op->aiocb.data = op;
- EThread *t = this_ethread();
+ op->aiocb.data = op;
+ EThread *t = this_ethread();
#ifdef HAVE_EVENTFD
io_set_eventfd(&op->aiocb, t->evfd);
#endif
@@ -608,15 +608,15 @@ ink_aio_write(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
int
ink_aio_readv(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
{
- EThread *t = this_ethread();
+ EThread *t = this_ethread();
DiskHandler *dh = t->diskHandler;
AIOCallback *io = op;
- int sz = 0;
+ int sz = 0;
while (io) {
- io->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
+ io->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
io->aiocb.aio_lio_opcode = IO_CMD_PREAD;
- io->aiocb.data = io;
+ io->aiocb.data = io;
#ifdef HAVE_EVENTFD
io_set_eventfd(&op->aiocb, t->evfd);
#endif
@@ -630,7 +630,7 @@ ink_aio_readv(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
AIOVec *vec = new AIOVec(sz, op);
while (--sz >= 0) {
op->action = vec;
- op = op->then;
+ op = op->then;
}
}
return 1;
@@ -639,15 +639,15 @@ ink_aio_readv(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
int
ink_aio_writev(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
{
- EThread *t = this_ethread();
+ EThread *t = this_ethread();
DiskHandler *dh = t->diskHandler;
AIOCallback *io = op;
- int sz = 0;
+ int sz = 0;
while (io) {
- io->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
+ io->aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
io->aiocb.aio_lio_opcode = IO_CMD_PWRITE;
- io->aiocb.data = io;
+ io->aiocb.data = io;
#ifdef HAVE_EVENTFD
io_set_eventfd(&op->aiocb, t->evfd);
#endif
@@ -661,7 +661,7 @@ ink_aio_writev(AIOCallback *op, int /* fromAPI ATS_UNUSED */)
AIOVec *vec = new AIOVec(sz, op);
while (--sz >= 0) {
op->action = vec;
- op = op->then;
+ op = op->then;
}
}
return 1;
diff --git a/iocore/aio/test_AIO.cc b/iocore/aio/test_AIO.cc
index 3e86a0c..ae90b52 100644
--- a/iocore/aio/test_AIO.cc
+++ b/iocore/aio/test_AIO.cc
@@ -58,31 +58,31 @@ AIO_Device *dev[MAX_DISK_THREADS];
extern RecInt cache_config_threads_per_disk;
-int write_after = 0;
-int write_skip = 0;
-int hotset_size = 20;
+int write_after = 0;
+int write_skip = 0;
+int hotset_size = 20;
double hotset_frequency = 0.9;
-int touch_data = 0;
-int disk_size = 4000;
-int read_size = 1024;
+int touch_data = 0;
+int disk_size = 4000;
+int read_size = 1024;
char *disk_path[MAX_DISK_THREADS];
-int n_disk_path = 0;
-int run_time = 0;
+int n_disk_path = 0;
+int run_time = 0;
int threads_per_disk = 1;
-int delete_disks = 0;
-int max_size = 0;
-int use_lseek = 0;
-
-int chains = 1;
-double seq_read_percent = 0.0;
-double seq_write_percent = 0.0;
-double rand_read_percent = 0.0;
-double real_seq_read_percent = 0.0;
+int delete_disks = 0;
+int max_size = 0;
+int use_lseek = 0;
+
+int chains = 1;
+double seq_read_percent = 0.0;
+double seq_write_percent = 0.0;
+double rand_read_percent = 0.0;
+double real_seq_read_percent = 0.0;
double real_seq_write_percent = 0.0;
double real_rand_read_percent = 0.0;
-int seq_read_size = 0;
-int seq_write_size = 0;
-int rand_read_size = 0;
+int seq_read_size = 0;
+int seq_write_size = 0;
+int rand_read_size = 0;
struct AIO_Device : public Continuation {
char *path;
@@ -99,7 +99,7 @@ struct AIO_Device : public Continuation {
AIO_Device(ProxyMutex *m) : Continuation(m)
{
hotset_idx = 0;
- io = new_AIOCallback();
+ io = new_AIOCallback();
time_start = 0;
SET_HANDLER(&AIO_Device::do_hotset);
}
@@ -118,13 +118,13 @@ struct AIO_Device : public Continuation {
{
if (!touch_data)
return;
- unsigned int len = (unsigned int)orig_len;
+ unsigned int len = (unsigned int)orig_len;
unsigned int offset = (unsigned int)orig_offset;
- offset = offset % 1024;
- char *b = buf;
- unsigned *x = (unsigned *)b;
+ offset = offset % 1024;
+ char *b = buf;
+ unsigned *x = (unsigned *)b;
for (unsigned j = 0; j < (len / sizeof(int)); j++) {
- x[j] = offset;
+ x[j] = offset;
offset = (offset + 1) % 1024;
}
};
@@ -133,10 +133,10 @@ struct AIO_Device : public Continuation {
{
if (!touch_data)
return 0;
- unsigned int len = (unsigned int)orig_len;
+ unsigned int len = (unsigned int)orig_len;
unsigned int offset = (unsigned int)orig_offset;
- offset = offset % 1024;
- unsigned *x = (unsigned *)buf;
+ offset = offset % 1024;
+ unsigned *x = (unsigned *)buf;
for (unsigned j = 0; j < (len / sizeof(int)); j++) {
if (x[j] != offset)
return 1;
@@ -174,12 +174,12 @@ dump_summary(void)
printf("-------------------------\n");
printf("individual thread results\n");
printf("-------------------------\n");
- double total_seq_reads = 0;
+ double total_seq_reads = 0;
double total_seq_writes = 0;
double total_rand_reads = 0;
- double total_secs = 0.0;
+ double total_secs = 0.0;
for (int i = 0; i < orig_n_accessors; i++) {
- double secs = (dev[i]->time_end - dev[i]->time_start) / 1000000000.0;
+ double secs = (dev[i]->time_end - dev[i]->time_start) / 1000000000.0;
double ops_sec = (dev[i]->seq_reads + dev[i]->seq_writes + dev[i]->rand_reads) / secs;
printf("%s: #sr:%d #sw:%d #rr:%d %0.1f secs %0.1f ops/sec\n", dev[i]->path, dev[i]->seq_reads, dev[i]->seq_writes,
dev[i]->rand_reads, secs, ops_sec);
@@ -216,10 +216,10 @@ dump_summary(void)
int
AIO_Device::do_hotset(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
- off_t max_offset = ((off_t)disk_size) * 1024 * 1024;
+ off_t max_offset = ((off_t)disk_size) * 1024 * 1024;
io->aiocb.aio_lio_opcode = LIO_WRITE;
- io->aiocb.aio_fildes = fd;
- io->aiocb.aio_offset = MIN_OFFSET + hotset_idx * max_size;
+ io->aiocb.aio_fildes = fd;
+ io->aiocb.aio_offset = MIN_OFFSET + hotset_idx * max_size;
do_touch_data(seq_read_size, io->aiocb.aio_offset);
ink_assert(!do_check_data(seq_read_size, io->aiocb.aio_offset));
if (!hotset_idx)
@@ -232,9 +232,9 @@ AIO_Device::do_hotset(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
return (0);
}
io->aiocb.aio_nbytes = seq_read_size;
- io->aiocb.aio_buf = buf;
- io->action = this;
- io->thread = mutex->thread_holding;
+ io->aiocb.aio_buf = buf;
+ io->action = this;
+ io->thread = mutex->thread_holding;
ink_assert(ink_aio_write(io) >= 0);
hotset_idx++;
return 0;
@@ -255,10 +255,10 @@ AIO_Device::do_fd(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
return 0;
}
- off_t max_offset = ((off_t)disk_size) * 1024 * 1024; // MB-GB
+ off_t max_offset = ((off_t)disk_size) * 1024 * 1024; // MB-GB
off_t max_hotset_offset = ((off_t)hotset_size) * 1024 * 1024; // MB-GB
- off_t seq_read_point = ((off_t)MIN_OFFSET);
- off_t seq_write_point = ((off_t)MIN_OFFSET) + max_offset / 2 + write_after * 1024 * 1024;
+ off_t seq_read_point = ((off_t)MIN_OFFSET);
+ off_t seq_write_point = ((off_t)MIN_OFFSET) + max_offset / 2 + write_after * 1024 * 1024;
seq_write_point += (id % n_disk_path) * (max_offset / (threads_per_disk * 4));
if (seq_write_point > max_offset)
seq_write_point = MIN_OFFSET;
@@ -268,14 +268,14 @@ AIO_Device::do_fd(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
memset((void *)buf, 0, max_size);
io->aiocb.aio_fildes = fd;
- io->aiocb.aio_buf = buf;
- io->action = this;
- io->thread = mutex->thread_holding;
+ io->aiocb.aio_buf = buf;
+ io->action = this;
+ io->thread = mutex->thread_holding;
switch (select_mode(drand48())) {
case READ_MODE:
- io->aiocb.aio_offset = seq_read_point;
- io->aiocb.aio_nbytes = seq_read_size;
+ io->aiocb.aio_offset = seq_read_point;
+ io->aiocb.aio_nbytes = seq_read_size;
io->aiocb.aio_lio_opcode = LIO_READ;
ink_assert(ink_aio_read(io) >= 0);
seq_read_point += seq_read_size;
@@ -284,8 +284,8 @@ AIO_Device::do_fd(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
seq_reads++;
break;
case WRITE_MODE:
- io->aiocb.aio_offset = seq_write_point;
- io->aiocb.aio_nbytes = seq_write_size;
+ io->aiocb.aio_offset = seq_write_point;
+ io->aiocb.aio_nbytes = seq_write_size;
io->aiocb.aio_lio_opcode = LIO_WRITE;
do_touch_data(seq_write_size, ((int)seq_write_point) % 1024);
ink_assert(ink_aio_write(io) >= 0);
@@ -299,18 +299,18 @@ AIO_Device::do_fd(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
case RANDOM_READ_MODE: {
// fprintf(stderr, "random read started \n");
double p, f;
- p = drand48();
- f = drand48();
+ p = drand48();
+ f = drand48();
off_t o = 0;
if (f < hotset_frequency)
o = (off_t)p * max_hotset_offset;
else
o = (off_t)p * (max_offset - rand_read_size);
if (o < MIN_OFFSET)
- o = MIN_OFFSET;
- o = (o + (seq_read_size - 1)) & (~(seq_read_size - 1));
- io->aiocb.aio_offset = o;
- io->aiocb.aio_nbytes = rand_read_size;
+ o = MIN_OFFSET;
+ o = (o + (seq_read_size - 1)) & (~(seq_read_size - 1));
+ io->aiocb.aio_offset = o;
+ io->aiocb.aio_nbytes = rand_read_size;
io->aiocb.aio_lio_opcode = LIO_READ;
ink_assert(ink_aio_read(io) >= 0);
rand_reads++;
@@ -373,8 +373,8 @@ read_config(const char *config_filename)
}
}
assert(read_size > 0);
- int t = seq_read_size + seq_write_size + rand_read_size;
- real_seq_read_percent = seq_read_percent;
+ int t = seq_read_size + seq_write_size + rand_read_size;
+ real_seq_read_percent = seq_read_percent;
real_seq_write_percent = seq_write_percent;
real_rand_read_percent = rand_read_percent;
if (seq_read_size)
@@ -383,8 +383,8 @@ read_config(const char *config_filename)
real_seq_write_percent *= t / seq_write_size;
if (rand_read_size)
real_rand_read_percent *= t / rand_read_size;
- float tt = real_seq_read_percent + real_seq_write_percent + real_rand_read_percent;
- real_seq_read_percent = real_seq_read_percent / tt;
+ float tt = real_seq_read_percent + real_seq_write_percent + real_rand_read_percent;
+ real_seq_read_percent = real_seq_read_percent / tt;
real_seq_write_percent = real_seq_write_percent / tt;
real_rand_read_percent = real_rand_read_percent / tt;
return (1);
@@ -401,8 +401,8 @@ main(int /* argc ATS_UNUSED */, char *argv[])
ink_event_system_init(EVENT_SYSTEM_MODULE_VERSION);
eventProcessor.start(ink_number_of_processors());
#if AIO_MODE == AIO_MODE_NATIVE
- int etype = ET_NET;
- int n_netthreads = eventProcessor.n_threads_for_type[etype];
+ int etype = ET_NET;
+ int n_netthreads = eventProcessor.n_threads_for_type[etype];
EThread **netthreads = eventProcessor.eventthread[etype];
for (int i = 0; i < n_netthreads; ++i) {
netthreads[i]->diskHandler = new DiskHandler();
@@ -424,17 +424,17 @@ main(int /* argc ATS_UNUSED */, char *argv[])
max_size = rand_read_size;
cache_config_threads_per_disk = threads_per_disk;
- orig_n_accessors = n_disk_path * threads_per_disk;
+ orig_n_accessors = n_disk_path * threads_per_disk;
for (i = 0; i < n_disk_path; i++) {
for (int j = 0; j < threads_per_disk; j++) {
- dev[n_accessors] = new AIO_Device(new_ProxyMutex());
- dev[n_accessors]->id = i * threads_per_disk + j;
- dev[n_accessors]->path = disk_path[i];
- dev[n_accessors]->seq_reads = 0;
+ dev[n_accessors] = new AIO_Device(new_ProxyMutex());
+ dev[n_accessors]->id = i * threads_per_disk + j;
+ dev[n_accessors]->path = disk_path[i];
+ dev[n_accessors]->seq_reads = 0;
dev[n_accessors]->seq_writes = 0;
dev[n_accessors]->rand_reads = 0;
- dev[n_accessors]->fd = open(dev[n_accessors]->path, O_RDWR | O_CREAT, 0600);
+ dev[n_accessors]->fd = open(dev[n_accessors]->path, O_RDWR | O_CREAT, 0600);
fchmod(dev[n_accessors]->fd, S_IRWXU | S_IRWXG);
if (dev[n_accessors]->fd < 0) {
perror(disk_path[i]);
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 8d13438..aa1e7a9 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -56,29 +56,29 @@ static short int const CACHE_DB_MAJOR_VERSION_COMPATIBLE = 21;
// Configuration
-int64_t cache_config_ram_cache_size = AUTO_SIZE_RAM_CACHE;
-int cache_config_ram_cache_algorithm = 0;
-int cache_config_ram_cache_compress = 0;
-int cache_config_ram_cache_compress_percent = 90;
-int cache_config_ram_cache_use_seen_filter = 0;
-int cache_config_http_max_alts = 3;
-int cache_config_dir_sync_frequency = 60;
-int cache_config_permit_pinning = 0;
-int cache_config_select_alternate = 1;
-int cache_config_max_doc_size = 0;
-int cache_config_min_average_object_size = ESTIMATED_OBJECT_SIZE;
-int64_t cache_config_ram_cache_cutoff = AGG_SIZE;
-int cache_config_max_disk_errors = 5;
-int cache_config_hit_evacuate_percent = 10;
-int cache_config_hit_evacuate_size_limit = 0;
-int cache_config_force_sector_size = 0;
-int cache_config_target_fragment_size = DEFAULT_TARGET_FRAGMENT_SIZE;
-int cache_config_agg_write_backlog = AGG_SIZE * 2;
-int cache_config_enable_checksum = 0;
-int cache_config_alt_rewrite_max_size = 4096;
-int cache_config_read_while_writer = 0;
-int cache_config_mutex_retry_delay = 2;
-int cache_read_while_writer_retry_delay = 50;
+int64_t cache_config_ram_cache_size = AUTO_SIZE_RAM_CACHE;
+int cache_config_ram_cache_algorithm = 0;
+int cache_config_ram_cache_compress = 0;
+int cache_config_ram_cache_compress_percent = 90;
+int cache_config_ram_cache_use_seen_filter = 0;
+int cache_config_http_max_alts = 3;
+int cache_config_dir_sync_frequency = 60;
+int cache_config_permit_pinning = 0;
+int cache_config_select_alternate = 1;
+int cache_config_max_doc_size = 0;
+int cache_config_min_average_object_size = ESTIMATED_OBJECT_SIZE;
+int64_t cache_config_ram_cache_cutoff = AGG_SIZE;
+int cache_config_max_disk_errors = 5;
+int cache_config_hit_evacuate_percent = 10;
+int cache_config_hit_evacuate_size_limit = 0;
+int cache_config_force_sector_size = 0;
+int cache_config_target_fragment_size = DEFAULT_TARGET_FRAGMENT_SIZE;
+int cache_config_agg_write_backlog = AGG_SIZE * 2;
+int cache_config_enable_checksum = 0;
+int cache_config_alt_rewrite_max_size = 4096;
+int cache_config_read_while_writer = 0;
+int cache_config_mutex_retry_delay = 2;
+int cache_read_while_writer_retry_delay = 50;
int cache_config_read_while_writer_max_retries = 10;
#ifdef HTTP_CACHE
static int enable_cache_empty_http_doc = 0;
@@ -89,25 +89,25 @@ int cache_config_compatibility_4_2_0_fixup = 1;
// Globals
-RecRawStatBlock *cache_rsb = NULL;
-Cache *theStreamCache = 0;
-Cache *theCache = 0;
-CacheDisk **gdisks = NULL;
-int gndisks = 0;
+RecRawStatBlock *cache_rsb = NULL;
+Cache *theStreamCache = 0;
+Cache *theCache = 0;
+CacheDisk **gdisks = NULL;
+int gndisks = 0;
static volatile int initialize_disk = 0;
Cache *caches[NUM_CACHE_FRAG_TYPES] = {0};
-CacheSync *cacheDirSync = 0;
+CacheSync *cacheDirSync = 0;
Store theCacheStore;
-volatile int CacheProcessor::initialized = CACHE_INITIALIZING;
+volatile int CacheProcessor::initialized = CACHE_INITIALIZING;
volatile uint32_t CacheProcessor::cache_ready = 0;
-volatile int CacheProcessor::start_done = 0;
-bool CacheProcessor::clear = false;
-bool CacheProcessor::fix = false;
-bool CacheProcessor::check = false;
-int CacheProcessor::start_internal_flags = 0;
-int CacheProcessor::auto_clear_flag = 0;
+volatile int CacheProcessor::start_done = 0;
+bool CacheProcessor::clear = false;
+bool CacheProcessor::fix = false;
+bool CacheProcessor::check = false;
+int CacheProcessor::start_internal_flags = 0;
+int CacheProcessor::auto_clear_flag = 0;
CacheProcessor cacheProcessor;
-Vol **gvol = NULL;
+Vol **gvol = NULL;
volatile int gnvol = 0;
ClassAllocator<CacheVC> cacheVConnectionAllocator("cacheVConnection");
ClassAllocator<EvacuationBlock> evacuationBlockAllocator("evacuationBlock");
@@ -124,7 +124,7 @@ struct VolInitInfo {
VolInitInfo()
{
recover_pos = 0;
- vol_h_f = (char *)ats_memalign(ats_pagesize(), 4 * STORE_BLOCK_SIZE);
+ vol_h_f = (char *)ats_memalign(ats_pagesize(), 4 * STORE_BLOCK_SIZE);
memset(vol_h_f, 0, 4 * STORE_BLOCK_SIZE);
}
@@ -297,7 +297,7 @@ static int
update_cache_config(const char * /* name ATS_UNUSED */, RecDataT /* data_type ATS_UNUSED */, RecData data,
void * /* cookie ATS_UNUSED */)
{
- volatile int new_value = validate_rww(data.rec_int);
+ volatile int new_value = validate_rww(data.rec_int);
cache_config_read_while_writer = new_value;
return 0;
@@ -324,8 +324,8 @@ CacheVC::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *abuf)
ink_assert(vio.op == VIO::READ);
vio.buffer.writer_for(abuf);
vio.set_continuation(c);
- vio.ndone = 0;
- vio.nbytes = nbytes;
+ vio.ndone = 0;
+ vio.nbytes = nbytes;
vio.vc_server = this;
#ifdef DEBUG
ink_assert(c->mutex->thread_holding);
@@ -341,10 +341,10 @@ CacheVC::do_io_pread(Continuation *c, int64_t nbytes, MIOBuffer *abuf, int64_t o
ink_assert(vio.op == VIO::READ);
vio.buffer.writer_for(abuf);
vio.set_continuation(c);
- vio.ndone = 0;
- vio.nbytes = nbytes;
+ vio.ndone = 0;
+ vio.nbytes = nbytes;
vio.vc_server = this;
- seek_to = offset;
+ seek_to = offset;
#ifdef DEBUG
ink_assert(c->mutex->thread_holding);
#endif
@@ -360,8 +360,8 @@ CacheVC::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *abuf, bool
ink_assert(!owner);
vio.buffer.reader_for(abuf);
vio.set_continuation(c);
- vio.ndone = 0;
- vio.nbytes = nbytes;
+ vio.ndone = 0;
+ vio.nbytes = nbytes;
vio.vc_server = this;
#ifdef DEBUG
ink_assert(c->mutex->thread_holding);
@@ -376,7 +376,7 @@ CacheVC::do_io_close(int alerrno)
{
ink_assert(mutex->thread_holding == this_ethread());
int previous_closed = closed;
- closed = (alerrno == -1) ? 1 : -1; // Stupid default arguments
+ closed = (alerrno == -1) ? 1 : -1; // Stupid default arguments
DDebug("cache_close", "do_io_close %p %d %d", this, alerrno, closed);
if (!previous_closed && !recursive)
die();
@@ -542,10 +542,10 @@ Vol::begin_read(CacheVC *cont)
}
// we don't actually need to preserve this block as it is already in
// memory, but this is easier, and evacuations are rare
- EThread *t = cont->mutex->thread_holding;
- b = new_EvacuationBlock(t);
- b->readers = 1;
- b->dir = cont->earliest_dir;
+ EThread *t = cont->mutex->thread_holding;
+ b = new_EvacuationBlock(t);
+ b->readers = 1;
+ b->dir = cont->earliest_dir;
b->evac_frags.key = cont->earliest_key;
evacuate[i].push(b);
return 1;
@@ -608,8 +608,8 @@ CacheProcessor::start_internal(int flags)
ink_assert((int)TS_EVENT_CACHE_SCAN_DONE == (int)CACHE_EVENT_SCAN_DONE);
#if AIO_MODE == AIO_MODE_NATIVE
- int etype = ET_NET;
- int n_netthreads = eventProcessor.n_threads_for_type[etype];
+ int etype = ET_NET;
+ int n_netthreads = eventProcessor.n_threads_for_type[etype];
EThread **netthreads = eventProcessor.eventthread[etype];
for (int i = 0; i < n_netthreads; ++i) {
netthreads[i]->diskHandler = new DiskHandler();
@@ -618,17 +618,17 @@ CacheProcessor::start_internal(int flags)
#endif
start_internal_flags = flags;
- clear = !!(flags & PROCESSOR_RECONFIGURE) || auto_clear_flag;
- fix = !!(flags & PROCESSOR_FIX);
- check = (flags & PROCESSOR_CHECK) != 0;
- start_done = 0;
- int diskok = 1;
+ clear = !!(flags & PROCESSOR_RECONFIGURE) || auto_clear_flag;
+ fix = !!(flags & PROCESSOR_FIX);
+ check = (flags & PROCESSOR_CHECK) != 0;
+ start_done = 0;
+ int diskok = 1;
Span *sd;
/* read the config file and create the data structures corresponding
to the file */
gndisks = theCacheStore.n_disks;
- gdisks = (CacheDisk **)ats_malloc(gndisks * sizeof(CacheDisk *));
+ gdisks = (CacheDisk **)ats_malloc(gndisks * sizeof(CacheDisk *));
gndisks = 0;
ink_aio_set_callback(new AIO_Callback_handler());
@@ -659,7 +659,7 @@ CacheProcessor::start_internal(int flags)
opts |= O_RDONLY;
}
- int fd = open(path, opts, 0644);
+ int fd = open(path, opts, 0644);
int64_t blocks = sd->blocks;
if (fd < 0 && (opts & O_CREAT)) // Try without O_DIRECT if this is a file on filesystem, e.g. tmpfs.
@@ -690,7 +690,7 @@ CacheProcessor::start_internal(int flags)
gdisks[gndisks] = new CacheDisk();
if (check)
- gdisks[gndisks]->read_only_p = true;
+ gdisks[gndisks]->read_only_p = true;
gdisks[gndisks]->forced_volume_num = sd->forced_volume_num;
if (sd->hash_base_string)
gdisks[gndisks]->hash_base_string = ats_strdup(sd->hash_base_string);
@@ -710,7 +710,7 @@ CacheProcessor::start_internal(int flags)
}
off_t skip = ROUND_TO_STORE_BLOCK((sd->offset < START_POS ? START_POS + sd->alignment : sd->offset));
- blocks = blocks - (skip >> STORE_BLOCK_SHIFT);
+ blocks = blocks - (skip >> STORE_BLOCK_SHIFT);
#if AIO_MODE == AIO_MODE_NATIVE
eventProcessor.schedule_imm(new DiskInit(gdisks[gndisks], path, blocks, skip, sector_size, fd, clear));
#else
@@ -758,9 +758,9 @@ CacheProcessor::start_internal(int flags)
void
CacheProcessor::diskInitialized()
{
- int n_init = ink_atomic_increment(&initialize_disk, 1);
+ int n_init = ink_atomic_increment(&initialize_disk, 1);
int bad_disks = 0;
- int res = 0;
+ int res = 0;
if (n_init == gndisks - 1) {
int i;
for (i = 0; i < gndisks; i++) {
@@ -797,7 +797,7 @@ CacheProcessor::diskInitialized()
}
}
ats_free(gdisks);
- gdisks = p_good_disks;
+ gdisks = p_good_disks;
gndisks = gndisks - bad_disks;
}
@@ -849,19 +849,19 @@ CacheProcessor::diskInitialized()
d->sync();
}
if (config_volumes.num_volumes == 0) {
- theCache = new Cache();
+ theCache = new Cache();
theCache->scheme = CACHE_HTTP_TYPE;
theCache->open(clear, fix);
return;
}
if (config_volumes.num_http_volumes != 0) {
- theCache = new Cache();
+ theCache = new Cache();
theCache->scheme = CACHE_HTTP_TYPE;
theCache->open(clear, fix);
}
if (config_volumes.num_stream_volumes != 0) {
- theStreamCache = new Cache();
+ theStreamCache = new Cache();
theStreamCache->scheme = CACHE_RTSP_TYPE;
theStreamCache->open(clear, fix);
}
@@ -875,17 +875,17 @@ CacheProcessor::cacheInitialized()
if ((theCache && (theCache->ready == CACHE_INITIALIZING)) || (theStreamCache && (theStreamCache->ready == CACHE_INITIALIZING)))
return;
- int caches_ready = 0;
+ int caches_ready = 0;
int cache_init_ok = 0;
/* allocate ram size in proportion to the disk space the
volume accupies */
- int64_t total_size = 0; // count in HTTP & MIXT
- uint64_t total_cache_bytes = 0; // bytes that can used in total_size
- uint64_t total_direntries = 0; // all the direntries in the cache
- uint64_t used_direntries = 0; // and used
+ int64_t total_size = 0; // count in HTTP & MIXT
+ uint64_t total_cache_bytes = 0; // bytes that can used in total_size
+ uint64_t total_direntries = 0; // all the direntries in the cache
+ uint64_t used_direntries = 0; // and used
uint64_t vol_total_cache_bytes = 0;
- uint64_t vol_total_direntries = 0;
- uint64_t vol_used_direntries = 0;
+ uint64_t vol_total_direntries = 0;
+ uint64_t vol_used_direntries = 0;
Vol *vol;
ProxyMutex *mutex = this_ethread()->mutex;
@@ -906,8 +906,8 @@ CacheProcessor::cacheInitialized()
Debug("cache_init", "CacheProcessor::cacheInitialized - failed to initialize the cache for http: cache disabled");
Warning("failed to initialize the cache for http: cache disabled\n");
} else {
- caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_HTTP);
- caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_NONE);
+ caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_HTTP);
+ caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_NONE);
caches[CACHE_FRAG_TYPE_HTTP] = theCache;
caches[CACHE_FRAG_TYPE_NONE] = theCache;
}
@@ -917,7 +917,7 @@ CacheProcessor::cacheInitialized()
Debug("cache_init", "CacheProcessor::cacheInitialized - failed to initialize the cache for streaming: cache disabled");
Warning("failed to initialize the cache for streaming: cache disabled\n");
} else {
- caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_RTSP);
+ caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_RTSP);
caches[CACHE_FRAG_TYPE_RTSP] = theStreamCache;
}
}
@@ -1127,9 +1127,9 @@ CacheProcessor::open_read(Continuation *cont, const CacheKey *key, bool cluster_
#ifdef CLUSTER_CACHE
if (cache_clustering_enabled > 0 && !cluster_cache_local) {
HttpCacheKey hkey;
- hkey.hash = *key;
+ hkey.hash = *key;
hkey.hostname = hostname;
- hkey.hostlen = hostlen;
+ hkey.hostlen = hostlen;
return open_read_internal(CACHE_OPEN_READ, cont, (MIOBuffer *)0, &hkey, (CacheHTTPHdr *)0, (CacheLookupHttpConfig *)0, 0,
frag_type);
}
@@ -1256,10 +1256,10 @@ Vol::db_check(bool /* fix ATS_UNUSED */)
static void
vol_init_data_internal(Vol *d)
{
- d->buckets = ((d->len - (d->start - d->skip)) / cache_config_min_average_object_size) / DIR_DEPTH;
+ d->buckets = ((d->len - (d->start - d->skip)) / cache_config_min_average_object_size) / DIR_DEPTH;
d->segments = (d->buckets + (((1 << 16) - 1) / DIR_DEPTH)) / ((1 << 16) / DIR_DEPTH);
- d->buckets = (d->buckets + d->segments - 1) / d->segments;
- d->start = d->skip + 2 * vol_dirlen(d);
+ d->buckets = (d->buckets + d->segments - 1) / d->segments;
+ d->start = d->skip + 2 * vol_dirlen(d);
}
static void
@@ -1278,7 +1278,7 @@ vol_init_dir(Vol *d)
for (s = 0; s < d->segments; s++) {
d->header->freelist[s] = 0;
- Dir *seg = dir_segment(s, d);
+ Dir *seg = dir_segment(s, d);
for (l = 1; l < DIR_DEPTH; l++) {
for (b = 0; b < d->buckets; b++) {
Dir *bucket = dir_bucket(b, seg);
@@ -1294,17 +1294,17 @@ vol_clear_init(Vol *d)
size_t dir_len = vol_dirlen(d);
memset(d->raw_dir, 0, dir_len);
vol_init_dir(d);
- d->header->magic = VOL_MAGIC;
+ d->header->magic = VOL_MAGIC;
d->header->version.ink_major = CACHE_DB_MAJOR_VERSION;
d->header->version.ink_minor = CACHE_DB_MINOR_VERSION;
d->scan_pos = d->header->agg_pos = d->header->write_pos = d->start;
- d->header->last_write_pos = d->header->write_pos;
- d->header->phase = 0;
- d->header->cycle = 0;
- d->header->create_time = time(NULL);
- d->header->dirty = 0;
+ d->header->last_write_pos = d->header->write_pos;
+ d->header->phase = 0;
+ d->header->cycle = 0;
+ d->header->create_time = time(NULL);
+ d->header->dirty = 0;
d->sector_size = d->header->sector_size = d->disk->hw_sector_size;
- *d->footer = *d->header;
+ *d->footer = *d->header;
}
int
@@ -1329,12 +1329,12 @@ Vol::clear_dir()
SET_HANDLER(&Vol::handle_dir_clear);
io.aiocb.aio_fildes = fd;
- io.aiocb.aio_buf = raw_dir;
+ io.aiocb.aio_buf = raw_dir;
io.aiocb.aio_nbytes = dir_len;
io.aiocb.aio_offset = skip;
- io.action = this;
- io.thread = AIO_CALLBACK_THREAD_ANY;
- io.then = 0;
+ io.action = this;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.then = 0;
ink_assert(ink_aio_write(&io));
return 0;
}
@@ -1342,7 +1342,7 @@ Vol::clear_dir()
int
Vol::init(char *s, off_t blocks, off_t dir_skip, bool clear)
{
- char *seed_str = disk->hash_base_string ? disk->hash_base_string : s;
+ char *seed_str = disk->hash_base_string ? disk->hash_base_string : s;
const size_t hash_seed_size = strlen(seed_str);
const size_t hash_text_size = hash_seed_size + 32;
@@ -1353,21 +1353,21 @@ Vol::init(char *s, off_t blocks, off_t dir_skip, bool clear)
MD5Context().hash_immediate(hash_id, hash_text, strlen(hash_text));
dir_skip = ROUND_TO_STORE_BLOCK((dir_skip < START_POS ? START_POS : dir_skip));
- path = ats_strdup(s);
- len = blocks * STORE_BLOCK_SIZE;
+ path = ats_strdup(s);
+ len = blocks * STORE_BLOCK_SIZE;
ink_assert(len <= MAX_VOL_SIZE);
- skip = dir_skip;
+ skip = dir_skip;
prev_recover_pos = 0;
// successive approximation, directory/meta data eats up some storage
start = dir_skip;
vol_init_data(this);
- data_blocks = (len - (start - skip)) / STORE_BLOCK_SIZE;
+ data_blocks = (len - (start - skip)) / STORE_BLOCK_SIZE;
hit_evacuate_window = (data_blocks * cache_config_hit_evacuate_percent) / 100;
evacuate_size = (int)(len / EVACUATION_BUCKET_SIZE) + 2;
- int evac_len = (int)evacuate_size * sizeof(DLL<EvacuationBlock>);
- evacuate = (DLL<EvacuationBlock> *)ats_malloc(evac_len);
+ int evac_len = (int)evacuate_size * sizeof(DLL<EvacuationBlock>);
+ evacuate = (DLL<EvacuationBlock> *)ats_malloc(evac_len);
memset(evacuate, 0, evac_len);
Debug("cache_init", "allocating %zu directory bytes for a %lld byte volume (%lf%%)", vol_dirlen(this), (long long)this->len,
@@ -1379,7 +1379,7 @@ Vol::init(char *s, off_t blocks, off_t dir_skip, bool clear)
if (raw_dir == NULL)
raw_dir = (char *)ats_memalign(ats_pagesize(), vol_dirlen(this));
- dir = (Dir *)(raw_dir + vol_headerlen(this));
+ dir = (Dir *)(raw_dir + vol_headerlen(this));
header = (VolHeaderFooter *)raw_dir;
footer = (VolHeaderFooter *)(raw_dir + vol_dirlen(this) - ROUND_TO_STORE_BLOCK(sizeof(VolHeaderFooter)));
@@ -1388,8 +1388,8 @@ Vol::init(char *s, off_t blocks, off_t dir_skip, bool clear)
return clear_dir();
}
- init_info = new VolInitInfo();
- int footerlen = ROUND_TO_STORE_BLOCK(sizeof(VolHeaderFooter));
+ init_info = new VolInitInfo();
+ int footerlen = ROUND_TO_STORE_BLOCK(sizeof(VolHeaderFooter));
off_t footer_offset = vol_dirlen(this) - footerlen;
// try A
off_t as = skip;
@@ -1398,18 +1398,18 @@ Vol::init(char *s, off_t blocks, off_t dir_skip, bool clear)
SET_HANDLER(&Vol::handle_header_read);
init_info->vol_aio[0].aiocb.aio_offset = as;
init_info->vol_aio[1].aiocb.aio_offset = as + footer_offset;
- off_t bs = skip + vol_dirlen(this);
+ off_t bs = skip + vol_dirlen(this);
init_info->vol_aio[2].aiocb.aio_offset = bs;
init_info->vol_aio[3].aiocb.aio_offset = bs + footer_offset;
for (unsigned i = 0; i < countof(init_info->vol_aio); i++) {
- AIOCallback *aio = &(init_info->vol_aio[i]);
+ AIOCallback *aio = &(init_info->vol_aio[i]);
aio->aiocb.aio_fildes = fd;
- aio->aiocb.aio_buf = &(init_info->vol_h_f[i * STORE_BLOCK_SIZE]);
+ aio->aiocb.aio_buf = &(init_info->vol_h_f[i * STORE_BLOCK_SIZE]);
aio->aiocb.aio_nbytes = footerlen;
- aio->action = this;
- aio->thread = AIO_CALLBACK_THREAD_ANY;
- aio->then = (i < 3) ? &(init_info->vol_aio[i + 1]) : 0;
+ aio->action = this;
+ aio->thread = AIO_CALLBACK_THREAD_ANY;
+ aio->then = (i < 3) ? &(init_info->vol_aio[i + 1]) : 0;
}
#if AIO_MODE == AIO_MODE_NATIVE
ink_assert(ink_aio_readv(init_info->vol_aio));
@@ -1523,7 +1523,7 @@ Vol::recover_data()
int
Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
{
- uint32_t got_len = 0;
+ uint32_t got_len = 0;
uint32_t max_sync_serial = header->sync_serial;
char *s, *e;
if (event == EVENT_IMMEDIATE) {
@@ -1533,15 +1533,15 @@ Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
return handle_recover_write_dir(EVENT_IMMEDIATE, 0);
}
// initialize
- recover_wrapped = 0;
- last_sync_serial = 0;
+ recover_wrapped = 0;
+ last_sync_serial = 0;
last_write_serial = 0;
- recover_pos = header->last_write_pos;
+ recover_pos = header->last_write_pos;
if (recover_pos >= skip + len) {
recover_wrapped = 1;
- recover_pos = start;
+ recover_pos = start;
}
- io.aiocb.aio_buf = (char *)ats_memalign(ats_pagesize(), RECOVERY_SIZE);
+ io.aiocb.aio_buf = (char *)ats_memalign(ats_pagesize(), RECOVERY_SIZE);
io.aiocb.aio_nbytes = RECOVERY_SIZE;
if ((off_t)(recover_pos + io.aiocb.aio_nbytes) > (off_t)(skip + len))
io.aiocb.aio_nbytes = (skip + len) - recover_pos;
@@ -1559,7 +1559,7 @@ Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
uint32_t to_check = header->write_pos - header->last_write_pos;
ink_assert(to_check && to_check < (uint32_t)io.aiocb.aio_nbytes);
uint32_t done = 0;
- s = (char *)io.aiocb.aio_buf;
+ s = (char *)io.aiocb.aio_buf;
while (done < to_check) {
Doc *doc = (Doc *)(s + done);
if (doc->magic != DOC_MAGIC || doc->write_serial > header->write_serial) {
@@ -1640,8 +1640,8 @@ Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
// (doc->sync_serial > header->sync_serial + 1).
// if we are too close to the end, wrap around
else if (recover_pos - (e - s) > (skip + len) - AGG_SIZE) {
- recover_wrapped = 1;
- recover_pos = start;
+ recover_wrapped = 1;
+ recover_pos = start;
io.aiocb.aio_nbytes = RECOVERY_SIZE;
break;
@@ -1655,8 +1655,8 @@ Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
// from the end, then wrap around
recover_pos -= e - s;
if (recover_pos > (skip + len) - AGG_SIZE) {
- recover_wrapped = 1;
- recover_pos = start;
+ recover_wrapped = 1;
+ recover_pos = start;
io.aiocb.aio_nbytes = RECOVERY_SIZE;
break;
@@ -1680,7 +1680,7 @@ Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
recover_pos -= e - s;
if (recover_pos >= skip + len) {
recover_wrapped = 1;
- recover_pos = start;
+ recover_pos = start;
}
io.aiocb.aio_nbytes = RECOVERY_SIZE;
if ((off_t)(recover_pos + io.aiocb.aio_nbytes) > (off_t)(skip + len))
@@ -1689,7 +1689,7 @@ Vol::handle_recover_from_data(int event, void * /* data ATS_UNUSED */)
}
if (recover_pos == prev_recover_pos) // this should never happen, but if it does break the loop
goto Lclear;
- prev_recover_pos = recover_pos;
+ prev_recover_pos = recover_pos;
io.aiocb.aio_offset = recover_pos;
ink_assert(ink_aio_read(&io));
return EVENT_CONT;
@@ -1719,7 +1719,7 @@ Ldone : {
next_sync_serial++;
// clear effected portion of the cache
off_t clear_start = offset_to_vol_offset(this, header->write_pos);
- off_t clear_end = offset_to_vol_offset(this, recover_pos);
+ off_t clear_end = offset_to_vol_offset(this, recover_pos);
if (clear_start <= clear_end)
dir_clear_range(clear_start, clear_end, this);
else {
@@ -1732,24 +1732,24 @@ Ldone : {
footer->sync_serial = header->sync_serial = next_sync_serial;
for (int i = 0; i < 3; i++) {
- AIOCallback *aio = &(init_info->vol_aio[i]);
+ AIOCallback *aio = &(init_info->vol_aio[i]);
aio->aiocb.aio_fildes = fd;
- aio->action = this;
- aio->thread = AIO_CALLBACK_THREAD_ANY;
- aio->then = (i < 2) ? &(init_info->vol_aio[i + 1]) : 0;
+ aio->action = this;
+ aio->thread = AIO_CALLBACK_THREAD_ANY;
+ aio->then = (i < 2) ? &(init_info->vol_aio[i + 1]) : 0;
}
int footerlen = ROUND_TO_STORE_BLOCK(sizeof(VolHeaderFooter));
size_t dirlen = vol_dirlen(this);
- int B = header->sync_serial & 1;
- off_t ss = skip + (B ? dirlen : 0);
+ int B = header->sync_serial & 1;
+ off_t ss = skip + (B ? dirlen : 0);
- init_info->vol_aio[0].aiocb.aio_buf = raw_dir;
+ init_info->vol_aio[0].aiocb.aio_buf = raw_dir;
init_info->vol_aio[0].aiocb.aio_nbytes = footerlen;
init_info->vol_aio[0].aiocb.aio_offset = ss;
- init_info->vol_aio[1].aiocb.aio_buf = raw_dir + footerlen;
+ init_info->vol_aio[1].aiocb.aio_buf = raw_dir + footerlen;
init_info->vol_aio[1].aiocb.aio_nbytes = dirlen - 2 * footerlen;
init_info->vol_aio[1].aiocb.aio_offset = ss + footerlen;
- init_info->vol_aio[2].aiocb.aio_buf = raw_dir + dirlen - footerlen;
+ init_info->vol_aio[2].aiocb.aio_buf = raw_dir + dirlen - footerlen;
init_info->vol_aio[2].aiocb.aio_nbytes = footerlen;
init_info->vol_aio[2].aiocb.aio_offset = ss + dirlen - footerlen;
@@ -1804,10 +1804,10 @@ Vol::handle_header_read(int event, void *data)
io.aiocb.aio_fildes = fd;
io.aiocb.aio_nbytes = vol_dirlen(this);
- io.aiocb.aio_buf = raw_dir;
- io.action = this;
- io.thread = AIO_CALLBACK_THREAD_ANY;
- io.then = 0;
+ io.aiocb.aio_buf = raw_dir;
+ io.action = this;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.then = 0;
if (hf[0]->sync_serial == hf[1]->sync_serial &&
(hf[0]->sync_serial >= hf[2]->sync_serial || hf[2]->sync_serial != hf[3]->sync_serial)) {
@@ -1879,16 +1879,16 @@ cmprtable(const void *aa, const void *bb)
void
build_vol_hash_table(CacheHostRecord *cp)
{
- int num_vols = cp->num_vols;
+ int num_vols = cp->num_vols;
unsigned int *mapping = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
- Vol **p = (Vol **)ats_malloc(sizeof(Vol *) * num_vols);
+ Vol **p = (Vol **)ats_malloc(sizeof(Vol *) * num_vols);
memset(mapping, 0, num_vols * sizeof(unsigned int));
memset(p, 0, num_vols * sizeof(Vol *));
uint64_t total = 0;
- int bad_vols = 0;
- int map = 0;
- uint64_t used = 0;
+ int bad_vols = 0;
+ int map = 0;
+ uint64_t used = 0;
// initialize number of elements per vol
for (int i = 0; i < num_vols; i++) {
if (DISK_BAD(cp->vols[i]->disk)) {
@@ -1896,7 +1896,7 @@ build_vol_hash_table(CacheHostRecord *cp)
continue;
}
mapping[map] = i;
- p[map++] = cp->vols[i];
+ p[map++] = cp->vols[i];
total += (cp->vols[i]->len >> STORE_BLOCK_SHIFT);
}
@@ -1913,13 +1913,13 @@ build_vol_hash_table(CacheHostRecord *cp)
return;
}
- unsigned int *forvol = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
- unsigned int *gotvol = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
- unsigned int *rnd = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
+ unsigned int *forvol = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
+ unsigned int *gotvol = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
+ unsigned int *rnd = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
unsigned short *ttable = (unsigned short *)ats_malloc(sizeof(unsigned short) * VOL_HASH_TABLE_SIZE);
unsigned short *old_table;
unsigned int *rtable_entries = (unsigned int *)ats_malloc(sizeof(unsigned int) * num_vols);
- unsigned int rtable_size = 0;
+ unsigned int rtable_size = 0;
// estimate allocation
for (int i = 0; i < num_vols; i++) {
@@ -1936,18 +1936,18 @@ build_vol_hash_table(CacheHostRecord *cp)
// seed random number generator
for (int i = 0; i < num_vols; i++) {
uint64_t x = p[i]->hash_id.fold();
- rnd[i] = (unsigned int)x;
+ rnd[i] = (unsigned int)x;
}
// initialize table to "empty"
- for (int i = 0; i < VOL_HASH_TABLE_SIZE; i++)
+ for (int i = 0; i < VOL_HASH_TABLE_SIZE; i++)
ttable[i] = VOL_HASH_EMPTY;
// generate random numbers proportaion to allocation
rtable_pair *rtable = (rtable_pair *)ats_malloc(sizeof(rtable_pair) * rtable_size);
- int rindex = 0;
+ int rindex = 0;
for (int i = 0; i < num_vols; i++)
for (int j = 0; j < (int)rtable_entries[i]; j++) {
rtable[rindex].rval = next_rand(&rnd[i]);
- rtable[rindex].idx = i;
+ rtable[rindex].idx = i;
rindex++;
}
ink_assert(rindex == (int)rtable_size);
@@ -1997,8 +1997,8 @@ CacheProcessor::mark_storage_offline(CacheDisk *d ///< Target disk
bool zret; // indicates whether there's any online storage left.
int p;
uint64_t total_bytes_delete = 0;
- uint64_t total_dir_delete = 0;
- uint64_t used_dir_delete = 0;
+ uint64_t total_dir_delete = 0;
+ uint64_t used_dir_delete = 0;
if (!DISK_BAD(d))
SET_DISK_BAD(d);
@@ -2029,16 +2029,16 @@ CacheProcessor::mark_storage_offline(CacheDisk *d ///< Target disk
} else { // check cache types specifically
if (theCache && !theCache->hosttable->gen_host_rec.vol_hash_table) {
unsigned int caches_ready = 0;
- caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_HTTP);
- caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_NONE);
- caches_ready = ~caches_ready;
+ caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_HTTP);
+ caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_NONE);
+ caches_ready = ~caches_ready;
CacheProcessor::cache_ready &= caches_ready;
Warning("all volumes for http cache are corrupt, http cache disabled");
}
if (theStreamCache && !theStreamCache->hosttable->gen_host_rec.vol_hash_table) {
unsigned int caches_ready = 0;
- caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_RTSP);
- caches_ready = ~caches_ready;
+ caches_ready = caches_ready | (1 << CACHE_FRAG_TYPE_RTSP);
+ caches_ready = ~caches_ready;
CacheProcessor::cache_ready &= caches_ready;
Warning("all volumes for mixt cache are corrupt, mixt cache disabled");
}
@@ -2064,7 +2064,7 @@ AIO_Callback_handler::handle_disk_failure(int /* event ATS_UNUSED */, void *data
/* search for the matching file descriptor */
if (!CacheProcessor::cache_ready)
return EVENT_DONE;
- int disk_no = 0;
+ int disk_no = 0;
AIOCallback *cb = (AIOCallback *)data;
for (; disk_no < gndisks; disk_no++) {
@@ -2129,11 +2129,11 @@ int
Cache::open(bool clear, bool /* fix ATS_UNUSED */)
{
int i;
- off_t blocks = 0;
- cache_read_done = 0;
+ off_t blocks = 0;
+ cache_read_done = 0;
total_initialized_vol = 0;
- total_nvol = 0;
- total_good_nvol = 0;
+ total_nvol = 0;
+ total_good_nvol = 0;
REC_EstablishStaticConfigInt32(cache_config_min_average_object_size, "proxy.config.cache.min_average_object_size");
Debug("cache_init", "Cache::open - proxy.config.cache.min_average_object_size = %d", (int)cache_config_min_average_object_size);
@@ -2141,19 +2141,19 @@ Cache::open(bool clear, bool /* fix ATS_UNUSED */)
CacheVol *cp = cp_list.head;
for (; cp; cp = cp->link.next) {
if (cp->scheme == scheme) {
- cp->vols = (Vol **)ats_malloc(cp->num_vols * sizeof(Vol *));
+ cp->vols = (Vol **)ats_malloc(cp->num_vols * sizeof(Vol *));
int vol_no = 0;
for (i = 0; i < gndisks; i++) {
if (cp->disk_vols[i] && !DISK_BAD(cp->disk_vols[i]->disk)) {
DiskVolBlockQueue *q = cp->disk_vols[i]->dpb_queue.head;
for (; q; q = q->link.next) {
- cp->vols[vol_no] = new Vol();
- CacheDisk *d = cp->disk_vols[i]->disk;
- cp->vols[vol_no]->disk = d;
- cp->vols[vol_no]->fd = d->fd;
- cp->vols[vol_no]->cache = this;
+ cp->vols[vol_no] = new Vol();
+ CacheDisk *d = cp->disk_vols[i]->disk;
+ cp->vols[vol_no]->disk = d;
+ cp->vols[vol_no]->fd = d->fd;
+ cp->vols[vol_no]->cache = this;
cp->vols[vol_no]->cache_vol = cp;
- blocks = q->b->len;
+ blocks = q->b->len;
bool vol_clear = clear || d->cleared || q->new_block;
#if AIO_MODE == AIO_MODE_NATIVE
@@ -2201,7 +2201,7 @@ static void
unmarshal_helper(Doc *doc, Ptr<IOBufferData> &buf, int &okay)
{
char *tmp = doc->hdr();
- int len = doc->hlen;
+ int len = doc->hlen;
while (len > 0) {
int r = HTTPInfo::unmarshal(tmp, len, buf._ptr());
if (r < 0) {
@@ -2232,7 +2232,7 @@ upgrade_doc_version(Ptr<IOBufferData> &buf)
{
// Type definition is close enough to use for initial checking.
cache_bc::Doc_v23 *doc = reinterpret_cast<cache_bc::Doc_v23 *>(buf->data());
- bool zret = true;
+ bool zret = true;
if (DOC_MAGIC == doc->magic) {
if (0 == doc->hlen) {
@@ -2247,8 +2247,8 @@ upgrade_doc_version(Ptr<IOBufferData> &buf)
char *hdr_limit = doc->data();
HTTPInfo::FragOffset *frags =
reinterpret_cast<HTTPInfo::FragOffset *>(static_cast<char *>(buf->data()) + cache_bc::sizeofDoc_v23);
- int frag_count = doc->_flen / sizeof(HTTPInfo::FragOffset);
- size_t n = 0;
+ int frag_count = doc->_flen / sizeof(HTTPInfo::FragOffset);
+ size_t n = 0;
size_t content_size = doc->data_len();
Debug("cache_bc", "Doc %p is 3.2", doc);
@@ -2256,7 +2256,7 @@ upgrade_doc_version(Ptr<IOBufferData> &buf)
// Use the same buffer size, fail if no fit.
d_buf->alloc(buf->_size_index, buf->_mem_type); // Duplicate.
d_doc = reinterpret_cast<Doc *>(d_buf->data());
- n = d_buf->block_size();
+ n = d_buf->block_size();
src = buf->data();
dst = d_buf->data();
@@ -2276,9 +2276,9 @@ upgrade_doc_version(Ptr<IOBufferData> &buf)
memcpy(dst, src, content_size); // content
// Must update new Doc::len and Doc::hlen
// dst points at the first byte of the content, or one past the last byte of the alt header.
- d_doc->len = (dst - reinterpret_cast<char *>(d_doc)) + content_size;
+ d_doc->len = (dst - reinterpret_cast<char *>(d_doc)) + content_size;
d_doc->hlen = (dst - reinterpret_cast<char *>(d_doc)) - sizeofDoc;
- buf = d_buf; // replace original buffer with new buffer.
+ buf = d_buf; // replace original buffer with new buffer.
} else {
zret = false;
}
@@ -2293,7 +2293,7 @@ upgrade_doc_version(Ptr<IOBufferData> &buf)
// put in the aggregation buffer.
n_doc->v_major = 0;
n_doc->v_minor = 0;
- n_doc->unused = 0; // force to zero to make future use easier.
+ n_doc->unused = 0; // force to zero to make future use easier.
}
}
return zret;
@@ -2389,7 +2389,7 @@ CacheVC::handleReadDone(int event, Event *e)
doc->first_key.b[0], doc->first_key.b[1], doc->len, doc->hlen, vol->path, (uint64_t)io.aiocb.aio_offset,
(size_t)io.aiocb.aio_nbytes);
doc->magic = DOC_CORRUPT;
- okay = 0;
+ okay = 0;
}
}
(void)e; // Avoid compiler warnings
@@ -2421,9 +2421,9 @@ CacheVC::handleReadDone(int event, Event *e)
// keep a pointer to it. In case the state machine decides to
// update this document, we don't have to read it back in memory
// again
- vol->first_fragment_key = *read_key;
+ vol->first_fragment_key = *read_key;
vol->first_fragment_offset = dir_offset(&dir);
- vol->first_fragment_data = buf;
+ vol->first_fragment_data = buf;
}
} // end VIO::READ check
#ifdef HTTP_CACHE
@@ -2447,8 +2447,8 @@ CacheVC::handleRead(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
// check ram cache
ink_assert(vol->mutex->thread_holding == this_ethread());
- int64_t o = dir_offset(&dir);
- int ram_hit_state = vol->ram_cache->get(read_key, &buf, (uint32_t)(o >> 32), (uint32_t)o);
+ int64_t o = dir_offset(&dir);
+ int ram_hit_state = vol->ram_cache->get(read_key, &buf, (uint32_t)(o >> 32), (uint32_t)o);
f.compressed_in_ram = (ram_hit_state > RAM_HIT_COMPRESS_NONE) ? 1 : 0;
if (ram_hit_state >= RAM_HIT_COMPRESS_NONE) {
goto LramHit;
@@ -2462,7 +2462,7 @@ CacheVC::handleRead(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
// see if its in the aggregation buffer
if (dir_agg_buf_valid(vol, &dir)) {
int agg_offset = vol_offset(vol, &dir) - vol->header->write_pos;
- buf = new_IOBufferData(iobuffer_size_to_index(io.aiocb.aio_nbytes, MAX_BUFFER_SIZE_INDEX), MEMALIGNED);
+ buf = new_IOBufferData(iobuffer_size_to_index(io.aiocb.aio_nbytes, MAX_BUFFER_SIZE_INDEX), MEMALIGNED);
ink_assert((agg_offset + io.aiocb.aio_nbytes) <= (unsigned)vol->agg_buf_pos);
char *doc = buf->data();
char *agg = vol->agg_buffer + agg_offset;
@@ -2476,10 +2476,10 @@ CacheVC::handleRead(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
io.aiocb.aio_offset = vol_offset(vol, &dir);
if ((off_t)(io.aiocb.aio_offset + io.aiocb.aio_nbytes) > (off_t)(vol->skip + vol->len))
io.aiocb.aio_nbytes = vol->skip + vol->len - io.aiocb.aio_offset;
- buf = new_IOBufferData(iobuffer_size_to_index(io.aiocb.aio_nbytes, MAX_BUFFER_SIZE_INDEX), MEMALIGNED);
- io.aiocb.aio_buf = buf->data();
- io.action = this;
- io.thread = mutex->thread_holding->tt == DEDICATED ? AIO_CALLBACK_THREAD_ANY : mutex->thread_holding;
+ buf = new_IOBufferData(iobuffer_size_to_index(io.aiocb.aio_nbytes, MAX_BUFFER_SIZE_INDEX), MEMALIGNED);
+ io.aiocb.aio_buf = buf->data();
+ io.action = this;
+ io.thread = mutex->thread_holding->tt == DEDICATED ? AIO_CALLBACK_THREAD_ANY : mutex->thread_holding;
SET_HANDLER(&CacheVC::handleReadDone);
ink_assert(ink_aio_read(&io) >= 0);
CACHE_DEBUG_INCREMENT_DYN_STAT(cache_pread_count_stat);
@@ -2487,8 +2487,8 @@ CacheVC::handleRead(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
LramHit : {
f.doc_from_ram_cache = true;
- io.aio_result = io.aiocb.aio_nbytes;
- Doc *doc = (Doc *)buf->data();
+ io.aio_result = io.aiocb.aio_nbytes;
+ Doc *doc = (Doc *)buf->data();
if (cache_config_ram_cache_compress && doc->doc_type == CACHE_FRAG_TYPE_HTTP && doc->hlen) {
SET_HANDLER(&CacheVC::handleReadDone);
return EVENT_RETURN;
@@ -2496,7 +2496,7 @@ LramHit : {
}
LmemHit:
f.doc_from_ram_cache = true;
- io.aio_result = io.aiocb.aio_nbytes;
+ io.aio_result = io.aiocb.aio_nbytes;
POP_HANDLER;
return EVENT_RETURN; // allow the caller to release the volume lock
}
@@ -2509,18 +2509,18 @@ Cache::lookup(Continuation *cont, const CacheKey *key, CacheFragType type, char
return ACTION_RESULT_DONE;
}
- Vol *vol = key_to_vol(key, hostname, host_len);
+ Vol *vol = key_to_vol(key, hostname, host_len);
ProxyMutex *mutex = cont->mutex;
- CacheVC *c = new_CacheVC(cont);
+ CacheVC *c = new_CacheVC(cont);
SET_CONTINUATION_HANDLER(c, &CacheVC::openReadStartHead);
- c->vio.op = VIO::READ;
+ c->vio.op = VIO::READ;
c->base_stat = cache_lookup_active_stat;
CACHE_INCREMENT_DYN_STAT(c->base_stat + CACHE_STAT_ACTIVE);
c->first_key = c->key = *key;
- c->frag_type = type;
- c->f.lookup = 1;
- c->vol = vol;
- c->last_collision = NULL;
+ c->frag_type = type;
+ c->f.lookup = 1;
+ c->vol = vol;
+ c->last_collision = NULL;
if (c->handleEvent(EVENT_INTERVAL, 0) == EVENT_CONT)
return &c->_action;
@@ -2549,7 +2549,7 @@ CacheVC::removeEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
// writer exists
ink_release_assert(od = vol->open_read(&key));
od->dont_update_directory = 1;
- od = NULL;
+ od = NULL;
} else {
od->dont_update_directory = 1;
}
@@ -2624,15 +2624,15 @@ Cache::remove(Continuation *cont, const CacheKey *key, CacheFragType type, const
dir_clear(&result); // initialized here, set result empty so we can recognize missed lock
mutex = cont->mutex;
- CacheVC *c = new_CacheVC(cont);
- c->vio.op = VIO::NONE;
+ CacheVC *c = new_CacheVC(cont);
+ c->vio.op = VIO::NONE;
c->frag_type = type;
c->base_stat = cache_remove_active_stat;
CACHE_INCREMENT_DYN_STAT(c->base_stat + CACHE_STAT_ACTIVE);
c->first_key = c->key = *key;
- c->vol = vol;
- c->dir = result;
- c->f.remove = 1;
+ c->vol = vol;
+ c->dir = result;
+ c->f.remove = 1;
SET_CONTINUATION_HANDLER(c, &CacheVC::removeEvent);
int ret = c->removeEvent(EVENT_IMMEDIATE, 0);
@@ -2670,12 +2670,12 @@ cplist_init()
if (!p) {
// did not find a volume in the cache vol list...create
// a new one
- CacheVol *new_p = new CacheVol();
+ CacheVol *new_p = new CacheVol();
new_p->vol_number = dp[j]->vol_number;
- new_p->num_vols = dp[j]->num_volblocks;
- new_p->size = dp[j]->size;
- new_p->scheme = dp[j]->dpb_queue.head->b->type;
- new_p->disk_vols = (DiskVol **)ats_malloc(gndisks * sizeof(DiskVol *));
+ new_p->num_vols = dp[j]->num_volblocks;
+ new_p->size = dp[j]->size;
+ new_p->scheme = dp[j]->dpb_queue.head->b->type;
+ new_p->disk_vols = (DiskVol **)ats_malloc(gndisks * sizeof(DiskVol *));
memset(new_p->disk_vols, 0, gndisks * sizeof(DiskVol *));
new_p->disk_vols[i] = dp[j];
cp_list.enqueue(new_p);
@@ -2706,7 +2706,7 @@ cplist_update()
for (d_no = 0; d_no < gndisks; d_no++) {
if (cp->disk_vols[d_no]) {
if (cp->disk_vols[d_no]->disk->forced_volume_num == cp->vol_number) {
- clearCV = 0;
+ clearCV = 0;
config_vol->cachep = cp;
} else {
cp->disk_vols[d_no]->disk->delete_volume(cp->vol_number);
@@ -2731,7 +2731,7 @@ cplist_update()
cp->disk_vols[d_no]->disk->delete_volume(cp->vol_number);
}
CacheVol *temp_cp = cp;
- cp = cp->link.next;
+ cp = cp->link.next;
cp_list.remove(temp_cp);
cp_list_len--;
delete temp_cp;
@@ -2744,7 +2744,7 @@ cplist_update()
static int
fillExclusiveDisks(CacheVol *cp)
{
- int diskCount = 0;
+ int diskCount = 0;
int volume_number = cp->vol_number;
Debug("cache_init", "volume %d", volume_number);
@@ -2795,10 +2795,10 @@ cplist_reconfigure()
gnvol = 0;
if (config_volumes.num_volumes == 0) {
/* only the http cache */
- CacheVol *cp = new CacheVol();
+ CacheVol *cp = new CacheVol();
cp->vol_number = 0;
- cp->scheme = CACHE_HTTP_TYPE;
- cp->disk_vols = (DiskVol **)ats_malloc(gndisks * sizeof(DiskVol *));
+ cp->scheme = CACHE_HTTP_TYPE;
+ cp->disk_vols = (DiskVol **)ats_malloc(gndisks * sizeof(DiskVol *));
memset(cp->disk_vols, 0, gndisks * sizeof(DiskVol *));
cp_list.enqueue(cp);
cp_list_len++;
@@ -2811,7 +2811,7 @@ cplist_reconfigure()
}
if (gdisks[i]->cleared) {
uint64_t free_space = gdisks[i]->free_space * STORE_BLOCK_SIZE;
- int vols = (free_space / MAX_VOL_SIZE) + 1;
+ int vols = (free_space / MAX_VOL_SIZE) + 1;
for (int p = 0; p < vols; p++) {
off_t b = gdisks[i]->free_space / (vols - p);
Debug("cache_hosting", "blocks = %" PRId64, (int64_t)b);
@@ -2841,7 +2841,7 @@ cplist_reconfigure()
/* change percentages in the config patitions to absolute value */
off_t tot_space_in_blks = 0;
- off_t blocks_per_vol = VOL_BLOCK_SIZE / STORE_BLOCK_SIZE;
+ off_t blocks_per_vol = VOL_BLOCK_SIZE / STORE_BLOCK_SIZE;
/* sum up the total space available on all the disks.
round down the space to 128 megabytes */
for (int i = 0; i < gndisks; i++)
@@ -2859,7 +2859,7 @@ cplist_reconfigure()
space_in_blks = space_in_blks >> (20 - STORE_BLOCK_SHIFT);
/* round down to 128 megabyte multiple */
- space_in_blks = (space_in_blks >> 7) << 7;
+ space_in_blks = (space_in_blks >> 7) << 7;
config_vol->size = space_in_blks;
tot_space_in_blks -= space_in_blks << (20 - STORE_BLOCK_SHIFT);
percent_remaining -= (config_vol->size < 128) ? 0 : config_vol->percent;
@@ -2899,7 +2899,7 @@ cplist_reconfigure()
if (!config_vol->cachep) {
// we did not find a corresponding entry in cache vol...creat one
- CacheVol *new_cp = new CacheVol();
+ CacheVol *new_cp = new CacheVol();
new_cp->disk_vols = (DiskVol **)ats_malloc(gndisks * sizeof(DiskVol *));
memset(new_cp->disk_vols, 0, gndisks * sizeof(DiskVol *));
if (create_volume(config_vol->number, size_in_blocks, config_vol->scheme, new_cp)) {
@@ -2923,33 +2923,33 @@ cplist_reconfigure()
/* search the cp_list */
int *sorted_vols = new int[gndisks];
- for (int i = 0; i < gndisks; i++)
+ for (int i = 0; i < gndisks; i++)
sorted_vols[i] = i;
for (int i = 0; i < gndisks - 1; i++) {
- int smallest = sorted_vols[i];
+ int smallest = sorted_vols[i];
int smallest_ndx = i;
for (int j = i + 1; j < gndisks; j++) {
- int curr = sorted_vols[j];
+ int curr = sorted_vols[j];
DiskVol *dvol = cp->disk_vols[curr];
if (gdisks[curr]->cleared) {
ink_assert(!dvol);
// disks that are cleared should be filled first
- smallest = curr;
+ smallest = curr;
smallest_ndx = j;
} else if (!dvol && cp->disk_vols[smallest]) {
- smallest = curr;
+ smallest = curr;
smallest_ndx = j;
} else if (dvol && cp->disk_vols[smallest] && (dvol->size < cp->disk_vols[smallest]->size)) {
- smallest = curr;
+ smallest = curr;
smallest_ndx = j;
}
}
sorted_vols[smallest_ndx] = sorted_vols[i];
- sorted_vols[i] = smallest;
+ sorted_vols[i] = smallest;
}
int64_t size_to_alloc = size_in_blocks - cp->size;
- int disk_full = 0;
+ int disk_full = 0;
for (int i = 0; (i < gndisks) && size_to_alloc; i++) {
int disk_no = sorted_vols[i];
ink_assert(cp->disk_vols[sorted_vols[gndisks - 1]]);
@@ -2960,7 +2960,7 @@ cplist_reconfigure()
the volume on this disk and try to make
them equal */
int64_t size_diff = (cp->disk_vols[disk_no]) ? largest_vol - cp->disk_vols[disk_no]->size : largest_vol;
- size_diff = (size_diff < size_to_alloc) ? size_diff : size_to_alloc;
+ size_diff = (size_diff < size_to_alloc) ? size_diff : size_to_alloc;
/* if size_diff == 0, then then the disks have volumes of the
same sizes, so we don't need to balance the disks */
if (size_diff == 0)
@@ -3002,13 +3002,13 @@ cplist_reconfigure()
int
create_volume(int volume_number, off_t size_in_blocks, int scheme, CacheVol *cp)
{
- static int curr_vol = 0; // FIXME: this will not reinitialize correctly
- off_t to_create = size_in_blocks;
+ static int curr_vol = 0; // FIXME: this will not reinitialize correctly
+ off_t to_create = size_in_blocks;
off_t blocks_per_vol = VOL_BLOCK_SIZE >> STORE_BLOCK_SHIFT;
- int full_disks = 0;
+ int full_disks = 0;
cp->vol_number = volume_number;
- cp->scheme = scheme;
+ cp->scheme = scheme;
if (fillExclusiveDisks(cp)) {
Debug("cache_init", "volume successfully filled from forced disks: volume_number=%d", volume_number);
return 0;
@@ -3043,8 +3043,8 @@ create_volume(int volume_number, off_t size_in_blocks, int scheme, CacheVol *cp)
i = (i + 1) % gndisks;
}
cp->vol_number = volume_number;
- cp->scheme = scheme;
- curr_vol = i;
+ cp->scheme = scheme;
+ curr_vol = i;
for (i = 0; i < gndisks; i++) {
if (sp[i] > 0) {
while (sp[i] > 0) {
@@ -3067,9 +3067,9 @@ rebuild_host_table(Cache *cache)
{
build_vol_hash_table(&cache->hosttable->gen_host_rec);
if (cache->hosttable->m_numEntries != 0) {
- CacheHostMatcher *hm = cache->hosttable->getHostMatcher();
+ CacheHostMatcher *hm = cache->hosttable->getHostMatcher();
CacheHostRecord *h_rec = hm->getDataArray();
- int h_rec_len = hm->getNumElements();
+ int h_rec_len = hm->getNumElements();
int i;
for (i = 0; i < h_rec_len; i++) {
build_vol_hash_table(&h_rec[i]);
@@ -3081,9 +3081,9 @@ rebuild_host_table(Cache *cache)
Vol *
Cache::key_to_vol(const CacheKey *key, char const *hostname, int host_len)
{
- uint32_t h = (key->slice32(2) >> DIR_TAG_WIDTH) % VOL_HASH_TABLE_SIZE;
+ uint32_t h = (key->slice32(2) >> DIR_TAG_WIDTH) % VOL_HASH_TABLE_SIZE;
unsigned short *hash_table = hosttable->gen_host_rec.vol_hash_table;
- CacheHostRecord *host_rec = &hosttable->gen_host_rec;
+ CacheHostRecord *host_rec = &hosttable->gen_host_rec;
if (hosttable->m_numEntries > 0 && host_len) {
CacheHostResult res;
@@ -3343,7 +3343,7 @@ static size_t const HTTP_ALT_MARSHAL_SIZE = ROUND(sizeof(HTTPCacheAlt), HDR_PTR_
size_t
HTTPInfo_v21::marshalled_length(void *data)
{
- size_t zret = ROUND(sizeof(HTTPCacheAlt_v21), HDR_PTR_SIZE);
+ size_t zret = ROUND(sizeof(HTTPCacheAlt_v21), HDR_PTR_SIZE);
HTTPCacheAlt_v21 *alt = static_cast<HTTPCacheAlt_v21 *>(data);
HdrHeap *hdr;
@@ -3383,13 +3383,13 @@ HTTPInfo_v21::copy_and_upgrade_unmarshalled_to_v23(char *&dst, char *&src, size_
// Extra data is fragment table - set that if we have it.
if (n_frags) {
static size_t const IFT_SIZE = HTTPCacheAlt_v23::N_INTEGRAL_FRAG_OFFSETS * sizeof(FragOffset);
- size_t ift_actual = min(n_frags, HTTPCacheAlt_v23::N_INTEGRAL_FRAG_OFFSETS) * sizeof(FragOffset);
+ size_t ift_actual = min(n_frags, HTTPCacheAlt_v23::N_INTEGRAL_FRAG_OFFSETS) * sizeof(FragOffset);
if (length < (HTTP_ALT_MARSHAL_SIZE + n_frags * sizeof(FragOffset) - IFT_SIZE))
return false; // can't place fragment table.
d_alt->m_frag_offset_count = n_frags;
- d_alt->m_frag_offsets = reinterpret_cast<FragOffset *>(dst - reinterpret_cast<char *>(d_alt));
+ d_alt->m_frag_offsets = reinterpret_cast<FragOffset *>(dst - reinterpret_cast<char *>(d_alt));
memcpy(d_alt->m_integral_frag_offsets, frag_offsets, ift_actual);
n_frags -= HTTPCacheAlt_v23::N_INTEGRAL_FRAG_OFFSETS;
@@ -3403,14 +3403,14 @@ HTTPInfo_v21::copy_and_upgrade_unmarshalled_to_v23(char *&dst, char *&src, size_
}
} else {
d_alt->m_frag_offset_count = 0;
- d_alt->m_frag_offsets = 0;
+ d_alt->m_frag_offsets = 0;
ink_zero(d_alt->m_integral_frag_offsets);
}
// Copy over the headers, tweaking the swizzled pointers.
s_hdr =
reinterpret_cast<HdrHeap_v23 *>(reinterpret_cast<char *>(s_alt) + reinterpret_cast<uintptr_t>(s_alt->m_request_hdr.m_heap));
- d_hdr = reinterpret_cast<HdrHeap_v23 *>(dst);
+ d_hdr = reinterpret_cast<HdrHeap_v23 *>(dst);
hdr_size = ROUND(s_hdr->unmarshal_size(), HDR_PTR_SIZE);
if (hdr_size > length)
return false;
@@ -3421,7 +3421,7 @@ HTTPInfo_v21::copy_and_upgrade_unmarshalled_to_v23(char *&dst, char *&src, size_
s_hdr =
reinterpret_cast<HdrHeap_v23 *>(reinterpret_cast<char *>(s_alt) + reinterpret_cast<uintptr_t>(s_alt->m_response_hdr.m_heap));
- d_hdr = reinterpret_cast<HdrHeap_v23 *>(dst);
+ d_hdr = reinterpret_cast<HdrHeap_v23 *>(dst);
hdr_size = ROUND(s_hdr->unmarshal_size(), HDR_PTR_SIZE);
if (hdr_size > length)
return false;
diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc
index eb5ab9c..3b0bac7 100644
--- a/iocore/cache/CacheDir.cc
+++ b/iocore/cache/CacheDir.cc
@@ -73,14 +73,14 @@ OpenDir::open_write(CacheVC *cont, int allow_if_writers, int max_writers)
{
ink_assert(cont->vol->mutex->thread_holding == this_ethread());
unsigned int h = cont->first_key.slice32(0);
- int b = h % OPEN_DIR_BUCKETS;
+ int b = h % OPEN_DIR_BUCKETS;
for (OpenDirEntry *d = bucket[b].head; d; d = d->link.next) {
if (!(d->writers.head->first_key == cont->first_key))
continue;
if (allow_if_writers && d->num_writers < d->max_writers) {
d->writers.push(cont);
d->num_writers++;
- cont->od = d;
+ cont->od = d;
cont->write_vector = &d->vector;
return 1;
}
@@ -89,15 +89,15 @@ OpenDir::open_write(CacheVC *cont, int allow_if_writers, int max_writers)
OpenDirEntry *od = THREAD_ALLOC(openDirEntryAllocator, cont->mutex->thread_holding);
od->readers.head = NULL;
od->writers.push(cont);
- od->num_writers = 1;
- od->max_writers = max_writers;
- od->vector.data.data = &od->vector.data.fast_data[0];
+ od->num_writers = 1;
+ od->max_writers = max_writers;
+ od->vector.data.data = &od->vector.data.fast_data[0];
od->dont_update_directory = 0;
- od->move_resident_alt = 0;
- od->reading_vec = 0;
- od->writing_vec = 0;
+ od->move_resident_alt = 0;
+ od->reading_vec = 0;
+ od->writing_vec = 0;
dir_clear(&od->first_dir);
- cont->od = od;
+ cont->od = od;
cont->write_vector = &od->vector;
bucket[b].push(od);
return 1;
@@ -120,7 +120,7 @@ OpenDir::signal_readers(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
if (newly_delayed_readers.head) {
delayed_readers = newly_delayed_readers;
- EThread *t1 = newly_delayed_readers.head->mutex->thread_holding;
+ EThread *t1 = newly_delayed_readers.head->mutex->thread_holding;
if (!t1)
t1 = mutex->thread_holding;
t1->schedule_in(this, HRTIME_MSECONDS(cache_config_mutex_retry_delay));
@@ -136,7 +136,7 @@ OpenDir::close_write(CacheVC *cont)
cont->od->num_writers--;
if (!cont->od->writers.head) {
unsigned int h = cont->first_key.slice32(0);
- int b = h % OPEN_DIR_BUCKETS;
+ int b = h % OPEN_DIR_BUCKETS;
bucket[b].remove(cont->od);
delayed_readers.append(cont->od->readers);
signal_readers(0, 0);
@@ -151,7 +151,7 @@ OpenDirEntry *
OpenDir::open_read(const CryptoHash *key)
{
unsigned int h = key->slice32(0);
- int b = h % OPEN_DIR_BUCKETS;
+ int b = h % OPEN_DIR_BUCKETS;
for (OpenDirEntry *d = bucket[b].head; d; d = d->link.next)
if (d->writers.head->first_key == *key)
return d;
@@ -206,7 +206,7 @@ void
dir_init_segment(int s, Vol *d)
{
d->header->freelist[s] = 0;
- Dir *seg = dir_segment(s, d);
+ Dir *seg = dir_segment(s, d);
int l, b;
memset(seg, 0, SIZEOF_DIR * DIR_DEPTH * d->buckets);
for (l = 1; l < DIR_DEPTH; l++) {
@@ -235,7 +235,7 @@ dir_freelist_length(Vol *d, int s)
{
int free = 0;
Dir *seg = dir_segment(s, d);
- Dir *e = dir_from_offset(d->header->freelist[s], seg);
+ Dir *e = dir_from_offset(d->header->freelist[s], seg);
if (dir_bucket_loop_fix(e, s, d))
return (DIR_DEPTH - 1) * d->buckets;
while (e) {
@@ -248,8 +248,8 @@ dir_freelist_length(Vol *d, int s)
int
dir_bucket_length(Dir *b, int s, Vol *d)
{
- Dir *e = b;
- int i = 0;
+ Dir *e = b;
+ int i = 0;
Dir *seg = dir_segment(s, d);
#ifdef LOOP_CHECK_MODE
if (dir_bucket_loop_fix(b, s, d))
@@ -288,12 +288,12 @@ inline void
unlink_from_freelist(Dir *e, int s, Vol *d)
{
Dir *seg = dir_segment(s, d);
- Dir *p = dir_from_offset(dir_prev(e), seg);
+ Dir *p = dir_from_offset(dir_prev(e), seg);
if (p)
dir_set_next(p, dir_next(e));
else
d->header->freelist[s] = dir_next(e);
- Dir *n = dir_from_offset(dir_next(e), seg);
+ Dir *n = dir_from_offset(dir_next(e), seg);
if (n)
dir_set_prev(n, dir_prev(e));
}
@@ -301,8 +301,8 @@ unlink_from_freelist(Dir *e, int s, Vol *d)
inline Dir *
dir_delete_entry(Dir *e, Dir *p, int s, Vol *d)
{
- Dir *seg = dir_segment(s, d);
- int no = dir_next(e);
+ Dir *seg = dir_segment(s, d);
+ int no = dir_next(e);
d->header->dirty = 1;
if (p) {
unsigned int fo = d->header->freelist[s];
@@ -407,7 +407,7 @@ freelist_clean(int s, Vol *vol)
if (vol->header->freelist[s])
return;
Warning("cache directory overflow on '%s' segment %d, purging...", vol->path, s);
- int n = 0;
+ int n = 0;
Dir *seg = dir_segment(s, vol);
for (int bi = 0; bi < vol->buckets; bi++) {
Dir *b = dir_bucket(bi, seg);
@@ -426,7 +426,7 @@ inline Dir *
freelist_pop(int s, Vol *d)
{
Dir *seg = dir_segment(s, d);
- Dir *e = dir_from_offset(d->header->freelist[s], seg);
+ Dir *e = dir_from_offset(d->header->freelist[s], seg);
if (!e) {
freelist_clean(s, d);
return NULL;
@@ -450,7 +450,7 @@ dir_segment_accounted(int s, Vol *d, int offby, int *f, int *u, int *et, int *v,
int used = 0, empty = 0;
int valid = 0, agg_valid = 0;
int64_t agg_size = 0;
- Dir *seg = dir_segment(s, d);
+ Dir *seg = dir_segment(s, d);
for (int bi = 0; bi < d->buckets; bi++) {
Dir *b = dir_bucket(bi, seg);
Dir *e = b;
@@ -490,7 +490,7 @@ dir_segment_accounted(int s, Vol *d, int offby, int *f, int *u, int *et, int *v,
void
dir_free_entry(Dir *e, int s, Vol *d)
{
- Dir *seg = dir_segment(s, d);
+ Dir *seg = dir_segment(s, d);
unsigned int fo = d->header->freelist[s];
unsigned int eo = dir_to_offset(e, seg);
dir_set_next(e, fo);
@@ -503,8 +503,8 @@ int
dir_probe(const CacheKey *key, Vol *d, Dir *result, Dir **last_collision)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int s = key->slice32(0) % d->segments;
- int b = key->slice32(1) % d->buckets;
+ int s = key->slice32(0) % d->segments;
+ int b = key->slice32(1) % d->buckets;
Dir *seg = dir_segment(s, d);
Dir *e = NULL, *p = NULL, *collision = *last_collision;
Vol *vol = d;
@@ -568,16 +568,16 @@ int
dir_insert(const CacheKey *key, Vol *d, Dir *to_part)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int s = key->slice32(0) % d->segments, l;
+ int s = key->slice32(0) % d->segments, l;
int bi = key->slice32(1) % d->buckets;
ink_assert(dir_approx_size(to_part) <= MAX_FRAG_SIZE + sizeofDoc);
Dir *seg = dir_segment(s, d);
- Dir *e = NULL;
- Dir *b = dir_bucket(bi, seg);
+ Dir *e = NULL;
+ Dir *b = dir_bucket(bi, seg);
Vol *vol = d;
#if defined(DEBUG) && defined(DO_CHECK_DIR_FAST)
unsigned int t = DIR_MASK_TAG(key->slice32(2));
- Dir *col = b;
+ Dir *col = b;
while (col) {
ink_assert((dir_tag(col) != t) || (dir_offset(col) != dir_offset(to_part)));
col = next_dir(col, seg);
@@ -620,15 +620,15 @@ int
dir_overwrite(const CacheKey *key, Vol *d, Dir *dir, Dir *overwrite, bool must_overwrite)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int s = key->slice32(0) % d->segments, l;
- int bi = key->slice32(1) % d->buckets;
- Dir *seg = dir_segment(s, d);
- Dir *e = NULL;
- Dir *b = dir_bucket(bi, seg);
+ int s = key->slice32(0) % d->segments, l;
+ int bi = key->slice32(1) % d->buckets;
+ Dir *seg = dir_segment(s, d);
+ Dir *e = NULL;
+ Dir *b = dir_bucket(bi, seg);
unsigned int t = DIR_MASK_TAG(key->slice32(2));
- int res = 1;
+ int res = 1;
#ifdef LOOP_CHECK_MODE
- int loop_count = 0;
+ int loop_count = 0;
bool loop_possible = true;
#endif
Vol *vol = d;
@@ -692,8 +692,8 @@ int
dir_delete(const CacheKey *key, Vol *d, Dir *del)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int s = key->slice32(0) % d->segments;
- int b = key->slice32(1) % d->buckets;
+ int s = key->slice32(0) % d->segments;
+ int b = key->slice32(1) % d->buckets;
Dir *seg = dir_segment(s, d);
Dir *e = NULL, *p = NULL;
#ifdef LOOP_CHECK_MODE
@@ -731,7 +731,7 @@ int
dir_lookaside_probe(const CacheKey *key, Vol *d, Dir *result, EvacuationBlock **eblock)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int i = key->slice32(3) % LOOKASIDE_SIZE;
+ int i = key->slice32(3) % LOOKASIDE_SIZE;
EvacuationBlock *b = d->lookaside[i].head;
while (b) {
if (b->evac_frags.key == *key) {
@@ -756,13 +756,13 @@ dir_lookaside_insert(EvacuationBlock *eblock, Vol *d, Dir *to)
DDebug("dir_lookaside", "insert %X %X, offset %d phase %d", key->slice32(0), key->slice32(1), (int)dir_offset(to),
(int)dir_phase(to));
ink_assert(d->mutex->thread_holding == this_ethread());
- int i = key->slice32(3) % LOOKASIDE_SIZE;
- EvacuationBlock *b = new_EvacuationBlock(d->mutex->thread_holding);
- b->evac_frags.key = *key;
+ int i = key->slice32(3) % LOOKASIDE_SIZE;
+ EvacuationBlock *b = new_EvacuationBlock(d->mutex->thread_holding);
+ b->evac_frags.key = *key;
b->evac_frags.earliest_key = *key;
- b->earliest_evacuator = eblock->earliest_evacuator;
+ b->earliest_evacuator = eblock->earliest_evacuator;
ink_assert(b->earliest_evacuator);
- b->dir = eblock->dir;
+ b->dir = eblock->dir;
b->new_dir = *to;
d->lookaside[i].push(b);
return 1;
@@ -772,7 +772,7 @@ int
dir_lookaside_fixup(const CacheKey *key, Vol *d)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int i = key->slice32(3) % LOOKASIDE_SIZE;
+ int i = key->slice32(3) % LOOKASIDE_SIZE;
EvacuationBlock *b = d->lookaside[i].head;
while (b) {
if (b->evac_frags.key == *key) {
@@ -818,7 +818,7 @@ void
dir_lookaside_remove(const CacheKey *key, Vol *d)
{
ink_assert(d->mutex->thread_holding == this_ethread());
- int i = key->slice32(3) % LOOKASIDE_SIZE;
+ int i = key->slice32(3) % LOOKASIDE_SIZE;
EvacuationBlock *b = d->lookaside[i].head;
while (b) {
if (b->evac_frags.key == *key) {
@@ -840,7 +840,7 @@ dir_lookaside_remove(const CacheKey *key, Vol *d)
void
dir_sync_init()
{
- cacheDirSync = new CacheSync;
+ cacheDirSync = new CacheSync;
cacheDirSync->trigger = eventProcessor.schedule_in(cacheDirSync, HRTIME_SECONDS(cache_config_dir_sync_frequency));
}
@@ -850,20 +850,20 @@ CacheSync::aio_write(int fd, char *b, int n, off_t o)
io.aiocb.aio_fildes = fd;
io.aiocb.aio_offset = o;
io.aiocb.aio_nbytes = n;
- io.aiocb.aio_buf = b;
- io.action = this;
- io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.aiocb.aio_buf = b;
+ io.action = this;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
ink_assert(ink_aio_write(&io) >= 0);
}
uint64_t
dir_entries_used(Vol *d)
{
- uint64_t full = 0;
+ uint64_t full = 0;
uint64_t sfull = 0;
for (int s = 0; s < d->segments; full += sfull, s++) {
Dir *seg = dir_segment(s, d);
- sfull = 0;
+ sfull = 0;
for (int b = 0; b < d->buckets; b++) {
Dir *e = dir_bucket(b, seg);
if (dir_bucket_loop_fix(e, s, d)) {
@@ -892,7 +892,7 @@ void
sync_cache_dir_on_shutdown(void)
{
Debug("cache_dir_sync", "sync started");
- char *buf = NULL;
+ char *buf = NULL;
size_t buflen = 0;
bool buf_huge = false;
@@ -948,11 +948,11 @@ sync_cache_dir_on_shutdown(void)
}
buflen = dirlen;
if (ats_hugepage_enabled()) {
- buf = (char *)ats_alloc_hugepage(buflen);
+ buf = (char *)ats_alloc_hugepage(buflen);
buf_huge = true;
}
if (buf == NULL) {
- buf = (char *)ats_memalign(ats_pagesize(), buflen);
+ buf = (char *)ats_memalign(ats_pagesize(), buflen);
buf_huge = false;
}
}
@@ -966,9 +966,9 @@ sync_cache_dir_on_shutdown(void)
CHECK_DIR(d);
memcpy(buf, d->raw_dir, dirlen);
- size_t B = d->header->sync_serial & 1;
+ size_t B = d->header->sync_serial & 1;
off_t start = d->skip + (B ? dirlen : 0);
- B = pwrite(d->fd, buf, dirlen, start);
+ B = pwrite(d->fd, buf, dirlen, start);
ink_assert(B == dirlen);
Debug("cache_dir_sync", "done syncing dir for vol %s", d->hash_text.get());
}
@@ -998,8 +998,8 @@ Lrestart:
ats_free_hugepage(buf, buflen);
else
ats_memalign_free(buf);
- buflen = 0;
- buf = NULL;
+ buflen = 0;
+ buf = NULL;
buf_huge = false;
}
Debug("cache_dir_sync", "sync done");
@@ -1074,11 +1074,11 @@ Lrestart:
}
buflen = dirlen;
if (ats_hugepage_enabled()) {
- buf = (char *)ats_alloc_hugepage(buflen);
+ buf = (char *)ats_alloc_hugepage(buflen);
buf_huge = true;
}
if (buf == NULL) {
- buf = (char *)ats_memalign(ats_pagesize(), buflen);
+ buf = (char *)ats_memalign(ats_pagesize(), buflen);
buf_huge = false;
}
}
@@ -1088,7 +1088,7 @@ Lrestart:
memcpy(buf, vol->raw_dir, dirlen);
vol->dir_sync_in_progress = 1;
}
- size_t B = vol->header->sync_serial & 1;
+ size_t B = vol->header->sync_serial & 1;
off_t start = vol->skip + (B ? dirlen : 0);
if (!writepos) {
@@ -1139,7 +1139,7 @@ compare_ushort(void const *a, void const *b)
int Vol::dir_check(bool /* fix ATS_UNUSED */) // TODO: we should eliminate this parameter ?
{
static int const SEGMENT_HISTOGRAM_WIDTH = 16;
- int hist[SEGMENT_HISTOGRAM_WIDTH + 1] = {0};
+ int hist[SEGMENT_HISTOGRAM_WIDTH + 1] = {0};
unsigned short chain_tag[MAX_ENTRIES_PER_SEGMENT];
int32_t chain_mark[MAX_ENTRIES_PER_SEGMENT];
uint64_t total_buckets = buckets * segments;
@@ -1162,13 +1162,13 @@ int Vol::dir_check(bool /* fix ATS_UNUSED */) // TODO: we should eliminate this
printf(" Entries: %" PRIu64 "\n", total_entries);
for (int s = 0; s < segments; s++) {
- Dir *seg = dir_segment(s, this);
- int seg_chain_max = 0;
- int seg_empty = 0;
- int seg_in_use = 0;
- int seg_stale = 0;
- int seg_bytes_in_use = 0;
- int seg_dups = 0;
+ Dir *seg = dir_segment(s, this);
+ int seg_chain_max = 0;
+ int seg_empty = 0;
+ int seg_in_use = 0;
+ int seg_stale = 0;
+ int seg_bytes_in_use = 0;
+ int seg_dups = 0;
int seg_buckets_in_use = 0;
ink_zero(chain_tag);
@@ -1176,11 +1176,11 @@ int Vol::dir_check(bool /* fix ATS_UNUSED */) // TODO: we should eliminate this
for (int b = 0; b < buckets; b++) {
Dir *root = dir_bucket(b, seg);
- int h = 0; // chain length starting in this bucket
+ int h = 0; // chain length starting in this bucket
// Walk the chain starting in this bucket
int chain_idx = 0;
- int mark = 0;
+ int mark = 0;
++seg_buckets_in_use;
for (Dir *e = root; e; e = next_dir(e, seg)) {
if (!dir_offset(e)) {
@@ -1272,7 +1272,7 @@ int Vol::dir_check(bool /* fix ATS_UNUSED */) // TODO: we should eliminate this
printf(" Fragment size demographics\n");
for (int b = 0; b < DIR_BLOCK_SIZES; ++b) {
int block_size = DIR_BLOCK_SIZE(b);
- int s = 0;
+ int s = 0;
while (s < 1 << DIR_SIZE_WIDTH) {
for (int j = 0; j < 8; ++j, ++s) {
// The size markings are redundant. Low values (less than DIR_SHIFT_WIDTH) for larger
@@ -1338,15 +1338,15 @@ regress_rand_CacheKey(const CacheKey *key)
{
unsigned int *x = (unsigned int *)key;
for (int i = 0; i < 4; i++)
- x[i] = next_rand(®ress_rand_seed);
+ x[i] = next_rand(®ress_rand_seed);
}
void
dir_corrupt_bucket(Dir *b, int s, Vol *d)
{
// coverity[dont_call]
- int l = ((int)(dir_bucket_length(b, s, d) * drand48()));
- Dir *e = b;
+ int l = ((int)(dir_bucket_length(b, s, d) * drand48()));
+ Dir *e = b;
Dir *seg = dir_segment(s, d);
for (int i = 0; i < l; i++) {
ink_release_assert(e);
@@ -1365,7 +1365,7 @@ EXCLUSIVE_REGRESSION_TEST(Cache_dir)(RegressionTest *t, int /* atype ATS_UNUSED
*status = REGRESSION_TEST_FAILED;
return;
}
- Vol *d = gvol[0];
+ Vol *d = gvol[0];
EThread *thread = this_ethread();
MUTEX_TRY_LOCK(lock, d->mutex, thread);
ink_release_assert(lock.is_locked());
@@ -1384,14 +1384,14 @@ EXCLUSIVE_REGRESSION_TEST(Cache_dir)(RegressionTest *t, int /* atype ATS_UNUSED
CacheKey key;
rand_CacheKey(&key, thread->mutex);
- int s = key.slice32(0) % d->segments, i, j;
+ int s = key.slice32(0) % d->segments, i, j;
Dir *seg = dir_segment(s, d);
// test insert
rprintf(t, "insert test\n", free);
int inserted = 0;
- int free = dir_freelist_length(d, s);
- int n = free;
+ int free = dir_freelist_length(d, s);
+ int n = free;
rprintf(t, "free: %d\n", free);
while (n--) {
if (!dir_insert(&key, d, &dir))
@@ -1475,7 +1475,7 @@ EXCLUSIVE_REGRESSION_TEST(Cache_dir)(RegressionTest *t, int /* atype ATS_UNUSED
b1 = key.slice32(1) % d->buckets;
CacheKey key1;
key1.b[1] = 127;
- dir1 = dir;
+ dir1 = dir;
dir_set_offset(&dir1, 23);
dir_insert(&key1, d, &dir1);
dir_insert(&key, d, &dir);
@@ -1485,15 +1485,15 @@ EXCLUSIVE_REGRESSION_TEST(Cache_dir)(RegressionTest *t, int /* atype ATS_UNUSED
dir_overwrite(&key, d, &dir, &dir, 1);
rand_CacheKey(&key, thread->mutex);
- s1 = key.slice32(0) % d->segments;
- b1 = key.slice32(1) % d->buckets;
+ s1 = key.slice32(0) % d->segments;
+ b1 = key.slice32(1) % d->buckets;
key.b[1] = 23;
dir_insert(&key, d, &dir1);
dir_corrupt_bucket(dir_bucket(b1, dir_segment(s1, d)), s1, d);
dir_overwrite(&key, d, &dir, &dir, 0);
rand_CacheKey(&key, thread->mutex);
- s1 = key.slice32(0) % d->segments;
+ s1 = key.slice32(0) % d->segments;
Dir *seg1 = dir_segment(s1, d);
// dir_freelist_length in freelist with loop
dir_corrupt_bucket(dir_from_offset(d->header->freelist[s], seg1), s1, d);
diff --git a/iocore/cache/CacheDisk.cc b/iocore/cache/CacheDisk.cc
index 7d76b50..5987ae5 100644
--- a/iocore/cache/CacheDisk.cc
+++ b/iocore/cache/CacheDisk.cc
@@ -26,16 +26,16 @@
int
CacheDisk::open(char *s, off_t blocks, off_t askip, int ahw_sector_size, int fildes, bool clear)
{
- path = ats_strdup(s);
+ path = ats_strdup(s);
hw_sector_size = ahw_sector_size;
- fd = fildes;
- skip = askip;
- start = skip;
+ fd = fildes;
+ skip = askip;
+ start = skip;
/* we can't use fractions of store blocks. */
- len = blocks;
- io.aiocb.aio_fildes = fd;
+ len = blocks;
+ io.aiocb.aio_fildes = fd;
io.aiocb.aio_reqprio = 0;
- io.action = this;
+ io.action = this;
// determine header size and hence start point by successive approximation
uint64_t l;
for (int i = 0; i < 3; i++) {
@@ -48,9 +48,9 @@ CacheDisk::open(char *s, off_t blocks, off_t askip, int ahw_sector_size, int fil
start = skip + header_len;
}
- disk_vols = (DiskVol **)ats_calloc((l / MIN_VOL_SIZE + 1), sizeof(DiskVol *));
- header_len = ROUND_TO_STORE_BLOCK(header_len);
- start = skip + header_len;
+ disk_vols = (DiskVol **)ats_calloc((l / MIN_VOL_SIZE + 1), sizeof(DiskVol *));
+ header_len = ROUND_TO_STORE_BLOCK(header_len);
+ start = skip + header_len;
num_usable_blocks = (off_t(len * STORE_BLOCK_SIZE) - (start - askip)) >> STORE_BLOCK_SHIFT;
header = (DiskHeader *)ats_memalign(ats_pagesize(), header_len);
@@ -69,9 +69,9 @@ CacheDisk::open(char *s, off_t blocks, off_t askip, int ahw_sector_size, int fil
SET_HANDLER(&CacheDisk::openStart);
io.aiocb.aio_offset = skip;
- io.aiocb.aio_buf = (char *)header;
+ io.aiocb.aio_buf = (char *)header;
io.aiocb.aio_nbytes = header_len;
- io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
ink_aio_read(&io);
return 0;
}
@@ -104,9 +104,9 @@ CacheDisk::clearDisk()
delete_all_volumes();
io.aiocb.aio_offset = skip;
- io.aiocb.aio_buf = header;
+ io.aiocb.aio_buf = header;
io.aiocb.aio_nbytes = header_len;
- io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
ink_aio_write(&io);
return 0;
}
@@ -188,9 +188,9 @@ int
CacheDisk::sync()
{
io.aiocb.aio_offset = skip;
- io.aiocb.aio_buf = header;
+ io.aiocb.aio_buf = header;
io.aiocb.aio_nbytes = header_len;
- io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
ink_aio_write(&io);
return 0;
}
@@ -216,21 +216,21 @@ CacheDisk::create_volume(int number, off_t size_in_blocks, int scheme)
if (size_in_blocks == 0)
return NULL;
- DiskVolBlockQueue *q = free_blocks->dpb_queue.head;
+ DiskVolBlockQueue *q = free_blocks->dpb_queue.head;
DiskVolBlockQueue *closest_match = q;
if (!q)
return NULL;
off_t max_blocks = MAX_VOL_SIZE >> STORE_BLOCK_SHIFT;
- size_in_blocks = (size_in_blocks <= max_blocks) ? size_in_blocks : max_blocks;
+ size_in_blocks = (size_in_blocks <= max_blocks) ? size_in_blocks : max_blocks;
int blocks_per_vol = VOL_BLOCK_SIZE / STORE_BLOCK_SIZE;
// ink_assert(!(size_in_blocks % blocks_per_vol));
DiskVolBlock *p = 0;
for (; q; q = q->link.next) {
if ((off_t)q->b->len >= size_in_blocks) {
- p = q->b;
+ p = q->b;
q->new_block = 1;
break;
} else {
@@ -244,8 +244,8 @@ CacheDisk::create_volume(int number, off_t size_in_blocks, int scheme)
if (!p && closest_match) {
/* allocate from the closest match */
- q = closest_match;
- p = q->b;
+ q = closest_match;
+ p = q->b;
q->new_block = 1;
ink_assert(size_in_blocks > (off_t)p->len);
/* allocate in 128 megabyte chunks. The Remaining space should
@@ -262,12 +262,12 @@ CacheDisk::create_volume(int number, off_t size_in_blocks, int scheme)
if (new_size >= (size_t)blocks_per_vol) {
/* create a new volume */
DiskVolBlock *dpb = &header->vol_info[header->num_diskvol_blks];
- *dpb = *p;
+ *dpb = *p;
dpb->len -= size_in_blocks;
dpb->offset += ((off_t)size_in_blocks * STORE_BLOCK_SIZE);
DiskVolBlockQueue *new_q = new DiskVolBlockQueue();
- new_q->b = dpb;
+ new_q->b = dpb;
free_blocks->dpb_queue.enqueue(new_q);
free_blocks->size += dpb->len;
free_space += dpb->len;
@@ -275,10 +275,10 @@ CacheDisk::create_volume(int number, off_t size_in_blocks, int scheme)
} else
header->num_free--;
- p->len = size_in_blocks;
- p->free = 0;
+ p->len = size_in_blocks;
+ p->free = 0;
p->number = number;
- p->type = scheme;
+ p->type = scheme;
header->num_used++;
unsigned int i;
@@ -292,10 +292,10 @@ CacheDisk::create_volume(int number, off_t size_in_blocks, int scheme)
}
}
if (i == header->num_volumes) {
- disk_vols[i] = new DiskVol();
+ disk_vols[i] = new DiskVol();
disk_vols[i]->num_volblocks = 1;
- disk_vols[i]->vol_number = number;
- disk_vols[i]->disk = this;
+ disk_vols[i]->vol_number = number;
+ disk_vols[i]->disk = this;
disk_vols[i]->dpb_queue.enqueue(q);
disk_vols[i]->size = q->b->len;
header->num_volumes++;
@@ -312,8 +312,8 @@ CacheDisk::delete_volume(int number)
DiskVolBlockQueue *q;
for (q = disk_vols[i]->dpb_queue.head; q;) {
DiskVolBlock *p = q->b;
- p->type = CACHE_NONE_TYPE;
- p->free = 1;
+ p->type = CACHE_NONE_TYPE;
+ p->free = 1;
free_space += p->len;
header->num_free++;
header->num_used--;
@@ -350,17 +350,17 @@ CacheDisk::update_header()
}
delete free_blocks;
}
- free_blocks = new DiskVol();
- free_blocks->vol_number = -1;
- free_blocks->disk = this;
+ free_blocks = new DiskVol();
+ free_blocks->vol_number = -1;
+ free_blocks->disk = this;
free_blocks->num_volblocks = 0;
- free_blocks->size = 0;
- free_space = 0;
+ free_blocks->size = 0;
+ free_space = 0;
for (i = 0; i < header->num_diskvol_blks; i++) {
DiskVolBlockQueue *dpbq = new DiskVolBlockQueue();
- bool dpbq_referenced = false;
- dpbq->b = &header->vol_info[i];
+ bool dpbq_referenced = false;
+ dpbq->b = &header->vol_info[i];
if (header->vol_info[i].free) {
free_blocks->num_volblocks++;
free_blocks->size += dpbq->b->len;
@@ -381,11 +381,11 @@ CacheDisk::update_header()
if (j == n) {
// did not find a matching volume number. create a new
// one
- disk_vols[j] = new DiskVol();
- disk_vols[j]->vol_number = vol_number;
- disk_vols[j]->disk = this;
+ disk_vols[j] = new DiskVol();
+ disk_vols[j]->vol_number = vol_number;
+ disk_vols[j]->disk = this;
disk_vols[j]->num_volblocks = 1;
- disk_vols[j]->size = dpbq->b->len;
+ disk_vols[j]->size = dpbq->b->len;
disk_vols[j]->dpb_queue.enqueue(dpbq);
dpbq_referenced = true;
n++;
@@ -415,17 +415,17 @@ int
CacheDisk::delete_all_volumes()
{
header->vol_info[0].offset = start;
- header->vol_info[0].len = num_usable_blocks;
- header->vol_info[0].type = CACHE_NONE_TYPE;
- header->vol_info[0].free = 1;
-
- header->magic = DISK_HEADER_MAGIC;
- header->num_used = 0;
- header->num_volumes = 0;
- header->num_free = 1;
+ header->vol_info[0].len = num_usable_blocks;
+ header->vol_info[0].type = CACHE_NONE_TYPE;
+ header->vol_info[0].free = 1;
+
+ header->magic = DISK_HEADER_MAGIC;
+ header->num_used = 0;
+ header->num_volumes = 0;
+ header->num_free = 1;
header->num_diskvol_blks = 1;
- header->num_blocks = len;
- cleared = 1;
+ header->num_blocks = len;
+ cleared = 1;
update_header();
return 0;
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index ea56061..2a5801d 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -86,7 +86,7 @@ CacheHostMatcher::AllocateSpace(int num_entries)
data_array = new CacheHostRecord[num_entries];
array_len = num_entries;
- num_el = 0;
+ num_el = 0;
}
// void CacheHostMatcher::Match(RequestData* rdata, Result* result)
@@ -186,8 +186,8 @@ CacheHostTable::CacheHostTable(Cache *c, CacheType typ)
config_tags = &CacheHosting_tags;
ink_assert(config_tags != NULL);
- type = typ;
- cache = c;
+ type = typ;
+ cache = c;
matcher_name = "[CacheHosting]";
;
hostMatch = NULL;
@@ -255,9 +255,9 @@ CacheHostTable::BuildTableFromString(const char *config_file_path, char *file_bu
matcher_line *first = NULL;
matcher_line *current;
matcher_line *last = NULL;
- int line_num = 0;
- int second_pass = 0;
- int numEntries = 0;
+ int line_num = 0;
+ int second_pass = 0;
+ int numEntries = 0;
const char *errPtr = NULL;
// type counts
@@ -283,7 +283,7 @@ CacheHostTable::BuildTableFromString(const char *config_file_path, char *file_bu
if (*tmp != '#' && *tmp != '\0') {
current = (matcher_line *)ats_malloc(sizeof(matcher_line));
- errPtr = parseConfigLine((char *)tmp, current, config_tags);
+ errPtr = parseConfigLine((char *)tmp, current, config_tags);
if (errPtr != NULL) {
RecSignalWarning(REC_SIGNAL_CONFIG_ERROR, "%s discarding %s entry at line %d : %s", matcher_name, config_file_path,
@@ -310,7 +310,7 @@ CacheHostTable::BuildTableFromString(const char *config_file_path, char *file_bu
first = last = current;
} else {
last->next = current;
- last = current;
+ last = current;
}
}
}
@@ -338,7 +338,7 @@ CacheHostTable::BuildTableFromString(const char *config_file_path, char *file_bu
}
// Traverse the list and build the records table
int generic_rec_initd = 0;
- current = first;
+ current = first;
while (current != NULL) {
second_pass++;
if ((current->type == MATCH_DOMAIN) || (current->type == MATCH_HOST)) {
@@ -371,7 +371,7 @@ CacheHostTable::BuildTableFromString(const char *config_file_path, char *file_bu
}
// Deallocate the parsing structure
- last = current;
+ last = current;
current = current->next;
ats_free(last);
}
@@ -418,10 +418,10 @@ CacheHostRecord::Init(CacheType typ)
extern int cp_list_len;
num_vols = 0;
- type = typ;
- cp = (CacheVol **)ats_malloc(cp_list_len * sizeof(CacheVol *));
+ type = typ;
+ cp = (CacheVol **)ats_malloc(cp_list_len * sizeof(CacheVol *));
memset(cp, 0, cp_list_len * sizeof(CacheVol *));
- num_cachevols = 0;
+ num_cachevols = 0;
CacheVol *cachep = cp_list.head;
for (; cachep; cachep = cachep->link.next) {
if (cachep->scheme == type) {
@@ -435,7 +435,7 @@ CacheHostRecord::Init(CacheType typ)
RecSignalWarning(REC_SIGNAL_CONFIG_ERROR, "error: No volumes found for Cache Type %d", type);
return -1;
}
- vols = (Vol **)ats_malloc(num_vols * sizeof(Vol *));
+ vols = (Vol **)ats_malloc(num_vols * sizeof(Vol *));
int counter = 0;
for (i = 0; i < num_cachevols; i++) {
CacheVol *cachep1 = cp[i];
@@ -467,9 +467,9 @@ CacheHostRecord::Init(matcher_line *line_info, CacheType typ)
if (!strcasecmp(label, "volume")) {
/* parse the list of volumes */
- val = ats_strdup(line_info->line[1][i]);
+ val = ats_strdup(line_info->line[1][i]);
char *vol_no = val;
- char *s = val;
+ char *s = val;
int volume_number;
CacheVol *cachep;
@@ -506,7 +506,7 @@ CacheHostRecord::Init(matcher_line *line_info, CacheType typ)
while (1) {
char c = *s;
if ((c == ',') || (c == '\0')) {
- *s = '\0';
+ *s = '\0';
volume_number = atoi(vol_no);
cachep = cp_list.head;
@@ -557,7 +557,7 @@ CacheHostRecord::Init(matcher_line *line_info, CacheType typ)
if (!num_vols) {
return -1;
}
- vols = (Vol **)ats_malloc(num_vols * sizeof(Vol *));
+ vols = (Vol **)ats_malloc(num_vols * sizeof(Vol *));
int counter = 0;
for (i = 0; i < num_cachevols; i++) {
CacheVol *cachep = cp[i];
@@ -618,21 +618,21 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
const char *tmp;
char *end;
char *line_end = NULL;
- int line_num = 0;
- int total = 0; // added by YTS Team, yamsat for bug id 59632
+ int line_num = 0;
+ int total = 0; // added by YTS Team, yamsat for bug id 59632
char volume_seen[256];
- int state = 0; // changed by YTS Team, yamsat for bug id 59632
- int volume_number = 0;
- CacheType scheme = CACHE_NONE_TYPE;
- int size = 0;
- int in_percent = 0;
+ int state = 0; // changed by YTS Team, yamsat for bug id 59632
+ int volume_number = 0;
+ CacheType scheme = CACHE_NONE_TYPE;
+ int size = 0;
+ int in_percent = 0;
const char *matcher_name = "[CacheVolition]";
memset(volume_seen, 0, sizeof(volume_seen));
- num_volumes = 0;
+ num_volumes = 0;
num_stream_volumes = 0;
- num_http_volumes = 0;
+ num_http_volumes = 0;
if (bufTok.Initialize(file_buf, SHARE_TOKS | ALLOW_EMPTY_TOKS) == 0) {
// We have an empty file
@@ -655,15 +655,15 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
/* add the config */
ConfigVol *configp = new ConfigVol();
- configp->number = volume_number;
+ configp->number = volume_number;
if (in_percent) {
- configp->percent = size;
+ configp->percent = size;
configp->in_percent = 1;
} else {
configp->in_percent = 0;
}
configp->scheme = scheme;
- configp->size = size;
+ configp->size = size;
configp->cachep = NULL;
cp_queue.enqueue(configp);
num_volumes++;
@@ -694,7 +694,7 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
line_end = end;
else {
line_end = end + 1;
- *end = '\0';
+ *end = '\0';
}
char *eq_sign;
@@ -780,7 +780,7 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
tmp++;
} else
in_percent = 0;
- state = DONE;
+ state = DONE;
break;
}
@@ -848,7 +848,7 @@ EXCLUSIVE_REGRESSION_TEST(Cache_vol)(RegressionTest *t, int /* atype ATS_UNUSED
int
create_config(RegressionTest *t, int num)
{
- int i = 0;
+ int i = 0;
int vol_num = 1;
// clear all old configurations before adding new test cases
config_volumes.clear_all();
@@ -856,7 +856,7 @@ create_config(RegressionTest *t, int num)
case 0:
for (i = 0; i < gndisks; i++) {
CacheDisk *d = gdisks[i];
- int blocks = d->num_usable_blocks;
+ int blocks = d->num_usable_blocks;
if (blocks < STORE_BLOCKS_PER_VOL) {
rprintf(t, "Cannot run Cache_vol regression: not enough disk space\n");
return 0;
@@ -865,12 +865,12 @@ create_config(RegressionTest *t, int num)
for (; blocks >= STORE_BLOCKS_PER_VOL; blocks -= STORE_BLOCKS_PER_VOL) {
if (vol_num > 255)
break;
- ConfigVol *cp = new ConfigVol();
- cp->number = vol_num++;
- cp->scheme = CACHE_HTTP_TYPE;
- cp->size = 128;
+ ConfigVol *cp = new ConfigVol();
+ cp->number = vol_num++;
+ cp->scheme = CACHE_HTTP_TYPE;
+ cp->size = 128;
cp->in_percent = 0;
- cp->cachep = 0;
+ cp->cachep = 0;
config_volumes.cp_queue.enqueue(cp);
config_volumes.num_volumes++;
config_volumes.num_http_volumes++;
@@ -903,13 +903,13 @@ create_config(RegressionTest *t, int num)
vol_num = 1;
rprintf(t, "Cleared disk\n");
for (i = 0; i < 10; i++) {
- ConfigVol *cp = new ConfigVol();
- cp->number = vol_num++;
- cp->scheme = CACHE_HTTP_TYPE;
- cp->size = 10;
- cp->percent = 10;
+ ConfigVol *cp = new ConfigVol();
+ cp->number = vol_num++;
+ cp->scheme = CACHE_HTTP_TYPE;
+ cp->size = 10;
+ cp->percent = 10;
cp->in_percent = 1;
- cp->cachep = 0;
+ cp->cachep = 0;
config_volumes.cp_queue.enqueue(cp);
config_volumes.num_volumes++;
config_volumes.num_http_volumes++;
@@ -922,9 +922,9 @@ create_config(RegressionTest *t, int num)
{
/* calculate the total disk space */
- InkRand *gen = &this_ethread()->generator;
+ InkRand *gen = &this_ethread()->generator;
off_t total_space = 0;
- vol_num = 1;
+ vol_num = 1;
if (num == 2) {
rprintf(t, "Random Volumes after clearing the disks\n");
} else {
@@ -955,19 +955,19 @@ create_config(RegressionTest *t, int num)
off_t random_size = (gen->random() % modu) + 1;
/* convert to 128 megs multiple */
CacheType scheme = (random_size % 2) ? CACHE_HTTP_TYPE : CACHE_RTSP_TYPE;
- random_size = ROUND_TO_VOL_SIZE(random_size);
- off_t blocks = random_size / STORE_BLOCK_SIZE;
+ random_size = ROUND_TO_VOL_SIZE(random_size);
+ off_t blocks = random_size / STORE_BLOCK_SIZE;
ink_assert(blocks <= (int)total_space);
total_space -= blocks;
ConfigVol *cp = new ConfigVol();
- cp->number = vol_num++;
- cp->scheme = scheme;
- cp->size = random_size >> 20;
- cp->percent = 0;
+ cp->number = vol_num++;
+ cp->scheme = scheme;
+ cp->size = random_size >> 20;
+ cp->percent = 0;
cp->in_percent = 0;
- cp->cachep = 0;
+ cp->cachep = 0;
config_volumes.cp_queue.enqueue(cp);
config_volumes.num_volumes++;
if (cp->scheme == CACHE_HTTP_TYPE) {
@@ -998,7 +998,7 @@ execute_and_verify(RegressionTest *t)
/* check that the volumes and sizes
match the configuration */
- int matched = 0;
+ int matched = 0;
ConfigVol *cp = config_volumes.cp_queue.head;
CacheVol *cachep;
@@ -1075,7 +1075,7 @@ execute_and_verify(RegressionTest *t)
int
ClearConfigVol(ConfigVolumes *configp)
{
- int i = 0;
+ int i = 0;
ConfigVol *cp = NULL;
while ((cp = configp->cp_queue.dequeue())) {
delete cp;
@@ -1085,8 +1085,8 @@ ClearConfigVol(ConfigVolumes *configp)
Warning("failed");
return 0;
}
- configp->num_volumes = 0;
- configp->num_http_volumes = 0;
+ configp->num_volumes = 0;
+ configp->num_http_volumes = 0;
configp->num_stream_volumes = 0;
return 1;
}
@@ -1094,7 +1094,7 @@ ClearConfigVol(ConfigVolumes *configp)
int
ClearCacheVolList(Queue<CacheVol> *cpl, int len)
{
- int i = 0;
+ int i = 0;
CacheVol *cp = NULL;
while ((cp = cpl->dequeue())) {
ats_free(cp->disk_vols);
@@ -1113,7 +1113,7 @@ ClearCacheVolList(Queue<CacheVol> *cpl, int len)
void
save_state()
{
- saved_cp_list = cp_list;
+ saved_cp_list = cp_list;
saved_cp_list_len = cp_list_len;
memcpy(&saved_config_volumes, &config_volumes, sizeof(ConfigVolumes));
saved_gnvol = gnvol;
@@ -1125,7 +1125,7 @@ save_state()
void
restore_state()
{
- cp_list = saved_cp_list;
+ cp_list = saved_cp_list;
cp_list_len = saved_cp_list_len;
memcpy(&config_volumes, &saved_config_volumes, sizeof(ConfigVolumes));
gnvol = saved_gnvol;
diff --git a/iocore/cache/CacheHttp.cc b/iocore/cache/CacheHttp.cc
index 493fba9..4c2130d 100644
--- a/iocore/cache/CacheHttp.cc
+++ b/iocore/cache/CacheHttp.cc
@@ -128,7 +128,7 @@ CacheHTTPInfoVector::print(char *buffer, size_t buf_size, bool temps)
int purl;
int i, tmp;
- p = buffer;
+ p = buffer;
purl = 1;
for (i = 0; i < xcount; i++) {
@@ -180,7 +180,7 @@ int
CacheHTTPInfoVector::marshal(char *buf, int length)
{
char *start = buf;
- int count = 0;
+ int count = 0;
ink_assert(!(((intptr_t)buf) & 3)); // buf must be aligned
diff --git a/iocore/cache/CacheLink.cc b/iocore/cache/CacheLink.cc
index 5189563..2aef39e 100644
--- a/iocore/cache/CacheLink.cc
+++ b/iocore/cache/CacheLink.cc
@@ -33,12 +33,12 @@ Cache::link(Continuation *cont, const CacheKey *from, const CacheKey *to, CacheF
ink_assert(caches[type] == this);
- CacheVC *c = new_CacheVC(cont);
- c->vol = key_to_vol(from, hostname, host_len);
- c->write_len = sizeof(*to); // so that the earliest_key will be used
+ CacheVC *c = new_CacheVC(cont);
+ c->vol = key_to_vol(from, hostname, host_len);
+ c->write_len = sizeof(*to); // so that the earliest_key will be used
c->f.use_first_key = 1;
- c->first_key = *from;
- c->earliest_key = *to;
+ c->first_key = *from;
+ c->earliest_key = *to;
c->buf = new_IOBufferData(BUFFER_SIZE_INDEX_512);
#ifdef DEBUG
@@ -83,7 +83,7 @@ Cache::deref(Continuation *cont, const CacheKey *key, CacheFragType type, const
Vol *vol = key_to_vol(key, hostname, host_len);
Dir result;
Dir *last_collision = NULL;
- CacheVC *c = NULL;
+ CacheVC *c = NULL;
{
MUTEX_TRY_LOCK(lock, vol->mutex, cont->mutex->thread_holding);
if (lock.is_locked()) {
@@ -95,9 +95,9 @@ Cache::deref(Continuation *cont, const CacheKey *key, CacheFragType type, const
c = new_CacheVC(cont);
SET_CONTINUATION_HANDLER(c, &CacheVC::derefRead);
c->first_key = c->key = *key;
- c->vol = vol;
- c->dir = result;
- c->last_collision = last_collision;
+ c->vol = vol;
+ c->dir = result;
+ c->last_collision = last_collision;
if (!lock.is_locked()) {
c->mutex->thread_holding->schedule_in_local(c, HRTIME_MSECONDS(cache_config_mutex_retry_delay));
diff --git a/iocore/cache/CachePages.cc b/iocore/cache/CachePages.cc
index 9d042b1..6f8356b 100644
--- a/iocore/cache/CachePages.cc
+++ b/iocore/cache/CachePages.cc
@@ -77,12 +77,12 @@ struct ShowCache : public ShowCont {
cvio(0)
{
urlstrs_index = 0;
- linecount = 0;
+ linecount = 0;
int query_len;
char query[4096];
char unescapedQuery[sizeof(query)];
show_cache_urlstrs = NULL;
- URL *u = h->url_get();
+ URL *u = h->url_get();
// process the query string
if (u->query_get(&query_len) && query_len < (int)sizeof(query)) {
@@ -106,7 +106,7 @@ struct ShowCache : public ShowCont {
query[m] = '\0';
unsigned nstrings = 1;
- char *p = strstr(query, "url=");
+ char *p = strstr(query, "url=");
// count the no of urls
if (p) {
while ((p = strstr(p, "\n"))) {
@@ -130,7 +130,7 @@ struct ShowCache : public ShowCont {
t = (char *)unescapedQuery + strlen(unescapedQuery);
for (int s = 0; p < t; s++) {
show_cache_urlstrs[s][0] = '\0';
- q = strstr(p, "%0D%0A" /* \r\n */); // we used this in the JS to separate urls
+ q = strstr(p, "%0D%0A" /* \r\n */); // we used this in the JS to separate urls
if (!q)
q = t;
ink_strlcpy(show_cache_urlstrs[s], p, q - p + 1);
@@ -168,7 +168,7 @@ Action *
register_ShowCache(Continuation *c, HTTPHdr *h)
{
ShowCache *theshowcache = new ShowCache(c, h);
- URL *u = h->url_get();
+ URL *u = h->url_get();
int path_len;
const char *path = u->path_get(&path_len);
@@ -330,9 +330,9 @@ ShowCache::handleCacheEvent(int event, Event *e)
}
case CACHE_EVENT_OPEN_READ: {
// get the vector
- cache_vc = (CacheVC *)e;
+ cache_vc = (CacheVC *)e;
CacheHTTPInfoVector *vec = &(cache_vc->vector);
- int alt_count = vec->count();
+ int alt_count = vec->count();
if (alt_count) {
Doc *d = (Doc *)(cache_vc->first_buf->data());
time_t t;
@@ -363,11 +363,11 @@ ShowCache::handleCacheEvent(int event, Event *e)
// unmarshal the alternate??
CHECK_SHOW(show("<p><table border=1>\n"));
CHECK_SHOW(show("<tr><th bgcolor=\"#FFF0E0\" colspan=2>Alternate %d</th></tr>\n", i + 1));
- CacheHTTPInfo *obj = vec->get(i);
- CacheKey obj_key = obj->object_key_get();
- HTTPHdr *cached_request = obj->request_get();
+ CacheHTTPInfo *obj = vec->get(i);
+ CacheKey obj_key = obj->object_key_get();
+ HTTPHdr *cached_request = obj->request_get();
HTTPHdr *cached_response = obj->response_get();
- int64_t obj_size = obj->object_size_get();
+ int64_t obj_size = obj->object_size_get();
int offset, tmp, used, done;
char b[4096];
@@ -376,7 +376,7 @@ ShowCache::handleCacheEvent(int event, Event *e)
offset = 0;
do {
used = 0;
- tmp = offset;
+ tmp = offset;
done = cached_request->print(b, 4095, &used, &tmp);
offset += used;
b[used] = '\0';
@@ -389,7 +389,7 @@ ShowCache::handleCacheEvent(int event, Event *e)
offset = 0;
do {
used = 0;
- tmp = offset;
+ tmp = offset;
done = cached_response->print(b, 4095, &used, &tmp);
offset += used;
b[used] = '\0';
@@ -415,10 +415,10 @@ ShowCache::handleCacheEvent(int event, Event *e)
}
case VC_EVENT_READ_READY:
if (!cvio) {
- buffer = new_empty_MIOBuffer();
- buffer_reader = buffer->alloc_reader();
+ buffer = new_empty_MIOBuffer();
+ buffer_reader = buffer->alloc_reader();
content_length = cache_vc->get_object_size();
- cvio = cache_vc->do_io_read(this, content_length, buffer);
+ cvio = cache_vc->do_io_read(this, content_length, buffer);
} else
buffer_reader->consume(buffer_reader->read_avail());
return EVENT_DONE;
diff --git a/iocore/cache/CachePagesInternal.cc b/iocore/cache/CachePagesInternal.cc
index fc840da..7a41d94 100644
--- a/iocore/cache/CachePagesInternal.cc
+++ b/iocore/cache/CachePagesInternal.cc
@@ -67,7 +67,7 @@ Action *
register_ShowCacheInternal(Continuation *c, HTTPHdr *h)
{
theshowcacheInternal = new ShowCacheInternal(c, h);
- URL *u = h->url_get();
+ URL *u = h->url_get();
int path_len;
const char *path = u->path_get(&path_len);
@@ -261,9 +261,9 @@ ShowCacheInternal::showVolVolumes(int event, Event *e)
char ctime[256];
ink_ctime_r(&p->header->create_time, ctime);
ctime[strlen(ctime) - 1] = 0;
- int agg_todo = 0;
- int agg_done = p->agg_buf_pos;
- CacheVC *c = 0;
+ int agg_todo = 0;
+ int agg_done = p->agg_buf_pos;
+ CacheVC *c = 0;
for (c = p->agg.head; c; c = (CacheVC *)c->link.next)
agg_todo++;
CHECK_SHOW(show("<tr>"
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 3e98ba9..0d422a7 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -42,20 +42,20 @@ Cache::open_read(Continuation *cont, const CacheKey *key, CacheFragType type, co
Vol *vol = key_to_vol(key, hostname, host_len);
Dir result, *last_collision = NULL;
ProxyMutex *mutex = cont->mutex;
- OpenDirEntry *od = NULL;
- CacheVC *c = NULL;
+ OpenDirEntry *od = NULL;
+ CacheVC *c = NULL;
{
CACHE_TRY_LOCK(lock, vol->mutex, mutex->thread_holding);
if (!lock.is_locked() || (od = vol->open_read(key)) || dir_probe(key, vol, &result, &last_collision)) {
c = new_CacheVC(cont);
SET_CONTINUATION_HANDLER(c, &CacheVC::openReadStartHead);
- c->vio.op = VIO::READ;
+ c->vio.op = VIO::READ;
c->base_stat = cache_read_active_stat;
CACHE_INCREMENT_DYN_STAT(c->base_stat + CACHE_STAT_ACTIVE);
c->first_key = c->key = c->earliest_key = *key;
- c->vol = vol;
- c->frag_type = type;
- c->od = od;
+ c->vol = vol;
+ c->frag_type = type;
+ c->od = od;
}
if (!c)
goto Lmiss;
@@ -65,7 +65,7 @@ Cache::open_read(Continuation *cont, const CacheKey *key, CacheFragType type, co
}
if (c->od)
goto Lwriter;
- c->dir = result;
+ c->dir = result;
c->last_collision = last_collision;
switch (c->do_read_call(&c->key)) {
case EVENT_DONE:
@@ -105,22 +105,22 @@ Cache::open_read(Continuation *cont, const CacheKey *key, CacheHTTPHdr *request,
Vol *vol = key_to_vol(key, hostname, host_len);
Dir result, *last_collision = NULL;
ProxyMutex *mutex = cont->mutex;
- OpenDirEntry *od = NULL;
- CacheVC *c = NULL;
+ OpenDirEntry *od = NULL;
+ CacheVC *c = NULL;
{
CACHE_TRY_LOCK(lock, vol->mutex, mutex->thread_holding);
if (!lock.is_locked() || (od = vol->open_read(key)) || dir_probe(key, vol, &result, &last_collision)) {
- c = new_CacheVC(cont);
+ c = new_CacheVC(cont);
c->first_key = c->key = c->earliest_key = *key;
- c->vol = vol;
- c->vio.op = VIO::READ;
- c->base_stat = cache_read_active_stat;
+ c->vol = vol;
+ c->vio.op = VIO::READ;
+ c->base_stat = cache_read_active_stat;
CACHE_INCREMENT_DYN_STAT(c->base_stat + CACHE_STAT_ACTIVE);
c->request.copy_shallow(request);
c->frag_type = CACHE_FRAG_TYPE_HTTP;
- c->params = params;
- c->od = od;
+ c->params = params;
+ c->od = od;
}
if (!lock.is_locked()) {
SET_CONTINUATION_HANDLER(c, &CacheVC::openReadStartHead);
@@ -133,7 +133,7 @@ Cache::open_read(Continuation *cont, const CacheKey *key, CacheHTTPHdr *request,
goto Lwriter;
// hit
c->dir = c->first_dir = result;
- c->last_collision = last_collision;
+ c->last_collision = last_collision;
SET_CONTINUATION_HANDLER(c, &CacheVC::openReadStartHead);
switch (c->do_read_call(&c->key)) {
case EVENT_DONE:
@@ -193,7 +193,7 @@ int
CacheVC::openReadChooseWriter(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
intptr_t err = ECACHE_DOC_BUSY;
- CacheVC *w = NULL;
+ CacheVC *w = NULL;
ink_assert(vol->mutex->thread_holding == mutex->thread_holding && write_vc == NULL);
@@ -213,7 +213,7 @@ CacheVC::openReadChooseWriter(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSE
}
#ifdef HTTP_CACHE
else {
- write_vector = &od->vector;
+ write_vector = &od->vector;
int write_vec_cnt = write_vector->count();
for (int c = 0; c < write_vec_cnt; c++)
vector.insert(write_vector->get(c));
@@ -266,7 +266,7 @@ CacheVC::openReadChooseWriter(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSE
if (alternate_index < 0)
return -ECACHE_ALT_MISS;
} else
- alternate_index = 0;
+ alternate_index = 0;
CacheHTTPInfo *obj = vector.get(alternate_index);
for (w = (CacheVC *)od->writers.head; w; w = (CacheVC *)w->opendir_link.next) {
if (obj->m_alt == w->alternate.m_alt) {
@@ -300,7 +300,7 @@ CacheVC::openReadFromWriter(int event, Event *e)
// before the open_write, but the reader could not get the volume
// lock. If we don't reset the clock here, we won't choose any writer
// and hence fail the read request.
- start_time = Thread::get_hrtime();
+ start_time = Thread::get_hrtime();
f.read_from_writer_called = 1;
}
cancel_trigger();
@@ -347,7 +347,7 @@ CacheVC::openReadFromWriter(int event, Event *e)
if (writer_done()) {
MUTEX_RELEASE(lock);
DDebug("cache_read_agg", "%p: key: %X writer %p has left, continuing as normal read", this, first_key.slice32(1), write_vc);
- od = NULL;
+ od = NULL;
write_vc = NULL;
SET_HANDLER(&CacheVC::openReadStartHead);
return openReadStartHead(event, e);
@@ -356,7 +356,7 @@ CacheVC::openReadFromWriter(int event, Event *e)
#ifdef HTTP_CACHE
OpenDirEntry *cod = od;
#endif
- od = NULL;
+ od = NULL;
// someone is currently writing the document
if (write_vc->closed < 0) {
MUTEX_RELEASE(lock);
@@ -414,14 +414,14 @@ CacheVC::openReadFromWriter(int event, Event *e)
// the resident alternate is being updated and its a
// header only update. The first_buf of the writer has the
// document body.
- Doc *doc = (Doc *)write_vc->first_buf->data();
+ Doc *doc = (Doc *)write_vc->first_buf->data();
writer_buf = new_IOBufferBlock(write_vc->first_buf, doc->data_len(), doc->prefix_len());
MUTEX_RELEASE(writer_lock);
ink_assert(doc_len == doc->data_len());
- length = doc_len;
+ length = doc_len;
f.single_fragment = 1;
- doc_pos = 0;
- earliest_key = key;
+ doc_pos = 0;
+ earliest_key = key;
dir_clean(&first_dir);
dir_clean(&earliest_dir);
SET_HANDLER(&CacheVC::openReadFromWriterMain);
@@ -443,7 +443,7 @@ CacheVC::openReadFromWriter(int event, Event *e)
}
#endif
if (write_vc->fragment) {
- doc_len = write_vc->vio.nbytes;
+ doc_len = write_vc->vio.nbytes;
last_collision = NULL;
DDebug("cache_read_agg", "%p: key: %X closed: %d, fragment: %d, len: %d starting first fragment", this, first_key.slice32(1),
write_vc->closed, write_vc->fragment, (int)doc_len);
@@ -452,13 +452,13 @@ CacheVC::openReadFromWriter(int event, Event *e)
SET_HANDLER(&CacheVC::openReadStartEarliest);
return openReadStartEarliest(event, e);
}
- writer_buf = write_vc->blocks;
+ writer_buf = write_vc->blocks;
writer_offset = write_vc->offset;
- length = write_vc->length;
+ length = write_vc->length;
// copy the vector
f.single_fragment = !write_vc->fragment; // single fragment doc
- doc_pos = 0;
- earliest_key = write_vc->earliest_key;
+ doc_pos = 0;
+ earliest_key = write_vc->earliest_key;
ink_assert(earliest_key == key);
doc_len = write_vc->total_len;
dir_clean(&first_dir);
@@ -477,10 +477,10 @@ CacheVC::openReadFromWriterMain(int /* event ATS_UNUSED */, Event * /* e ATS_UNU
cancel_trigger();
if (seek_to) {
vio.ndone = seek_to;
- seek_to = 0;
+ seek_to = 0;
}
IOBufferBlock *b = NULL;
- int64_t ntodo = vio.ntodo();
+ int64_t ntodo = vio.ntodo();
if (ntodo <= 0)
return EVENT_CONT;
if (length < ((int64_t)doc_len) - vio.ndone) {
@@ -505,7 +505,7 @@ CacheVC::openReadFromWriterMain(int /* event ATS_UNUSED */, Event * /* e ATS_UNU
// reached the end of the document and the user still wants more
return calluser(VC_EVENT_EOS);
}
- b = iobufferblock_clone(writer_buf, writer_offset, bytes);
+ b = iobufferblock_clone(writer_buf, writer_offset, bytes);
writer_buf = iobufferblock_skip(writer_buf, &writer_offset, &length, bytes);
vio.buffer.writer()->append_block(b);
vio.ndone += bytes;
@@ -622,9 +622,9 @@ int
CacheVC::openReadMain(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
cancel_trigger();
- Doc *doc = (Doc *)buf->data();
- int64_t ntodo = vio.ntodo();
- int64_t bytes = doc->len - doc_pos;
+ Doc *doc = (Doc *)buf->data();
+ int64_t ntodo = vio.ntodo();
+ int64_t bytes = doc->len - doc_pos;
IOBufferBlock *b = NULL;
if (seek_to) { // handle do_io_pread
if (seek_to >= doc_len) {
@@ -643,9 +643,9 @@ CacheVC::openReadMain(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
The essential difference is the existence of a fragment table.
*/
if (frags) {
- int target = 0;
+ int target = 0;
HTTPInfo::FragOffset next_off = frags[target];
- int lfi = static_cast<int>(alternate.get_frag_offset_count()) - 1;
+ int lfi = static_cast<int>(alternate.get_frag_offset_count()) - 1;
ink_assert(lfi >= 0); // because it's not a single frag doc.
/* Note: frag[i].offset is the offset of the first byte past the
@@ -690,9 +690,9 @@ CacheVC::openReadMain(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
if (fragment)
doc_pos -= static_cast<int64_t>(frags[fragment - 1]);
vio.ndone = 0;
- seek_to = 0;
- ntodo = vio.ntodo();
- bytes = doc->len - doc_pos;
+ seek_to = 0;
+ ntodo = vio.ntodo();
+ bytes = doc->len - doc_pos;
if (is_debug_tag_set("cache_seek")) {
char target_key_str[33];
key.toHexStr(target_key_str);
@@ -707,8 +707,8 @@ CacheVC::openReadMain(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
if ((bytes <= 0) && vio.ntodo() >= 0)
goto Lread;
if (bytes > vio.ntodo())
- bytes = vio.ntodo();
- b = new_IOBufferBlock(buf, bytes, doc_pos);
+ bytes = vio.ntodo();
+ b = new_IOBufferBlock(buf, bytes, doc_pos);
b->_buf_end = b->_end;
vio.buffer.writer()->append_block(b);
vio.ndone += bytes;
@@ -728,7 +728,7 @@ Lread : {
if (vio.ndone >= (int64_t)doc_len)
// reached the end of the document and the user still wants more
return calluser(VC_EVENT_EOS);
- last_collision = 0;
+ last_collision = 0;
writer_lock_retry = 0;
// if the state machine calls reenable on the callback from the cache,
// we set up a schedule_imm event. The openReadReadDone discards
@@ -785,7 +785,7 @@ Lcallreturn:
int
CacheVC::openReadStartEarliest(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
- int ret = 0;
+ int ret = 0;
Doc *doc = NULL;
cancel_trigger();
set_io_not_in_progress();
@@ -830,7 +830,7 @@ CacheVC::openReadStartEarliest(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
goto Lread;
// success
earliest_key = key;
- doc_pos = doc->prefix_len();
+ doc_pos = doc->prefix_len();
next_CacheKey(&key, &doc->key);
vol->begin_read(this);
if (vol->within_hit_evacuate_window(&earliest_dir) &&
@@ -853,7 +853,7 @@ CacheVC::openReadStartEarliest(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
if (!f.read_from_writer_called && frag_type == CACHE_FRAG_TYPE_HTTP) {
// don't want any writers while we are evacuating the vector
if (!vol->open_write(this, false, 1)) {
- Doc *doc1 = (Doc *)first_buf->data();
+ Doc *doc1 = (Doc *)first_buf->data();
uint32_t len = this->load_http_info(write_vector, doc1);
ink_assert(len == doc1->hlen && write_vector->count() > 0);
write_vector->remove(alternate_index, true);
@@ -864,25 +864,25 @@ CacheVC::openReadStartEarliest(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
// (cannot assert on the return value)
dir_delete(&first_key, vol, &first_dir);
} else {
- buf = NULL;
- last_collision = NULL;
- write_len = 0;
- header_len = write_vector->marshal_length();
- f.evac_vector = 1;
+ buf = NULL;
+ last_collision = NULL;
+ write_len = 0;
+ header_len = write_vector->marshal_length();
+ f.evac_vector = 1;
f.use_first_key = 1;
- key = first_key;
+ key = first_key;
// always use od->first_dir to overwrite a directory.
// If an evacuation happens while a vector is being updated
// the evacuator changes the od->first_dir to the new directory
// that it inserted
- od->first_dir = first_dir;
+ od->first_dir = first_dir;
od->writing_vec = 1;
- earliest_key = zero_key;
+ earliest_key = zero_key;
// set up this VC as a alternate delete write_vc
- vio.op = VIO::WRITE;
- total_len = 0;
- f.update = 1;
+ vio.op = VIO::WRITE;
+ total_len = 0;
+ f.update = 1;
alternate_index = CACHE_ALT_REMOVED;
/////////////////////////////////////////////////////////////////
// change to create a directory entry for a resident alternate //
@@ -890,7 +890,7 @@ CacheVC::openReadStartEarliest(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
/////////////////////////////////////////////////////////////////
if (doc1->total_len > 0) {
od->move_resident_alt = 1;
- od->single_doc_key = doc1->key;
+ od->single_doc_key = doc1->key;
dir_assign(&od->single_doc_dir, &dir);
dir_set_tag(&od->single_doc_dir, od->single_doc_key.slice32(2));
}
@@ -939,12 +939,12 @@ CacheVC::openReadVecWrite(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */
ink_assert(f.evac_vector);
ink_assert(frag_type == CACHE_FRAG_TYPE_HTTP);
ink_assert(!buf.m_ptr);
- f.evac_vector = false;
- last_collision = NULL;
- f.update = 0;
+ f.evac_vector = false;
+ last_collision = NULL;
+ f.update = 0;
alternate_index = CACHE_ALT_INDEX_DEFAULT;
f.use_first_key = 0;
- vio.op = VIO::READ;
+ vio.op = VIO::READ;
dir_overwrite(&first_key, vol, &dir, &od->first_dir);
if (od->move_resident_alt)
dir_insert(&od->single_doc_key, vol, &od->single_doc_dir);
@@ -978,7 +978,7 @@ int
CacheVC::openReadStartHead(int event, Event *e)
{
intptr_t err = ECACHE_NO_DOC;
- Doc *doc = NULL;
+ Doc *doc = NULL;
cancel_trigger();
set_io_not_in_progress();
if (_action.cancelled)
@@ -1032,7 +1032,7 @@ CacheVC::openReadStartHead(int event, Event *e)
goto Ldone;
if ((uml = this->load_http_info(&vector, doc)) != doc->hlen) {
if (buf) {
- HTTPCacheAlt *alt = reinterpret_cast<HTTPCacheAlt *>(doc->hdr());
+ HTTPCacheAlt *alt = reinterpret_cast<HTTPCacheAlt *>(doc->hdr());
int32_t alt_length = 0;
// count should be reasonable, as vector is initialized and unlikly to be too corrupted
// by bad disk data - count should be the number of successfully unmarshalled alts.
@@ -1063,7 +1063,7 @@ CacheVC::openReadStartHead(int event, Event *e)
}
} else
alternate_index = 0;
- alternate_tmp = vector.get(alternate_index);
+ alternate_tmp = vector.get(alternate_index);
if (!alternate_tmp->valid()) {
if (buf) {
Note("OpenReadHead failed for cachekey %X : alternate inconsistency", key.slice32(0));
@@ -1089,8 +1089,8 @@ CacheVC::openReadStartHead(int event, Event *e)
{
next_CacheKey(&key, &doc->key);
f.single_fragment = doc->single_fragment();
- doc_pos = doc->prefix_len();
- doc_len = doc->total_len;
+ doc_pos = doc->prefix_len();
+ doc_len = doc->total_len;
}
if (is_debug_tag_set("cache_read")) { // amc debug
@@ -1140,7 +1140,7 @@ CacheVC::openReadStartHead(int event, Event *e)
}
if (dir_probe(&key, vol, &dir, &last_collision)) {
first_dir = dir;
- int ret = do_read_call(&key);
+ int ret = do_read_call(&key);
if (ret == EVENT_RETURN)
goto Lcallreturn;
return ret;
@@ -1165,9 +1165,9 @@ Lookup:
_action.continuation->handleEvent(CACHE_EVENT_LOOKUP, 0);
return free_CacheVC(this);
Learliest:
- first_buf = buf;
- buf = NULL;
- earliest_key = key;
+ first_buf = buf;
+ buf = NULL;
+ earliest_key = key;
last_collision = NULL;
SET_HANDLER(&CacheVC::openReadStartEarliest);
return openReadStartEarliest(event, e);
diff --git a/iocore/cache/CacheTest.cc b/iocore/cache/CacheTest.cc
index 65b37a6..f0a2e32 100644
--- a/iocore/cache/CacheTest.cc
+++ b/iocore/cache/CacheTest.cc
@@ -98,9 +98,9 @@ CacheTestSM::event_handler(int event, void *data)
case CACHE_EVENT_OPEN_READ:
initial_event = event;
cancel_timeout();
- cache_action = 0;
- cache_vc = (CacheVConnection *)data;
- buffer = new_empty_MIOBuffer();
+ cache_action = 0;
+ cache_vc = (CacheVConnection *)data;
+ buffer = new_empty_MIOBuffer();
buffer_reader = buffer->alloc_reader();
if (open_read_callout() < 0)
goto Lclose_error_next;
@@ -129,9 +129,9 @@ CacheTestSM::event_handler(int event, void *data)
case CACHE_EVENT_OPEN_WRITE:
initial_event = event;
cancel_timeout();
- cache_action = 0;
- cache_vc = (CacheVConnection *)data;
- buffer = new_empty_MIOBuffer();
+ cache_action = 0;
+ cache_vc = (CacheVConnection *)data;
+ buffer = new_empty_MIOBuffer();
buffer_reader = buffer->alloc_reader();
if (open_write_callout() < 0)
goto Lclose_error_next;
@@ -157,7 +157,7 @@ CacheTestSM::event_handler(int event, void *data)
case CACHE_EVENT_SCAN:
initial_event = event;
- cache_vc = (CacheVConnection *)data;
+ cache_vc = (CacheVConnection *)data;
return EVENT_CONT;
case CACHE_EVENT_SCAN_OBJECT:
@@ -216,7 +216,7 @@ void
CacheTestSM::fill_buffer()
{
int64_t avail = buffer->write_avail();
- CacheKey k = key;
+ CacheKey k = key;
k.b[1] += content_salt;
int64_t sk = (int64_t)sizeof(key);
while (avail > 0) {
@@ -225,11 +225,11 @@ CacheTestSM::fill_buffer()
l = sk;
int64_t pos = cvio->ndone + buffer_reader->read_avail();
- int64_t o = pos % sk;
+ int64_t o = pos % sk;
if (l > sk - o)
- l = sk - o;
- k.b[0] = pos / sk;
+ l = sk - o;
+ k.b[0] = pos / sk;
char *x = ((char *)&k) + o;
buffer->write(x, l);
buffer->fill(l);
@@ -241,19 +241,19 @@ int
CacheTestSM::check_buffer()
{
int64_t avail = buffer_reader->read_avail();
- CacheKey k = key;
+ CacheKey k = key;
k.b[1] += content_salt;
char b[sizeof(key)];
- int64_t sk = (int64_t)sizeof(key);
+ int64_t sk = (int64_t)sizeof(key);
int64_t pos = cvio->ndone - buffer_reader->read_avail();
while (avail > 0) {
int64_t l = avail;
if (l > sk)
- l = sk;
+ l = sk;
int64_t o = pos % sk;
if (l > sk - o)
- l = sk - o;
- k.b[0] = pos / sk;
+ l = sk - o;
+ k.b[0] = pos / sk;
char *x = ((char *)&k) + o;
buffer_reader->read(&b[0], l);
if (::memcmp(b, x, l))
@@ -302,31 +302,31 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
CACHE_SM(t, write_test, { cacheProcessor.open_write(this, &key, false, CACHE_FRAG_TYPE_NONE, 100, CACHE_WRITE_OPT_SYNC); });
write_test.expect_initial_event = CACHE_EVENT_OPEN_WRITE;
- write_test.expect_event = VC_EVENT_WRITE_COMPLETE;
- write_test.nbytes = 100;
+ write_test.expect_event = VC_EVENT_WRITE_COMPLETE;
+ write_test.nbytes = 100;
rand_CacheKey(&write_test.key, thread->mutex);
CACHE_SM(t, lookup_test, { cacheProcessor.lookup(this, &key, false); });
lookup_test.expect_event = CACHE_EVENT_LOOKUP;
- lookup_test.key = write_test.key;
+ lookup_test.key = write_test.key;
CACHE_SM(t, read_test, { cacheProcessor.open_read(this, &key, false); });
read_test.expect_initial_event = CACHE_EVENT_OPEN_READ;
- read_test.expect_event = VC_EVENT_READ_COMPLETE;
- read_test.nbytes = 100;
- read_test.key = write_test.key;
+ read_test.expect_event = VC_EVENT_READ_COMPLETE;
+ read_test.nbytes = 100;
+ read_test.key = write_test.key;
CACHE_SM(t, remove_test, { cacheProcessor.remove(this, &key, false); });
remove_test.expect_event = CACHE_EVENT_REMOVE;
- remove_test.key = write_test.key;
+ remove_test.key = write_test.key;
CACHE_SM(t, lookup_fail_test, { cacheProcessor.lookup(this, &key, false); });
lookup_fail_test.expect_event = CACHE_EVENT_LOOKUP_FAILED;
- lookup_fail_test.key = write_test.key;
+ lookup_fail_test.key = write_test.key;
CACHE_SM(t, read_fail_test, { cacheProcessor.open_read(this, &key, false); });
read_fail_test.expect_event = CACHE_EVENT_OPEN_READ_FAILED;
- read_fail_test.key = write_test.key;
+ read_fail_test.key = write_test.key;
CACHE_SM(t, remove_fail_test, { cacheProcessor.remove(this, &key, false); });
remove_fail_test.expect_event = CACHE_EVENT_REMOVE_FAILED;
@@ -341,8 +341,8 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
return 1;
});
replace_write_test.expect_initial_event = CACHE_EVENT_OPEN_WRITE;
- replace_write_test.expect_event = VC_EVENT_WRITE_COMPLETE;
- replace_write_test.nbytes = 100;
+ replace_write_test.expect_event = VC_EVENT_WRITE_COMPLETE;
+ replace_write_test.nbytes = 100;
rand_CacheKey(&replace_write_test.key, thread->mutex);
CACHE_SM(t, replace_test,
@@ -350,7 +350,7 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
cacheProcessor.open_write(this, &key, false, CACHE_FRAG_TYPE_NONE, 100, CACHE_WRITE_OPT_OVERWRITE_SYNC);
} int open_write_callout() {
CacheTestHeader *h = 0;
- int hlen = 0;
+ int hlen = 0;
if (cache_vc->get_header((void **)&h, &hlen) < 0)
return -1;
if (h->serial != 10)
@@ -361,14 +361,14 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
return 1;
});
replace_test.expect_initial_event = CACHE_EVENT_OPEN_WRITE;
- replace_test.expect_event = VC_EVENT_WRITE_COMPLETE;
- replace_test.nbytes = 100;
- replace_test.key = replace_write_test.key;
- replace_test.content_salt = 1;
+ replace_test.expect_event = VC_EVENT_WRITE_COMPLETE;
+ replace_test.nbytes = 100;
+ replace_test.key = replace_write_test.key;
+ replace_test.content_salt = 1;
CACHE_SM(t, replace_read_test, { cacheProcessor.open_read(this, &key, false); } int open_read_callout() {
CacheTestHeader *h = 0;
- int hlen = 0;
+ int hlen = 0;
if (cache_vc->get_header((void **)&h, &hlen) < 0)
return -1;
if (h->serial != 11)
@@ -377,15 +377,15 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
return 1;
});
replace_read_test.expect_initial_event = CACHE_EVENT_OPEN_READ;
- replace_read_test.expect_event = VC_EVENT_READ_COMPLETE;
- replace_read_test.nbytes = 100;
- replace_read_test.key = replace_test.key;
- replace_read_test.content_salt = 1;
+ replace_read_test.expect_event = VC_EVENT_READ_COMPLETE;
+ replace_read_test.nbytes = 100;
+ replace_read_test.key = replace_test.key;
+ replace_read_test.content_salt = 1;
CACHE_SM(t, large_write_test, { cacheProcessor.open_write(this, &key, false, CACHE_FRAG_TYPE_NONE, 100, CACHE_WRITE_OPT_SYNC); });
large_write_test.expect_initial_event = CACHE_EVENT_OPEN_WRITE;
- large_write_test.expect_event = VC_EVENT_WRITE_COMPLETE;
- large_write_test.nbytes = 10000000;
+ large_write_test.expect_event = VC_EVENT_WRITE_COMPLETE;
+ large_write_test.nbytes = 10000000;
rand_CacheKey(&large_write_test.key, thread->mutex);
CACHE_SM(t, pread_test, { cacheProcessor.open_read(this, &key, false); } int open_read_callout() {
@@ -393,9 +393,9 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
return 1;
});
pread_test.expect_initial_event = CACHE_EVENT_OPEN_READ;
- pread_test.expect_event = VC_EVENT_READ_COMPLETE;
- pread_test.nbytes = 100;
- pread_test.key = large_write_test.key;
+ pread_test.expect_event = VC_EVENT_READ_COMPLETE;
+ pread_test.nbytes = 100;
+ pread_test.key = large_write_test.key;
r_sequential(t, write_test.clone(), lookup_test.clone(), r_sequential(t, 10, read_test.clone()), remove_test.clone(),
lookup_fail_test.clone(), read_fail_test.clone(), remove_fail_test.clone(), replace_write_test.clone(),
@@ -413,8 +413,8 @@ force_link_CacheTest()
REGRESSION_TEST(cache_disk_replacement_stability)(RegressionTest *t, int level, int *pstatus)
{
- static int const MAX_VOLS = 26; // maximum values used in any test.
- static uint64_t DEFAULT_SKIP = 8192;
+ static int const MAX_VOLS = 26; // maximum values used in any test.
+ static uint64_t DEFAULT_SKIP = 8192;
static uint64_t DEFAULT_STRIPE_SIZE = 1024ULL * 1024 * 1024 * 911; // 911G
CacheDisk disk; // Only need one because it's just checked for failure.
CacheHostRecord hr1, hr2;
@@ -435,23 +435,23 @@ REGRESSION_TEST(cache_disk_replacement_stability)(RegressionTest *t, int level,
disk.num_errors = 0;
for (int i = 0; i < MAX_VOLS; ++i) {
- vol_ptrs[i] = vols + i;
+ vol_ptrs[i] = vols + i;
vols[i].disk = &disk;
- vols[i].len = DEFAULT_STRIPE_SIZE;
+ vols[i].len = DEFAULT_STRIPE_SIZE;
snprintf(buff, sizeof(buff), "/dev/sd%c %" PRIu64 ":%" PRIu64, 'a' + i, DEFAULT_SKIP, vols[i].len);
MD5Context().hash_immediate(vols[i].hash_id, buff, strlen(buff));
}
hr1.vol_hash_table = 0;
- hr1.vols = vol_ptrs;
- hr1.num_vols = MAX_VOLS;
+ hr1.vols = vol_ptrs;
+ hr1.num_vols = MAX_VOLS;
build_vol_hash_table(&hr1);
hr2.vol_hash_table = 0;
- hr2.vols = vol_ptrs;
- hr2.num_vols = MAX_VOLS;
+ hr2.vols = vol_ptrs;
+ hr2.num_vols = MAX_VOLS;
- sample = vols + sample_idx;
+ sample = vols + sample_idx;
sample->len = 1024ULL * 1024 * 1024 * (1024 + 128); // 1.1 TB
snprintf(buff, sizeof(buff), "/dev/sd%c %" PRIu64 ":%" PRIu64, 'a' + sample_idx, DEFAULT_SKIP, sample->len);
MD5Context().hash_immediate(sample->hash_id, buff, strlen(buff));
@@ -481,7 +481,7 @@ REGRESSION_TEST(cache_disk_replacement_stability)(RegressionTest *t, int level,
hr2.vols = 0;
}
-static double zipf_alpha = 1.2;
+static double zipf_alpha = 1.2;
static int64_t zipf_bucket_size = 1;
#define ZIPF_SIZE (1 << 20)
@@ -494,12 +494,12 @@ build_zipf()
if (zipf_table)
return;
zipf_table = (double *)ats_malloc(ZIPF_SIZE * sizeof(double));
- for (int i = 0; i < ZIPF_SIZE; i++)
+ for (int i = 0; i < ZIPF_SIZE; i++)
zipf_table[i] = 1.0 / pow(i + 2, zipf_alpha);
- for (int i = 1; i < ZIPF_SIZE; i++)
+ for (int i = 1; i < ZIPF_SIZE; i++)
zipf_table[i] = zipf_table[i - 1] + zipf_table[i];
- double x = zipf_table[ZIPF_SIZE - 1];
- for (int i = 0; i < ZIPF_SIZE; i++)
+ double x = zipf_table[ZIPF_SIZE - 1];
+ for (int i = 0; i < ZIPF_SIZE; i++)
zipf_table[i] = zipf_table[i] / x;
}
@@ -638,7 +638,7 @@ REGRESSION_TEST(ram_cache)(RegressionTest *t, int level, int *pstatus)
}
for (int s = 20; s <= 28; s += 4) {
int64_t cache_size = 1LL << s;
- *pstatus = REGRESSION_TEST_PASSED;
+ *pstatus = REGRESSION_TEST_PASSED;
if (!test_RamCache(t, new_RamCacheLRU(), "LRU", cache_size) || !test_RamCache(t, new_RamCacheCLFUS(), "CLFUS", cache_size))
*pstatus = REGRESSION_TEST_FAILED;
}
diff --git a/iocore/cache/CacheVol.cc b/iocore/cache/CacheVol.cc
index b308bfe..0b9b265 100644
--- a/iocore/cache/CacheVol.cc
+++ b/iocore/cache/CacheVol.cc
@@ -36,14 +36,14 @@ Cache::scan(Continuation *cont, const char *hostname, int host_len, int KB_per_s
}
CacheVC *c = new_CacheVC(cont);
- c->vol = NULL;
+ c->vol = NULL;
/* do we need to make a copy */
- c->hostname = const_cast<char *>(hostname);
- c->host_len = host_len;
- c->base_stat = cache_scan_active_stat;
- c->buf = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(SCAN_BUF_SIZE), MEMALIGNED);
+ c->hostname = const_cast<char *>(hostname);
+ c->host_len = host_len;
+ c->base_stat = cache_scan_active_stat;
+ c->buf = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(SCAN_BUF_SIZE), MEMALIGNED);
c->scan_msec_delay = (SCAN_BUF_SIZE / KB_per_second);
- c->offset = 0;
+ c->offset = 0;
SET_CONTINUATION_HANDLER(c, &CacheVC::scanVol);
eventProcessor.schedule_in(c, HRTIME_MSECONDS(c->scan_msec_delay));
cont->handleEvent(CACHE_EVENT_SCAN, c);
@@ -95,8 +95,8 @@ static off_t
next_in_map(Vol *d, char *vol_map, off_t offset)
{
off_t start_offset = vol_offset_to_offset(d, 0);
- off_t new_off = (offset - start_offset);
- off_t vol_len = vol_relative_length(d, start_offset);
+ off_t new_off = (offset - start_offset);
+ off_t vol_len = vol_relative_length(d, start_offset);
while (new_off < vol_len && !vol_map[new_off / SCAN_BUF_SIZE])
new_off += SCAN_BUF_SIZE;
@@ -119,9 +119,9 @@ make_vol_map(Vol *d)
{
// Map will be one byte for each SCAN_BUF_SIZE bytes.
off_t start_offset = vol_offset_to_offset(d, 0);
- off_t vol_len = vol_relative_length(d, start_offset);
- size_t map_len = (vol_len + (SCAN_BUF_SIZE - 1)) / SCAN_BUF_SIZE;
- char *vol_map = (char *)ats_malloc(map_len);
+ off_t vol_len = vol_relative_length(d, start_offset);
+ size_t map_len = (vol_len + (SCAN_BUF_SIZE - 1)) / SCAN_BUF_SIZE;
+ char *vol_map = (char *)ats_malloc(map_len);
memset(vol_map, 0, map_len);
@@ -154,14 +154,14 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
Debug("cache_scan_truss", "inside %p:scanObject", this);
- Doc *doc = NULL;
+ Doc *doc = NULL;
void *result = NULL;
#ifdef HTTP_CACHE
int hlen = 0;
char hname[500];
bool hostinfo_copied = false;
#endif
- off_t next_object_len = 0;
+ off_t next_object_len = 0;
bool might_need_overlap_read = false;
cancel_trigger();
@@ -177,15 +177,15 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
if (!fragment) { // initialize for first read
- fragment = 1;
- scan_vol_map = make_vol_map(vol);
+ fragment = 1;
+ scan_vol_map = make_vol_map(vol);
io.aiocb.aio_offset = next_in_map(vol, scan_vol_map, vol_offset_to_offset(vol, 0));
if (io.aiocb.aio_offset >= (off_t)(vol->skip + vol->len))
goto Lnext_vol;
io.aiocb.aio_nbytes = SCAN_BUF_SIZE;
- io.aiocb.aio_buf = buf->data();
- io.action = this;
- io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.aiocb.aio_buf = buf->data();
+ io.action = this;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
Debug("cache_scan_truss", "read %p:scanObject", this);
goto Lread;
}
@@ -202,13 +202,13 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
io.aio_result += scan_fix_buffer_offset;
io.aiocb.aio_nbytes += scan_fix_buffer_offset;
io.aiocb.aio_offset -= scan_fix_buffer_offset;
- io.aiocb.aio_buf = (char *)io.aiocb.aio_buf - scan_fix_buffer_offset;
+ io.aiocb.aio_buf = (char *)io.aiocb.aio_buf - scan_fix_buffer_offset;
scan_fix_buffer_offset = 0;
}
while ((off_t)((char *)doc - buf->data()) + next_object_len < (off_t)io.aiocb.aio_nbytes) {
might_need_overlap_read = false;
- doc = (Doc *)((char *)doc + next_object_len);
- next_object_len = vol->round_to_approx_size(doc->len);
+ doc = (Doc *)((char *)doc + next_object_len);
+ next_object_len = vol->round_to_approx_size(doc->len);
#ifdef HTTP_CACHE
int i;
bool changed;
@@ -237,7 +237,7 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
{
char *tmp = doc->hdr();
- int len = doc->hlen;
+ int len = doc->hlen;
while (len > 0) {
int r = HTTPInfo::unmarshal(tmp, len, buf._ptr());
if (r < 0) {
@@ -250,7 +250,7 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
if (this->load_http_info(&vector, doc) != doc->hlen)
goto Lskip;
- changed = false;
+ changed = false;
hostinfo_copied = 0;
for (i = 0; i < vector.count(); i++) {
if (!vector.get(i)->valid())
@@ -270,7 +270,7 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
continue;
}
earliest_key = key;
- int result1 = _action.continuation->handleEvent(CACHE_EVENT_SCAN_OBJECT, vector.get(i));
+ int result1 = _action.continuation->handleEvent(CACHE_EVENT_SCAN_OBJECT, vector.get(i));
switch (result1) {
case CACHE_SCAN_RESULT_CONTINUE:
continue;
@@ -306,14 +306,14 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
cacheProcessor.remove(this, &doc->first_key, true, CACHE_FRAG_TYPE_HTTP, hname, hlen);
return EVENT_CONT;
} else {
- offset = (char *)doc - buf->data();
- write_len = 0;
- frag_type = CACHE_FRAG_TYPE_HTTP;
+ offset = (char *)doc - buf->data();
+ write_len = 0;
+ frag_type = CACHE_FRAG_TYPE_HTTP;
f.use_first_key = 1;
- f.evac_vector = 1;
- first_key = key = doc->first_key;
- alternate_index = CACHE_ALT_REMOVED;
- earliest_key = zero_key;
+ f.evac_vector = 1;
+ first_key = key = doc->first_key;
+ alternate_index = CACHE_ALT_REMOVED;
+ earliest_key = zero_key;
writer_lock_retry = 0;
SET_HANDLER(&CacheVC::scanOpenWrite);
return scanOpenWrite(EVENT_NONE, 0);
@@ -334,16 +334,16 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
// Copy partial object to beginning of the buffer.
memmove(buf->data(), (char *)doc, partial_object_len);
io.aiocb.aio_offset += io.aiocb.aio_nbytes;
- io.aiocb.aio_nbytes = SCAN_BUF_SIZE - partial_object_len;
- io.aiocb.aio_buf = buf->data() + partial_object_len;
+ io.aiocb.aio_nbytes = SCAN_BUF_SIZE - partial_object_len;
+ io.aiocb.aio_buf = buf->data() + partial_object_len;
scan_fix_buffer_offset = partial_object_len;
} else { // Normal case, where we ended on a object boundary.
io.aiocb.aio_offset += ((char *)doc - buf->data()) + next_object_len;
Debug("cache_scan_truss", "next %p:scanObject %" PRId64, this, (int64_t)io.aiocb.aio_offset);
io.aiocb.aio_offset = next_in_map(vol, scan_vol_map, io.aiocb.aio_offset);
Debug("cache_scan_truss", "next_in_map %p:scanObject %" PRId64, this, (int64_t)io.aiocb.aio_offset);
- io.aiocb.aio_nbytes = SCAN_BUF_SIZE;
- io.aiocb.aio_buf = buf->data();
+ io.aiocb.aio_nbytes = SCAN_BUF_SIZE;
+ io.aiocb.aio_buf = buf->data();
scan_fix_buffer_offset = 0;
}
@@ -358,7 +358,7 @@ Lread:
io.aiocb.aio_fildes = vol->fd;
if ((off_t)(io.aiocb.aio_offset + io.aiocb.aio_nbytes) > (off_t)(vol->skip + vol->len))
io.aiocb.aio_nbytes = vol->skip + vol->len - io.aiocb.aio_offset;
- offset = 0;
+ offset = 0;
ink_assert(ink_aio_read(&io) >= 0);
Debug("cache_scan_truss", "read %p:scanObject %" PRId64 " %zu", this, (int64_t)io.aiocb.aio_offset, (size_t)io.aiocb.aio_nbytes);
return EVENT_CONT;
@@ -432,7 +432,7 @@ CacheVC::scanOpenWrite(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
Dir *l = NULL;
Dir d;
Doc *doc = (Doc *)(buf->data() + offset);
- offset = (char *)doc - buf->data() + vol->round_to_approx_size(doc->len);
+ offset = (char *)doc - buf->data() + vol->round_to_approx_size(doc->len);
// if the doc contains some data, then we need to create
// a new directory entry for this fragment. Remember the
// offset and the key in earliest_key
@@ -440,7 +440,7 @@ CacheVC::scanOpenWrite(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
if (doc->total_len) {
dir_assign(&od->single_doc_dir, &dir);
dir_set_tag(&od->single_doc_dir, doc->key.slice32(2));
- od->single_doc_key = doc->key;
+ od->single_doc_key = doc->key;
od->move_resident_alt = 1;
}
diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index dfb927c..8e0f811 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -107,8 +107,8 @@ CacheVC::updateVector(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
}
if (od->move_resident_alt && first_buf._ptr() && !od->has_multiple_writers()) {
- Doc *doc = (Doc *)first_buf->data();
- int small_doc = (int64_t)doc->data_len() < (int64_t)cache_config_alt_rewrite_max_size;
+ Doc *doc = (Doc *)first_buf->data();
+ int small_doc = (int64_t)doc->data_len() < (int64_t)cache_config_alt_rewrite_max_size;
int have_res_alt = doc->key == od->single_doc_key;
// if the new alternate is not written with the vector
// then move the old one with the vector
@@ -122,14 +122,14 @@ CacheVC::updateVector(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
// for multiple fragment document, we must have done
// CacheVC:openWriteCloseDataDone
ink_assert(!fragment || f.data_done);
- od->move_resident_alt = 0;
+ od->move_resident_alt = 0;
f.rewrite_resident_alt = 1;
- write_len = doc->data_len();
+ write_len = doc->data_len();
Debug("cache_update_alt", "rewriting resident alt size: %d key: %X, first_key: %X", write_len, doc->key.slice32(0),
first_key.slice32(0));
}
}
- header_len = write_vector->marshal_length();
+ header_len = write_vector->marshal_length();
od->writing_vec = 1;
f.use_first_key = 1;
SET_HANDLER(&CacheVC::openWriteCloseHeadDone);
@@ -218,13 +218,13 @@ iobufferblock_memcpy(char *p, int len, IOBufferBlock *ab, int offset)
{
IOBufferBlock *b = ab;
while (b && len >= 0) {
- char *start = b->_start;
- char *end = b->_end;
+ char *start = b->_start;
+ char *end = b->_end;
int max_bytes = end - start;
max_bytes -= offset;
if (max_bytes <= 0) {
offset = -max_bytes;
- b = b->next;
+ b = b->next;
continue;
}
int bytes = len;
@@ -233,7 +233,7 @@ iobufferblock_memcpy(char *p, int len, IOBufferBlock *ab, int offset)
::memcpy(p, start + offset, bytes);
p += bytes;
len -= bytes;
- b = b->next;
+ b = b->next;
offset = 0;
}
return p;
@@ -250,14 +250,14 @@ Vol::force_evacuate_head(Dir *evac_dir, int pinned)
return b;
if (!b) {
- b = new_EvacuationBlock(mutex->thread_holding);
+ b = new_EvacuationBlock(mutex->thread_holding);
b->dir = *evac_dir;
DDebug("cache_evac", "force: %d, %d", (int)dir_offset(evac_dir), (int)dir_phase(evac_dir));
evacuate[dir_evac_bucket(evac_dir)].push(b);
}
- b->f.pinned = pinned;
+ b->f.pinned = pinned;
b->f.evacuate_head = 1;
- b->evac_frags.key = zero_key; // ensure that the block gets
+ b->evac_frags.key = zero_key; // ensure that the block gets
// evacuated no matter what
b->readers = 0; // ensure that the block does not disappear
return b;
@@ -269,9 +269,9 @@ Vol::scan_for_pinned_documents()
if (cache_config_permit_pinning) {
// we can't evacuate anything between header->write_pos and
// header->write_pos + AGG_SIZE.
- int ps = offset_to_vol_offset(this, header->write_pos + AGG_SIZE);
- int pe = offset_to_vol_offset(this, header->write_pos + 2 * EVACUATION_SIZE + (len / PIN_SCAN_EVERY));
- int vol_end_offset = offset_to_vol_offset(this, len + skip);
+ int ps = offset_to_vol_offset(this, header->write_pos + AGG_SIZE);
+ int pe = offset_to_vol_offset(this, header->write_pos + 2 * EVACUATION_SIZE + (len / PIN_SCAN_EVERY));
+ int vol_end_offset = offset_to_vol_offset(this, len + skip);
int before_end_of_vol = pe < vol_end_offset;
DDebug("cache_evac", "scan %d %d", ps, pe);
for (int i = 0; i < vol_direntries(this); i++) {
@@ -363,13 +363,13 @@ Vol::aggWriteDone(int event, Event *e)
CacheVC *
new_DocEvacuator(int nbytes, Vol *vol)
{
- CacheVC *c = new_CacheVC(vol);
+ CacheVC *c = new_CacheVC(vol);
ProxyMutex *mutex = vol->mutex;
- c->base_stat = cache_evacuate_active_stat;
+ c->base_stat = cache_evacuate_active_stat;
CACHE_INCREMENT_DYN_STAT(c->base_stat + CACHE_STAT_ACTIVE);
- c->buf = new_IOBufferData(iobuffer_size_to_index(nbytes, MAX_BUFFER_SIZE_INDEX), MEMALIGNED);
- c->vol = vol;
- c->f.evacuator = 1;
+ c->buf = new_IOBufferData(iobuffer_size_to_index(nbytes, MAX_BUFFER_SIZE_INDEX), MEMALIGNED);
+ c->vol = vol;
+ c->f.evacuator = 1;
c->earliest_key = zero_key;
SET_CONTINUATION_HANDLER(c, &CacheVC::evacuateDocDone);
return c;
@@ -406,7 +406,7 @@ CacheVC::evacuateReadHead(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */
if (alternate_index < 0)
goto Ldone;
alternate_tmp = vector.get(alternate_index);
- doc_len = alternate_tmp->object_size_get();
+ doc_len = alternate_tmp->object_size_get();
Debug("cache_evac", "evacuateReadHead http earliest %X first: %X len: %" PRId64, first_key.slice32(0), earliest_key.slice32(0),
doc_len);
} else
@@ -510,7 +510,7 @@ CacheVC::evacuateDocDone(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
ink_assert(dir_compare_tag(&overwrite_dir, &doc->key));
ink_assert(b->earliest_evacuator == this);
total_len += doc->data_len();
- first_key = doc->first_key;
+ first_key = doc->first_key;
earliest_dir = dir;
if (dir_probe(&first_key, vol, &dir, &last_collision) > 0) {
dir_lookaside_insert(b, vol, &earliest_dir);
@@ -541,9 +541,9 @@ evacuate_fragments(CacheKey *key, CacheKey *earliest_key, int force, Vol *vol)
continue;
EvacuationBlock *b = evacuation_block_exists(&dir, vol);
if (!b) {
- b = new_EvacuationBlock(vol->mutex->thread_holding);
- b->dir = dir;
- b->evac_frags.key = *key;
+ b = new_EvacuationBlock(vol->mutex->thread_holding);
+ b->dir = dir;
+ b->evac_frags.key = *key;
b->evac_frags.earliest_key = *earliest_key;
vol->evacuate[dir_evac_bucket(&dir)].push(b);
i++;
@@ -551,10 +551,10 @@ evacuate_fragments(CacheKey *key, CacheKey *earliest_key, int force, Vol *vol)
ink_assert(dir_offset(&dir) == dir_offset(&b->dir));
ink_assert(dir_phase(&dir) == dir_phase(&b->dir));
EvacuationKey *evac_frag = evacuationKeyAllocator.alloc();
- evac_frag->key = *key;
- evac_frag->earliest_key = *earliest_key;
- evac_frag->link.next = b->evac_frags.link.next;
- b->evac_frags.link.next = evac_frag;
+ evac_frag->key = *key;
+ evac_frag->earliest_key = *earliest_key;
+ evac_frag->link.next = b->evac_frags.link.next;
+ b->evac_frags.link.next = evac_frag;
}
if (force)
b->readers = 0;
@@ -572,7 +572,7 @@ Vol::evacuateWrite(CacheVC *evacuator, int event, Event *e)
evacuator->agg_len = round_to_approx_size(((Doc *)evacuator->buf->data())->len);
agg_todo_size += evacuator->agg_len;
/* insert the evacuator after all the other evacuators */
- CacheVC *cur = (CacheVC *)agg.head;
+ CacheVC *cur = (CacheVC *)agg.head;
CacheVC *after = NULL;
for (; cur && cur->f.evacuator; cur = (CacheVC *)cur->link.next)
after = cur;
@@ -619,7 +619,7 @@ Vol::evacuateDocReadDone(int event, Event *e)
// need to write this vector down and overwrite the directory entry.
if (dir_compare_tag(&b->dir, &doc->first_key)) {
doc_evacuator->key = doc->first_key;
- b->evac_frags.key = doc->first_key;
+ b->evac_frags.key = doc->first_key;
DDebug("cache_evac", "evacuating vector %X offset %d", (int)doc->first_key.slice32(0),
(int)dir_offset(&doc_evacuator->overwrite_dir));
b->f.unused = 57;
@@ -628,11 +628,11 @@ Vol::evacuateDocReadDone(int event, Event *e)
// a little tricky. We have to propagate the earliest key to the next
// fragments for this alternate. The last fragment to be evacuated
// fixes up the lookaside buffer.
- doc_evacuator->key = doc->key;
+ doc_evacuator->key = doc->key;
doc_evacuator->earliest_key = doc->key;
- b->evac_frags.key = doc->key;
- b->evac_frags.earliest_key = doc->key;
- b->earliest_evacuator = doc_evacuator;
+ b->evac_frags.key = doc->key;
+ b->evac_frags.earliest_key = doc->key;
+ b->earliest_evacuator = doc_evacuator;
DDebug("cache_evac", "evacuating earliest %X %X evac: %p offset: %d", (int)b->evac_frags.key.slice32(0),
(int)doc->key.slice32(0), doc_evacuator, (int)dir_offset(&doc_evacuator->overwrite_dir));
b->f.unused = 67;
@@ -646,7 +646,7 @@ Vol::evacuateDocReadDone(int event, Event *e)
b->f.unused = 77;
goto Ldone;
}
- doc_evacuator->key = ek->key;
+ doc_evacuator->key = ek->key;
doc_evacuator->earliest_key = ek->earliest_key;
DDebug("cache_evac", "evacuateDocReadDone key: %X earliest: %X", (int)ek->key.slice32(0), (int)ek->earliest_key.slice32(0));
b->f.unused = 87;
@@ -671,35 +671,35 @@ Vol::evac_range(off_t low, off_t high, int evac_phase)
{
off_t s = offset_to_vol_offset(this, low);
off_t e = offset_to_vol_offset(this, high);
- int si = dir_offset_evac_bucket(s);
- int ei = dir_offset_evac_bucket(e);
+ int si = dir_offset_evac_bucket(s);
+ int ei = dir_offset_evac_bucket(e);
for (int i = si; i <= ei; i++) {
- EvacuationBlock *b = evacuate[i].head;
+ EvacuationBlock *b = evacuate[i].head;
EvacuationBlock *first = 0;
- int64_t first_offset = INT64_MAX;
+ int64_t first_offset = INT64_MAX;
for (; b; b = b->link.next) {
int64_t offset = dir_offset(&b->dir);
- int phase = dir_phase(&b->dir);
+ int phase = dir_phase(&b->dir);
if (offset >= s && offset < e && !b->f.done && phase == evac_phase)
if (offset < first_offset) {
- first = b;
+ first = b;
first_offset = offset;
}
}
if (first) {
- first->f.done = 1;
+ first->f.done = 1;
io.aiocb.aio_fildes = fd;
io.aiocb.aio_nbytes = dir_approx_size(&first->dir);
io.aiocb.aio_offset = vol_offset(this, &first->dir);
if ((off_t)(io.aiocb.aio_offset + io.aiocb.aio_nbytes) > (off_t)(skip + len))
- io.aiocb.aio_nbytes = skip + len - io.aiocb.aio_offset;
- doc_evacuator = new_DocEvacuator(io.aiocb.aio_nbytes, this);
+ io.aiocb.aio_nbytes = skip + len - io.aiocb.aio_offset;
+ doc_evacuator = new_DocEvacuator(io.aiocb.aio_nbytes, this);
doc_evacuator->overwrite_dir = first->dir;
io.aiocb.aio_buf = doc_evacuator->buf->data();
- io.action = this;
- io.thread = AIO_CALLBACK_THREAD_ANY;
+ io.action = this;
+ io.thread = AIO_CALLBACK_THREAD_ANY;
DDebug("cache_evac", "evac_range evacuating %X %d", (int)dir_tag(&first->dir), (int)dir_offset(&first->dir));
SET_HANDLER(&Vol::evacuateDocReadDone);
ink_assert(ink_aio_read(&io) >= 0);
@@ -713,10 +713,10 @@ static int
agg_copy(char *p, CacheVC *vc)
{
Vol *vol = vc->vol;
- off_t o = vol->header->write_pos + vol->agg_buf_pos;
+ off_t o = vol->header->write_pos + vol->agg_buf_pos;
if (!vc->f.evacuator) {
- Doc *doc = (Doc *)p;
+ Doc *doc = (Doc *)p;
IOBufferBlock *res_alt_blk = 0;
uint32_t len = vc->write_len + vc->header_len + vc->frag_len + sizeofDoc;
@@ -729,18 +729,18 @@ agg_copy(char *p, CacheVC *vc)
dir_set_phase(&vc->dir, vol->header->phase);
// fill in document header
- doc->magic = DOC_MAGIC;
- doc->len = len;
- doc->hlen = vc->header_len;
- doc->doc_type = vc->frag_type;
- doc->v_major = CACHE_DB_MAJOR_VERSION;
- doc->v_minor = CACHE_DB_MINOR_VERSION;
- doc->unused = 0; // force this for forward compatibility.
- doc->total_len = vc->total_len;
- doc->first_key = vc->first_key;
+ doc->magic = DOC_MAGIC;
+ doc->len = len;
+ doc->hlen = vc->header_len;
+ doc->doc_type = vc->frag_type;
+ doc->v_major = CACHE_DB_MAJOR_VERSION;
+ doc->v_minor = CACHE_DB_MINOR_VERSION;
+ doc->unused = 0; // force this for forward compatibility.
+ doc->total_len = vc->total_len;
+ doc->first_key = vc->first_key;
doc->sync_serial = vol->header->sync_serial;
vc->write_serial = doc->write_serial = vol->header->write_serial;
- doc->checksum = DOC_NO_CHECKSUM;
+ doc->checksum = DOC_NO_CHECKSUM;
if (vc->pin_in_cache) {
dir_set_pinned(&vc->dir, 1);
doc->pinned = (uint32_t)(Thread::get_hrtime() / HRTIME_SECOND) + vc->pin_in_cache;
@@ -767,9 +767,9 @@ agg_copy(char *p, CacheVC *vc)
#ifdef HTTP_CACHE
if (vc->f.rewrite_resident_alt) {
ink_assert(vc->f.use_first_key);
- Doc *res_doc = (Doc *)vc->first_buf->data();
- res_alt_blk = new_IOBufferBlock(vc->first_buf, res_doc->data_len(), sizeofDoc + res_doc->hlen);
- doc->key = res_doc->key;
+ Doc *res_doc = (Doc *)vc->first_buf->data();
+ res_alt_blk = new_IOBufferBlock(vc->first_buf, res_doc->data_len(), sizeofDoc + res_doc->hlen);
+ doc->key = res_doc->key;
doc->total_len = res_doc->data_len();
}
#endif
@@ -839,7 +839,7 @@ agg_copy(char *p, CacheVC *vc)
} else {
// for evacuated documents, copy the data, and update directory
Doc *doc = (Doc *)vc->buf->data();
- int l = vc->vol->round_to_approx_size(doc->len);
+ int l = vc->vol->round_to_approx_size(doc->len);
{
ProxyMutex *mutex ATS_UNUSED = vc->vol->mutex;
ink_assert(mutex->thread_holding == this_ethread());
@@ -847,7 +847,7 @@ agg_copy(char *p, CacheVC *vc)
CACHE_DEBUG_SUM_DYN_STAT(cache_gc_bytes_evacuated_stat, l);
}
- doc->sync_serial = vc->vol->header->sync_serial;
+ doc->sync_serial = vc->vol->header->sync_serial;
doc->write_serial = vc->vol->header->write_serial;
memcpy(p, doc, doc->len);
@@ -881,9 +881,9 @@ void
Vol::evacuate_cleanup()
{
int64_t eo = ((header->write_pos - start) / CACHE_BLOCK_SIZE) + 1;
- int64_t e = dir_offset_evac_bucket(eo);
+ int64_t e = dir_offset_evac_bucket(eo);
int64_t sx = e - (evacuate_size / PIN_SCAN_EVERY) - 1;
- int64_t s = sx;
+ int64_t s = sx;
int i;
if (e > evacuate_size)
@@ -917,7 +917,7 @@ void
Vol::agg_wrap()
{
header->write_pos = start;
- header->phase = !header->phase;
+ header->phase = !header->phase;
header->cycle++;
header->agg_pos = header->write_pos;
@@ -1015,13 +1015,13 @@ Lagain:
// write sync marker
if (!agg_buf_pos) {
ink_assert(sync.head);
- int l = round_to_approx_size(sizeof(Doc));
+ int l = round_to_approx_size(sizeof(Doc));
agg_buf_pos = l;
- Doc *d = (Doc *)agg_buffer;
+ Doc *d = (Doc *)agg_buffer;
memset(d, 0, sizeof(Doc));
- d->magic = DOC_MAGIC;
- d->len = l;
- d->sync_serial = header->sync_serial;
+ d->magic = DOC_MAGIC;
+ d->len = l;
+ d->sync_serial = header->sync_serial;
d->write_serial = header->write_serial;
}
@@ -1030,9 +1030,9 @@ Lagain:
io.aiocb.aio_fildes = fd;
io.aiocb.aio_offset = header->write_pos;
- io.aiocb.aio_buf = agg_buffer;
+ io.aiocb.aio_buf = agg_buffer;
io.aiocb.aio_nbytes = agg_buf_pos;
- io.action = this;
+ io.action = this;
/*
Callback on AIO thread so that we can issue a new write ASAP
as all writes are serialized in the volume. This is not necessary
@@ -1351,10 +1351,10 @@ Lagain:
if (vio.ntodo() <= 0)
return EVENT_CONT;
}
- int64_t ntodo = (int64_t)(vio.ntodo() + length);
+ int64_t ntodo = (int64_t)(vio.ntodo() + length);
int64_t total_avail = vio.buffer.reader()->read_avail();
- int64_t avail = total_avail;
- int64_t towrite = avail + length;
+ int64_t avail = total_avail;
+ int64_t towrite = avail + length;
if (towrite > ntodo) {
avail -= (towrite - ntodo);
towrite = ntodo;
@@ -1376,7 +1376,7 @@ Lagain:
if (length > target_fragment_size() && (length < target_fragment_size() + target_fragment_size() / 4))
write_len = target_fragment_size();
else
- write_len = length;
+ write_len = length;
bool not_writing = towrite != ntodo && towrite < target_fragment_size();
if (!called_user) {
if (not_writing) {
@@ -1417,7 +1417,7 @@ CacheVC::openWriteOverwrite(int event, Event *e)
if (!(doc->first_key == first_key))
goto Lcollision;
od->first_dir = dir;
- first_buf = buf;
+ first_buf = buf;
goto Ldone;
}
Lcollision : {
@@ -1486,11 +1486,11 @@ CacheVC::openWriteStartDone(int event, Event *e)
}
ink_assert(write_vector->count() > 0);
od->first_dir = dir;
- first_dir = dir;
+ first_dir = dir;
if (doc->single_fragment()) {
// fragment is tied to the vector
od->move_resident_alt = 1;
- od->single_doc_key = doc->key;
+ od->single_doc_key = doc->key;
dir_assign(&od->single_doc_dir, &dir);
dir_set_tag(&od->single_doc_dir, od->single_doc_key.slice32(2));
}
@@ -1512,7 +1512,7 @@ CacheVC::openWriteStartDone(int event, Event *e)
// check for collision
if (dir_probe(&first_key, vol, &dir, &last_collision)) {
od->reading_vec = 1;
- int ret = do_read_call(&first_key);
+ int ret = do_read_call(&first_key);
if (ret == EVENT_RETURN)
goto Lcallreturn;
return ret;
@@ -1581,17 +1581,17 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_ty
ink_assert(caches[frag_type] == this);
- intptr_t res = 0;
- CacheVC *c = new_CacheVC(cont);
+ intptr_t res = 0;
+ CacheVC *c = new_CacheVC(cont);
ProxyMutex *mutex = cont->mutex;
SCOPED_MUTEX_LOCK(lock, c->mutex, this_ethread());
- c->vio.op = VIO::WRITE;
+ c->vio.op = VIO::WRITE;
c->base_stat = cache_write_active_stat;
- c->vol = key_to_vol(key, hostname, host_len);
- Vol *vol = c->vol;
+ c->vol = key_to_vol(key, hostname, host_len);
+ Vol *vol = c->vol;
CACHE_INCREMENT_DYN_STAT(c->base_stat + CACHE_STAT_ACTIVE);
c->first_key = c->key = *key;
- c->frag_type = frag_type;
+ c->frag_type = frag_type;
/*
The transition from single fragment document to a multi-fragment document
would cause a problem if the key and the first_key collide. In case of
@@ -1606,10 +1606,10 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheFragType frag_ty
#ifdef HTTP_CACHE
c->info = 0;
#endif
- c->f.overwrite = (options & CACHE_WRITE_OPT_OVERWRITE) != 0;
+ c->f.overwrite = (options & CACHE_WRITE_OPT_OVERWRITE) != 0;
c->f.close_complete = (options & CACHE_WRITE_OPT_CLOSE_COMPLETE) != 0;
- c->f.sync = (options & CACHE_WRITE_OPT_SYNC) == CACHE_WRITE_OPT_SYNC;
- c->pin_in_cache = (uint32_t)apin_in_cache;
+ c->f.sync = (options & CACHE_WRITE_OPT_SYNC) == CACHE_WRITE_OPT_SYNC;
+ c->pin_in_cache = (uint32_t)apin_in_cache;
if ((res = c->vol->open_write_lock(c, false, 1)) > 0) {
// document currently being written, abort
@@ -1648,12 +1648,12 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info,
}
ink_assert(caches[type] == this);
- intptr_t err = 0;
- int if_writers = (uintptr_t)info == CACHE_ALLOW_MULTIPLE_WRITES;
- CacheVC *c = new_CacheVC(cont);
+ intptr_t err = 0;
+ int if_writers = (uintptr_t)info == CACHE_ALLOW_MULTIPLE_WRITES;
+ CacheVC *c = new_CacheVC(cont);
ProxyMutex *mutex = cont->mutex;
- c->vio.op = VIO::WRITE;
- c->first_key = *key;
+ c->vio.op = VIO::WRITE;
+ c->first_key = *key;
/*
The transition from single fragment document to a multi-fragment document
would cause a problem if the key and the first_key collide. In case of
@@ -1665,10 +1665,10 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info,
rand_CacheKey(&c->key, cont->mutex);
} while (DIR_MASK_TAG(c->key.slice32(2)) == DIR_MASK_TAG(c->first_key.slice32(2)));
c->earliest_key = c->key;
- c->frag_type = CACHE_FRAG_TYPE_HTTP;
- c->vol = key_to_vol(key, hostname, host_len);
- Vol *vol = c->vol;
- c->info = info;
+ c->frag_type = CACHE_FRAG_TYPE_HTTP;
+ c->vol = key_to_vol(key, hostname, host_len);
+ Vol *vol = c->vol;
+ c->info = info;
if (c->info && (uintptr_t)info != CACHE_ALLOW_MULTIPLE_WRITES) {
/*
Update has the following code paths :
@@ -1699,7 +1699,7 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info,
open_write with info set
close
*/
- c->f.update = 1;
+ c->f.update = 1;
c->base_stat = cache_update_active_stat;
DDebug("cache_update", "Update called");
info->object_key_get(&c->update_key);
diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h
index b1c0cfe..6ba165c 100644
--- a/iocore/cache/I_Cache.h
+++ b/iocore/cache/I_Cache.h
@@ -184,8 +184,8 @@ struct CacheVConnection : public VConnection {
virtual VIO *do_io_pread(Continuation *c, int64_t nbytes, MIOBuffer *buf, int64_t offset) = 0;
VIO *do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *buf, bool owner = false) = 0;
void do_io_close(int lerrno = -1) = 0;
- void reenable(VIO *avio) = 0;
- void reenable_re(VIO *avio) = 0;
+ void reenable(VIO *avio) = 0;
+ void reenable_re(VIO *avio) = 0;
void
do_io_shutdown(ShutdownHowTo_t howto)
{
@@ -193,21 +193,21 @@ struct CacheVConnection : public VConnection {
ink_assert(!"CacheVConnection::do_io_shutdown unsupported");
}
- virtual int get_header(void **ptr, int *len) = 0;
- virtual int set_header(void *ptr, int len) = 0;
+ virtual int get_header(void **ptr, int *len) = 0;
+ virtual int set_header(void *ptr, int len) = 0;
virtual int get_single_data(void **ptr, int *len) = 0;
#ifdef HTTP_CACHE
- virtual void set_http_info(CacheHTTPInfo *info) = 0;
+ virtual void set_http_info(CacheHTTPInfo *info) = 0;
virtual void get_http_info(CacheHTTPInfo **info) = 0;
#endif
- virtual bool is_ram_cache_hit() const = 0;
+ virtual bool is_ram_cache_hit() const = 0;
virtual bool set_disk_io_priority(int priority) = 0;
- virtual int get_disk_io_priority() = 0;
- virtual bool set_pin_in_cache(time_t t) = 0;
- virtual time_t get_pin_in_cache() = 0;
- virtual int64_t get_object_size() = 0;
+ virtual int get_disk_io_priority() = 0;
+ virtual bool set_pin_in_cache(time_t t) = 0;
+ virtual time_t get_pin_in_cache() = 0;
+ virtual int64_t get_object_size() = 0;
virtual bool
is_compressed_in_ram() const
{
diff --git a/iocore/cache/I_CacheDefs.h b/iocore/cache/I_CacheDefs.h
index 38ad84f..06564d6 100644
--- a/iocore/cache/I_CacheDefs.h
+++ b/iocore/cache/I_CacheDefs.h
@@ -65,27 +65,27 @@ enum CacheType {
// NOTE: All the failures are ODD, and one greater than the success
// Some of these must match those in <ts/ts.h>
enum CacheEventType {
- CACHE_EVENT_LOOKUP = CACHE_EVENT_EVENTS_START + 0,
- CACHE_EVENT_LOOKUP_FAILED = CACHE_EVENT_EVENTS_START + 1,
- CACHE_EVENT_OPEN_READ = CACHE_EVENT_EVENTS_START + 2,
+ CACHE_EVENT_LOOKUP = CACHE_EVENT_EVENTS_START + 0,
+ CACHE_EVENT_LOOKUP_FAILED = CACHE_EVENT_EVENTS_START + 1,
+ CACHE_EVENT_OPEN_READ = CACHE_EVENT_EVENTS_START + 2,
CACHE_EVENT_OPEN_READ_FAILED = CACHE_EVENT_EVENTS_START + 3,
// 4-7 unused
- CACHE_EVENT_OPEN_WRITE = CACHE_EVENT_EVENTS_START + 8,
+ CACHE_EVENT_OPEN_WRITE = CACHE_EVENT_EVENTS_START + 8,
CACHE_EVENT_OPEN_WRITE_FAILED = CACHE_EVENT_EVENTS_START + 9,
- CACHE_EVENT_REMOVE = CACHE_EVENT_EVENTS_START + 12,
- CACHE_EVENT_REMOVE_FAILED = CACHE_EVENT_EVENTS_START + 13,
+ CACHE_EVENT_REMOVE = CACHE_EVENT_EVENTS_START + 12,
+ CACHE_EVENT_REMOVE_FAILED = CACHE_EVENT_EVENTS_START + 13,
CACHE_EVENT_UPDATE,
CACHE_EVENT_UPDATE_FAILED,
CACHE_EVENT_LINK,
CACHE_EVENT_LINK_FAILED,
CACHE_EVENT_DEREF,
CACHE_EVENT_DEREF_FAILED,
- CACHE_EVENT_SCAN = CACHE_EVENT_EVENTS_START + 20,
- CACHE_EVENT_SCAN_FAILED = CACHE_EVENT_EVENTS_START + 21,
- CACHE_EVENT_SCAN_OBJECT = CACHE_EVENT_EVENTS_START + 22,
+ CACHE_EVENT_SCAN = CACHE_EVENT_EVENTS_START + 20,
+ CACHE_EVENT_SCAN_FAILED = CACHE_EVENT_EVENTS_START + 21,
+ CACHE_EVENT_SCAN_OBJECT = CACHE_EVENT_EVENTS_START + 22,
CACHE_EVENT_SCAN_OPERATION_BLOCKED = CACHE_EVENT_EVENTS_START + 23,
- CACHE_EVENT_SCAN_OPERATION_FAILED = CACHE_EVENT_EVENTS_START + 24,
- CACHE_EVENT_SCAN_DONE = CACHE_EVENT_EVENTS_START + 25,
+ CACHE_EVENT_SCAN_OPERATION_FAILED = CACHE_EVENT_EVENTS_START + 24,
+ CACHE_EVENT_SCAN_DONE = CACHE_EVENT_EVENTS_START + 25,
//////////////////////////
// Internal error codes //
//////////////////////////
@@ -96,8 +96,8 @@ enum CacheEventType {
enum CacheScanResult {
CACHE_SCAN_RESULT_CONTINUE = EVENT_CONT,
- CACHE_SCAN_RESULT_DONE = EVENT_DONE,
- CACHE_SCAN_RESULT_DELETE = 10,
+ CACHE_SCAN_RESULT_DONE = EVENT_DONE,
+ CACHE_SCAN_RESULT_DELETE = 10,
CACHE_SCAN_RESULT_DELETE_ALL_ALTERNATES,
CACHE_SCAN_RESULT_UPDATE,
CACHE_SCAN_RESULT_RETRY
diff --git a/iocore/cache/I_Store.h b/iocore/cache/I_Store.h
index 59968c0..9d99166 100644
--- a/iocore/cache/I_Store.h
+++ b/iocore/cache/I_Store.h
@@ -176,7 +176,7 @@ public:
pathname = ats_strdup(that.pathname);
if (that.hash_base_string)
hash_base_string = ats_strdup(that.hash_base_string);
- link.next = NULL;
+ link.next = NULL;
}
~Span();
@@ -200,7 +200,7 @@ struct Store {
Store s;
alloc(s, blocks, true, mmapable);
if (s.n_disks) {
- Span *t = s.disk[0];
+ Span *t = s.disk[0];
s.disk[0] = NULL;
return t;
}
diff --git a/iocore/cache/P_CacheArray.h b/iocore/cache/P_CacheArray.h
index 869906e..9a7c7dd 100644
--- a/iocore/cache/P_CacheArray.h
+++ b/iocore/cache/P_CacheArray.h
@@ -124,7 +124,7 @@ CacheArray<T>::detach()
{
T *d;
- d = data;
+ d = data;
data = NULL;
return d;
@@ -149,7 +149,7 @@ CacheArray<T>::clear()
}
size = 0;
- pos = -1;
+ pos = -1;
}
template <class T>
diff --git a/iocore/cache/P_CacheDir.h b/iocore/cache/P_CacheDir.h
index 57b6ad7..951d708 100644
--- a/iocore/cache/P_CacheDir.h
+++ b/iocore/cache/P_CacheDir.h
@@ -340,7 +340,7 @@ dir_to_offset(const Dir *d, const Dir *seg)
return (((char *)d) - ((char *)seg)) / SIZEOF_DIR;
#else
int64_t i = (int64_t)((((char *)d) - ((char *)seg)) / SIZEOF_DIR);
- i = i - (i / DIR_DEPTH);
+ i = i - (i / DIR_DEPTH);
return i;
#endif
}
diff --git a/iocore/cache/P_CacheHosting.h b/iocore/cache/P_CacheHosting.h
index 0c4b7fd..0ccc4ad 100644
--- a/iocore/cache/P_CacheHosting.h
+++ b/iocore/cache/P_CacheHosting.h
@@ -167,7 +167,7 @@ struct CacheHostTableConfig : public Continuation {
{
(void)e;
(void)event;
- CacheHostTable *t = new CacheHostTable((*ppt)->cache, (*ppt)->type);
+ CacheHostTable *t = new CacheHostTable((*ppt)->cache, (*ppt)->type);
CacheHostTable *old = (CacheHostTable *)ink_atomic_swap(&t, *ppt);
new_Deleter(old, CACHE_MEM_FREE_TIMEOUT);
return EVENT_DONE;
@@ -201,8 +201,8 @@ struct ConfigVolumes {
cp_queue.pop();
}
// reset count variables
- num_volumes = 0;
- num_http_volumes = 0;
+ num_volumes = 0;
+ num_http_volumes = 0;
num_stream_volumes = 0;
}
};
diff --git a/iocore/cache/P_CacheHttp.h b/iocore/cache/P_CacheHttp.h
index c9484dd..2b2e78e 100644
--- a/iocore/cache/P_CacheHttp.h
+++ b/iocore/cache/P_CacheHttp.h
@@ -35,9 +35,9 @@ typedef HTTPInfo CacheHTTPInfo;
#define OFFSET_BITS 24
enum {
- OWNER_NONE = 0,
+ OWNER_NONE = 0,
OWNER_CACHE = 1,
- OWNER_HTTP = 2,
+ OWNER_HTTP = 2,
};
#else
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index 8db829b..ba48d45 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -95,7 +95,7 @@ struct EvacuationBlock;
writer_lock_retry++; \
ink_hrtime _t = HRTIME_MSECONDS(cache_read_while_writer_retry_delay); \
if (writer_lock_retry > 2) \
- _t = HRTIME_MSECONDS(cache_read_while_writer_retry_delay) * 2; \
+ _t = HRTIME_MSECONDS(cache_read_while_writer_retry_delay) * 2; \
trigger = mutex->thread_holding->schedule_in_local(this, _t); \
return EVENT_CONT; \
} while (0)
@@ -239,8 +239,8 @@ struct CacheVC : public CacheVConnection {
{
if (first_buf.m_ptr) {
Doc *doc = (Doc *)first_buf->data();
- *ptr = doc->hdr();
- *len = doc->hlen;
+ *ptr = doc->hdr();
+ *len = doc->hlen;
return 0;
} else
return -1;
@@ -248,7 +248,7 @@ struct CacheVC : public CacheVConnection {
int
set_header(void *ptr, int len)
{
- header_to_write = ptr;
+ header_to_write = ptr;
header_to_write_len = len;
return 0;
}
@@ -506,7 +506,7 @@ struct CacheVC : public CacheVConnection {
do { \
ink_assert(handler != (ContinuationHandler)(&CacheVC::dead)); \
save_handler = handler; \
- handler = (ContinuationHandler)(_x); \
+ handler = (ContinuationHandler)(_x); \
} while (0)
#define POP_HANDLER \
@@ -542,10 +542,10 @@ new_CacheVC(Continuation *cont)
#ifdef HTTP_CACHE
c->vector.data.data = &c->vector.data.fast_data[0];
#endif
- c->_action = cont;
+ c->_action = cont;
c->initial_thread = t->tt == DEDICATED ? NULL : t;
- c->mutex = cont->mutex;
- c->start_time = Thread::get_hrtime();
+ c->mutex = cont->mutex;
+ c->start_time = Thread::get_hrtime();
ink_assert(c->trigger == NULL);
Debug("cache_new", "new %p", c);
#ifdef CACHE_STAT_PAGES
@@ -561,7 +561,7 @@ free_CacheVC(CacheVC *cont)
{
Debug("cache_free", "free %p", cont);
ProxyMutex *mutex = cont->mutex;
- Vol *vol = cont->vol;
+ Vol *vol = cont->vol;
if (vol) {
CACHE_DECREMENT_DYN_STAT(cont->base_stat + CACHE_STAT_ACTIVE);
if (cont->closed > 0) {
@@ -577,10 +577,10 @@ free_CacheVC(CacheVC *cont)
release build....wierd??? For now, null out continuation and mutex
of the action separately */
cont->io.action.continuation = NULL;
- cont->io.action.mutex = NULL;
+ cont->io.action.mutex = NULL;
cont->io.mutex.clear();
- cont->io.aio_result = 0;
- cont->io.aiocb.aio_nbytes = 0;
+ cont->io.aio_result = 0;
+ cont->io.aiocb.aio_nbytes = 0;
cont->io.aiocb.aio_reqprio = AIO_DEFAULT_PRIORITY;
#ifdef HTTP_CACHE
cont->request.reset();
@@ -646,8 +646,8 @@ CacheVC::callcont(int event)
TS_INLINE int
CacheVC::do_read_call(CacheKey *akey)
{
- doc_pos = 0;
- read_key = akey;
+ doc_pos = 0;
+ read_key = akey;
io.aiocb.aio_nbytes = dir_approx_size(&dir);
PUSH_HANDLER(&CacheVC::handleRead);
return handleRead(EVENT_CALL, 0);
@@ -734,7 +734,7 @@ CacheVC::writer_done()
{
OpenDirEntry *cod = od;
if (!cod)
- cod = vol->open_read(&first_key);
+ cod = vol->open_read(&first_key);
CacheVC *w = (cod) ? cod->writers.head : NULL;
// If the write vc started after the reader, then its not the
// original writer, since we never choose a writer that started
@@ -762,7 +762,7 @@ Vol::close_write(CacheVC *cont)
TS_INLINE int
Vol::open_write(CacheVC *cont, int allow_if_writers, int max_writers)
{
- Vol *vol = this;
+ Vol *vol = this;
bool agg_error = false;
if (!cont->f.remove) {
agg_error = (!cont->f.update && agg_todo_size > cache_config_agg_write_backlog);
@@ -883,9 +883,9 @@ next_CacheKey(CacheKey *next_key, CacheKey *key)
{
uint8_t *b = (uint8_t *)next_key;
uint8_t *k = (uint8_t *)key;
- b[0] = CacheKey_next_table[k[0]];
+ b[0] = CacheKey_next_table[k[0]];
for (int i = 1; i < 16; i++)
- b[i] = CacheKey_next_table[(b[i - 1] + k[i]) & 0xFF];
+ b[i] = CacheKey_next_table[(b[i - 1] + k[i]) & 0xFF];
}
extern uint8_t CacheKey_prev_table[];
void TS_INLINE
@@ -894,16 +894,16 @@ prev_CacheKey(CacheKey *prev_key, CacheKey *key)
uint8_t *b = (uint8_t *)prev_key;
uint8_t *k = (uint8_t *)key;
for (int i = 15; i > 0; i--)
- b[i] = 256 + CacheKey_prev_table[k[i]] - k[i - 1];
- b[0] = CacheKey_prev_table[k[0]];
+ b[i] = 256 + CacheKey_prev_table[k[i]] - k[i - 1];
+ b[0] = CacheKey_prev_table[k[0]];
}
TS_INLINE unsigned int
next_rand(unsigned int *p)
{
unsigned int seed = *p;
- seed = 1103515145 * seed + 12345;
- *p = seed;
+ seed = 1103515145 * seed + 12345;
+ *p = seed;
return seed;
}
@@ -1028,7 +1028,7 @@ Cache::generate_key(HttpCacheKey *key, CacheURL *url, cache_generation_t generat
TS_INLINE unsigned int
cache_hash(const INK_MD5 &md5)
{
- uint64_t f = md5.fold();
+ uint64_t f = md5.fold();
unsigned int mhash = (unsigned int)(f >> 32);
return mhash;
}
diff --git a/iocore/cache/P_CacheVol.h b/iocore/cache/P_CacheVol.h
index de1a38c..c9d2486 100644
--- a/iocore/cache/P_CacheVol.h
+++ b/iocore/cache/P_CacheVol.h
@@ -272,7 +272,7 @@ struct Vol : public Continuation {
writing_end_marker(0)
{
open_dir.mutex = mutex;
- agg_buffer = (char *)ats_memalign(ats_pagesize(), AGG_SIZE);
+ agg_buffer = (char *)ats_memalign(ats_pagesize(), AGG_SIZE);
memset(agg_buffer, 0, AGG_SIZE);
SET_HANDLER(&Vol::aggWrite);
}
@@ -473,10 +473,10 @@ Vol::cancel_trigger()
TS_INLINE EvacuationBlock *
new_EvacuationBlock(EThread *t)
{
- EvacuationBlock *b = THREAD_ALLOC(evacuationBlockAllocator, t);
- b->init = 0;
- b->readers = 0;
- b->earliest_evacuator = 0;
+ EvacuationBlock *b = THREAD_ALLOC(evacuationBlockAllocator, t);
+ b->init = 0;
+ b->readers = 0;
+ b->earliest_evacuator = 0;
b->evac_frags.link.next = 0;
return b;
}
@@ -502,9 +502,9 @@ Vol::open_read(const CryptoHash *key)
TS_INLINE int
Vol::within_hit_evacuate_window(Dir *xdir)
{
- off_t oft = dir_offset(xdir) - 1;
+ off_t oft = dir_offset(xdir) - 1;
off_t write_off = (header->write_pos + AGG_SIZE - start) / CACHE_BLOCK_SIZE;
- off_t delta = oft - write_off;
+ off_t delta = oft - write_off;
if (delta >= 0)
return delta < hit_evacuate_window;
else
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index c186214..9db0bb3 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -191,12 +191,12 @@ RamCacheCLFUS::resize_hashtable()
}
ats_free(bucket);
}
- bucket = new_bucket;
+ bucket = new_bucket;
nbuckets = anbuckets;
ats_free(seen);
if (cache_config_ram_cache_use_seen_filter) {
int size = bucket_sizes[ibuckets] * sizeof(uint16_t);
- seen = (uint16_t *)ats_malloc(size);
+ seen = (uint16_t *)ats_malloc(size);
memset(seen, 0, size);
}
}
@@ -205,7 +205,7 @@ void
RamCacheCLFUS::init(int64_t abytes, Vol *avol)
{
ink_assert(avol != 0);
- vol = avol;
+ vol = avol;
max_bytes = abytes;
DDebug("ram_cache", "initializing ram_cache %" PRId64 " bytes", abytes);
if (!max_bytes)
@@ -243,9 +243,9 @@ RamCacheCLFUS::get(INK_MD5 *key, Ptr<IOBufferData> *ret_data, uint32_t auxkey1,
{
if (!max_bytes)
return 0;
- int64_t i = key->slice32(3) % nbuckets;
+ int64_t i = key->slice32(3) % nbuckets;
RamCacheCLFUSEntry *e = bucket[i].head;
- char *b = 0;
+ char *b = 0;
while (e) {
if (e->key == *key && e->auxkey1 == auxkey1 && e->auxkey2 == auxkey2) {
move_compressed(e);
@@ -290,7 +290,7 @@ RamCacheCLFUS::get(INK_MD5 *key, Ptr<IOBufferData> *ret_data, uint32_t auxkey1,
#endif
}
IOBufferData *data = new_xmalloc_IOBufferData(b, e->len);
- data->_mem_type = DEFAULT_ALLOC;
+ data->_mem_type = DEFAULT_ALLOC;
if (!e->flag_bits.copy) { // don't bother if we have to copy anyway
int64_t delta = ((int64_t)e->compressed_len) - (int64_t)e->size;
bytes += delta;
@@ -298,7 +298,7 @@ RamCacheCLFUS::get(INK_MD5 *key, Ptr<IOBufferData> *ret_data, uint32_t auxkey1,
e->size = e->compressed_len;
check_accounting(this);
e->flag_bits.compressed = 0;
- e->data = data;
+ e->data = data;
}
(*ret_data) = data;
} else {
@@ -363,7 +363,7 @@ RamCacheCLFUS::victimize(RamCacheCLFUSEntry *e)
{
objects--;
DDebug("ram_cache", "put %X %d %d size %d VICTIMIZED", e->key.slice32(3), e->auxkey1, e->auxkey2, e->size);
- e->data = NULL;
+ e->data = NULL;
e->flag_bits.lru = 1;
lru[1].enqueue(e);
history++;
@@ -410,11 +410,11 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
ink_assert(vol != 0);
MUTEX_TAKE_LOCK(vol->mutex, thread);
if (!compressed) {
- compressed = lru[0].head;
+ compressed = lru[0].head;
ncompressed = 0;
}
float target = (cache_config_ram_cache_compress_percent / 100.0) * objects;
- int n = 0;
+ int n = 0;
char *b = 0, *bb = 0;
while (compressed && target > ncompressed) {
RamCacheCLFUSEntry *e = compressed;
@@ -425,8 +425,8 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
break;
{
e->compressed_len = e->size;
- uint32_t l = 0;
- int ctype = cache_config_ram_cache_compress;
+ uint32_t l = 0;
+ int ctype = cache_config_ram_cache_compress;
switch (ctype) {
default:
goto Lcontinue;
@@ -446,10 +446,10 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
}
// store transient data for lock release
Ptr<IOBufferData> edata = e->data;
- uint32_t elen = e->len;
- INK_MD5 key = e->key;
+ uint32_t elen = e->len;
+ INK_MD5 key = e->key;
MUTEX_UNTAKE_LOCK(vol->mutex, thread);
- b = (char *)ats_malloc(l);
+ b = (char *)ats_malloc(l);
bool failed = false;
switch (ctype) {
default:
@@ -465,7 +465,7 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
uLongf ll = l;
if ((Z_OK != compress((Bytef *)b, &ll, (Bytef *)edata->data(), elen)))
failed = true;
- l = (int)ll;
+ l = (int)ll;
break;
}
#endif
@@ -475,7 +475,7 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
if (LZMA_OK != lzma_easy_buffer_encode(LZMA_PRESET_DEFAULT, LZMA_CHECK_NONE, NULL, (uint8_t *)edata->data(), elen,
(uint8_t *)b, &pos, ll))
failed = true;
- l = (int)pos;
+ l = (int)pos;
break;
}
#endif
@@ -485,7 +485,7 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
{
if (failed)
goto Lfailed;
- uint32_t i = key.slice32(3) % nbuckets;
+ uint32_t i = key.slice32(3) % nbuckets;
RamCacheCLFUSEntry *ee = bucket[i].head;
while (ee) {
if (ee->key == key && ee->data == edata)
@@ -503,26 +503,26 @@ RamCacheCLFUS::compress_entries(EThread *thread, int do_at_most)
goto Lfailed;
if (l < e->len) {
e->flag_bits.compressed = cache_config_ram_cache_compress;
- bb = (char *)ats_malloc(l);
+ bb = (char *)ats_malloc(l);
memcpy(bb, b, l);
ats_free(b);
e->compressed_len = l;
- int64_t delta = ((int64_t)l) - (int64_t)e->size;
+ int64_t delta = ((int64_t)l) - (int64_t)e->size;
bytes += delta;
CACHE_SUM_DYN_STAT_THREAD(cache_ram_cache_bytes_stat, delta);
e->size = l;
} else {
ats_free(b);
e->flag_bits.compressed = 0;
- bb = (char *)ats_malloc(e->len);
+ bb = (char *)ats_malloc(e->len);
memcpy(bb, e->data->data(), e->len);
int64_t delta = ((int64_t)e->len) - (int64_t)e->size;
bytes += delta;
CACHE_SUM_DYN_STAT_THREAD(cache_ram_cache_bytes_stat, delta);
e->size = e->len;
- l = e->len;
+ l = e->len;
}
- e->data = new_xmalloc_IOBufferData(bb, l);
+ e->data = new_xmalloc_IOBufferData(bb, l);
e->data->_mem_type = DEFAULT_ALLOC;
check_accounting(this);
}
@@ -558,10 +558,10 @@ RamCacheCLFUS::put(INK_MD5 *key, IOBufferData *data, uint32_t len, bool copy, ui
{
if (!max_bytes)
return 0;
- uint32_t i = key->slice32(3) % nbuckets;
+ uint32_t i = key->slice32(3) % nbuckets;
RamCacheCLFUSEntry *e = bucket[i].head;
- uint32_t size = copy ? len : data->block_size();
- double victim_value = 0;
+ uint32_t size = copy ? len : data->block_size();
+ double victim_value = 0;
while (e) {
if (e->key == *key) {
if (e->auxkey1 == auxkey1 && e->auxkey2 == auxkey2)
@@ -588,12 +588,12 @@ RamCacheCLFUS::put(INK_MD5 *key, IOBufferData *data, uint32_t len, bool copy, ui
} else {
char *b = (char *)ats_malloc(len);
memcpy(b, data->data(), len);
- e->data = new_xmalloc_IOBufferData(b, len);
+ e->data = new_xmalloc_IOBufferData(b, len);
e->data->_mem_type = DEFAULT_ALLOC;
- e->size = size;
+ e->size = size;
}
check_accounting(this);
- e->flag_bits.copy = copy;
+ e->flag_bits.copy = copy;
e->flag_bits.compressed = 0;
DDebug("ram_cache", "put %X %d %d size %d HIT", key->slice32(3), auxkey1, auxkey2, e->size);
return 1;
@@ -607,15 +607,15 @@ RamCacheCLFUS::put(INK_MD5 *key, IOBufferData *data, uint32_t len, bool copy, ui
}
Que(RamCacheCLFUSEntry, lru_link) victims;
RamCacheCLFUSEntry *victim = 0;
- int requeue_limit = REQUEUE_LIMIT;
+ int requeue_limit = REQUEUE_LIMIT;
if (!lru[1].head) // initial fill
if (bytes + size <= max_bytes)
goto Linsert;
if (!e && cache_config_ram_cache_use_seen_filter) {
- uint32_t s = key->slice32(3) % bucket_sizes[ibuckets];
- uint16_t k = key->slice32(3) >> 16;
+ uint32_t s = key->slice32(3) % bucket_sizes[ibuckets];
+ uint16_t k = key->slice32(3) >> 16;
uint16_t kk = seen[s];
- seen[s] = k;
+ seen[s] = k;
if (history >= objects && kk != k) {
DDebug("ram_cache", "put %X %d %d size %d UNSEEN", key->slice32(3), auxkey1, auxkey2, size);
return 0;
@@ -673,11 +673,11 @@ Linsert:
if (e) {
history--; // move from history
} else {
- e = THREAD_ALLOC(ramCacheCLFUSEntryAllocator, this_ethread());
- e->key = *key;
+ e = THREAD_ALLOC(ramCacheCLFUSEntryAllocator, this_ethread());
+ e->key = *key;
e->auxkey1 = auxkey1;
e->auxkey2 = auxkey2;
- e->hits = 1;
+ e->hits = 1;
bucket[i].push(e);
if (objects > nbuckets) {
++ibuckets;
@@ -691,7 +691,7 @@ Linsert:
else {
char *b = (char *)ats_malloc(len);
memcpy(b, data->data(), len);
- e->data = new_xmalloc_IOBufferData(b, len);
+ e->data = new_xmalloc_IOBufferData(b, len);
e->data->_mem_type = DEFAULT_ALLOC;
}
e->flag_bits.copy = copy;
@@ -707,13 +707,13 @@ Linsert:
Lhistory:
requeue_victims(victims);
check_accounting(this);
- e = THREAD_ALLOC(ramCacheCLFUSEntryAllocator, this_ethread());
- e->key = *key;
+ e = THREAD_ALLOC(ramCacheCLFUSEntryAllocator, this_ethread());
+ e->key = *key;
e->auxkey1 = auxkey1;
e->auxkey2 = auxkey2;
- e->hits = 1;
- e->size = data->block_size();
- e->flags = 0;
+ e->hits = 1;
+ e->size = data->block_size();
+ e->flags = 0;
bucket[i].push(e);
e->flag_bits.lru = 1;
lru[1].enqueue(e);
@@ -727,7 +727,7 @@ RamCacheCLFUS::fixup(const INK_MD5 *key, uint32_t old_auxkey1, uint32_t old_auxk
{
if (!max_bytes)
return 0;
- uint32_t i = key->slice32(3) % nbuckets;
+ uint32_t i = key->slice32(3) % nbuckets;
RamCacheCLFUSEntry *e = bucket[i].head;
while (e) {
if (e->key == *key && e->auxkey1 == old_auxkey1 && e->auxkey2 == old_auxkey2) {
diff --git a/iocore/cache/RamCacheLRU.cc b/iocore/cache/RamCacheLRU.cc
index 4c7cd4b..2a44512 100644
--- a/iocore/cache/RamCacheLRU.cc
+++ b/iocore/cache/RamCacheLRU.cc
@@ -96,7 +96,7 @@ RamCacheLRU::resize_hashtable()
}
ats_free(bucket);
}
- bucket = new_bucket;
+ bucket = new_bucket;
nbuckets = anbuckets;
ats_free(seen);
int size = bucket_sizes[ibuckets] * sizeof(uint16_t);
@@ -109,7 +109,7 @@ RamCacheLRU::resize_hashtable()
void
RamCacheLRU::init(int64_t abytes, Vol *avol)
{
- vol = avol;
+ vol = avol;
max_bytes = abytes;
DDebug("ram_cache", "initializing ram_cache %" PRId64 " bytes", abytes);
if (!max_bytes)
@@ -122,7 +122,7 @@ RamCacheLRU::get(INK_MD5 *key, Ptr<IOBufferData> *ret_data, uint32_t auxkey1, ui
{
if (!max_bytes)
return 0;
- uint32_t i = key->slice32(3) % nbuckets;
+ uint32_t i = key->slice32(3) % nbuckets;
RamCacheLRUEntry *e = bucket[i].head;
while (e) {
if (e->key == *key && e->auxkey1 == auxkey1 && e->auxkey2 == auxkey2) {
@@ -144,7 +144,7 @@ RamCacheLRUEntry *
RamCacheLRU::remove(RamCacheLRUEntry *e)
{
RamCacheLRUEntry *ret = e->hash_link.next;
- uint32_t b = e->key.slice32(3) % nbuckets;
+ uint32_t b = e->key.slice32(3) % nbuckets;
bucket[b].remove(e);
lru.remove(e);
bytes -= ENTRY_OVERHEAD + e->data->block_size();
@@ -164,9 +164,9 @@ RamCacheLRU::put(INK_MD5 *key, IOBufferData *data, uint32_t len, bool, uint32_t
return 0;
uint32_t i = key->slice32(3) % nbuckets;
if (cache_config_ram_cache_use_seen_filter) {
- uint16_t k = key->slice32(3) >> 16;
+ uint16_t k = key->slice32(3) >> 16;
uint16_t kk = seen[i];
- seen[i] = k;
+ seen[i] = k;
if ((kk != (uint16_t)k)) {
DDebug("ram_cache", "put %X %d %d len %d UNSEEN", key->slice32(3), auxkey1, auxkey2, len);
return 0;
@@ -186,11 +186,11 @@ RamCacheLRU::put(INK_MD5 *key, IOBufferData *data, uint32_t len, bool, uint32_t
}
e = e->hash_link.next;
}
- e = THREAD_ALLOC(ramCacheLRUEntryAllocator, this_ethread());
- e->key = *key;
+ e = THREAD_ALLOC(ramCacheLRUEntryAllocator, this_ethread());
+ e->key = *key;
e->auxkey1 = auxkey1;
e->auxkey2 = auxkey2;
- e->data = data;
+ e->data = data;
bucket[i].push(e);
lru.enqueue(e);
bytes += ENTRY_OVERHEAD + data->block_size();
@@ -216,7 +216,7 @@ RamCacheLRU::fixup(const INK_MD5 *key, uint32_t old_auxkey1, uint32_t old_auxkey
{
if (!max_bytes)
return 0;
- uint32_t i = key->slice32(3) % nbuckets;
+ uint32_t i = key->slice32(3) % nbuckets;
RamCacheLRUEntry *e = bucket[i].head;
while (e) {
if (e->key == *key && e->auxkey1 == old_auxkey1 && e->auxkey2 == old_auxkey2) {
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 9164a7a..8217397 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -36,7 +36,7 @@
// Store
//
-char const Store::VOLUME_KEY[] = "volume";
+char const Store::VOLUME_KEY[] = "volume";
char const Store::HASH_BASE_STRING_KEY[] = "id";
static span_error_t
@@ -121,7 +121,7 @@ Store::sort()
Span **vec = (Span **)alloca(sizeof(Span *) * n_disks);
memset(vec, 0, sizeof(Span *) * n_disks);
for (unsigned i = 0; i < n_disks; i++) {
- vec[i] = disk[i];
+ vec[i] = disk[i];
disk[i] = NULL;
}
@@ -134,7 +134,7 @@ Store::sort()
for (unsigned d = 0; d < n; d++) {
if (sd->disk_id == disk[d]->disk_id) {
sd->link.next = disk[d];
- disk[d] = sd;
+ disk[d] = sd;
goto Ldone;
}
}
@@ -154,18 +154,18 @@ Store::sort()
if (next &&
((strcmp(sd->pathname, next->pathname) < 0) || (!strcmp(sd->pathname, next->pathname) && sd->offset > next->offset))) {
if (!prev) {
- disk[i] = next;
- sd->link.next = next->link.next;
+ disk[i] = next;
+ sd->link.next = next->link.next;
next->link.next = sd;
} else {
prev->link.next = next;
- sd->link.next = next->link.next;
+ sd->link.next = next->link.next;
next->link.next = sd;
}
goto Lagain;
}
prev = sd;
- sd = next;
+ sd = next;
}
}
@@ -295,7 +295,7 @@ Lagain:
if (p)
p->link.next = sd->link.next;
else
- disk[i] = sd->link.next;
+ disk[i] = sd->link.next;
sd->link.next = NULL;
delete sd;
goto Lagain;
@@ -309,9 +309,9 @@ Lagain:
const char *
Store::read_config()
{
- int n_dsstore = 0;
- int ln = 0;
- int i = 0;
+ int n_dsstore = 0;
+ int ln = 0;
+ int i = 0;
const char *err = NULL;
Span *sd = NULL, *cur = NULL;
Span *ns;
@@ -352,7 +352,7 @@ Store::read_config()
Debug("cache_init", "Store::read_config: \"%s\"", path);
++n_disks_in_config;
- int64_t size = -1;
+ int64_t size = -1;
int volume_num = -1;
char const *e;
while (0 != (e = tokens.getNext())) {
@@ -402,7 +402,7 @@ Store::read_config()
// new Span
{
Span *prev = cur;
- cur = ns;
+ cur = ns;
if (!sd)
sd = cur;
else
@@ -414,10 +414,10 @@ Store::read_config()
extend(n_dsstore);
cur = sd;
while (cur) {
- Span *next = cur->link.next;
+ Span *next = cur->link.next;
cur->link.next = NULL;
- disk[i++] = cur;
- cur = next;
+ disk[i++] = cur;
+ cur = next;
}
sd = 0; // these are all used.
sort();
@@ -510,12 +510,12 @@ Span::init(const char *path, int64_t size)
goto fail;
}
- this->disk_id[0] = 0;
- this->disk_id[1] = sbuf.st_rdev;
- this->file_pathname = true;
+ this->disk_id[0] = 0;
+ this->disk_id[1] = sbuf.st_rdev;
+ this->file_pathname = true;
this->hw_sector_size = geometry.blocksz;
- this->alignment = geometry.alignsz;
- this->blocks = geometry.totalsz / STORE_BLOCK_SIZE;
+ this->alignment = geometry.alignsz;
+ this->blocks = geometry.totalsz / STORE_BLOCK_SIZE;
break;
@@ -529,11 +529,11 @@ Span::init(const char *path, int64_t size)
// it the right size based on the "file_pathname" flag. That's something that we should clean up in the future.
this->file_pathname = false;
- this->disk_id[0] = sbuf.st_dev;
- this->disk_id[1] = sbuf.st_ino;
+ this->disk_id[0] = sbuf.st_dev;
+ this->disk_id[1] = sbuf.st_ino;
this->hw_sector_size = vbuf.f_bsize;
- this->alignment = 0;
- this->blocks = size / STORE_BLOCK_SIZE;
+ this->alignment = 0;
+ this->blocks = size / STORE_BLOCK_SIZE;
break;
case S_IFREG:
@@ -545,12 +545,12 @@ Span::init(const char *path, int64_t size)
}
}
- this->disk_id[0] = sbuf.st_dev;
- this->disk_id[1] = sbuf.st_ino;
- this->file_pathname = true;
+ this->disk_id[0] = sbuf.st_dev;
+ this->disk_id[1] = sbuf.st_ino;
+ this->file_pathname = true;
this->hw_sector_size = vbuf.f_bsize;
- this->alignment = 0;
- this->blocks = sbuf.st_size / STORE_BLOCK_SIZE;
+ this->alignment = 0;
+ this->blocks = sbuf.st_size / STORE_BLOCK_SIZE;
break;
@@ -598,17 +598,17 @@ static unsigned int
try_alloc(Store &target, Span *source, unsigned int start_blocks, bool one_only = false)
{
unsigned int blocks = start_blocks;
- Span *ds = NULL;
+ Span *ds = NULL;
while (source && blocks) {
if (source->blocks) {
unsigned int a; // allocated
if (blocks > source->blocks)
a = source->blocks;
else
- a = blocks;
+ a = blocks;
Span *d = new Span(*source);
- d->blocks = a;
+ d->blocks = a;
d->link.next = ds;
if (d->file_pathname)
@@ -681,7 +681,7 @@ Store::try_realloc(Store &s, Store &diff)
} else {
Span *x = new Span(*d);
// d will be the first vol
- d->blocks = sd->offset - d->offset;
+ d->blocks = sd->offset - d->offset;
d->link.next = x;
// x will be the last vol
x->offset = sd->offset + sd->blocks;
@@ -697,13 +697,13 @@ Store::try_realloc(Store &s, Store &diff)
prev->link.next = sd->link.next;
diff.extend(i + 1);
sd->link.next = diff.disk[i];
- diff.disk[i] = sd;
- sd = prev ? prev->link.next : s.disk[i];
+ diff.disk[i] = sd;
+ sd = prev ? prev->link.next : s.disk[i];
continue;
}
Lfound:;
prev = sd;
- sd = sd->link.next;
+ sd = sd->link.next;
}
}
normalize();
@@ -771,7 +771,7 @@ Store::write(int fd, const char *name) const
return (-1);
for (unsigned i = 0; i < n_disks; i++) {
- int n = 0;
+ int n = 0;
Span *sd = NULL;
for (sd = disk[i]; sd; sd = sd->link.next) {
n++;
@@ -877,7 +877,7 @@ Store::read(int fd, char *aname)
Span *sd = NULL;
while (n--) {
Span *last = sd;
- sd = new Span;
+ sd = new Span;
if (!last)
disk[i] = sd;
@@ -909,7 +909,7 @@ void
Store::dup(Store &s)
{
s.n_disks = n_disks;
- s.disk = (Span **)ats_malloc(sizeof(Span *) * n_disks);
+ s.disk = (Span **)ats_malloc(sizeof(Span *) * n_disks);
for (unsigned i = 0; i < n_disks; i++) {
s.disk[i] = disk[i]->dup();
}
diff --git a/iocore/cluster/ClusterAPI.cc b/iocore/cluster/ClusterAPI.cc
index 599bd9f..97e1467 100644
--- a/iocore/cluster/ClusterAPI.cc
+++ b/iocore/cluster/ClusterAPI.cc
@@ -125,7 +125,7 @@ MachineStatusSM::MachineStatusSMEvent(Event * /* e ATS_UNUSED */, void * /* d AT
Debug("cluster_api", "callout: n %d ([%u.%u.%u.%u], %d)", n, DOT_SEPARATED(_node_handle), _node_status);
} else {
_restart = 1;
- _next_n = n;
+ _next_n = n;
return EVENT_CONT;
}
}
@@ -161,7 +161,7 @@ MachineStatusSM::MachineStatusSMEvent(Event * /* e ATS_UNUSED */, void * /* d AT
} else {
_restart = 1;
- _next_n = n;
+ _next_n = n;
return EVENT_CONT;
}
}
@@ -178,7 +178,7 @@ MachineStatusSM::MachineStatusSMEvent(Event * /* e ATS_UNUSED */, void * /* d AT
Debug("cluster_api", "directed callout: n %d ([%u.%u.%u.%u], %d)", n, DOT_SEPARATED(_node_handle), _node_status);
} else {
_restart = 1;
- _next_n = n;
+ _next_n = n;
return EVENT_CONT;
}
}
@@ -220,7 +220,7 @@ ClusterAPIPeriodicSM::GetNextSM()
msmp = (MachineStatusSM *)ink_atomiclist_popall(&status_callout_atomic_q);
if (msmp) {
while (msmp) {
- msmp_next = (MachineStatusSM *)msmp->link.next;
+ msmp_next = (MachineStatusSM *)msmp->link.next;
msmp->link.next = 0;
status_callout_q.push(msmp);
msmp = msmp_next;
@@ -290,7 +290,7 @@ TSAddClusterStatusFunction(TSClusterStatusFunction Status_Function, TSMutex m, T
for (n = 0; n < MAX_CLUSTERSTATUS_CALLOUTS; ++n) {
if (!status_callouts[n].func) {
status_callouts[n].mutex = (ProxyMutex *)m;
- status_callouts[n].func = Status_Function;
+ status_callouts[n].func = Status_Function;
MUTEX_UNTAKE_LOCK(ClusterAPI_mutex, e);
*h = INDEX_TO_CLUSTER_STATUS_HANDLE(n);
@@ -312,7 +312,7 @@ TSAddClusterStatusFunction(TSClusterStatusFunction Status_Function, TSMutex m, T
int
TSDeleteClusterStatusFunction(TSClusterStatusHandle_t *h)
{
- int n = CLUSTER_STATUS_HANDLE_TO_INDEX(*h);
+ int n = CLUSTER_STATUS_HANDLE_TO_INDEX(*h);
EThread *e = this_ethread();
ink_release_assert((n >= 0) && (n < MAX_CLUSTERSTATUS_CALLOUTS));
@@ -320,7 +320,7 @@ TSDeleteClusterStatusFunction(TSClusterStatusHandle_t *h)
MUTEX_TAKE_LOCK(ClusterAPI_mutex, e);
status_callouts[n].mutex = 0;
- status_callouts[n].func = (TSClusterStatusFunction)0;
+ status_callouts[n].func = (TSClusterStatusFunction)0;
status_callouts[n].state = NE_STATE_FREE;
MUTEX_UNTAKE_LOCK(ClusterAPI_mutex, e);
@@ -416,7 +416,7 @@ int
TSAddClusterRPCFunction(TSClusterRPCKey_t k, TSClusterRPCFunction func, TSClusterRPCHandle_t *h)
{
RPCHandle_t handle;
- int n = RPC_FUNCTION_KEY_TO_CLUSTER_NUMBER(k);
+ int n = RPC_FUNCTION_KEY_TO_CLUSTER_NUMBER(k);
EThread *e = this_ethread();
ink_release_assert(func);
@@ -424,7 +424,7 @@ TSAddClusterRPCFunction(TSClusterRPCKey_t k, TSClusterRPCFunction func, TSCluste
Debug("cluster_api", "TSAddClusterRPCFunction: key %d func %p", k, func);
handle.u.internal.cluster_function = n;
- handle.u.internal.magic = RPC_HANDLE_MAGIC;
+ handle.u.internal.magic = RPC_HANDLE_MAGIC;
MUTEX_TAKE_LOCK(ClusterAPI_mutex, e);
if (n < API_END_CLUSTER_FUNCTION)
@@ -445,7 +445,7 @@ int
TSDeleteClusterRPCFunction(TSClusterRPCHandle_t *rpch)
{
RPCHandle_t *h = (RPCHandle_t *)rpch;
- EThread *e = this_ethread();
+ EThread *e = this_ethread();
ink_release_assert(((h->u.internal.cluster_function >= API_STARECT_CLUSTER_FUNCTION) &&
(h->u.internal.cluster_function <= API_END_CLUSTER_FUNCTION)));
@@ -466,14 +466,14 @@ default_api_ClusterFunction(ClusterHandler *ch, void *data, int len)
Debug("cluster_api", "default_api_ClusterFunction: [%u.%u.%u.%u] data %p len %d", DOT_SEPARATED(ch->machine->ip), data, len);
TSClusterRPCMsg_t *msg = (TSClusterRPCMsg_t *)data;
- RPCHandle_t *rpch = (RPCHandle_t *)&msg->m_handle;
- int cluster_function = rpch->u.internal.cluster_function;
+ RPCHandle_t *rpch = (RPCHandle_t *)&msg->m_handle;
+ int cluster_function = rpch->u.internal.cluster_function;
ink_release_assert((size_t)len >= sizeof(TSClusterRPCMsg_t));
ink_release_assert(((cluster_function >= API_STARECT_CLUSTER_FUNCTION) && (cluster_function <= API_END_CLUSTER_FUNCTION)));
if (cluster_function < API_END_CLUSTER_FUNCTION && RPC_Functions[cluster_function]) {
- int msg_data_len = len - SIZEOF_RPC_MSG_LESS_DATA;
+ int msg_data_len = len - SIZEOF_RPC_MSG_LESS_DATA;
TSNodeHandle_t nh = IP_TO_NODE_HANDLE(ch->machine->ip);
(*RPC_Functions[cluster_function])(&nh, msg, msg_data_len);
} else {
@@ -513,7 +513,7 @@ TSAllocClusterRPCMsg(TSClusterRPCHandle_t *h, int data_size)
c->alloc_data();
*((OutgoingControl **)c->data) = c;
- rpcm = (TSClusterRPCMsg_t *)(c->data + sizeof(OutgoingControl *));
+ rpcm = (TSClusterRPCMsg_t *)(c->data + sizeof(OutgoingControl *));
rpcm->m_handle = *h;
/*
@@ -532,9 +532,9 @@ int
TSSendClusterRPC(TSNodeHandle_t *nh, TSClusterRPCMsg_t *msg)
{
struct in_addr ipaddr = NODE_HANDLE_TO_IP(*nh);
- RPCHandle_t *rpch = (RPCHandle_t *)&msg->m_handle;
+ RPCHandle_t *rpch = (RPCHandle_t *)&msg->m_handle;
- OutgoingControl *c = *((OutgoingControl **)((char *)msg - sizeof(OutgoingControl *)));
+ OutgoingControl *c = *((OutgoingControl **)((char *)msg - sizeof(OutgoingControl *)));
ClusterConfiguration *cc = this_cluster()->current_configuration();
ClusterMachine *m;
diff --git a/iocore/cluster/ClusterCache.cc b/iocore/cluster/ClusterCache.cc
index bf3b659..41346cc 100644
--- a/iocore/cluster/ClusterCache.cc
+++ b/iocore/cluster/ClusterCache.cc
@@ -102,26 +102,26 @@ struct traceEntry recvTraceTable[MAX_TENTRIES];
struct traceEntry sndTraceTable[MAX_TENTRIES];
static recvTraceTable_index = 0;
-static sndTraceTable_index = 0;
+static sndTraceTable_index = 0;
void
log_cache_op_msg(unsigned int seqno, int op, char *type)
{
- int t = ink_atomic_increment(&recvTraceTable_index, 1);
- int n = recvTraceTable_index % MAX_TENTRIES;
+ int t = ink_atomic_increment(&recvTraceTable_index, 1);
+ int n = recvTraceTable_index % MAX_TENTRIES;
recvTraceTable[n].seqno = seqno;
- recvTraceTable[n].op = op;
- recvTraceTable[n].type = type;
+ recvTraceTable[n].op = op;
+ recvTraceTable[n].type = type;
}
void
log_cache_op_sndmsg(unsigned int seqno, int op, char *type)
{
- int t = ink_atomic_increment(&sndTraceTable_index, 1);
- int n = sndTraceTable_index % MAX_TENTRIES;
+ int t = ink_atomic_increment(&sndTraceTable_index, 1);
+ int n = sndTraceTable_index % MAX_TENTRIES;
sndTraceTable[n].seqno = seqno;
- sndTraceTable[n].op = op;
- sndTraceTable[n].type = type;
+ sndTraceTable[n].op = op;
+ sndTraceTable[n].type = type;
}
void
@@ -182,7 +182,7 @@ public:
enum {
MAX_TABLE_ENTRIES = 256, // must be power of 2
- SCAN_INTERVAL = 10 // seconds
+ SCAN_INTERVAL = 10 // seconds
};
Queue<Entry> hash_table[MAX_TABLE_ENTRIES];
Ptr<ProxyMutex> hash_lock[MAX_TABLE_ENTRIES];
@@ -222,7 +222,7 @@ ClusterVConnectionCache::init()
for (n = 0; n < MAX_TABLE_ENTRIES; ++n) {
// Setup up periodic purge events on each hash list
- eh = new ClusterVConnectionCacheEvent(this, n);
+ eh = new ClusterVConnectionCacheEvent(this, n);
hash_event[n] = eventProcessor.schedule_in(eh, HRTIME_SECONDS(ClusterVConnectionCache::SCAN_INTERVAL), ET_CACHE_CONT_SM);
}
}
@@ -242,7 +242,7 @@ ClusterVConnectionCache::insert(INK_MD5 *key, ClusterVConnection *vc)
{
int index = MD5ToIndex(key);
Entry *e;
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
MUTEX_TRY_LOCK(lock, hash_lock[index], thread);
@@ -253,9 +253,9 @@ ClusterVConnectionCache::insert(INK_MD5 *key, ClusterVConnection *vc)
} else {
// Add entry to list
- e = ClusterVCCacheEntryAlloc.alloc();
+ e = ClusterVCCacheEntryAlloc.alloc();
e->key = *key;
- e->vc = vc;
+ e->vc = vc;
hash_table[index].enqueue(e);
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_VC_CACHE_INSERTS_STAT);
}
@@ -268,8 +268,8 @@ ClusterVConnectionCache::lookup(INK_MD5 *key)
int index = MD5ToIndex(key);
Entry *e;
ClusterVConnection *vc = 0;
- EThread *thread = this_ethread();
- ProxyMutex *mutex = thread->mutex;
+ EThread *thread = this_ethread();
+ ProxyMutex *mutex = thread->mutex;
MUTEX_TRY_LOCK(lock, hash_lock[index], thread);
if (!lock.is_locked()) {
@@ -325,7 +325,7 @@ ClusterVConnectionCacheEvent::eventHandler(int /* event ATS_UNUSED */, Event *e)
} else {
entry->mark_for_delete = true;
- entry = entry->link.next;
+ entry = entry->link.next;
}
}
@@ -345,7 +345,7 @@ int
CacheContinuation::init()
{
int n;
- for (n = 0; n < REMOTE_CONNECT_HASH; ++n)
+ for (n = 0; n < REMOTE_CONNECT_HASH; ++n)
remoteCacheContQueueMutex[n] = new_ProxyMutex();
GlobalOpenWriteVCcache = new ClusterVConnectionCache;
@@ -362,9 +362,9 @@ CacheContinuation::do_op(Continuation *c, ClusterMachine *mp, void *args, int us
MIOBuffer *b)
{
CacheContinuation *cc = 0;
- Action *act = 0;
- char *msg = 0;
- ClusterHandler *ch = mp->pop_ClusterHandler();
+ Action *act = 0;
+ char *msg = 0;
+ ClusterHandler *ch = mp->pop_ClusterHandler();
/////////////////////////////////////////////////////////////////////
// Unconditionally map open read buffer interfaces to open read.
@@ -386,22 +386,22 @@ CacheContinuation::do_op(Continuation *c, ClusterMachine *mp, void *args, int us
goto no_send_exit;
if (c) {
- cc = cacheContAllocator_alloc();
- cc->ch = ch;
- cc->target_machine = mp;
- cc->request_opcode = opcode;
- cc->mutex = c->mutex;
- cc->action = c;
+ cc = cacheContAllocator_alloc();
+ cc->ch = ch;
+ cc->target_machine = mp;
+ cc->request_opcode = opcode;
+ cc->mutex = c->mutex;
+ cc->action = c;
cc->action.cancelled = false;
- cc->start_time = Thread::get_hrtime();
- cc->from = mp;
- cc->result = op_failure(opcode);
+ cc->start_time = Thread::get_hrtime();
+ cc->from = mp;
+ cc->result = op_failure(opcode);
SET_CONTINUATION_HANDLER(cc, (CacheContHandler)&CacheContinuation::remoteOpEvent);
act = &cc->action;
// set up sequence number so we can find this continuation
- cc->target_ip = mp->ip;
+ cc->target_ip = mp->ip;
cc->seq_number = new_cache_sequence_number();
// establish timeout for cache op
@@ -443,23 +443,23 @@ CacheContinuation::do_op(Continuation *c, ClusterMachine *mp, void *args, int us
//////////////////////
if (!data) {
data_len = op_to_sizeof_fixedlen_msg(opcode);
- data = (char *)ALLOCA_DOUBLE(data_len);
+ data = (char *)ALLOCA_DOUBLE(data_len);
}
- msg = (char *)data;
+ msg = (char *)data;
CacheOpMsg_short *m = (CacheOpMsg_short *)msg;
m->init();
- m->opcode = opcode;
- m->cfl_flags = ((CacheOpArgs_General *)args)->cfl_flags;
- m->md5 = *((CacheOpArgs_General *)args)->url_md5;
- cc->url_md5 = m->md5;
+ m->opcode = opcode;
+ m->cfl_flags = ((CacheOpArgs_General *)args)->cfl_flags;
+ m->md5 = *((CacheOpArgs_General *)args)->url_md5;
+ cc->url_md5 = m->md5;
m->seq_number = (c ? cc->seq_number : CACHE_NO_RESPONSE);
- m->frag_type = ((CacheOpArgs_General *)args)->frag_type;
+ m->frag_type = ((CacheOpArgs_General *)args)->frag_type;
if (opcode == CACHE_OPEN_WRITE) {
m->nbytes = nbytes;
- m->data = (uint32_t)((CacheOpArgs_General *)args)->pin_in_cache;
+ m->data = (uint32_t)((CacheOpArgs_General *)args)->pin_in_cache;
} else {
m->nbytes = 0;
- m->data = 0;
+ m->data = 0;
}
if (opcode == CACHE_OPEN_READ) {
@@ -504,17 +504,17 @@ CacheContinuation::do_op(Continuation *c, ClusterMachine *mp, void *args, int us
//////////////////////
// Use long format //
//////////////////////
- msg = data;
+ msg = data;
CacheOpMsg_long *m = (CacheOpMsg_long *)msg;
m->init();
- m->opcode = opcode;
- m->cfl_flags = ((CacheOpArgs_General *)args)->cfl_flags;
- m->url_md5 = *((CacheOpArgs_General *)args)->url_md5;
- cc->url_md5 = m->url_md5;
+ m->opcode = opcode;
+ m->cfl_flags = ((CacheOpArgs_General *)args)->cfl_flags;
+ m->url_md5 = *((CacheOpArgs_General *)args)->url_md5;
+ cc->url_md5 = m->url_md5;
m->seq_number = (c ? cc->seq_number : CACHE_NO_RESPONSE);
- m->nbytes = nbytes;
- m->data = (uint32_t)((CacheOpArgs_General *)args)->pin_in_cache;
- m->frag_type = (uint32_t)((CacheOpArgs_General *)args)->frag_type;
+ m->nbytes = nbytes;
+ m->data = (uint32_t)((CacheOpArgs_General *)args)->pin_in_cache;
+ m->frag_type = (uint32_t)((CacheOpArgs_General *)args)->frag_type;
if (opcode == CACHE_OPEN_READ_LONG) {
//
@@ -556,16 +556,16 @@ CacheContinuation::do_op(Continuation *c, ClusterMachine *mp, void *args, int us
//////////////////////
// Use short format //
//////////////////////
- msg = data;
+ msg = data;
CacheOpMsg_short *m = (CacheOpMsg_short *)msg;
m->init();
- m->opcode = opcode;
+ m->opcode = opcode;
m->frag_type = ((CacheOpArgs_Deref *)args)->frag_type;
m->cfl_flags = ((CacheOpArgs_Deref *)args)->cfl_flags;
if (opcode == CACHE_DEREF)
m->md5 = *((CacheOpArgs_Deref *)args)->md5;
else
- m->md5 = *((CacheOpArgs_General *)args)->url_md5;
+ m->md5 = *((CacheOpArgs_General *)args)->url_md5;
m->seq_number = (c ? cc->seq_number : CACHE_NO_RESPONSE);
break;
}
@@ -573,15 +573,15 @@ CacheContinuation::do_op(Continuation *c, ClusterMachine *mp, void *args, int us
////////////////////////
// Use short_2 format //
////////////////////////
- msg = data;
+ msg = data;
CacheOpMsg_short_2 *m = (CacheOpMsg_short_2 *)msg;
m->init();
- m->opcode = opcode;
- m->cfl_flags = ((CacheOpArgs_Link *)args)->cfl_flags;
- m->md5_1 = *((CacheOpArgs_Link *)args)->from;
- m->md5_2 = *((CacheOpArgs_Link *)args)->to;
+ m->opcode = opcode;
+ m->cfl_flags = ((CacheOpArgs_Link *)args)->cfl_flags;
+ m->md5_1 = *((CacheOpArgs_Link *)args)->from;
+ m->md5_2 = *((CacheOpArgs_Link *)args)->to;
m->seq_number = (c ? cc->seq_number : CACHE_NO_RESPONSE);
- m->frag_type = ((CacheOpArgs_Link *)args)->frag_type;
+ m->frag_type = ((CacheOpArgs_Link *)args)->frag_type;
break;
}
default:
@@ -605,7 +605,7 @@ no_send_exit:
int
CacheContinuation::setup_local_vc(char *data, int data_len, CacheContinuation *cc, ClusterMachine *mp, Action **act)
{
- bool read_op = op_is_read(cc->request_opcode);
+ bool read_op = op_is_read(cc->request_opcode);
bool short_msg = op_is_shortform(cc->request_opcode);
// Alloc buffer, copy message and attach to continuation
@@ -656,18 +656,18 @@ CacheContinuation::setup_local_vc(char *data, int data_len, CacheContinuation *c
cc->write_cluster_vc = vc;
}
cc->cluster_vc_channel = vc->channel;
- vc->current_cont = cc;
+ vc->current_cont = cc;
if (short_msg) {
CacheOpMsg_short *ms = (CacheOpMsg_short *)data;
- ms->channel = vc->channel;
- ms->token = cc->open_local_token;
+ ms->channel = vc->channel;
+ ms->token = cc->open_local_token;
Debug("cache_proto", "0open_local-s (%s) success, seqno=%d chan=%d token=%d,%d VC=%p", (read_op ? "R" : "W"), ms->seq_number,
vc->channel, ms->token.ip_created, ms->token.sequence_number, vc);
} else {
CacheOpMsg_long *ml = (CacheOpMsg_long *)data;
- ml->channel = vc->channel;
- ml->token = cc->open_local_token;
+ ml->channel = vc->channel;
+ ml->token = cc->open_local_token;
Debug("cache_proto", "1open_local-l (%s) success, seqno=%d chan=%d token=%d,%d VC=%p", (read_op ? "R" : "W"), ml->seq_number,
vc->channel, ml->token.ip_created, ml->token.sequence_number, vc);
}
@@ -719,10 +719,10 @@ CacheContinuation::lookupOpenWriteVC()
CacheOpReplyMsg msg;
int msglen;
- msglen = CacheOpReplyMsg::sizeof_fixedlen_msg();
- msg.result = CACHE_EVENT_OPEN_WRITE;
+ msglen = CacheOpReplyMsg::sizeof_fixedlen_msg();
+ msg.result = CACHE_EVENT_OPEN_WRITE;
msg.seq_number = seq_number;
- msg.token = vc->token;
+ msg.token = vc->token;
cache_op_result_ClusterFunction(ch, (void *)&msg, msglen);
@@ -788,10 +788,10 @@ CacheContinuation::localVCsetupEvent(int event, ClusterVConnection *vc)
ink_assert(magicno == (int)MagicNo);
ink_assert(getMsgBuffer());
bool short_msg = op_is_shortform(request_opcode);
- bool read_op = op_is_read(request_opcode);
+ bool read_op = op_is_read(request_opcode);
if (event == EVENT_INTERVAL) {
- Event *e = (Event *)vc;
+ Event *e = (Event *)vc;
unsigned int hash = FOLDHASH(target_ip, seq_number);
MUTEX_TRY_LOCK(queuelock, remoteCacheContQueueMutex[hash], e->ethread);
@@ -841,20 +841,20 @@ CacheContinuation::localVCsetupEvent(int event, ClusterVConnection *vc)
write_cluster_vc = vc;
}
cluster_vc_channel = vc->channel;
- vc->current_cont = this;
+ vc->current_cont = this;
if (short_msg) {
CacheOpMsg_short *ms = (CacheOpMsg_short *)getMsgBuffer();
- ms->channel = vc->channel;
- ms->token = open_local_token;
+ ms->channel = vc->channel;
+ ms->token = open_local_token;
Debug("cache_proto", "2open_local-s (%s) success, seqno=%d chan=%d token=%d,%d VC=%p", (read_op ? "R" : "W"), ms->seq_number,
vc->channel, ms->token.ip_created, ms->token.sequence_number, vc);
} else {
CacheOpMsg_long *ml = (CacheOpMsg_long *)getMsgBuffer();
- ml->channel = vc->channel;
- ml->token = open_local_token;
+ ml->channel = vc->channel;
+ ml->token = open_local_token;
Debug("cache_proto", "3open_local-l (%s) success, seqno=%d chan=%d token=%d,%d VC=%p", (read_op ? "R" : "W"), ml->seq_number,
vc->channel, ml->token.ip_created, ml->token.sequence_number, vc);
@@ -888,7 +888,7 @@ CacheContinuation::localVCsetupEvent(int event, ClusterVConnection *vc)
if (event == CLUSTER_EVENT_OPEN) {
vc->pending_remote_fill = 0;
- vc->remote_closed = 1; // avoid remote close msg
+ vc->remote_closed = 1; // avoid remote close msg
vc->do_io(VIO::CLOSE);
}
send_failure_callback = 0; // already sent.
@@ -906,8 +906,8 @@ CacheContinuation::localVCsetupEvent(int event, ClusterVConnection *vc)
// removing ourselves from the active list.
//
this->use_deferred_callback = true;
- this->result = (read_op ? CACHE_EVENT_OPEN_READ_FAILED : CACHE_EVENT_OPEN_WRITE_FAILED);
- this->result_error = 0;
+ this->result = (read_op ? CACHE_EVENT_OPEN_READ_FAILED : CACHE_EVENT_OPEN_WRITE_FAILED);
+ this->result_error = 0;
remove_and_delete(0, (Event *)0);
} else {
@@ -958,19 +958,19 @@ unmarshal_CacheOpMsg_short_2(void *data, int NeedByteSwap)
inline void
init_from_long(CacheContinuation *cont, CacheOpMsg_long *msg, ClusterMachine *m)
{
- cont->no_reply_message = (msg->seq_number == CACHE_NO_RESPONSE);
- cont->seq_number = msg->seq_number;
- cont->cfl_flags = msg->cfl_flags;
- cont->from = m;
- cont->url_md5 = msg->url_md5;
+ cont->no_reply_message = (msg->seq_number == CACHE_NO_RESPONSE);
+ cont->seq_number = msg->seq_number;
+ cont->cfl_flags = msg->cfl_flags;
+ cont->from = m;
+ cont->url_md5 = msg->url_md5;
cont->cluster_vc_channel = msg->channel;
- cont->frag_type = (CacheFragType)msg->frag_type;
+ cont->frag_type = (CacheFragType)msg->frag_type;
if ((cont->request_opcode == CACHE_OPEN_WRITE_LONG) || (cont->request_opcode == CACHE_OPEN_READ_LONG)) {
cont->pin_in_cache = (time_t)msg->data;
} else {
cont->pin_in_cache = 0;
}
- cont->token = msg->token;
+ cont->token = msg->token;
cont->nbytes = (((int)msg->nbytes < 0) ? 0 : msg->nbytes);
if (cont->request_opcode == CACHE_OPEN_READ_LONG) {
@@ -984,15 +984,15 @@ init_from_long(CacheContinuation *cont, CacheOpMsg_long *msg, ClusterMachine *m)
inline void
init_from_short(CacheContinuation *cont, CacheOpMsg_short *msg, ClusterMachine *m)
{
- cont->no_reply_message = (msg->seq_number == CACHE_NO_RESPONSE);
- cont->seq_number = msg->seq_number;
- cont->cfl_flags = msg->cfl_flags;
- cont->from = m;
- cont->url_md5 = msg->md5;
+ cont->no_reply_message = (msg->seq_number == CACHE_NO_RESPONSE);
+ cont->seq_number = msg->seq_number;
+ cont->cfl_flags = msg->cfl_flags;
+ cont->from = m;
+ cont->url_md5 = msg->md5;
cont->cluster_vc_channel = msg->channel;
- cont->token = msg->token;
- cont->nbytes = (((int)msg->nbytes < 0) ? 0 : msg->nbytes);
- cont->frag_type = (CacheFragType)msg->frag_type;
+ cont->token = msg->token;
+ cont->nbytes = (((int)msg->nbytes < 0) ? 0 : msg->nbytes);
+ cont->frag_type = (CacheFragType)msg->frag_type;
if (cont->request_opcode == CACHE_OPEN_WRITE) {
cont->pin_in_cache = (time_t)msg->data;
@@ -1012,17 +1012,17 @@ inline void
init_from_short_2(CacheContinuation *cont, CacheOpMsg_short_2 *msg, ClusterMachine *m)
{
cont->no_reply_message = (msg->seq_number == CACHE_NO_RESPONSE);
- cont->seq_number = msg->seq_number;
- cont->cfl_flags = msg->cfl_flags;
- cont->from = m;
- cont->url_md5 = msg->md5_1;
- cont->frag_type = (CacheFragType)msg->frag_type;
+ cont->seq_number = msg->seq_number;
+ cont->cfl_flags = msg->cfl_flags;
+ cont->from = m;
+ cont->url_md5 = msg->md5_1;
+ cont->frag_type = (CacheFragType)msg->frag_type;
}
void
cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
////////////////////////////////////////////////////////
// Note: we are running on the ET_CLUSTER thread
@@ -1042,12 +1042,12 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
// If necessary, create a continuation to reflect the response back
CacheContinuation *c = CacheContinuation::cacheContAllocator_alloc();
- c->mutex = new_ProxyMutex();
+ c->mutex = new_ProxyMutex();
MUTEX_TRY_LOCK(lock, c->mutex, this_ethread());
c->request_opcode = opcode;
c->token.clear();
c->start_time = Thread::get_hrtime();
- c->ch = ch;
+ c->ch = ch;
SET_CONTINUATION_HANDLER(c, (CacheContHandler)&CacheContinuation::replyOpEvent);
switch (opcode) {
@@ -1095,12 +1095,12 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheKey key(msg->md5);
char *hostname = NULL;
- int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
+ int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
if (host_len) {
hostname = (char *)msg->moi.byte;
}
Cache *call_cache = caches[c->frag_type];
- c->cache_action = call_cache->open_read(c, &key, c->frag_type, hostname, host_len);
+ c->cache_action = call_cache->open_read(c, &key, c->frag_type, hostname, host_len);
break;
}
case CACHE_OPEN_READ_LONG: {
@@ -1109,7 +1109,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
c->allocMsgBuffer();
memcpy(c->getMsgBuffer(), (char *)data, len);
- int flen = CacheOpMsg_long::sizeof_fixedlen_msg();
+ int flen = CacheOpMsg_long::sizeof_fixedlen_msg();
CacheOpMsg_long *msg = unmarshal_CacheOpMsg_long(c->getMsgBuffer(), mh->NeedByteSwap());
init_from_long(c, msg, ch->machine);
Debug("cache_msg", "cache_op-l op=%d seqno=%d data=%p len=%d machine=%p", opcode, c->seq_number, data, len, ch->machine);
@@ -1142,7 +1142,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
msg->token.ip_created, msg->token.sequence_number);
const char *p = (const char *)msg + flen;
- int moi_len = len - flen;
+ int moi_len = len - flen;
int res;
ink_assert(moi_len > 0);
@@ -1158,7 +1158,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
ink_assert(moi_len > 0);
// Unmarshal CacheLookupHttpConfig
c->ic_params = new (CacheLookupHttpConfigAllocator.alloc()) CacheLookupHttpConfig();
- res = c->ic_params->unmarshal(&c->ic_arena, (const char *)p, moi_len);
+ res = c->ic_params->unmarshal(&c->ic_arena, (const char *)p, moi_len);
ink_assert(res > 0);
moi_len -= res;
@@ -1167,7 +1167,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheKey key(msg->url_md5);
char *hostname = NULL;
- int host_len = 0;
+ int host_len = 0;
if (moi_len) {
hostname = (char *)p;
@@ -1176,14 +1176,14 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
// Save hostname and attach it to the continuation since we may
// need it if we convert this to an open_write.
- c->ic_hostname = new_IOBufferData(iobuffer_size_to_index(host_len));
+ c->ic_hostname = new_IOBufferData(iobuffer_size_to_index(host_len));
c->ic_hostname_len = host_len;
memcpy(c->ic_hostname->data(), hostname, host_len);
}
Cache *call_cache = caches[c->frag_type];
- Action *a = call_cache->open_read(c, &key, &c->ic_request, c->ic_params, c->frag_type, hostname, host_len);
+ Action *a = call_cache->open_read(c, &key, &c->ic_request, c->ic_params, c->frag_type, hostname, host_len);
// Get rid of purify warnings since 'c' can be freed by open_read.
if (a != ACTION_RESULT_DONE) {
c->cache_action = a;
@@ -1220,7 +1220,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheKey key(msg->md5);
char *hostname = NULL;
- int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
+ int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
if (host_len) {
hostname = (char *)msg->moi.byte;
}
@@ -1239,7 +1239,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
c->allocMsgBuffer();
memcpy(c->getMsgBuffer(), (char *)data, len);
- int flen = CacheOpMsg_long::sizeof_fixedlen_msg();
+ int flen = CacheOpMsg_long::sizeof_fixedlen_msg();
CacheOpMsg_long *msg = unmarshal_CacheOpMsg_long(c->getMsgBuffer(), mh->NeedByteSwap());
init_from_long(c, msg, ch->machine);
Debug("cache_msg", "cache_op-l op=%d seqno=%d data=%p len=%d machine=%p", opcode, c->seq_number, data, len, ch->machine);
@@ -1267,9 +1267,9 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
ink_release_assert(c->read_cluster_vc != CLUSTER_DELAYED_OPEN);
CacheHTTPInfo *ci = 0;
- const char *p = (const char *)msg + flen;
- int res = 0;
- int moi_len = len - flen;
+ const char *p = (const char *)msg + flen;
+ int res = 0;
+ int moi_len = len - flen;
if (moi_len && c->cfl_flags & CFL_LOPENWRITE_HAVE_OLDINFO) {
// Unmarshal old CacheHTTPInfo
@@ -1294,7 +1294,7 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
}
Cache *call_cache = caches[c->frag_type];
- Action *a = call_cache->open_write(c, &key, ci, c->pin_in_cache, NULL, c->frag_type, hostname, moi_len);
+ Action *a = call_cache->open_write(c, &key, ci, c->pin_in_cache, NULL, c->frag_type, hostname, moi_len);
if (a != ACTION_RESULT_DONE) {
c->cache_action = a;
}
@@ -1310,13 +1310,13 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheKey key(msg->md5);
char *hostname = NULL;
- int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
+ int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
if (host_len) {
hostname = (char *)msg->moi.byte;
}
Cache *call_cache = caches[c->frag_type];
- Action *a = call_cache->remove(c, &key, c->frag_type, hostname, host_len);
+ Action *a = call_cache->remove(c, &key, c->frag_type, hostname, host_len);
if (a != ACTION_RESULT_DONE) {
c->cache_action = a;
}
@@ -1334,13 +1334,13 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheKey key2(msg->md5_2);
char *hostname = NULL;
- int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
+ int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
if (host_len) {
hostname = (char *)msg->moi.byte;
}
Cache *call_cache = caches[c->frag_type];
- Action *a = call_cache->link(c, &key1, &key2, c->frag_type, hostname, host_len);
+ Action *a = call_cache->link(c, &key1, &key2, c->frag_type, hostname, host_len);
if (a != ACTION_RESULT_DONE) {
c->cache_action = a;
}
@@ -1357,13 +1357,13 @@ cache_op_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheKey key(msg->md5);
char *hostname = NULL;
- int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
+ int host_len = len - op_to_sizeof_fixedlen_msg(opcode);
if (host_len) {
hostname = (char *)msg->moi.byte;
}
Cache *call_cache = caches[c->frag_type];
- Action *a = call_cache->deref(c, &key, c->frag_type, hostname, host_len);
+ Action *a = call_cache->deref(c, &key, c->frag_type, hostname, host_len);
if (a != ACTION_RESULT_DONE) {
c->cache_action = a;
}
@@ -1401,8 +1401,8 @@ CacheContinuation::setupVCdataRead(int event, VConnection *vc)
SET_HANDLER((CacheContHandler)&CacheContinuation::VCdataRead);
int64_t size_index = iobuffer_size_to_index(caller_buf_freebytes);
- MIOBuffer *buf = new_MIOBuffer(size_index);
- readahead_reader = buf->alloc_reader();
+ MIOBuffer *buf = new_MIOBuffer(size_index);
+ readahead_reader = buf->alloc_reader();
MUTEX_TRY_LOCK(lock, mutex, this_ethread()); // prevent immediate callback
readahead_vio = vc->do_io_read(this, caller_buf_freebytes, buf);
@@ -1422,7 +1422,7 @@ CacheContinuation::VCdataRead(int event, VIO *target_vio)
ink_release_assert(readahead_vio == target_vio);
VConnection *vc = target_vio->vc_server;
- int reply = CACHE_EVENT_OPEN_READ;
+ int reply = CACHE_EVENT_OPEN_READ;
int32_t object_size;
switch (event) {
@@ -1441,7 +1441,7 @@ CacheContinuation::VCdataRead(int event, VIO *target_vio)
ink_assert(current_ndone);
ink_assert(current_ndone <= readahead_reader->read_avail());
- object_size = getObjectSize(vc, request_opcode, &cache_vc_info);
+ object_size = getObjectSize(vc, request_opcode, &cache_vc_info);
have_all_data = ((object_size <= caller_buf_freebytes) && (object_size == current_ndone));
// Use no more than the caller's max buffer limit
@@ -1481,7 +1481,7 @@ CacheContinuation::VCdataRead(int event, VIO *target_vio)
vc->do_io(VIO::CLOSE);
free_MIOBuffer(mbuf);
readahead_vio = 0;
- reply = CACHE_EVENT_OPEN_READ_FAILED;
+ reply = CACHE_EVENT_OPEN_READ_FAILED;
SET_HANDLER((CacheContHandler)&CacheContinuation::replyOpEvent);
handleEvent(reply, (VConnection *)-ECLUSTER_ORB_DATA_READ);
@@ -1561,15 +1561,15 @@ CacheContinuation::replyOpEvent(int event, VConnection *cvc)
ink_release_assert(expect_cache_callback);
expect_cache_callback = false; // make sure we are called back exactly once
- result = event;
- bool open = event_is_open(event);
- bool read_op = op_is_read(request_opcode);
+ result = event;
+ bool open = event_is_open(event);
+ bool read_op = op_is_read(request_opcode);
bool open_read_now_open_write = false;
// Reply message initializations
CacheOpReplyMsg rmsg;
CacheOpReplyMsg *msg = &rmsg;
- msg->result = event;
+ msg->result = event;
if ((request_opcode == CACHE_OPEN_READ_LONG) && cvc && (event == CACHE_EVENT_OPEN_WRITE)) {
//////////////////////////////////////////////////////////////////////////
@@ -1577,14 +1577,14 @@ CacheContinuation::replyOpEvent(int event, VConnection *cvc)
// CACHE_EVENT_OPEN_READ_FAILED and make result token non zero to
// signal to the remote node that we have established a write connection.
//////////////////////////////////////////////////////////////////////////
- msg->result = CACHE_EVENT_OPEN_READ_FAILED;
+ msg->result = CACHE_EVENT_OPEN_READ_FAILED;
open_read_now_open_write = true;
}
msg->seq_number = seq_number;
- int flen = CacheOpReplyMsg::sizeof_fixedlen_msg(); // include token
- int len = 0;
- int vers = 0;
+ int flen = CacheOpReplyMsg::sizeof_fixedlen_msg(); // include token
+ int len = 0;
+ int vers = 0;
int results_expected = 1;
@@ -1595,8 +1595,8 @@ CacheContinuation::replyOpEvent(int event, VConnection *cvc)
// prepare for CACHE_OPEN_EVENT
results_expected = 2;
- cache_vc = cvc;
- cache_read = (event == CACHE_EVENT_OPEN_READ);
+ cache_vc = cvc;
+ cache_read = (event == CACHE_EVENT_OPEN_READ);
if (read_op && !open_read_now_open_write) {
ink_release_assert(write_cluster_vc->pending_remote_fill);
@@ -1631,7 +1631,7 @@ CacheContinuation::replyOpEvent(int event, VConnection *cvc)
(void)getObjectSize(cache_vc, request_opcode, &cache_vc_info);
}
// Determine data length and allocate
- len = cache_vc_info.marshal_length();
+ len = cache_vc_info.marshal_length();
CacheOpReplyMsg *reply = (CacheOpReplyMsg *)ALLOCA_DOUBLE(flen + len);
// Initialize reply message header
@@ -1666,7 +1666,7 @@ CacheContinuation::replyOpEvent(int event, VConnection *cvc)
}
if (write_cluster_vc) {
write_cluster_vc->pending_remote_fill = 0;
- write_cluster_vc->remote_closed = 1; // avoid remote close msg
+ write_cluster_vc->remote_closed = 1; // avoid remote close msg
write_cluster_vc->do_io(VIO::CLOSE);
}
reply->moi.u32 = (int32_t)((uintptr_t)cvc & 0xffffffff); // code describing failure
@@ -1719,19 +1719,19 @@ CacheContinuation::setupReadBufTunnel(VConnection *cache_read_vc, VConnection *c
// Setup OneWayTunnel and tunnel close event handler.
// Used in readahead processing on open read connections.
////////////////////////////////////////////////////////////
- tunnel_cont = cacheContAllocator_alloc();
+ tunnel_cont = cacheContAllocator_alloc();
tunnel_cont->mutex = this->mutex;
SET_CONTINUATION_HANDLER(tunnel_cont, (CacheContHandler)&CacheContinuation::tunnelClosedEvent);
int64_t ravail = bytes_IOBufferBlockList(readahead_data, 1);
- tunnel_mutex = tunnel_cont->mutex;
+ tunnel_mutex = tunnel_cont->mutex;
tunnel_closed = false;
tunnel = OneWayTunnel::OneWayTunnel_alloc();
readahead_reader->consume(ravail); // allow for bytes sent in initial reply
tunnel->init(cache_read_vc, cluster_write_vc, tunnel_cont, readahead_vio, readahead_reader);
- tunnel_cont->action = this;
- tunnel_cont->tunnel = tunnel;
+ tunnel_cont->action = this;
+ tunnel_cont->tunnel = tunnel;
tunnel_cont->tunnel_cont = tunnel_cont;
// Disable cluster_write_vc
@@ -1761,8 +1761,8 @@ CacheContinuation::tunnelClosedEvent(int /* event ATS_UNUSED */, void *c)
if (real_cc) {
// Notify the real continuation of the tunnel closed event
- real_cc->tunnel = 0;
- real_cc->tunnel_cont = 0;
+ real_cc->tunnel = 0;
+ real_cc->tunnel_cont = 0;
real_cc->tunnel_closed = true;
}
OneWayTunnel::OneWayTunnel_free(tc->tunnel);
@@ -1816,7 +1816,7 @@ CacheContinuation::disposeOfDataBuffer(void *d)
// close message to remote node.
//
cc->write_cluster_vc->pending_remote_fill = 0;
- cc->write_cluster_vc->remote_closed = 1;
+ cc->write_cluster_vc->remote_closed = 1;
cc->write_cluster_vc->do_io(VIO::CLOSE);
cc->readahead_data = 0;
@@ -1883,8 +1883,8 @@ cache_op_result_ClusterFunction(ClusterHandler *ch, void *d, int l)
char *data = iob->data();
int flen, len = l;
CacheHTTPInfo ci;
- CacheOpReplyMsg *msg = (CacheOpReplyMsg *)data;
- int32_t op_result_error = 0;
+ CacheOpReplyMsg *msg = (CacheOpReplyMsg *)data;
+ int32_t op_result_error = 0;
ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
if (mh->GetMsgVersion() != CacheOpReplyMsg::CACHE_OP_REPLY_MESSAGE_VERSION) { ////////////////////////////////////////////////
@@ -1938,7 +1938,7 @@ cache_op_result_ClusterFunction(ClusterHandler *ch, void *d, int l)
// See if this response is still expected (expected case == yes)
unsigned int hash = FOLDHASH(ch->machine->ip, msg->seq_number);
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
if (MUTEX_TAKE_TRY_LOCK(remoteCacheContQueueMutex[hash], thread)) {
// Find it in pending list
@@ -1986,12 +1986,12 @@ cache_op_result_ClusterFunction(ClusterHandler *ch, void *d, int l)
Lretry:
CacheContinuation *c = CacheContinuation::cacheContAllocator_alloc();
- c->mutex = new_ProxyMutex();
- c->seq_number = msg->seq_number;
- c->target_ip = ch->machine->ip;
+ c->mutex = new_ProxyMutex();
+ c->seq_number = msg->seq_number;
+ c->target_ip = ch->machine->ip;
SET_CONTINUATION_HANDLER(c, (CacheContHandler)&CacheContinuation::handleReplyEvent);
c->start_time = Thread::get_hrtime();
- c->result = msg->result;
+ c->result = msg->result;
if (event_is_open(msg->result))
c->token = msg->token;
if (ci.valid()) {
@@ -2016,7 +2016,7 @@ CacheContinuation::handleReplyEvent(int event, Event *e)
// take lock on outstanding message queue
- EThread *t = e->ethread;
+ EThread *t = e->ethread;
unsigned int hash = FOLDHASH(target_ip, seq_number);
if (!MUTEX_TAKE_TRY_LOCK(remoteCacheContQueueMutex[hash], t)) {
@@ -2086,10 +2086,10 @@ CacheContinuation::remoteOpEvent(int event_code, Event *e)
if (event != EVENT_INTERVAL) {
if (event == CACHE_EVENT_RESPONSE) {
CacheContinuation *ccont = (CacheContinuation *)e;
- res = ccont->result;
+ res = ccont->result;
} else {
CacheOpReplyMsg *rmsg = (CacheOpReplyMsg *)e;
- res = rmsg->result;
+ res = rmsg->result;
}
if ((res == CACHE_EVENT_LOOKUP) || (res == CACHE_EVENT_LOOKUP_FAILED)) {
now = Thread::get_hrtime();
@@ -2104,7 +2104,7 @@ CacheContinuation::remoteOpEvent(int event_code, Event *e)
start_time = 0;
}
// for CACHE_EVENT_RESPONSE/XXX the lock was acquired at the higher level
- intptr_t return_error = 0;
+ intptr_t return_error = 0;
ClusterVCToken *pToken = NULL;
retry:
@@ -2140,7 +2140,7 @@ retry:
Debug("cluster_timeout", "cluster op timeout %d", seq_number);
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_REMOTE_OP_TIMEOUTS_STAT);
request_timeout = true;
- timeout = 0;
+ timeout = 0;
//
// Post error completion now and defer deallocation of
// the continuation until we receive the reply or the
@@ -2222,7 +2222,7 @@ retry:
}
// Move CacheHTTPInfo reply data into VC
read_cluster_vc->marshal_buf = this->getMsgBufferIOBData();
- read_cluster_vc->alternate = this->ic_new_info;
+ read_cluster_vc->alternate = this->ic_new_info;
this->ic_new_info.clear();
ink_release_assert(read_cluster_vc->alternate.object_size_get());
@@ -2267,7 +2267,7 @@ retry:
// machine is the master (or the owner machine has failed), go to
// the local machine. Also if PROBE_LOCAL_CACHE_LAST.
//
- int len = getMsgBufferLen();
+ int len = getMsgBufferLen();
char *hostname = (len ? getMsgBuffer() : 0);
if (!m || PROBE_LOCAL_CACHE_LAST) {
@@ -2311,7 +2311,7 @@ retry:
// Compiler bug in CC: WorkShop Compilers 5.0 98/12/15 C++ 5.0
// Does not accept assignment of ((Continuation *) NULL)
{
- Continuation *temp = NULL;
+ Continuation *temp = NULL;
read_cluster_vc->action_ = temp;
}
if (!GlobalOpenWriteVCcache->insert(&url_md5, read_cluster_vc)) {
@@ -2388,9 +2388,9 @@ Action *
CacheContinuation::do_remote_lookup(Continuation *cont, const CacheKey *key, CacheContinuation *c, CacheFragType ft,
const char *hostname, int hostname_len)
{
- int probe_depth = 0;
+ int probe_depth = 0;
ClusterMachine *past_probes[CONFIGURATION_HISTORY_PROBE_DEPTH] = {0};
- int mlen = op_to_sizeof_fixedlen_msg(CACHE_LOOKUP_OP) + ((hostname && hostname_len) ? hostname_len : 0);
+ int mlen = op_to_sizeof_fixedlen_msg(CACHE_LOOKUP_OP) + ((hostname && hostname_len) ? hostname_len : 0);
CacheLookupMsg *msg = (CacheLookupMsg *)ALLOCA_DOUBLE(mlen);
msg->init();
@@ -2424,8 +2424,8 @@ CacheContinuation::do_remote_lookup(Continuation *cont, const CacheKey *key, Cac
// If we do not have a continuation, build one
if (!c) {
- c = cacheContAllocator_alloc();
- c->mutex = cont->mutex;
+ c = cacheContAllocator_alloc();
+ c->mutex = cont->mutex;
c->probe_depth = probe_depth;
memcpy(c->past_probes, past_probes, sizeof(past_probes));
}
@@ -2438,20 +2438,20 @@ CacheContinuation::do_remote_lookup(Continuation *cont, const CacheKey *key, Cac
memcpy(c->getMsgBuffer(), hostname, hostname_len);
}
- c->url_md5 = msg->url_md5;
+ c->url_md5 = msg->url_md5;
c->action.cancelled = false;
- c->action = cont;
- c->start_time = Thread::get_hrtime();
+ c->action = cont;
+ c->start_time = Thread::get_hrtime();
SET_CONTINUATION_HANDLER(c, (CacheContHandler)&CacheContinuation::remoteOpEvent);
c->result = CACHE_EVENT_LOOKUP_FAILED;
// set up sequence number so we can find this continuation
- c->target_ip = m->ip;
- c->seq_number = new_cache_sequence_number();
+ c->target_ip = m->ip;
+ c->seq_number = new_cache_sequence_number();
msg->seq_number = c->seq_number;
- c->frag_type = ft;
- msg->frag_type = ft;
+ c->frag_type = ft;
+ msg->frag_type = ft;
// establish timeout for lookup
@@ -2472,8 +2472,8 @@ CacheContinuation::do_remote_lookup(Continuation *cont, const CacheKey *key, Cac
if (vers == CacheLookupMsg::CACHE_LOOKUP_MESSAGE_VERSION) {
msg->seq_number = c->seq_number;
- data = (char *)msg;
- len = mlen;
+ data = (char *)msg;
+ len = mlen;
if (hostname && hostname_len) {
memcpy(msg->moi.byte, hostname, hostname_len);
}
@@ -2503,13 +2503,13 @@ void
cache_lookup_ClusterFunction(ClusterHandler *ch, void *data, int len)
{
(void)len;
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
////////////////////////////////////////////////////////
// Note: we are running on the ET_CLUSTER thread
////////////////////////////////////////////////////////
- CacheLookupMsg *msg = (CacheLookupMsg *)data;
+ CacheLookupMsg *msg = (CacheLookupMsg *)data;
ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
if (mh->GetMsgVersion() != CacheLookupMsg::CACHE_LOOKUP_MESSAGE_VERSION) { ////////////////////////////////////////////////
@@ -2524,12 +2524,12 @@ cache_lookup_ClusterFunction(ClusterHandler *ch, void *data, int len)
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_CACHE_OUTSTANDING_STAT);
CacheContinuation *c = CacheContinuation::cacheContAllocator_alloc();
- c->mutex = new_ProxyMutex();
+ c->mutex = new_ProxyMutex();
MUTEX_TRY_LOCK(lock, c->mutex, this_ethread());
c->no_reply_message = (msg->seq_number == CACHE_NO_RESPONSE);
- c->seq_number = msg->seq_number;
- c->from = ch->machine;
- c->url_md5 = msg->url_md5;
+ c->seq_number = msg->seq_number;
+ c->from = ch->machine;
+ c->url_md5 = msg->url_md5;
SET_CONTINUATION_HANDLER(c, (CacheContHandler)&CacheContinuation::replyLookupEvent);
CacheKey key(msg->url_md5);
@@ -2541,7 +2541,7 @@ cache_lookup_ClusterFunction(ClusterHandler *ch, void *data, int len)
char *hostname;
int hostname_len = len - op_to_sizeof_fixedlen_msg(CACHE_LOOKUP_OP);
- hostname = (hostname_len ? (char *)msg->moi.byte : 0);
+ hostname = (hostname_len ? (char *)msg->moi.byte : 0);
// Note: Hostname data invalid after return from lookup
Cache *call_cache = caches[msg->frag_type];
@@ -2565,14 +2565,14 @@ CacheContinuation::replyLookupEvent(int event, void * /* d ATS_UNUSED */)
if (vers == CacheOpReplyMsg::CACHE_OP_REPLY_MESSAGE_VERSION) {
CacheOpReplyMsg *msg;
int flen = CacheOpReplyMsg::sizeof_fixedlen_msg();
- msg = (CacheOpReplyMsg *)ALLOCA_DOUBLE(flen);
+ msg = (CacheOpReplyMsg *)ALLOCA_DOUBLE(flen);
msg->init();
CLUSTER_DECREMENT_DYN_STAT(CLUSTER_CACHE_OUTSTANDING_STAT);
int len = flen - sizeof(msg->token);
if (!no_reply_message) {
msg->seq_number = seq_number;
- msg->result = event;
+ msg->result = event;
#ifdef CACHE_MSG_TRACE
log_cache_op_sndmsg(seq_number, event, "cache_result");
#endif
@@ -2594,7 +2594,7 @@ CacheContinuation::replyLookupEvent(int event, void * /* d ATS_UNUSED */)
int32_t
CacheContinuation::getObjectSize(VConnection *vc, int opcode, CacheHTTPInfo *ret_ci)
{
- CacheHTTPInfo *ci = 0;
+ CacheHTTPInfo *ci = 0;
int64_t object_size = 0;
if ((opcode == CACHE_OPEN_READ_LONG) || (opcode == CACHE_OPEN_READ_BUFFER_LONG)) {
@@ -2603,7 +2603,7 @@ CacheContinuation::getObjectSize(VConnection *vc, int opcode, CacheHTTPInfo *ret
object_size = ci->object_size_get();
} else {
- ci = 0;
+ ci = 0;
object_size = 0;
}
@@ -2640,8 +2640,8 @@ CacheContinuation::insert_cache_callback_user(ClusterVConnection *vc, int res, v
} else {
// Unable to insert, try later
- result = res;
- callback_data = e;
+ result = res;
+ callback_data = e;
callback_data_2 = (void *)vc;
SET_HANDLER((CacheContHandler)&CacheContinuation::insertCallbackEvent);
eventProcessor.schedule_imm(this, ET_CACHE_CONT_SM);
@@ -2693,7 +2693,7 @@ CacheContinuation::callback_user(int res, void *e)
void
CacheContinuation::defer_callback_result(int r, void *e)
{
- result = r;
+ result = r;
callback_data = e;
SET_HANDLER((CacheContHandler)&CacheContinuation::callbackResultEvent);
eventProcessor.schedule_imm(this, ET_CACHE_CONT_SM);
@@ -2740,7 +2740,7 @@ CacheContinuation::cacheContAllocator_free(CacheContinuation *c)
// Does not accept assignment of ((Continuation *) NULL)
{
Continuation *temp = NULL;
- c->action = temp;
+ c->action = temp;
}
c->tunnel_mutex = NULL;
cacheContAllocator.free(c);
@@ -2755,14 +2755,14 @@ CacheContinuation::callback_failure(Action *a, int result, int err, CacheContinu
{
CacheContinuation *cc;
if (!this_cc) {
- cc = cacheContAllocator_alloc();
- cc->mutex = a->mutex;
+ cc = cacheContAllocator_alloc();
+ cc->mutex = a->mutex;
cc->action = *a;
} else {
cc = this_cc;
}
- cc->result = result;
+ cc->result = result;
cc->result_error = err;
SET_CONTINUATION_HANDLER(cc, (CacheContHandler)&CacheContinuation::callbackEvent);
eventProcessor.schedule_imm(cc, ET_CACHE_CONT_SM);
@@ -2794,8 +2794,8 @@ CacheContinuation::callbackEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UN
static CacheContinuation *
find_cache_continuation(unsigned int seq_number, unsigned int from_ip)
{
- unsigned int hash = FOLDHASH(from_ip, seq_number);
- CacheContinuation *c = NULL;
+ unsigned int hash = FOLDHASH(from_ip, seq_number);
+ CacheContinuation *c = NULL;
CacheContinuation *lastc = NULL;
for (c = (CacheContinuation *)remoteCacheContQueue[hash].head; c; c = (CacheContinuation *)c->link.next) {
if (seq_number == c->seq_number && from_ip == c->target_ip) {
@@ -2842,7 +2842,7 @@ new_cache_sequence_number()
int
CacheContinuation::forwardEvent(int event, VConnection *c)
{
- int ret = EVENT_CONT;
+ int ret = EVENT_CONT;
cluster_vc = 0;
cache_read = false;
@@ -2857,7 +2857,7 @@ CacheContinuation::forwardEvent(int event, VConnection *c)
break;
case CACHE_EVENT_OPEN_READ_FAILED:
cache_read = true;
- ret = EVENT_DONE;
+ ret = EVENT_DONE;
break;
case CACHE_EVENT_OPEN_READ:
cache_read = true;
@@ -2877,9 +2877,9 @@ CacheContinuation::forwardEvent(int event, VConnection *c)
int
CacheContinuation::forwardWaitEvent(int event, VConnection *c)
{
- int ret = EVENT_CONT;
- int res = CACHE_EVENT_OPEN_READ_FAILED;
- void *res_data = NULL;
+ int ret = EVENT_CONT;
+ int res = CACHE_EVENT_OPEN_READ_FAILED;
+ void *res_data = NULL;
VConnection *vc = NULL;
switch (event) {
@@ -2894,17 +2894,17 @@ CacheContinuation::forwardWaitEvent(int event, VConnection *c)
vc = c;
break;
}
- VConnection *read_vc = (cache_read ? cluster_vc : vc);
+ VConnection *read_vc = (cache_read ? cluster_vc : vc);
VConnection *write_vc = (!cache_read ? cluster_vc : vc);
- res = read_vc ? CACHE_EVENT_OPEN_READ : CACHE_EVENT_OPEN_READ_FAILED;
+ res = read_vc ? CACHE_EVENT_OPEN_READ : CACHE_EVENT_OPEN_READ_FAILED;
res_data = read_vc;
// if the read and write are sucessful, tunnel the read to the write
if (read_vc && write_vc) {
res_data = new VCTee(read_vc, write_vc, vio);
if (vio) { // CACHE_EVENT_OPEN_READ_VIO
- res = event;
+ res = event;
res_data = &((VCTee *)read_vc)->vio;
}
}
@@ -2922,18 +2922,18 @@ CacheContinuation::forwardWaitEvent(int event, VConnection *c)
int
CacheContinuation::tunnelEvent(int event, VConnection *vc)
{
- int ret = EVENT_DONE;
- int flen = CacheOpReplyMsg::sizeof_fixedlen_msg(); // include token
- int len = 0;
+ int ret = EVENT_DONE;
+ int flen = CacheOpReplyMsg::sizeof_fixedlen_msg(); // include token
+ int len = 0;
bool read_buf = ((request_opcode == CACHE_OPEN_READ_BUFFER) || (request_opcode == CACHE_OPEN_READ_BUFFER_LONG));
ink_release_assert(!read_buf);
CacheOpReplyMsg rmsg;
CacheOpReplyMsg *msg = &rmsg;
- msg->result = result;
- msg->seq_number = seq_number;
- msg->token = token;
- int expect_reply = 1;
+ msg->result = result;
+ msg->seq_number = seq_number;
+ msg->token = token;
+ int expect_reply = 1;
if (event == CLUSTER_EVENT_OPEN) {
if (cache_read) {
@@ -2967,7 +2967,7 @@ CacheContinuation::tunnelEvent(int event, VConnection *vc)
ci = cache_vc_info;
// Determine data length and allocate
- len = ci->marshal_length();
+ len = ci->marshal_length();
CacheOpReplyMsg *reply = (CacheOpReplyMsg *)ALLOCA_DOUBLE(flen + len);
// Initialize reply message header
@@ -2992,7 +2992,7 @@ CacheContinuation::tunnelEvent(int event, VConnection *vc)
if (read_buf) {
Debug("cluster_timeout", "unable to make cluster connection2");
- initial_buf = 0; // Do not send data
+ initial_buf = 0; // Do not send data
initial_bufsize = 0;
if (!have_all_data) {
diff --git a/iocore/cluster/ClusterConfig.cc b/iocore/cluster/ClusterConfig.cc
index 499550b..7a26a32 100644
--- a/iocore/cluster/ClusterConfig.cc
+++ b/iocore/cluster/ClusterConfig.cc
@@ -100,11 +100,11 @@ ClusterAccept::ClusterAcceptEvent(int event, void *data)
}
NetProcessor::AcceptOptions opt;
- opt.recv_bufsize = socket_recv_bufsize;
- opt.send_bufsize = socket_send_bufsize;
- opt.etype = ET_CLUSTER;
- opt.local_port = cluster_port;
- opt.ip_family = AF_INET;
+ opt.recv_bufsize = socket_recv_bufsize;
+ opt.send_bufsize = socket_send_bufsize;
+ opt.etype = ET_CLUSTER;
+ opt.local_port = cluster_port;
+ opt.ip_family = AF_INET;
opt.localhost_only = false;
accept_action = netProcessor.main_accept(this, NO_FD, opt);
@@ -132,7 +132,7 @@ ClusterAccept::ClusterAcceptMachine(NetVConnection *NetVC)
{
// Validate remote IP address.
unsigned int remote_ip = NetVC->get_remote_ip();
- MachineList *mc = the_cluster_machines_config();
+ MachineList *mc = the_cluster_machines_config();
if (mc && !mc->find(remote_ip)) {
Note("Illegal cluster connection from %u.%u.%u.%u", DOT_SEPARATED(remote_ip));
@@ -142,9 +142,9 @@ ClusterAccept::ClusterAcceptMachine(NetVConnection *NetVC)
Debug(CL_NOTE, "Accepting machine %u.%u.%u.%u", DOT_SEPARATED(remote_ip));
ClusterHandler *ch = new ClusterHandler;
- ch->machine = new ClusterMachine(NULL, remote_ip);
- ch->ip = remote_ip;
- ch->net_vc = NetVC;
+ ch->machine = new ClusterMachine(NULL, remote_ip);
+ ch->ip = remote_ip;
+ ch->net_vc = NetVC;
eventProcessor.schedule_imm_signal(ch, ET_CLUSTER);
return 1;
}
@@ -155,7 +155,7 @@ make_cluster_connections(MachineList *l)
//
// Connect to all new machines.
//
- uint32_t ip = this_cluster_machine()->ip;
+ uint32_t ip = this_cluster_machine()->ip;
int num_connections = this_cluster_machine()->num_connections;
if (l) {
@@ -183,26 +183,26 @@ machine_config_change(const char * /* name ATS_UNUSED */, RecDataT /* data_type
// This may include front-end load redirectors, machines going
// up or coming down etc.
//
- char *filename = (char *)data.rec_string;
- MachineList *l = read_MachineList(filename);
+ char *filename = (char *)data.rec_string;
+ MachineList *l = read_MachineList(filename);
MachineList *old = NULL;
#ifdef USE_SEPARATE_MACHINE_CONFIG
switch ((int)cookie) {
case MACHINE_CONFIG:
- old = machines_config;
+ old = machines_config;
machines_config = l;
break;
case CLUSTER_CONFIG:
- old = cluster_config;
+ old = cluster_config;
cluster_config = l;
make_cluster_connections(l);
break;
}
#else
(void)cookie;
- old = cluster_config;
+ old = cluster_config;
machines_config = l;
- cluster_config = l;
+ cluster_config = l;
make_cluster_connections(l);
#endif
if (old)
@@ -284,9 +284,9 @@ configuration_add_machine(ClusterConfiguration *c, ClusterMachine *m)
// Build a new cluster configuration with the new machine.
// Machines are stored in ip sorted order.
//
- EThread *thread = this_ethread();
- ProxyMutex *mutex = thread->mutex;
- int i = 0;
+ EThread *thread = this_ethread();
+ ProxyMutex *mutex = thread->mutex;
+ int i = 0;
ClusterConfiguration *cc = new ClusterConfiguration(*c);
// Find the place to insert this new machine
@@ -298,7 +298,7 @@ configuration_add_machine(ClusterConfiguration *c, ClusterMachine *m)
// Move the other machines out of the way
//
- for (int j = cc->n_machines - 1; j >= i; j--)
+ for (int j = cc->n_machines - 1; j >= i; j--)
cc->machines[j + 1] = cc->machines[j];
// Insert it
@@ -307,7 +307,7 @@ configuration_add_machine(ClusterConfiguration *c, ClusterMachine *m)
cc->n_machines++;
cc->link.next = c;
- cc->changed = Thread::get_hrtime();
+ cc->changed = Thread::get_hrtime();
ink_assert(cc->n_machines < CLUSTER_MAX_MACHINES);
build_cluster_hash_table(cc);
@@ -321,7 +321,7 @@ configuration_add_machine(ClusterConfiguration *c, ClusterMachine *m)
ClusterConfiguration *
configuration_remove_machine(ClusterConfiguration *c, ClusterMachine *m)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
//
@@ -339,7 +339,7 @@ configuration_remove_machine(ClusterConfiguration *c, ClusterMachine *m)
ink_assert(cc->n_machines > 0);
cc->link.next = c;
- cc->changed = Thread::get_hrtime();
+ cc->changed = Thread::get_hrtime();
build_cluster_hash_table(cc);
INK_MEMORY_BARRIER; // commit writes before freeing old hash table
@@ -364,12 +364,12 @@ cluster_machine_at_depth(unsigned int hash, int *pprobe_depth, ClusterMachine **
if (!cache_clustering_enabled)
return NULL;
#endif
- ClusterConfiguration *cc = this_cluster()->current_configuration();
+ ClusterConfiguration *cc = this_cluster()->current_configuration();
ClusterConfiguration *next_cc = cc;
- ink_hrtime now = Thread::get_hrtime();
- int fake_probe_depth = 0;
- int &probe_depth = pprobe_depth ? (*pprobe_depth) : fake_probe_depth;
- int tprobe_depth = probe_depth;
+ ink_hrtime now = Thread::get_hrtime();
+ int fake_probe_depth = 0;
+ int &probe_depth = pprobe_depth ? (*pprobe_depth) : fake_probe_depth;
+ int tprobe_depth = probe_depth;
#ifdef CLUSTER_TEST
if (cc->n_machines > 1) {
@@ -392,7 +392,7 @@ cluster_machine_at_depth(unsigned int hash, int *pprobe_depth, ClusterMachine **
if (!cc || !next_cc)
break;
- cc = next_cc;
+ cc = next_cc;
next_cc = next_cc->link.next;
// Find the correct configuration
diff --git a/iocore/cluster/ClusterHandler.cc b/iocore/cluster/ClusterHandler.cc
index da07b4d..97bd5cc 100644
--- a/iocore/cluster/ClusterHandler.cc
+++ b/iocore/cluster/ClusterHandler.cc
@@ -294,7 +294,7 @@ ClusterHandler::close_ClusterVConnection(ClusterVConnection *vc)
ClusterVC_remove_read(vc);
if (vc->write.queue)
ClusterVC_remove_write(vc);
- vc->read.vio.mutex = NULL;
+ vc->read.vio.mutex = NULL;
vc->write.vio.mutex = NULL;
ink_assert(!vc->read_locked);
@@ -325,12 +325,12 @@ ClusterHandler::close_ClusterVConnection(ClusterVConnection *vc)
int len;
if (vers == CloseMessage::CLOSE_CHAN_MESSAGE_VERSION) {
- msg.channel = channel;
- msg.status = (vc->remote_closed == FORCE_CLOSE_ON_OPEN_CHANNEL) ? FORCE_CLOSE_ON_OPEN_CHANNEL : vc->closed;
- msg.lerrno = vc->lerrno;
+ msg.channel = channel;
+ msg.status = (vc->remote_closed == FORCE_CLOSE_ON_OPEN_CHANNEL) ? FORCE_CLOSE_ON_OPEN_CHANNEL : vc->closed;
+ msg.lerrno = vc->lerrno;
msg.sequence_number = vc->token.sequence_number;
- data = (void *)&msg;
- len = sizeof(CloseMessage);
+ data = (void *)&msg;
+ len = sizeof(CloseMessage);
} else {
//////////////////////////////////////////////////////////////
@@ -391,10 +391,10 @@ ClusterHandler::build_data_vector(char *d, int len, bool read_flag)
ink_assert(len);
ink_assert(s.iov);
- s.msg.count = 1;
+ s.msg.count = 1;
s.iov[0].iov_base = 0;
- s.iov[0].iov_len = len;
- s.block[0] = new_IOBufferBlock();
+ s.iov[0].iov_len = len;
+ s.block[0] = new_IOBufferBlock();
s.block[0]->set(new_constant_IOBufferData(d, len));
if (read_flag) {
@@ -406,7 +406,7 @@ ClusterHandler::build_data_vector(char *d, int len, bool read_flag)
}
s.to_do = len;
- s.did = 0;
+ s.did = 0;
s.n_iov = 1;
return true;
@@ -450,12 +450,12 @@ ClusterHandler::build_initial_vector(bool read_flag)
// This isn't used.
// MIOBuffer *w;
- ink_hrtime now = Thread::get_hrtime();
- ClusterState &s = (read_flag ? read : write);
+ ink_hrtime now = Thread::get_hrtime();
+ ClusterState &s = (read_flag ? read : write);
OutgoingControl *oc = s.msg.outgoing_control.head;
IncomingControl *ic = incoming_control.head;
- int new_n_iov = 0;
- int to_do = 0;
+ int new_n_iov = 0;
+ int to_do = 0;
int len;
ink_assert(s.iov);
@@ -464,10 +464,10 @@ ClusterHandler::build_initial_vector(bool read_flag)
//////////////////////////////////////////////////////////////////////
// Setup vector for write of header, descriptors and control data
//////////////////////////////////////////////////////////////////////
- len = sizeof(ClusterMsgHeader) + (s.msg.count * sizeof(Descriptor)) + s.msg.control_bytes;
+ len = sizeof(ClusterMsgHeader) + (s.msg.count * sizeof(Descriptor)) + s.msg.control_bytes;
s.iov[new_n_iov].iov_base = 0;
- s.iov[new_n_iov].iov_len = len;
- s.block[new_n_iov] = s.msg.get_block_header();
+ s.iov[new_n_iov].iov_len = len;
+ s.block[new_n_iov] = s.msg.get_block_header();
// Make read_avail == len
s.block[new_n_iov]->fill(len);
@@ -480,10 +480,10 @@ ClusterHandler::build_initial_vector(bool read_flag)
////////////////////////////////////
// Setup vector for read of header
////////////////////////////////////
- len = sizeof(ClusterMsgHeader);
+ len = sizeof(ClusterMsgHeader);
s.iov[new_n_iov].iov_base = 0;
- s.iov[new_n_iov].iov_len = len;
- s.block[new_n_iov] = s.msg.get_block_header();
+ s.iov[new_n_iov].iov_len = len;
+ s.block[new_n_iov] = s.msg.get_block_header();
// Make write_avail == len
s.block[new_n_iov]->_buf_end = s.block[new_n_iov]->end() + len;
@@ -495,10 +495,10 @@ ClusterHandler::build_initial_vector(bool read_flag)
/////////////////////////////////////////////////////////
// Setup vector for read of Descriptors+control data
/////////////////////////////////////////////////////////
- len = (s.msg.count * sizeof(Descriptor)) + s.msg.control_bytes;
+ len = (s.msg.count * sizeof(Descriptor)) + s.msg.control_bytes;
s.iov[new_n_iov].iov_base = 0;
- s.iov[new_n_iov].iov_len = len;
- s.block[new_n_iov] = s.msg.get_block_descriptor();
+ s.iov[new_n_iov].iov_len = len;
+ s.block[new_n_iov] = s.msg.get_block_descriptor();
// Make write_avail == len
s.block[new_n_iov]->_buf_end = s.block[new_n_iov]->end() + len;
@@ -527,7 +527,7 @@ ClusterHandler::build_initial_vector(bool read_flag)
// Incoming Control
///////////////////////
if (!ic) {
- ic = IncomingControl::alloc();
+ ic = IncomingControl::alloc();
ic->recognized_time = now;
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_CTRL_MSGS_RECVD_STAT);
ic->len = s.msg.descriptor[i].length;
@@ -540,8 +540,8 @@ ClusterHandler::build_initial_vector(bool read_flag)
incoming_control.enqueue(ic);
}
s.iov[new_n_iov].iov_base = 0;
- s.iov[new_n_iov].iov_len = ic->len;
- s.block[new_n_iov] = ic->get_block();
+ s.iov[new_n_iov].iov_len = ic->len;
+ s.block[new_n_iov] = ic->get_block();
to_do += s.iov[new_n_iov].iov_len;
++new_n_iov;
ic = (IncomingControl *)ic->link.next;
@@ -551,8 +551,8 @@ ClusterHandler::build_initial_vector(bool read_flag)
///////////////////////
ink_assert(oc);
s.iov[new_n_iov].iov_base = 0;
- s.iov[new_n_iov].iov_len = oc->len;
- s.block[new_n_iov] = oc->get_block();
+ s.iov[new_n_iov].iov_len = oc->len;
+ s.block[new_n_iov] = oc->get_block();
to_do += s.iov[new_n_iov].iov_len;
++new_n_iov;
oc = (OutgoingControl *)oc->link.next;
@@ -597,16 +597,16 @@ ClusterHandler::build_initial_vector(bool read_flag)
//////////////////////////////////////////////////////////
ink_release_assert(s.msg.descriptor[i].length <= DEFAULT_MAX_BUFFER_SIZE);
vc->read_block = new_IOBufferBlock();
- int64_t index = buffer_size_to_index(s.msg.descriptor[i].length, MAX_BUFFER_SIZE_INDEX);
+ int64_t index = buffer_size_to_index(s.msg.descriptor[i].length, MAX_BUFFER_SIZE_INDEX);
vc->read_block->alloc(index);
s.iov[new_n_iov].iov_base = 0;
- s.block[new_n_iov] = vc->read_block->clone();
+ s.block[new_n_iov] = vc->read_block->clone();
} else {
Debug(CL_NOTE, "dumping cluster read data");
s.iov[new_n_iov].iov_base = 0;
- s.block[new_n_iov] = new_IOBufferBlock();
+ s.block[new_n_iov] = new_IOBufferBlock();
s.block[new_n_iov]->set(new_constant_IOBufferData(channel_dummy_input, DEFAULT_MAX_BUFFER_SIZE));
}
@@ -629,7 +629,7 @@ ClusterHandler::build_initial_vector(bool read_flag)
s.iov[new_n_iov].iov_base = 0;
ink_release_assert((int)s.msg.descriptor[i].length <= vc->write_list_bytes);
s.block[new_n_iov] = vc->write_list;
- vc->write_list = consume_IOBufferBlockList(vc->write_list, (int)s.msg.descriptor[i].length);
+ vc->write_list = consume_IOBufferBlockList(vc->write_list, (int)s.msg.descriptor[i].length);
vc->write_list_bytes -= (int)s.msg.descriptor[i].length;
vc->write_bytes_in_transit += (int)s.msg.descriptor[i].length;
@@ -640,7 +640,7 @@ ClusterHandler::build_initial_vector(bool read_flag)
} else {
Debug(CL_NOTE, "faking cluster write data");
s.iov[new_n_iov].iov_base = 0;
- s.block[new_n_iov] = new_IOBufferBlock();
+ s.block[new_n_iov] = new_IOBufferBlock();
s.block[new_n_iov]->set(new_constant_IOBufferData(channel_dummy_output, DEFAULT_MAX_BUFFER_SIZE));
// Make block read_avail == descriptor[].length
s.block[new_n_iov]->fill(s.msg.descriptor[i].length);
@@ -649,7 +649,7 @@ ClusterHandler::build_initial_vector(bool read_flag)
} else {
// VC has been deleted, need to dump the bits...
s.iov[new_n_iov].iov_base = 0;
- s.block[new_n_iov] = new_IOBufferBlock();
+ s.block[new_n_iov] = new_IOBufferBlock();
if (read_flag) {
s.block[new_n_iov]->set(new_constant_IOBufferData(channel_dummy_input, DEFAULT_MAX_BUFFER_SIZE));
@@ -677,7 +677,7 @@ ClusterHandler::build_initial_vector(bool read_flag)
// Initialize i/o state variables
s.to_do = to_do;
- s.did = 0;
+ s.did = 0;
s.n_iov = new_n_iov;
return true;
@@ -727,7 +727,7 @@ ClusterHandler::get_read_locks()
// make considerations for the last transfer on this vector.
vec_bytes_remainder = (s.iov[n].iov_len - iov_done[n]);
- bytes_processed = s.bytes_xfered;
+ bytes_processed = s.bytes_xfered;
bytes_processed -= vec_bytes_remainder;
if (bytes_processed >= 0) {
@@ -856,14 +856,14 @@ ClusterHandler::process_set_data_msgs()
// Process small control set_data messages.
/////////////////////////////////////////////
if (!read.msg.did_small_control_set_data) {
- char *p = (char *)&read.msg.descriptor[read.msg.count];
+ char *p = (char *)&read.msg.descriptor[read.msg.count];
char *endp = p + read.msg.control_bytes;
while (p < endp) {
if (needByteSwap) {
ats_swap32((uint32_t *)p); // length
ats_swap32((uint32_t *)(p + sizeof(int32_t))); // function code
}
- int len = *(int32_t *)p;
+ int len = *(int32_t *)p;
cluster_function_index = *(uint32_t *)(p + sizeof(int32_t));
if ((cluster_function_index < (uint32_t)SIZE_clusterFunction) &&
@@ -883,7 +883,7 @@ ClusterHandler::process_set_data_msgs()
break; // End of set_data messages
}
}
- read.msg.control_data_offset = p - (char *)&read.msg.descriptor[read.msg.count];
+ read.msg.control_data_offset = p - (char *)&read.msg.descriptor[read.msg.count];
read.msg.did_small_control_set_data = 1;
}
/////////////////////////////////////////////
@@ -935,8 +935,8 @@ ClusterHandler::process_small_control_msgs()
}
ink_hrtime now = Thread::get_hrtime();
- char *p = (char *)&read.msg.descriptor[read.msg.count] + read.msg.control_data_offset;
- char *endp = (char *)&read.msg.descriptor[read.msg.count] + read.msg.control_bytes;
+ char *p = (char *)&read.msg.descriptor[read.msg.count] + read.msg.control_data_offset;
+ char *endp = (char *)&read.msg.descriptor[read.msg.count] + read.msg.control_bytes;
while (p < endp) {
/////////////////////////////////////////////////////////////////
@@ -970,7 +970,7 @@ ClusterHandler::process_small_control_msgs()
///////////////////////////////////////////////////////
IncomingControl *ic = IncomingControl::alloc();
ic->recognized_time = now;
- ic->len = len;
+ ic->len = len;
ic->alloc_data();
memcpy(ic->data, p, ic->len);
SetHighBit(&ic->len); // mark as small cntl
@@ -1066,7 +1066,7 @@ ClusterHandler::process_freespace_msgs()
void
ClusterHandler::add_to_byte_bank(ClusterVConnection *vc)
{
- ByteBankDescriptor *bb_desc = ByteBankDescriptor::ByteBankDescriptor_alloc(vc->read_block);
+ ByteBankDescriptor *bb_desc = ByteBankDescriptor::ByteBankDescriptor_alloc(vc->read_block);
bool pending_byte_bank_completion = vc->byte_bank_q.head ? true : false;
// Put current byte bank descriptor on completion list
@@ -1165,7 +1165,7 @@ ClusterHandler::process_incoming_callouts(ProxyMutex *m)
break;
while (ic_ext) {
- ic_ext_next = (IncomingControl *)ic_ext->link.next;
+ ic_ext_next = (IncomingControl *)ic_ext->link.next;
ic_ext->link.next = NULL;
local_incoming_control.push(ic_ext);
ic_ext = ic_ext_next;
@@ -1183,8 +1183,8 @@ ClusterHandler::process_incoming_callouts(ProxyMutex *m)
ClearHighBit(&ic->len); // Clear small msg flag bit
if (small_control_msg) {
- int len = ic->len;
- char *p = ic->data;
+ int len = ic->len;
+ char *p = ic->data;
uint32_t cluster_function_index = *(uint32_t *)p;
p += sizeof(uint32_t);
@@ -1247,7 +1247,7 @@ ClusterHandler::update_channels_partial_read()
// how much of the iov was done
int64_t iov_done[MAX_TCOUNT];
- int64_t total = 0;
+ int64_t total = 0;
int64_t already_read = read.did - read.bytes_xfered;
for (i = 0; i < read.n_iov; i++) {
@@ -1258,7 +1258,7 @@ ClusterHandler::update_channels_partial_read()
if (already_read) {
already_read -= iov_done[i];
if (already_read < 0) {
- iov_done[i] = -already_read; // bytes remaining
+ iov_done[i] = -already_read; // bytes remaining
already_read = 0;
} else {
iov_done[i] = 0;
@@ -1286,7 +1286,7 @@ ClusterHandler::update_channels_partial_read()
if (VALID_CHANNEL(vc) && (read.msg.descriptor[i].sequence_number) == CLUSTER_SEQUENCE_NUMBER(vc->token.sequence_number)) {
if (vc->pending_remote_fill || (vc_ok_read(vc) && (vc->iov_map != CLUSTER_IOV_NONE))) {
vc->last_activity_time = current_time; // note activity time
- ClusterVConnState *s = &vc->read;
+ ClusterVConnState *s = &vc->read;
ink_assert(vc->iov_map < read.n_iov);
int len = iov_done[vc->iov_map];
@@ -1439,19 +1439,19 @@ ClusterHandler::update_channels_written()
Debug(CL_TRACE, "update_channels_written chan=%d seqno=%d len=%d", write.msg.descriptor[i].channel,
write.msg.descriptor[i].sequence_number, write.msg.descriptor[i].length);
vc->pending_remote_fill = 0;
- vc->remote_write_block = 0; // free data block
- continue; // ignore remote write fill VC(s)
+ vc->remote_write_block = 0; // free data block
+ continue; // ignore remote write fill VC(s)
}
ClusterVConnState *s = &vc->write;
- int len = write.msg.descriptor[i].length;
+ int len = write.msg.descriptor[i].length;
vc->write_bytes_in_transit -= len;
ink_release_assert(vc->write_bytes_in_transit >= 0);
Debug(CL_PROTO, "(%d) data sent %d %" PRId64, write.msg.descriptor[i].channel, len, s->vio.ndone);
if (vc_ok_write(vc)) {
vc->last_activity_time = current_time; // note activity time
- int64_t ndone = vc->was_closed() ? 0 : s->vio.ndone;
+ int64_t ndone = vc->was_closed() ? 0 : s->vio.ndone;
if (ndone < vc->remote_free) {
vcs_push(vc, VC_CLUSTER_WRITE);
@@ -1465,7 +1465,7 @@ ClusterHandler::update_channels_written()
OutgoingControl *oc = write.msg.outgoing_control.dequeue();
oc->free_data();
oc->mutex = NULL;
- now = Thread::get_hrtime();
+ now = Thread::get_hrtime();
CLUSTER_SUM_DYN_STAT(CLUSTER_CTRL_MSGS_SEND_TIME_STAT, now - oc->submit_time);
LOG_EVENT_TIME(oc->submit_time, cluster_send_time_dist, cluster_send_events);
oc->freeall();
@@ -1491,7 +1491,7 @@ ClusterHandler::update_channels_written()
// Free descriptor
hdr_oc->free_data();
hdr_oc->mutex = NULL;
- now = Thread::get_hrtime();
+ now = Thread::get_hrtime();
CLUSTER_SUM_DYN_STAT(CLUSTER_CTRL_MSGS_SEND_TIME_STAT, now - hdr_oc->submit_time);
LOG_EVENT_TIME(hdr_oc->submit_time, cluster_send_time_dist, cluster_send_events);
hdr_oc->freeall();
@@ -1506,8 +1506,8 @@ ClusterHandler::build_write_descriptors()
// write_vcs bucket with considerations for maximum elements per
// write (struct iovec system maximum).
//
- int count_bucket = cur_vcs;
- int tcount = write.msg.count + 2; // count + descriptor
+ int count_bucket = cur_vcs;
+ int tcount = write.msg.count + 2; // count + descriptor
int write_descriptors_built = 0;
int valid;
int list_len = 0;
@@ -1519,12 +1519,12 @@ ClusterHandler::build_write_descriptors()
vc = (ClusterVConnection *)ink_atomiclist_popall(&write_vcs_ready);
while (vc) {
enter_exit(&cls_build_writes_entered, &cls_writes_exited);
- vc_next = (ClusterVConnection *)vc->ready_alink.next;
+ vc_next = (ClusterVConnection *)vc->ready_alink.next;
vc->ready_alink.next = NULL;
list_len++;
if (VC_CLUSTER_CLOSED == vc->type) {
vc->in_vcs = false;
- vc->type = VC_NULL;
+ vc->type = VC_NULL;
clusterVCAllocator.free(vc);
vc = vc_next;
continue;
@@ -1543,10 +1543,10 @@ ClusterHandler::build_write_descriptors()
CLUSTER_SUM_DYN_STAT(CLUSTER_VC_WRITE_LIST_LEN_STAT, list_len);
}
- tcount = write.msg.count + 2;
+ tcount = write.msg.count + 2;
vc_next = (ClusterVConnection *)write_vcs[count_bucket].head;
while (vc_next) {
- vc = vc_next;
+ vc = vc_next;
vc_next = (ClusterVConnection *)vc->write.link.next;
if (VC_CLUSTER_CLOSED == vc->type) {
@@ -1566,11 +1566,11 @@ ClusterHandler::build_write_descriptors()
if ((vc->remote_free > (vc->write.vio.ndone - vc->write_list_bytes)) && channels[vc->channel] == vc) {
ink_assert(vc->write_list && vc->write_list_bytes);
- int d = write.msg.count;
- write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
- write.msg.descriptor[d].channel = vc->channel;
+ int d = write.msg.count;
+ write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
+ write.msg.descriptor[d].channel = vc->channel;
write.msg.descriptor[d].sequence_number = vc->token.sequence_number;
- int s = vc->write_list_bytes;
+ int s = vc->write_list_bytes;
ink_release_assert(s <= MAX_CLUSTER_SEND_LENGTH);
// Transfer no more than nbytes
@@ -1578,7 +1578,7 @@ ClusterHandler::build_write_descriptors()
s = vc->write.vio.nbytes - (vc->write.vio.ndone - s);
if ((vc->write.vio.ndone - s) > vc->remote_free)
- s = vc->remote_free - (vc->write.vio.ndone - s);
+ s = vc->remote_free - (vc->write.vio.ndone - s);
write.msg.descriptor[d].length = s;
write.msg.count++;
tcount++;
@@ -1610,11 +1610,11 @@ ClusterHandler::build_freespace_descriptors()
// write (struct iovec system maximum) and for pending elements already
// in the list.
//
- int count_bucket = cur_vcs;
- int tcount = write.msg.count + 2; // count + descriptor require 2 iovec(s)
+ int count_bucket = cur_vcs;
+ int tcount = write.msg.count + 2; // count + descriptor require 2 iovec(s)
int freespace_descriptors_built = 0;
- int s = 0;
- int list_len = 0;
+ int s = 0;
+ int list_len = 0;
ClusterVConnection *vc, *vc_next;
//
@@ -1623,12 +1623,12 @@ ClusterHandler::build_freespace_descriptors()
vc = (ClusterVConnection *)ink_atomiclist_popall(&read_vcs_ready);
while (vc) {
enter_exit(&cls_build_reads_entered, &cls_reads_exited);
- vc_next = (ClusterVConnection *)vc->ready_alink.next;
+ vc_next = (ClusterVConnection *)vc->ready_alink.next;
vc->ready_alink.next = NULL;
list_len++;
if (VC_CLUSTER_CLOSED == vc->type) {
vc->in_vcs = false;
- vc->type = VC_NULL;
+ vc->type = VC_NULL;
clusterVCAllocator.free(vc);
vc = vc_next;
continue;
@@ -1647,10 +1647,10 @@ ClusterHandler::build_freespace_descriptors()
CLUSTER_SUM_DYN_STAT(CLUSTER_VC_READ_LIST_LEN_STAT, list_len);
}
- tcount = write.msg.count + 2;
+ tcount = write.msg.count + 2;
vc_next = (ClusterVConnection *)read_vcs[count_bucket].head;
while (vc_next) {
- vc = vc_next;
+ vc = vc_next;
vc_next = (ClusterVConnection *)vc->read.link.next;
if (VC_CLUSTER_CLOSED == vc->type) {
@@ -1668,14 +1668,14 @@ ClusterHandler::build_freespace_descriptors()
} else if (s) {
if (vc_ok_read(vc) && channels[vc->channel] == vc) {
// Send free space only if changed
- int d = write.msg.count;
- write.msg.descriptor[d].type = CLUSTER_SEND_FREE;
- write.msg.descriptor[d].channel = vc->channel;
+ int d = write.msg.count;
+ write.msg.descriptor[d].type = CLUSTER_SEND_FREE;
+ write.msg.descriptor[d].channel = vc->channel;
write.msg.descriptor[d].sequence_number = vc->token.sequence_number;
ink_assert(s > 0);
write.msg.descriptor[d].length = s;
- vc->last_local_free = s;
+ vc->last_local_free = s;
Debug(CL_PROTO, "(%d) free space priority %d", vc->channel, vc->read.priority);
write.msg.count++;
tcount++;
@@ -1695,15 +1695,15 @@ ClusterHandler::build_controlmsg_descriptors()
// write (struct iovec system maximum) and for elements already
// in the list.
//
- int tcount = write.msg.count + 2; // count + descriptor require 2 iovec(s)
+ int tcount = write.msg.count + 2; // count + descriptor require 2 iovec(s)
int control_msgs_built = 0;
bool compound_msg; // msg + chan data
//
// Build descriptors for control messages
//
OutgoingControl *c = NULL;
- int control_bytes = 0;
- int q = 0;
+ int control_bytes = 0;
+ int q = 0;
while (tcount < (MAX_TCOUNT - 1)) { // -1 to allow for compound messages
c = outgoing_control[q].pop();
@@ -1719,7 +1719,7 @@ ClusterHandler::build_controlmsg_descriptors()
}
}
while (c) {
- c_next = (OutgoingControl *)c->link.next;
+ c_next = (OutgoingControl *)c->link.next;
c->link.next = NULL;
outgoing_control[q].push(c);
c = c_next;
@@ -1747,9 +1747,9 @@ ClusterHandler::build_controlmsg_descriptors()
if (compound_msg) {
// Extract out components of compound message.
invoke_remote_data_args *cmhdr = (invoke_remote_data_args *)(c->data + sizeof(int32_t));
- OutgoingControl *oc_header = c;
- OutgoingControl *oc_msg = cmhdr->msg_oc;
- OutgoingControl *oc_data = cmhdr->data_oc;
+ OutgoingControl *oc_header = c;
+ OutgoingControl *oc_msg = cmhdr->msg_oc;
+ OutgoingControl *oc_data = cmhdr->data_oc;
ink_assert(cmhdr->magicno == invoke_remote_data_args::MagicNo);
//
@@ -1759,10 +1759,10 @@ ClusterHandler::build_controlmsg_descriptors()
// Not an issue today since channel data is always processed first.
//
int d;
- d = write.msg.count;
- write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
- write.msg.descriptor[d].channel = cmhdr->dest_channel;
- write.msg.descriptor[d].length = oc_data->len;
+ d = write.msg.count;
+ write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
+ write.msg.descriptor[d].channel = cmhdr->dest_channel;
+ write.msg.descriptor[d].length = oc_data->len;
write.msg.descriptor[d].sequence_number = cmhdr->token.sequence_number;
#ifdef CLUSTER_STATS
@@ -1782,9 +1782,9 @@ ClusterHandler::build_controlmsg_descriptors()
control_msgs_built++;
d = write.msg.count;
write.msg.outgoing_control.enqueue(oc_msg);
- write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
+ write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
write.msg.descriptor[d].channel = CLUSTER_CONTROL_CHANNEL;
- write.msg.descriptor[d].length = oc_msg->len;
+ write.msg.descriptor[d].length = oc_msg->len;
#ifdef CLUSTER_STATS
_control_write_bytes += oc_msg->len;
@@ -1820,10 +1820,10 @@ ClusterHandler::build_controlmsg_descriptors()
} else {
write.msg.outgoing_control.enqueue(c);
- int d = write.msg.count;
- write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
+ int d = write.msg.count;
+ write.msg.descriptor[d].type = CLUSTER_SEND_DATA;
write.msg.descriptor[d].channel = CLUSTER_CONTROL_CHANNEL;
- write.msg.descriptor[d].length = c->len;
+ write.msg.descriptor[d].length = c->len;
#ifdef CLUSTER_STATS
_control_write_bytes += c->len;
@@ -1847,7 +1847,7 @@ ClusterHandler::add_small_controlmsg_descriptors()
//
// Move small control message data to free space after descriptors
//
- char *p = (char *)&write.msg.descriptor[write.msg.count];
+ char *p = (char *)&write.msg.descriptor[write.msg.count];
OutgoingControl *c = NULL;
while ((c = write.msg.outgoing_small_control.dequeue())) {
@@ -1876,7 +1876,7 @@ struct DestructorLock {
DestructorLock(EThread *thread)
{
have_lock = false;
- t = thread;
+ t = thread;
}
~DestructorLock()
{
@@ -1925,8 +1925,8 @@ retry:
ink_assert(lock.m);
#endif
vc->write_locked = lock.m;
- lock.m = 0;
- lock.have_lock = false;
+ lock.m = 0;
+ lock.have_lock = false;
return 1;
} else {
if (!vc->write_bytes_in_transit) {
@@ -2007,8 +2007,8 @@ retry:
//
MIOBufferAccessor &buf = s->vio.buffer;
- int64_t towrite = buf.reader()->read_avail();
- int64_t ntodo = s->vio.ntodo();
+ int64_t towrite = buf.reader()->read_avail();
+ int64_t ntodo = s->vio.ntodo();
bool write_vc_signal = false;
if (towrite > ntodo)
@@ -2069,8 +2069,8 @@ retry:
ink_assert(s->vio.mutex);
#endif
vc->write_locked = lock.m;
- lock.m = 0;
- lock.have_lock = false;
+ lock.m = 0;
+ lock.have_lock = false;
return 1;
} else {
if (!write_vc_signal && buf.writer()->write_avail() && towrite != ntodo)
@@ -2346,13 +2346,13 @@ ClusterHandler::build_poll(bool next)
{
Pollfd *pfd;
if (next) {
- pfd = thread->nextPollDescriptor->alloc();
+ pfd = thread->nextPollDescriptor->alloc();
pfd->fd = net_vc->get_socket();
- ifd = pfd - thread->nextPollDescriptor->pfd;
+ ifd = pfd - thread->nextPollDescriptor->pfd;
} else {
- pfd = thread->pollDescriptor->alloc();
+ pfd = thread->pollDescriptor->alloc();
pfd->fd = net_vc->get_socket();
- ifd = pfd - thread->pollDescriptor->pfd;
+ ifd = pfd - thread->pollDescriptor->pfd;
}
pfd->events = POLLHUP;
if (next) {
@@ -2435,7 +2435,7 @@ ClusterHandler::mainClusterEvent(int event, Event *e)
int res;
while (io_activity) {
- io_activity = 0;
+ io_activity = 0;
only_write_control_msgs = 0;
if (downing) {
@@ -2571,11 +2571,11 @@ int ClusterHandler::process_read(ink_hrtime /* now ATS_UNUSED */)
if (needByteSwap) {
read.msg.hdr()->SwapBytes();
}
- read.msg.count = read.msg.hdr()->count;
- read.msg.control_bytes = read.msg.hdr()->control_bytes;
- read.msg.descriptor_cksum = read.msg.hdr()->descriptor_cksum;
+ read.msg.count = read.msg.hdr()->count;
+ read.msg.control_bytes = read.msg.hdr()->control_bytes;
+ read.msg.descriptor_cksum = read.msg.hdr()->descriptor_cksum;
read.msg.control_bytes_cksum = read.msg.hdr()->control_bytes_cksum;
- read.msg.unused = read.msg.hdr()->unused;
+ read.msg.unused = read.msg.hdr()->unused;
if (MAGIC_COUNT(read) != read.msg.hdr()->count_check) {
ink_assert(!"Read bad ClusterMsgHeader data");
@@ -2661,7 +2661,7 @@ int ClusterHandler::process_read(ink_hrtime /* now ATS_UNUSED */)
}
if (read.msg.count == 0) {
read.bytes_xfered = 0;
- read.state = ClusterState::READ_COMPLETE;
+ read.state = ClusterState::READ_COMPLETE;
} else {
read.msg.state++;
read.state = ClusterState::READ_SETUP_DATA;
@@ -2804,12 +2804,12 @@ ClusterHandler::process_write(ink_hrtime now, bool only_write_control_msgs)
_n_write_start++;
#endif
write.msg.clear();
- write.last_time = Thread::get_hrtime();
- pw_write_descriptors_built = -1;
- pw_freespace_descriptors_built = -1;
+ write.last_time = Thread::get_hrtime();
+ pw_write_descriptors_built = -1;
+ pw_freespace_descriptors_built = -1;
pw_controldata_descriptors_built = -1;
- pw_time_expired = 0;
- write.state = ClusterState::WRITE_SETUP;
+ pw_time_expired = 0;
+ write.state = ClusterState::WRITE_SETUP;
break;
}
///////////////////////////////////////////////
@@ -2842,8 +2842,8 @@ ClusterHandler::process_write(ink_hrtime now, bool only_write_control_msgs)
/////////////////////////////////////////////////////////////
// Build a write descriptor only containing control data.
/////////////////////////////////////////////////////////////
- pw_write_descriptors_built = 0;
- pw_freespace_descriptors_built = 0;
+ pw_write_descriptors_built = 0;
+ pw_freespace_descriptors_built = 0;
pw_controldata_descriptors_built = build_controlmsg_descriptors();
add_small_controlmsg_descriptors(); // always last
}
@@ -2854,21 +2854,21 @@ ClusterHandler::process_write(ink_hrtime now, bool only_write_control_msgs)
break;
} else {
started_on_stolen_thread = on_stolen_thread;
- control_message_write = only_write_control_msgs;
+ control_message_write = only_write_control_msgs;
}
// Move required data into the message header
#ifdef CLUSTER_MESSAGE_CKSUM
- write.msg.descriptor_cksum = write.msg.calc_descriptor_cksum();
+ write.msg.descriptor_cksum = write.msg.calc_descriptor_cksum();
write.msg.hdr()->descriptor_cksum = write.msg.descriptor_cksum;
- write.msg.control_bytes_cksum = write.msg.calc_control_bytes_cksum();
+ write.msg.control_bytes_cksum = write.msg.calc_control_bytes_cksum();
write.msg.hdr()->control_bytes_cksum = write.msg.control_bytes_cksum;
- write.msg.unused = 0;
+ write.msg.unused = 0;
#endif
- write.msg.hdr()->count = write.msg.count;
+ write.msg.hdr()->count = write.msg.count;
write.msg.hdr()->control_bytes = write.msg.control_bytes;
- write.msg.hdr()->count_check = MAGIC_COUNT(write);
+ write.msg.hdr()->count_check = MAGIC_COUNT(write);
ink_release_assert(build_initial_vector(CLUSTER_WRITE));
free_locks(CLUSTER_WRITE);
@@ -2951,7 +2951,7 @@ ClusterHandler::process_write(ink_hrtime now, bool only_write_control_msgs)
#ifdef CLUSTER_STATS
_n_write_complete++;
#endif
- write.state = ClusterState::WRITE_START;
+ write.state = ClusterState::WRITE_START;
ink_hrtime curtime = Thread::get_hrtime();
if (!on_stolen_thread) {
@@ -3034,7 +3034,7 @@ ClusterHandler::do_open_local_requests()
break;
while (cvc_ext) {
- cvc_ext_next = (ClusterVConnection *)cvc_ext->link.next;
+ cvc_ext_next = (ClusterVConnection *)cvc_ext->link.next;
cvc_ext->link.next = NULL;
local_incoming_open_local.push(cvc_ext);
cvc_ext = cvc_ext_next;
diff --git a/iocore/cluster/ClusterHandlerBase.cc b/iocore/cluster/ClusterHandlerBase.cc
index a396f7c..3074714 100644
--- a/iocore/cluster/ClusterHandlerBase.cc
+++ b/iocore/cluster/ClusterHandlerBase.cc
@@ -67,13 +67,13 @@ ClusterControl::ClusterControl()
void
ClusterControl::real_alloc_data(int read_access, bool align_int32_on_non_int64_boundary)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
ink_assert(!data);
if ((len + DATA_HDR + sizeof(int32_t)) <= DEFAULT_MAX_BUFFER_SIZE) {
size_index = buffer_size_to_index(len + DATA_HDR + sizeof(int32_t), MAX_BUFFER_SIZE_INDEX);
- iob_block = new_IOBufferBlock();
+ iob_block = new_IOBufferBlock();
iob_block->alloc(size_index); // aligns on 8 byte boundary
real_data = (int64_t *)iob_block->buf();
@@ -83,9 +83,9 @@ ClusterControl::real_alloc_data(int read_access, bool align_int32_on_non_int64_b
data = ((char *)real_data) + DATA_HDR;
}
} else {
- int size = sizeof(int64_t) * (((len + DATA_HDR + sizeof(int32_t) + sizeof(int64_t) - 1) / sizeof(int64_t)) + 1);
+ int size = sizeof(int64_t) * (((len + DATA_HDR + sizeof(int32_t) + sizeof(int64_t) - 1) / sizeof(int64_t)) + 1);
size_index = -1;
- iob_block = new_IOBufferBlock();
+ iob_block = new_IOBufferBlock();
iob_block->alloc(BUFFER_SIZE_FOR_XMALLOC(size));
real_data = (int64_t *)iob_block->buf();
@@ -112,7 +112,7 @@ ClusterControl::real_alloc_data(int read_access, bool align_int32_on_non_int64_b
// Write size_index, magic number and 'this' in leading bytes
char *size_index_ptr = (char *)data - DATA_HDR;
- *size_index_ptr = size_index;
+ *size_index_ptr = size_index;
++size_index_ptr;
*size_index_ptr = (char)ALLOC_DATA_MAGIC;
@@ -192,7 +192,7 @@ OutgoingControl::startEvent(int event, Event *e)
return EVENT_DONE;
int32_t cluster_fn = *(int32_t *)this->data;
- int32_t pri = ClusterFuncToQpri(cluster_fn);
+ int32_t pri = ClusterFuncToQpri(cluster_fn);
ink_atomiclist_push(&ch->outgoing_control_al[pri], (void *)this);
return EVENT_DONE;
@@ -242,7 +242,7 @@ ClusterState::ClusterState(ClusterHandler *c, bool read_chan)
state = ClusterState::WRITE_START;
SET_HANDLER(&ClusterState::doIO_write_event);
}
- last_time = HRTIME_SECONDS(0);
+ last_time = HRTIME_SECONDS(0);
start_time = HRTIME_SECONDS(0);
int size;
//
@@ -254,16 +254,16 @@ ClusterState::ClusterState(ClusterHandler *c, bool read_chan)
// Place an invalid page in front of iovec data.
//////////////////////////////////////////////////
size_t pagesize = ats_pagesize();
- size = ((MAX_TCOUNT + 1) * sizeof(IOVec)) + (2 * pagesize);
- iob_iov = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(size));
- char *addr = (char *)align_pointer_forward(iob_iov->data(), pagesize);
+ size = ((MAX_TCOUNT + 1) * sizeof(IOVec)) + (2 * pagesize);
+ iob_iov = new_IOBufferData(BUFFER_SIZE_FOR_XMALLOC(size));
+ char *addr = (char *)align_pointer_forward(iob_iov->data(), pagesize);
iov = (IOVec *)(addr + pagesize);
///////////////////////////////////////////////////
// Place an invalid page in front of message data.
///////////////////////////////////////////////////
- size = sizeof(ClusterMsgHeader) + (MAX_TCOUNT + 1) * sizeof(Descriptor) + CONTROL_DATA + (2 * pagesize);
+ size = sizeof(ClusterMsgHeader) + (MAX_TCOUNT + 1) * sizeof(Descriptor) + CONTROL_DATA + (2 * pagesize);
msg.iob_descriptor_block = new_IOBufferBlock();
msg.iob_descriptor_block->alloc(BUFFER_SIZE_FOR_XMALLOC(size));
@@ -385,7 +385,7 @@ ClusterState::doIO()
v->nbytes = to_do + did;
ink_release_assert(v->nbytes > v->ndone);
- io_complete = false;
+ io_complete = false;
io_complete_event = 0;
REENABLE_IO();
@@ -393,10 +393,10 @@ ClusterState::doIO()
// Start new do_io_xxx operation.
// Initialize globals
- io_complete = false;
+ io_complete = false;
io_complete_event = 0;
- bytes_xfered = 0;
- last_ndone = 0;
+ bytes_xfered = 0;
+ last_ndone = 0;
build_do_io_vector();
@@ -411,7 +411,7 @@ ClusterState::doIO()
} else {
IOBufferReader *r = mbuf->alloc_reader();
- r->block = mbuf->_writer;
+ r->block = mbuf->_writer;
ink_assert(r->read_avail() == to_do);
#ifdef CLUSTER_IMMEDIATE_NETIO
v = ch->net_vc->do_io_write_now(this, to_do, r);
@@ -446,7 +446,7 @@ ClusterState::doIO_read_event(int event, void *d)
did += bytes_xfered;
to_do -= bytes_xfered;
}
- last_ndone = v->ndone;
+ last_ndone = v->ndone;
io_complete_event = event;
INK_WRITE_MEMORY_BARRIER;
@@ -622,17 +622,17 @@ ClusterHandler::check_channel(int c)
for (int i = old_channels; i < n_channels; i++) {
if (local_channel(i)) {
if (i > LAST_DEDICATED_CHANNEL) {
- channels[i] = (ClusterVConnection *)1; // mark as invalid
+ channels[i] = (ClusterVConnection *)1; // mark as invalid
channel_data[i] = (struct ChannelData *)ats_malloc(sizeof(struct ChannelData));
memset(channel_data[i], 0, sizeof(struct ChannelData));
channel_data[i]->channel_number = i;
free_local_channels.enqueue(channel_data[i]);
} else {
- channels[i] = NULL;
+ channels[i] = NULL;
channel_data[i] = NULL;
}
} else {
- channels[i] = NULL;
+ channels[i] = NULL;
channel_data[i] = NULL;
}
}
@@ -647,7 +647,7 @@ ClusterHandler::alloc_channel(ClusterVConnection *vc, int requested)
// Allocate a channel
//
struct ChannelData *cdp = 0;
- int i = requested;
+ int i = requested;
if (!i) {
int loops = 1;
@@ -732,11 +732,11 @@ ClusterHandler::machine_down()
net_vc = 0;
}
// Cancel pending cluster reads and writes
- read.io_complete = -1;
+ read.io_complete = -1;
write.io_complete = -1;
MUTEX_TAKE_LOCK(the_cluster_config_mutex, this_ethread());
- ClusterConfiguration *c = this_cluster()->current_configuration();
+ ClusterConfiguration *c = this_cluster()->current_configuration();
machine->clusterHandlers[id] = NULL;
if ((--machine->now_connections == 0) && c->find(ip, port)) {
ClusterConfiguration *cc = configuration_remove_machine(c, machine);
@@ -808,12 +808,12 @@ ClusterHandler::connectClusterEvent(int event, Event *e)
NetVCOptions opt;
opt.socket_send_bufsize = cluster_send_buffer_size;
opt.socket_recv_bufsize = cluster_receive_buffer_size;
- opt.sockopt_flags = cluster_sockopt_flags;
- opt.packet_mark = cluster_packet_mark;
- opt.packet_tos = cluster_packet_tos;
- opt.etype = ET_CLUSTER;
- opt.addr_binding = NetVCOptions::INTF_ADDR;
- opt.local_ip = this_cluster_machine()->ip;
+ opt.sockopt_flags = cluster_sockopt_flags;
+ opt.packet_mark = cluster_packet_mark;
+ opt.packet_tos = cluster_packet_tos;
+ opt.etype = ET_CLUSTER;
+ opt.addr_binding = NetVCOptions::INTF_ADDR;
+ opt.local_ip = this_cluster_machine()->ip;
struct sockaddr_in addr;
ats_ip4_set(&addr, machine->ip, htons(machine->cluster_port ? machine->cluster_port : cluster_port));
@@ -1034,7 +1034,7 @@ ClusterHandler::startClusterEvent(int event, Event *e)
case ClusterHandler::CLCON_CONN_BIND: {
//
- NetHandler *nh = get_NetHandler(e->ethread);
+ NetHandler *nh = get_NetHandler(e->ethread);
UnixNetVConnection *vc = (UnixNetVConnection *)net_vc;
MUTEX_TRY_LOCK(lock, nh->mutex, e->ethread);
MUTEX_TRY_LOCK(lock1, vc->mutex, e->ethread);
@@ -1044,8 +1044,8 @@ ClusterHandler::startClusterEvent(int event, Event *e)
if (vc->write.in_enabled_list)
nh->write_enable_list.push(vc);
- vc->nh = nh;
- vc->thread = e->ethread;
+ vc->nh = nh;
+ vc->thread = e->ethread;
PollDescriptor *pd = get_PollDescriptor(e->ethread);
if (vc->ep.start(pd, vc, EVENTIO_READ | EVENTIO_WRITE) < 0) {
cluster_connect_state = ClusterHandler::CLCON_DELETE_CONNECT;
@@ -1068,7 +1068,7 @@ ClusterHandler::startClusterEvent(int event, Event *e)
MachineList *cc = the_cluster_config();
if (cc && cc->find(ip, port)) {
ClusterConfiguration *c = this_cluster()->current_configuration();
- ClusterMachine *m = c->find(ip, port);
+ ClusterMachine *m = c->find(ip, port);
if (!m) { // this first connection
ClusterConfiguration *cconf = configuration_add_machine(c, machine);
@@ -1085,8 +1085,8 @@ ClusterHandler::startClusterEvent(int event, Event *e)
}
machine->now_connections++;
machine->clusterHandlers[id] = this;
- machine->dead = false;
- dead = false;
+ machine->dead = false;
+ dead = false;
} else {
Debug(CL_NOTE, "cluster connect aborted, machine %u.%u.%u.%u:%d not in cluster", DOT_SEPARATED(ip), port);
failed = -1;
@@ -1118,12 +1118,12 @@ ClusterHandler::startClusterEvent(int event, Event *e)
clusteringVersion._minor);
#endif
- read_vcs = new Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_read_link>[CLUSTER_BUCKETS];
+ read_vcs = new Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_read_link>[CLUSTER_BUCKETS];
write_vcs = new Queue<ClusterVConnectionBase, ClusterVConnectionBase::Link_write_link>[CLUSTER_BUCKETS];
SET_HANDLER((ClusterContHandler)&ClusterHandler::beginClusterEvent);
// enable schedule_imm() on i/o completion (optimization)
- read.do_iodone_event = true;
+ read.do_iodone_event = true;
write.do_iodone_event = true;
cluster_periodic_event = thread->schedule_every(this, -CLUSTER_PERIOD);
@@ -1131,10 +1131,10 @@ ClusterHandler::startClusterEvent(int event, Event *e)
// Startup the periodic events to process entries in
// external_incoming_control.
- int procs_online = ink_number_of_processors();
+ int procs_online = ink_number_of_processors();
int total_callbacks = min(procs_online, MAX_COMPLETION_CALLBACK_EVENTS);
for (int n = 0; n < total_callbacks; ++n) {
- callout_cont[n] = new ClusterCalloutContinuation(this);
+ callout_cont[n] = new ClusterCalloutContinuation(this);
callout_events[n] = eventProcessor.schedule_every(callout_cont[n], COMPLETION_CALLBACK_PERIOD, ET_NET);
}
@@ -1216,9 +1216,9 @@ ClusterHandler::protoZombieEvent(int /* event ATS_UNUSED */, Event *e)
// After cleanup is complete, setup handler to delete *this
// after NO_RACE_DELAY
//
- bool failed = false;
+ bool failed = false;
ink_hrtime delay = CLUSTER_MEMBER_DELAY * 5;
- EThread *t = e ? e->ethread : this_ethread();
+ EThread *t = e ? e->ethread : this_ethread();
head_p item;
/////////////////////////////////////////////////////////////////
@@ -1243,7 +1243,7 @@ ClusterHandler::protoZombieEvent(int /* event ATS_UNUSED */, Event *e)
///////////////////////////////////////////////////////////////
IncomingControl *ic;
while ((ic = incoming_control.dequeue())) {
- failed = true;
+ failed = true;
ic->mutex = NULL;
ic->freeall();
}
@@ -1275,10 +1275,10 @@ ClusterHandler::protoZombieEvent(int /* event ATS_UNUSED */, Event *e)
vc = channels[i];
if (VALID_CHANNEL(vc)) {
if (vc->closed) {
- vc->ch = 0;
- vc->write_list = 0;
- vc->write_list_tail = 0;
- vc->write_list_bytes = 0;
+ vc->ch = 0;
+ vc->write_list = 0;
+ vc->write_list_tail = 0;
+ vc->write_list_bytes = 0;
vc->write_bytes_in_transit = 0;
close_ClusterVConnection(vc);
} else {
@@ -1331,7 +1331,7 @@ int
ClusterHandler::compute_active_channels()
{
ClusterHandler *ch = this;
- int active_chans = 0;
+ int active_chans = 0;
for (int i = LAST_DEDICATED_CHANNEL + 1; i < ch->n_channels; i++) {
ClusterVConnection *vc = ch->channels[i];
@@ -1355,8 +1355,8 @@ ClusterHandler::dump_internal_data()
message_blk->alloc(MAX_IOBUFFER_SIZE);
}
int r;
- int n = 0;
- char *b = message_blk->data->data();
+ int n = 0;
+ char *b = message_blk->data->data();
unsigned int b_size = message_blk->data->block_size();
r = snprintf(&b[n], b_size - n, "Host: %hhu.%hhu.%hhu.%hhu\n", DOT_SEPARATED(ip));
diff --git a/iocore/cluster/ClusterHash.cc b/iocore/cluster/ClusterHash.cc
index ea2d583..0498512 100644
--- a/iocore/cluster/ClusterHash.cc
+++ b/iocore/cluster/ClusterHash.cc
@@ -43,8 +43,8 @@
// These are only global for testing purposes.
//
bool machineClusterHash = true;
-bool boundClusterHash = false;
-bool randClusterHash = false;
+bool boundClusterHash = false;
+bool randClusterHash = false;
// This produces better speed for large numbers of machines > 18
//
@@ -68,9 +68,9 @@ inline unsigned short
next_rnd15(unsigned int *p)
{
unsigned int seed = *p;
- seed = 1103515145 * seed + 12345;
- seed = seed & 0x7FFF;
- *p = seed;
+ seed = 1103515145 * seed + 12345;
+ seed = seed & 0x7FFF;
+ *p = seed;
return seed;
}
@@ -86,27 +86,27 @@ void
build_hash_table_machine(ClusterConfiguration *c)
{
int left = CLUSTER_HASH_TABLE_SIZE;
- int m = 0;
- int i = 0;
+ int m = 0;
+ int i = 0;
unsigned int rnd[CLUSTER_MAX_MACHINES];
unsigned int mach[CLUSTER_MAX_MACHINES];
int total = CLUSTER_HASH_TABLE_SIZE;
for (i = 0; i < c->n_machines; i++) {
int mine = total / (c->n_machines - i);
- mach[i] = mine;
+ mach[i] = mine;
total -= mine;
}
// seed the random number generator with the ip address
// do a little xor folding to get it into 15 bits
//
- for (m = 0; m < c->n_machines; m++)
+ for (m = 0; m < c->n_machines; m++)
rnd[m] = (((c->machines[m]->ip >> 15) & 0x7FFF) ^ (c->machines[m]->ip & 0x7FFF)) ^ (c->machines[m]->ip >> 30);
// Initialize the table to "empty"
//
- for (i = 0; i < CLUSTER_HASH_TABLE_SIZE; i++)
+ for (i = 0; i < CLUSTER_HASH_TABLE_SIZE; i++)
c->hash_table[i] = 255;
// Until we have hit every element of the table, give each
@@ -141,11 +141,11 @@ build_hash_table_bucket(ClusterConfiguration *c)
for (i = 0; i < c->n_machines; i++) {
int mine = total / (c->n_machines - i);
- mach[i] = mine;
+ mach[i] = mine;
total -= mine;
}
- for (i = 0; i < CLUSTER_HASH_TABLE_SIZE; i++)
+ for (i = 0; i < CLUSTER_HASH_TABLE_SIZE; i++)
rnd[i] = i;
for (i = 0; i < CLUSTER_HASH_TABLE_SIZE; i++) {
diff --git a/iocore/cluster/ClusterLib.cc b/iocore/cluster/ClusterLib.cc
index cd24208..a255618 100644
--- a/iocore/cluster/ClusterLib.cc
+++ b/iocore/cluster/ClusterLib.cc
@@ -96,9 +96,9 @@ clone_IOBufferBlockList(IOBufferBlock *b, int start_off, int n, IOBufferBlock **
////////////////////////////////////////////////////////////////
int64_t nbytes = n;
int64_t block_read_avail;
- int64_t bytes_to_skip = start_off;
- IOBufferBlock *bsrc = b;
- IOBufferBlock *bclone = 0;
+ int64_t bytes_to_skip = start_off;
+ IOBufferBlock *bsrc = b;
+ IOBufferBlock *bclone = 0;
IOBufferBlock *bclone_head = 0;
while (bsrc && nbytes) {
@@ -110,7 +110,7 @@ clone_IOBufferBlockList(IOBufferBlock *b, int start_off, int n, IOBufferBlock **
if (bclone_head) {
bclone->next = bsrc->clone();
- bclone = bclone->next;
+ bclone = bclone->next;
} else {
// Skip bytes already processed
if (bytes_to_skip) {
@@ -120,7 +120,7 @@ clone_IOBufferBlockList(IOBufferBlock *b, int start_off, int n, IOBufferBlock **
// Skip bytes in current block
bclone_head = bsrc->clone();
bclone_head->consume(bsrc->read_avail() + bytes_to_skip);
- bclone = bclone_head;
+ bclone = bclone_head;
bytes_to_skip = 0;
} else {
@@ -130,7 +130,7 @@ clone_IOBufferBlockList(IOBufferBlock *b, int start_off, int n, IOBufferBlock **
}
} else {
bclone_head = bsrc->clone();
- bclone = bclone_head;
+ bclone = bclone_head;
}
}
block_read_avail = bclone->read_avail();
@@ -151,7 +151,7 @@ IOBufferBlock *
consume_IOBufferBlockList(IOBufferBlock *b, int64_t n)
{
IOBufferBlock *b_remainder = 0;
- int64_t nbytes = n;
+ int64_t nbytes = n;
while (b) {
nbytes -= b->read_avail();
@@ -162,8 +162,8 @@ consume_IOBufferBlockList(IOBufferBlock *b, int64_t n)
b->fill(nbytes); // make read_avail match nbytes
b_remainder->consume(b->read_avail()); // clone for remaining bytes
b_remainder->next = b->next;
- b->next = 0;
- nbytes = 0;
+ b->next = 0;
+ nbytes = 0;
} else {
// Consumed entire block
@@ -207,17 +207,17 @@ int
partial_readv(int fd, IOVec *iov, int n_iov, int seq)
{
IOVec tiov[16];
- for (int i = 0; i < n_iov; i++)
- tiov[i] = iov[i];
- int tn_iov = n_iov;
- int rnd = seq;
+ for (int i = 0; i < n_iov; i++)
+ tiov[i] = iov[i];
+ int tn_iov = n_iov;
+ int rnd = seq;
int element = rand_r((unsigned int *)&rnd);
- element = element % n_iov;
- int byte = rand_r((unsigned int *)&rnd);
- byte = byte % iov[element].iov_len;
- int stop = rand_r((unsigned int *)&rnd);
+ element = element % n_iov;
+ int byte = rand_r((unsigned int *)&rnd);
+ byte = byte % iov[element].iov_len;
+ int stop = rand_r((unsigned int *)&rnd);
if (!(stop % 3)) { // 33% chance
- tn_iov = element + 1;
+ tn_iov = element + 1;
tiov[element].iov_len = byte;
if (!byte)
tn_iov--;
@@ -240,7 +240,7 @@ partial_writev(int fd, IOVec *iov, int n_iov, int seq)
{
int rnd = seq;
int sum = 0;
- int i = 0;
+ int i = 0;
for (i = 0; i < n_iov; i++) {
int l = iov[i].iov_len;
int r = rand_r((unsigned int *)&rnd);
diff --git a/iocore/cluster/ClusterLoadMonitor.cc b/iocore/cluster/ClusterLoadMonitor.cc
index 42af4cf..cf03f43 100644
--- a/iocore/cluster/ClusterLoadMonitor.cc
+++ b/iocore/cluster/ClusterLoadMonitor.cc
@@ -78,15 +78,15 @@ ClusterLoadMonitor::ClusterLoadMonitor(ClusterHandler *ch)
cluster_load_exceed_duration = cf_cluster_load_exceed_duration ? cf_cluster_load_exceed_duration : 4;
Debug("cluster_monitor", "cluster_load_exceed_duration=%d", cluster_load_exceed_duration);
- int nbytes = sizeof(int) * num_ping_response_buckets;
+ int nbytes = sizeof(int) * num_ping_response_buckets;
ping_response_buckets = (int *)ats_malloc(nbytes);
memset((char *)ping_response_buckets, 0, nbytes);
- nbytes = sizeof(ink_hrtime) * ping_history_buf_length;
+ nbytes = sizeof(ink_hrtime) * ping_history_buf_length;
ping_response_history_buf = (ink_hrtime *)ats_malloc(nbytes);
memset((char *)ping_response_history_buf, 0, nbytes);
- last_ping_message_sent = HRTIME_SECONDS(0);
+ last_ping_message_sent = HRTIME_SECONDS(0);
last_cluster_load_compute = HRTIME_SECONDS(0);
}
@@ -137,8 +137,8 @@ ClusterLoadMonitor::compute_cluster_load()
// buckets and averaging the results.
int n;
- int sum = 0;
- int entries = 0;
+ int sum = 0;
+ int entries = 0;
int n_bucket = 0;
for (n = 0; n < num_ping_response_buckets; ++n) {
@@ -161,7 +161,7 @@ ClusterLoadMonitor::compute_cluster_load()
// Log ping latency in history buffer.
ping_response_history_buf[ping_history_buf_head++] = current_ping_latency;
- ping_history_buf_head = ping_history_buf_head % ping_history_buf_length;
+ ping_history_buf_head = ping_history_buf_head % ping_history_buf_length;
// Determine the current state of the cluster interconnect using
// the configured limits. We determine the state as follows.
@@ -192,7 +192,7 @@ ClusterLoadMonitor::compute_cluster_load()
if (end < 0)
end += ping_history_buf_length;
- int threshold_clear = 0;
+ int threshold_clear = 0;
int threshold_exceeded = 0;
do {
if (ping_response_history_buf[start] >= ping_latency_threshold)
@@ -270,7 +270,7 @@ ClusterLoadMonitor::send_cluster_load_msg(ink_hrtime current_time)
struct cluster_load_ping_msg m(this);
m.sequence_number = cluster_load_msg_sequence_number++;
- m.send_time = current_time;
+ m.send_time = current_time;
cluster_ping(ch, cluster_load_ping_rethandler, (void *)&m, sizeof(m));
}
diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc
index 3dd80e8..fa37ee4 100644
--- a/iocore/cluster/ClusterMachine.cc
+++ b/iocore/cluster/ClusterMachine.cc
@@ -34,7 +34,7 @@
extern int num_of_cluster_threads;
MachineList *machines_config = NULL;
-MachineList *cluster_config = NULL;
+MachineList *cluster_config = NULL;
ProxyMutex *the_cluster_config_mutex;
@@ -62,7 +62,7 @@ void
create_this_cluster_machine()
{
the_cluster_config_mutex = new_ProxyMutex();
- cluster_machine = new ClusterMachine;
+ cluster_machine = new ClusterMachine;
}
ClusterMachine::ClusterMachine(char *ahostname, unsigned int aip, int aport)
@@ -78,7 +78,7 @@ ClusterMachine::ClusterMachine(char *ahostname, unsigned int aip, int aport)
msg_proto_minor(0),
clusterHandlers(0)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_MACHINES_ALLOCATED_STAT);
if (!aip) {
@@ -148,7 +148,7 @@ ClusterMachine::ClusterMachine(char *ahostname, unsigned int aip, int aport)
ClusterHandler *
ClusterMachine::pop_ClusterHandler(int no_rr)
{
- int find = 0;
+ int find = 0;
int64_t now = rr_count;
if (no_rr == 0) {
ink_atomic_increment(&rr_count, 1);
@@ -191,7 +191,7 @@ struct MachineTimeoutContinuation : public Continuation {
void
free_ClusterMachine(ClusterMachine *m)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
// delay before the final free
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_MACHINES_FREED_STAT);
@@ -223,7 +223,7 @@ read_MachineList(const char *filename, int afd)
if (n == -1 && ParseRules::is_digit(*line)) {
n = atoi(line);
if (n > 0) {
- l = (MachineList *)ats_malloc(sizeof(MachineList) + (n - 1) * sizeof(MachineListElement));
+ l = (MachineList *)ats_malloc(sizeof(MachineList) + (n - 1) * sizeof(MachineListElement));
l->n = 0;
} else {
l = NULL;
@@ -234,7 +234,7 @@ read_MachineList(const char *filename, int afd)
char *port = strchr(line, ':');
if (!port)
goto Lfail;
- *port++ = 0;
+ *port++ = 0;
l->machine[i].ip = inet_addr(line);
if (-1 == (int)l->machine[i].ip) {
if (afd == -1) {
diff --git a/iocore/cluster/ClusterProcessor.cc b/iocore/cluster/ClusterProcessor.cc
index e8655b6..56890c7 100644
--- a/iocore/cluster/ClusterProcessor.cc
+++ b/iocore/cluster/ClusterProcessor.cc
@@ -30,9 +30,9 @@
/*************************************************************************/
// ClusterProcessor member functions (Public class)
/*************************************************************************/
-int cluster_port_number = DEFAULT_CLUSTER_PORT_NUMBER;
+int cluster_port_number = DEFAULT_CLUSTER_PORT_NUMBER;
int cache_clustering_enabled = 0;
-int num_of_cluster_threads = DEFAULT_NUMBER_OF_CLUSTER_THREADS;
+int num_of_cluster_threads = DEFAULT_NUMBER_OF_CLUSTER_THREADS;
ClusterProcessor clusterProcessor;
RecRawStatBlock *cluster_rsb = NULL;
@@ -53,16 +53,16 @@ ClusterProcessor::~ClusterProcessor()
int
ClusterProcessor::internal_invoke_remote(ClusterHandler *ch, int cluster_fn, void *data, int len, int options, void *cmsg)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
//
// RPC facility for intercluster communication available to other
// subsystems.
//
- bool steal = (options & CLUSTER_OPT_STEAL ? true : false);
- bool delay = (options & CLUSTER_OPT_DELAY ? true : false);
+ bool steal = (options & CLUSTER_OPT_STEAL ? true : false);
+ bool delay = (options & CLUSTER_OPT_DELAY ? true : false);
bool data_in_ocntl = (options & CLUSTER_OPT_DATA_IS_OCONTROL ? true : false);
- bool malloced = (cluster_fn == CLUSTER_FUNCTION_MALLOCED);
+ bool malloced = (cluster_fn == CLUSTER_FUNCTION_MALLOCED);
OutgoingControl *c;
if (!ch || (!malloced && !((unsigned int)cluster_fn < (uint32_t)SIZE_clusterFunction))) {
@@ -117,7 +117,7 @@ ClusterProcessor::internal_invoke_remote(ClusterHandler *ch, int cluster_fn, voi
invoke_remote_data_args *args = (invoke_remote_data_args *)(((OutgoingControl *)cmsg)->data + sizeof(int32_t));
ink_assert(args->magicno == invoke_remote_data_args::MagicNo);
args->msg_oc = c;
- c = (OutgoingControl *)cmsg;
+ c = (OutgoingControl *)cmsg;
}
#ifndef CLUSTER_THREAD_STEALING
delay = true;
@@ -177,14 +177,14 @@ ClusterProcessor::invoke_remote_data(ClusterHandler *ch, int cluster_fn, void *d
// Build OutgoingControl for compound message header
invoke_remote_data_args mh;
- mh.msg_oc = 0;
- mh.data_oc = bufdata_oc;
+ mh.msg_oc = 0;
+ mh.data_oc = bufdata_oc;
mh.dest_channel = dest_channel;
- mh.token = *token;
+ mh.token = *token;
OutgoingControl *chdr = OutgoingControl::alloc();
- chdr->submit_time = Thread::get_hrtime();
- chdr->len = sizeof(int32_t) + sizeof(mh);
+ chdr->submit_time = Thread::get_hrtime();
+ chdr->len = sizeof(int32_t) + sizeof(mh);
chdr->alloc_data();
*(int32_t *)chdr->data = -1; // always -1 for compound message
memcpy(chdr->data + sizeof(int32_t), (char *)&mh, sizeof(mh));
@@ -196,7 +196,7 @@ ClusterProcessor::invoke_remote_data(ClusterHandler *ch, int cluster_fn, void *d
void
ClusterProcessor::free_remote_data(char *p, int /* l ATS_UNUSED */)
{
- char *d = p - sizeof(int32_t); // reset to ptr to function code
+ char *d = p - sizeof(int32_t); // reset to ptr to function code
int data_hdr = ClusterControl::DATA_HDR;
ink_release_assert(*((uint8_t *)(d - data_hdr + 1)) == (uint8_t)ALLOC_DATA_MAGIC);
@@ -228,7 +228,7 @@ ClusterProcessor::open_local(Continuation *cont, ClusterMachine * /* m ATS_UNUSE
// token and channel id in the remote request. The remote handler calls
// connect_local to establish the remote side of the connection.
//
- bool immediate = ((options & CLUSTER_OPT_IMMEDIATE) ? true : false);
+ bool immediate = ((options & CLUSTER_OPT_IMMEDIATE) ? true : false);
bool allow_immediate = ((options & CLUSTER_OPT_ALLOW_IMMEDIATE) ? true : false);
ClusterHandler *ch = ((CacheContinuation *)cont)->ch;
@@ -238,16 +238,16 @@ ClusterProcessor::open_local(Continuation *cont, ClusterMachine * /* m ATS_UNUSE
if (!t)
return NULL;
- EThread *thread = this_ethread();
- ProxyMutex *mutex = thread->mutex;
+ EThread *thread = this_ethread();
+ ProxyMutex *mutex = thread->mutex;
ClusterVConnection *vc = clusterVCAllocator.alloc();
- vc->new_connect_read = (options & CLUSTER_OPT_CONN_READ ? 1 : 0);
- vc->start_time = Thread::get_hrtime();
+ vc->new_connect_read = (options & CLUSTER_OPT_CONN_READ ? 1 : 0);
+ vc->start_time = Thread::get_hrtime();
vc->last_activity_time = vc->start_time;
- vc->ch = ch;
+ vc->ch = ch;
vc->token.alloc();
vc->token.ch_id = ch->id;
- token = vc->token;
+ token = vc->token;
#ifdef CLUSTER_THREAD_STEALING
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_CONNECTIONS_OPENNED_STAT);
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_CONNECTIONS_OPEN_STAT);
@@ -287,7 +287,7 @@ ClusterProcessor::connect_local(Continuation *cont, ClusterVCToken *token, int c
// Establish VC connection initiated by remote node on the local node
// using the given token and channel id.
//
- bool immediate = ((options & CLUSTER_OPT_IMMEDIATE) ? true : false);
+ bool immediate = ((options & CLUSTER_OPT_IMMEDIATE) ? true : false);
bool allow_immediate = ((options & CLUSTER_OPT_ALLOW_IMMEDIATE) ? true : false);
#ifdef LOCAL_CLUSTER_TEST_MODE
@@ -308,15 +308,15 @@ ClusterProcessor::connect_local(Continuation *cont, ClusterVCToken *token, int c
if (!t)
return NULL;
- EThread *thread = this_ethread();
- ProxyMutex *mutex = thread->mutex;
+ EThread *thread = this_ethread();
+ ProxyMutex *mutex = thread->mutex;
ClusterVConnection *vc = clusterVCAllocator.alloc();
- vc->new_connect_read = (options & CLUSTER_OPT_CONN_READ ? 1 : 0);
- vc->start_time = Thread::get_hrtime();
+ vc->new_connect_read = (options & CLUSTER_OPT_CONN_READ ? 1 : 0);
+ vc->start_time = Thread::get_hrtime();
vc->last_activity_time = vc->start_time;
- vc->ch = ch;
- vc->token = *token;
- vc->channel = channel;
+ vc->ch = ch;
+ vc->token = *token;
+ vc->channel = channel;
#ifdef CLUSTER_THREAD_STEALING
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_CONNECTIONS_OPENNED_STAT);
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_CONNECTIONS_OPEN_STAT);
@@ -327,7 +327,7 @@ ClusterProcessor::connect_local(Continuation *cont, ClusterVCToken *token, int c
clusterVCAllocator_free(vc);
return NULL;
}
- vc->mutex = ch->mutex;
+ vc->mutex = ch->mutex;
vc->action_ = cont;
ch->thread->schedule_imm_signal(vc);
return CLUSTER_DELAYED_OPEN;
@@ -368,14 +368,14 @@ GlobalClusterPeriodicEvent *PeriodicClusterEvent;
#ifdef CLUSTER_TOMCAT
extern int cache_clustering_enabled;
-int CacheClusterMonitorEnabled = 0;
+int CacheClusterMonitorEnabled = 0;
int CacheClusterMonitorIntervalSecs = 1;
-int cluster_send_buffer_size = 0;
-int cluster_receive_buffer_size = 0;
+int cluster_send_buffer_size = 0;
+int cluster_receive_buffer_size = 0;
unsigned long cluster_sockopt_flags = 0;
-unsigned long cluster_packet_mark = 0;
-unsigned long cluster_packet_tos = 0;
+unsigned long cluster_packet_mark = 0;
+unsigned long cluster_packet_tos = 0;
int RPC_only_CacheCluster = 0;
#endif
@@ -631,10 +631,10 @@ ClusterProcessor::init()
PeriodicClusterEvent = new GlobalClusterPeriodicEvent;
PeriodicClusterEvent->init();
- this_cluster = new Cluster;
+ this_cluster = new Cluster;
ClusterConfiguration *cc = new ClusterConfiguration;
this_cluster->configurations.push(cc);
- cc->n_machines = 1;
+ cc->n_machines = 1;
cc->machines[0] = this_cluster_machine();
memset(cc->hash_table, 0, CLUSTER_HASH_TABLE_SIZE);
// 0 dummy output data
@@ -695,9 +695,9 @@ ClusterProcessor::connect(char *hostname, int16_t id)
//
ClusterHandler *ch = new ClusterHandler;
SET_CONTINUATION_HANDLER(ch, (ClusterContHandler)&ClusterHandler::connectClusterEvent);
- ch->hostname = ats_strdup(hostname);
+ ch->hostname = ats_strdup(hostname);
ch->connector = true;
- ch->id = id;
+ ch->id = id;
eventProcessor.schedule_imm(ch, ET_CLUSTER);
}
@@ -709,10 +709,10 @@ ClusterProcessor::connect(unsigned int ip, int port, int16_t id, bool delay)
//
ClusterHandler *ch = new ClusterHandler;
SET_CONTINUATION_HANDLER(ch, (ClusterContHandler)&ClusterHandler::connectClusterEvent);
- ch->ip = ip;
- ch->port = port;
+ ch->ip = ip;
+ ch->port = port;
ch->connector = true;
- ch->id = id;
+ ch->id = id;
if (delay)
eventProcessor.schedule_in(ch, CLUSTER_MEMBER_DELAY, ET_CLUSTER);
else
@@ -728,13 +728,13 @@ ClusterProcessor::send_machine_list(ClusterMachine *m)
// lists.
//
MachineListMessage mlistmsg;
- int vers = MachineListMessage::protoToVersion(m->msg_proto_major);
+ int vers = MachineListMessage::protoToVersion(m->msg_proto_major);
ClusterConfiguration *cc = this_cluster->current_configuration();
void *data;
int len;
if (vers == MachineListMessage::MACHINE_LIST_MESSAGE_VERSION) {
- int n = 0;
+ int n = 0;
MachineListMessage *msg = &mlistmsg;
while (n < cc->n_machines) {
@@ -742,8 +742,8 @@ ClusterProcessor::send_machine_list(ClusterMachine *m)
n++;
}
msg->n_ip = n;
- data = (void *)msg;
- len = msg->sizeof_fixedlen_msg() + (n * sizeof(uint32_t));
+ data = (void *)msg;
+ len = msg->sizeof_fixedlen_msg() + (n * sizeof(uint32_t));
} else {
//////////////////////////////////////////////////////////////
diff --git a/iocore/cluster/ClusterRPC.cc b/iocore/cluster/ClusterRPC.cc
index 8ae28c8..d31a66e 100644
--- a/iocore/cluster/ClusterRPC.cc
+++ b/iocore/cluster/ClusterRPC.cc
@@ -56,7 +56,7 @@ machine_list_ClusterFunction(ClusterHandler *from, void *data, int len)
{
(void)from;
ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
- MachineListMessage *m = (MachineListMessage *)data;
+ MachineListMessage *m = (MachineListMessage *)data;
if (mh->GetMsgVersion() != MachineListMessage::MACHINE_LIST_MESSAGE_VERSION) { ////////////////////////////////////////////////
// Convert from old to current message format
@@ -94,7 +94,7 @@ void
close_channel_ClusterFunction(ClusterHandler *ch, void *data, int len)
{
ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
- CloseMessage *m = (CloseMessage *)data;
+ CloseMessage *m = (CloseMessage *)data;
if (mh->GetMsgVersion() != CloseMessage::CLOSE_CHAN_MESSAGE_VERSION) { ////////////////////////////////////////////////
// Convert from old to current message format
@@ -131,7 +131,7 @@ test_ClusterFunction(ClusterHandler *ch, void *data, int len)
CacheVC *
ChannelToCacheWriteVC(ClusterHandler *ch, int channel, uint32_t channel_seqno, ClusterVConnection **cluster_vc)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
ClusterVConnection *cvc = ch->channels[channel];
@@ -159,7 +159,7 @@ ChannelToCacheWriteVC(ClusterHandler *ch, int channel, uint32_t channel_seqno, C
void
set_channel_data_ClusterFunction(ClusterHandler *ch, void *tdata, int tlen)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
// We are called on the ET_CLUSTER thread.
@@ -169,7 +169,7 @@ set_channel_data_ClusterFunction(ClusterHandler *ch, void *tdata, int tlen)
// Allocate memory for set channel data and pass it to the cache
IncomingControl *ic = IncomingControl::alloc();
- ic->len = tlen;
+ ic->len = tlen;
ic->alloc_data();
data = ic->data + sizeof(int32_t); // free_remote_data expects d+sizeof(int32_t)
@@ -177,7 +177,7 @@ set_channel_data_ClusterFunction(ClusterHandler *ch, void *tdata, int tlen)
len = tlen;
ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
- SetChanDataMessage *m = (SetChanDataMessage *)data;
+ SetChanDataMessage *m = (SetChanDataMessage *)data;
if (mh->GetMsgVersion() !=
SetChanDataMessage::SET_CHANNEL_DATA_MESSAGE_VERSION) { ////////////////////////////////////////////////
@@ -203,7 +203,7 @@ set_channel_data_ClusterFunction(ClusterHandler *ch, void *tdata, int tlen)
char *p = (char *)m + SetChanDataMessage::sizeof_fixedlen_msg();
IOBufferBlock *block_ref = ic->get_block();
- res = HTTPInfo::unmarshal(p, len, block_ref);
+ res = HTTPInfo::unmarshal(p, len, block_ref);
ink_assert(res > 0);
CacheHTTPInfo h;
@@ -228,7 +228,7 @@ set_channel_data_ClusterFunction(ClusterHandler *ch, void *tdata, int tlen)
void
post_setchan_send_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUSED */)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
// We are called on the ET_CLUSTER thread.
// set_data() control message has been queued into cluster transfer message.
@@ -261,7 +261,7 @@ set_channel_pin_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_U
// We are called on the ET_CLUSTER thread.
ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
- SetChanPinMessage *m = (SetChanPinMessage *)data;
+ SetChanPinMessage *m = (SetChanPinMessage *)data;
if (mh->GetMsgVersion() != SetChanPinMessage::SET_CHANNEL_PIN_MESSAGE_VERSION) { ////////////////////////////////////////////////
// Convert from old to current message format
@@ -288,7 +288,7 @@ set_channel_pin_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_U
void
post_setchan_pin_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUSED */)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
// We are called on the ET_CLUSTER thread.
// Control message has been queued into cluster transfer message.
@@ -320,7 +320,7 @@ set_channel_priority_ClusterFunction(ClusterHandler *ch, void *data, int /* len
// We are called on the ET_CLUSTER thread.
- ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
+ ClusterMessageHeader *mh = (ClusterMessageHeader *)data;
SetChanPriorityMessage *m = (SetChanPriorityMessage *)data;
if (mh->GetMsgVersion() !=
@@ -348,7 +348,7 @@ set_channel_priority_ClusterFunction(ClusterHandler *ch, void *data, int /* len
void
post_setchan_priority_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUSED */)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
// We are called on the ET_CLUSTER thread.
diff --git a/iocore/cluster/ClusterVConnection.cc b/iocore/cluster/ClusterVConnection.cc
index 1fa0f64..bba41ca 100644
--- a/iocore/cluster/ClusterVConnection.cc
+++ b/iocore/cluster/ClusterVConnection.cc
@@ -34,7 +34,7 @@ ByteBankDescriptor *
ByteBankDescriptor::ByteBankDescriptor_alloc(IOBufferBlock *iob)
{
ByteBankDescriptor *b = byteBankAllocator.alloc();
- b->block = iob;
+ b->block = iob;
return b;
}
@@ -48,7 +48,7 @@ ByteBankDescriptor::ByteBankDescriptor_free(ByteBankDescriptor *b)
void
clusterVCAllocator_free(ClusterVConnection *vc)
{
- vc->mutex = 0;
+ vc->mutex = 0;
vc->action_ = 0;
vc->free();
if (vc->in_vcs) {
@@ -78,10 +78,10 @@ ClusterVConnectionBase::do_io_read(Continuation *acont, int64_t anbytes, MIOBuff
read.vio.buffer.writer_for(abuffer);
read.vio.op = VIO::READ;
read.vio.set_continuation(acont);
- read.vio.nbytes = anbytes;
- read.vio.ndone = 0;
+ read.vio.nbytes = anbytes;
+ read.vio.ndone = 0;
read.vio.vc_server = (VConnection *)this;
- read.enabled = 1;
+ read.enabled = 1;
ClusterVConnection *cvc = (ClusterVConnection *)this;
Debug("cluster_vc_xfer", "do_io_read [%s] chan %d", "", cvc->channel);
@@ -124,10 +124,10 @@ ClusterVConnectionBase::do_io_write(Continuation *acont, int64_t anbytes, IOBuff
write.vio.buffer.reader_for(abuffer);
write.vio.op = VIO::WRITE;
write.vio.set_continuation(acont);
- write.vio.nbytes = anbytes;
- write.vio.ndone = 0;
+ write.vio.nbytes = anbytes;
+ write.vio.ndone = 0;
write.vio.vc_server = (VConnection *)this;
- write.enabled = 1;
+ write.enabled = 1;
return &write.vio;
}
@@ -135,7 +135,7 @@ ClusterVConnectionBase::do_io_write(Continuation *acont, int64_t anbytes, IOBuff
void
ClusterVConnectionBase::do_io_close(int alerrno)
{
- read.enabled = 0;
+ read.enabled = 0;
write.enabled = 0;
read.vio.buffer.clear();
write.vio.buffer.clear();
@@ -216,7 +216,7 @@ ClusterVConnection::ClusterVConnection(int is_new_connect_read)
disk_io_priority(0)
{
#ifdef DEBUG
- read.vio.buffer.name = "ClusterVConnection.read";
+ read.vio.buffer.name = "ClusterVConnection.read";
write.vio.buffer.name = "ClusterVConnection.write";
#endif
SET_HANDLER((ClusterVConnHandler)&ClusterVConnection::startEvent);
@@ -237,12 +237,12 @@ ClusterVConnection::free()
while ((d = byte_bank_q.dequeue())) {
ByteBankDescriptor::ByteBankDescriptor_free(d);
}
- read_block = 0;
- remote_write_block = 0;
- marshal_buf = 0;
- write_list = 0;
- write_list_tail = 0;
- write_list_bytes = 0;
+ read_block = 0;
+ remote_write_block = 0;
+ marshal_buf = 0;
+ write_list = 0;
+ write_list_tail = 0;
+ write_list_bytes = 0;
write_bytes_in_transit = 0;
}
@@ -388,7 +388,7 @@ ClusterVConnection::start(EThread *t)
Debug(CL_TRACE, "VC start alloc remote chan=%d VC=%p", channel, this);
if (new_connect_read)
this->pending_remote_fill = 1;
- this->iov_map = CLUSTER_IOV_NONE; // disable connect timeout
+ this->iov_map = CLUSTER_IOV_NONE; // disable connect timeout
}
}
cluster_schedule(ch, this, &read);
@@ -444,8 +444,8 @@ ClusterVConnection::schedule_write()
if ((closed < 0) || remote_closed) {
// User aborted connection, dump data.
- write_list = 0;
- write_list_tail = 0;
+ write_list = 0;
+ write_list_tail = 0;
write_list_bytes = 0;
return false;
@@ -543,21 +543,21 @@ ClusterVConnection::set_http_info(CacheHTTPInfo *d)
// Create message and marshal data.
CacheHTTPInfo *r = d;
- len = r->marshal_length();
- data = (void *)ALLOCA_DOUBLE(flen + len);
+ len = r->marshal_length();
+ data = (void *)ALLOCA_DOUBLE(flen + len);
memcpy((char *)data, (char *)&msg, sizeof(msg));
- m = (SetChanDataMessage *)data;
+ m = (SetChanDataMessage *)data;
m->data_type = CACHE_DATA_HTTP_INFO;
char *p = (char *)m + flen;
- res = r->marshal(p, len);
+ res = r->marshal(p, len);
if (res < 0) {
r->destroy();
return;
}
r->destroy();
- m->channel = channel;
+ m->channel = channel;
m->sequence_number = token.sequence_number;
// note pending set_data() msgs on VC.
@@ -592,9 +592,9 @@ ClusterVConnection::set_pin_in_cache(time_t t)
ink_release_assert(!"ClusterVConnection::set_pin_in_cache() bad msg "
"version");
}
- msg.channel = channel;
+ msg.channel = channel;
msg.sequence_number = token.sequence_number;
- msg.pin_time = time_pin;
+ msg.pin_time = time_pin;
// note pending set_data() msgs on VC.
ink_atomic_increment(&n_set_data_msgs, 1);
@@ -635,9 +635,9 @@ ClusterVConnection::set_disk_io_priority(int priority)
ink_release_assert(!"ClusterVConnection::set_disk_io_priority() bad msg "
"version");
}
- msg.channel = channel;
+ msg.channel = channel;
msg.sequence_number = token.sequence_number;
- msg.disk_priority = priority;
+ msg.disk_priority = priority;
// note pending set_data() msgs on VC.
ink_atomic_increment(&n_set_data_msgs, 1);
diff --git a/iocore/cluster/P_ClusterCache.h b/iocore/cluster/P_ClusterCache.h
index 06b6afa..cb38e93 100644
--- a/iocore/cluster/P_ClusterCache.h
+++ b/iocore/cluster/P_ClusterCache.h
@@ -107,7 +107,7 @@ inline void
ats_swap16(uint16_t *d)
{
unsigned char *p = (unsigned char *)d;
- *d = ((p[1] << 8) | p[0]);
+ *d = ((p[1] << 8) | p[0]);
}
inline uint16_t
@@ -121,7 +121,7 @@ inline void
ats_swap32(uint32_t *d)
{
unsigned char *p = (unsigned char *)d;
- *d = ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
+ *d = ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
}
inline uint32_t
@@ -285,7 +285,7 @@ struct ClusterVCToken {
void
clear()
{
- ip_created = 0;
+ ip_created = 0;
sequence_number = 0;
}
@@ -433,7 +433,7 @@ ClusterVConnectionBase::cancel_active_timeout()
{
if (active_timeout) {
active_timeout->cancel(this);
- active_timeout = NULL;
+ active_timeout = NULL;
active_timeout_in = 0;
}
}
@@ -443,7 +443,7 @@ ClusterVConnectionBase::cancel_inactivity_timeout()
{
if (inactivity_timeout) {
inactivity_timeout->cancel(this);
- inactivity_timeout = NULL;
+ inactivity_timeout = NULL;
inactivity_timeout_in = 0;
}
}
@@ -1009,8 +1009,8 @@ struct ClusterHelloMessage {
ClusterHelloMessage() : _NativeByteOrder(1)
{
- _major = CLUSTER_MAJOR_VERSION;
- _minor = CLUSTER_MINOR_VERSION;
+ _major = CLUSTER_MAJOR_VERSION;
+ _minor = CLUSTER_MINOR_VERSION;
_min_major = MIN_CLUSTER_MAJOR_VERSION;
_min_minor = MIN_CLUSTER_MINOR_VERSION;
memset(_pad, '\0', sizeof(_pad));
@@ -1043,7 +1043,7 @@ struct ClusterMessageHeader {
_init(uint16_t msg_version)
{
_InNativeByteOrder = 1;
- _MsgVersion = msg_version;
+ _MsgVersion = msg_version;
}
ClusterMessageHeader() : _InNativeByteOrder(0), _MsgVersion(0) {}
ClusterMessageHeader(uint16_t msg_version) { _init(msg_version); }
@@ -1080,8 +1080,8 @@ struct PingMessage : public ClusterMessageHeader {
char data[1]; // start of data
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
PING_MESSAGE_VERSION = MAX_VERSION,
};
diff --git a/iocore/cluster/P_ClusterCacheInternal.h b/iocore/cluster/P_ClusterCacheInternal.h
index b0b4d15..19949b6 100644
--- a/iocore/cluster/P_ClusterCacheInternal.h
+++ b/iocore/cluster/P_ClusterCacheInternal.h
@@ -198,7 +198,7 @@ struct CacheContinuation : public Continuation {
ink_assert(rw_buf_msg == 0);
ink_assert(rw_buf_msg_len == 0);
- rw_buf_msg = b;
+ rw_buf_msg = b;
rw_buf_msg_len = l;
}
@@ -237,7 +237,7 @@ struct CacheContinuation : public Continuation {
freeMsgBuffer()
{
if (rw_buf_msg) {
- rw_buf_msg = 0;
+ rw_buf_msg = 0;
rw_buf_msg_len = 0;
}
}
@@ -270,9 +270,9 @@ struct CacheContinuation : public Continuation {
ic_arena.reset();
freeMsgBuffer();
- tunnel_mutex = 0;
+ tunnel_mutex = 0;
readahead_data = 0;
- ic_hostname = 0;
+ ic_hostname = 0;
}
CacheContinuation()
@@ -400,8 +400,8 @@ struct CacheLookupMsg : public ClusterMessageHeader {
uint32_t frag_type;
Alias32 moi;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
CACHE_LOOKUP_MESSAGE_VERSION = MAX_VERSION,
};
CacheLookupMsg(uint16_t vers = CACHE_LOOKUP_MESSAGE_VERSION) : ClusterMessageHeader(vers), seq_number(0), frag_type(0)
@@ -451,8 +451,8 @@ struct CacheOpMsg_long : public ClusterMessageHeader {
int32_t buffer_size; // used by open read interface
Alias32 moi;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
CACHE_OP_LONG_MESSAGE_VERSION = MAX_VERSION,
};
CacheOpMsg_long(uint16_t vers = CACHE_OP_LONG_MESSAGE_VERSION)
@@ -519,8 +519,8 @@ struct CacheOpMsg_short : public ClusterMessageHeader {
// Variable portion of message
Alias32 moi;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
CACHE_OP_SHORT_MESSAGE_VERSION = MAX_VERSION,
};
CacheOpMsg_short(uint16_t vers = CACHE_OP_SHORT_MESSAGE_VERSION)
@@ -582,8 +582,8 @@ struct CacheOpMsg_short_2 : public ClusterMessageHeader {
uint32_t seq_number;
Alias32 moi;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
CACHE_OP_SHORT_2_MESSAGE_VERSION = MAX_VERSION,
};
CacheOpMsg_short_2(uint16_t vers = CACHE_OP_SHORT_2_MESSAGE_VERSION)
@@ -628,8 +628,8 @@ struct CacheOpReplyMsg : public ClusterMessageHeader {
bool is_ram_cache_hit; // Entire object was from ram cache
Alias32 moi; // Used by CACHE_OPEN_READ & CACHE_LINK reply
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
CACHE_OP_REPLY_MESSAGE_VERSION = MAX_VERSION,
};
CacheOpReplyMsg(uint16_t vers = CACHE_OP_REPLY_MESSAGE_VERSION)
diff --git a/iocore/cluster/P_ClusterHandler.h b/iocore/cluster/P_ClusterHandler.h
index edf2d49..7e3df87 100644
--- a/iocore/cluster/P_ClusterHandler.h
+++ b/iocore/cluster/P_ClusterHandler.h
@@ -95,11 +95,11 @@ struct OutgoingControl : public ClusterControl {
void
set_data(char *adata, int alen)
{
- data = adata;
- len = alen;
- free_proc = 0;
+ data = adata;
+ len = alen;
+ free_proc = 0;
free_proc_arg = 0;
- real_data = 0;
+ real_data = 0;
// Create IOBufferBlock wrapper around passed data.
@@ -111,12 +111,12 @@ struct OutgoingControl : public ClusterControl {
void
set_data(IOBufferBlock *buf, void (*free_data_proc)(void *), void *free_data_arg)
{
- data = buf->data->data();
- len = bytes_IOBufferBlockList(buf, 1); // read avail bytes
- free_proc = free_data_proc;
+ data = buf->data->data();
+ len = bytes_IOBufferBlockList(buf, 1); // read avail bytes
+ free_proc = free_data_proc;
free_proc_arg = free_data_arg;
- real_data = 0;
- iob_block = buf;
+ real_data = 0;
+ iob_block = buf;
}
int startEvent(int event, Event *e);
virtual void freeall();
@@ -191,12 +191,12 @@ struct ClusterMsgHeader { // Note: Over the Wire structure
void
clear()
{
- count = 0;
- descriptor_cksum = 0;
+ count = 0;
+ descriptor_cksum = 0;
control_bytes_cksum = 0;
- unused = 0;
- control_bytes = 0;
- count_check = 0;
+ unused = 0;
+ control_bytes = 0;
+ count_check = 0;
}
ClusterMsgHeader() : count(0), descriptor_cksum(0), control_bytes_cksum(0), unused(0), control_bytes(0), count_check(0) {}
inline void
@@ -275,27 +275,27 @@ struct ClusterMsg {
clear()
{
hdr()->clear();
- count = 0;
- control_bytes = 0;
- descriptor_cksum = 0;
+ count = 0;
+ control_bytes = 0;
+ descriptor_cksum = 0;
control_bytes_cksum = 0;
- unused = 0;
- state = 0;
+ unused = 0;
+ state = 0;
outgoing_control.clear();
outgoing_small_control.clear();
- control_data_offset = 0;
+ control_data_offset = 0;
did_small_control_set_data = 0;
did_large_control_set_data = 0;
- did_small_control_msgs = 0;
- did_large_control_msgs = 0;
- did_freespace_msgs = 0;
+ did_small_control_msgs = 0;
+ did_large_control_msgs = 0;
+ did_freespace_msgs = 0;
}
uint16_t
calc_control_bytes_cksum()
{
uint16_t cksum = 0;
- char *p = (char *)&descriptor[count];
- char *endp = p + control_bytes;
+ char *p = (char *)&descriptor[count];
+ char *endp = p + control_bytes;
while (p < endp) {
cksum += *p;
++p;
@@ -306,8 +306,8 @@ struct ClusterMsg {
calc_descriptor_cksum()
{
uint16_t cksum = 0;
- char *p = (char *)&descriptor[0];
- char *endp = (char *)&descriptor[count];
+ char *p = (char *)&descriptor[0];
+ char *endp = (char *)&descriptor[count];
while (p < endp) {
cksum += *p;
++p;
@@ -544,40 +544,40 @@ struct ClusterHandler : public ClusterHandlerBase {
void
clear_cluster_stats()
{
- _vc_writes = 0;
- _vc_write_bytes = 0;
- _control_write_bytes = 0;
- _dw_missed_lock = 0;
- _dw_not_enabled = 0;
- _dw_wait_remote_fill = 0;
- _dw_no_active_vio = 0;
+ _vc_writes = 0;
+ _vc_write_bytes = 0;
+ _control_write_bytes = 0;
+ _dw_missed_lock = 0;
+ _dw_not_enabled = 0;
+ _dw_wait_remote_fill = 0;
+ _dw_no_active_vio = 0;
_dw_not_enabled_or_no_write = 0;
- _dw_set_data_pending = 0;
- _dw_no_free_space = 0;
- _fw_missed_lock = 0;
- _fw_not_enabled = 0;
- _fw_wait_remote_fill = 0;
- _fw_no_active_vio = 0;
- _fw_not_enabled_or_no_read = 0;
- _process_read_calls = 0;
- _n_read_start = 0;
- _n_read_header = 0;
- _n_read_await_header = 0;
- _n_read_setup_descriptor = 0;
- _n_read_descriptor = 0;
- _n_read_await_descriptor = 0;
- _n_read_setup_data = 0;
- _n_read_data = 0;
- _n_read_await_data = 0;
- _n_read_post_complete = 0;
- _n_read_complete = 0;
- _process_write_calls = 0;
- _n_write_start = 0;
- _n_write_setup = 0;
- _n_write_initiate = 0;
- _n_write_await_completion = 0;
- _n_write_post_complete = 0;
- _n_write_complete = 0;
+ _dw_set_data_pending = 0;
+ _dw_no_free_space = 0;
+ _fw_missed_lock = 0;
+ _fw_not_enabled = 0;
+ _fw_wait_remote_fill = 0;
+ _fw_no_active_vio = 0;
+ _fw_not_enabled_or_no_read = 0;
+ _process_read_calls = 0;
+ _n_read_start = 0;
+ _n_read_header = 0;
+ _n_read_await_header = 0;
+ _n_read_setup_descriptor = 0;
+ _n_read_descriptor = 0;
+ _n_read_await_descriptor = 0;
+ _n_read_setup_data = 0;
+ _n_read_data = 0;
+ _n_read_await_data = 0;
+ _n_read_post_complete = 0;
+ _n_read_complete = 0;
+ _process_write_calls = 0;
+ _n_write_start = 0;
+ _n_write_setup = 0;
+ _n_write_initiate = 0;
+ _n_write_await_completion = 0;
+ _n_write_post_complete = 0;
+ _n_write_complete = 0;
}
#endif // CLUSTER_STATS
diff --git a/iocore/cluster/P_ClusterInline.h b/iocore/cluster/P_ClusterInline.h
index fae29a9..20b8a80 100644
--- a/iocore/cluster/P_ClusterInline.h
+++ b/iocore/cluster/P_ClusterInline.h
@@ -40,9 +40,9 @@ Cluster_lookup(Continuation *cont, const CacheKey *key, CacheFragType frag_type,
ClusterMachine *m = cluster_machine_at_depth(cache_hash(*key));
if (m && !clusterProcessor.disable_remote_cluster_ops(m)) {
CacheContinuation *cc = CacheContinuation::cacheContAllocator_alloc();
- cc->action = cont;
- cc->mutex = cont->mutex;
- retAct = CacheContinuation::do_remote_lookup(cont, key, cc, frag_type, hostname, host_len);
+ cc->action = cont;
+ cc->mutex = cont->mutex;
+ retAct = CacheContinuation::do_remote_lookup(cont, key, cc, frag_type, hostname, host_len);
if (retAct) {
return retAct;
} else {
@@ -92,7 +92,7 @@ Cluster_read(ClusterMachine *owner_machine, int opcode, Continuation *cont, MIOB
goto err_exit;
// Perform data Marshal operation
- msg = (char *)ALLOCA_DOUBLE(flen + len);
+ msg = (char *)ALLOCA_DOUBLE(flen + len);
data = msg + flen;
int cur_len = len;
@@ -109,9 +109,9 @@ Cluster_read(ClusterMachine *owner_machine, int opcode, Continuation *cont, MIOB
memcpy(data, hostname, hostlen);
CacheOpArgs_General readArgs;
- readArgs.url_md5 = key;
+ readArgs.url_md5 = key;
readArgs.pin_in_cache = pin_in_cache;
- readArgs.frag_type = frag_type;
+ readArgs.frag_type = frag_type;
return CacheContinuation::do_op(cont, owner_machine, (void *)&readArgs, opcode, (char *)msg, (flen + len), -1, buf);
} else {
// Build message if we have host data.
@@ -119,22 +119,22 @@ Cluster_read(ClusterMachine *owner_machine, int opcode, Continuation *cont, MIOB
if (hostlen) {
// Determine length of data to Marshal
flen = op_to_sizeof_fixedlen_msg(opcode);
- len = hostlen;
+ len = hostlen;
if ((flen + len) > DEFAULT_MAX_BUFFER_SIZE) // Bound marshalled data
goto err_exit;
- msg = (char *)ALLOCA_DOUBLE(flen + len);
+ msg = (char *)ALLOCA_DOUBLE(flen + len);
data = msg + flen;
memcpy(data, hostname, hostlen);
} else {
- msg = 0;
+ msg = 0;
flen = 0;
- len = 0;
+ len = 0;
}
CacheOpArgs_General readArgs;
- readArgs.url_md5 = key;
+ readArgs.url_md5 = key;
readArgs.frag_type = frag_type;
return CacheContinuation::do_op(cont, owner_machine, (void *)&readArgs, opcode, (char *)msg, (flen + len), -1, buf);
}
@@ -162,12 +162,12 @@ Cluster_write(Continuation *cont, int expected_size, MIOBuffer *buf, ClusterMach
a = cont;
return CacheContinuation::callback_failure(&a, CACHE_EVENT_OPEN_WRITE_FAILED, 0);
}
- char *msg = 0;
- char *data = 0;
+ char *msg = 0;
+ char *data = 0;
int allow_multiple_writes = 0;
- int len = 0;
- int flen = 0;
- int vers = CacheOpMsg_long::protoToVersion(m->msg_proto_major);
+ int len = 0;
+ int flen = 0;
+ int vers = CacheOpMsg_long::protoToVersion(m->msg_proto_major);
switch (opcode) {
case CACHE_OPEN_WRITE: {
@@ -175,12 +175,12 @@ Cluster_write(Continuation *cont, int expected_size, MIOBuffer *buf, ClusterMach
if (hostlen) {
// Determine length of data to Marshal
flen = op_to_sizeof_fixedlen_msg(CACHE_OPEN_WRITE);
- len = hostlen;
+ len = hostlen;
if ((flen + len) > DEFAULT_MAX_BUFFER_SIZE) // Bound marshalled data
goto err_exit;
- msg = (char *)ALLOCA_DOUBLE(flen + len);
+ msg = (char *)ALLOCA_DOUBLE(flen + len);
data = msg + flen;
memcpy(data, hostname, hostlen);
@@ -193,10 +193,10 @@ Cluster_write(Continuation *cont, int expected_size, MIOBuffer *buf, ClusterMach
// Determine length of data to Marshal
flen = op_to_sizeof_fixedlen_msg(CACHE_OPEN_WRITE_LONG);
- len = 0;
+ len = 0;
if (old_info == (CacheHTTPInfo *)CACHE_ALLOW_MULTIPLE_WRITES) {
- old_info = 0;
+ old_info = 0;
allow_multiple_writes = 1;
}
if (old_info) {
@@ -208,7 +208,7 @@ Cluster_write(Continuation *cont, int expected_size, MIOBuffer *buf, ClusterMach
goto err_exit;
// Perform data Marshal operation
- msg = (char *)ALLOCA_DOUBLE(flen + len);
+ msg = (char *)ALLOCA_DOUBLE(flen + len);
data = msg + flen;
if (old_info) {
@@ -230,9 +230,9 @@ Cluster_write(Continuation *cont, int expected_size, MIOBuffer *buf, ClusterMach
if (vers == CacheOpMsg_long::CACHE_OP_LONG_MESSAGE_VERSION) {
// Do remote open_write()
CacheOpArgs_General writeArgs;
- writeArgs.url_md5 = url_md5;
+ writeArgs.url_md5 = url_md5;
writeArgs.pin_in_cache = pin_in_cache;
- writeArgs.frag_type = ft;
+ writeArgs.frag_type = ft;
writeArgs.cfl_flags |= (options & CACHE_WRITE_OPT_OVERWRITE ? CFL_OVERWRITE_ON_WRITE : 0);
writeArgs.cfl_flags |= (old_info ? CFL_LOPENWRITE_HAVE_OLDINFO : 0);
writeArgs.cfl_flags |= (allow_multiple_writes ? CFL_ALLOW_MULTIPLE_WRITES : 0);
@@ -267,7 +267,7 @@ Cluster_link(ClusterMachine *m, Continuation *cont, CacheKey *from, CacheKey *to
// Allocate memory for message header
int flen = op_to_sizeof_fixedlen_msg(CACHE_LINK);
- int len = host_len;
+ int len = host_len;
if ((flen + len) > DEFAULT_MAX_BUFFER_SIZE) // Bound marshalled data
goto err_exit;
@@ -277,8 +277,8 @@ Cluster_link(ClusterMachine *m, Continuation *cont, CacheKey *from, CacheKey *to
// Setup args for remote link
CacheOpArgs_Link linkArgs;
- linkArgs.from = from;
- linkArgs.to = to;
+ linkArgs.from = from;
+ linkArgs.to = to;
linkArgs.frag_type = type;
return CacheContinuation::do_op(cont, m, (void *)&linkArgs, CACHE_LINK, msg, (flen + len));
} else {
@@ -310,7 +310,7 @@ Cluster_deref(ClusterMachine *m, Continuation *cont, CacheKey *key, CacheFragTyp
// Allocate memory for message header
int flen = op_to_sizeof_fixedlen_msg(CACHE_DEREF);
- int len = host_len;
+ int len = host_len;
if ((flen + len) > DEFAULT_MAX_BUFFER_SIZE) // Bound marshalled data
goto err_exit;
@@ -320,7 +320,7 @@ Cluster_deref(ClusterMachine *m, Continuation *cont, CacheKey *key, CacheFragTyp
// Setup args for remote deref
CacheOpArgs_Deref drefArgs;
- drefArgs.md5 = key;
+ drefArgs.md5 = key;
drefArgs.frag_type = type;
return CacheContinuation::do_op(cont, m, (void *)&drefArgs, CACHE_DEREF, msg, (flen + len));
} else {
@@ -353,7 +353,7 @@ Cluster_remove(ClusterMachine *m, Continuation *cont, const CacheKey *key, Cache
// Allocate memory for message header
int flen = op_to_sizeof_fixedlen_msg(CACHE_REMOVE);
- int len = host_len;
+ int len = host_len;
if ((flen + len) > DEFAULT_MAX_BUFFER_SIZE) // Bound marshalled data
goto err_exit;
@@ -364,7 +364,7 @@ Cluster_remove(ClusterMachine *m, Continuation *cont, const CacheKey *key, Cache
// Setup args for remote update
CacheOpArgs_General updateArgs;
ink_zero(updateArgs);
- updateArgs.url_md5 = key;
+ updateArgs.url_md5 = key;
updateArgs.frag_type = frag_type;
return CacheContinuation::do_op(cont, m, (void *)&updateArgs, CACHE_REMOVE, msg, (flen + len));
} else {
diff --git a/iocore/cluster/P_ClusterInternal.h b/iocore/cluster/P_ClusterInternal.h
index 844934f..01bdca9 100644
--- a/iocore/cluster/P_ClusterInternal.h
+++ b/iocore/cluster/P_ClusterInternal.h
@@ -206,8 +206,8 @@ struct CloseMessage : public ClusterMessageHeader {
uint32_t sequence_number;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
CLOSE_CHAN_MESSAGE_VERSION = MAX_VERSION,
};
@@ -253,8 +253,8 @@ struct MachineListMessage : public ClusterMessageHeader {
uint32_t ip[CLUSTER_MAX_MACHINES]; // variable length data
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
MACHINE_LIST_MESSAGE_VERSION = MAX_VERSION,
};
@@ -294,8 +294,8 @@ struct SetChanDataMessage : public ClusterMessageHeader {
char data[4];
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
SET_CHANNEL_DATA_MESSAGE_VERSION = MAX_VERSION,
};
@@ -343,8 +343,8 @@ struct SetChanPinMessage : public ClusterMessageHeader {
uint32_t pin_time;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
SET_CHANNEL_PIN_MESSAGE_VERSION = MAX_VERSION,
};
@@ -390,8 +390,8 @@ struct SetChanPriorityMessage : public ClusterMessageHeader {
uint32_t disk_priority;
enum {
- MIN_VERSION = 1,
- MAX_VERSION = 1,
+ MIN_VERSION = 1,
+ MAX_VERSION = 1,
SET_CHANNEL_PRIORITY_MESSAGE_VERSION = MAX_VERSION,
};
diff --git a/iocore/cluster/P_TimeTrace.h b/iocore/cluster/P_TimeTrace.h
index a4412e8..1bf3c89 100644
--- a/iocore/cluster/P_TimeTrace.h
+++ b/iocore/cluster/P_TimeTrace.h
@@ -66,7 +66,7 @@ extern int cluster_send_events;
#ifdef ENABLE_TIME_TRACE
#define LOG_EVENT_TIME(_start_time, _time_dist, _time_cnt) \
do { \
- ink_hrtime now = ink_get_hrtime(); \
+ ink_hrtime now = ink_get_hrtime(); \
unsigned int bucket = (now - _start_time) / HRTIME_MSECONDS(10); \
if (bucket > TIME_DIST_BUCKETS) \
bucket = TIME_DIST_BUCKETS; \
diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc
index fbd0416..a53ea28 100644
--- a/iocore/dns/DNS.cc
+++ b/iocore/dns/DNS.cc
@@ -39,23 +39,23 @@ EventType ET_DNS = ET_CALL;
//
// Config
//
-int dns_timeout = DEFAULT_DNS_TIMEOUT;
-int dns_retries = DEFAULT_DNS_RETRIES;
-int dns_search = DEFAULT_DNS_SEARCH;
-int dns_failover_number = DEFAULT_FAILOVER_NUMBER;
-int dns_failover_period = DEFAULT_FAILOVER_PERIOD;
-int dns_failover_try_period = DEFAULT_FAILOVER_TRY_PERIOD;
-int dns_max_dns_in_flight = MAX_DNS_IN_FLIGHT;
-int dns_validate_qname = 0;
+int dns_timeout = DEFAULT_DNS_TIMEOUT;
+int dns_retries = DEFAULT_DNS_RETRIES;
+int dns_search = DEFAULT_DNS_SEARCH;
+int dns_failover_number = DEFAULT_FAILOVER_NUMBER;
+int dns_failover_period = DEFAULT_FAILOVER_PERIOD;
+int dns_failover_try_period = DEFAULT_FAILOVER_TRY_PERIOD;
+int dns_max_dns_in_flight = MAX_DNS_IN_FLIGHT;
+int dns_validate_qname = 0;
unsigned int dns_handler_initialized = 0;
-int dns_ns_rr = 0;
-int dns_ns_rr_init_down = 1;
-char *dns_ns_list = NULL;
-char *dns_resolv_conf = NULL;
-char *dns_local_ipv6 = NULL;
-char *dns_local_ipv4 = NULL;
-int dns_thread = 0;
-int dns_prefer_ipv6 = 0;
+int dns_ns_rr = 0;
+int dns_ns_rr_init_down = 1;
+char *dns_ns_list = NULL;
+char *dns_resolv_conf = NULL;
+char *dns_local_ipv6 = NULL;
+char *dns_local_ipv4 = NULL;
+int dns_thread = 0;
+int dns_prefer_ipv6 = 0;
namespace
{
// Currently only used for A and AAAA.
@@ -88,8 +88,8 @@ static void write_dns(DNSHandler *h);
static bool write_dns_event(DNSHandler *h, DNSEntry *e);
// "reliable" name to try. need to build up first.
-static int try_servers = 0;
-static int local_num_entries = 1;
+static int try_servers = 0;
+static int local_num_entries = 1;
static int attempt_num_entries = 1;
char try_server_names[DEFAULT_NUM_TRY_SERVER][MAXDNAME];
@@ -119,33 +119,33 @@ HostEnt::free()
void
make_ipv4_ptr(in_addr_t addr, char *buffer)
{
- char *p = buffer;
+ char *p = buffer;
uint8_t const *u = reinterpret_cast<uint8_t *>(&addr);
if (u[3] > 99)
*p++ = (u[3] / 100) + '0';
if (u[3] > 9)
*p++ = ((u[3] / 10) % 10) + '0';
- *p++ = u[3] % 10 + '0';
- *p++ = '.';
+ *p++ = u[3] % 10 + '0';
+ *p++ = '.';
if (u[2] > 99)
*p++ = (u[2] / 100) + '0';
if (u[2] > 9)
*p++ = ((u[2] / 10) % 10) + '0';
- *p++ = u[2] % 10 + '0';
- *p++ = '.';
+ *p++ = u[2] % 10 + '0';
+ *p++ = '.';
if (u[1] > 99)
*p++ = (u[1] / 100) + '0';
if (u[1] > 9)
*p++ = ((u[1] / 10) % 10) + '0';
- *p++ = u[1] % 10 + '0';
- *p++ = '.';
+ *p++ = u[1] % 10 + '0';
+ *p++ = '.';
if (u[0] > 99)
*p++ = (u[0] / 100) + '0';
if (u[0] > 9)
*p++ = ((u[0] / 10) % 10) + '0';
- *p++ = u[0] % 10 + '0';
- *p++ = '.';
+ *p++ = u[0] % 10 + '0';
+ *p++ = '.';
ink_strlcpy(p, "in-addr.arpa", MAXDNAME - (p - buffer + 1));
}
@@ -153,8 +153,8 @@ void
make_ipv6_ptr(in6_addr const *addr, char *buffer)
{
const char hex_digit[] = "0123456789abcdef";
- char *p = buffer;
- uint8_t const *src = addr->s6_addr;
+ char *p = buffer;
+ uint8_t const *src = addr->s6_addr;
int i;
for (i = TS_IP6_SIZE - 1; i >= 0; --i) {
@@ -255,12 +255,12 @@ DNSProcessor::dns_init()
int i;
char *last;
char *ns_list = ats_strdup(dns_ns_list);
- char *ns = (char *)strtok_r(ns_list, " ,;\t\r", &last);
+ char *ns = (char *)strtok_r(ns_list, " ,;\t\r", &last);
for (i = 0, nserv = 0; (i < MAX_NAMED) && ns; ++i) {
Debug("dns", "Nameserver list - parsing \"%s\"\n", ns);
- bool err = false;
- int prt = DOMAIN_SERVICE_PORT;
+ bool err = false;
+ int prt = DOMAIN_SERVICE_PORT;
char *colon = 0; // where the port colon is.
// Check for IPv6 notation.
if ('[' == *ns) {
@@ -356,7 +356,7 @@ DNSProcessor::DNSProcessor() : thread(NULL), handler(NULL)
void
DNSEntry::init(const char *x, int len, int qtype_arg, Continuation *acont, DNSProcessor::Options const &opt)
{
- qtype = qtype_arg;
+ qtype = qtype_arg;
host_res_style = opt.host_res_style;
if (is_addr_query(qtype)) {
// adjust things based on family preference.
@@ -366,8 +366,8 @@ DNSEntry::init(const char *x, int len, int qtype_arg, Continuation *acont, DNSPr
qtype = T_AAAA;
}
}
- submit_time = Thread::get_hrtime();
- action = acont;
+ submit_time = Thread::get_hrtime();
+ action = acont;
submit_thread = acont->mutex->thread_holding;
#ifdef SPLIT_DNS
@@ -388,10 +388,10 @@ DNSEntry::init(const char *x, int len, int qtype_arg, Continuation *acont, DNSPr
if (len) {
len = len > (MAXDNAME - 1) ? (MAXDNAME - 1) : len;
memcpy(qname, x, len);
- qname[len] = 0;
+ qname[len] = 0;
orig_qname_len = qname_len = len;
} else {
- qname_len = ink_strlcpy(qname, x, MAXDNAME);
+ qname_len = ink_strlcpy(qname, x, MAXDNAME);
orig_qname_len = qname_len;
}
} else { // T_PTR
@@ -494,7 +494,7 @@ DNSHandler::startEvent(int /* event ATS_UNUSED */, Event *e)
int max_nscount = m_res->nscount;
if (max_nscount > MAX_NAMED)
max_nscount = MAX_NAMED;
- n_con = 0;
+ n_con = 0;
for (int i = 0; i < max_nscount; i++) {
ip_port_text_buffer buff;
sockaddr *sa = &m_res->nsaddr_list[i].sa;
@@ -564,7 +564,7 @@ DNSHandler::retry_named(int ndx, ink_hrtime t, bool reopen)
char buffer[MAX_DNS_PACKET_LEN];
Debug("dns", "trying to resolve '%s' from DNS connection, ndx %d", try_server_names[try_servers], ndx);
- int r = _ink_res_mkquery(m_res, try_server_names[try_servers], T_A, buffer);
+ int r = _ink_res_mkquery(m_res, try_server_names[try_servers], T_A, buffer);
try_servers = (try_servers + 1) % countof(try_server_names);
ink_assert(r >= 0);
if (r >= 0) { // looking for a bounce
@@ -625,9 +625,9 @@ DNSHandler::failover()
int max_nscount = m_res->nscount;
if (max_nscount > MAX_NAMED)
- max_nscount = MAX_NAMED;
+ max_nscount = MAX_NAMED;
sockaddr const *old_addr = &m_res->nsaddr_list[name_server].sa;
- name_server = (name_server + 1) % max_nscount;
+ name_server = (name_server + 1) % max_nscount;
Debug("dns", "failover: failing over to name_server=%d", name_server);
IpEndpoint target;
@@ -733,7 +733,7 @@ DNSHandler::recv_dns(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
if (!hostent_cache)
hostent_cache = dnsBufAllocator.alloc();
- HostEnt *buf = hostent_cache;
+ HostEnt *buf = hostent_cache;
int res = socketManager.recvfrom(dnsc->fd, buf->buf, MAX_DNS_PACKET_LEN, 0, &from_ip.sa, &from_length);
@@ -754,7 +754,7 @@ DNSHandler::recv_dns(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
ats_ip_ntop(&dnsc->ip.sa, ipbuff2, sizeof ipbuff2));
continue;
}
- hostent_cache = 0;
+ hostent_cache = 0;
buf->packet_size = res;
Debug("dns", "received packet size = %d", res);
if (dns_ns_rr) {
@@ -990,8 +990,8 @@ write_dns_event(DNSHandler *h, DNSEntry *e)
return false;
}
- e->written_flag = true;
- e->which_ns = h->name_server;
+ e->written_flag = true;
+ e->which_ns = h->name_server;
e->once_written_flag = true;
++h->in_flight;
DNS_INCREMENT_DYN_STAT(dns_in_flight_stat);
@@ -1093,7 +1093,7 @@ DNSProcessor::getby(const char *x, int len, int type, Continuation *cont, Option
Debug("dns_srv", "DNSProcessor::getby attempting an SRV lookup for %s, timeout = %d", x, opt.timeout);
}
DNSEntry *e = dnsEntryAllocator.alloc();
- e->retries = dns_retries;
+ e->retries = dns_retries;
e->init(x, len, type, cont, opt);
MUTEX_TRY_LOCK(lock, e->mutex, this_ethread());
if (!lock.is_locked())
@@ -1111,7 +1111,7 @@ static void
dns_result(DNSHandler *h, DNSEntry *e, HostEnt *ent, bool retry)
{
ProxyMutex *mutex = h->mutex;
- bool cancelled = (e->action.cancelled ? true : false);
+ bool cancelled = (e->action.cancelled ? true : false);
if (!ent && !cancelled) {
// try to retry operation
@@ -1171,11 +1171,11 @@ dns_result(DNSHandler *h, DNSEntry *e, HostEnt *ent, bool retry)
if (is_debug_tag_set("dns")) {
if (is_addr_query(e->qtype)) {
ip_text_buffer buff;
- char const *ptr = "<none>";
+ char const *ptr = "<none>";
char const *result = "FAIL";
if (ent) {
result = "SUCCESS";
- ptr = inet_ntop(e->qtype == T_AAAA ? AF_INET6 : AF_INET, ent->ent.h_addr_list[0], buff, sizeof(buff));
+ ptr = inet_ntop(e->qtype == T_AAAA ? AF_INET6 : AF_INET, ent->ent.h_addr_list[0], buff, sizeof(buff));
}
Debug("dns", "%s result for %s = %s retry %d", result, e->qname, ptr, retry);
} else {
@@ -1232,7 +1232,7 @@ dns_result(DNSHandler *h, DNSEntry *e, HostEnt *ent, bool retry)
return;
Lretry:
e->result_ent = ent;
- e->retries = 0;
+ e->retries = 0;
if (e->timeout)
e->timeout->cancel();
e->timeout = h->mutex->thread_holding->schedule_in(e, DNS_PERIOD);
@@ -1268,9 +1268,9 @@ DNSEntry::postEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
Debug("dns", "called back continuation for %s", qname);
action.continuation->handleEvent(DNS_EVENT_LOOKUP, result_ent);
}
- result_ent = NULL;
+ result_ent = NULL;
action.mutex = NULL;
- mutex = NULL;
+ mutex = NULL;
dnsEntryAllocator.free(this);
return EVENT_DONE;
}
@@ -1280,10 +1280,10 @@ static bool
dns_process(DNSHandler *handler, HostEnt *buf, int len)
{
ProxyMutex *mutex = handler->mutex;
- HEADER *h = (HEADER *)(buf->buf);
- DNSEntry *e = get_dns(handler, (uint16_t)ntohs(h->id));
- bool retry = false;
- bool server_ok = true;
+ HEADER *h = (HEADER *)(buf->buf);
+ DNSEntry *e = get_dns(handler, (uint16_t)ntohs(h->id));
+ bool retry = false;
+ bool server_ok = true;
uint32_t temp_ttl = 0;
//
@@ -1307,7 +1307,7 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
switch (h->rcode) {
default:
Warning("Unknown DNS error %d for [%s]", h->rcode, e->qname);
- retry = true;
+ retry = true;
server_ok = false; // could be server problems
goto Lerror;
case SERVFAIL: // recoverable error
@@ -1336,17 +1336,17 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
u_char tbuf[MAXDNAME + 1];
buf->ent.h_name = NULL;
- int ancount = ntohs(h->ancount);
+ int ancount = ntohs(h->ancount);
unsigned char *bp = buf->hostbuf;
- int buflen = sizeof(buf->hostbuf);
- u_char *cp = ((u_char *)h) + HFIXEDSZ;
- u_char *eom = (u_char *)h + len;
+ int buflen = sizeof(buf->hostbuf);
+ u_char *cp = ((u_char *)h) + HFIXEDSZ;
+ u_char *eom = (u_char *)h + len;
int n;
ink_assert(buf->srv_hosts.srv_host_count == 0 && buf->srv_hosts.srv_hosts_length == 0);
- buf->srv_hosts.srv_host_count = 0;
+ buf->srv_hosts.srv_host_count = 0;
buf->srv_hosts.srv_hosts_length = 0;
- unsigned &num_srv = buf->srv_hosts.srv_host_count;
- int rname_len = -1;
+ unsigned &num_srv = buf->srv_hosts.srv_host_count;
+ int rname_len = -1;
//
// Expand name
@@ -1381,7 +1381,7 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
if (-1 == rname_len)
n = strlen((char *)bp) + 1;
else
- n = rname_len + 1;
+ n = rname_len + 1;
buf->ent.h_name = (char *)bp;
bp += n;
buflen -= n;
@@ -1389,10 +1389,10 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
//
// Configure HostEnt data structure
//
- u_char **ap = buf->host_aliases;
- buf->ent.h_aliases = (char **)buf->host_aliases;
- u_char **hap = (u_char **)buf->h_addr_ptrs;
- *hap = NULL;
+ u_char **ap = buf->host_aliases;
+ buf->ent.h_aliases = (char **)buf->host_aliases;
+ u_char **hap = (u_char **)buf->h_addr_ptrs;
+ *hap = NULL;
buf->ent.h_addr_list = (char **)buf->h_addr_ptrs;
//
@@ -1462,7 +1462,7 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
}
cp += n;
*ap++ = (unsigned char *)bp;
- n = strlen((char *)bp) + 1;
+ n = strlen((char *)bp) + 1;
bp += n;
buflen -= n;
n = strlen((char *)tbuf) + 1;
@@ -1506,15 +1506,15 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
} else if (type == T_SRV) {
if (num_srv >= HOST_DB_MAX_ROUND_ROBIN_INFO)
break;
- cp = here; /* hack */
+ cp = here; /* hack */
int strlen = dn_skipname(cp, eom);
cp += strlen;
const unsigned char *srv_off = cp;
cp += SRV_FIXEDSZ;
cp += dn_skipname(cp, eom);
- here = cp; /* hack */
+ here = cp; /* hack */
SRV *srv = &buf->srv_hosts.hosts[num_srv];
- int r = ink_ns_name_ntop(srv_off + SRV_SERVER, srv->host, MAXDNAME);
+ int r = ink_ns_name_ntop(srv_off + SRV_SERVER, srv->host, MAXDNAME);
if (r <= 0) {
/* FIXME: is this really an error? or just a continue; */
++error;
@@ -1523,12 +1523,12 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
Debug("dns_srv", "Discovered SRV record [from NS lookup] with cost:%d weight:%d port:%d with host:%s",
ink_get16(srv_off + SRV_COST), ink_get16(srv_off + SRV_WEIGHT), ink_get16(srv_off + SRV_PORT), srv->host);
- srv->port = ink_get16(srv_off + SRV_PORT);
- srv->priority = ink_get16(srv_off + SRV_COST);
- srv->weight = ink_get16(srv_off + SRV_WEIGHT);
- srv->host_len = r;
+ srv->port = ink_get16(srv_off + SRV_PORT);
+ srv->priority = ink_get16(srv_off + SRV_COST);
+ srv->weight = ink_get16(srv_off + SRV_WEIGHT);
+ srv->host_len = r;
srv->host[r - 1] = '\0';
- srv->key = makeHostHash(srv->host);
+ srv->key = makeHostHash(srv->host);
if (srv->host[0] != '\0')
buf->srv_hosts.srv_hosts_length += r;
@@ -1543,10 +1543,10 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
}
} else {
int nn;
- buf->ent.h_length = n;
+ buf->ent.h_length = n;
buf->ent.h_addrtype = T_A == type ? AF_INET : AF_INET6;
- buf->ent.h_name = (char *)bp;
- nn = strlen((char *)bp) + 1;
+ buf->ent.h_name = (char *)bp;
+ nn = strlen((char *)bp) + 1;
Debug("dns", "received %s name = %s", QtypeName(type), bp);
bp += nn;
buflen -= nn;
@@ -1573,7 +1573,7 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
++answer;
}
if (answer) {
- *ap = NULL;
+ *ap = NULL;
*hap = NULL;
//
// If the named didn't send us the name, insert the one
diff --git a/iocore/dns/DNSConnection.cc b/iocore/dns/DNSConnection.cc
index ef96139..f96c66c 100644
--- a/iocore/dns/DNSConnection.cc
+++ b/iocore/dns/DNSConnection.cc
@@ -63,7 +63,7 @@ DNSConnection::close()
// don't close any of the standards
if (fd >= 2) {
int fd_save = fd;
- fd = NO_FD;
+ fd = NO_FD;
return socketManager.close(fd_save);
} else {
fd = NO_FD;
@@ -117,7 +117,7 @@ DNSConnection::connect(sockaddr const *addr, Options const &opt)
ats_ip_copy(&bind_addr.sa, opt._local_ipv4);
else
bind_addr.sin.sin_addr.s_addr = INADDR_ANY;
- bind_size = sizeof(sockaddr_in);
+ bind_size = sizeof(sockaddr_in);
} else {
ink_assert(!"Target DNS address must be IP.");
}
@@ -130,15 +130,15 @@ DNSConnection::connect(sockaddr const *addr, Options const &opt)
bind_addr.sa.sa_family = af;
if (AF_INET6 == af) {
bind_addr.sin6.sin6_addr = in6addr_any;
- bind_size = sizeof bind_addr.sin6;
+ bind_size = sizeof bind_addr.sin6;
} else {
bind_addr.sin.sin_addr.s_addr = INADDR_ANY;
- bind_size = sizeof bind_addr.sin;
+ bind_size = sizeof bind_addr.sin;
}
while (retries++ < 10000) {
ip_port_text_buffer b;
- uint32_t p = generator.random();
- p = static_cast<uint16_t>((p % (LAST_RANDOM_PORT - FIRST_RANDOM_PORT)) + FIRST_RANDOM_PORT);
+ uint32_t p = generator.random();
+ p = static_cast<uint16_t>((p % (LAST_RANDOM_PORT - FIRST_RANDOM_PORT)) + FIRST_RANDOM_PORT);
ats_ip_port_cast(&bind_addr.sa) = htons(p); // stuff port in sockaddr.
Debug("dns", "random port = %s\n", ats_ip_nptop(&bind_addr.sa, b, sizeof b));
if ((res = socketManager.ink_bind(fd, &bind_addr.sa, bind_size, Proto)) < 0) {
diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h
index 2c0f60d..ed7acbb 100644
--- a/iocore/dns/P_DNSProcessor.h
+++ b/iocore/dns/P_DNSProcessor.h
@@ -183,7 +183,7 @@ struct DNSEntry : public Continuation {
last(false)
{
for (int i = 0; i < MAX_DNS_RETRIES; i++)
- id[i] = -1;
+ id[i] = -1;
memset(qname, 0, MAXDNAME);
}
};
@@ -340,12 +340,12 @@ DNSHandler::DNSHandler()
{
ats_ip_invalidate(&ip);
for (int i = 0; i < MAX_NAMED; i++) {
- ifd[i] = -1;
- failover_number[i] = 0;
- failover_soon_number[i] = 0;
+ ifd[i] = -1;
+ failover_number[i] = 0;
+ failover_soon_number[i] = 0;
crossed_failover_number[i] = 0;
- ns_down[i] = 1;
- con[i].handler = this;
+ ns_down[i] = 1;
+ con[i].handler = this;
}
memset(&qid_in_flight, 0, sizeof(qid_in_flight));
SET_HANDLER(&DNSHandler::startEvent);
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index 40befb6..875a8bb 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -66,7 +66,7 @@ enum SplitDNSCB_t {
static const char *SDNSResultStr[] = {"DNSServer_Undefined", "DNSServer_Specified", "DNSServer_Failed"};
-int SplitDNSConfig::m_id = 0;
+int SplitDNSConfig::m_id = 0;
int SplitDNSConfig::gsplit_dns_enabled = 0;
int splitDNSFile_CB(const char *name, RecDataT data_type, RecData data, void *cookie);
Ptr<ProxyMutex> SplitDNSConfig::dnsHandler_mutex;
@@ -136,7 +136,7 @@ SplitDNSConfig::reconfigure()
SplitDNS *params = new SplitDNS;
params->m_SplitDNSlEnable = gsplit_dns_enabled;
- params->m_DNSSrvrTable = new DNS_table("proxy.config.dns.splitdns.filename", modulePrefix, &sdns_dest_tags);
+ params->m_DNSSrvrTable = new DNS_table("proxy.config.dns.splitdns.filename", modulePrefix, &sdns_dest_tags);
params->m_numEle = params->m_DNSSrvrTable->getEntryCount();
if (0 == params->m_DNSSrvrTable || (0 == params->m_numEle)) {
@@ -148,8 +148,8 @@ SplitDNSConfig::reconfigure()
if (0 != params->m_DNSSrvrTable->getHostMatcher() && 0 == params->m_DNSSrvrTable->getReMatcher() &&
0 == params->m_DNSSrvrTable->getIPMatcher() && 4 >= params->m_numEle) {
- HostLookup *pxHL = params->m_DNSSrvrTable->getHostMatcher()->getHLookup();
- params->m_pxLeafArray = (void *)pxHL->getLArray();
+ HostLookup *pxHL = params->m_DNSSrvrTable->getHostMatcher()->getHLookup();
+ params->m_pxLeafArray = (void *)pxHL->getLArray();
params->m_bEnableFastPath = true;
}
@@ -184,7 +184,7 @@ SplitDNS::getDNSRecord(const char *hostname)
Debug("splitdns", "Called SplitDNS::getDNSRecord(%s)", hostname);
DNSRequestData *pRD = DNSReqAllocator.alloc();
- pRD->m_pHost = hostname;
+ pRD->m_pHost = hostname;
SplitDNSResult res;
findServer(pRD, &res);
@@ -215,7 +215,7 @@ SplitDNS::findServer(RequestData *rdata, SplitDNSResult *result)
return;
}
- result->m_rec = NULL;
+ result->m_rec = NULL;
result->m_line_number = 0xffffffff;
result->m_wrap_around = false;
@@ -224,13 +224,13 @@ SplitDNS::findServer(RequestData *rdata, SplitDNSResult *result)
--------------------------- */
if (m_bEnableFastPath) {
SplitDNSRecord *data_ptr = 0;
- char *pHost = (char *)rdata->get_host();
+ char *pHost = (char *)rdata->get_host();
if (0 == pHost) {
Warning("SplitDNS: No host to match !");
return;
}
- int len = strlen(pHost);
+ int len = strlen(pHost);
HostLeaf *pxHL = (HostLeaf *)m_pxLeafArray;
for (int i = 0; i < m_numEle; i++) {
if (0 == pxHL)
@@ -239,10 +239,10 @@ SplitDNS::findServer(RequestData *rdata, SplitDNSResult *result)
if (false == pxHL[i].isNot && pxHL[i].len > len)
continue;
- int idx = len - pxHL[i].len;
- char *pH = &pHost[idx];
+ int idx = len - pxHL[i].len;
+ char *pH = &pHost[idx];
char *pMatch = (char *)pxHL[i].match;
- char cNot = *pMatch;
+ char cNot = *pMatch;
if ('!' == cNot)
pMatch++;
@@ -313,7 +313,7 @@ SplitDNSRecord::ProcessDNSHosts(char *val)
------------------------------------------------ */
for (int i = 0; i < numTok; i++) {
current = pTok[i];
- tmp = (char *)strchr(current, ':');
+ tmp = (char *)strchr(current, ':');
// coverity[secure_coding]
if (tmp != NULL && sscanf(tmp + 1, "%d", &port) != 1) {
return "Malformed DNS port";
@@ -409,7 +409,7 @@ SplitDNSRecord::ProcessDomainSrchList(char *val)
for (int i = 0; i < numTok; i++) {
current = pTok[i];
- cnt = sz += strlen(current);
+ cnt = sz += strlen(current);
if (MAXDNAME - 1 < sz)
break;
@@ -439,7 +439,7 @@ SplitDNSRecord::Init(matcher_line *line_info)
this->line_num = line_info->line_num;
for (int i = 0; i < MATCHER_MAX_TOKENS; i++) {
label = line_info->line[0][i];
- val = line_info->line[1][i];
+ val = line_info->line[1][i];
if (label == NULL) {
continue;
@@ -477,7 +477,7 @@ SplitDNSRecord::Init(matcher_line *line_info)
return config_parse_error("%s No server specified in splitdns.config at line %d", modulePrefix, line_num);
}
- DNSHandler *dnsH = new DNSHandler;
+ DNSHandler *dnsH = new DNSHandler;
ink_res_state res = new ts_imp_res_state;
memset(res, 0, sizeof(ts_imp_res_state));
@@ -519,7 +519,7 @@ SplitDNSRecord::UpdateMatch(SplitDNSResult *result, RequestData * /* rdata ATS_U
int last_number = result->m_line_number;
if ((last_number < 0) || (last_number > this->line_num)) {
- result->m_rec = this;
+ result->m_rec = this;
result->m_line_number = this->line_num;
Debug("splitdns_config", "Matched with %p dns node from line %d", this, this->line_num);
diff --git a/iocore/dns/test_P_DNS.cc b/iocore/dns/test_P_DNS.cc
index 02677e0..1150960 100644
--- a/iocore/dns/test_P_DNS.cc
+++ b/iocore/dns/test_P_DNS.cc
@@ -36,8 +36,8 @@ struct NetTesterSM : public Continuation {
ink_release_assert(lock);
vc = _vc;
SET_HANDLER(&NetTesterSM::handle_read);
- buf = new_MIOBuffer(8);
- reader = buf->alloc_reader();
+ buf = new_MIOBuffer(8);
+ reader = buf->alloc_reader();
read_vio = vc->do_io_read(this, INT64_MAX, buf);
}
@@ -48,7 +48,7 @@ struct NetTesterSM : public Continuation {
char *str;
switch (event) {
case VC_EVENT_READ_READY:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
printf("%s", str);
@@ -57,7 +57,7 @@ struct NetTesterSM : public Continuation {
case VC_EVENT_READ_COMPLETE:
/* FALLSTHROUGH */
case VC_EVENT_EOS:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
printf("%s", str);
diff --git a/iocore/eventsystem/IOBuffer.cc b/iocore/eventsystem/IOBuffer.cc
index b73d81e..3e3d7fb 100644
--- a/iocore/eventsystem/IOBuffer.cc
+++ b/iocore/eventsystem/IOBuffer.cc
@@ -37,7 +37,7 @@ inkcoreapi ClassAllocator<IOBufferData> ioDataAllocator("ioDataAllocator", DEFAU
inkcoreapi ClassAllocator<IOBufferBlock> ioBlockAllocator("ioBlockAllocator", DEFAULT_BUFFER_NUMBER);
int64_t default_large_iobuffer_size = DEFAULT_LARGE_BUFFER_SIZE;
int64_t default_small_iobuffer_size = DEFAULT_SMALL_BUFFER_SIZE;
-int64_t max_iobuffer_size = DEFAULT_BUFFER_SIZES - 1;
+int64_t max_iobuffer_size = DEFAULT_BUFFER_SIZES - 1;
//
// Initialization
@@ -55,7 +55,7 @@ init_buffer_allocators()
for (int i = 0; i < DEFAULT_BUFFER_SIZES; i++) {
int64_t s = DEFAULT_BUFFER_BASE_SIZE * (((int64_t)1) << i);
int64_t a = DEFAULT_BUFFER_ALIGNMENT;
- int n = i <= default_large_iobuffer_size ? DEFAULT_BUFFER_NUMBER : DEFAULT_HUGE_BUFFER_NUMBER;
+ int n = i <= default_large_iobuffer_size ? DEFAULT_BUFFER_NUMBER : DEFAULT_HUGE_BUFFER_NUMBER;
if (s < a)
a = s;
@@ -71,7 +71,7 @@ MIOBuffer::remove_append(IOBufferReader *r)
int64_t l = 0;
while (r->block) {
Ptr<IOBufferBlock> b = r->block;
- r->block = r->block->next;
+ r->block = r->block->next;
b->_start += r->start_offset;
if (b->start() >= b->end()) {
r->start_offset = -r->start_offset;
@@ -89,12 +89,12 @@ int64_t
MIOBuffer::write(const void *abuf, int64_t alen)
{
const char *buf = (const char *)abuf;
- int64_t len = alen;
+ int64_t len = alen;
while (len) {
if (!_writer)
add_block();
int64_t f = _writer->write_avail();
- f = f < len ? f : len;
+ f = f < len ? f : len;
if (f > 0) {
::memcpy(_writer->end(), buf, f);
_writer->fill(f);
@@ -139,7 +139,7 @@ MIOBuffer::write_and_transfer_left_over_space(IOBufferReader *r, int64_t alen, i
int64_t
MIOBuffer::write(IOBufferReader *r, int64_t alen, int64_t offset)
{
- int64_t len = alen;
+ int64_t len = alen;
IOBufferBlock *b = r->block;
offset += r->start_offset;
@@ -148,14 +148,14 @@ MIOBuffer::write(IOBufferReader *r, int64_t alen, int64_t offset)
max_bytes -= offset;
if (max_bytes <= 0) {
offset = -max_bytes;
- b = b->next;
+ b = b->next;
continue;
}
int64_t bytes;
if (len < 0 || len >= max_bytes)
bytes = max_bytes;
else
- bytes = len;
+ bytes = len;
IOBufferBlock *bb = b->clone();
bb->_start += offset;
bb->_buf_end = bb->_end = bb->_start + bytes;
@@ -191,10 +191,10 @@ MIOBuffer::puts(char *s, int64_t len)
int64_t
IOBufferReader::read(void *ab, int64_t len)
{
- char *b = (char *)ab;
+ char *b = (char *)ab;
int64_t max_bytes = read_avail();
- int64_t bytes = len <= max_bytes ? len : max_bytes;
- int64_t n = bytes;
+ int64_t bytes = len <= max_bytes ? len : max_bytes;
+ int64_t n = bytes;
while (n) {
int64_t l = block_read_avail();
@@ -221,7 +221,7 @@ IOBufferReader::memchr(char c, int64_t len, int64_t offset)
max_bytes -= offset;
if (max_bytes <= 0) {
offset = -max_bytes;
- b = b->next;
+ b = b->next;
continue;
}
int64_t bytes;
@@ -235,7 +235,7 @@ IOBufferReader::memchr(char c, int64_t len, int64_t offset)
return (int64_t)(o - start_offset + p - s);
o += bytes;
len -= bytes;
- b = b->next;
+ b = b->next;
offset = 0;
}
@@ -245,7 +245,7 @@ IOBufferReader::memchr(char c, int64_t len, int64_t offset)
char *
IOBufferReader::memcpy(const void *ap, int64_t len, int64_t offset)
{
- char *p = (char *)ap;
+ char *p = (char *)ap;
IOBufferBlock *b = block;
offset += start_offset;
@@ -254,7 +254,7 @@ IOBufferReader::memcpy(const void *ap, int64_t len, int64_t offset)
max_bytes -= offset;
if (max_bytes <= 0) {
offset = -max_bytes;
- b = b->next;
+ b = b->next;
continue;
}
int64_t bytes;
@@ -265,7 +265,7 @@ IOBufferReader::memcpy(const void *ap, int64_t len, int64_t offset)
::memcpy(p, b->start() + offset, bytes);
p += bytes;
len -= bytes;
- b = b->next;
+ b = b->next;
offset = 0;
}
diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h
index af73195..f546f42 100644
--- a/iocore/eventsystem/I_Event.h
+++ b/iocore/eventsystem/I_Event.h
@@ -95,7 +95,7 @@
#define PREFETCH_EVENT_SEND_URL (SIMPLE_EVENT_EVENTS_START + 2)
typedef int EventType;
-const int ET_CALL = 0;
+const int ET_CALL = 0;
const int MAX_EVENT_TYPES = 8; // conservative, these are dynamically allocated
class EThread;
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index 5931f90..619cfc9 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -1208,7 +1208,7 @@ struct MIOBufferAccessor {
void
clear()
{
- mbuf = NULL;
+ mbuf = NULL;
entry = NULL;
}
diff --git a/iocore/eventsystem/I_Lock.h b/iocore/eventsystem/I_Lock.h
index e2a9999..1d1b777 100644
--- a/iocore/eventsystem/I_Lock.h
+++ b/iocore/eventsystem/I_Lock.h
@@ -238,19 +238,19 @@ public:
: srcloc(NULL, NULL, 0)
#endif
{
- thread_holding = NULL;
+ thread_holding = NULL;
nthread_holding = 0;
#ifdef DEBUG
hold_time = 0;
- handler = NULL;
+ handler = NULL;
#ifdef MAX_LOCK_TAKEN
taken = 0;
#endif // MAX_LOCK_TAKEN
#ifdef LOCK_CONTENTION_PROFILING
- total_acquires = 0;
- blocking_acquires = 0;
- nonblocking_acquires = 0;
- successful_nonblocking_acquires = 0;
+ total_acquires = 0;
+ blocking_acquires = 0;
+ nonblocking_acquires = 0;
+ successful_nonblocking_acquires = 0;
unsuccessful_nonblocking_acquires = 0;
#endif // LOCK_CONTENTION_PROFILING
#endif // DEBUG
@@ -301,8 +301,8 @@ Mutex_trylock(
}
m->thread_holding = t;
#ifdef DEBUG
- m->srcloc = location;
- m->handler = ahandler;
+ m->srcloc = location;
+ m->handler = ahandler;
m->hold_time = Thread::get_hrtime();
#ifdef MAX_LOCK_TAKEN
m->taken++;
@@ -350,8 +350,8 @@ Mutex_trylock_spin(
m->thread_holding = t;
ink_assert(m->thread_holding);
#ifdef DEBUG
- m->srcloc = location;
- m->handler = ahandler;
+ m->srcloc = location;
+ m->handler = ahandler;
m->hold_time = Thread::get_hrtime();
#ifdef MAX_LOCK_TAKEN
m->taken++;
@@ -383,8 +383,8 @@ Mutex_lock(
m->thread_holding = t;
ink_assert(m->thread_holding);
#ifdef DEBUG
- m->srcloc = location;
- m->handler = ahandler;
+ m->srcloc = location;
+ m->handler = ahandler;
m->hold_time = Thread::get_hrtime();
#ifdef MAX_LOCK_TAKEN
m->taken++;
@@ -416,7 +416,7 @@ Mutex_unlock(ProxyMutex *m, EThread *t)
if (m->taken > MAX_LOCK_TAKEN)
lock_taken(m->srcloc, m->handler);
#endif // MAX_LOCK_TAKEN
- m->srcloc = SrcLoc(NULL, NULL, 0);
+ m->srcloc = SrcLoc(NULL, NULL, 0);
m->handler = NULL;
#endif // DEBUG
ink_assert(m->thread_holding);
diff --git a/iocore/eventsystem/I_PriorityEventQueue.h b/iocore/eventsystem/I_PriorityEventQueue.h
index a1b11f9..886dea6 100644
--- a/iocore/eventsystem/I_PriorityEventQueue.h
+++ b/iocore/eventsystem/I_PriorityEventQueue.h
@@ -42,7 +42,7 @@ struct PriorityEventQueue {
enqueue(Event *e, ink_hrtime now)
{
ink_hrtime t = e->timeout_at - now;
- int i = 0;
+ int i = 0;
// equivalent but faster
if (t <= PQ_BUCKET_TIME(3)) {
if (t <= PQ_BUCKET_TIME(1)) {
@@ -82,7 +82,7 @@ struct PriorityEventQueue {
}
}
e->in_the_priority_queue = 1;
- e->in_heap = i;
+ e->in_heap = i;
after[i].enqueue(e);
}
diff --git a/iocore/eventsystem/I_ProxyAllocator.h b/iocore/eventsystem/I_ProxyAllocator.h
index e24e686..3650f2a 100644
--- a/iocore/eventsystem/I_ProxyAllocator.h
+++ b/iocore/eventsystem/I_ProxyAllocator.h
@@ -50,7 +50,7 @@ inline C *
thread_alloc(ClassAllocator<C> &a, ProxyAllocator &l)
{
if (l.freelist) {
- C *v = (C *)l.freelist;
+ C *v = (C *)l.freelist;
l.freelist = *(C **)l.freelist;
--(l.allocated);
*(void **)v = *(void **)&a.proto.typeObject;
@@ -64,7 +64,7 @@ inline C *
thread_alloc_init(ClassAllocator<C> &a, ProxyAllocator &l)
{
if (l.freelist) {
- C *v = (C *)l.freelist;
+ C *v = (C *)l.freelist;
l.freelist = *(C **)l.freelist;
--(l.allocated);
memcpy((void *)v, (void *)&a.proto.typeObject, sizeof(C));
@@ -90,11 +90,11 @@ template <class C>
inline void
thread_freeup(ClassAllocator<C> &a, ProxyAllocator &l)
{
- C *head = (C *)l.freelist;
- C *tail = (C *)l.freelist;
+ C *head = (C *)l.freelist;
+ C *tail = (C *)l.freelist;
size_t count = 0;
while (l.freelist && l.allocated > thread_freelist_low_watermark) {
- tail = (C *)l.freelist;
+ tail = (C *)l.freelist;
l.freelist = *(C **)l.freelist;
--(l.allocated);
++count;
@@ -116,7 +116,7 @@ void thread_freeup(Allocator &a, ProxyAllocator &l);
#define THREAD_ALLOC_INIT(_a, _t) thread_alloc_init(::_a, _t->_a)
#define THREAD_FREE(_p, _a, _t) \
do { \
- *(char **)_p = (char *)_t->_a.freelist; \
+ *(char **)_p = (char *)_t->_a.freelist; \
_t->_a.freelist = _p; \
_t->_a.allocated++; \
if (_t->_a.allocated > thread_freelist_high_watermark) \
diff --git a/iocore/eventsystem/I_Thread.h b/iocore/eventsystem/I_Thread.h
index 2d4fcb7..d82280e 100644
--- a/iocore/eventsystem/I_Thread.h
+++ b/iocore/eventsystem/I_Thread.h
@@ -77,7 +77,7 @@ typedef THREADAPI_RETURN_TYPE(THREADAPI *ThreadFunction)(void *arg);
extern ProxyMutex *global_mutex;
static const int MAX_THREAD_NAME_LENGTH = 16;
-static const int DEFAULT_STACKSIZE = 1048576; // 1MB
+static const int DEFAULT_STACKSIZE = 1048576; // 1MB
/**
Base class for the threads in the Event System. Thread is the base
diff --git a/iocore/eventsystem/PQ-List.cc b/iocore/eventsystem/PQ-List.cc
index c3686bf..5710bf6 100644
--- a/iocore/eventsystem/PQ-List.cc
+++ b/iocore/eventsystem/PQ-List.cc
@@ -25,7 +25,7 @@
PriorityEventQueue::PriorityEventQueue()
{
- last_check_time = Thread::get_hrtime_updated();
+ last_check_time = Thread::get_hrtime_updated();
last_check_buckets = last_check_time / PQ_BUCKET_TIME(0);
}
@@ -34,9 +34,9 @@ PriorityEventQueue::check_ready(ink_hrtime now, EThread *t)
{
int i, j, k = 0;
uint32_t check_buckets = (uint32_t)(now / PQ_BUCKET_TIME(0));
- uint32_t todo_buckets = check_buckets ^ last_check_buckets;
- last_check_time = now;
- last_check_buckets = check_buckets;
+ uint32_t todo_buckets = check_buckets ^ last_check_buckets;
+ last_check_time = now;
+ last_check_buckets = check_buckets;
todo_buckets &= ((1 << (N_PQ_LIST - 1)) - 1);
while (todo_buckets) {
k++;
@@ -49,7 +49,7 @@ PriorityEventQueue::check_ready(ink_hrtime now, EThread *t)
while ((e = q.dequeue()) != NULL) {
if (e->cancelled) {
e->in_the_priority_queue = 0;
- e->cancelled = 0;
+ e->cancelled = 0;
EVENT_FREE(e, eventAllocator, t);
} else {
ink_hrtime tt = e->timeout_at - now;
diff --git a/iocore/eventsystem/P_IOBuffer.h b/iocore/eventsystem/P_IOBuffer.h
index 1298b89..460258b 100644
--- a/iocore/eventsystem/P_IOBuffer.h
+++ b/iocore/eventsystem/P_IOBuffer.h
@@ -71,34 +71,34 @@ index_to_buffer_size(int64_t idx)
TS_INLINE IOBufferBlock *
iobufferblock_clone(IOBufferBlock *b, int64_t offset, int64_t len)
{
- IOBufferBlock *start_buf = NULL;
+ IOBufferBlock *start_buf = NULL;
IOBufferBlock *current_buf = NULL;
while (b && len >= 0) {
- char *start = b->_start;
- char *end = b->_end;
+ char *start = b->_start;
+ char *end = b->_end;
int64_t max_bytes = end - start;
max_bytes -= offset;
if (max_bytes <= 0) {
offset = -max_bytes;
- b = b->next;
+ b = b->next;
continue;
}
int64_t bytes = len;
if (bytes >= max_bytes)
- bytes = max_bytes;
+ bytes = max_bytes;
IOBufferBlock *new_buf = b->clone();
new_buf->_start += offset;
new_buf->_buf_end = new_buf->_end = new_buf->_start + bytes;
if (!start_buf) {
- start_buf = new_buf;
+ start_buf = new_buf;
current_buf = start_buf;
} else {
current_buf->next = new_buf;
- current_buf = new_buf;
+ current_buf = new_buf;
}
len -= bytes;
- b = b->next;
+ b = b->next;
offset = 0;
}
return start_buf;
@@ -108,13 +108,13 @@ TS_INLINE IOBufferBlock *
iobufferblock_skip(IOBufferBlock *b, int64_t *poffset, int64_t *plen, int64_t write)
{
int64_t offset = *poffset;
- int64_t len = write;
+ int64_t len = write;
while (b && len >= 0) {
int64_t max_bytes = b->read_avail();
max_bytes -= offset;
if (max_bytes <= 0) {
offset = -max_bytes;
- b = b->next;
+ b = b->next;
continue;
}
if (len >= max_bytes) {
@@ -188,7 +188,7 @@ new_IOBufferData_internal(
{
(void)size;
IOBufferData *d = THREAD_ALLOC(ioDataAllocator, this_thread());
- d->_size_index = asize_index;
+ d->_size_index = asize_index;
ink_assert(BUFFER_SIZE_INDEX_IS_CONSTANT(asize_index) || size <= d->block_size());
#ifdef TRACK_BUFFER_USER
d->_location = location;
@@ -264,7 +264,7 @@ IOBufferData::alloc(int64_t size_index, AllocType type)
if (_data)
dealloc();
_size_index = size_index;
- _mem_type = type;
+ _mem_type = type;
#ifdef TRACK_BUFFER_USER
iobuffer_mem_inc(_location, size_index);
#endif
@@ -309,9 +309,9 @@ IOBufferData::dealloc()
ats_free(_data);
break;
}
- _data = 0;
+ _data = 0;
_size_index = BUFFER_SIZE_NOT_ALLOCATED;
- _mem_type = NO_ALLOC;
+ _mem_type = NO_ALLOC;
}
TS_INLINE void
@@ -387,7 +387,7 @@ TS_INLINE void
IOBufferBlock::reset()
{
_end = _start = buf();
- _buf_end = buf() + data->block_size();
+ _buf_end = buf() + data->block_size();
}
TS_INLINE void
@@ -397,7 +397,7 @@ IOBufferBlock::alloc(int64_t i)
#ifdef TRACK_BUFFER_USER
data = new_IOBufferData_internal(_location, i);
#else
- data = new_IOBufferData_internal(i);
+ data = new_IOBufferData_internal(i);
#endif
reset();
}
@@ -405,7 +405,7 @@ IOBufferBlock::alloc(int64_t i)
TS_INLINE void
IOBufferBlock::clear()
{
- data = NULL;
+ data = NULL;
IOBufferBlock *p = next;
while (p) {
int r = p->refcount_dec();
@@ -413,7 +413,7 @@ IOBufferBlock::clear()
break;
else {
IOBufferBlock *n = p->next.m_ptr;
- p->next.m_ptr = NULL;
+ p->next.m_ptr = NULL;
p->free();
p = n;
}
@@ -430,9 +430,9 @@ IOBufferBlock::clone()
#else
IOBufferBlock *b = new_IOBufferBlock_internal();
#endif
- b->data = data;
- b->_start = _start;
- b->_end = _end;
+ b->data = data;
+ b->_start = _start;
+ b->_end = _end;
b->_buf_end = _end;
#ifdef TRACK_BUFFER_USER
b->_location = _location;
@@ -459,7 +459,7 @@ IOBufferBlock::set_internal(void *b, int64_t len, int64_t asize_index)
#ifdef TRACK_BUFFER_USER
data = new_IOBufferData_internal(_location, BUFFER_SIZE_NOT_ALLOCATED);
#else
- data = new_IOBufferData_internal(BUFFER_SIZE_NOT_ALLOCATED);
+ data = new_IOBufferData_internal(BUFFER_SIZE_NOT_ALLOCATED);
#endif
data->_data = (char *)b;
#ifdef TRACK_BUFFER_USER
@@ -473,9 +473,9 @@ IOBufferBlock::set_internal(void *b, int64_t len, int64_t asize_index)
TS_INLINE void
IOBufferBlock::set(IOBufferData *d, int64_t len, int64_t offset)
{
- data = d;
- _start = buf() + offset;
- _end = _start + len;
+ data = d;
+ _start = buf() + offset;
+ _end = _start + len;
_buf_end = buf() + d->block_size();
}
@@ -588,7 +588,7 @@ IOBufferReader::block_read_avail()
TS_INLINE int
IOBufferReader::block_count()
{
- int count = 0;
+ int count = 0;
IOBufferBlock *b = block;
while (b) {
@@ -601,7 +601,7 @@ IOBufferReader::block_count()
TS_INLINE int64_t
IOBufferReader::read_avail()
{
- int64_t t = 0;
+ int64_t t = 0;
IOBufferBlock *b = block;
while (b) {
@@ -617,7 +617,7 @@ IOBufferReader::read_avail()
inline bool
IOBufferReader::is_read_avail_more_than(int64_t size)
{
- int64_t t = -start_offset;
+ int64_t t = -start_offset;
IOBufferBlock *b = block;
while (b) {
t += b->read_avail();
@@ -643,8 +643,8 @@ IOBufferReader::consume(int64_t n)
while (r <= s && block->next && block->next->read_avail()) {
s -= r;
start_offset = s;
- block = block->next;
- r = block->read_avail();
+ block = block->next;
+ r = block->read_avail();
}
ink_assert(read_avail() >= 0);
}
@@ -673,19 +673,19 @@ TS_INLINE char &IOBufferReader::operator[](int64_t i)
TS_INLINE void
IOBufferReader::clear()
{
- accessor = NULL;
- block = NULL;
- mbuf = NULL;
+ accessor = NULL;
+ block = NULL;
+ mbuf = NULL;
start_offset = 0;
- size_limit = INT64_MAX;
+ size_limit = INT64_MAX;
}
TS_INLINE void
IOBufferReader::reset()
{
- block = mbuf->_writer;
+ block = mbuf->_writer;
start_offset = 0;
- size_limit = INT64_MAX;
+ size_limit = INT64_MAX;
}
////////////////////////////////////////////////////////////////
@@ -778,7 +778,7 @@ new_empty_MIOBuffer_internal(
#endif
int64_t size_index)
{
- MIOBuffer *b = THREAD_ALLOC(ioAllocator, this_thread());
+ MIOBuffer *b = THREAD_ALLOC(ioAllocator, this_thread());
b->size_index = size_index;
#ifdef TRACK_BUFFER_USER
b->_location = location;
@@ -804,7 +804,7 @@ MIOBuffer::alloc_accessor(MIOBufferAccessor *anAccessor)
ink_release_assert(i < MAX_MIOBUFFER_READERS);
IOBufferReader *e = &readers[i];
- e->mbuf = this;
+ e->mbuf = this;
e->reset();
e->accessor = anAccessor;
@@ -823,7 +823,7 @@ MIOBuffer::alloc_reader()
ink_release_assert(i < MAX_MIOBUFFER_READERS);
IOBufferReader *e = &readers[i];
- e->mbuf = this;
+ e->mbuf = this;
e->reset();
e->accessor = NULL;
@@ -847,11 +847,11 @@ MIOBuffer::clone_reader(IOBufferReader *r)
ink_release_assert(i < MAX_MIOBUFFER_READERS);
IOBufferReader *e = &readers[i];
- e->mbuf = this;
- e->accessor = NULL;
- e->block = r->block;
- e->start_offset = r->start_offset;
- e->size_limit = r->size_limit;
+ e->mbuf = this;
+ e->accessor = NULL;
+ e->block = r->block;
+ e->start_offset = r->start_offset;
+ e->size_limit = r->size_limit;
ink_assert(e->size_limit >= 0);
return e;
@@ -893,7 +893,7 @@ MIOBuffer::append_block_internal(IOBufferBlock *b)
_writer->next = b;
while (b->read_avail()) {
_writer = b;
- b = b->next;
+ b = b->next;
if (!b)
break;
}
@@ -963,7 +963,7 @@ MIOBuffer::get_current_block()
TS_INLINE int64_t
MIOBuffer::current_write_avail()
{
- int64_t t = 0;
+ int64_t t = 0;
IOBufferBlock *b = _writer;
while (b) {
t += b->write_avail();
@@ -997,7 +997,7 @@ MIOBuffer::fill(int64_t len)
len -= f;
if (len > 0)
_writer = _writer->next;
- f = _writer->write_avail();
+ f = _writer->write_avail();
}
_writer->fill(len);
}
@@ -1042,7 +1042,7 @@ MIOBuffer::set(void *b, int64_t len)
#ifdef TRACK_BUFFER_USER
_writer = new_IOBufferBlock_internal(_location);
#else
- _writer = new_IOBufferBlock_internal();
+ _writer = new_IOBufferBlock_internal();
#endif
_writer->set_internal(b, len, BUFFER_SIZE_INDEX_FOR_CONSTANT_SIZE(len));
init_readers();
@@ -1054,7 +1054,7 @@ MIOBuffer::set_xmalloced(void *b, int64_t len)
#ifdef TRACK_BUFFER_USER
_writer = new_IOBufferBlock_internal(_location);
#else
- _writer = new_IOBufferBlock_internal();
+ _writer = new_IOBufferBlock_internal();
#endif
_writer->set_internal(b, len, BUFFER_SIZE_INDEX_FOR_XMALLOC_SIZE(len));
init_readers();
@@ -1090,7 +1090,7 @@ MIOBuffer::alloc(int64_t i)
#ifdef TRACK_BUFFER_USER
_writer = new_IOBufferBlock_internal(_location);
#else
- _writer = new_IOBufferBlock_internal();
+ _writer = new_IOBufferBlock_internal();
#endif
_writer->alloc(i);
size_index = i;
@@ -1156,7 +1156,7 @@ MIOBufferAccessor::reader_for(IOBufferReader *areader)
{
if (entry == areader)
return;
- mbuf = areader->mbuf;
+ mbuf = areader->mbuf;
entry = areader;
ink_assert(mbuf);
}
@@ -1164,7 +1164,7 @@ MIOBufferAccessor::reader_for(IOBufferReader *areader)
TS_INLINE void
MIOBufferAccessor::writer_for(MIOBuffer *abuf)
{
- mbuf = abuf;
+ mbuf = abuf;
entry = NULL;
}
diff --git a/iocore/eventsystem/P_UnixEThread.h b/iocore/eventsystem/P_UnixEThread.h
index f884f4b..3de6134 100644
--- a/iocore/eventsystem/P_UnixEThread.h
+++ b/iocore/eventsystem/P_UnixEThread.h
@@ -46,45 +46,45 @@ EThread::schedule_spawn(Continuation *cont)
TS_INLINE Event *
EThread::schedule_imm(Continuation *cont, int callback_event, void *cookie)
{
- Event *e = ::eventAllocator.alloc();
+ Event *e = ::eventAllocator.alloc();
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, 0, 0));
}
TS_INLINE Event *
EThread::schedule_imm_signal(Continuation *cont, int callback_event, void *cookie)
{
- Event *e = ::eventAllocator.alloc();
+ Event *e = ::eventAllocator.alloc();
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, 0, 0), true);
}
TS_INLINE Event *
EThread::schedule_at(Continuation *cont, ink_hrtime t, int callback_event, void *cookie)
{
- Event *e = ::eventAllocator.alloc();
+ Event *e = ::eventAllocator.alloc();
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, t, 0));
}
TS_INLINE Event *
EThread::schedule_in(Continuation *cont, ink_hrtime t, int callback_event, void *cookie)
{
- Event *e = ::eventAllocator.alloc();
+ Event *e = ::eventAllocator.alloc();
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, get_hrtime() + t, 0));
}
TS_INLINE Event *
EThread::schedule_every(Continuation *cont, ink_hrtime t, int callback_event, void *cookie)
{
- Event *e = ::eventAllocator.alloc();
+ Event *e = ::eventAllocator.alloc();
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, get_hrtime() + t, t));
}
@@ -105,36 +105,36 @@ EThread::schedule(Event *e, bool fast_signal)
TS_INLINE Event *
EThread::schedule_imm_local(Continuation *cont, int callback_event, void *cookie)
{
- Event *e = EVENT_ALLOC(eventAllocator, this);
+ Event *e = EVENT_ALLOC(eventAllocator, this);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule_local(e->init(cont, 0, 0));
}
TS_INLINE Event *
EThread::schedule_at_local(Continuation *cont, ink_hrtime t, int callback_event, void *cookie)
{
- Event *e = EVENT_ALLOC(eventAllocator, this);
+ Event *e = EVENT_ALLOC(eventAllocator, this);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule_local(e->init(cont, t, 0));
}
TS_INLINE Event *
EThread::schedule_in_local(Continuation *cont, ink_hrtime t, int callback_event, void *cookie)
{
- Event *e = EVENT_ALLOC(eventAllocator, this);
+ Event *e = EVENT_ALLOC(eventAllocator, this);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule_local(e->init(cont, get_hrtime() + t, 0));
}
TS_INLINE Event *
EThread::schedule_every_local(Continuation *cont, ink_hrtime t, int callback_event, void *cookie)
{
- Event *e = EVENT_ALLOC(eventAllocator, this);
+ Event *e = EVENT_ALLOC(eventAllocator, this);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule_local(e->init(cont, get_hrtime() + t, t));
}
@@ -147,7 +147,7 @@ EThread::schedule_local(Event *e)
}
if (!e->mutex.m_ptr) {
e->ethread = this;
- e->mutex = e->continuation->mutex;
+ e->mutex = e->continuation->mutex;
} else {
ink_assert(e->ethread == this);
}
diff --git a/iocore/eventsystem/P_UnixEvent.h b/iocore/eventsystem/P_UnixEvent.h
index 4b2f8b1..a79cb88 100644
--- a/iocore/eventsystem/P_UnixEvent.h
+++ b/iocore/eventsystem/P_UnixEvent.h
@@ -28,10 +28,10 @@ TS_INLINE Event *
Event::init(Continuation *c, ink_hrtime atimeout_at, ink_hrtime aperiod)
{
continuation = c;
- timeout_at = atimeout_at;
- period = aperiod;
- immediate = !period && !atimeout_at;
- cancelled = false;
+ timeout_at = atimeout_at;
+ period = aperiod;
+ immediate = !period && !atimeout_at;
+ cancelled = false;
return this;
}
diff --git a/iocore/eventsystem/P_UnixEventProcessor.h b/iocore/eventsystem/P_UnixEventProcessor.h
index 911024e..5ee4867 100644
--- a/iocore/eventsystem/P_UnixEventProcessor.h
+++ b/iocore/eventsystem/P_UnixEventProcessor.h
@@ -42,8 +42,8 @@ TS_INLINE off_t
EventProcessor::allocate(int size)
{
static off_t start = INK_ALIGN(offsetof(EThread, thread_private), 16);
- static off_t loss = start - offsetof(EThread, thread_private);
- size = INK_ALIGN(size, 16); // 16 byte alignment
+ static off_t loss = start - offsetof(EThread, thread_private);
+ size = INK_ALIGN(size, 16); // 16 byte alignment
int old;
do {
@@ -91,7 +91,7 @@ EventProcessor::schedule_imm_signal(Continuation *cont, EventType et, int callba
e->start_time = Thread::get_hrtime();
#endif
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, 0, 0), et, true);
}
@@ -105,7 +105,7 @@ EventProcessor::schedule_imm(Continuation *cont, EventType et, int callback_even
e->start_time = Thread::get_hrtime();
#endif
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, 0, 0), et);
}
@@ -117,7 +117,7 @@ EventProcessor::schedule_at(Continuation *cont, ink_hrtime t, EventType et, int
ink_assert(t > 0);
ink_assert(et < MAX_EVENT_TYPES);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, t, 0), et);
}
@@ -128,7 +128,7 @@ EventProcessor::schedule_in(Continuation *cont, ink_hrtime t, EventType et, int
ink_assert(et < MAX_EVENT_TYPES);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
return schedule(e->init(cont, Thread::get_hrtime() + t, 0), et);
}
@@ -140,7 +140,7 @@ EventProcessor::schedule_every(Continuation *cont, ink_hrtime t, EventType et, i
ink_assert(t != 0);
ink_assert(et < MAX_EVENT_TYPES);
e->callback_event = callback_event;
- e->cookie = cookie;
+ e->cookie = cookie;
if (t < 0)
return schedule(e->init(cont, t, t), et);
else
diff --git a/iocore/eventsystem/P_UnixSocketManager.h b/iocore/eventsystem/P_UnixSocketManager.h
index f372caa..e1161fb 100644
--- a/iocore/eventsystem/P_UnixSocketManager.h
+++ b/iocore/eventsystem/P_UnixSocketManager.h
@@ -461,7 +461,7 @@ SocketManager::get_sndbuf_size(int s)
int bszsz, r;
bszsz = sizeof(bsz);
- r = safe_getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&bsz, &bszsz);
+ r = safe_getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&bsz, &bszsz);
return (r == 0 ? bsz : r);
}
@@ -472,7 +472,7 @@ SocketManager::get_rcvbuf_size(int s)
int bszsz, r;
bszsz = sizeof(bsz);
- r = safe_getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&bsz, &bszsz);
+ r = safe_getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&bsz, &bszsz);
return (r == 0 ? bsz : r);
}
diff --git a/iocore/eventsystem/ProtectedQueue.cc b/iocore/eventsystem/ProtectedQueue.cc
index 8afd620..bd56e98 100644
--- a/iocore/eventsystem/ProtectedQueue.cc
+++ b/iocore/eventsystem/ProtectedQueue.cc
@@ -47,9 +47,9 @@ void
ProtectedQueue::enqueue(Event *e, bool fast_signal)
{
ink_assert(!e->in_the_prot_queue && !e->in_the_priority_queue);
- EThread *e_ethread = e->ethread;
+ EThread *e_ethread = e->ethread;
e->in_the_prot_queue = 1;
- bool was_empty = (ink_atomiclist_push(&al, e) == NULL);
+ bool was_empty = (ink_atomiclist_push(&al, e) == NULL);
if (was_empty) {
EThread *inserting_thread = this_ethread();
@@ -72,7 +72,7 @@ ProtectedQueue::enqueue(Event *e, bool fast_signal)
if (e_ethread->signal_hook)
e_ethread->signal_hook(e_ethread);
}
- int &t = inserting_thread->n_ethreads_to_be_signalled;
+ int &t = inserting_thread->n_ethreads_to_be_signalled;
EThread **sig_e = inserting_thread->ethreads_to_be_signalled;
if ((t + 1) >= eventProcessor.n_ethreads) {
// we have run out of room
@@ -86,7 +86,7 @@ ProtectedQueue::enqueue(Event *e, bool fast_signal)
if (next == cur)
break;
sig_e[cur->id] = cur;
- cur = next;
+ cur = next;
}
// if not overwritten
if (sig_e[i] && sig_e[i]->id != i)
diff --git a/iocore/eventsystem/ProxyAllocator.cc b/iocore/eventsystem/ProxyAllocator.cc
index 434921d..ad5bc63 100644
--- a/iocore/eventsystem/ProxyAllocator.cc
+++ b/iocore/eventsystem/ProxyAllocator.cc
@@ -23,14 +23,14 @@
#include "I_EventSystem.h"
int thread_freelist_high_watermark = 512;
-int thread_freelist_low_watermark = 32;
+int thread_freelist_low_watermark = 32;
void *
thread_alloc(Allocator &a, ProxyAllocator &l)
{
#if TS_USE_FREELIST
if (l.freelist) {
- void *v = (void *)l.freelist;
+ void *v = (void *)l.freelist;
l.freelist = *(void **)l.freelist;
--(l.allocated);
return v;
@@ -44,11 +44,11 @@ thread_alloc(Allocator &a, ProxyAllocator &l)
void
thread_freeup(Allocator &a, ProxyAllocator &l)
{
- void *head = (void *)l.freelist;
- void *tail = (void *)l.freelist;
+ void *head = (void *)l.freelist;
+ void *tail = (void *)l.freelist;
size_t count = 0;
while (l.freelist && l.allocated > thread_freelist_low_watermark) {
- tail = l.freelist;
+ tail = l.freelist;
l.freelist = *(void **)l.freelist;
--(l.allocated);
++count;
diff --git a/iocore/eventsystem/Thread.cc b/iocore/eventsystem/Thread.cc
index 03af6db..64b697d 100644
--- a/iocore/eventsystem/Thread.cc
+++ b/iocore/eventsystem/Thread.cc
@@ -37,13 +37,13 @@
static ink_thread_key init_thread_key();
-ProxyMutex *global_mutex = NULL;
-ink_hrtime Thread::cur_time = 0;
+ProxyMutex *global_mutex = NULL;
+ink_hrtime Thread::cur_time = 0;
inkcoreapi ink_thread_key Thread::thread_data_key = init_thread_key();
Thread::Thread()
{
- mutex = new_ProxyMutex();
+ mutex = new_ProxyMutex();
mutex_ptr = mutex;
MUTEX_TAKE_LOCK(mutex, (EThread *)this);
mutex->nthread_holding = THREAD_MUTEX_THREAD_HOLDING;
@@ -93,8 +93,8 @@ Thread::start(const char *name, size_t stacksize, ThreadFunction f, void *a)
{
thread_data_internal *p = (thread_data_internal *)ats_malloc(sizeof(thread_data_internal));
- p->f = f;
- p->a = a;
+ p->f = f;
+ p->a = a;
p->me = this;
memset(p->name, 0, MAX_THREAD_NAME_LENGTH);
ink_strlcpy(p->name, name, MAX_THREAD_NAME_LENGTH);
diff --git a/iocore/eventsystem/UnixEThread.cc b/iocore/eventsystem/UnixEThread.cc
index e395787..7f08361 100644
--- a/iocore/eventsystem/UnixEThread.cc
+++ b/iocore/eventsystem/UnixEThread.cc
@@ -276,7 +276,7 @@ EThread::execute()
if (!INK_ATOMICLIST_EMPTY(EventQueueExternal.al))
EventQueueExternal.dequeue_timed(cur_time, next_time, false);
} else { // Means there are no negative events
- next_time = EventQueue.earliest_timeout();
+ next_time = EventQueue.earliest_timeout();
ink_hrtime sleep_time = next_time - cur_time;
if (sleep_time > THREAD_MAX_HEARTBEAT_MSECONDS * HRTIME_MSECOND) {
diff --git a/iocore/eventsystem/UnixEvent.cc b/iocore/eventsystem/UnixEvent.cc
index 91ca27b..8596f47 100644
--- a/iocore/eventsystem/UnixEvent.cc
+++ b/iocore/eventsystem/UnixEvent.cc
@@ -39,9 +39,9 @@ Event::schedule_imm(int acallback_event)
if (in_the_priority_queue)
ethread->EventQueue.remove(this);
timeout_at = 0;
- period = 0;
- immediate = true;
- mutex = continuation->mutex;
+ period = 0;
+ immediate = true;
+ mutex = continuation->mutex;
if (!in_the_prot_queue)
ethread->EventQueueExternal.enqueue_local(this);
}
@@ -55,9 +55,9 @@ Event::schedule_at(ink_hrtime atimeout_at, int acallback_event)
if (in_the_priority_queue)
ethread->EventQueue.remove(this);
timeout_at = atimeout_at;
- period = 0;
- immediate = false;
- mutex = continuation->mutex;
+ period = 0;
+ immediate = false;
+ mutex = continuation->mutex;
if (!in_the_prot_queue)
ethread->EventQueueExternal.enqueue_local(this);
}
@@ -70,9 +70,9 @@ Event::schedule_in(ink_hrtime atimeout_in, int acallback_event)
if (in_the_priority_queue)
ethread->EventQueue.remove(this);
timeout_at = Thread::get_hrtime() + atimeout_in;
- period = 0;
- immediate = false;
- mutex = continuation->mutex;
+ period = 0;
+ immediate = false;
+ mutex = continuation->mutex;
if (!in_the_prot_queue)
ethread->EventQueueExternal.enqueue_local(this);
}
@@ -90,9 +90,9 @@ Event::schedule_every(ink_hrtime aperiod, int acallback_event)
} else {
timeout_at = Thread::get_hrtime() + aperiod;
}
- period = aperiod;
+ period = aperiod;
immediate = false;
- mutex = continuation->mutex;
+ mutex = continuation->mutex;
if (!in_the_prot_queue)
ethread->EventQueueExternal.enqueue_local(this);
}
diff --git a/iocore/eventsystem/UnixEventProcessor.cc b/iocore/eventsystem/UnixEventProcessor.cc
index 0c4e410..2689d6c 100644
--- a/iocore/eventsystem/UnixEventProcessor.cc
+++ b/iocore/eventsystem/UnixEventProcessor.cc
@@ -45,8 +45,8 @@ EventProcessor::spawn_event_threads(int n_threads, const char *et_name, size_t s
new_thread_group_id = (EventType)n_thread_groups;
for (i = 0; i < n_threads; i++) {
- EThread *t = new EThread(REGULAR, n_ethreads + i);
- all_ethreads[n_ethreads + i] = t;
+ EThread *t = new EThread(REGULAR, n_ethreads + i);
+ all_ethreads[n_ethreads + i] = t;
eventthread[new_thread_group_id][i] = t;
t->set_event_type(new_thread_group_id);
}
@@ -78,7 +78,7 @@ EventProcessor::start(int n_event_threads, size_t stacksize)
ink_release_assert(n_event_threads > 0 && n_event_threads <= MAX_EVENT_THREADS);
started = 1;
- n_ethreads = n_event_threads;
+ n_ethreads = n_event_threads;
n_thread_groups = 1;
for (i = 0; i < n_event_threads; i++) {
@@ -147,7 +147,7 @@ EventProcessor::start(int n_event_threads, size_t stacksize)
obj = hwloc_get_obj_by_type(ink_get_topology(), obj_type, i % obj_count);
#if HWLOC_API_VERSION >= 0x00010100
int cpu_mask_len = hwloc_bitmap_snprintf(NULL, 0, obj->cpuset) + 1;
- char *cpu_mask = (char *)alloca(cpu_mask_len);
+ char *cpu_mask = (char *)alloca(cpu_mask_len);
hwloc_bitmap_snprintf(cpu_mask, cpu_mask_len, obj->cpuset);
Debug("iocore_thread", "EThread: %d %s: %d CPU Mask: %s\n", i, obj_name, obj->logical_index, cpu_mask);
#else
@@ -179,7 +179,7 @@ EventProcessor::spawn_thread(Continuation *cont, const char *thr_name, size_t st
e->init(cont, 0, 0);
all_dthreads[n_dthreads] = new EThread(DEDICATED, e);
- e->ethread = all_dthreads[n_dthreads];
+ e->ethread = all_dthreads[n_dthreads];
e->mutex = e->continuation->mutex = all_dthreads[n_dthreads]->mutex;
n_dthreads++;
e->ethread->start(thr_name, stacksize);
diff --git a/iocore/eventsystem/test_Buffer.cc b/iocore/eventsystem/test_Buffer.cc
index 775738f..165b090 100644
--- a/iocore/eventsystem/test_Buffer.cc
+++ b/iocore/eventsystem/test_Buffer.cc
@@ -43,11 +43,11 @@ main(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
eventProcessor.start(TEST_THREADS);
for (unsigned i = 0; i < 100; ++i) {
- MIOBuffer *b1 = new_MIOBuffer(default_large_iobuffer_size);
+ MIOBuffer *b1 = new_MIOBuffer(default_large_iobuffer_size);
IOBufferReader *b1reader ATS_UNUSED = b1->alloc_reader();
b1->fill(b1->write_avail());
- MIOBuffer *b2 = new_MIOBuffer(default_large_iobuffer_size);
+ MIOBuffer *b2 = new_MIOBuffer(default_large_iobuffer_size);
IOBufferReader *b2reader ATS_UNUSED = b2->alloc_reader();
b2->fill(b2->write_avail());
diff --git a/iocore/eventsystem/test_Event.cc b/iocore/eventsystem/test_Event.cc
index 8185afa..5fe80bf 100644
--- a/iocore/eventsystem/test_Event.cc
+++ b/iocore/eventsystem/test_Event.cc
@@ -60,7 +60,7 @@ int
main(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
{
RecModeT mode_type = RECM_STAND_ALONE;
- count = 0;
+ count = 0;
Layout::create();
init_diags("", NULL);
@@ -69,7 +69,7 @@ main(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
ink_event_system_init(EVENT_SYSTEM_MODULE_VERSION);
eventProcessor.start(TEST_THREADS, 1048576); // Hardcoded stacksize at 1MB
- alarm_printer *alrm = new alarm_printer(new_ProxyMutex());
+ alarm_printer *alrm = new alarm_printer(new_ProxyMutex());
process_killer *killer = new process_killer(new_ProxyMutex());
eventProcessor.schedule_in(killer, HRTIME_SECONDS(10));
eventProcessor.schedule_every(alrm, HRTIME_SECONDS(1));
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index ab1a7dd..7081b46 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -40,31 +40,31 @@
HostDBProcessor hostDBProcessor;
int HostDBProcessor::hostdb_strict_round_robin = 0;
-int HostDBProcessor::hostdb_timed_round_robin = 0;
+int HostDBProcessor::hostdb_timed_round_robin = 0;
HostDBProcessor::Options const HostDBProcessor::DEFAULT_OPTIONS;
HostDBContinuation::Options const HostDBContinuation::DEFAULT_OPTIONS;
-int hostdb_enable = true;
-int hostdb_migrate_on_demand = true;
-int hostdb_cluster = false;
-int hostdb_cluster_round_robin = false;
-int hostdb_lookup_timeout = 30;
-int hostdb_insert_timeout = 160;
-int hostdb_re_dns_on_reload = false;
-int hostdb_ttl_mode = TTL_OBEY;
-unsigned int hostdb_current_interval = 0;
-unsigned int hostdb_ip_stale_interval = HOST_DB_IP_STALE;
-unsigned int hostdb_ip_timeout_interval = HOST_DB_IP_TIMEOUT;
-unsigned int hostdb_ip_fail_timeout_interval = HOST_DB_IP_FAIL_TIMEOUT;
+int hostdb_enable = true;
+int hostdb_migrate_on_demand = true;
+int hostdb_cluster = false;
+int hostdb_cluster_round_robin = false;
+int hostdb_lookup_timeout = 30;
+int hostdb_insert_timeout = 160;
+int hostdb_re_dns_on_reload = false;
+int hostdb_ttl_mode = TTL_OBEY;
+unsigned int hostdb_current_interval = 0;
+unsigned int hostdb_ip_stale_interval = HOST_DB_IP_STALE;
+unsigned int hostdb_ip_timeout_interval = HOST_DB_IP_TIMEOUT;
+unsigned int hostdb_ip_fail_timeout_interval = HOST_DB_IP_FAIL_TIMEOUT;
unsigned int hostdb_serve_stale_but_revalidate = 0;
-unsigned int hostdb_hostfile_check_interval = 86400; // 1 day
-unsigned int hostdb_hostfile_update_timestamp = 0;
-unsigned int hostdb_hostfile_check_timestamp = 0;
-char hostdb_filename[PATH_NAME_MAX] = DEFAULT_HOST_DB_FILENAME;
-int hostdb_size = DEFAULT_HOST_DB_SIZE;
-char hostdb_hostfile_path[PATH_NAME_MAX] = "";
-int hostdb_sync_frequency = 120;
-int hostdb_srv_enabled = 0;
-int hostdb_disable_reverse_lookup = 0;
+unsigned int hostdb_hostfile_check_interval = 86400; // 1 day
+unsigned int hostdb_hostfile_update_timestamp = 0;
+unsigned int hostdb_hostfile_check_timestamp = 0;
+char hostdb_filename[PATH_NAME_MAX] = DEFAULT_HOST_DB_FILENAME;
+int hostdb_size = DEFAULT_HOST_DB_SIZE;
+char hostdb_hostfile_path[PATH_NAME_MAX] = "";
+int hostdb_sync_frequency = 120;
+int hostdb_srv_enabled = 0;
+int hostdb_disable_reverse_lookup = 0;
ClassAllocator<HostDBContinuation> hostDBContAllocator("hostDBContAllocator");
@@ -134,7 +134,7 @@ hostdb_cont_free(HostDBContinuation *cont)
{
if (cont->pending_action)
cont->pending_action->cancel();
- cont->mutex = 0;
+ cont->mutex = 0;
cont->action.mutex = 0;
hostDBContAllocator.free(cont);
}
@@ -172,7 +172,7 @@ HostDBMD5 &
HostDBMD5::set_host(char const *name, int len)
{
host_name = name;
- host_len = len;
+ host_len = len;
#ifdef SPLIT_DNS
if (host_name && SplitDNSConfig::isSplitDNSEnabled()) {
const char *scan;
@@ -202,7 +202,7 @@ HostDBMD5::refresh()
if (host_name) {
char const *server_line = dns_server ? dns_server->x_dns_ip_line : 0;
- uint8_t m = static_cast<uint8_t>(db_mark); // be sure of the type.
+ uint8_t m = static_cast<uint8_t>(db_mark); // be sure of the type.
ctx.update(host_name, host_len);
ctx.update(reinterpret_cast<uint8_t *>(&port), sizeof(port));
@@ -235,11 +235,11 @@ HostDBMD5::~HostDBMD5()
HostDBCache::HostDBCache()
{
- tag_bits = HOST_DB_TAG_BITS;
- max_hits = (1 << HOST_DB_HITS_BITS) - 1;
+ tag_bits = HOST_DB_TAG_BITS;
+ max_hits = (1 << HOST_DB_HITS_BITS) - 1;
version.ink_major = HOST_DB_CACHE_MAJOR_VERSION;
version.ink_minor = HOST_DB_CACHE_MINOR_VERSION;
- hosts_file_ptr = new RefCountedHostsFileMap();
+ hosts_file_ptr = new RefCountedHostsFileMap();
}
int
@@ -409,7 +409,7 @@ HostDBCache::start(int flags)
int storage_size = 33554432; // 32MB default
bool reconfigure = ((flags & PROCESSOR_RECONFIGURE) ? true : false);
- bool fix = ((flags & PROCESSOR_FIX) ? true : false);
+ bool fix = ((flags & PROCESSOR_FIX) ? true : false);
storage_path[0] = '\0';
@@ -440,7 +440,7 @@ HostDBCache::start(int flags)
}
hostDBStore = new Store;
- hostDBSpan = new Span;
+ hostDBSpan = new Span;
hostDBSpan->init(storage_path, storage_size);
hostDBStore->add(hostDBSpan);
@@ -456,7 +456,7 @@ HostDBCache::start(int flags)
delete hostDBStore;
hostDBStore = new Store;
- hostDBSpan = new Span;
+ hostDBSpan = new Span;
hostDBSpan->init(storage_path, storage_size);
hostDBStore->add(hostDBSpan);
@@ -544,11 +544,11 @@ HostDBContinuation::init(HostDBMD5 const &the_md5, Options const &opt)
md5.host_len = 0;
}
md5_host_name_store[md5.host_len] = 0;
- md5.host_name = md5_host_name_store;
+ md5.host_name = md5_host_name_store;
- host_res_style = opt.host_res_style;
+ host_res_style = opt.host_res_style;
dns_lookup_timeout = opt.timeout;
- mutex = hostDB.lock_for_bucket((int)(fold_md5(md5.hash) % hostDB.buckets));
+ mutex = hostDB.lock_for_bucket((int)(fold_md5(md5.hash) % hostDB.buckets));
if (opt.cont) {
action = opt.cont;
} else {
@@ -653,7 +653,7 @@ probe(ProxyMutex *mutex, HostDBMD5 const &md5, bool ignore_timeout)
ink_assert(this_ethread() == hostDB.lock_for_bucket((int)(fold_md5(md5.hash) % hostDB.buckets))->thread_holding);
if (hostdb_enable) {
uint64_t folded_md5 = fold_md5(md5.hash);
- HostDBInfo *r = hostDB.lookup_block(folded_md5, hostDB.levels);
+ HostDBInfo *r = hostDB.lookup_block(folded_md5, hostDB.levels);
Debug("hostdb", "probe %.*s %" PRIx64 " %d [ignore_timeout = %d]", md5.host_len, md5.host_name, folded_md5, !!r,
ignore_timeout);
if (r && md5.hash[1] == r->md5_high) {
@@ -717,7 +717,7 @@ HostDBInfo *
HostDBContinuation::insert(unsigned int attl)
{
uint64_t folded_md5 = fold_md5(md5.hash);
- int bucket = folded_md5 % hostDB.buckets;
+ int bucket = folded_md5 % hostDB.buckets;
ink_assert(this_ethread() == hostDB.lock_for_bucket(bucket)->thread_holding);
// remove the old one to prevent buildup
@@ -725,11 +725,11 @@ HostDBContinuation::insert(unsigned int attl)
if (old_r)
hostDB.delete_block(old_r);
HostDBInfo *r = hostDB.insert_block(folded_md5, NULL, 0);
- r->md5_high = md5.hash[1];
+ r->md5_high = md5.hash[1];
if (attl > HOST_DB_MAX_TTL)
- attl = HOST_DB_MAX_TTL;
+ attl = HOST_DB_MAX_TTL;
r->ip_timeout_interval = attl;
- r->ip_timestamp = hostdb_current_interval;
+ r->ip_timestamp = hostdb_current_interval;
Debug("hostdb", "inserting for: %.*s: (md5: %" PRIx64 ") bucket: %d now: %u timeout: %u ttl: %u", md5.host_len, md5.host_name,
folded_md5, bucket, r->ip_timestamp, r->ip_timeout_interval, attl);
return r;
@@ -743,7 +743,7 @@ HostDBProcessor::getby(Continuation *cont, const char *hostname, int len, sockad
HostResStyle host_res_style, int dns_lookup_timeout)
{
HostDBMD5 md5;
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
ip_text_buffer ipb;
@@ -760,7 +760,7 @@ HostDBProcessor::getby(Continuation *cont, const char *hostname, int len, sockad
// Load the MD5 data.
md5.set_host(hostname, hostname ? (len ? len : strlen(hostname)) : 0);
md5.ip.assign(ip);
- md5.port = ip ? ats_ip_port_host_order(ip) : 0;
+ md5.port = ip ? ats_ip_port_host_order(ip) : 0;
md5.db_mark = db_mark_for(host_res_style);
md5.refresh();
@@ -804,9 +804,9 @@ Lretry:
//
HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options opt;
- opt.timeout = dns_lookup_timeout;
- opt.force_dns = aforce_dns;
- opt.cont = cont;
+ opt.timeout = dns_lookup_timeout;
+ opt.force_dns = aforce_dns;
+ opt.cont = cont;
opt.host_res_style = host_res_style;
c->init(md5, opt);
SET_CONTINUATION_HANDLER(c, (HostDBContHandler)&HostDBContinuation::probeEvent);
@@ -828,8 +828,8 @@ Lretry:
Action *
HostDBProcessor::getbyname_re(Continuation *cont, const char *ahostname, int len, Options const &opt)
{
- bool force_dns = false;
- EThread *thread = this_ethread();
+ bool force_dns = false;
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
if (opt.flags & HOSTDB_FORCE_DNS_ALWAYS)
@@ -845,8 +845,8 @@ HostDBProcessor::getbyname_re(Continuation *cont, const char *ahostname, int len
Action *
HostDBProcessor::getbynameport_re(Continuation *cont, const char *ahostname, int len, Options const &opt)
{
- bool force_dns = false;
- EThread *thread = this_ethread();
+ bool force_dns = false;
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
if (opt.flags & HOSTDB_FORCE_DNS_ALWAYS)
@@ -867,8 +867,8 @@ HostDBProcessor::getSRVbyname_imm(Continuation *cont, process_srv_info_pfn proce
Options const &opt)
{
ink_assert(cont->mutex->thread_holding == this_ethread());
- bool force_dns = false;
- EThread *thread = cont->mutex->thread_holding;
+ bool force_dns = false;
+ EThread *thread = cont->mutex->thread_holding;
ProxyMutex *mutex = thread->mutex;
if (opt.flags & HOSTDB_FORCE_DNS_ALWAYS)
@@ -889,9 +889,9 @@ HostDBProcessor::getSRVbyname_imm(Continuation *cont, process_srv_info_pfn proce
}
md5.host_name = hostname;
- md5.host_len = hostname ? (len ? len : strlen(hostname)) : 0;
- md5.port = 0;
- md5.db_mark = HOSTDB_MARK_SRV;
+ md5.host_len = hostname ? (len ? len : strlen(hostname)) : 0;
+ md5.port = 0;
+ md5.db_mark = HOSTDB_MARK_SRV;
md5.refresh();
// Attempt to find the result in-line, for level 1 hits
@@ -918,8 +918,8 @@ HostDBProcessor::getSRVbyname_imm(Continuation *cont, process_srv_info_pfn proce
// Otherwise, create a continuation to do a deeper probe in the background
HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options copt;
- copt.timeout = opt.timeout;
- copt.cont = cont;
+ copt.timeout = opt.timeout;
+ copt.cont = cont;
copt.force_dns = force_dns;
c->init(md5, copt);
SET_CONTINUATION_HANDLER(c, (HostDBContHandler)&HostDBContinuation::probeEvent);
@@ -940,8 +940,8 @@ HostDBProcessor::getbyname_imm(Continuation *cont, process_hostdb_info_pfn proce
Options const &opt)
{
ink_assert(cont->mutex->thread_holding == this_ethread());
- bool force_dns = false;
- EThread *thread = cont->mutex->thread_holding;
+ bool force_dns = false;
+ EThread *thread = cont->mutex->thread_holding;
ProxyMutex *mutex = thread->mutex;
HostDBMD5 md5;
@@ -961,7 +961,7 @@ HostDBProcessor::getbyname_imm(Continuation *cont, process_hostdb_info_pfn proce
}
md5.set_host(hostname, hostname ? (len ? len : strlen(hostname)) : 0);
- md5.port = opt.port;
+ md5.port = opt.port;
md5.db_mark = db_mark_for(opt.host_res_style);
md5.refresh();
@@ -995,9 +995,9 @@ HostDBProcessor::getbyname_imm(Continuation *cont, process_hostdb_info_pfn proce
// Otherwise, create a continuation to do a deeper probe in the background
HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options copt;
- copt.cont = cont;
- copt.force_dns = force_dns;
- copt.timeout = opt.timeout;
+ copt.cont = cont;
+ copt.force_dns = force_dns;
+ copt.timeout = opt.timeout;
copt.host_res_style = opt.host_res_style;
c->init(md5, copt);
SET_CONTINUATION_HANDLER(c, (HostDBContHandler)&HostDBContinuation::probeEvent);
@@ -1011,16 +1011,16 @@ Action *
HostDBProcessor::iterate(Continuation *cont)
{
ink_assert(cont->mutex->thread_holding == this_ethread());
- EThread *thread = cont->mutex->thread_holding;
+ EThread *thread = cont->mutex->thread_holding;
ProxyMutex *mutex = thread->mutex;
HOSTDB_INCREMENT_DYN_STAT(hostdb_total_lookups_stat);
HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options copt;
- copt.cont = cont;
- copt.force_dns = false;
- copt.timeout = 0;
+ copt.cont = cont;
+ copt.force_dns = false;
+ copt.timeout = 0;
copt.host_res_style = HOST_RES_NONE;
c->init(HostDBMD5(), copt);
c->current_iterate_pos = 0;
@@ -1081,14 +1081,14 @@ HostDBProcessor::setby(const char *hostname, int len, sockaddr const *ip, HostDB
HostDBMD5 md5;
md5.set_host(hostname, hostname ? (len ? len : strlen(hostname)) : 0);
md5.ip.assign(ip);
- md5.port = ip ? ats_ip_port_host_order(ip) : 0;
+ md5.port = ip ? ats_ip_port_host_order(ip) : 0;
md5.db_mark = db_mark_for(ip);
md5.refresh();
// Attempt to find the result in-line, for level 1 hits
ProxyMutex *mutex = hostDB.lock_for_bucket((int)(fold_md5(md5.hash) % hostDB.buckets));
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
MUTEX_TRY_LOCK(lock, mutex, thread);
if (lock.is_locked()) {
@@ -1115,7 +1115,7 @@ HostDBProcessor::setby_srv(const char *hostname, int len, const char *target, Ho
HostDBMD5 md5;
md5.set_host(hostname, len ? len : strlen(hostname));
- md5.port = 0;
+ md5.port = 0;
md5.db_mark = HOSTDB_MARK_SRV;
md5.refresh();
@@ -1154,8 +1154,8 @@ remove_round_robin(HostDBInfo *r, const char *hostname, IpAddr const &ip)
if (ip == rr->info[i].ip()) {
ip_text_buffer b;
Debug("hostdb", "Deleting %s from '%s' round robin DNS entry", ip.toString(b, sizeof b), hostname);
- HostDBInfo tmp = rr->info[i];
- rr->info[i] = rr->info[rr->good - 1];
+ HostDBInfo tmp = rr->info[i];
+ rr->info[i] = rr->info[rr->good - 1];
rr->info[rr->good - 1] = tmp;
rr->good--;
if (rr->good <= 0) {
@@ -1163,9 +1163,9 @@ remove_round_robin(HostDBInfo *r, const char *hostname, IpAddr const &ip)
return false;
} else {
if (is_debug_tag_set("hostdb")) {
- int bufsize = rr->good * INET6_ADDRSTRLEN;
+ int bufsize = rr->good * INET6_ADDRSTRLEN;
char *rr_ip_list = (char *)alloca(bufsize);
- char *p = rr_ip_list;
+ char *p = rr_ip_list;
for (int n = 0; n < rr->good; ++n) {
ats_ip_ntop(rr->info[n].ip(), p, bufsize);
int nbytes = strlen(p);
@@ -1234,7 +1234,7 @@ HostDBContinuation::removeEvent(int /* event ATS_UNUSED */, Event *e)
cont->handleEvent(EVENT_HOST_DB_IP_REMOVED, (void *)NULL);
} else {
HostDBInfo *r = probe(mutex, md5, false);
- bool res = (remove_round_robin(r, md5.host_name, md5.ip) ? true : false);
+ bool res = (remove_round_robin(r, md5.host_name, md5.ip) ? true : false);
if (cont)
cont->handleEvent(EVENT_HOST_DB_IP_REMOVED, res ? static_cast<void *>(&md5.ip) : static_cast<void *>(NULL));
}
@@ -1261,11 +1261,11 @@ HostDBContinuation::lookup_done(IpAddr const &ip, char const *aname, bool around
ip_text_buffer b;
Debug("hostdb", "failed for %s", md5.ip.toString(b, sizeof b));
}
- i = insert(hostdb_ip_fail_timeout_interval); // currently ... 0
- i->round_robin = false;
+ i = insert(hostdb_ip_fail_timeout_interval); // currently ... 0
+ i->round_robin = false;
i->round_robin_elt = false;
- i->is_srv = is_srv();
- i->reverse_dns = !is_byname() && !is_srv();
+ i->is_srv = is_srv();
+ i->reverse_dns = !is_byname() && !is_srv();
i->set_failed();
} else {
@@ -1294,7 +1294,7 @@ HostDBContinuation::lookup_done(IpAddr const &ip, char const *aname, bool around
if (0 == ttl_seconds)
ttl_seconds = 1;
- i = insert(ttl_seconds);
+ i = insert(ttl_seconds);
i->round_robin_elt = false; // only true for elements explicitly added as RR elements.
if (is_byname()) {
ip_text_buffer b;
@@ -1310,9 +1310,9 @@ HostDBContinuation::lookup_done(IpAddr const &ip, char const *aname, bool around
ink_assert(srv && srv->srv_host_count > 0 && srv->srv_host_count <= 16 && around_robin);
i->data.srv.srv_offset = srv->srv_host_count;
- i->reverse_dns = false;
- i->is_srv = true;
- i->round_robin = around_robin;
+ i->reverse_dns = false;
+ i->is_srv = true;
+ i->round_robin = around_robin;
if (md5.host_name != aname) {
ink_strlcpy(md5_host_name_store, aname, sizeof(md5_host_name_store));
@@ -1321,12 +1321,12 @@ HostDBContinuation::lookup_done(IpAddr const &ip, char const *aname, bool around
} else {
Debug("hostdb", "done '%s' TTL %d", aname, ttl_seconds);
const size_t s_size = strlen(aname) + 1;
- void *s = hostDB.alloc(&i->data.hostname_offset, s_size);
+ void *s = hostDB.alloc(&i->data.hostname_offset, s_size);
if (s) {
ink_strlcpy((char *)s, aname, s_size);
i->round_robin = false;
i->reverse_dns = true;
- i->is_srv = false;
+ i->is_srv = false;
} else {
ink_assert(!"out of room in hostdb data area");
Warning("out of room in hostdb for reverse DNS data");
@@ -1338,7 +1338,7 @@ HostDBContinuation::lookup_done(IpAddr const &ip, char const *aname, bool around
if (aname) {
const size_t s_size = strlen(aname) + 1;
- void *host_dest = hostDB.alloc(&i->hostname_offset, s_size);
+ void *host_dest = hostDB.alloc(&i->hostname_offset, s_size);
if (host_dest) {
ink_strlcpy((char *)host_dest, aname, s_size);
} else {
@@ -1433,7 +1433,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
} else {
bool failed = !e;
- bool is_rr = false;
+ bool is_rr = false;
pending_action = NULL;
if (is_srv()) {
@@ -1443,13 +1443,13 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
} else {
}
- ttl = failed ? 0 : e->ttl / 60;
+ ttl = failed ? 0 : e->ttl / 60;
int ttl_seconds = failed ? 0 : e->ttl; // ebalsa: moving to second accuracy
HostDBInfo *old_r = probe(mutex, md5, true);
HostDBInfo old_info;
if (old_r)
- old_info = *old_r;
+ old_info = *old_r;
HostDBRoundRobin *old_rr_data = old_r ? old_r->rr() : NULL;
#ifdef DEBUG
if (old_rr_data) {
@@ -1462,7 +1462,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
#endif
int n = 0, nn = 0;
void *first = 0;
- uint8_t af = e ? e->ent.h_addrtype : AF_UNSPEC; // address family
+ uint8_t af = e ? e->ent.h_addrtype : AF_UNSPEC; // address family
if (is_rr) {
if (is_srv() && !failed) {
n = e->srv_hosts.srv_host_count;
@@ -1482,7 +1482,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
}
if (!first) {
failed = true;
- is_rr = false;
+ is_rr = false;
}
}
} else if (!failed) {
@@ -1503,11 +1503,11 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
r = lookup_done(tip, md5.host_name, is_rr, ttl_seconds, failed ? 0 : &e->srv_hosts);
} else if (is_srv()) {
if (!failed)
- tip._family = AF_INET; // force the tip valid, or else the srv will fail
- r = lookup_done(tip, /* junk: FIXME: is the code in lookup_done() wrong to NEED this? */
- md5.host_name, /* hostname */
- is_rr, /* is round robin, doesnt matter for SRV since we recheck getCount() inside lookup_done() */
- ttl_seconds, /* ttl in seconds */
+ tip._family = AF_INET; // force the tip valid, or else the srv will fail
+ r = lookup_done(tip, /* junk: FIXME: is the code in lookup_done() wrong to NEED this? */
+ md5.host_name, /* hostname */
+ is_rr, /* is round robin, doesnt matter for SRV since we recheck getCount() inside lookup_done() */
+ ttl_seconds, /* ttl in seconds */
failed ? 0 : &e->srv_hosts);
} else if (failed) {
r = lookup_done(tip, md5.host_name, false, ttl_seconds, 0);
@@ -1519,7 +1519,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
ink_assert(r && r->app.allotment.application1 == 0 && r->app.allotment.application2 == 0);
if (is_rr) {
- const int rrsize = HostDBRoundRobin::size(n, e->srv_hosts.srv_hosts_length);
+ const int rrsize = HostDBRoundRobin::size(n, e->srv_hosts.srv_hosts_length);
HostDBRoundRobin *rr_data = (HostDBRoundRobin *)hostDB.alloc(&r->app.rr.offset, rrsize);
Debug("hostdb", "allocating %d bytes for %d RR at %p %d", rrsize, n, rr_data, r->app.rr.offset);
@@ -1528,7 +1528,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
rr_data->length = rrsize;
int i = 0, ii = 0;
if (is_srv()) {
- int skip = 0;
+ int skip = 0;
char *pos = (char *)rr_data + sizeof(HostDBRoundRobin) + n * sizeof(HostDBInfo);
SRV *q[HOST_DB_MAX_ROUND_ROBIN_INFO];
ink_assert(n <= HOST_DB_MAX_ROUND_ROBIN_INFO);
@@ -1540,25 +1540,25 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
for (ii = i + 1; ii < n; ++ii) {
if (*q[ii] < *q[i]) {
SRV *tmp = q[i];
- q[i] = q[ii];
- q[ii] = tmp;
+ q[i] = q[ii];
+ q[ii] = tmp;
}
}
}
for (i = 0; i < n; ++i) {
- SRV *t = q[i];
+ SRV *t = q[i];
HostDBInfo &item = rr_data->info[i];
memset(&item, 0, sizeof(item));
- item.round_robin = 0;
- item.round_robin_elt = 1;
- item.reverse_dns = 0;
- item.is_srv = 1;
- item.data.srv.srv_weight = t->weight;
+ item.round_robin = 0;
+ item.round_robin_elt = 1;
+ item.reverse_dns = 0;
+ item.is_srv = 1;
+ item.data.srv.srv_weight = t->weight;
item.data.srv.srv_priority = t->priority;
- item.data.srv.srv_port = t->port;
- item.data.srv.key = t->key;
+ item.data.srv.srv_port = t->port;
+ item.data.srv.key = t->key;
ink_assert((skip + t->host_len) <= e->srv_hosts.srv_hosts_length);
@@ -1567,10 +1567,10 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
skip += t->host_len;
- item.md5_high = r->md5_high;
- item.md5_low = r->md5_low;
- item.md5_low_low = r->md5_low_low;
- item.full = 1;
+ item.md5_high = r->md5_high;
+ item.md5_low = r->md5_low;
+ item.md5_low_low = r->md5_low_low;
+ item.full = 1;
item.hostname_offset = 0;
item.app.allotment.application1 = 0;
@@ -1578,7 +1578,7 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
Debug("dns_srv", "inserted SRV RR record [%s] into HostDB with TTL: %d seconds", t->host, ttl_seconds);
}
rr_data->good = rr_data->rrcount = n;
- rr_data->current = 0;
+ rr_data->current = 0;
// restore
if (old_rr_data) {
@@ -1599,14 +1599,14 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
HostDBInfo &item = rr_data->info[i];
memset(&item, 0, sizeof(item));
ip_addr_set(item.ip(), af, e->ent.h_addr_list[ii]);
- item.full = 1;
- item.round_robin = 0;
+ item.full = 1;
+ item.round_robin = 0;
item.round_robin_elt = 1;
- item.reverse_dns = 0;
- item.is_srv = 0;
- item.md5_high = r->md5_high;
- item.md5_low = r->md5_low;
- item.md5_low_low = r->md5_low_low;
+ item.reverse_dns = 0;
+ item.is_srv = 0;
+ item.md5_high = r->md5_high;
+ item.md5_low = r->md5_low;
+ item.md5_low_low = r->md5_low_low;
item.hostname_offset = 0;
if (!restore_info(&item, old_r, old_info, old_rr_data)) {
item.app.allotment.application1 = 0;
@@ -1616,12 +1616,12 @@ HostDBContinuation::dnsEvent(int event, HostEnt *e)
}
}
rr_data->good = rr_data->rrcount = n;
- rr_data->current = 0;
+ rr_data->current = 0;
}
} else {
ink_assert(!"out of room in hostdb data area");
Warning("out of room in hostdb for round-robin DNS data");
- r->round_robin = 0;
+ r->round_robin = 0;
r->round_robin_elt = 0;
}
}
@@ -1688,7 +1688,7 @@ HostDBContinuation::make_get_message(char *buf, int size)
ink_assert(size >= (int)sizeof(HostDB_get_message));
HostDB_get_message *msg = reinterpret_cast<HostDB_get_message *>(buf);
- msg->md5 = md5.hash;
+ msg->md5 = md5.hash;
ats_ip_set(&msg->ip.sa, md5.ip, htons(md5.port));
msg->cont = this;
@@ -1719,7 +1719,7 @@ HostDBContinuation::do_get_response(Event * /* e ATS_UNUSED */)
} else {
if (probe_depth)
return false;
- m = cluster_machine_at_depth(master_hash(md5.hash));
+ m = cluster_machine_at_depth(master_hash(md5.hash));
probe_depth = 1;
}
@@ -1775,15 +1775,15 @@ HostDBContinuation::make_put_message(HostDBInfo *r, Continuation *c, char *buf,
HostDB_put_message *msg = reinterpret_cast<HostDB_put_message *>(buf);
memset(msg, 0, sizeof(HostDB_put_message));
- msg->md5 = md5.hash;
+ msg->md5 = md5.hash;
msg->cont = c;
if (r) {
ats_ip_copy(&msg->ip.sa, r->ip());
msg->application1 = r->app.allotment.application1;
msg->application2 = r->app.allotment.application2;
- msg->missing = false;
- msg->round_robin = r->round_robin;
- msg->ttl = r->ip_time_remaining();
+ msg->missing = false;
+ msg->round_robin = r->round_robin;
+ msg->ttl = r->ip_time_remaining();
} else {
msg->missing = true;
}
@@ -1937,7 +1937,7 @@ int
HostDBContinuation::set_check_pending_dns()
{
Queue<HostDBContinuation> &q = hostDB.pending_dns_for_hash(md5.hash);
- HostDBContinuation *c = q.head;
+ HostDBContinuation *c = q.head;
for (; c; c = (HostDBContinuation *)c->link.next) {
if (md5.hash == c->md5.hash) {
Debug("hostdb", "enqueuing additional request");
@@ -1990,7 +1990,7 @@ HostDBContinuation::do_dns()
}
ts::ConstBuffer hname(md5.host_name, md5.host_len);
Ptr<RefCountedHostsFileMap> current_host_file_map = hostDB.hosts_file_ptr;
- HostsFileMap::iterator find_result = current_host_file_map->hosts_file_map.find(hname);
+ HostsFileMap::iterator find_result = current_host_file_map->hosts_file_map.find(hname);
if (find_result != current_host_file_map->hosts_file_map.end()) {
if (action.continuation) {
// Set the TTL based on how much time remains until the next sync
@@ -2009,12 +2009,12 @@ HostDBContinuation::do_dns()
}
if (set_check_pending_dns()) {
DNSProcessor::Options opt;
- opt.timeout = dns_lookup_timeout;
+ opt.timeout = dns_lookup_timeout;
opt.host_res_style = host_res_style_for(md5.db_mark);
SET_HANDLER((HostDBContHandler)&HostDBContinuation::dnsEvent);
if (is_byname()) {
if (md5.dns_server)
- opt.handler = md5.dns_server->x_dnsH;
+ opt.handler = md5.dns_server->x_dnsH;
pending_action = dnsProcessor.gethostbyname(this, md5.host_name, opt);
} else if (is_srv()) {
Debug("dns_srv", "SRV lookup of %s", md5.host_name);
@@ -2044,7 +2044,7 @@ HostDBContinuation::clusterResponseEvent(int /* event ATS_UNUSED */, Event *e)
// Check to see that we have not already timed out
//
if (c) {
- action = c;
+ action = c;
from_cont = 0;
MUTEX_TRY_LOCK(lock, c->mutex, e->ethread);
MUTEX_TRY_LOCK(lock2, c->action.mutex, e->ethread);
@@ -2089,8 +2089,8 @@ HostDBContinuation::clusterEvent(int event, Event *e)
timeout = NULL;
}
if (e) {
- HostDBContinuation *c = (HostDBContinuation *)e;
- HostDBInfo *r = lookup_done(md5.ip, c->md5.host_name, false, c->ttl, NULL);
+ HostDBContinuation *c = (HostDBContinuation *)e;
+ HostDBInfo *r = lookup_done(md5.ip, c->md5.host_name, false, c->ttl, NULL);
r->app.allotment.application1 = c->app.allotment.application1;
r->app.allotment.application2 = c->app.allotment.application2;
@@ -2151,13 +2151,13 @@ get_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUS
HostDB_get_message *msg = (HostDB_get_message *)data;
md5.host_name = msg->name;
- md5.host_len = msg->namelen;
+ md5.host_len = msg->namelen;
md5.ip.assign(&msg->ip.sa);
- md5.port = ats_ip_port_host_order(&msg->ip.sa);
- md5.hash = msg->md5;
+ md5.port = ats_ip_port_host_order(&msg->ip.sa);
+ md5.hash = msg->md5;
md5.db_mark = db_mark_for(&msg->ip.sa);
#ifdef SPLIT_DNS
- SplitDNS *pSD = 0;
+ SplitDNS *pSD = 0;
char *hostname = msg->name;
if (hostname && SplitDNSConfig::isSplitDNSEnabled()) {
pSD = SplitDNSConfig::acquire();
@@ -2172,7 +2172,7 @@ get_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUS
HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options copt;
SET_CONTINUATION_HANDLER(c, (HostDBContHandler)&HostDBContinuation::probeEvent);
- c->from = ch->machine;
+ c->from = ch->machine;
c->from_cont = msg->cont;
/* -----------------------------------------
@@ -2184,7 +2184,7 @@ get_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUS
copt.host_res_style = host_res_style_for(&msg->ip.sa);
c->init(md5, copt);
- c->mutex = hostDB.lock_for_bucket(fold_md5(msg->md5) % hostDB.buckets);
+ c->mutex = hostDB.lock_for_bucket(fold_md5(msg->md5) % hostDB.buckets);
c->action.mutex = c->mutex;
dnsProcessor.thread->schedule_imm(c);
}
@@ -2193,25 +2193,25 @@ void
put_hostinfo_ClusterFunction(ClusterHandler *ch, void *data, int /* len ATS_UNUSED */)
{
HostDB_put_message *msg = (HostDB_put_message *)data;
- HostDBContinuation *c = hostDBContAllocator.alloc();
+ HostDBContinuation *c = hostDBContAllocator.alloc();
HostDBContinuation::Options copt;
HostDBMD5 md5;
SET_CONTINUATION_HANDLER(c, (HostDBContHandler)&HostDBContinuation::clusterResponseEvent);
md5.host_name = msg->name;
- md5.host_len = msg->namelen;
+ md5.host_len = msg->namelen;
md5.ip.assign(&msg->ip.sa);
- md5.port = ats_ip_port_host_order(&msg->ip.sa);
- md5.hash = msg->md5;
- md5.db_mark = db_mark_for(&msg->ip.sa);
+ md5.port = ats_ip_port_host_order(&msg->ip.sa);
+ md5.hash = msg->md5;
+ md5.db_mark = db_mark_for(&msg->ip.sa);
copt.host_res_style = host_res_style_for(&msg->ip.sa);
c->init(md5, copt);
- c->mutex = hostDB.lock_for_bucket(fold_md5(msg->md5) % hostDB.buckets);
- c->from_cont = msg->cont; // cannot use action if cont freed due to timeout
- c->missing = msg->missing;
+ c->mutex = hostDB.lock_for_bucket(fold_md5(msg->md5) % hostDB.buckets);
+ c->from_cont = msg->cont; // cannot use action if cont freed due to timeout
+ c->missing = msg->missing;
c->round_robin = msg->round_robin;
- c->ttl = msg->ttl;
- c->from = ch->machine;
+ c->ttl = msg->ttl;
+ c->from = ch->machine;
dnsProcessor.thread->schedule_imm(c);
}
@@ -2274,7 +2274,7 @@ HostDBInfo::match(INK_MD5 &md5, int /* bucket ATS_UNUSED */, int buckets)
return false;
uint64_t folded_md5 = fold_md5(md5);
- uint64_t ttag = folded_md5 / buckets;
+ uint64_t ttag = folded_md5 / buckets;
if (!ttag)
ttag = 1;
@@ -2285,7 +2285,7 @@ HostDBInfo::match(INK_MD5 &md5, int /* bucket ATS_UNUSED */, int buckets)
} tmp;
tmp.md5_low_low = (unsigned int)ttag;
- tmp.md5_low = (unsigned int)(ttag >> 24);
+ tmp.md5_low = (unsigned int)(ttag >> 24);
return tmp.md5_low_low == md5_low_low && tmp.md5_low == md5_low;
}
@@ -2398,7 +2398,7 @@ struct ShowHostDB : public ShowCont {
SET_HANDLER(&ShowHostDB::showLookupDone);
if (name) {
HostDBProcessor::Options opts;
- opts.port = port;
+ opts.port = port;
opts.flags = HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS;
hostDBProcessor.getbynameport_re(this, name, strlen(name), opts);
} else
@@ -2608,8 +2608,8 @@ register_ShowHostDB(Continuation *c, HTTPHdr *h)
s->force = !ptr_len_ncasecmp(path + 3, path_len - 3, "force", 5);
int query_len;
const char *query = h->url_get()->query_get(&query_len);
- s->sarg = ats_strndup(query, query_len);
- char *gn = NULL;
+ s->sarg = ats_strndup(query, query_len);
+ char *gn = NULL;
if (s->sarg)
gn = (char *)memchr(s->sarg, '=', strlen(s->sarg));
if (gn) {
@@ -2620,23 +2620,23 @@ register_ShowHostDB(Continuation *c, HTTPHdr *h)
s->force = !ptr_len_ncasecmp(path + 5, path_len - 5, "force", 5);
int query_len;
const char *query = h->url_get()->query_get(&query_len);
- s->sarg = ats_strndup(query, query_len);
- char *gn = NULL;
+ s->sarg = ats_strndup(query, query_len);
+ char *gn = NULL;
if (s->sarg)
gn = (char *)memchr(s->sarg, '=', strlen(s->sarg));
if (gn) {
- s->name = gn + 1;
+ s->name = gn + 1;
char *pos = strstr(s->name, "%3A");
if (pos != NULL) {
s->port = atoi(pos + 3);
- *pos = '\0'; // Null terminate name
+ *pos = '\0'; // Null terminate name
} else {
s->port = 0;
}
}
SET_CONTINUATION_HANDLER(s, &ShowHostDB::showLookup);
} else if (STR_LEN_EQ_PREFIX(path, path_len, "showall")) {
- int query_len = 0;
+ int query_len = 0;
const char *query = h->url_get()->query_get(&query_len);
if (query && query_len && strstr(query, "json")) {
s->output_json = true;
@@ -2844,15 +2844,15 @@ ParseHostFile(char const *path, unsigned int hostdb_hostfile_check_interval)
// +1 in case no terminating newline
int64_t size = info.st_size + 1;
- parsed_hosts_file_ptr = new RefCountedHostsFileMap;
+ parsed_hosts_file_ptr = new RefCountedHostsFileMap;
parsed_hosts_file_ptr->next_sync_time = Thread::get_hrtime() + hostdb_hostfile_check_interval;
- parsed_hosts_file_ptr->HostFileText = static_cast<char *>(ats_malloc(size));
+ parsed_hosts_file_ptr->HostFileText = static_cast<char *>(ats_malloc(size));
if (parsed_hosts_file_ptr->HostFileText) {
char *base = parsed_hosts_file_ptr->HostFileText;
char *limit;
- size = read(fd, parsed_hosts_file_ptr->HostFileText, info.st_size);
- limit = parsed_hosts_file_ptr->HostFileText + size;
+ size = read(fd, parsed_hosts_file_ptr->HostFileText, info.st_size);
+ limit = parsed_hosts_file_ptr->HostFileText + size;
*limit = 0;
// We need to get a list of all name/addr pairs so that we can
diff --git a/iocore/hostdb/I_HostDBProcessor.h b/iocore/hostdb/I_HostDBProcessor.h
index ebcd2dc..bd8bbc2 100644
--- a/iocore/hostdb/I_HostDBProcessor.h
+++ b/iocore/hostdb/I_HostDBProcessor.h
@@ -119,9 +119,9 @@ union HostDBApplicationInfo {
enum HttpVersion_t {
HTTP_VERSION_UNDEFINED = 0,
- HTTP_VERSION_09 = 1,
- HTTP_VERSION_10 = 2,
- HTTP_VERSION_11 = 3,
+ HTTP_VERSION_09 = 1,
+ HTTP_VERSION_10 = 2,
+ HTTP_VERSION_11 = 3,
};
struct application_data_rr {
@@ -331,9 +331,9 @@ struct HostDBInfo {
void
set_empty()
{
- full = 0;
- md5_high = 0;
- md5_low = 0;
+ full = 0;
+ md5_high = 0;
+ md5_low = 0;
md5_low_low = 0;
}
@@ -343,10 +343,10 @@ struct HostDBInfo {
uint64_t ttag = folded_md5 / buckets;
if (!ttag)
- ttag = 1;
+ ttag = 1;
md5_low_low = (unsigned int)ttag;
- md5_low = (unsigned int)(ttag >> 24);
- full = 1;
+ md5_low = (unsigned int)(ttag >> 24);
+ full = 1;
}
void
@@ -355,12 +355,12 @@ struct HostDBInfo {
ats_ip_invalidate(ip());
app.allotment.application1 = 0;
app.allotment.application2 = 0;
- backed = 0;
- deleted = 0;
- hits = 0;
- round_robin = 0;
- reverse_dns = 0;
- is_srv = 0;
+ backed = 0;
+ deleted = 0;
+ hits = 0;
+ round_robin = 0;
+ reverse_dns = 0;
+ is_srv = 0;
}
uint64_t
@@ -437,10 +437,10 @@ struct HostDBProcessor : public Processor {
// The HostDBInfo may be changed during the callback.
enum {
- HOSTDB_DO_NOT_FORCE_DNS = 0,
- HOSTDB_ROUND_ROBIN = 0,
- HOSTDB_FORCE_DNS_RELOAD = 1,
- HOSTDB_FORCE_DNS_ALWAYS = 2,
+ HOSTDB_DO_NOT_FORCE_DNS = 0,
+ HOSTDB_ROUND_ROBIN = 0,
+ HOSTDB_FORCE_DNS_RELOAD = 1,
+ HOSTDB_FORCE_DNS_ALWAYS = 2,
HOSTDB_DO_NOT_ROUND_ROBIN = 4
};
diff --git a/iocore/hostdb/MultiCache.cc b/iocore/hostdb/MultiCache.cc
index 1105fb0..fcb03fe 100644
--- a/iocore/hostdb/MultiCache.cc
+++ b/iocore/hostdb/MultiCache.cc
@@ -43,7 +43,7 @@ MultiCacheBase::MultiCacheBase()
filename[0] = 0;
memset(hit_stat, 0, sizeof(hit_stat));
memset(unsunk, 0, sizeof(unsunk));
- for (int i = 0; i < MULTI_CACHE_PARTITIONS; i++)
+ for (int i = 0; i < MULTI_CACHE_PARTITIONS; i++)
unsunk[i].mc = this;
}
@@ -77,8 +77,8 @@ MultiCacheHeader::MultiCacheHeader()
memset(level_offset, 0, sizeof(level_offset));
memset(bucketsize, 0, sizeof(bucketsize));
memset(elements, 0, sizeof(elements));
- heap_used[0] = 8;
- heap_used[1] = 8;
+ heap_used[0] = 8;
+ heap_used[1] = 8;
version.ink_major = MULTI_CACHE_MAJOR_VERSION;
version.ink_minor = MULTI_CACHE_MINOR_VERSION;
}
@@ -93,13 +93,13 @@ inline int
MultiCacheBase::blocks_in_level(unsigned int level)
{
int64_t sumbytes = 0;
- int prevblocks = 0;
- int b = 0;
+ int prevblocks = 0;
+ int b = 0;
for (unsigned int i = 0; i <= level; i++) {
sumbytes += buckets * ((int64_t)bucketsize[i]);
int sumblocks = bytes_to_blocks(sumbytes);
- b = sumblocks - prevblocks;
- prevblocks = sumblocks;
+ b = sumblocks - prevblocks;
+ prevblocks = sumblocks;
}
return b;
}
@@ -121,11 +121,11 @@ MultiCacheBase::initialize(Store *astore, char *afilename, int aelements, int ab
Warning("Alevels too large %d, cannot initialize MultiCache", MULTI_CACHE_MAX_LEVELS);
return -1;
}
- levels = alevels;
- elementsize = get_elementsize();
- totalelements = 0;
+ levels = alevels;
+ elementsize = get_elementsize();
+ totalelements = 0;
nominal_elements = aelements;
- buckets = abuckets;
+ buckets = abuckets;
ink_strlcpy(filename, afilename, sizeof(filename));
//
@@ -139,7 +139,7 @@ MultiCacheBase::initialize(Store *astore, char *afilename, int aelements, int ab
}
if (levels == 3)
level2_elements_per_bucket = aelements / buckets;
- elements[2] = level2_elements_per_bucket;
+ elements[2] = level2_elements_per_bucket;
totalelements += buckets * level2_elements_per_bucket;
bucketsize[2] = elementsize * level2_elements_per_bucket;
size += (int64_t)bucketsize[2] * (int64_t)buckets;
@@ -162,7 +162,7 @@ MultiCacheBase::initialize(Store *astore, char *afilename, int aelements, int ab
}
if (levels == 2)
level1_elements_per_bucket = aelements / buckets;
- elements[1] = level1_elements_per_bucket;
+ elements[1] = level1_elements_per_bucket;
totalelements += buckets * level1_elements_per_bucket;
bucketsize[1] = elementsize * level1_elements_per_bucket;
size += (int64_t)bucketsize[1] * (int64_t)buckets;
@@ -182,7 +182,7 @@ MultiCacheBase::initialize(Store *astore, char *afilename, int aelements, int ab
}
if (levels == 1)
level0_elements_per_bucket = aelements / buckets;
- elements[0] = level0_elements_per_bucket;
+ elements[0] = level0_elements_per_bucket;
totalelements += buckets * level0_elements_per_bucket;
bucketsize[0] = elementsize * level0_elements_per_bucket;
size += (int64_t)bucketsize[0] * (int64_t)buckets;
@@ -235,10 +235,10 @@ MultiCacheBase::mmap_region(int blocks, int *fds, char *cur, size_t &total_lengt
{
if (!blocks)
return cur;
- int p = 0;
+ int p = 0;
char *res = 0;
for (unsigned i = 0; i < store->n_disks; i++) {
- unsigned int target = blocks / (store->n_disks - i);
+ unsigned int target = blocks / (store->n_disks - i);
unsigned int following = store->total_blocks(i + 1);
if (blocks - target > following)
target = blocks - following;
@@ -254,7 +254,7 @@ MultiCacheBase::mmap_region(int blocks, int *fds, char *cur, size_t &total_lengt
b = target;
d->blocks -= b;
unsigned int nbytes = b * STORE_BLOCK_SIZE;
- int fd = fds[p] ? fds[p] : zero_fill;
+ int fd = fds[p] ? fds[p] : zero_fill;
ink_assert(-1 != fd);
int flags = private_flag ? MAP_PRIVATE : MAP_SHARED_MAP_NORESERVE;
@@ -297,7 +297,7 @@ MultiCacheBase::unmap_data()
{
int res = 0;
if (data) {
- res = munmap(data, totalsize);
+ res = munmap(data, totalsize);
data = NULL;
return res;
}
@@ -309,8 +309,8 @@ MultiCacheBase::mmap_data(bool private_flag, bool zero_fill)
{
ats_scoped_fd fd;
int fds[MULTI_CACHE_MAX_FILES] = {0};
- int n_fds = 0;
- size_t total_mapped = 0; // total mapped memory from storage.
+ int n_fds = 0;
+ size_t total_mapped = 0; // total mapped memory from storage.
// open files
//
@@ -321,7 +321,7 @@ MultiCacheBase::mmap_data(bool private_flag, bool zero_fill)
for (unsigned j = 0; j < store->disk[i]->paths(); j++) {
char path[PATH_NAME_MAX];
Span *d = ds->nth(j);
- int r = d->path(filename, NULL, path, PATH_NAME_MAX);
+ int r = d->path(filename, NULL, path, PATH_NAME_MAX);
if (r < 0) {
Warning("filename too large '%s'", filename);
goto Labort;
@@ -366,7 +366,7 @@ MultiCacheBase::mmap_data(bool private_flag, bool zero_fill)
Store tStore;
store->dup(tStore);
Store *saved = store;
- store = &tStore;
+ store = &tStore;
char *cur = 0;
@@ -432,7 +432,7 @@ MultiCacheBase::mmap_data(bool private_flag, bool zero_fill)
if (heap_size) {
heap = cur;
- cur = mmap_region(bytes_to_blocks(heap_size), fds, cur, total_mapped, private_flag, fd);
+ cur = mmap_region(bytes_to_blocks(heap_size), fds, cur, total_mapped, private_flag, fd);
if (!cur) {
store = saved;
goto Labort;
@@ -460,7 +460,7 @@ Lalloc : {
char *cur = 0;
data = (char *)ats_memalign(ats_pagesize(), totalsize);
- cur = data + STORE_BLOCK_SIZE * blocks_in_level(0);
+ cur = data + STORE_BLOCK_SIZE * blocks_in_level(0);
if (levels > 1)
cur = data + STORE_BLOCK_SIZE * blocks_in_level(1);
if (levels > 2)
@@ -493,8 +493,8 @@ void
MultiCacheBase::clear()
{
memset(data, 0, totalsize);
- heap_used[0] = 8;
- heap_used[1] = 8;
+ heap_used[0] = 8;
+ heap_used[1] = 8;
heap_halfspace = 0;
*mapped_header = *(MultiCacheHeader *)this;
}
@@ -567,13 +567,13 @@ MultiCacheBase::write_config(const char *config_filename, int nominal_size, int
int
MultiCacheBase::open(Store *s, const char *config_filename, char *db_filename, int db_size, bool reconfigure, bool fix, bool silent)
{
- int ret = 0;
+ int ret = 0;
const char *err = NULL;
- char *serr = NULL;
+ char *serr = NULL;
char t_db_filename[PATH_NAME_MAX];
- int t_db_size = 0;
+ int t_db_size = 0;
int t_db_buckets = 0;
- int change = 0;
+ int change = 0;
t_db_filename[0] = 0;
@@ -699,12 +699,12 @@ LheaderCorrupt:
goto Lfail;
LfailWrite:
- err = "unable to write";
+ err = "unable to write";
serr = strerror(errno);
goto Lfail;
LfailRead:
- err = "unable to read";
+ err = "unable to read";
serr = strerror(errno);
goto Lfail;
@@ -729,7 +729,7 @@ LfailFix:
goto Lfail;
LfailMap:
- err = "unable to mmap";
+ err = "unable to mmap";
serr = strerror(errno);
goto Lfail;
@@ -819,7 +819,7 @@ MultiCacheBase::rebuild(MultiCacheBase &old, int kind)
if (kind == MC_REBUILD_CHECK) {
// old.data is the original, data is the copy
old.data = data;
- data = new_data;
+ data = new_data;
} else {
memcpy(new_data, data, old.totalsize);
// old.data is the copy, data is the original
@@ -836,16 +836,16 @@ MultiCacheBase::rebuild(MultiCacheBase &old, int kind)
r.data = old.data;
r.rebuild = kind == MC_REBUILD;
- r.check = kind == MC_REBUILD_CHECK;
- r.fix = kind == MC_REBUILD_FIX;
+ r.check = kind == MC_REBUILD_CHECK;
+ r.fix = kind == MC_REBUILD_FIX;
- r.deleted = 0;
- r.backed = 0;
+ r.deleted = 0;
+ r.backed = 0;
r.duplicates = 0;
- r.stale = 0;
- r.corrupt = 0;
- r.good = 0;
- r.total = 0;
+ r.stale = 0;
+ r.corrupt = 0;
+ r.good = 0;
+ r.total = 0;
if (r.rebuild)
fprintf(diag_output_fp, "New:\n");
@@ -941,8 +941,8 @@ int
MultiCacheBase::sync_partition(int partition)
{
int res = 0;
- int b = first_bucket_of_partition(partition);
- int n = buckets_of_partition(partition);
+ int b = first_bucket_of_partition(partition);
+ int n = buckets_of_partition(partition);
// L3
if (levels > 2) {
if (ats_msync(data + level_offset[2] + b * bucketsize[2], n * bucketsize[2], data + totalsize, MS_SYNC) < 0)
@@ -997,7 +997,7 @@ struct MultiCacheSync : public Continuation {
heapEvent(int event, Event *e)
{
if (!partition) {
- before_used = mc->heap_used[mc->heap_halfspace];
+ before_used = mc->heap_used[mc->heap_halfspace];
mc->header_snap = *(MultiCacheHeader *)mc;
}
if (partition < MULTI_CACHE_PARTITIONS) {
@@ -1061,7 +1061,7 @@ UnsunkPtrRegistry *
MultiCacheBase::fixup_heap_offsets(int partition, int before_used, UnsunkPtrRegistry *r, int base)
{
if (!r)
- r = &unsunk[partition];
+ r = &unsunk[partition];
bool found = 0;
for (int i = 0; i < r->n; i++) {
UnsunkPtr &p = r->ptrs[i];
@@ -1083,14 +1083,14 @@ MultiCacheBase::fixup_heap_offsets(int partition, int before_used, UnsunkPtrRegi
Debug("multicache", "not found %" PRId64 " i %d base %d *p.poffset = %d", (int64_t)((char *)p.poffset - data), i, base,
*p.poffset);
}
- p.offset = 0;
- p.poffset = (int *)r->next_free;
+ p.offset = 0;
+ p.poffset = (int *)r->next_free;
r->next_free = &p;
- found = true;
+ found = true;
}
}
if (r->next) {
- int s = MULTI_CACHE_UNSUNK_PTR_BLOCK_SIZE(totalelements);
+ int s = MULTI_CACHE_UNSUNK_PTR_BLOCK_SIZE(totalelements);
r->next = fixup_heap_offsets(partition, before_used, r->next, base + s);
}
if (!r->next && !found && r != &unsunk[partition]) {
@@ -1137,8 +1137,8 @@ struct MultiCacheHeapGC : public Continuation {
int *i1, i2;
// BAD CODE GENERATION ON THE ALPHA
//*(offset_table[i].poffset) = offset_table[i].new_offset + 1;
- i1 = offset_table[i].poffset;
- i2 = offset_table[i].new_offset + 1;
+ i1 = offset_table[i].poffset;
+ i2 = offset_table[i].new_offset + 1;
*i1 = i2;
}
n_offsets = 0;
@@ -1165,7 +1165,7 @@ struct MultiCacheHeapGC : public Continuation {
offset_table = (OffsetTable *)ats_malloc(sizeof(OffsetTable) *
((mc->totalelements / MULTI_CACHE_PARTITIONS) + mc->elements[mc->levels - 1] * 3 + 1));
// flip halfspaces
- mutex = mc->locks[partition];
+ mutex = mc->locks[partition];
mc->heap_halfspace = mc->heap_halfspace ? 0 : 1;
}
~MultiCacheHeapGC() { ats_free(offset_table); }
@@ -1200,7 +1200,7 @@ MultiCacheBase::copy_heap_data(char *src, int s, int *pi, int partition, MultiCa
}
} else {
gc->offset_table[gc->n_offsets].new_offset = dest - heap;
- gc->offset_table[gc->n_offsets].poffset = pi;
+ gc->offset_table[gc->n_offsets].poffset = pi;
gc->n_offsets++;
}
} else {
@@ -1221,16 +1221,16 @@ UnsunkPtrRegistry::~UnsunkPtrRegistry()
void
UnsunkPtrRegistry::alloc_data()
{
- int bs = MULTI_CACHE_UNSUNK_PTR_BLOCK_SIZE(mc->totalelements);
+ int bs = MULTI_CACHE_UNSUNK_PTR_BLOCK_SIZE(mc->totalelements);
size_t s = bs * sizeof(UnsunkPtr);
- ptrs = (UnsunkPtr *)ats_malloc(s);
+ ptrs = (UnsunkPtr *)ats_malloc(s);
for (int i = 0; i < bs; i++) {
- ptrs[i].offset = 0;
+ ptrs[i].offset = 0;
ptrs[i].poffset = (int *)&ptrs[i + 1];
}
ptrs[bs - 1].poffset = NULL;
- next_free = ptrs;
- n = bs;
+ next_free = ptrs;
+ n = bs;
}
UnsunkPtr *
@@ -1238,8 +1238,8 @@ UnsunkPtrRegistry::alloc(int *poffset, int base)
{
if (next_free) {
UnsunkPtr *res = next_free;
- next_free = (UnsunkPtr *)next_free->poffset;
- *poffset = -(base + (res - ptrs)) - 1;
+ next_free = (UnsunkPtr *)next_free->poffset;
+ *poffset = -(base + (res - ptrs)) - 1;
ink_assert(*poffset);
return res;
} else {
@@ -1248,7 +1248,7 @@ UnsunkPtrRegistry::alloc(int *poffset, int base)
return alloc(poffset, base);
}
if (!next) {
- next = new UnsunkPtrRegistry;
+ next = new UnsunkPtrRegistry;
next->mc = mc;
}
int s = MULTI_CACHE_UNSUNK_PTR_BLOCK_SIZE(mc->totalelements);
@@ -1259,9 +1259,9 @@ UnsunkPtrRegistry::alloc(int *poffset, int base)
void *
MultiCacheBase::alloc(int *poffset, int asize)
{
- int h = heap_halfspace;
+ int h = heap_halfspace;
int size = (asize + MULTI_CACHE_HEAP_ALIGNMENT - 1) & ~(MULTI_CACHE_HEAP_ALIGNMENT - 1);
- int o = ink_atomic_increment((int *)&heap_used[h], size);
+ int o = ink_atomic_increment((int *)&heap_used[h], size);
if (o + size > halfspace_size()) {
ink_atomic_increment((int *)&heap_used[h], -size);
@@ -1271,14 +1271,14 @@ MultiCacheBase::alloc(int *poffset, int asize)
return NULL;
}
int offset = (h ? halfspace_size() : 0) + o;
- char *p = heap + offset;
+ char *p = heap + offset;
if (poffset) {
int part = ptr_to_partition((char *)poffset);
if (part < 0)
return NULL;
UnsunkPtr *up = unsunk[part].alloc(poffset);
- up->offset = offset;
- up->poffset = poffset;
+ up->offset = offset;
+ up->poffset = poffset;
Debug("multicache", "alloc unsunk %d at %" PRId64 " part %d offset %d", *poffset, (int64_t)((char *)poffset - data), part,
offset);
}
@@ -1350,8 +1350,8 @@ MultiCacheBase::update(int *poffset, int *old_poffset)
}
ink_assert(p->poffset != poffset);
UnsunkPtr *n = unsunk[part].alloc(poffset);
- n->poffset = poffset;
- n->offset = p->offset;
+ n->poffset = poffset;
+ n->offset = p->offset;
}
int
diff --git a/iocore/hostdb/P_HostDBProcessor.h b/iocore/hostdb/P_HostDBProcessor.h
index cf2ae91..d3a83f5 100644
--- a/iocore/hostdb/P_HostDBProcessor.h
+++ b/iocore/hostdb/P_HostDBProcessor.h
@@ -91,7 +91,7 @@ HOSTDB_CLIENT_IP_HASH(sockaddr const *lhs, sockaddr const *rhs)
if (ats_is_ip4(lhs)) {
in_addr_t ip1 = ats_ip4_addr_cast(lhs);
in_addr_t ip2 = ats_ip4_addr_cast(rhs);
- zret = (ip1 >> 16) ^ ip1 ^ ip2 ^ (ip2 >> 16);
+ zret = (ip1 >> 16) ^ ip1 ^ ip2 ^ (ip2 >> 16);
} else if (ats_is_ip6(lhs)) {
uint32_t const *ip1 = ats_ip_addr32_cast(lhs);
uint32_t const *ip2 = ats_ip_addr32_cast(rhs);
@@ -266,7 +266,7 @@ HostDBRoundRobin::select_next(sockaddr const *ip)
if (good > 1) {
int idx = this->index_of(ip);
if (idx >= 0) {
- idx = (idx + 1) % good;
+ idx = (idx + 1) % good;
zret = &info[idx];
}
}
@@ -301,7 +301,7 @@ HostDBRoundRobin::select_best_http(sockaddr const *client_ip, ink_time_t now, in
}
int best_any = 0;
- int best_up = -1;
+ int best_up = -1;
// Basic round robin, increment current and mod with how many we have
if (HostDBProcessor::hostdb_strict_round_robin) {
@@ -332,18 +332,18 @@ HostDBRoundRobin::select_best_http(sockaddr const *client_ip, ink_time_t now, in
} else {
Debug("hostdb", "Using default round robin");
unsigned int best_hash_any = 0;
- unsigned int best_hash_up = 0;
+ unsigned int best_hash_up = 0;
sockaddr const *ip;
for (int i = 0; i < good; i++) {
- ip = info[i].ip();
+ ip = info[i].ip();
unsigned int h = HOSTDB_CLIENT_IP_HASH(client_ip, ip);
if (best_hash_any <= h) {
- best_any = i;
+ best_any = i;
best_hash_any = h;
}
if (info[i].alive(now, fail_window)) {
if (best_hash_up <= h) {
- best_up = i;
+ best_up = i;
best_hash_up = h;
}
}
diff --git a/iocore/hostdb/P_MultiCache.h b/iocore/hostdb/P_MultiCache.h
index adc1ad3..dfc76ca 100644
--- a/iocore/hostdb/P_MultiCache.h
+++ b/iocore/hostdb/P_MultiCache.h
@@ -332,7 +332,7 @@ struct MultiCacheBase : public MultiCacheHeader {
// beeping gcc 2.7.2 is broken
if (tag_bits > 32) {
uint64_t mask = 0x100000000LL << (tag_bits - 32);
- mask = mask - 1;
+ mask = mask - 1;
return ttag & mask;
} else {
uint64_t mask = 1LL;
@@ -479,7 +479,7 @@ template <class C>
inline C *
MultiCache<C>::cache_bucket(uint64_t folded_md5, unsigned int level)
{
- int bucket = (int)(folded_md5 % buckets);
+ int bucket = (int)(folded_md5 % buckets);
char *offset = data + level_offset[level] + bucketsize[level] * bucket;
return (C *)offset;
}
@@ -491,15 +491,15 @@ template <class C>
inline C *
MultiCache<C>::insert_block(uint64_t folded_md5, C *new_block, unsigned int level)
{
- C *b = cache_bucket(folded_md5, level);
+ C *b = cache_bucket(folded_md5, level);
C *block = NULL, *empty = NULL;
int bucket = (int)(folded_md5 % buckets);
- int hits = 0;
+ int hits = 0;
// Find the entry
//
uint64_t tag = make_tag(folded_md5);
- int n_empty = 0;
+ int n_empty = 0;
for (block = b; block < b + elements[level]; block++) {
if (block->is_empty() && !empty) {
@@ -516,7 +516,7 @@ MultiCache<C>::insert_block(uint64_t folded_md5, C *new_block, unsigned int leve
}
{
- C *best = NULL;
+ C *best = NULL;
int again = 1;
do {
// Find an entry previously backed to a higher level.
@@ -542,7 +542,7 @@ MultiCache<C>::insert_block(uint64_t folded_md5, C *new_block, unsigned int leve
Lfound:
if (new_block) {
- *block = *new_block;
+ *block = *new_block;
int *hop = new_block->heap_offset_ptr();
if (hop)
update(block->heap_offset_ptr(), hop);
@@ -602,7 +602,7 @@ MultiCache<C>::delete_block(C *b)
unsigned int l = level_of_block(b);
if (l < levels - 1) {
int bucket = (((char *)b - data) - level_offset[l]) / bucketsize[l];
- C *x = (C *)(data + level_offset[l + 1] + bucket * bucketsize[l + 1]);
+ C *x = (C *)(data + level_offset[l + 1] + bucket * bucketsize[l + 1]);
for (C *y = x; y < x + elements[l + 1]; y++)
if (b->tag() == y->tag())
delete_block(y);
@@ -618,9 +618,9 @@ template <class C>
inline C *
MultiCache<C>::lookup_block(uint64_t folded_md5, unsigned int level)
{
- C *b = cache_bucket(folded_md5, 0);
+ C *b = cache_bucket(folded_md5, 0);
uint64_t tag = make_tag(folded_md5);
- int i = 0;
+ int i = 0;
// Level 0
for (i = 0; i < elements[0]; i++)
if (tag == b[i].tag())
@@ -676,9 +676,9 @@ MultiCache<C>::copy_heap(int partition, MultiCacheHeapGC *gc)
int b = first_bucket_of_partition(partition);
int n = buckets_of_partition(partition);
for (unsigned int level = 0; level < levels; level++) {
- int e = n * elements[level];
+ int e = n * elements[level];
char *d = data + level_offset[level] + b * bucketsize[level];
- C *x = (C *)d;
+ C *x = (C *)d;
for (int i = 0; i < e; i++) {
int s = x[i].heap_size();
if (s) {
diff --git a/iocore/hostdb/test_P_HostDB.cc b/iocore/hostdb/test_P_HostDB.cc
index fc35658..4e324d9 100644
--- a/iocore/hostdb/test_P_HostDB.cc
+++ b/iocore/hostdb/test_P_HostDB.cc
@@ -36,8 +36,8 @@ struct NetTesterSM : public Continuation {
ink_release_assert(lock);
vc = _vc;
SET_HANDLER(&NetTesterSM::handle_read);
- buf = new_MIOBuffer(8);
- reader = buf->alloc_reader();
+ buf = new_MIOBuffer(8);
+ reader = buf->alloc_reader();
read_vio = vc->do_io_read(this, INT64_MAX, buf);
}
@@ -48,7 +48,7 @@ struct NetTesterSM : public Continuation {
char *str;
switch (event) {
case VC_EVENT_READ_READY:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
printf("%s", str);
@@ -57,7 +57,7 @@ struct NetTesterSM : public Continuation {
case VC_EVENT_READ_COMPLETE:
/* FALLSTHROUGH */
case VC_EVENT_EOS:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
printf("%s", str);
diff --git a/iocore/net/Connection.cc b/iocore/net/Connection.cc
index 487f2c0..46d90aa 100644
--- a/iocore/net/Connection.cc
+++ b/iocore/net/Connection.cc
@@ -74,7 +74,7 @@ Connection::~Connection()
int
Server::accept(Connection *c)
{
- int res = 0;
+ int res = 0;
socklen_t sz = sizeof(c->addr);
res = socketManager.accept(fd, &c->addr.sa, &sz);
@@ -108,11 +108,11 @@ int
Connection::close()
{
is_connected = false;
- is_bound = false;
+ is_bound = false;
// don't close any of the standards
if (fd >= 2) {
int fd_save = fd;
- fd = NO_FD;
+ fd = NO_FD;
return socketManager.close(fd_save);
} else {
fd = NO_FD;
@@ -128,11 +128,11 @@ void
Connection::move(Connection &orig)
{
this->is_connected = orig.is_connected;
- this->is_bound = orig.is_bound;
- this->fd = orig.fd;
+ this->is_bound = orig.is_bound;
+ this->fd = orig.fd;
// The target has taken ownership of the file descriptor
- orig.fd = NO_FD;
- this->addr = orig.addr;
+ orig.fd = NO_FD;
+ this->addr = orig.addr;
this->sock_type = orig.sock_type;
}
@@ -149,7 +149,7 @@ add_http_filter(int fd ATS_UNUSED)
int
Server::setup_fd_for_listen(bool non_blocking, int recv_bufsize, int send_bufsize, bool transparent)
{
- int res = 0;
+ int res = 0;
int sockopt_flag_in = 0;
REC_ReadConfigInteger(sockopt_flag_in, "proxy.config.net.sock_option_flag_in");
@@ -218,7 +218,7 @@ Server::setup_fd_for_listen(bool non_blocking, int recv_bufsize, int send_bufsiz
{
struct linger l;
- l.l_onoff = 0;
+ l.l_onoff = 0;
l.l_linger = 0;
if ((sockopt_flag_in & NetVCOptions::SOCK_OPT_LINGER_ON) &&
(res = safe_setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l))) < 0) {
diff --git a/iocore/net/I_Socks.h b/iocore/net/I_Socks.h
index 84c03b6..3e2d6db 100644
--- a/iocore/net/I_Socks.h
+++ b/iocore/net/I_Socks.h
@@ -46,7 +46,7 @@ enum {
// For these two, we need to pick two values which are not used for any of the
//"commands" (eg: CONNECT, BIND) in SOCKS protocols.
NORMAL_SOCKS = 0,
- NO_SOCKS = 48
+ NO_SOCKS = 48
};
enum {
diff --git a/iocore/net/Net.cc b/iocore/net/Net.cc
index b8af833..74fe378 100644
--- a/iocore/net/Net.cc
+++ b/iocore/net/Net.cc
@@ -34,10 +34,10 @@ RecRawStatBlock *net_rsb = NULL;
// All in milli-seconds
int net_config_poll_timeout = -1; // This will get set via either command line or records.config.
-int net_event_period = 10;
-int net_accept_period = 10;
-int net_retry_delay = 10;
-int net_throttle_delay = 50; /* milliseconds */
+int net_event_period = 10;
+int net_accept_period = 10;
+int net_retry_delay = 10;
+int net_throttle_delay = 50; /* milliseconds */
static inline void
configure_net(void)
diff --git a/iocore/net/NetTest-http-server.c b/iocore/net/NetTest-http-server.c
index 062d5e6..5ca88a4 100644
--- a/iocore/net/NetTest-http-server.c
+++ b/iocore/net/NetTest-http-server.c
@@ -39,13 +39,13 @@ struct NetTesterSM : public Continuation {
vc = _vc;
Debug("net_test", "Accepted a connection");
SET_HANDLER(&NetTesterSM::handle_read);
- req_buf = new_MIOBuffer(1);
- reader = req_buf->alloc_reader();
+ req_buf = new_MIOBuffer(1);
+ reader = req_buf->alloc_reader();
read_vio = vc->do_io_read(this, INT64_MAX, req_buf);
// vc->set_inactivity_timeout(HRTIME_SECONDS(60));
resp_buf = new_empty_MIOBuffer(6);
resp_buf->append_block(resp_blk->clone());
- req_len = 0;
+ req_len = 0;
resp_reader = resp_buf->alloc_reader();
}
@@ -91,7 +91,7 @@ struct NetTesterSM : public Continuation {
case VC_EVENT_READ_COMPLETE:
/* FALLSTHROUGH */
case VC_EVENT_EOS:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
Debug("net_test", "%s", str);
diff --git a/iocore/net/NetVCTest.cc b/iocore/net/NetVCTest.cc
index f195e56..26b5e1c 100644
--- a/iocore/net/NetVCTest.cc
+++ b/iocore/net/NetVCTest.cc
@@ -136,23 +136,23 @@ NetVCTest::init_test(NetVcTestType_t c_type, NetTestDriver *driver_arg, NetVConn
NVC_test_def *my_def, const char *module_name_arg, const char *debug_tag_arg)
{
test_cont_type = c_type;
- driver = driver_arg;
- test_vc = nvc;
- regress = robj;
- module_name = module_name_arg;
- debug_tag = debug_tag_arg;
+ driver = driver_arg;
+ test_vc = nvc;
+ regress = robj;
+ module_name = module_name_arg;
+ debug_tag = debug_tag_arg;
bytes_to_send = my_def->bytes_to_send;
bytes_to_read = my_def->bytes_to_read;
- nbytes_read = my_def->nbytes_read;
+ nbytes_read = my_def->nbytes_read;
nbytes_write = my_def->nbytes_write;
write_bytes_to_add_per = my_def->write_bytes_per;
- timeout = my_def->timeout;
- expected_read_term = my_def->expected_read_term;
- expected_write_term = my_def->expected_write_term;
- test_name = my_def->test_name;
+ timeout = my_def->timeout;
+ expected_read_term = my_def->expected_read_term;
+ expected_write_term = my_def->expected_write_term;
+ test_name = my_def->test_name;
mutex = new_ProxyMutex();
SET_HANDLER(&NetVCTest::main_handler);
@@ -168,7 +168,7 @@ NetVCTest::start_test()
test_vc->set_inactivity_timeout(HRTIME_SECONDS(timeout));
test_vc->set_active_timeout(HRTIME_SECONDS(timeout + 5));
- read_buffer = new_MIOBuffer();
+ read_buffer = new_MIOBuffer();
write_buffer = new_MIOBuffer();
reader_for_rbuf = read_buffer->alloc_reader();
@@ -191,8 +191,8 @@ int
NetVCTest::fill_buffer(MIOBuffer *buf, uint8_t *seed, int bytes)
{
char *space = (char *)ats_malloc(bytes);
- char *tmp = space;
- int to_add = bytes;
+ char *tmp = space;
+ int to_add = bytes;
while (bytes > 0) {
*tmp = *seed;
@@ -220,8 +220,8 @@ NetVCTest::consume_and_check_bytes(IOBufferReader *r, uint8_t *seed)
while (r->read_avail() > 0) {
int64_t b_avail = r->block_read_avail();
- tmp = (uint8_t *)r->start();
- end = tmp + b_avail;
+ tmp = (uint8_t *)r->start();
+ end = tmp + b_avail;
b_consumed = 0;
while (tmp < end && actual_bytes_read < bytes_to_read) {
diff --git a/iocore/net/OCSPStapling.cc b/iocore/net/OCSPStapling.cc
index 87c356a..2a1a065 100644
--- a/iocore/net/OCSPStapling.cc
+++ b/iocore/net/OCSPStapling.cc
@@ -127,11 +127,11 @@ ssl_stapling_init_cert(SSL_CTX *ctx, X509 *cert, const char *certname)
}
// Initialize certinfo
- cinf->cid = NULL;
- cinf->uri = NULL;
+ cinf->cid = NULL;
+ cinf->uri = NULL;
cinf->resp_derlen = 0;
ink_mutex_init(&cinf->stapling_mutex, "stapling_mutex");
- cinf->is_expire = true;
+ cinf->is_expire = true;
cinf->expire_time = 0;
SSL_CTX_set_ex_data(ctx, ssl_stapling_index, cinf);
@@ -179,7 +179,7 @@ stapling_cache_response(OCSP_RESPONSE *rsp, certinfo *cinf)
unsigned char *p;
unsigned int resp_derlen;
- p = resp_der;
+ p = resp_der;
resp_derlen = i2d_OCSP_RESPONSE(rsp, &p);
if (resp_derlen == 0) {
@@ -195,7 +195,7 @@ stapling_cache_response(OCSP_RESPONSE *rsp, certinfo *cinf)
ink_mutex_acquire(&cinf->stapling_mutex);
memcpy(cinf->resp_der, resp_der, resp_derlen);
cinf->resp_derlen = resp_derlen;
- cinf->is_expire = false;
+ cinf->is_expire = false;
cinf->expire_time = time(NULL) + SSLConfigParams::ssl_ocsp_cache_timeout;
ink_mutex_release(&cinf->stapling_mutex);
@@ -257,7 +257,7 @@ query_responder(BIO *b, char *host, char *path, OCSP_REQUEST *req, int req_timeo
int rv;
start = Thread::get_hrtime();
- end = ink_hrtime_add(start, ink_hrtime_from_sec(req_timeout));
+ end = ink_hrtime_add(start, ink_hrtime_from_sec(req_timeout));
ctx = OCSP_sendreq_new(b, path, NULL, -1);
OCSP_REQ_CTX_add1_header(ctx, "Host", host);
@@ -279,9 +279,9 @@ query_responder(BIO *b, char *host, char *path, OCSP_REQUEST *req, int req_timeo
static OCSP_RESPONSE *
process_responder(OCSP_REQUEST *req, char *host, char *path, char *port, int req_timeout)
{
- BIO *cbio = NULL;
+ BIO *cbio = NULL;
OCSP_RESPONSE *resp = NULL;
- cbio = BIO_new_connect(host);
+ cbio = BIO_new_connect(host);
if (!cbio) {
goto end;
}
@@ -304,11 +304,11 @@ end:
static bool
stapling_refresh_response(certinfo *cinf, OCSP_RESPONSE **prsp)
{
- bool rv = true;
+ bool rv = true;
OCSP_REQUEST *req = NULL;
- OCSP_CERTID *id = NULL;
+ OCSP_CERTID *id = NULL;
char *host, *path, *port;
- int ssl_flag = 0;
+ int ssl_flag = 0;
int req_timeout = -1;
Debug("ssl_ocsp", "stapling_refresh_response: querying responder");
@@ -328,7 +328,7 @@ stapling_refresh_response(certinfo *cinf, OCSP_RESPONSE **prsp)
goto err;
req_timeout = SSLConfigParams::ssl_ocsp_request_timeout;
- *prsp = process_responder(req, host, path, port, req_timeout);
+ *prsp = process_responder(req, host, path, port, req_timeout);
if (*prsp == NULL) {
goto done;
@@ -364,7 +364,7 @@ void
ocsp_update()
{
SSL_CTX *ctx;
- certinfo *cinf = NULL;
+ certinfo *cinf = NULL;
OCSP_RESPONSE *resp = NULL;
time_t current_time;
@@ -374,7 +374,7 @@ ocsp_update()
for (unsigned i = 0; i < ctxCount; i++) {
SSLCertContext *cc = certLookup->get(i);
if (cc && cc->ctx) {
- ctx = cc->ctx;
+ ctx = cc->ctx;
cinf = stapling_get_cert_info(ctx);
if (cinf) {
ink_mutex_acquire(&cinf->stapling_mutex);
diff --git a/iocore/net/P_LibBulkIO.h b/iocore/net/P_LibBulkIO.h
index eb3c779..2ebc428 100644
--- a/iocore/net/P_LibBulkIO.h
+++ b/iocore/net/P_LibBulkIO.h
@@ -60,16 +60,16 @@ struct InkBulkIOSplit {
struct InkBulkIOAggregator {
InkBulkIOAggregator()
{
- metaReqCount = 0;
+ metaReqCount = 0;
metablockInfo.ptr = NULL;
- metablockInfo.id = 0xffffffff;
- metablockReqPtr = NULL;
+ metablockInfo.id = 0xffffffff;
+ metablockReqPtr = NULL;
lastReqFragCount = 0;
- lastReq = NULL;
+ lastReq = NULL;
reqblockInfo.ptr = NULL;
- reqblockInfo.id = 0xffffffff;
- reqblockPktPtr = NULL;
+ reqblockInfo.id = 0xffffffff;
+ reqblockPktPtr = NULL;
};
struct InkBulkIOBlock metablockInfo;
// Location where the next req. block id should be stuffed in the meta block.
@@ -85,18 +85,18 @@ struct InkBulkIOAggregator {
ResetLastRequestInfo()
{
lastReqFragCount = 0;
- lastReq = NULL;
+ lastReq = NULL;
reqblockInfo.ptr = NULL;
- reqblockInfo.id = 0xffffffff;
- reqblockPktPtr = NULL;
+ reqblockInfo.id = 0xffffffff;
+ reqblockPktPtr = NULL;
};
void
ResetMetaBlockInfo()
{
- metaReqCount = 0;
+ metaReqCount = 0;
metablockInfo.ptr = NULL;
- metablockInfo.id = 0xffffffff;
- metablockReqPtr = NULL;
+ metablockInfo.id = 0xffffffff;
+ metablockReqPtr = NULL;
};
bool
AppendLastRequest()
@@ -117,35 +117,35 @@ struct InkBulkIOAggregator {
void
TerminateLastRequest()
{
- reqblockPktPtr->blockID = 0xffffffff;
- reqblockPktPtr->pktsize = 0xffff;
- reqblockPktPtr->inChain = 0;
+ reqblockPktPtr->blockID = 0xffffffff;
+ reqblockPktPtr->pktsize = 0xffff;
+ reqblockPktPtr->inChain = 0;
reqblockPktPtr->reserved = 0;
};
void
InitMetaBlock()
{
metablockReqPtr = (uint32_t *)metablockInfo.ptr;
- metaReqCount = 0;
+ metaReqCount = 0;
};
void
InitSendtoReqBlock()
{
- reqblockPktPtr = (struct InkBulkIOPkt *)((caddr_t)reqblockInfo.ptr + sizeof(InkBulkIORequest));
- lastReq = (struct InkBulkIORequest *)reqblockInfo.ptr;
- lastReq->reqType = INKBIO_SENDTO_REQUEST;
+ reqblockPktPtr = (struct InkBulkIOPkt *)((caddr_t)reqblockInfo.ptr + sizeof(InkBulkIORequest));
+ lastReq = (struct InkBulkIORequest *)reqblockInfo.ptr;
+ lastReq->reqType = INKBIO_SENDTO_REQUEST;
lastReq->request.sendto.pktCount = 0;
- lastReqFragCount = 0;
+ lastReqFragCount = 0;
};
void
InitSplitReqBlock()
{
- reqblockPktPtr = (struct InkBulkIOPkt *)((caddr_t)reqblockInfo.ptr + sizeof(InkBulkIORequest));
- lastReq = (struct InkBulkIORequest *)reqblockInfo.ptr;
- lastReq->reqType = INKBIO_SPLIT_REQUEST;
- lastReq->request.split.recvCount = 0;
+ reqblockPktPtr = (struct InkBulkIOPkt *)((caddr_t)reqblockInfo.ptr + sizeof(InkBulkIORequest));
+ lastReq = (struct InkBulkIORequest *)reqblockInfo.ptr;
+ lastReq->reqType = INKBIO_SPLIT_REQUEST;
+ lastReq->request.split.recvCount = 0;
lastReq->request.split.perDestHeader = 0;
- lastReqFragCount = 0;
+ lastReqFragCount = 0;
};
};
diff --git a/iocore/net/P_SSLConfig.h b/iocore/net/P_SSLConfig.h
index a74c417..35fdff1 100644
--- a/iocore/net/P_SSLConfig.h
+++ b/iocore/net/P_SSLConfig.h
@@ -50,9 +50,9 @@ typedef void (*load_ssl_file_func)(const char *, unsigned int);
struct SSLConfigParams : public ConfigInfo {
enum SSL_SESSION_CACHE_MODE {
- SSL_SESSION_CACHE_MODE_OFF = 0,
+ SSL_SESSION_CACHE_MODE_OFF = 0,
SSL_SESSION_CACHE_MODE_SERVER_OPENSSL_IMPL = 1,
- SSL_SESSION_CACHE_MODE_SERVER_ATS_IMPL = 2
+ SSL_SESSION_CACHE_MODE_SERVER_ATS_IMPL = 2
};
SSLConfigParams();
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index 543700d..16e8034 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -84,7 +84,7 @@ public:
virtual void
enableRead()
{
- read.enabled = 1;
+ read.enabled = 1;
write.enabled = 1;
};
virtual bool
@@ -199,9 +199,9 @@ public:
void
initialize_handshake_buffers()
{
- this->handShakeBuffer = new_MIOBuffer();
- this->handShakeReader = this->handShakeBuffer->alloc_reader();
- this->handShakeHolder = this->handShakeReader->clone();
+ this->handShakeBuffer = new_MIOBuffer();
+ this->handShakeReader = this->handShakeBuffer->alloc_reader();
+ this->handShakeHolder = this->handShakeReader->clone();
this->handShakeBioStored = 0;
}
void
@@ -216,9 +216,9 @@ public:
if (this->handShakeBuffer) {
free_MIOBuffer(this->handShakeBuffer);
}
- this->handShakeReader = NULL;
- this->handShakeHolder = NULL;
- this->handShakeBuffer = NULL;
+ this->handShakeReader = NULL;
+ this->handShakeHolder = NULL;
+ this->handShakeBuffer = NULL;
this->handShakeBioStored = 0;
}
// Returns true if all the hooks reenabled
diff --git a/iocore/net/P_SSLUtils.h b/iocore/net/P_SSLUtils.h
index f890190..e0c4e3b 100644
--- a/iocore/net/P_SSLUtils.h
+++ b/iocore/net/P_SSLUtils.h
@@ -96,7 +96,7 @@ enum SSL_Stats {
ssl_ocsp_unknown_cert_stat,
ssl_cipher_stats_start = 100,
- ssl_cipher_stats_end = 300,
+ ssl_cipher_stats_end = 300,
Ssl_Stat_Count
};
diff --git a/iocore/net/P_Socks.h b/iocore/net/P_Socks.h
index 7cf5e24..5f74ad4 100644
--- a/iocore/net/P_Socks.h
+++ b/iocore/net/P_Socks.h
@@ -171,7 +171,7 @@ SocksAddrType::reset()
}
addr.buf = 0;
- type = SOCKS_ATYPE_NONE;
+ type = SOCKS_ATYPE_NONE;
}
#endif
diff --git a/iocore/net/P_UDPConnection.h b/iocore/net/P_UDPConnection.h
index 4ee94f7..75d3e47 100644
--- a/iocore/net/P_UDPConnection.h
+++ b/iocore/net/P_UDPConnection.h
@@ -64,10 +64,10 @@ TS_INLINE
UDPConnectionInternal::UDPConnectionInternal()
: continuation(NULL), recvActive(0), refcount(0), fd(-1), binding_valid(0), tobedestroyed(0)
{
- sendGenerationNum = 0;
- lastSentPktTSSeqNum = -1;
+ sendGenerationNum = 0;
+ lastSentPktTSSeqNum = -1;
lastSentPktStartTime = 0;
- lastPktStartTime = 0;
+ lastPktStartTime = 0;
memset(&binding, 0, sizeof binding);
}
@@ -75,7 +75,7 @@ TS_INLINE
UDPConnectionInternal::~UDPConnectionInternal()
{
continuation = NULL;
- mutex = NULL;
+ mutex = NULL;
}
TS_INLINE SOCKET
@@ -157,7 +157,7 @@ UDPConnection::setContinuation(Continuation *c)
{
// it is not safe to switch among continuations that don't share locks
ink_assert(mutex == NULL || c->mutex == mutex);
- mutex = c->mutex;
+ mutex = c->mutex;
((UDPConnectionInternal *)this)->continuation = c;
}
diff --git a/iocore/net/P_UDPIOEvent.h b/iocore/net/P_UDPIOEvent.h
index 4daddae..c0212d0 100644
--- a/iocore/net/P_UDPIOEvent.h
+++ b/iocore/net/P_UDPIOEvent.h
@@ -34,18 +34,18 @@ public:
void
setInfo(int fd_, IOBufferBlock *b_, int bytesTransferred_, int errno_)
{
- fd = fd_;
- b = b_;
+ fd = fd_;
+ b = b_;
bytesTransferred = bytesTransferred_;
- err = errno_;
+ err = errno_;
};
void
setInfo(int fd_, struct msghdr *m_, int bytesTransferred_, int errno_)
{
- fd = fd_;
- m = m_;
+ fd = fd_;
+ m = m_;
bytesTransferred = bytesTransferred_;
- err = errno_;
+ err = errno_;
};
void
setHandle(void *v)
@@ -94,7 +94,7 @@ extern ClassAllocator<UDPIOEvent> UDPIOEventAllocator;
TS_INLINE void
UDPIOEvent::free(UDPIOEvent *e)
{
- e->b = NULL;
+ e->b = NULL;
e->mutex = NULL;
UDPIOEventAllocator.free(e);
}
diff --git a/iocore/net/P_UDPNet.h b/iocore/net/P_UDPNet.h
index 9d45172..60630b5 100644
--- a/iocore/net/P_UDPNet.h
+++ b/iocore/net/P_UDPNet.h
@@ -80,13 +80,13 @@ public:
void
init(void)
{
- now_slot = 0;
+ now_slot = 0;
ink_hrtime now = ink_get_hrtime_internal();
- int i = now_slot;
- int j = 0;
+ int i = now_slot;
+ int j = 0;
while (j < N_SLOTS) {
delivery_time[i] = now + j * SLOT_TIME;
- i = (i + 1) % N_SLOTS;
+ i = (i + 1) % N_SLOTS;
j++;
}
}
@@ -113,7 +113,7 @@ public:
if (s < 0) {
before = 1;
- s = 0;
+ s = 0;
}
s = s / SLOT_TIME;
// if s >= N_SLOTS, either we are *REALLY* behind or someone is trying
@@ -122,7 +122,7 @@ public:
// from long-term slot whenever you advance.
if (s >= N_SLOTS - 1) {
longTermQ.enqueue(e);
- e->in_heap = 0;
+ e->in_heap = 0;
e->in_the_priority_queue = 1;
return;
}
@@ -131,7 +131,7 @@ public:
// so that slot+1 is still "in future".
ink_assert((before || delivery_time[slot] <= e->delivery_time) && (delivery_time[(slot + 1) % N_SLOTS] >= e->delivery_time));
e->in_the_priority_queue = 1;
- e->in_heap = slot;
+ e->in_heap = slot;
bucket[slot].enqueue(e);
}
@@ -210,10 +210,10 @@ public:
}
while (!bucket[s].head && (t > delivery_time[s] + SLOT_TIME)) {
- prev = (s + N_SLOTS - 1) % N_SLOTS;
+ prev = (s + N_SLOTS - 1) % N_SLOTS;
delivery_time[s] = delivery_time[prev] + SLOT_TIME;
- s = (s + 1) % N_SLOTS;
- prev = (s + N_SLOTS - 1) % N_SLOTS;
+ s = (s + 1) % N_SLOTS;
+ prev = (s + N_SLOTS - 1) % N_SLOTS;
ink_assert(delivery_time[prev] > delivery_time[s]);
if (s == now_slot) {
diff --git a/iocore/net/P_UDPPacket.h b/iocore/net/P_UDPPacket.h
index 8c6bd6a..1d362f4 100644
--- a/iocore/net/P_UDPPacket.h
+++ b/iocore/net/P_UDPPacket.h
@@ -109,7 +109,7 @@ UDPPacket::getPktLength()
IOBufferBlock *b;
p->pktLength = 0;
- b = p->chain;
+ b = p->chain;
while (b) {
p->pktLength += b->read_avail();
b = b->next;
@@ -169,8 +169,8 @@ new_UDPPacket(struct sockaddr const *to, ink_hrtime when, char *buf, int len)
UDPPacketInternal *p = udpPacketAllocator.alloc();
p->in_the_priority_queue = 0;
- p->in_heap = 0;
- p->delivery_time = when;
+ p->in_heap = 0;
+ p->delivery_time = when;
ats_ip_copy(&p->to, to);
if (buf) {
@@ -192,8 +192,8 @@ new_UDPPacket(struct sockaddr const *to, ink_hrtime when, IOBufferBlock *buf, in
IOBufferBlock *body;
p->in_the_priority_queue = 0;
- p->in_heap = 0;
- p->delivery_time = when;
+ p->in_heap = 0;
+ p->delivery_time = when;
ats_ip_copy(&p->to, to);
while (buf) {
@@ -210,8 +210,8 @@ new_UDPPacket(struct sockaddr const *to, ink_hrtime when, Ptr<IOBufferBlock> buf
UDPPacketInternal *p = udpPacketAllocator.alloc();
p->in_the_priority_queue = 0;
- p->in_heap = 0;
- p->delivery_time = when;
+ p->in_heap = 0;
+ p->delivery_time = when;
if (to)
ats_ip_copy(&p->to, to);
p->chain = buf;
@@ -230,8 +230,8 @@ new_incoming_UDPPacket(struct sockaddr *from, char *buf, int len)
UDPPacketInternal *p = udpPacketAllocator.alloc();
p->in_the_priority_queue = 0;
- p->in_heap = 0;
- p->delivery_time = 0;
+ p->in_heap = 0;
+ p->delivery_time = 0;
ats_ip_copy(&p->from, from);
IOBufferBlock *body = new_IOBufferBlock();
diff --git a/iocore/net/P_UnixCompletionUtil.h b/iocore/net/P_UnixCompletionUtil.h
index e9e6235..f9dda5a 100644
--- a/iocore/net/P_UnixCompletionUtil.h
+++ b/iocore/net/P_UnixCompletionUtil.h
@@ -45,13 +45,13 @@ TS_INLINE void
completionUtil::setThread(Event *e, EThread *t)
{
UDPIOEvent *u = (UDPIOEvent *)e;
- u->ethread = t;
+ u->ethread = t;
}
TS_INLINE void
completionUtil::setContinuation(Event *e, Continuation *c)
{
UDPIOEvent *u = (UDPIOEvent *)e;
- *(Action *)u = c;
+ *(Action *)u = c;
}
TS_INLINE void *
completionUtil::getHandle(Event *e)
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 637577c..d9d6458 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -103,7 +103,7 @@ struct EventIO {
int close();
EventIO()
{
- type = 0;
+ type = 0;
data.c = 0;
}
};
@@ -244,7 +244,7 @@ TS_INLINE int
net_connections_to_throttle(ThrottleType t)
{
double headroom = t == ACCEPT ? NET_THROTTLE_ACCEPT_HEADROOM : NET_THROTTLE_CONNECT_HEADROOM;
- int64_t sval = 0;
+ int64_t sval = 0;
NET_READ_GLOBAL_DYN_SUM(net_connections_currently_open_stat, sval);
int currently_open = (int)sval;
@@ -308,10 +308,10 @@ check_throttle_warning()
TS_INLINE int
check_emergency_throttle(Connection &con)
{
- int fd = con.fd;
+ int fd = con.fd;
int emergency = fds_limit - EMERGENCY_THROTTLE;
if (fd > emergency) {
- int over = fd - emergency;
+ int over = fd - emergency;
emergency_throttle_time = Thread::get_hrtime() + (over * over) * HRTIME_SECOND;
RecSignalWarning(REC_SIGNAL_SYSTEM_ERROR, "too many open file descriptors, emergency throttling");
int hyper_emergency = fds_limit - HYPER_EMERGENCY_THROTTLE;
@@ -486,13 +486,13 @@ EventIO::close()
TS_INLINE int
EventIO::start(EventLoop l, int afd, Continuation *c, int e)
{
- data.c = c;
- fd = afd;
+ data.c = c;
+ fd = afd;
event_loop = l;
#if TS_USE_EPOLL
struct epoll_event ev;
memset(&ev, 0, sizeof(ev));
- ev.events = e;
+ ev.events = e;
ev.data.ptr = this;
#ifndef USE_EDGE_TRIGGER
events = e;
@@ -510,7 +510,7 @@ EventIO::start(EventLoop l, int afd, Continuation *c, int e)
return kevent(l->kqueue_fd, &ev[0], n, NULL, 0, NULL);
#endif
#if TS_USE_PORT
- events = e;
+ events = e;
int retval = port_associate(event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
Debug("iocore_eventio", "[EventIO::start] e(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, events, retval,
retval < 0 ? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
@@ -530,8 +530,8 @@ EventIO::modify(int e)
new_events &= ~(-e);
else
new_events |= e;
- events = new_events;
- ev.events = new_events;
+ events = new_events;
+ ev.events = new_events;
ev.data.ptr = this;
if (!new_events)
return epoll_ctl(event_loop->epoll_fd, EPOLL_CTL_DEL, fd, &ev);
@@ -564,7 +564,7 @@ EventIO::modify(int e)
return 0;
#endif
#if TS_USE_PORT
- int n = 0;
+ int n = 0;
int ne = e;
if (e < 0) {
if (((-e) & events)) {
@@ -584,7 +584,7 @@ EventIO::modify(int e)
}
}
if (n && ne && event_loop) {
- events = ne;
+ events = ne;
int retval = port_associate(event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
Debug("iocore_eventio", "[EventIO::modify] e(%d), ne(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, ne, events,
retval, retval < 0 ? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
@@ -615,7 +615,7 @@ EventIO::refresh(int e)
return 0;
#endif
#if TS_USE_PORT
- int n = 0;
+ int n = 0;
int ne = e;
if ((e & events)) {
ne = events | e;
@@ -624,7 +624,7 @@ EventIO::refresh(int e)
if (e & EVENTIO_WRITE)
n++;
if (n && ne && event_loop) {
- events = ne;
+ events = ne;
int retval = port_associate(event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
Debug("iocore_eventio", "[EventIO::refresh] e(%d), ne(%d), events(%d), %d[%s]=port_associate(%d,%d,%d,%d,%p)", e, ne, events,
retval, retval < 0 ? strerror(errno) : "ok", event_loop->port_fd, PORT_SOURCE_FD, fd, events, this);
@@ -647,7 +647,7 @@ EventIO::stop()
struct epoll_event ev;
memset(&ev, 0, sizeof(struct epoll_event));
ev.events = EPOLLIN | EPOLLOUT | EPOLLET;
- retval = epoll_ctl(event_loop->epoll_fd, EPOLL_CTL_DEL, fd, &ev);
+ retval = epoll_ctl(event_loop->epoll_fd, EPOLL_CTL_DEL, fd, &ev);
#endif
#if TS_USE_PORT
retval = port_dissociate(event_loop->port_fd, PORT_SOURCE_FD, fd);
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
index bef0191..21a2580 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -44,15 +44,15 @@ struct PollDescriptor;
TS_INLINE void
NetVCOptions::reset()
{
- ip_proto = USE_TCP;
+ ip_proto = USE_TCP;
ip_family = AF_INET;
local_ip.invalidate();
- local_port = 0;
- addr_binding = ANY_ADDR;
- f_blocking = false;
+ local_port = 0;
+ addr_binding = ANY_ADDR;
+ f_blocking = false;
f_blocking_connect = false;
- socks_support = NORMAL_SOCKS;
- socks_version = SOCKS_DEFAULT_VERSION;
+ socks_support = NORMAL_SOCKS;
+ socks_version = SOCKS_DEFAULT_VERSION;
socket_recv_bufsize =
#if defined(RECV_BUF_SIZE)
RECV_BUF_SIZE;
@@ -60,9 +60,9 @@ NetVCOptions::reset()
0;
#endif
socket_send_bufsize = 0;
- sockopt_flags = 0;
- packet_mark = 0;
- packet_tos = 0;
+ sockopt_flags = 0;
+ packet_mark = 0;
+ packet_tos = 0;
etype = ET_NET;
@@ -75,9 +75,9 @@ NetVCOptions::set_sock_param(int _recv_bufsize, int _send_bufsize, unsigned long
{
socket_recv_bufsize = _recv_bufsize;
socket_send_bufsize = _send_bufsize;
- sockopt_flags = _opt_flags;
- packet_mark = _packet_mark;
- packet_tos = _packet_tos;
+ sockopt_flags = _opt_flags;
+ packet_mark = _packet_mark;
+ packet_tos = _packet_tos;
}
struct OOB_callback : public Continuation {
@@ -91,7 +91,7 @@ struct OOB_callback : public Continuation {
OOB_callback(ProxyMutex *m, NetVConnection *vc, Continuation *cont, char *buf, int len)
: Continuation(m), data(buf), length(len), trigger(0)
{
- server_vc = (UnixNetVConnection *)vc;
+ server_vc = (UnixNetVConnection *)vc;
server_cont = cont;
SET_HANDLER(&OOB_callback::retry_OOB_send);
}
@@ -406,7 +406,7 @@ UnixNetVConnection::set_active_timeout(ink_hrtime timeout)
} else
active_timeout = 0;
#else
- next_activity_timeout_at = Thread::get_hrtime() + timeout;
+ next_activity_timeout_at = Thread::get_hrtime() + timeout;
#endif
}
@@ -438,7 +438,7 @@ UnixNetVConnection::cancel_active_timeout()
active_timeout = NULL;
}
#else
- next_activity_timeout_at = 0;
+ next_activity_timeout_at = 0;
#endif
}
@@ -448,7 +448,7 @@ UnixNetVConnection::set_tcp_init_cwnd(int init_cwnd)
#ifdef TCP_INIT_CWND
int rv;
uint32_t val = init_cwnd;
- rv = setsockopt(con.fd, IPPROTO_TCP, TCP_INIT_CWND, &val, sizeof(val));
+ rv = setsockopt(con.fd, IPPROTO_TCP, TCP_INIT_CWND, &val, sizeof(val));
Debug("socket", "Setting TCP initial congestion window (%d) -> %d", init_cwnd, rv);
return rv;
#else
@@ -462,7 +462,7 @@ UnixNetVConnection::set_tcp_congestion_control(const char *name, int len)
{
#ifdef TCP_CONGESTION
int rv = 0;
- rv = setsockopt(con.fd, IPPROTO_TCP, TCP_CONGESTION, reinterpret_cast<void *>(const_cast<char *>(name)), len);
+ rv = setsockopt(con.fd, IPPROTO_TCP, TCP_CONGESTION, reinterpret_cast<void *>(const_cast<char *>(name)), len);
if (rv < 0) {
Error("Unable to set TCP congestion control on socket %d to \"%.*s\", errno=%d (%s)", con.fd, len, name, errno,
strerror(errno));
diff --git a/iocore/net/P_UnixPollDescriptor.h b/iocore/net/P_UnixPollDescriptor.h
index 05e5f0b..dbbd8f2 100644
--- a/iocore/net/P_UnixPollDescriptor.h
+++ b/iocore/net/P_UnixPollDescriptor.h
@@ -123,7 +123,7 @@ private:
{
result = 0;
#if TS_USE_EPOLL
- nfds = 0;
+ nfds = 0;
epoll_fd = epoll_create(POLL_DESCRIPTOR_SIZE);
memset(ePoll_Triggered_Events, 0, sizeof(ePoll_Triggered_Events));
memset(pfd, 0, sizeof(pfd));
diff --git a/iocore/net/P_UnixUDPConnection.h b/iocore/net/P_UnixUDPConnection.h
index c482020..12019a2 100644
--- a/iocore/net/P_UnixUDPConnection.h
+++ b/iocore/net/P_UnixUDPConnection.h
@@ -72,11 +72,11 @@ UnixUDPConnection::UnixUDPConnection(int the_fd) : onCallbackQueue(0), callbackA
TS_INLINE void
UnixUDPConnection::init(int the_fd)
{
- fd = the_fd;
+ fd = the_fd;
onCallbackQueue = 0;
- callbackAction = NULL;
- ethread = NULL;
- m_errno = 0;
+ callbackAction = NULL;
+ ethread = NULL;
+ m_errno = 0;
UDPPacketInternal p;
ink_atomiclist_init(&inQueue, "Incoming UDP Packet queue", (char *)&p.alink.next - (char *)&p);
@@ -102,7 +102,7 @@ UDPConnection::recv(Continuation *c)
// register callback interest.
p->continuation = c;
ink_assert(c != NULL);
- mutex = c->mutex;
+ mutex = c->mutex;
p->recvActive = 1;
return ACTION_RESULT_NONE;
}
diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc
index 5a865ae..8bd389a 100644
--- a/iocore/net/SSLCertLookup.cc
+++ b/iocore/net/SSLCertLookup.cc
@@ -45,7 +45,7 @@ struct SSLAddressLookupKey {
// if there is a certificate on the port.
nbytes = ats_ip_to_hex(&ip.sa, key, sizeof(key));
if (port) {
- sep = nbytes;
+ sep = nbytes;
key[nbytes++] = '.';
key[nbytes++] = hextab[(port >> 12) & 0x000F];
key[nbytes++] = hextab[(port >> 8) & 0x000F];
@@ -140,7 +140,7 @@ ticket_block_free(void *ptr)
{
if (ptr) {
ssl_ticket_key_block *key_block_ptr = (ssl_ticket_key_block *)ptr;
- unsigned num_ticket_keys = key_block_ptr->num_keys;
+ unsigned num_ticket_keys = key_block_ptr->num_keys;
memset(ptr, 0, sizeof(ssl_ticket_key_block) + num_ticket_keys * sizeof(ssl_ticket_key_t));
}
ats_free(ptr);
@@ -254,13 +254,13 @@ private:
static char *
reverse_dns_name(const char *hostname, char (&reversed)[TS_MAX_HOST_NAME_LEN + 1])
{
- char *ptr = reversed + sizeof(reversed);
+ char *ptr = reversed + sizeof(reversed);
const char *part = hostname;
*(--ptr) = '\0'; // NUL-terminate
while (*part) {
- ssize_t len = strcspn(part, ".");
+ ssize_t len = strcspn(part, ".");
ssize_t remain = ptr - reversed;
if (remain < (len + 1)) {
@@ -322,7 +322,7 @@ int
SSLContextStorage::insert(const char *name, SSLCertContext const &cc)
{
int idx = this->store(cc);
- idx = this->insert(name, idx);
+ idx = this->insert(name, idx);
if (idx < 0)
this->ctx_store.drop();
return idx;
@@ -347,9 +347,9 @@ SSLContextStorage::insert(const char *name, int idx)
return -1;
}
- ref = new ContextRef(idx);
+ ref = new ContextRef(idx);
int ref_idx = (*ref).idx;
- inserted = this->wildcards.Insert(reversed, ref, 0 /* rank */, -1 /* keylen */);
+ inserted = this->wildcards.Insert(reversed, ref, 0 /* rank */, -1 /* keylen */);
if (!inserted) {
ContextRef *found;
diff --git a/iocore/net/SSLClientUtils.cc b/iocore/net/SSLClientUtils.cc
index be78389..1817a84 100644
--- a/iocore/net/SSLClientUtils.cc
+++ b/iocore/net/SSLClientUtils.cc
@@ -53,8 +53,8 @@ verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
SSLDebug("Entered verify cb");
depth = X509_STORE_CTX_get_error_depth(ctx);
- cert = X509_STORE_CTX_get_current_cert(ctx);
- err = X509_STORE_CTX_get_error(ctx);
+ cert = X509_STORE_CTX_get_current_cert(ctx);
+ err = X509_STORE_CTX_get_error(ctx);
if (!preverify_ok) {
// Don't bother to check the hostname if we failed openssl's verification
@@ -69,7 +69,7 @@ verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
* Retrieve the pointer to the SSL of the connection currently treated
* and the application specific data stored into the SSL object.
*/
- ssl = static_cast<SSL *>(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()));
+ ssl = static_cast<SSL *>(X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()));
SSLNetVConnection *netvc = static_cast<SSLNetVConnection *>(SSL_get_ex_data(ssl, ssl_client_data_index));
if (netvc != NULL) {
// Match SNI if present
@@ -101,14 +101,14 @@ SSL_CTX *
SSLInitClientContext(const SSLConfigParams *params)
{
ink_ssl_method_t meth = NULL;
- SSL_CTX *client_ctx = NULL;
- char *clientKeyPtr = NULL;
+ SSL_CTX *client_ctx = NULL;
+ char *clientKeyPtr = NULL;
// Note that we do not call RAND_seed() explicitly here, we depend on OpenSSL
// to do the seeding of the PRNG for us. This is the case for all platforms that
// has /dev/urandom for example.
- meth = SSLv23_client_method();
+ meth = SSLv23_client_method();
client_ctx = SSL_CTX_new(meth);
// disable selected protocols
diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
index 63540ce..d3567f4 100644
--- a/iocore/net/SSLConfig.cc
+++ b/iocore/net/SSLConfig.cc
@@ -40,26 +40,26 @@
#include "SSLSessionCache.h"
#include <records/I_RecHttp.h>
-int SSLConfig::configid = 0;
-int SSLCertificateConfig::configid = 0;
-int SSLConfigParams::ssl_maxrecord = 0;
-bool SSLConfigParams::ssl_allow_client_renegotiation = false;
-bool SSLConfigParams::ssl_ocsp_enabled = false;
-int SSLConfigParams::ssl_ocsp_cache_timeout = 3600;
-int SSLConfigParams::ssl_ocsp_request_timeout = 10;
-int SSLConfigParams::ssl_ocsp_update_period = 60;
-int SSLConfigParams::ssl_handshake_timeout_in = 0;
-size_t SSLConfigParams::session_cache_number_buckets = 1024;
+int SSLConfig::configid = 0;
+int SSLCertificateConfig::configid = 0;
+int SSLConfigParams::ssl_maxrecord = 0;
+bool SSLConfigParams::ssl_allow_client_renegotiation = false;
+bool SSLConfigParams::ssl_ocsp_enabled = false;
+int SSLConfigParams::ssl_ocsp_cache_timeout = 3600;
+int SSLConfigParams::ssl_ocsp_request_timeout = 10;
+int SSLConfigParams::ssl_ocsp_update_period = 60;
+int SSLConfigParams::ssl_handshake_timeout_in = 0;
+size_t SSLConfigParams::session_cache_number_buckets = 1024;
bool SSLConfigParams::session_cache_skip_on_lock_contention = false;
-size_t SSLConfigParams::session_cache_max_bucket_size = 100;
-init_ssl_ctx_func SSLConfigParams::init_ssl_ctx_cb = NULL;
-load_ssl_file_func SSLConfigParams::load_ssl_file_cb = NULL;
+size_t SSLConfigParams::session_cache_max_bucket_size = 100;
+init_ssl_ctx_func SSLConfigParams::init_ssl_ctx_cb = NULL;
+load_ssl_file_func SSLConfigParams::load_ssl_file_cb = NULL;
// TS-3534 Wiretracing for SSL Connections
-int SSLConfigParams::ssl_wire_trace_enabled = 0;
-char *SSLConfigParams::ssl_wire_trace_addr = NULL;
-IpAddr *SSLConfigParams::ssl_wire_trace_ip = NULL;
-int SSLConfigParams::ssl_wire_trace_percentage = 0;
+int SSLConfigParams::ssl_wire_trace_enabled = 0;
+char *SSLConfigParams::ssl_wire_trace_addr = NULL;
+IpAddr *SSLConfigParams::ssl_wire_trace_ip = NULL;
+int SSLConfigParams::ssl_wire_trace_percentage = 0;
char *SSLConfigParams::ssl_wire_trace_server_name = NULL;
static ConfigUpdateHandler<SSLCertificateConfig> *sslCertUpdate;
@@ -72,15 +72,15 @@ SSLConfigParams::SSLConfigParams()
clientCertLevel = client_verify_depth = verify_depth = clientVerify = 0;
- ssl_ctx_options = 0;
- ssl_client_ctx_protocols = 0;
- ssl_session_cache = SSL_SESSION_CACHE_MODE_SERVER_ATS_IMPL;
- ssl_session_cache_size = 1024 * 100;
+ ssl_ctx_options = 0;
+ ssl_client_ctx_protocols = 0;
+ ssl_session_cache = SSL_SESSION_CACHE_MODE_SERVER_ATS_IMPL;
+ ssl_session_cache_size = 1024 * 100;
ssl_session_cache_num_buckets = 1024; // Sessions per bucket is ceil(ssl_session_cache_size / ssl_session_cache_num_buckets)
ssl_session_cache_skip_on_contention = 0;
- ssl_session_cache_timeout = 0;
- ssl_session_cache_auto_clear = 1;
- configExitOnLoadError = 0;
+ ssl_session_cache_timeout = 0;
+ ssl_session_cache_auto_clear = 1;
+ configExitOnLoadError = 0;
}
SSLConfigParams::~SSLConfigParams()
@@ -138,16 +138,16 @@ set_paths_helper(const char *path, const char *filename, char **final_path, char
void
SSLConfigParams::initialize()
{
- char *serverCertRelativePath = NULL;
- char *ssl_server_private_key_path = NULL;
- char *CACertRelativePath = NULL;
- char *ssl_client_cert_filename = NULL;
- char *ssl_client_cert_path = NULL;
+ char *serverCertRelativePath = NULL;
+ char *ssl_server_private_key_path = NULL;
+ char *CACertRelativePath = NULL;
+ char *ssl_client_cert_filename = NULL;
+ char *ssl_client_cert_path = NULL;
char *ssl_client_private_key_filename = NULL;
- char *ssl_client_private_key_path = NULL;
- char *clientCACertRelativePath = NULL;
- char *ssl_server_ca_cert_filename = NULL;
- char *ssl_client_ca_cert_filename = NULL;
+ char *ssl_client_private_key_path = NULL;
+ char *clientCACertRelativePath = NULL;
+ char *ssl_server_ca_cert_filename = NULL;
+ char *ssl_client_ca_cert_filename = NULL;
cleanup();
@@ -263,7 +263,7 @@ SSLConfigParams::initialize()
SSLConfigParams::session_cache_max_bucket_size = (size_t)ceil((double)ssl_session_cache_size / ssl_session_cache_num_buckets);
SSLConfigParams::session_cache_skip_on_lock_contention = ssl_session_cache_skip_on_contention;
- SSLConfigParams::session_cache_number_buckets = ssl_session_cache_num_buckets;
+ SSLConfigParams::session_cache_number_buckets = ssl_session_cache_num_buckets;
if (ssl_session_cache == SSL_SESSION_CACHE_MODE_SERVER_ATS_IMPL) {
session_cache = new SSLSessionCache();
@@ -285,7 +285,7 @@ SSLConfigParams::initialize()
REC_ReadConfigInt32(clientVerify, "proxy.config.ssl.client.verify.server");
ssl_client_cert_filename = NULL;
- ssl_client_cert_path = NULL;
+ ssl_client_cert_path = NULL;
REC_ReadConfigStringAlloc(ssl_client_cert_filename, "proxy.config.ssl.client.cert.filename");
REC_ReadConfigStringAlloc(ssl_client_cert_path, "proxy.config.ssl.client.cert.path");
set_paths_helper(ssl_client_cert_path, ssl_client_cert_filename, NULL, &clientCertPath);
@@ -321,9 +321,9 @@ SSLConfigParams::initialize()
REC_EstablishStaticConfigInt32(ssl_wire_trace_percentage, "proxy.config.ssl.wire_trace_percentage");
REC_EstablishStaticConfigStringAlloc(ssl_wire_trace_server_name, "proxy.config.ssl.wire_trace_server_name");
} else {
- ssl_wire_trace_addr = NULL;
- ssl_wire_trace_ip = NULL;
- ssl_wire_trace_percentage = 0;
+ ssl_wire_trace_addr = NULL;
+ ssl_wire_trace_ip = NULL;
+ ssl_wire_trace_percentage = 0;
ssl_wire_trace_server_name = NULL;
}
}
diff --git a/iocore/net/SSLNetAccept.cc b/iocore/net/SSLNetAccept.cc
index 1b17ad3..47d8b1c 100644
--- a/iocore/net/SSLNetAccept.cc
+++ b/iocore/net/SSLNetAccept.cc
@@ -52,12 +52,12 @@ SSLNetAccept::init_accept_per_thread(bool isTransparent)
else
SET_HANDLER((SSLNetAcceptHandler)&SSLNetAccept::acceptEvent);
period = -HRTIME_MSECONDS(net_accept_period);
- n = eventProcessor.n_threads_for_type[SSLNetProcessor::ET_SSL];
+ n = eventProcessor.n_threads_for_type[SSLNetProcessor::ET_SSL];
for (i = 0; i < n; i++) {
if (i < n - 1)
a = clone();
else
- a = this;
+ a = this;
EThread *t = eventProcessor.eventthread[SSLNetProcessor::ET_SSL][i];
PollDescriptor *pd = get_PollDescriptor(t);
@@ -72,7 +72,7 @@ NetAccept *
SSLNetAccept::clone() const
{
NetAccept *na;
- na = new SSLNetAccept;
+ na = new SSLNetAccept;
*na = *this;
return na;
}
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 5a96db4..44ae638 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -197,14 +197,14 @@ debug_certificate_name(const char *msg, X509_NAME *name)
static int
ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
{
- NetState *s = &sslvc->read;
- MIOBufferAccessor &buf = s->vio.buffer;
- IOBufferBlock *b = buf.writer()->first_write_block();
- int event = SSL_READ_ERROR_NONE;
- int64_t bytes_read = 0;
+ NetState *s = &sslvc->read;
+ MIOBufferAccessor &buf = s->vio.buffer;
+ IOBufferBlock *b = buf.writer()->first_write_block();
+ int event = SSL_READ_ERROR_NONE;
+ int64_t bytes_read = 0;
int64_t block_write_avail = 0;
- ssl_error_t sslErr = SSL_ERROR_NONE;
- int64_t nread = 0;
+ ssl_error_t sslErr = SSL_ERROR_NONE;
+ int64_t nread = 0;
bool trace = sslvc->getSSLTrace();
Debug("ssl", "trace=%s", trace ? "TRUE" : "FALSE");
@@ -268,7 +268,7 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
if (nread != 0) {
// not EOF
event = SSL_READ_ERROR;
- ret = errno;
+ ret = errno;
Debug("ssl.error", "[SSL_NetVConnection::ssl_read_from_net] SSL_ERROR_SYSCALL, underlying IO error: %s", strerror(errno));
TraceIn(trace, sslvc->get_remote_addr(), sslvc->get_remote_port(), "Underlying IO error: %d", errno);
} else {
@@ -293,7 +293,7 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
TraceIn(trace, sslvc->get_remote_addr(), sslvc->get_remote_port(), "SSL Error: sslErr=%d, ERR_get_error=%ld (%s) errno=%d",
sslErr, e, buf, errno);
event = SSL_READ_ERROR;
- ret = errno;
+ ret = errno;
SSL_CLR_ERR_INCR_DYN_STAT(sslvc, ssl_error_ssl, "[SSL_NetVConnection::ssl_read_from_net]: errno=%d", errno);
} break;
} // switch
@@ -336,7 +336,7 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
int64_t
SSLNetVConnection::read_raw_data()
{
- int64_t r = 0;
+ int64_t r = 0;
int64_t toread = INT_MAX;
// read data
@@ -346,15 +346,15 @@ SSLNetVConnection::read_raw_data()
if (toread) {
IOBufferBlock *b = this->handShakeBuffer->first_write_block();
do {
- niov = 0;
+ niov = 0;
rattempted = 0;
while (b && niov < NET_MAX_IOV) {
int64_t a = b->write_avail();
if (a > 0) {
tiovec[niov].iov_base = b->_end;
- int64_t togo = toread - total_read - rattempted;
+ int64_t togo = toread - total_read - rattempted;
if (a > togo)
- a = togo;
+ a = togo;
tiovec[niov].iov_len = a;
rattempted += a;
niov++;
@@ -392,8 +392,8 @@ SSLNetVConnection::read_raw_data()
this->handShakeBuffer->fill(r);
}
- char *start = this->handShakeReader->start();
- char *end = this->handShakeReader->end();
+ char *start = this->handShakeReader->start();
+ char *end = this->handShakeReader->end();
this->handShakeBioStored = end - start;
// Sets up the buffer as a read only bio target
@@ -410,9 +410,9 @@ void
SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
{
int ret;
- int64_t r = 0;
+ int64_t r = 0;
int64_t bytes = 0;
- NetState *s = &this->read;
+ NetState *s = &this->read;
if (HttpProxyPort::TRANSPORT_BLIND_TUNNEL == this->attributes) {
this->super::net_read_io(nh, lthread);
@@ -448,7 +448,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
}
MIOBufferAccessor &buf = s->vio.buffer;
- int64_t ntodo = s->vio.ntodo();
+ int64_t ntodo = s->vio.ntodo();
ink_assert(buf.writer());
// Continue on if we are still in the handshake
@@ -484,9 +484,9 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
// Copy over all data already read in during the SSL_accept
// (the client hello message)
- NetState *s = &this->read;
+ NetState *s = &this->read;
MIOBufferAccessor &buf = s->vio.buffer;
- int64_t r = buf.writer()->write(this->handShakeHolder);
+ int64_t r = buf.writer()->write(this->handShakeHolder);
s->vio.nbytes += r;
s->vio.ndone += r;
@@ -566,8 +566,8 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
this->free_handshake_buffers();
} else {
// Setup the next iobuffer block to drain
- char *start = this->handShakeReader->start();
- char *end = this->handShakeReader->end();
+ char *start = this->handShakeReader->start();
+ char *end = this->handShakeReader->end();
this->handShakeBioStored = end - start;
// Sets up the buffer as a read only bio target
@@ -632,7 +632,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
// close the connection if we have SSL_READ_EOS, this is the return value from ssl_read_from_net() if we get an
// SSL_ERROR_ZERO_RETURN from SSL_get_error()
// SSL_ERROR_ZERO_RETURN means that the origin server closed the SSL connection
- eosRcvd = true;
+ eosRcvd = true;
read.triggered = 0;
readSignalDone(VC_EVENT_EOS, nh);
@@ -658,20 +658,20 @@ int64_t
SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, int64_t &total_written, MIOBufferAccessor &buf,
int &needs)
{
- ProxyMutex *mutex = this_ethread()->mutex;
- int64_t r = 0;
- int64_t l = 0;
+ ProxyMutex *mutex = this_ethread()->mutex;
+ int64_t r = 0;
+ int64_t l = 0;
uint32_t dynamic_tls_record_size = 0;
- ssl_error_t err = SSL_ERROR_NONE;
+ ssl_error_t err = SSL_ERROR_NONE;
// XXX Rather than dealing with the block directly, we should use the IOBufferReader API.
- int64_t offset = buf.reader()->start_offset;
+ int64_t offset = buf.reader()->start_offset;
IOBufferBlock *b = buf.reader()->block;
// Dynamic TLS record sizing
ink_hrtime now = 0;
if (SSLConfigParams::ssl_maxrecord == -1) {
- now = Thread::get_hrtime_updated();
+ now = Thread::get_hrtime_updated();
int msec_since_last_write = ink_hrtime_diff_msec(now, sslLastWriteTime);
if (msec_since_last_write > SSL_DEF_TLS_RECORD_MSEC_THRESHOLD) {
@@ -695,7 +695,7 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, i
l -= offset;
if (l <= 0) {
offset = -l;
- b = b->next;
+ b = b->next;
continue;
}
// check if to amount to write exceeds that in this buffer
@@ -750,7 +750,7 @@ SSLNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted, i
if (l == orig_l) {
// on to the next block
offset = 0;
- b = b->next;
+ b = b->next;
} else {
offset += l;
}
@@ -886,7 +886,7 @@ void
SSLNetVConnection::free(EThread *t)
{
got_remote_addr = 0;
- got_local_addr = 0;
+ got_local_addr = 0;
read.vio.mutex.clear();
write.vio.mutex.clear();
this->mutex.clear();
@@ -902,13 +902,13 @@ SSLNetVConnection::free(EThread *t)
nh = NULL;
}
- read.triggered = 0;
- write.triggered = 0;
- read.enabled = 0;
- write.enabled = 0;
- read.vio._cont = NULL;
- write.vio._cont = NULL;
- read.vio.vc_server = NULL;
+ read.triggered = 0;
+ write.triggered = 0;
+ read.enabled = 0;
+ write.enabled = 0;
+ read.vio._cont = NULL;
+ write.vio._cont = NULL;
+ read.vio.vc_server = NULL;
write.vio.vc_server = NULL;
options.reset();
closed = 0;
@@ -918,24 +918,24 @@ SSLNetVConnection::free(EThread *t)
SSL_free(ssl);
ssl = NULL;
}
- sslHandShakeComplete = false;
- sslClientConnection = false;
- sslHandshakeBeginTime = 0;
- sslLastWriteTime = 0;
- sslTotalBytesSent = 0;
+ sslHandShakeComplete = false;
+ sslClientConnection = false;
+ sslHandshakeBeginTime = 0;
+ sslLastWriteTime = 0;
+ sslTotalBytesSent = 0;
sslClientRenegotiationAbort = false;
- sslSessionCacheHit = false;
+ sslSessionCacheHit = false;
if (SSL_HOOKS_ACTIVE == sslPreAcceptHookState) {
Error("SSLNetVconnection freed with outstanding hook");
}
sslPreAcceptHookState = SSL_HOOKS_INIT;
- curHook = 0;
- hookOpRequested = TS_SSL_HOOK_OP_DEFAULT;
- npnSet = NULL;
- npnEndpoint = NULL;
- sessionAcceptPtr = NULL;
- eosRcvd = false;
- sslHandShakeComplete = false;
+ curHook = 0;
+ hookOpRequested = TS_SSL_HOOK_OP_DEFAULT;
+ npnSet = NULL;
+ npnEndpoint = NULL;
+ sessionAcceptPtr = NULL;
+ eosRcvd = false;
+ sslHandShakeComplete = false;
free_handshake_buffers();
sslTrace = false;
@@ -979,7 +979,7 @@ SSLNetVConnection::sslStartHandShake(int event, int &err)
// No data has been read at this point, so we can go
// directly into blind tunnel mode
if (cc && SSLCertContext::OPT_TUNNEL == cc->opt && this->is_transparent) {
- this->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
+ this->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
sslHandShakeComplete = 1;
SSL_free(this->ssl);
this->ssl = NULL;
@@ -1031,7 +1031,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
if (SSL_HOOKS_DONE != sslPreAcceptHookState) {
// Get the first hook if we haven't started invoking yet.
if (SSL_HOOKS_INIT == sslPreAcceptHookState) {
- curHook = ssl_hooks->get(TS_VCONN_PRE_ACCEPT_INTERNAL_HOOK);
+ curHook = ssl_hooks->get(TS_VCONN_PRE_ACCEPT_INTERNAL_HOOK);
sslPreAcceptHookState = SSL_HOOKS_INVOKE;
} else if (SSL_HOOKS_INVOKE == sslPreAcceptHookState) {
// if the state is anything else, we haven't finished
@@ -1095,7 +1095,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
}
ssl_error_t ssl_error = SSLAccept(ssl);
- bool trace = getSSLTrace();
+ bool trace = getSSLTrace();
Debug("ssl", "trace=%s", trace ? "TRUE" : "FALSE");
if (ssl_error != SSL_ERROR_NONE) {
@@ -1106,7 +1106,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
char *buf = handShakeBuffer->buf();
if (getTransparentPassThrough() && buf && *buf != SSL_OP_HANDSHAKE) {
SSLDebugVC(this, "Data does not look like SSL handshake, starting blind tunnel");
- this->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
+ this->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
sslHandShakeComplete = 0;
return EVENT_CONT;
}
@@ -1140,7 +1140,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
{
const unsigned char *proto = NULL;
- unsigned len = 0;
+ unsigned len = 0;
// If it's possible to negotiate both NPN and ALPN, then ALPN
// is preferred since it is the server's preference. The server
@@ -1162,7 +1162,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
ink_assert(this->npnSet != NULL);
this->npnEndpoint = this->npnSet->findEndpoint(proto, len);
- this->npnSet = NULL;
+ this->npnSet = NULL;
if (this->npnEndpoint == NULL) {
Error("failed to find registered SSL endpoint for '%.*s'", (int)len, (const char *)proto);
@@ -1214,7 +1214,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
#endif
#if defined(SSL_ERROR_WANT_SNI_RESOLVE) || defined(SSL_ERROR_WANT_X509_LOOKUP)
if (this->attributes == HttpProxyPort::TRANSPORT_BLIND_TUNNEL || TS_SSL_HOOK_OP_TUNNEL == hookOpRequested) {
- this->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
+ this->attributes = HttpProxyPort::TRANSPORT_BLIND_TUNNEL;
sslHandShakeComplete = 0;
return EVENT_CONT;
} else {
@@ -1266,7 +1266,7 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
SSL_set_ex_data(ssl, get_ssl_client_data_index(), this);
ssl_error_t ssl_error = SSLConnect(ssl);
- bool trace = getSSLTrace();
+ bool trace = getSSLTrace();
Debug("ssl", "trace=%s", trace ? "TRUE" : "FALSE");
switch (ssl_error) {
@@ -1383,7 +1383,7 @@ SSLNetVConnection::select_next_protocol(SSL *ssl, const unsigned char **out, uns
{
SSLNetVConnection *netvc = (SSLNetVConnection *)SSL_get_app_data(ssl);
const unsigned char *npn = NULL;
- unsigned npnsz = 0;
+ unsigned npnsz = 0;
ink_release_assert(netvc != NULL);
@@ -1399,7 +1399,7 @@ SSLNetVConnection::select_next_protocol(SSL *ssl, const unsigned char **out, uns
#endif /* HAVE_SSL_SELECT_NEXT_PROTO */
}
- *out = NULL;
+ *out = NULL;
*outlen = 0;
return SSL_TLSEXT_ERR_NOACK;
}
@@ -1442,7 +1442,7 @@ SSLNetVConnection::sslContextSet(void *ctx)
else
zret = false;
#else
- bool zret = false;
+ bool zret = false;
#endif
return zret;
}
@@ -1490,7 +1490,7 @@ SSLNetVConnection::computeSSLTrace()
#if TS_USE_TLS_SNI
bool sni_trace;
if (ssl) {
- const char *ssl_servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+ const char *ssl_servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
char *wire_trace_server_name = SSLConfigParams::ssl_wire_trace_server_name;
Debug("ssl", "for wiretrace, ssl_servername=%s, wire_trace_server_name=%s", ssl_servername, wire_trace_server_name);
sni_trace = ssl_servername && wire_trace_server_name && (0 == strcmp(wire_trace_server_name, ssl_servername));
@@ -1503,7 +1503,7 @@ SSLNetVConnection::computeSSLTrace()
// count based on ip only if they set an IP value
const sockaddr *remote_addr = get_remote_addr();
- bool ip_trace = false;
+ bool ip_trace = false;
if (SSLConfigParams::ssl_wire_trace_ip) {
ip_trace = (*SSLConfigParams::ssl_wire_trace_ip == remote_addr);
}
@@ -1516,16 +1516,16 @@ SSLNetVConnection::computeSSLTrace()
// we only generate random numbers as needed (to maintain correct percentage)
if (SSLConfigParams::ssl_wire_trace_server_name && SSLConfigParams::ssl_wire_trace_ip) {
random = this_ethread()->generator.random() % 100; // range [0-99]
- trace = sni_trace && ip_trace && (percentage > random);
+ trace = sni_trace && ip_trace && (percentage > random);
} else if (SSLConfigParams::ssl_wire_trace_server_name) {
random = this_ethread()->generator.random() % 100; // range [0-99]
- trace = sni_trace && (percentage > random);
+ trace = sni_trace && (percentage > random);
} else if (SSLConfigParams::ssl_wire_trace_ip) {
random = this_ethread()->generator.random() % 100; // range [0-99]
- trace = ip_trace && (percentage > random);
+ trace = ip_trace && (percentage > random);
} else {
random = this_ethread()->generator.random() % 100; // range [0-99]
- trace = percentage > random;
+ trace = percentage > random;
}
Debug("ssl", "ssl_netvc random=%d, trace=%s", random, trace ? "TRUE" : "FALSE");
@@ -1544,7 +1544,7 @@ SSLNetVConnection::populate(Connection &con, Continuation *c, void *arg)
// Maybe bring over the stats?
this->sslHandShakeComplete = true;
- this->sslClientConnection = true;
+ this->sslClientConnection = true;
SSL_set_ex_data(this->ssl, get_ssl_client_data_index(), this);
return EVENT_DONE;
}
diff --git a/iocore/net/SSLNextProtocolAccept.cc b/iocore/net/SSLNextProtocolAccept.cc
index 2d1e213..1bcec2e 100644
--- a/iocore/net/SSLNextProtocolAccept.cc
+++ b/iocore/net/SSLNextProtocolAccept.cc
@@ -76,7 +76,7 @@ struct SSLNextProtocolTrampoline : public Continuation {
Continuation *plugin;
SSLNetVConnection *netvc;
- vio = static_cast<VIO *>(edata);
+ vio = static_cast<VIO *>(edata);
netvc = dynamic_cast<SSLNetVConnection *>(vio->vc_server);
ink_assert(netvc != NULL);
diff --git a/iocore/net/SSLNextProtocolSet.cc b/iocore/net/SSLNextProtocolSet.cc
index c12d766..dc2ac93 100644
--- a/iocore/net/SSLNextProtocolSet.cc
+++ b/iocore/net/SSLNextProtocolSet.cc
@@ -37,7 +37,7 @@ unsigned char *
append_protocol(const char *proto, unsigned char *buf)
{
size_t sz = strlen(proto);
- *buf++ = (unsigned char)sz;
+ *buf++ = (unsigned char)sz;
memcpy(buf, proto, sz);
return buf + sz;
}
@@ -102,7 +102,7 @@ SSLNextProtocolSet::registerEndpoint(const char *proto, Continuation *ep)
if (npn) {
ats_free(npn);
- npn = NULL;
+ npn = NULL;
npnsz = 0;
}
diff --git a/iocore/net/SSLSessionCache.cc b/iocore/net/SSLSessionCache.cc
index e0fa401..3d4e11b 100644
--- a/iocore/net/SSLSessionCache.cc
+++ b/iocore/net/SSLSessionCache.cc
@@ -52,8 +52,8 @@ SSLSessionCache::~SSLSessionCache()
bool
SSLSessionCache::getSession(const SSLSessionID &sid, SSL_SESSION **sess) const
{
- uint64_t hash = sid.hash();
- uint64_t target_bucket = hash % nbuckets;
+ uint64_t hash = sid.hash();
+ uint64_t target_bucket = hash % nbuckets;
SSLSessionBucket *bucket = &session_bucket[target_bucket];
if (is_debug_tag_set("ssl.session_cache")) {
@@ -69,8 +69,8 @@ SSLSessionCache::getSession(const SSLSessionID &sid, SSL_SESSION **sess) const
void
SSLSessionCache::removeSession(const SSLSessionID &sid)
{
- uint64_t hash = sid.hash();
- uint64_t target_bucket = hash % nbuckets;
+ uint64_t hash = sid.hash();
+ uint64_t target_bucket = hash % nbuckets;
SSLSessionBucket *bucket = &session_bucket[target_bucket];
if (is_debug_tag_set("ssl.session_cache")) {
@@ -87,8 +87,8 @@ SSLSessionCache::removeSession(const SSLSessionID &sid)
void
SSLSessionCache::insertSession(const SSLSessionID &sid, SSL_SESSION *sess)
{
- uint64_t hash = sid.hash();
- uint64_t target_bucket = hash % nbuckets;
+ uint64_t hash = sid.hash();
+ uint64_t target_bucket = hash % nbuckets;
SSLSessionBucket *bucket = &session_bucket[target_bucket];
if (is_debug_tag_set("ssl.session_cache")) {
@@ -172,7 +172,7 @@ SSLSessionBucket::getSession(const SSLSessionID &id, SSL_SESSION **sess)
while (node) {
if (node->session_id == id) {
const unsigned char *loc = reinterpret_cast<const unsigned char *>(node->asn1_data->data());
- *sess = d2i_SSL_SESSION(NULL, &loc, node->len_asn1_data);
+ *sess = d2i_SSL_SESSION(NULL, &loc, node->len_asn1_data);
return true;
}
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 1dfb29d..dff5d9c 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -120,10 +120,10 @@ static int ssl_callback_session_ticket(SSL *, unsigned char *, unsigned char *,
static int ssl_session_ticket_index = -1;
#endif
-static ink_mutex *mutex_buf = NULL;
+static ink_mutex *mutex_buf = NULL;
static bool open_ssl_initialized = false;
-RecRawStatBlock *ssl_rsb = NULL;
+RecRawStatBlock *ssl_rsb = NULL;
static InkHashTable *ssl_cipher_name_table = NULL;
/* Using pthread thread ID and mutex functions directly, instead of
@@ -234,7 +234,7 @@ ssl_get_cached_session(SSL *ssl, unsigned char *id, int len, int *copy)
static int
ssl_new_cached_session(SSL *ssl, SSL_SESSION *sess)
{
- unsigned int len = 0;
+ unsigned int len = 0;
const unsigned char *id = SSL_SESSION_get_id(sess, &len);
SSLSessionID sid(id, len);
@@ -256,7 +256,7 @@ ssl_rm_cached_session(SSL_CTX *ctx, SSL_SESSION *sess)
{
SSL_CTX_remove_session(ctx, sess);
- unsigned int len = 0;
+ unsigned int len = 0;
const unsigned char *id = SSL_SESSION_get_id(sess, &len);
SSLSessionID sid(id, len);
@@ -273,13 +273,13 @@ ssl_rm_cached_session(SSL_CTX *ctx, SSL_SESSION *sess)
int
set_context_cert(SSL *ssl)
{
- SSL_CTX *ctx = NULL;
+ SSL_CTX *ctx = NULL;
SSLCertContext *cc = NULL;
SSLCertificateConfig::scoped_config lookup;
- const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+ const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
SSLNetVConnection *netvc = (SSLNetVConnection *)SSL_get_app_data(ssl);
- bool found = true;
- int retval = 1;
+ bool found = true;
+ int retval = 1;
Debug("ssl", "set_context_cert ssl=%p server=%s handshake_complete=%d", ssl, servername, netvc->getSSLHandShakeComplete());
// set SSL trace (we do this a little later in the USE_TLS_SNI case so we can get the servername
@@ -538,9 +538,9 @@ ssl_context_enable_tickets(SSL_CTX *ctx, const char *ticket_key_path)
}
} else {
// Generate a random ticket key
- ticket_key_len = 48;
+ ticket_key_len = 48;
ticket_key_data = (char *)ats_malloc(ticket_key_len);
- char *tmp_ptr = ticket_key_data;
+ char *tmp_ptr = ticket_key_data;
RAND_bytes(reinterpret_cast<unsigned char *>(tmp_ptr), ticket_key_len);
}
@@ -652,7 +652,7 @@ ssl_getpassword(const char *prompt, char *buffer, int size)
return -1;
}
- int i = 0;
+ int i = 0;
int ch = 0;
*buffer = 0;
@@ -662,7 +662,7 @@ ssl_getpassword(const char *prompt, char *buffer, int size)
return -1;
}
- buffer[i] = ch;
+ buffer[i] = ch;
buffer[++i] = 0;
}
@@ -676,7 +676,7 @@ ssl_private_key_passphrase_callback_exec(char *buf, int size, int rwflag, void *
return 0;
}
- *buf = 0;
+ *buf = 0;
passphrase_cb_userdata *ud = static_cast<passphrase_cb_userdata *>(userdata);
Debug("ssl", "ssl_private_key_passphrase_callback_exec rwflag=%d serverDialog=%s", rwflag, ud->_serverDialog);
@@ -710,7 +710,7 @@ ssl_private_key_passphrase_callback_builtin(char *buf, int size, int rwflag, voi
return 0;
}
- *buf = 0;
+ *buf = 0;
passphrase_cb_userdata *ud = static_cast<passphrase_cb_userdata *>(userdata);
Debug("ssl", "ssl_private_key_passphrase_callback rwflag=%d serverDialog=%s", rwflag, ud->_serverDialog);
@@ -743,9 +743,9 @@ ssl_private_key_validate_exec(const char *cmdLine)
return false;
}
- bool bReturn = false;
+ bool bReturn = false;
char *cmdLineCopy = ats_strdup(cmdLine);
- char *ptr = cmdLineCopy;
+ char *ptr = cmdLineCopy;
while (*ptr && !isspace(*ptr))
++ptr;
@@ -765,8 +765,8 @@ SSLRecRawStatSyncCount(const char *name, RecDataT data_type, RecData *data, RecR
SSLCertificateConfig::scoped_config certLookup;
int64_t sessions = 0;
- int64_t hits = 0;
- int64_t misses = 0;
+ int64_t hits = 0;
+ int64_t misses = 0;
int64_t timeouts = 0;
if (certLookup) {
@@ -992,15 +992,15 @@ SSLInitializeStatistics()
// initialize stat name->index hash table
ssl_cipher_name_table = ink_hash_table_create(InkHashTableKeyType_Word);
- ctx = SSLDefaultServerContext();
- ssl = SSL_new(ctx);
+ ctx = SSLDefaultServerContext();
+ ssl = SSL_new(ctx);
ciphers = SSL_get_ciphers(ssl);
// BoringSSL has sk_SSL_CIPHER_num() return a size_t (well, sk_num() is)
for (int index = 0; index < static_cast<int>(sk_SSL_CIPHER_num(ciphers)); index++) {
- SSL_CIPHER *cipher = const_cast<SSL_CIPHER *>(sk_SSL_CIPHER_value(ciphers, index));
+ SSL_CIPHER *cipher = const_cast<SSL_CIPHER *>(sk_SSL_CIPHER_value(ciphers, index));
const char *cipherName = SSL_CIPHER_get_name(cipher);
- std::string statName = "proxy.process.ssl.cipher.user_agent." + std::string(cipherName);
+ std::string statName = "proxy.process.ssl.cipher.user_agent." + std::string(cipherName);
// If room in allocated space ...
if ((ssl_cipher_stats_start + index) > ssl_cipher_stats_end) {
@@ -1292,7 +1292,7 @@ SSLInitServerContext(const SSLConfigParams *params, const ssl_user_config &sslMu
EVP_MD_CTX digest;
STACK_OF(X509_NAME) *ca_list = NULL;
unsigned char hash_buf[EVP_MAX_MD_SIZE];
- unsigned int hash_len = 0;
+ unsigned int hash_len = 0;
char const *setting_cert = sslMultCertSettings.cert.get();
// disable selected protocols
@@ -1607,7 +1607,7 @@ static bool
ssl_index_certificate(SSLCertLookup *lookup, SSLCertContext const &cc, X509 *cert, const char *certname)
{
X509_NAME *subject = NULL;
- bool inserted = false;
+ bool inserted = false;
if (NULL == cert) {
Error("Failed to load certificate %s", certname);
@@ -1627,8 +1627,8 @@ ssl_index_certificate(SSLCertLookup *lookup, SSLCertContext const &cc, X509 *cer
}
X509_NAME_ENTRY *e = X509_NAME_get_entry(subject, pos);
- ASN1_STRING *cn = X509_NAME_ENTRY_get_data(e);
- subj_name = asn1_strdup(cn);
+ ASN1_STRING *cn = X509_NAME_ENTRY_get_data(e);
+ subj_name = asn1_strdup(cn);
Debug("ssl", "mapping '%s' to certificate %s", (const char *)subj_name, certname);
if (lookup->insert(subj_name, cc) >= 0)
@@ -1717,9 +1717,9 @@ static SSL_CTX *
ssl_store_ssl_context(const SSLConfigParams *params, SSLCertLookup *lookup, const ssl_user_config &sslMultCertSettings)
{
Vec<X509 *> cert_list;
- SSL_CTX *ctx = SSLInitServerContext(params, sslMultCertSettings, cert_list);
+ SSL_CTX *ctx = SSLInitServerContext(params, sslMultCertSettings, cert_list);
ssl_ticket_key_block *keyblock = NULL;
- bool inserted = false;
+ bool inserted = false;
if (!ctx) {
lookup->is_valid = false;
@@ -1761,7 +1761,7 @@ ssl_store_ssl_context(const SSLConfigParams *params, SSLCertLookup *lookup, cons
if (sslMultCertSettings.addr) {
if (strcmp(sslMultCertSettings.addr, "*") == 0) {
if (lookup->insert(sslMultCertSettings.addr, SSLCertContext(ctx, sslMultCertSettings.opt, keyblock)) >= 0) {
- inserted = true;
+ inserted = true;
lookup->ssl_default = ctx;
ssl_set_handshake_callbacks(ctx);
}
@@ -1908,7 +1908,7 @@ bool
SSLParseCertificateConfiguration(const SSLConfigParams *params, SSLCertLookup *lookup)
{
char *tok_state = NULL;
- char *line = NULL;
+ char *line = NULL;
ats_scoped_str file_buf;
unsigned line_num = 0;
matcher_line line_info;
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index 792c949..9c2a9d0 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -43,8 +43,8 @@ ClassAllocator<SocksEntry> socksAllocator("socksAllocator");
void
SocksEntry::init(ProxyMutex *m, SocksNetVC *vc, unsigned char socks_support, unsigned char ver)
{
- mutex = m;
- buf = new_MIOBuffer();
+ mutex = m;
+ buf = new_MIOBuffer();
reader = buf->alloc_reader();
socks_cmd = socks_support;
@@ -59,10 +59,10 @@ SocksEntry::init(ProxyMutex *m, SocksNetVC *vc, unsigned char socks_support, uns
ats_ip_copy(&target_addr, vc->get_local_addr());
#ifdef SOCKS_WITH_TS
- req_data.hdr = 0;
+ req_data.hdr = 0;
req_data.hostname_str = 0;
- req_data.api_info = 0;
- req_data.xact_start = time(0);
+ req_data.api_info = 0;
+ req_data.xact_start = time(0);
assert(ats_is_ip4(&target_addr));
ats_ip_copy(&req_data.dest_ip, &target_addr);
@@ -76,7 +76,7 @@ SocksEntry::init(ProxyMutex *m, SocksNetVC *vc, unsigned char socks_support, uns
nattempts = 0;
findServer();
- timeout = this_ethread()->schedule_in(this, HRTIME_SECONDS(netProcessor.socks_conf_stuff->server_connect_timeout));
+ timeout = this_ethread()->schedule_in(this, HRTIME_SECONDS(netProcessor.socks_conf_stuff->server_connect_timeout));
write_done = false;
}
@@ -175,7 +175,7 @@ SocksEntry::free()
free_MIOBuffer(buf);
action_ = NULL;
- mutex = NULL;
+ mutex = NULL;
socksAllocator.free(this);
}
@@ -233,7 +233,7 @@ SocksEntry::startEvent(int event, void *data)
int
SocksEntry::mainEvent(int event, void *data)
{
- int ret = EVENT_DONE;
+ int ret = EVENT_DONE;
int n_bytes = 0;
unsigned char *p;
@@ -251,7 +251,7 @@ SocksEntry::mainEvent(int event, void *data)
p[n_bytes++] = version;
p[n_bytes++] = (socks_cmd == NORMAL_SOCKS) ? SOCKS_CONNECT : socks_cmd;
- ts = ntohs(ats_ip_port_cast(&server_addr));
+ ts = ntohs(ats_ip_port_cast(&server_addr));
if (version == SOCKS5_VERSION) {
p[n_bytes++] = 0; // Reserved
@@ -305,7 +305,7 @@ SocksEntry::mainEvent(int event, void *data)
case VC_EVENT_WRITE_COMPLETE:
if (timeout) {
timeout->cancel(this);
- timeout = NULL;
+ timeout = NULL;
write_done = true;
}
@@ -334,7 +334,7 @@ SocksEntry::mainEvent(int event, void *data)
if (version == SOCKS5_VERSION && auth_handler == NULL) {
VIO *vio = (VIO *)data;
- p = (unsigned char *)buf->start();
+ p = (unsigned char *)buf->start();
if (vio->ndone >= 5) {
int reply_len;
@@ -357,7 +357,7 @@ SocksEntry::mainEvent(int event, void *data)
if (vio->ndone >= reply_len) {
vio->nbytes = vio->ndone;
- ret = EVENT_DONE;
+ ret = EVENT_DONE;
}
}
}
@@ -455,7 +455,7 @@ loadSocksConfiguration(socks_conf_struct *socks_conf_stuff)
#endif
socks_conf_stuff->accept_enabled = 0; // initialize it INKqa08593
- socks_conf_stuff->socks_needed = REC_ConfigReadInteger("proxy.config.socks.socks_needed");
+ socks_conf_stuff->socks_needed = REC_ConfigReadInteger("proxy.config.socks.socks_needed");
if (!socks_conf_stuff->socks_needed) {
Debug("Socks", "Socks Turned Off");
return;
@@ -470,16 +470,16 @@ loadSocksConfiguration(socks_conf_struct *socks_conf_stuff)
}
socks_conf_stuff->server_connect_timeout = REC_ConfigReadInteger("proxy.config.socks.server_connect_timeout");
- socks_conf_stuff->socks_timeout = REC_ConfigReadInteger("proxy.config.socks.socks_timeout");
+ socks_conf_stuff->socks_timeout = REC_ConfigReadInteger("proxy.config.socks.socks_timeout");
Debug("Socks", "server connect timeout: %d socks respnonse timeout %d", socks_conf_stuff->server_connect_timeout,
socks_conf_stuff->socks_timeout);
socks_conf_stuff->per_server_connection_attempts = REC_ConfigReadInteger("proxy.config.socks.per_server_connection_attempts");
- socks_conf_stuff->connection_attempts = REC_ConfigReadInteger("proxy.config.socks.connection_attempts");
+ socks_conf_stuff->connection_attempts = REC_ConfigReadInteger("proxy.config.socks.connection_attempts");
socks_conf_stuff->accept_enabled = REC_ConfigReadInteger("proxy.config.socks.accept_enabled");
- socks_conf_stuff->accept_port = REC_ConfigReadInteger("proxy.config.socks.accept_port");
- socks_conf_stuff->http_port = REC_ConfigReadInteger("proxy.config.socks.http_port");
+ socks_conf_stuff->accept_port = REC_ConfigReadInteger("proxy.config.socks.accept_port");
+ socks_conf_stuff->http_port = REC_ConfigReadInteger("proxy.config.socks.http_port");
Debug("SocksProxy", "Read SocksProxy info: accept_enabled = %d "
"accept_port = %d http_port = %d",
socks_conf_stuff->accept_enabled, socks_conf_stuff->accept_port, socks_conf_stuff->http_port);
@@ -523,7 +523,7 @@ loadSocksConfiguration(socks_conf_struct *socks_conf_stuff)
return;
error:
- socks_conf_stuff->socks_needed = 0;
+ socks_conf_stuff->socks_needed = 0;
socks_conf_stuff->accept_enabled = 0;
if (socks_config_fd >= 0)
::close(socks_config_fd);
@@ -532,10 +532,10 @@ error:
int
loadSocksAuthInfo(int fd, socks_conf_struct *socks_stuff)
{
- char c = '\0';
- char line[256] = {0}; // initialize all chars to nil
+ char c = '\0';
+ char line[256] = {0}; // initialize all chars to nil
char user_name[256] = {0};
- char passwd[256] = {0};
+ char passwd[256] = {0};
if (lseek(fd, 0, SEEK_SET) < 0) {
Warning("Can not seek on Socks configuration file\n");
@@ -549,7 +549,7 @@ loadSocksAuthInfo(int fd, socks_conf_struct *socks_stuff)
line[n++] = c;
if (rc <= 0)
end_of_file = true;
- line[n] = '\0';
+ line[n] = '\0';
// coverity[secure_coding]
rc = sscanf(line, " auth u %255s %255s ", user_name, passwd);
@@ -562,7 +562,7 @@ loadSocksAuthInfo(int fd, socks_conf_struct *socks_stuff)
socks_stuff->user_name_n_passwd_len = len1 + len2 + 2;
char *ptr = (char *)ats_malloc(socks_stuff->user_name_n_passwd_len);
- ptr[0] = len1;
+ ptr[0] = len1;
memcpy(&ptr[1], user_name, len1);
ptr[len1 + 1] = len2;
memcpy(&ptr[len1 + 2], passwd, len2);
@@ -580,7 +580,7 @@ int
socks5BasicAuthHandler(int event, unsigned char *p, void (**h_ptr)(void))
{
// for more info on Socks5 see RFC 1928
- int ret = 0;
+ int ret = 0;
char *pass_phrase = netProcessor.socks_conf_stuff->user_name_n_passwd;
switch (event) {
@@ -613,7 +613,7 @@ socks5BasicAuthHandler(int event, unsigned char *p, void (**h_ptr)(void))
if (!pass_phrase) {
Debug("Socks", "Buggy Socks server: asks for username/passwd "
"when not supplied as an option");
- ret = -1;
+ ret = -1;
*h_ptr = NULL;
} else
*(SocksAuthHandler *)h_ptr = &socks5PasswdAuthHandler;
@@ -624,7 +624,7 @@ socks5BasicAuthHandler(int event, unsigned char *p, void (**h_ptr)(void))
Debug("Socks", "None of the Socks authentcations is acceptable "
"to the server");
*h_ptr = NULL;
- ret = -1;
+ ret = -1;
break;
default:
@@ -659,7 +659,7 @@ socks5PasswdAuthHandler(int event, unsigned char *p, void (**h_ptr)(void))
switch (event) {
case SOCKS_AUTH_OPEN:
pass_phrase = netProcessor.socks_conf_stuff->user_name_n_passwd;
- pass_len = netProcessor.socks_conf_stuff->user_name_n_passwd_len;
+ pass_len = netProcessor.socks_conf_stuff->user_name_n_passwd_len;
ink_assert(pass_phrase);
p[0] = 1; // version
diff --git a/iocore/net/UnixConnection.cc b/iocore/net/UnixConnection.cc
index 57aecd1..4c5fdc9 100644
--- a/iocore/net/UnixConnection.cc
+++ b/iocore/net/UnixConnection.cc
@@ -51,9 +51,9 @@ Connection::setup_mc_send(sockaddr const *mc_addr, sockaddr const *my_addr, bool
{
(void)c;
ink_assert(fd == NO_FD);
- int res = 0;
+ int res = 0;
int enable_reuseaddr = 1;
- in_addr_t mc_if = ats_ip4_addr_cast(my_addr);
+ in_addr_t mc_if = ats_ip4_addr_cast(my_addr);
if ((res = socketManager.mc_socket(my_addr->sa_family, SOCK_DGRAM, 0, non_blocking)) < 0)
goto Lerror;
@@ -109,7 +109,7 @@ Connection::setup_mc_receive(sockaddr const *mc_addr, sockaddr const *my_addr, b
ink_assert(fd == NO_FD);
(void)sendChan;
(void)c;
- int res = 0;
+ int res = 0;
int enable_reuseaddr = 1;
IpAddr inaddr_any(INADDR_ANY);
@@ -223,7 +223,7 @@ Connection::open(NetVCOptions const &opt)
{
ink_assert(fd == NO_FD);
int enable_reuseaddr = 1; // used for sockopt setting
- int res = 0; // temp result
+ int res = 0; // temp result
IpEndpoint local_addr;
sock_type = NetVCOptions::USE_UDP == opt.ip_proto ? SOCK_DGRAM : SOCK_STREAM;
int family;
@@ -244,7 +244,7 @@ Connection::open(NetVCOptions const &opt)
// No local address specified, so use family option if possible.
family = ats_is_ip(opt.ip_family) ? opt.ip_family : AF_INET;
local_addr.setToAnyAddr(family);
- is_any_address = true;
+ is_any_address = true;
local_addr.port() = htons(opt.local_port);
}
@@ -371,7 +371,7 @@ Connection::apply_options(NetVCOptions const &opt)
}
if (opt.sockopt_flags & NetVCOptions::SOCK_OPT_LINGER_ON) {
struct linger l;
- l.l_onoff = 1;
+ l.l_onoff = 1;
l.l_linger = 0;
safe_setsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l));
Debug("socket", "::open:: setsockopt() turn on SO_LINGER on socket");
diff --git a/iocore/net/UnixNet.cc b/iocore/net/UnixNet.cc
index 5066b47..46efbf1 100644
--- a/iocore/net/UnixNet.cc
+++ b/iocore/net/UnixNet.cc
@@ -189,7 +189,7 @@ PollCont::pollEvent(int event, Event *e)
poll_timeout, pollDescriptor->result);
#elif TS_USE_KQUEUE
struct timespec tv;
- tv.tv_sec = poll_timeout / 1000;
+ tv.tv_sec = poll_timeout / 1000;
tv.tv_nsec = 1000000 * (poll_timeout % 1000);
pollDescriptor->result =
kevent(pollDescriptor->kqueue_fd, NULL, 0, pollDescriptor->kq_Triggered_Events, POLL_DESCRIPTOR_SIZE, &tv);
@@ -198,9 +198,9 @@ PollCont::pollEvent(int event, Event *e)
#elif TS_USE_PORT
int retval;
timespec_t ptimeout;
- ptimeout.tv_sec = poll_timeout / 1000;
+ ptimeout.tv_sec = poll_timeout / 1000;
ptimeout.tv_nsec = 1000000 * (poll_timeout % 1000);
- unsigned nget = 1;
+ unsigned nget = 1;
if ((retval = port_getn(pollDescriptor->port_fd, pollDescriptor->Port_Triggered_Events, POLL_DESCRIPTOR_SIZE, &nget, &ptimeout)) <
0) {
pollDescriptor->result = 0;
@@ -263,22 +263,22 @@ initialize_thread_for_net(EThread *thread)
new ((ink_dummy_for_new *)get_NetHandler(thread)) NetHandler();
new ((ink_dummy_for_new *)get_PollCont(thread)) PollCont(thread->mutex, get_NetHandler(thread));
get_NetHandler(thread)->mutex = new_ProxyMutex();
- PollCont *pc = get_PollCont(thread);
- PollDescriptor *pd = pc->pollDescriptor;
+ PollCont *pc = get_PollCont(thread);
+ PollDescriptor *pd = pc->pollDescriptor;
thread->schedule_imm(get_NetHandler(thread));
#ifndef INACTIVITY_TIMEOUT
InactivityCop *inactivityCop = new InactivityCop(get_NetHandler(thread)->mutex);
- int cop_freq = 1;
+ int cop_freq = 1;
REC_ReadConfigInteger(cop_freq, "proxy.config.net.inactivity_check_frequency");
thread->schedule_every(inactivityCop, HRTIME_SECONDS(cop_freq));
#endif
thread->signal_hook = net_signal_hook_function;
- thread->ep = (EventIO *)ats_malloc(sizeof(EventIO));
- thread->ep->type = EVENTIO_ASYNC_SIGNAL;
+ thread->ep = (EventIO *)ats_malloc(sizeof(EventIO));
+ thread->ep->type = EVENTIO_ASYNC_SIGNAL;
#if HAVE_EVENTFD
thread->ep->start(pd, thread->evfd, 0, EVENTIO_READ);
#else
@@ -303,12 +303,12 @@ update_nethandler_config(const char *name, RecDataT data_type ATS_UNUSED, RecDat
if (nh != NULL) {
if (strcmp(name, "proxy.config.net.max_connections_in") == 0) {
Debug("net_queue", "proxy.config.net.max_connections_in updated to %" PRId64, data.rec_int);
- nh->max_connections_in = data.rec_int;
+ nh->max_connections_in = data.rec_int;
update_per_thread_configuration = true;
}
if (strcmp(name, "proxy.config.net.max_active_connections_in") == 0) {
Debug("net_queue", "proxy.config.net.max_active_connections_in updated to %" PRId64, data.rec_int);
- nh->max_connections_active_in = data.rec_int;
+ nh->max_connections_active_in = data.rec_int;
update_per_thread_configuration = true;
}
if (strcmp(name, "proxy.config.net.inactive_threashold_in") == 0) {
@@ -416,7 +416,7 @@ NetHandler::mainNetEvent(int event, Event *e)
else
poll_timeout = net_config_poll_timeout;
- PollDescriptor *pd = get_PollDescriptor(trigger_event->ethread);
+ PollDescriptor *pd = get_PollDescriptor(trigger_event->ethread);
UnixNetVConnection *vc = NULL;
#if TS_USE_EPOLL
pd->result = epoll_wait(pd->epoll_fd, pd->ePoll_Triggered_Events, POLL_DESCRIPTOR_SIZE, poll_timeout);
@@ -424,16 +424,16 @@ NetHandler::mainNetEvent(int event, Event *e)
pd->result);
#elif TS_USE_KQUEUE
struct timespec tv;
- tv.tv_sec = poll_timeout / 1000;
+ tv.tv_sec = poll_timeout / 1000;
tv.tv_nsec = 1000000 * (poll_timeout % 1000);
pd->result = kevent(pd->kqueue_fd, NULL, 0, pd->kq_Triggered_Events, POLL_DESCRIPTOR_SIZE, &tv);
NetDebug("iocore_net_main_poll", "[NetHandler::mainNetEvent] kevent(%d,%d), result=%d", pd->kqueue_fd, poll_timeout, pd->result);
#elif TS_USE_PORT
int retval;
timespec_t ptimeout;
- ptimeout.tv_sec = poll_timeout / 1000;
+ ptimeout.tv_sec = poll_timeout / 1000;
ptimeout.tv_nsec = 1000000 * (poll_timeout % 1000);
- unsigned nget = 1;
+ unsigned nget = 1;
if ((retval = port_getn(pd->port_fd, pd->Port_Triggered_Events, POLL_DESCRIPTOR_SIZE, &nget, &ptimeout)) < 0) {
pd->result = 0;
switch (errno) {
@@ -579,12 +579,12 @@ NetHandler::manage_active_queue(bool ignore_queue_size = false)
ink_hrtime now = Thread::get_hrtime();
// loop over the non-active connections and try to close them
- UnixNetVConnection *vc = active_queue.head;
+ UnixNetVConnection *vc = active_queue.head;
UnixNetVConnection *vc_next = NULL;
- int closed = 0;
- int handle_event = 0;
- int total_idle_time = 0;
- int total_idle_count = 0;
+ int closed = 0;
+ int handle_event = 0;
+ int total_idle_time = 0;
+ int total_idle_count = 0;
for (; vc != NULL; vc = vc_next) {
vc_next = vc->active_queue_link.next;
if ((vc->inactivity_timeout_in && vc->next_inactivity_timeout_at <= now) ||
@@ -609,7 +609,7 @@ NetHandler::configure_per_thread()
// figure out the number of threads and calculate the number of connections per thread
int threads = eventProcessor.n_threads_for_type[ET_NET];
threads += (ET_NET == SSLNetProcessor::ET_SSL) ? 0 : eventProcessor.n_threads_for_type[SSLNetProcessor::ET_SSL];
- max_connections_per_thread_in = max_connections_in / threads;
+ max_connections_per_thread_in = max_connections_in / threads;
max_connections_active_per_thread_in = max_connections_active_in / threads;
Debug("net_queue", "max_connections_per_thread_in updated to %d threads: %d", max_connections_per_thread_in, threads);
Debug("net_queue", "max_connections_active_per_thread_in updated to %d threads: %d", max_connections_active_per_thread_in,
@@ -620,7 +620,7 @@ void
NetHandler::manage_keep_alive_queue()
{
uint32_t total_connections_in = active_queue_size + keep_alive_queue_size;
- ink_hrtime now = Thread::get_hrtime();
+ ink_hrtime now = Thread::get_hrtime();
Debug("net_queue", "max_connections_per_thread_in: %d total_connections_in: %d active_queue_size: %d keep_alive_queue_size: %d",
max_connections_per_thread_in, total_connections_in, active_queue_size, keep_alive_queue_size);
@@ -631,10 +631,10 @@ NetHandler::manage_keep_alive_queue()
// loop over the non-active connections and try to close them
UnixNetVConnection *vc_next = NULL;
- int closed = 0;
- int handle_event = 0;
- int total_idle_time = 0;
- int total_idle_count = 0;
+ int closed = 0;
+ int handle_event = 0;
+ int total_idle_time = 0;
+ int total_idle_count = 0;
for (UnixNetVConnection *vc = keep_alive_queue.head; vc != NULL; vc = vc_next) {
vc_next = vc->keep_alive_queue_link.next;
_close_vc(vc, now, handle_event, closed, total_idle_time, total_idle_count);
diff --git a/iocore/net/UnixNetAccept.cc b/iocore/net/UnixNetAccept.cc
index 0510515..3e22f4d 100644
--- a/iocore/net/UnixNetAccept.cc
+++ b/iocore/net/UnixNetAccept.cc
@@ -30,7 +30,7 @@
typedef int (NetAccept::*NetAcceptHandler)(int, void *);
volatile int dummy_volatile = 0;
-int accept_till_done = 1;
+int accept_till_done = 1;
static void
safe_delay(int msec)
@@ -49,7 +49,7 @@ send_throttle_message(NetAccept *na)
Connection con[100];
char dummy_read_request[4096];
- afd.fd = na->server.fd;
+ afd.fd = na->server.fd;
afd.events = POLLIN;
int n = 0;
@@ -77,10 +77,10 @@ send_throttle_message(NetAccept *na)
int
net_accept(NetAccept *na, void *ep, bool blockable)
{
- Event *e = (Event *)ep;
- int res = 0;
- int count = 0;
- int loop = accept_till_done;
+ Event *e = (Event *)ep;
+ int res = 0;
+ int count = 0;
+ int loop = accept_till_done;
UnixNetVConnection *vc = NULL;
Connection con;
@@ -115,7 +115,7 @@ net_accept(NetAccept *na, void *ep, bool blockable)
vc->con.move(con);
vc->submit_time = Thread::get_hrtime();
ats_ip_copy(&vc->server_addr, &vc->con.addr);
- vc->mutex = new_ProxyMutex();
+ vc->mutex = new_ProxyMutex();
vc->action_ = *na->action_;
vc->set_is_transparent(na->server.f_inbound_transparent);
vc->closed = 0;
@@ -162,7 +162,7 @@ NetAccept::init_accept(EThread *t, bool isTransparent)
if (!action_->continuation->mutex) {
action_->continuation->mutex = t->mutex;
- action_->mutex = t->mutex;
+ action_->mutex = t->mutex;
}
if (do_listen(NON_BLOCKING, isTransparent))
return;
@@ -190,8 +190,8 @@ NetAccept::init_accept_per_thread(bool isTransparent)
if (i < n - 1)
a = clone();
else
- a = this;
- EThread *t = eventProcessor.eventthread[ET_NET][i];
+ a = this;
+ EThread *t = eventProcessor.eventthread[ET_NET][i];
PollDescriptor *pd = get_PollDescriptor(t);
if (a->ep.start(pd, a, EVENTIO_READ) < 0)
Warning("[NetAccept::init_accept_per_thread]:error starting EventIO");
@@ -228,8 +228,8 @@ NetAccept::do_listen(bool non_blocking, bool transparent)
int
NetAccept::do_blocking_accept(EThread *t)
{
- int res = 0;
- int loop = accept_till_done;
+ int res = 0;
+ int loop = accept_till_done;
UnixNetVConnection *vc = NULL;
Connection con;
@@ -273,12 +273,12 @@ NetAccept::do_blocking_accept(EThread *t)
con.close();
return -1;
}
- vc->con = con;
+ vc->con = con;
vc->options.packet_mark = packet_mark;
- vc->options.packet_tos = packet_tos;
+ vc->options.packet_tos = packet_tos;
vc->apply_options();
vc->from_accept_thread = true;
- vc->id = net_next_connection_number();
+ vc->id = net_next_connection_number();
check_emergency_throttle(con);
@@ -286,7 +286,7 @@ NetAccept::do_blocking_accept(EThread *t)
vc->submit_time = now;
ats_ip_copy(&vc->server_addr, &vc->con.addr);
vc->set_is_transparent(server.f_inbound_transparent);
- vc->mutex = new_ProxyMutex();
+ vc->mutex = new_ProxyMutex();
vc->action_ = *action_;
SET_CONTINUATION_HANDLER(vc, (NetVConnHandler)&UnixNetVConnection::acceptEvent);
// eventProcessor.schedule_imm(vc, getEtype());
@@ -346,9 +346,9 @@ NetAccept::acceptFastEvent(int event, void *ep)
int bufsz, res;
Connection con;
- PollDescriptor *pd = get_PollDescriptor(e->ethread);
+ PollDescriptor *pd = get_PollDescriptor(e->ethread);
UnixNetVConnection *vc = NULL;
- int loop = accept_till_done;
+ int loop = accept_till_done;
do {
if (!backdoor && check_net_throttle(ACCEPT, Thread::get_hrtime())) {
@@ -357,8 +357,8 @@ NetAccept::acceptFastEvent(int event, void *ep)
}
socklen_t sz = sizeof(con.addr);
- int fd = socketManager.accept(server.fd, &con.addr.sa, &sz);
- con.fd = fd;
+ int fd = socketManager.accept(server.fd, &con.addr.sa, &sz);
+ con.fd = fd;
if (likely(fd >= 0)) {
Debug("iocore_net", "accepted a new socket: %d", fd);
@@ -403,7 +403,7 @@ NetAccept::acceptFastEvent(int event, void *ep)
vc->con = con;
vc->options.packet_mark = packet_mark;
- vc->options.packet_tos = packet_tos;
+ vc->options.packet_tos = packet_tos;
vc->apply_options();
} else {
res = fd;
@@ -431,7 +431,7 @@ NetAccept::acceptFastEvent(int event, void *ep)
vc->submit_time = Thread::get_hrtime();
ats_ip_copy(&vc->server_addr, &vc->con.addr);
vc->set_is_transparent(server.f_inbound_transparent);
- vc->mutex = new_ProxyMutex();
+ vc->mutex = new_ProxyMutex();
vc->thread = e->ethread;
vc->nh = get_NetHandler(e->ethread);
@@ -527,7 +527,7 @@ NetAccept *
NetAccept::clone() const
{
NetAccept *na;
- na = new NetAccept;
+ na = new NetAccept;
*na = *this;
return na;
}
diff --git a/iocore/net/UnixNetPages.cc b/iocore/net/UnixNetPages.cc
index 40f95b9..782ebac 100644
--- a/iocore/net/UnixNetPages.cc
+++ b/iocore/net/UnixNetPages.cc
@@ -53,7 +53,7 @@ struct ShowNet : public ShowCont {
showConnectionsOnThread(int event, Event *e)
{
EThread *ethread = e->ethread;
- NetHandler *nh = get_NetHandler(ethread);
+ NetHandler *nh = get_NetHandler(ethread);
MUTEX_TRY_LOCK(lock, nh->mutex, ethread);
if (!lock.is_locked()) {
ethread->schedule_in(this, HRTIME_MSECONDS(net_retry_delay));
@@ -145,8 +145,8 @@ struct ShowNet : public ShowCont {
int
showSingleThread(int event, Event *e)
{
- EThread *ethread = e->ethread;
- NetHandler *nh = get_NetHandler(ethread);
+ EThread *ethread = e->ethread;
+ NetHandler *nh = get_NetHandler(ethread);
PollDescriptor *pollDescriptor = get_PollDescriptor(ethread);
MUTEX_TRY_LOCK(lock, nh->mutex, ethread);
if (!lock.is_locked()) {
@@ -218,8 +218,8 @@ register_ShowNet(Continuation *c, HTTPHdr *h)
} else if (STREQ_PREFIX(path, path_len, "ips")) {
int query_len;
const char *query = h->url_get()->query_get(&query_len);
- s->sarg = ats_strndup(query, query_len);
- char *gn = NULL;
+ s->sarg = ats_strndup(query, query_len);
+ char *gn = NULL;
if (s->sarg)
gn = (char *)memchr(s->sarg, '=', strlen(s->sarg));
if (gn)
@@ -228,8 +228,8 @@ register_ShowNet(Continuation *c, HTTPHdr *h)
} else if (STREQ_PREFIX(path, path_len, "ports")) {
int query_len;
const char *query = h->url_get()->query_get(&query_len);
- s->sarg = ats_strndup(query, query_len);
- char *gn = NULL;
+ s->sarg = ats_strndup(query, query_len);
+ char *gn = NULL;
if (s->sarg)
gn = (char *)memchr(s->sarg, '=', strlen(s->sarg));
if (gn)
diff --git a/iocore/net/UnixNetProcessor.cc b/iocore/net/UnixNetProcessor.cc
index e2c6268..521148e 100644
--- a/iocore/net/UnixNetProcessor.cc
+++ b/iocore/net/UnixNetProcessor.cc
@@ -35,18 +35,18 @@ NetProcessor::AcceptOptions::reset()
{
local_port = 0;
local_ip.invalidate();
- accept_threads = -1;
- ip_family = AF_INET;
- etype = ET_NET;
- f_callback_on_open = false;
- localhost_only = false;
- frequent_accept = true;
- backdoor = false;
- recv_bufsize = 0;
- send_bufsize = 0;
- sockopt_flags = 0;
- packet_mark = 0;
- packet_tos = 0;
+ accept_threads = -1;
+ ip_family = AF_INET;
+ etype = ET_NET;
+ f_callback_on_open = false;
+ localhost_only = false;
+ frequent_accept = true;
+ backdoor = false;
+ recv_bufsize = 0;
+ send_bufsize = 0;
+ sockopt_flags = 0;
+ packet_mark = 0;
+ packet_tos = 0;
f_inbound_transparent = false;
return *this;
}
@@ -85,10 +85,10 @@ Action *
UnixNetProcessor::accept_internal(Continuation *cont, int fd, AcceptOptions const &opt)
{
EventType upgraded_etype = opt.etype; // setEtype requires non-const ref.
- EThread *thread = this_ethread();
- ProxyMutex *mutex = thread->mutex;
- int accept_threads = opt.accept_threads; // might be changed.
- IpEndpoint accept_ip; // local binding address.
+ EThread *thread = this_ethread();
+ ProxyMutex *mutex = thread->mutex;
+ int accept_threads = opt.accept_threads; // might be changed.
+ IpEndpoint accept_ip; // local binding address.
char thr_name[MAX_THREAD_NAME_LENGTH];
NetAccept *na = createNetAccept();
@@ -123,23 +123,23 @@ UnixNetProcessor::accept_internal(Continuation *cont, int fd, AcceptOptions cons
Debug("http_tproxy", "Marking accept server %p on port %d as inbound transparent", na, opt.local_port);
}
- int should_filter_int = 0;
+ int should_filter_int = 0;
na->server.http_accept_filter = false;
REC_ReadConfigInteger(should_filter_int, "proxy.config.net.defer_accept");
if (should_filter_int > 0 && opt.etype == ET_NET)
na->server.http_accept_filter = true;
- na->action_ = new NetAcceptAction();
- *na->action_ = cont;
- na->action_->server = &na->server;
+ na->action_ = new NetAcceptAction();
+ *na->action_ = cont;
+ na->action_->server = &na->server;
na->callback_on_open = opt.f_callback_on_open;
- na->recv_bufsize = opt.recv_bufsize;
- na->send_bufsize = opt.send_bufsize;
- na->sockopt_flags = opt.sockopt_flags;
- na->packet_mark = opt.packet_mark;
- na->packet_tos = opt.packet_tos;
- na->etype = upgraded_etype;
- na->backdoor = opt.backdoor;
+ na->recv_bufsize = opt.recv_bufsize;
+ na->send_bufsize = opt.send_bufsize;
+ na->sockopt_flags = opt.sockopt_flags;
+ na->packet_mark = opt.packet_mark;
+ na->packet_tos = opt.packet_tos;
+ na->etype = upgraded_etype;
+ na->backdoor = opt.backdoor;
if (na->callback_on_open)
na->mutex = cont->mutex;
if (opt.frequent_accept) { // true
@@ -197,8 +197,8 @@ UnixNetProcessor::accept_internal(Continuation *cont, int fd, AcceptOptions cons
Action *
UnixNetProcessor::connect_re_internal(Continuation *cont, sockaddr const *target, NetVCOptions *opt)
{
- ProxyMutex *mutex = cont->mutex;
- EThread *t = mutex->thread_holding;
+ ProxyMutex *mutex = cont->mutex;
+ EThread *t = mutex->thread_holding;
UnixNetVConnection *vc = (UnixNetVConnection *)this->allocate_vc(t);
if (opt)
@@ -222,11 +222,11 @@ UnixNetProcessor::connect_re_internal(Continuation *cont, sockaddr const *target
SocksEntry *socksEntry = NULL;
NET_SUM_GLOBAL_DYN_STAT(net_connections_currently_open_stat, 1);
- vc->id = net_next_connection_number();
+ vc->id = net_next_connection_number();
vc->submit_time = Thread::get_hrtime();
vc->setSSLClientConnection(true);
ats_ip_copy(&vc->server_addr, target);
- vc->mutex = cont->mutex;
+ vc->mutex = cont->mutex;
Action *result = &vc->action_;
if (using_socks) {
@@ -235,14 +235,14 @@ UnixNetProcessor::connect_re_internal(Continuation *cont, sockaddr const *target
socksEntry = socksAllocator.alloc();
socksEntry->init(cont->mutex, vc, opt->socks_support, opt->socks_version); /*XXXX remove last two args */
socksEntry->action_ = cont;
- cont = socksEntry;
+ cont = socksEntry;
if (!ats_is_ip(&socksEntry->server_addr)) {
socksEntry->lerrno = ESOCK_NO_SOCK_SERVER_CONN;
socksEntry->free();
return ACTION_RESULT_DONE;
}
ats_ip_copy(&vc->server_addr, &socksEntry->server_addr);
- result = &socksEntry->action_;
+ result = &socksEntry->action_;
vc->action_ = socksEntry;
} else {
Debug("Socks", "Not Using Socks %d \n", socks_conf_stuff->socks_needed);
@@ -310,7 +310,7 @@ struct CheckConnect : public Continuation {
int sl, ret;
socklen_t sz;
if (!action_.cancelled) {
- sz = sizeof(int);
+ sz = sizeof(int);
ret = getsockopt(vc->con.fd, SOL_SOCKET, SO_ERROR, (char *)&sl, &sz);
if (!ret && sl == 0) {
Debug("iocore_net_connect", "connection established");
@@ -320,7 +320,7 @@ struct CheckConnect : public Continuation {
// write_disable(get_NetHandler(this_ethread()), vc);
/* clean up vc fields */
vc->write.vio.nbytes = 0;
- vc->write.vio.op = VIO::NONE;
+ vc->write.vio.op = VIO::NONE;
vc->write.vio.buffer.clear();
action_.continuation->handleEvent(NET_EVENT_OPEN, vc);
@@ -367,7 +367,7 @@ struct CheckConnect : public Continuation {
CheckConnect(ProxyMutex *m = NULL) : Continuation(m), connect_status(-1), recursion(0), timeout(0)
{
SET_HANDLER(&CheckConnect::handle_connect);
- buf = new_empty_MIOBuffer(1);
+ buf = new_empty_MIOBuffer(1);
reader = buf->alloc_reader();
}
@@ -396,14 +396,14 @@ UnixNetProcessor::start(int, size_t)
EventType etype = ET_NET;
netHandler_offset = eventProcessor.allocate(sizeof(NetHandler));
- pollCont_offset = eventProcessor.allocate(sizeof(PollCont));
+ pollCont_offset = eventProcessor.allocate(sizeof(PollCont));
// etype is ET_NET for netProcessor
// and ET_SSL for sslNetProcessor
upgradeEtype(etype);
n_netthreads = eventProcessor.n_threads_for_type[etype];
- netthreads = eventProcessor.eventthread[etype];
+ netthreads = eventProcessor.eventthread[etype];
for (int i = 0; i < n_netthreads; ++i) {
initialize_thread_for_net(netthreads[i]);
extern void initialize_thread_for_http_sessions(EThread * thread, int thread_index);
@@ -470,7 +470,7 @@ UnixNetProcessor::allocate_vc(EThread *t)
}
struct socks_conf_struct *NetProcessor::socks_conf_stuff = NULL;
-int NetProcessor::accept_mss = 0;
+int NetProcessor::accept_mss = 0;
UnixNetProcessor unix_netProcessor;
NetProcessor &netProcessor = unix_netProcessor;
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 59b30bd..441d20e 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -29,10 +29,10 @@
#define STATE_VIO_OFFSET ((uintptr_t) & ((NetState *)0)->vio)
#define STATE_FROM_VIO(_x) ((NetState *)(((char *)(_x)) - STATE_VIO_OFFSET))
-#define disable_read(_vc) (_vc)->read.enabled = 0
+#define disable_read(_vc) (_vc)->read.enabled = 0
#define disable_write(_vc) (_vc)->write.enabled = 0
-#define enable_read(_vc) (_vc)->read.enabled = 1
-#define enable_write(_vc) (_vc)->write.enabled = 1
+#define enable_read(_vc) (_vc)->read.enabled = 1
+#define enable_write(_vc) (_vc)->write.enabled = 1
#ifndef UIO_MAXIOV
#define NET_MAX_IOV 16 // UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
@@ -117,8 +117,8 @@ close_UnixNetVConnection(UnixNetVConnection *vc, EThread *t)
vc->active_timeout = NULL;
}
#else
- vc->next_inactivity_timeout_at = 0;
- vc->next_activity_timeout_at = 0;
+ vc->next_inactivity_timeout_at = 0;
+ vc->next_activity_timeout_at = 0;
#endif
vc->inactivity_timeout_in = 0;
@@ -252,9 +252,9 @@ write_signal_error(NetHandler *nh, UnixNetVConnection *vc, int lerrno)
static void
read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
{
- NetState *s = &vc->read;
+ NetState *s = &vc->read;
ProxyMutex *mutex = thread->mutex;
- int64_t r = 0;
+ int64_t r = 0;
MUTEX_TRY_LOCK_FOR(lock, s->vio.mutex, thread, s->vio._cont);
@@ -296,15 +296,15 @@ read_from_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
if (toread) {
IOBufferBlock *b = buf.writer()->first_write_block();
do {
- niov = 0;
+ niov = 0;
rattempted = 0;
while (b && niov < NET_MAX_IOV) {
int64_t a = b->write_avail();
if (a > 0) {
tiovec[niov].iov_base = b->_end;
- int64_t togo = toread - total_read - rattempted;
+ int64_t togo = toread - total_read - rattempted;
if (a > togo)
- a = togo;
+ a = togo;
tiovec[niov].iov_len = a;
rattempted += a;
niov++;
@@ -426,7 +426,7 @@ write_to_net(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
void
write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
{
- NetState *s = &vc->write;
+ NetState *s = &vc->write;
ProxyMutex *mutex = thread->mutex;
MUTEX_TRY_LOCK_FOR(lock, s->vio.mutex, thread, s->vio._cont);
@@ -483,7 +483,7 @@ write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread)
// Calculate amount to write
int64_t towrite = buf.reader()->read_avail();
if (towrite > ntodo)
- towrite = ntodo;
+ towrite = ntodo;
int signalled = 0;
// signal write ready to allow user to fill the buffer
@@ -629,11 +629,11 @@ UnixNetVConnection::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
Error("do_io_read invoked on closed vc %p, cont %p, nbytes %" PRId64 ", buf %p", this, c, nbytes, buf);
return NULL;
}
- read.vio.op = VIO::READ;
- read.vio.mutex = c ? c->mutex : this->mutex;
- read.vio._cont = c;
- read.vio.nbytes = nbytes;
- read.vio.ndone = 0;
+ read.vio.op = VIO::READ;
+ read.vio.mutex = c ? c->mutex : this->mutex;
+ read.vio._cont = c;
+ read.vio.nbytes = nbytes;
+ read.vio.ndone = 0;
read.vio.vc_server = (VConnection *)this;
if (buf) {
read.vio.buffer.writer_for(buf);
@@ -653,11 +653,11 @@ UnixNetVConnection::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader
Error("do_io_write invoked on closed vc %p, cont %p, nbytes %" PRId64 ", reader %p", this, c, nbytes, reader);
return NULL;
}
- write.vio.op = VIO::WRITE;
- write.vio.mutex = c ? c->mutex : this->mutex;
- write.vio._cont = c;
- write.vio.nbytes = nbytes;
- write.vio.ndone = 0;
+ write.vio.op = VIO::WRITE;
+ write.vio.mutex = c ? c->mutex : this->mutex;
+ write.vio._cont = c;
+ write.vio.nbytes = nbytes;
+ write.vio.ndone = 0;
write.vio.vc_server = (VConnection *)this;
if (reader) {
ink_assert(!owner);
@@ -677,14 +677,14 @@ UnixNetVConnection::do_io_close(int alerrno /* = -1 */)
disable_write(this);
read.vio.buffer.clear();
read.vio.nbytes = 0;
- read.vio.op = VIO::NONE;
- read.vio._cont = NULL;
+ read.vio.op = VIO::NONE;
+ read.vio._cont = NULL;
write.vio.buffer.clear();
write.vio.nbytes = 0;
- write.vio.op = VIO::NONE;
- write.vio._cont = NULL;
+ write.vio.op = VIO::NONE;
+ write.vio._cont = NULL;
- EThread *t = this_ethread();
+ EThread *t = this_ethread();
bool close_inline = !recursion && (!nh || nh->mutex->thread_holding == t);
INK_WRITE_MEMORY_BARRIER;
@@ -708,14 +708,14 @@ UnixNetVConnection::do_io_shutdown(ShutdownHowTo_t howto)
disable_read(this);
read.vio.buffer.clear();
read.vio.nbytes = 0;
- f.shutdown = NET_VC_SHUTDOWN_READ;
+ f.shutdown = NET_VC_SHUTDOWN_READ;
break;
case IO_SHUTDOWN_WRITE:
socketManager.shutdown(((UnixNetVConnection *)this)->con.fd, 1);
disable_write(this);
write.vio.buffer.clear();
write.vio.nbytes = 0;
- f.shutdown = NET_VC_SHUTDOWN_WRITE;
+ f.shutdown = NET_VC_SHUTDOWN_WRITE;
break;
case IO_SHUTDOWN_READWRITE:
socketManager.shutdown(((UnixNetVConnection *)this)->con.fd, 2);
@@ -725,7 +725,7 @@ UnixNetVConnection::do_io_shutdown(ShutdownHowTo_t howto)
read.vio.nbytes = 0;
write.vio.buffer.clear();
write.vio.nbytes = 0;
- f.shutdown = NET_VC_SHUTDOWN_READ | NET_VC_SHUTDOWN_WRITE;
+ f.shutdown = NET_VC_SHUTDOWN_READ | NET_VC_SHUTDOWN_WRITE;
break;
default:
ink_assert(!"not reached");
@@ -775,7 +775,7 @@ UnixNetVConnection::send_OOB(Continuation *cont, char *buf, int len)
return ACTION_RESULT_DONE;
}
if (written > 0 && written < len) {
- u->oob_ptr = new OOB_callback(mutex, this, cont, buf + written, len - written);
+ u->oob_ptr = new OOB_callback(mutex, this, cont, buf + written, len - written);
u->oob_ptr->trigger = mutex->thread_holding->schedule_in_local(u->oob_ptr, HRTIME_MSECONDS(10));
return u->oob_ptr->trigger;
} else {
@@ -783,7 +783,7 @@ UnixNetVConnection::send_OOB(Continuation *cont, char *buf, int len)
// expensive for this
written = -errno;
ink_assert(written == -EAGAIN || written == -ENOTCONN);
- u->oob_ptr = new OOB_callback(mutex, this, cont, buf, len);
+ u->oob_ptr = new OOB_callback(mutex, this, cont, buf, len);
u->oob_ptr->trigger = mutex->thread_holding->schedule_in_local(u->oob_ptr, HRTIME_MSECONDS(10));
return u->oob_ptr->trigger;
}
@@ -949,12 +949,12 @@ UnixNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted,
int64_t r = 0;
// XXX Rather than dealing with the block directly, we should use the IOBufferReader API.
- int64_t offset = buf.reader()->start_offset;
+ int64_t offset = buf.reader()->start_offset;
IOBufferBlock *b = buf.reader()->block;
do {
IOVec tiovec[NET_MAX_IOV];
- int niov = 0;
+ int niov = 0;
int64_t total_written_last = total_written;
while (b && niov < NET_MAX_IOV) {
// check if we have done this block
@@ -962,7 +962,7 @@ UnixNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted,
l -= offset;
if (l <= 0) {
offset = -l;
- b = b->next;
+ b = b->next;
continue;
}
// check if to amount to write exceeds that in this buffer
@@ -973,12 +973,12 @@ UnixNetVConnection::load_buffer_and_write(int64_t towrite, int64_t &wattempted,
break;
total_written += l;
// build an iov entry
- tiovec[niov].iov_len = l;
+ tiovec[niov].iov_len = l;
tiovec[niov].iov_base = b->start() + offset;
niov++;
// on to the next block
offset = 0;
- b = b->next;
+ b = b->next;
}
wattempted = total_written - total_written_last;
if (niov == 1)
@@ -1095,7 +1095,7 @@ UnixNetVConnection::acceptEvent(int event, Event *e)
SET_HANDLER((NetVConnHandler)&UnixNetVConnection::mainEvent);
- nh = get_NetHandler(thread);
+ nh = get_NetHandler(thread);
PollDescriptor *pd = get_PollDescriptor(thread);
if (ep.start(pd, this, EVENTIO_READ | EVENTIO_WRITE) < 0) {
Debug("iocore_net", "acceptEvent : failed EventIO::start\n");
@@ -1154,19 +1154,19 @@ UnixNetVConnection::mainEvent(int event, Event *e)
int signal_event;
Event **signal_timeout;
- Continuation *reader_cont = NULL;
- Continuation *writer_cont = NULL;
+ Continuation *reader_cont = NULL;
+ Continuation *writer_cont = NULL;
ink_hrtime *signal_timeout_at = NULL;
- Event *t = NULL;
- signal_timeout = &t;
+ Event *t = NULL;
+ signal_timeout = &t;
#ifdef INACTIVITY_TIMEOUT
if (e == inactivity_timeout) {
- signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
+ signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
signal_timeout = &inactivity_timeout;
} else {
ink_assert(e == active_timeout);
- signal_event = VC_EVENT_ACTIVE_TIMEOUT;
+ signal_event = VC_EVENT_ACTIVE_TIMEOUT;
signal_timeout = &active_timeout;
}
#else
@@ -1176,17 +1176,17 @@ UnixNetVConnection::mainEvent(int event, Event *e)
// ink_assert(next_inactivity_timeout_at < Thread::get_hrtime());
if (!inactivity_timeout_in || next_inactivity_timeout_at > Thread::get_hrtime())
return EVENT_CONT;
- signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
+ signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
signal_timeout_at = &next_inactivity_timeout_at;
} else {
- signal_event = VC_EVENT_ACTIVE_TIMEOUT;
+ signal_event = VC_EVENT_ACTIVE_TIMEOUT;
signal_timeout_at = &next_activity_timeout_at;
}
#endif
- *signal_timeout = 0;
+ *signal_timeout = 0;
*signal_timeout_at = 0;
- writer_cont = write.vio._cont;
+ writer_cont = write.vio._cont;
if (closed) {
close_UnixNetVConnection(this, thread);
@@ -1210,7 +1210,7 @@ int
UnixNetVConnection::populate(Connection &con_in, Continuation *c, void *arg)
{
this->con.move(con_in);
- this->mutex = c->mutex;
+ this->mutex = c->mutex;
this->thread = this_ethread();
EThread *t = this_ethread();
@@ -1279,9 +1279,9 @@ UnixNetVConnection::connectUp(EThread *t, int fd)
// is only used when setting up the socket.
safe_getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&con.sock_type, &len);
safe_nonblocking(fd);
- con.fd = fd;
+ con.fd = fd;
con.is_connected = true;
- con.is_bound = true;
+ con.is_bound = true;
}
// Must connect after EventIO::Start() to avoid a race condition
@@ -1331,20 +1331,20 @@ UnixNetVConnection::free(EThread *t)
this->mutex.clear();
action_.mutex.clear();
got_remote_addr = 0;
- got_local_addr = 0;
- attributes = 0;
+ got_local_addr = 0;
+ attributes = 0;
read.vio.mutex.clear();
write.vio.mutex.clear();
flags = 0;
SET_CONTINUATION_HANDLER(this, (NetVConnHandler)&UnixNetVConnection::startEvent);
- nh = NULL;
- read.triggered = 0;
- write.triggered = 0;
- read.enabled = 0;
- write.enabled = 0;
- read.vio._cont = NULL;
- write.vio._cont = NULL;
- read.vio.vc_server = NULL;
+ nh = NULL;
+ read.triggered = 0;
+ write.triggered = 0;
+ read.enabled = 0;
+ write.enabled = 0;
+ read.vio._cont = NULL;
+ write.vio._cont = NULL;
+ read.vio.vc_server = NULL;
write.vio.vc_server = NULL;
options.reset();
closed = 0;
@@ -1388,7 +1388,7 @@ UnixNetVConnection::migrateToCurrentThread(Continuation *cont, EThread *t)
Connection hold_con;
hold_con.move(this->con);
SSLNetVConnection *sslvc = dynamic_cast<SSLNetVConnection *>(this);
- SSL *save_ssl = (sslvc) ? sslvc->ssl : NULL;
+ SSL *save_ssl = (sslvc) ? sslvc->ssl : NULL;
if (save_ssl) {
SSL_set_ex_data(sslvc->ssl, get_ssl_client_data_index(), NULL);
sslvc->ssl = NULL;
diff --git a/iocore/net/UnixUDPConnection.cc b/iocore/net/UnixUDPConnection.cc
index 318e629..bca80b0 100644
--- a/iocore/net/UnixUDPConnection.cc
+++ b/iocore/net/UnixUDPConnection.cc
@@ -42,7 +42,7 @@ UnixUDPConnection::~UnixUDPConnection()
if (p) {
UDPPacketInternal *pnext = NULL;
while (p) {
- pnext = p->alink.next;
+ pnext = p->alink.next;
p->alink.next = NULL;
p->free();
p = pnext;
@@ -83,7 +83,7 @@ UnixUDPConnection::callbackHandler(int event, void *data)
UDPPacketInternal *pnext = NULL;
Queue<UDPPacketInternal> result;
while (p) {
- pnext = p->alink.next;
+ pnext = p->alink.next;
p->alink.next = NULL;
result.push(p);
p = pnext;
@@ -111,14 +111,14 @@ UDPConnection::bindToThread(Continuation *c)
uc->ethread = t;
AddRef();
uc->continuation = c;
- mutex = c->mutex;
+ mutex = c->mutex;
ink_atomiclist_push(&get_UDPNetHandler(t)->udpNewConnections, uc);
}
Action *
UDPConnection::send(Continuation *c, UDPPacket *xp)
{
- UDPPacketInternal *p = (UDPPacketInternal *)xp;
+ UDPPacketInternal *p = (UDPPacketInternal *)xp;
UnixUDPConnection *conn = (UnixUDPConnection *)this;
if (shouldDestroy()) {
@@ -132,7 +132,7 @@ UDPConnection::send(Continuation *c, UDPPacket *xp)
p->setConnection(this);
conn->continuation = c;
ink_assert(conn->continuation != NULL);
- mutex = c->mutex;
+ mutex = c->mutex;
p->reqGenerationNum = conn->sendGenerationNum;
get_UDPNetHandler(conn->ethread)->udpOutQueue.send(p);
return ACTION_RESULT_NONE;
diff --git a/iocore/net/UnixUDPNet.cc b/iocore/net/UnixUDPNet.cc
index a17d46c..039dbb3 100644
--- a/iocore/net/UnixUDPNet.cc
+++ b/iocore/net/UnixUDPNet.cc
@@ -95,7 +95,7 @@ UDPNetProcessorInternal::start(int n_upd_threads, size_t stacksize)
if (ET_UDP < 0) // Probably can't happen, maybe at some point EventType should be unsigned ?
return -1;
- pollCont_offset = eventProcessor.allocate(sizeof(PollCont));
+ pollCont_offset = eventProcessor.allocate(sizeof(PollCont));
udpNetHandler_offset = eventProcessor.allocate(sizeof(UDPNetHandler));
for (int i = 0; i < eventProcessor.n_threads_for_type[ET_UDP]; i++)
@@ -121,7 +121,7 @@ UDPNetProcessorInternal::udp_read_from_net(UDPNetHandler *nh, UDPConnection *xuc
// which gets referenced by IOBufferBlock.
char buf[65536];
int buflen = sizeof(buf);
- r = socketManager.recvfrom(uc->getFd(), buf, buflen, 0, (struct sockaddr *)&fromaddr, &fromlen);
+ r = socketManager.recvfrom(uc->getFd(), buf, buflen, 0, (struct sockaddr *)&fromaddr, &fromlen);
if (r <= 0) {
// error
break;
@@ -253,16 +253,16 @@ UDPReadContinuation::free(void)
{
ink_assert(event != NULL);
completionUtil::destroy(event);
- event = NULL;
- readbuf = NULL;
- readlen = 0;
- fromaddrlen = 0;
- fd = -1;
- ifd = -1;
- period = 0;
- elapsed_time = 0;
+ event = NULL;
+ readbuf = NULL;
+ readlen = 0;
+ fromaddrlen = 0;
+ fd = -1;
+ ifd = -1;
+ period = 0;
+ elapsed_time = 0;
timeout_interval = 0;
- mutex = NULL;
+ mutex = NULL;
udpReadContAllocator.free(this);
}
@@ -281,10 +281,10 @@ inline void
UDPReadContinuation::init_read(int rfd, IOBufferBlock *buf, int len, struct sockaddr *fromaddr_, socklen_t *fromaddrlen_)
{
ink_assert(rfd >= 0 && buf != NULL && fromaddr_ != NULL && fromaddrlen_ != NULL);
- fd = rfd;
- readbuf = buf;
- readlen = len;
- fromaddr = ats_ip6_cast(fromaddr_);
+ fd = rfd;
+ readbuf = buf;
+ readlen = len;
+ fromaddr = ats_ip6_cast(fromaddr_);
fromaddrlen = fromaddrlen_;
SET_HANDLER(&UDPReadContinuation::readPollEvent);
period = -HRTIME_MSECONDS(net_event_period);
@@ -313,16 +313,16 @@ UDPReadContinuation::setupPollDescriptor()
{
#if TS_USE_EPOLL
Pollfd *pfd;
- EThread *et = (EThread *)this_thread();
+ EThread *et = (EThread *)this_thread();
PollCont *pc = get_PollCont(et);
if (pc->nextPollDescriptor == NULL) {
pc->nextPollDescriptor = new PollDescriptor();
}
- pfd = pc->nextPollDescriptor->alloc();
+ pfd = pc->nextPollDescriptor->alloc();
pfd->fd = fd;
- ifd = pfd - pc->nextPollDescriptor->pfd;
+ ifd = pfd - pc->nextPollDescriptor->pfd;
ink_assert(pc->nextPollDescriptor->nfds > ifd);
- pfd->events = POLLIN;
+ pfd->events = POLLIN;
pfd->revents = 0;
#endif
}
@@ -362,7 +362,7 @@ UDPReadContinuation::readPollEvent(int event_, Event *e)
c = completionUtil::getContinuation(event);
// do read
socklen_t tmp_fromlen = *fromaddrlen;
- int rlen = socketManager.recvfrom(fd, readbuf->end(), readlen, 0, ats_ip_sa_cast(fromaddr), &tmp_fromlen);
+ int rlen = socketManager.recvfrom(fd, readbuf->end(), readlen, 0, ats_ip_sa_cast(fromaddr), &tmp_fromlen);
completionUtil::setThread(event, e->ethread);
// call back user with their event
@@ -551,7 +551,7 @@ UDPNetProcessor::CreateUDPSocket(int *resfd, sockaddr const *remote_addr, sockad
Debug("udpnet", "CreateUdpsocket: getsockname didnt' work");
goto HardError;
}
- *resfd = fd;
+ *resfd = fd;
*status = NULL;
Debug("udpnet", "creating a udp socket port = %d, %d---success", ats_ip_port_host_order(remote_addr),
ats_ip_port_host_order(local_addr));
@@ -560,14 +560,14 @@ SoftError:
Debug("udpnet", "creating a udp socket port = %d---soft failure", ats_ip_port_host_order(local_addr));
if (fd != -1)
socketManager.close(fd);
- *resfd = -1;
+ *resfd = -1;
*status = NULL;
return false;
HardError:
Debug("udpnet", "creating a udp socket port = %d---hard failure", ats_ip_port_host_order(local_addr));
if (fd != -1)
socketManager.close(fd);
- *resfd = -1;
+ *resfd = -1;
*status = ACTION_IO_ERROR;
return false;
}
@@ -575,8 +575,8 @@ HardError:
Action *
UDPNetProcessor::UDPBind(Continuation *cont, sockaddr const *addr, int send_bufsize, int recv_bufsize)
{
- int res = 0;
- int fd = -1;
+ int res = 0;
+ int fd = -1;
UnixUDPConnection *n = NULL;
IpEndpoint myaddr;
int myaddr_len = sizeof(myaddr);
@@ -642,7 +642,7 @@ void
UDPQueue::service(UDPNetHandler *nh)
{
(void)nh;
- ink_hrtime now = Thread::get_hrtime_updated();
+ ink_hrtime now = Thread::get_hrtime_updated();
uint64_t timeSpent = 0;
uint64_t pktSendStartTime;
UDPPacketInternal *p;
@@ -654,7 +654,7 @@ UDPQueue::service(UDPNetHandler *nh)
Queue<UDPPacketInternal> stk;
while (p) {
- pnext = p->alink.next;
+ pnext = p->alink.next;
p->alink.next = NULL;
stk.push(p);
p = pnext;
@@ -670,11 +670,11 @@ UDPQueue::service(UDPNetHandler *nh)
if (p->conn->lastPktStartTime == 0) {
pktSendStartTime = MAX(now, p->delivery_time);
} else {
- pktSendTime = p->delivery_time;
+ pktSendTime = p->delivery_time;
pktSendStartTime = MAX(MAX(now, pktSendTime), p->delivery_time);
}
p->conn->lastPktStartTime = pktSendStartTime;
- p->delivery_time = pktSendStartTime;
+ p->delivery_time = pktSendStartTime;
pipeInfo.addPacket(p, now);
}
@@ -686,8 +686,8 @@ UDPQueue::service(UDPNetHandler *nh)
timeSpent = ink_hrtime_to_msec(now - last_report);
if (timeSpent > 10000) {
last_report = now;
- added = 0;
- packets = 0;
+ added = 0;
+ packets = 0;
}
last_service = now;
}
@@ -697,8 +697,8 @@ UDPQueue::SendPackets()
{
UDPPacketInternal *p;
static ink_hrtime lastCleanupTime = Thread::get_hrtime_updated();
- ink_hrtime now = Thread::get_hrtime_updated();
- ink_hrtime send_threshold_time = now + SLOT_TIME;
+ ink_hrtime now = Thread::get_hrtime_updated();
+ ink_hrtime send_threshold_time = now + SLOT_TIME;
int32_t bytesThisSlot = INT_MAX, bytesUsed = 0;
int32_t bytesThisPipe, sentOne;
int64_t pktLen;
@@ -706,11 +706,11 @@ UDPQueue::SendPackets()
bytesThisSlot = INT_MAX;
sendPackets:
- sentOne = false;
+ sentOne = false;
bytesThisPipe = (int32_t)bytesThisSlot;
while ((bytesThisPipe > 0) && (pipeInfo.firstPacket(send_threshold_time))) {
- p = pipeInfo.getFirstPacket();
+ p = pipeInfo.getFirstPacket();
pktLen = p->getPktLength();
if (p->conn->shouldDestroy())
@@ -759,21 +759,21 @@ UDPQueue::SendUDPPacket(UDPPacketInternal *p, int32_t /* pktLen ATS_UNUSED */)
Debug("udp-send", "Sending %p", p);
#if !defined(solaris)
- msg.msg_control = 0;
+ msg.msg_control = 0;
msg.msg_controllen = 0;
- msg.msg_flags = 0;
+ msg.msg_flags = 0;
#endif
- msg.msg_name = (caddr_t)&p->to;
+ msg.msg_name = (caddr_t)&p->to;
msg.msg_namelen = sizeof(p->to);
- iov_len = 0;
+ iov_len = 0;
for (b = p->chain; b != NULL; b = b->next) {
iov[iov_len].iov_base = (caddr_t)b->start();
- iov[iov_len].iov_len = b->size();
+ iov[iov_len].iov_len = b->size();
real_len += iov[iov_len].iov_len;
iov_len++;
}
- msg.msg_iov = iov;
+ msg.msg_iov = iov;
msg.msg_iovlen = iov_len;
count = 0;
diff --git a/iocore/net/test_I_Net.cc b/iocore/net/test_I_Net.cc
index 08b3fb0..d687ca2 100644
--- a/iocore/net/test_I_Net.cc
+++ b/iocore/net/test_I_Net.cc
@@ -65,7 +65,7 @@ main()
#ifdef USE_SOCKS
net_config_socks_server_host = "209.131.52.54";
net_config_socks_server_port = 1080;
- net_config_socks_needed = 1;
+ net_config_socks_needed = 1;
#endif
netProcessor.start();
diff --git a/iocore/net/test_P_Net.cc b/iocore/net/test_P_Net.cc
index e338842..5bf9c68 100644
--- a/iocore/net/test_P_Net.cc
+++ b/iocore/net/test_P_Net.cc
@@ -36,8 +36,8 @@ struct NetTesterSM : public Continuation {
ink_release_assert(lock);
vc = _vc;
SET_HANDLER(&NetTesterSM::handle_read);
- buf = new_MIOBuffer(8);
- reader = buf->alloc_reader();
+ buf = new_MIOBuffer(8);
+ reader = buf->alloc_reader();
read_vio = vc->do_io_read(this, INT64_MAX, buf);
}
@@ -48,7 +48,7 @@ struct NetTesterSM : public Continuation {
char *str;
switch (event) {
case VC_EVENT_READ_READY:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
printf("%s", str);
@@ -57,7 +57,7 @@ struct NetTesterSM : public Continuation {
case VC_EVENT_READ_COMPLETE:
/* FALLSTHROUGH */
case VC_EVENT_EOS:
- r = reader->read_avail();
+ r = reader->read_avail();
str = new char[r + 10];
reader->read(str, r);
printf("%s", str);
diff --git a/iocore/net/test_certlookup.cc b/iocore/net/test_certlookup.cc
index 3989a81..129a173 100644
--- a/iocore/net/test_certlookup.cc
+++ b/iocore/net/test_certlookup.cc
@@ -39,11 +39,11 @@ REGRESSION_TEST(SSLCertificateLookup)(RegressionTest *t, int /* atype ATS_UNUSED
TestBox box(t, pstatus);
SSLCertLookup lookup;
- SSL_CTX *wild = SSL_CTX_new(SSLv23_server_method());
- SSL_CTX *notwild = SSL_CTX_new(SSLv23_server_method());
+ SSL_CTX *wild = SSL_CTX_new(SSLv23_server_method());
+ SSL_CTX *notwild = SSL_CTX_new(SSLv23_server_method());
SSL_CTX *b_notwild = SSL_CTX_new(SSLv23_server_method());
- SSL_CTX *foo = SSL_CTX_new(SSLv23_server_method());
- SSL_CTX *all_com = SSL_CTX_new(SSLv23_server_method());
+ SSL_CTX *foo = SSL_CTX_new(SSLv23_server_method());
+ SSL_CTX *all_com = SSL_CTX_new(SSLv23_server_method());
SSLCertContext wild_cc(wild);
SSLCertContext notwild_cc(notwild);
SSLCertContext b_notwild_cc(b_notwild);
@@ -111,18 +111,18 @@ REGRESSION_TEST(SSLAddressLookup)(RegressionTest *t, int /* atype ATS_UNUSED */,
IpEndpoint ip4p;
} endpoint;
- context.ip6 = SSL_CTX_new(SSLv23_server_method());
+ context.ip6 = SSL_CTX_new(SSLv23_server_method());
context.ip6p = SSL_CTX_new(SSLv23_server_method());
- context.ip4 = SSL_CTX_new(SSLv23_server_method());
+ context.ip4 = SSL_CTX_new(SSLv23_server_method());
context.ip4p = SSL_CTX_new(SSLv23_server_method());
SSLCertContext ip6_cc(context.ip6);
SSLCertContext ip6p_cc(context.ip6p);
SSLCertContext ip4_cc(context.ip4);
SSLCertContext ip4p_cc(context.ip4p);
- endpoint.ip6 = make_endpoint("fe80::7ed1:c3ff:fe90:2582");
+ endpoint.ip6 = make_endpoint("fe80::7ed1:c3ff:fe90:2582");
endpoint.ip6p = make_endpoint("[fe80::7ed1:c3ff:fe90:2582]:80");
- endpoint.ip4 = make_endpoint("10.0.0.5");
+ endpoint.ip4 = make_endpoint("10.0.0.5");
endpoint.ip4p = make_endpoint("10.0.0.5:80");
box = REGRESSION_TEST_PASSED;
@@ -207,7 +207,7 @@ int
main(int argc, const char **argv)
{
BaseLogFile *blf = new BaseLogFile("stdout");
- diags = new Diags(NULL, NULL, blf);
+ diags = new Diags(NULL, NULL, blf);
res_track_memory = 1;
SSL_library_init();
diff --git a/iocore/utils/I_Machine.h b/iocore/utils/I_Machine.h
index e74a43b..e43400f 100644
--- a/iocore/utils/I_Machine.h
+++ b/iocore/utils/I_Machine.h
@@ -71,8 +71,8 @@ struct Machine {
@note This must be called before called @c instance so that the
singleton is not @em inadvertently default initialized.
*/
- static self *init(char const *name = 0, ///< Host name of the machine.
- sockaddr const *addr = 0 ///< Primary IP adddress of the machine.
+ static self *init(char const *name = 0, ///< Host name of the machine.
+ sockaddr const *addr = 0 ///< Primary IP adddress of the machine.
);
/// @return The global instance of this class.
static self *instance();
diff --git a/iocore/utils/Machine.cc b/iocore/utils/Machine.cc
index 403a124..9b2695b 100644
--- a/iocore/utils/Machine.cc
+++ b/iocore/utils/Machine.cc
@@ -55,7 +55,7 @@ Machine::Machine(char const *the_hostname, sockaddr const *addr)
char localhost[1024];
int status; // return for system calls.
- ip_string[0] = 0;
+ ip_string[0] = 0;
ip_hex_string[0] = 0;
ink_zero(ip);
ink_zero(ip4);
@@ -72,7 +72,7 @@ Machine::Machine(char const *the_hostname, sockaddr const *addr)
#if HAVE_IFADDRS_H
ifaddrs *ifa_addrs = 0;
- status = getifaddrs(&ifa_addrs);
+ status = getifaddrs(&ifa_addrs);
#else
int s = socket(AF_INET, SOCK_DGRAM, 0);
// This number is hard to determine, but needs to be much larger than
@@ -85,7 +85,7 @@ Machine::Machine(char const *the_hostname, sockaddr const *addr)
if (0 <= s) {
conf.ifc_len = sizeof(req);
conf.ifc_req = req;
- status = ioctl(s, SIOCGIFCONF, &conf);
+ status = ioctl(s, SIOCGIFCONF, &conf);
} else {
status = -1;
}
@@ -114,7 +114,7 @@ Machine::Machine(char const *the_hostname, sockaddr const *addr)
#endif
) {
#if HAVE_IFADDRS_H
- ifip = spot->ifa_addr;
+ ifip = spot->ifa_addr;
ifflags = spot->ifa_flags;
#else
ifip = &spot->ifr_addr;
@@ -189,7 +189,7 @@ Machine::Machine(char const *the_hostname, sockaddr const *addr)
hostname_len = hostname ? strlen(hostname) : 0;
ats_ip_ntop(&ip.sa, ip_string, sizeof(ip_string));
- ip_string_len = strlen(ip_string);
+ ip_string_len = strlen(ip_string);
ip_hex_string_len = ats_ip_to_hex(&ip.sa, ip_hex_string, sizeof(ip_hex_string));
}
diff --git a/iocore/utils/OneWayMultiTunnel.cc b/iocore/utils/OneWayMultiTunnel.cc
index fc28305..9b7f5a1 100644
--- a/iocore/utils/OneWayMultiTunnel.cc
+++ b/iocore/utils/OneWayMultiTunnel.cc
@@ -63,11 +63,11 @@ OneWayMultiTunnel::init(VConnection *vcSource, VConnection **vcTargets, int n_vc
bool aclose_targets, /* = false */
Transform_fn aManipulate_fn, int water_mark)
{
- mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
- cont = aCont;
- manipulate_fn = aManipulate_fn;
- close_source = aclose_source;
- close_target = aclose_targets;
+ mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
+ cont = aCont;
+ manipulate_fn = aManipulate_fn;
+ close_source = aclose_source;
+ close_target = aclose_targets;
source_read_previously_completed = false;
SET_HANDLER(&OneWayMultiTunnel::startEvent);
@@ -98,7 +98,7 @@ OneWayMultiTunnel::init(VConnection *vcSource, VConnection **vcTargets, int n_vc
vioSource = vcSource->do_io(VIO::READ, this, nbytes, buf1, 0);
ink_assert(n_vcTargets <= ONE_WAY_MULTI_TUNNEL_LIMIT);
- for (int i = 0; i < n_vcTargets; i++)
+ for (int i = 0; i < n_vcTargets; i++)
vioTargets[i] = vcTargets[i]->do_io(VIO::WRITE, this, INT64_MAX, buf2, 0);
return;
@@ -108,8 +108,8 @@ void
OneWayMultiTunnel::init(Continuation *aCont, VIO *SourceVio, VIO **TargetVios, int n_TargetVios, bool aclose_source,
bool aclose_targets)
{
- mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
- cont = aCont;
+ mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
+ cont = aCont;
single_buffer = true;
manipulate_fn = 0;
n_connections = n_TargetVios + 1;
@@ -120,8 +120,8 @@ OneWayMultiTunnel::init(Continuation *aCont, VIO *SourceVio, VIO **TargetVios, i
// we still need to write data into the target buffers. Note this
// fact as we'll not get a VC_EVENT_READ_COMPLETE callback later.
source_read_previously_completed = (SourceVio->ntodo() == 0);
- tunnel_till_done = true;
- n_vioTargets = n_TargetVios;
+ tunnel_till_done = true;
+ n_vioTargets = n_TargetVios;
topOutBuffer.writer_for(SourceVio->buffer.writer());
// do_io_read() read already posted on vcSource.
@@ -146,8 +146,8 @@ OneWayMultiTunnel::init(Continuation *aCont, VIO *SourceVio, VIO **TargetVios, i
int
OneWayMultiTunnel::startEvent(int event, void *data)
{
- VIO *vio = (VIO *)data;
- int ret = VC_EVENT_DONE;
+ VIO *vio = (VIO *)data;
+ int ret = VC_EVENT_DONE;
int result = 0;
#ifdef TEST
diff --git a/iocore/utils/OneWayTunnel.cc b/iocore/utils/OneWayTunnel.cc
index d286a57..5663f38 100644
--- a/iocore/utils/OneWayTunnel.cc
+++ b/iocore/utils/OneWayTunnel.cc
@@ -126,14 +126,14 @@ OneWayTunnel::init(VConnection *vcSource, VConnection *vcTarget, Continuation *a
int64_t nbytes, bool asingle_buffer, bool aclose_source, bool aclose_target, Transform_fn aManipulate_fn,
int water_mark)
{
- mutex = aCont ? (ProxyMutex *)aCont->mutex : (aMutex ? aMutex : new_ProxyMutex());
- cont = aMutex ? NULL : aCont;
- single_buffer = asingle_buffer;
- manipulate_fn = aManipulate_fn;
- n_connections = 2;
- close_source = aclose_source;
- close_target = aclose_target;
- lerrno = 0;
+ mutex = aCont ? (ProxyMutex *)aCont->mutex : (aMutex ? aMutex : new_ProxyMutex());
+ cont = aMutex ? NULL : aCont;
+ single_buffer = asingle_buffer;
+ manipulate_fn = aManipulate_fn;
+ n_connections = 2;
+ close_source = aclose_source;
+ close_target = aclose_target;
+ lerrno = 0;
tunnel_till_done = (nbytes == TUNNEL_TILL_DONE);
SET_HANDLER(&OneWayTunnel::startEvent);
@@ -170,13 +170,13 @@ OneWayTunnel::init(VConnection *vcSource, VConnection *vcTarget, Continuation *a
bool aclose_source, bool aclose_target)
{
(void)vcSource;
- mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
- cont = aCont;
- single_buffer = true;
- manipulate_fn = 0;
- n_connections = 2;
- close_source = aclose_source;
- close_target = aclose_target;
+ mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
+ cont = aCont;
+ single_buffer = true;
+ manipulate_fn = 0;
+ n_connections = 2;
+ close_source = aclose_source;
+ close_target = aclose_target;
tunnel_till_done = true;
// Prior to constructing the OneWayTunnel, we initiated a do_io(VIO::READ)
@@ -196,13 +196,13 @@ OneWayTunnel::init(VConnection *vcSource, VConnection *vcTarget, Continuation *a
void
OneWayTunnel::init(Continuation *aCont, VIO *SourceVio, VIO *TargetVio, bool aclose_source, bool aclose_target)
{
- mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
- cont = aCont;
- single_buffer = true;
- manipulate_fn = 0;
- n_connections = 2;
- close_source = aclose_source;
- close_target = aclose_target;
+ mutex = aCont ? (ProxyMutex *)aCont->mutex : new_ProxyMutex();
+ cont = aCont;
+ single_buffer = true;
+ manipulate_fn = 0;
+ n_connections = 2;
+ close_source = aclose_source;
+ close_target = aclose_target;
tunnel_till_done = true;
// do_io_read() read already posted on vcSource.
@@ -238,8 +238,8 @@ OneWayTunnel::transform(MIOBufferAccessor &in_buf, MIOBufferAccessor &out_buf)
int
OneWayTunnel::startEvent(int event, void *data)
{
- VIO *vio = (VIO *)data;
- int ret = VC_EVENT_DONE;
+ VIO *vio = (VIO *)data;
+ int ret = VC_EVENT_DONE;
int result = 0;
#ifdef TEST
@@ -257,7 +257,7 @@ OneWayTunnel::startEvent(int event, void *data)
/* This event is sent out by our peer */
ink_assert(tunnel_peer);
tunnel_peer = NULL;
- free_vcs = false;
+ free_vcs = false;
goto Ldone;
case VC_EVENT_READ_READY:
diff --git a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
index 968bb3a..1c4367c 100644
--- a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
+++ b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
@@ -102,7 +102,7 @@ public:
// we'll add some custom headers for this request
AsyncHttpFetch2 *provider2 = new AsyncHttpFetch2("http://127.0.0.1/");
- Headers &request_headers = provider2->getRequestHeaders();
+ Headers &request_headers = provider2->getRequestHeaders();
request_headers.set("Header1", "Value1");
request_headers.set("Header2", "Value2");
Async::execute<AsyncHttpFetch2>(this, provider2, getMutex());
diff --git a/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc b/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc
index 6d29f1d..dd58c0f 100644
--- a/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc
+++ b/lib/atscppapi/examples/async_http_fetch_streaming/AsyncHttpFetchStreaming.cc
@@ -109,7 +109,7 @@ void
Intercept::handleAsyncComplete(AsyncHttpFetch &async_http_fetch)
{
AsyncHttpFetch::Result result = async_http_fetch.getResult();
- string url = async_http_fetch.getRequestUrl().getUrlString();
+ string url = async_http_fetch.getRequestUrl().getUrlString();
if (result == AsyncHttpFetch::RESULT_HEADER_COMPLETE) {
TS_DEBUG(TAG, "Header completed for URL [%s]", url.c_str());
const Response &response = async_http_fetch.getResponse();
diff --git a/lib/atscppapi/examples/async_timer/AsyncTimer.cc b/lib/atscppapi/examples/async_timer/AsyncTimer.cc
index 1da4642..2e371af 100644
--- a/lib/atscppapi/examples/async_timer/AsyncTimer.cc
+++ b/lib/atscppapi/examples/async_timer/AsyncTimer.cc
@@ -60,17 +60,17 @@ void
TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED)
{
RegisterGlobalPlugin("CPP_Example_AsyncTimer", "apache", "dev@trafficserver.apache.org");
- int period_in_ms = 1000;
+ int period_in_ms = 1000;
TimerEventReceiver *timer1 = new TimerEventReceiver(AsyncTimer::TYPE_PERIODIC, period_in_ms);
TS_DEBUG(TAG, "Created periodic timer %p with initial period 0, regular period %d and max instances 0", timer1, period_in_ms);
- int initial_period_in_ms = 100;
+ int initial_period_in_ms = 100;
TimerEventReceiver *timer2 = new TimerEventReceiver(AsyncTimer::TYPE_PERIODIC, period_in_ms, initial_period_in_ms);
TS_DEBUG(TAG, "Created periodic timer %p with initial period %d, regular period %d and max instances 0", timer2,
initial_period_in_ms, period_in_ms);
- initial_period_in_ms = 200;
- int max_instances = 10;
+ initial_period_in_ms = 200;
+ int max_instances = 10;
TimerEventReceiver *timer3 = new TimerEventReceiver(AsyncTimer::TYPE_PERIODIC, period_in_ms, initial_period_in_ms, max_instances);
TS_DEBUG(TAG, "Created periodic timer %p with initial period %d, regular period %d and max instances %d", timer3,
initial_period_in_ms, period_in_ms, max_instances);
@@ -79,7 +79,7 @@ TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED)
TS_DEBUG(TAG, "Created one-off timer %p with period %d", timer4, period_in_ms);
initial_period_in_ms = 0;
- max_instances = 5;
+ max_instances = 5;
TimerEventReceiver *timer5 =
new TimerEventReceiver(AsyncTimer::TYPE_PERIODIC, period_in_ms, initial_period_in_ms, max_instances, true /* cancel */);
TS_DEBUG(TAG, "Created canceling timer %p with initial period %d, regular period %d and max instances %d", timer5,
diff --git a/lib/atscppapi/examples/clientrequest/ClientRequest.cc b/lib/atscppapi/examples/clientrequest/ClientRequest.cc
index 449df73..64847ec 100644
--- a/lib/atscppapi/examples/clientrequest/ClientRequest.cc
+++ b/lib/atscppapi/examples/clientrequest/ClientRequest.cc
@@ -44,7 +44,7 @@ public:
cout << "Hello from handleReadRequesHeadersPreRemap!" << endl;
ClientRequest &client_request = transaction.getClientRequest();
- Url &request_url = client_request.getUrl();
+ Url &request_url = client_request.getUrl();
cout << "Method is " << HTTP_METHOD_STRINGS[client_request.getMethod()] << endl;
cout << "Version is " << HTTP_VERSION_STRINGS[client_request.getVersion()] << endl;
@@ -68,8 +68,8 @@ public:
{
cout << "Hello from handleReadRequesHeadersPostRemap!" << endl;
- ClientRequest &client_request = transaction.getClientRequest();
- Url &request_url = client_request.getUrl();
+ ClientRequest &client_request = transaction.getClientRequest();
+ Url &request_url = client_request.getUrl();
const Url &pristine_request_url = client_request.getPristineUrl();
cout << "--------------------PRISTINE-----------------------" << endl;
diff --git a/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc b/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc
index b9f80b2..4c5fce8 100644
--- a/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc
+++ b/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc
@@ -62,8 +62,8 @@ public:
}
enum ContentType {
- UNKNOWN = 0,
- TEXT_HTML = 1,
+ UNKNOWN = 0,
+ TEXT_HTML = 1,
TEXT_PLAIN = 2,
};
diff --git a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
index 08c6947..6d6af28 100644
--- a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
+++ b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
@@ -53,8 +53,8 @@ public:
return RESULT_ERROR;
}
const string &remap = query_params["remap"];
- bool stop = (query_params["stop"] == "true");
- Result result = stop ? RESULT_NO_REMAP_STOP : RESULT_NO_REMAP;
+ bool stop = (query_params["stop"] == "true");
+ Result result = stop ? RESULT_NO_REMAP_STOP : RESULT_NO_REMAP;
if (remap == "true") {
const string &path = query_params["path"];
if (path.size()) {
diff --git a/lib/atscppapi/src/AsyncHttpFetch.cc b/lib/atscppapi/src/AsyncHttpFetch.cc
index 01344a9..b5f6622 100644
--- a/lib/atscppapi/src/AsyncHttpFetch.cc
+++ b/lib/atscppapi/src/AsyncHttpFetch.cc
@@ -88,14 +88,14 @@ struct atscppapi::AsyncHttpFetchState : noncopyable {
namespace
{
const unsigned int LOCAL_IP_ADDRESS = 0x0100007f;
-const int LOCAL_PORT = 8080;
+const int LOCAL_PORT = 8080;
static int
handleFetchEvents(TSCont cont, TSEvent event, void *edata)
{
LOG_DEBUG("Received fetch event = %d, edata = %p", event, edata);
AsyncHttpFetch *fetch_provider = static_cast<AsyncHttpFetch *>(TSContDataGet(cont));
- AsyncHttpFetchState *state = utils::internal::getAsyncHttpFetchState(*fetch_provider);
+ AsyncHttpFetchState *state = utils::internal::getAsyncHttpFetchState(*fetch_provider);
if (state->streaming_flag_ == AsyncHttpFetch::STREAMING_DISABLED) {
if (event == static_cast<int>(AsyncHttpFetch::RESULT_SUCCESS)) {
@@ -104,14 +104,14 @@ handleFetchEvents(TSCont cont, TSEvent event, void *edata)
const char *data_start = TSFetchRespGet(txn, &data_len);
if (data_start && (data_len > 0)) {
const char *data_end = data_start + data_len;
- TSHttpParser parser = TSHttpParserCreate();
- state->hdr_buf_ = TSMBufferCreate();
- state->hdr_loc_ = TSHttpHdrCreate(state->hdr_buf_);
+ TSHttpParser parser = TSHttpParserCreate();
+ state->hdr_buf_ = TSMBufferCreate();
+ state->hdr_loc_ = TSHttpHdrCreate(state->hdr_buf_);
TSHttpHdrTypeSet(state->hdr_buf_, state->hdr_loc_, TS_HTTP_TYPE_RESPONSE);
if (TSHttpHdrParseResp(parser, state->hdr_buf_, state->hdr_loc_, &data_start, data_end) == TS_PARSE_DONE) {
TSHttpStatus status = TSHttpHdrStatusGet(state->hdr_buf_, state->hdr_loc_);
- state->body_ = data_start; // data_start will now be pointing to body
- state->body_size_ = data_end - data_start;
+ state->body_ = data_start; // data_start will now be pointing to body
+ state->body_size_ = data_end - data_start;
utils::internal::initResponse(state->response_, state->hdr_buf_, state->hdr_loc_);
LOG_DEBUG("Fetch result had a status code of %d with a body length of %ld", status, state->body_size_);
} else {
@@ -189,9 +189,9 @@ AsyncHttpFetch::run()
TSContDataSet(fetchCont, static_cast<void *>(this)); // Providers have to clean themselves up when they are done.
struct sockaddr_in addr;
- addr.sin_family = AF_INET;
+ addr.sin_family = AF_INET;
addr.sin_addr.s_addr = LOCAL_IP_ADDRESS;
- addr.sin_port = LOCAL_PORT;
+ addr.sin_port = LOCAL_PORT;
Headers &headers = state_->request_->getHeaders();
if (headers.size()) {
@@ -232,7 +232,7 @@ AsyncHttpFetch::run()
string header_value;
for (Headers::iterator iter = headers.begin(), end = headers.end(); iter != end; ++iter) {
HeaderFieldName header_name = (*iter).name();
- header_value = (*iter).values();
+ header_value = (*iter).values();
TSFetchHeaderAdd(state_->fetch_sm_, header_name.c_str(), header_name.length(), header_value.data(), header_value.size());
}
LOG_DEBUG("Launching streaming fetch");
@@ -277,7 +277,7 @@ AsyncHttpFetch::getResponse() const
void
AsyncHttpFetch::getResponseBody(const void *&body, size_t &body_size) const
{
- body = state_->body_;
+ body = state_->body_;
body_size = state_->body_size_;
}
diff --git a/lib/atscppapi/src/AsyncTimer.cc b/lib/atscppapi/src/AsyncTimer.cc
index 1e40a02..f04a204 100644
--- a/lib/atscppapi/src/AsyncTimer.cc
+++ b/lib/atscppapi/src/AsyncTimer.cc
@@ -69,7 +69,7 @@ handleTimerEvent(TSCont cont, TSEvent event, void *edata)
AsyncTimer::AsyncTimer(Type type, int period_in_ms, int initial_period_in_ms)
{
- state_ = new AsyncTimerState(type, period_in_ms, initial_period_in_ms, this);
+ state_ = new AsyncTimerState(type, period_in_ms, initial_period_in_ms, this);
state_->cont_ = TSContCreate(handleTimerEvent, TSMutexCreate());
TSContDataSet(state_->cont_, static_cast<void *>(state_));
}
@@ -78,8 +78,8 @@ void
AsyncTimer::run()
{
state_->dispatch_controller_ = getDispatchController(); // keep a copy in state so that cont handler can use it
- int one_off_timeout_in_ms = 0;
- int regular_timeout_in_ms = 0;
+ int one_off_timeout_in_ms = 0;
+ int regular_timeout_in_ms = 0;
if (state_->type_ == AsyncTimer::TYPE_ONE_OFF) {
one_off_timeout_in_ms = state_->period_in_ms_;
} else {
diff --git a/lib/atscppapi/src/GlobalPlugin.cc b/lib/atscppapi/src/GlobalPlugin.cc
index fe1bf8f..5d3f1ee 100644
--- a/lib/atscppapi/src/GlobalPlugin.cc
+++ b/lib/atscppapi/src/GlobalPlugin.cc
@@ -48,7 +48,7 @@ namespace
static int
handleGlobalPluginEvents(TSCont cont, TSEvent event, void *edata)
{
- TSHttpTxn txn = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txn = static_cast<TSHttpTxn>(edata);
GlobalPluginState *state = static_cast<GlobalPluginState *>(TSContDataGet(cont));
if (state->ignore_internal_transactions_ && (TSHttpTxnIsInternal(txn) == TS_SUCCESS)) {
LOG_DEBUG("Ignoring event %d on internal transaction %p for global plugin %p", event, txn, state->global_plugin_);
@@ -65,7 +65,7 @@ handleGlobalPluginEvents(TSCont cont, TSEvent event, void *edata)
GlobalPlugin::GlobalPlugin(bool ignore_internal_transactions)
{
utils::internal::initTransactionManagement();
- state_ = new GlobalPluginState(this, ignore_internal_transactions);
+ state_ = new GlobalPluginState(this, ignore_internal_transactions);
TSMutex mutex = NULL;
state_->cont_ = TSContCreate(handleGlobalPluginEvents, mutex);
TSContDataSet(state_->cont_, static_cast<void *>(state_));
diff --git a/lib/atscppapi/src/GzipDeflateTransformation.cc b/lib/atscppapi/src/GzipDeflateTransformation.cc
index 6200bf6..fec2fcc 100644
--- a/lib/atscppapi/src/GzipDeflateTransformation.cc
+++ b/lib/atscppapi/src/GzipDeflateTransformation.cc
@@ -34,8 +34,8 @@ using std::vector;
namespace
{
-const int GZIP_MEM_LEVEL = 8;
-const int WINDOW_BITS = 31; // Always use 31 for gzip.
+const int GZIP_MEM_LEVEL = 8;
+const int WINDOW_BITS = 31; // Always use 31 for gzip.
const unsigned int ONE_KB = 1024;
}
@@ -92,10 +92,10 @@ GzipDeflateTransformation::consume(const string &data)
return;
}
- int iteration = 0;
+ int iteration = 0;
state_->z_stream_.data_type = Z_ASCII;
- state_->z_stream_.next_in = reinterpret_cast<unsigned char *>(const_cast<char *>(data.c_str()));
- state_->z_stream_.avail_in = data.length();
+ state_->z_stream_.next_in = reinterpret_cast<unsigned char *>(const_cast<char *>(data.c_str()));
+ state_->z_stream_.avail_in = data.length();
// For small payloads the size can actually be greater than the original input
// so we'll use twice the original size to avoid needless repeated calls to deflate.
@@ -105,7 +105,7 @@ GzipDeflateTransformation::consume(const string &data)
do {
LOG_DEBUG("Iteration %d: Deflate will compress %ld bytes", ++iteration, data.size());
state_->z_stream_.avail_out = buffer_size;
- state_->z_stream_.next_out = &buffer[0];
+ state_->z_stream_.next_out = &buffer[0];
int err = deflate(&state_->z_stream_, Z_SYNC_FLUSH);
if (Z_OK != err) {
@@ -133,8 +133,8 @@ void
GzipDeflateTransformation::handleInputComplete()
{
// We will flush out anything that's remaining in the gzip buffer
- int status = Z_OK;
- int iteration = 0;
+ int status = Z_OK;
+ int iteration = 0;
const int buffer_size = 1024; // 1024 bytes is usually more than enough for the epilouge
unsigned char buffer[buffer_size];
@@ -143,7 +143,7 @@ GzipDeflateTransformation::handleInputComplete()
LOG_DEBUG("Iteration %d: Gzip deflate finalizing.", ++iteration);
state_->z_stream_.data_type = Z_ASCII;
state_->z_stream_.avail_out = buffer_size;
- state_->z_stream_.next_out = buffer;
+ state_->z_stream_.next_out = buffer;
status = deflate(&state_->z_stream_, Z_FINISH);
diff --git a/lib/atscppapi/src/GzipInflateTransformation.cc b/lib/atscppapi/src/GzipInflateTransformation.cc
index 64531b3..4e040f0 100644
--- a/lib/atscppapi/src/GzipInflateTransformation.cc
+++ b/lib/atscppapi/src/GzipInflateTransformation.cc
@@ -35,7 +35,7 @@ using std::vector;
namespace
{
-const int WINDOW_BITS = 31; // Always use 31 for gzip.
+const int WINDOW_BITS = 31; // Always use 31 for gzip.
unsigned int INFLATE_SCALE_FACTOR = 6;
}
@@ -95,13 +95,13 @@ GzipInflateTransformation::consume(const string &data)
return;
}
- int err = Z_OK;
- int iteration = 0;
+ int err = Z_OK;
+ int iteration = 0;
int inflate_block_size = INFLATE_SCALE_FACTOR * data.size();
vector<char> buffer(inflate_block_size);
// Setup the compressed input
- state_->z_stream_.next_in = reinterpret_cast<unsigned char *>(const_cast<char *>(data.c_str()));
+ state_->z_stream_.next_in = reinterpret_cast<unsigned char *>(const_cast<char *>(data.c_str()));
state_->z_stream_.avail_in = data.length();
// Loop while we have more data to inflate
@@ -109,7 +109,7 @@ GzipInflateTransformation::consume(const string &data)
LOG_DEBUG("Iteration %d: Gzip has %d bytes to inflate", ++iteration, state_->z_stream_.avail_in);
// Setup where the decompressed output will go.
- state_->z_stream_.next_out = reinterpret_cast<unsigned char *>(&buffer[0]);
+ state_->z_stream_.next_out = reinterpret_cast<unsigned char *>(&buffer[0]);
state_->z_stream_.avail_out = inflate_block_size;
/* Uncompress */
diff --git a/lib/atscppapi/src/Headers.cc b/lib/atscppapi/src/Headers.cc
index 41f8a89..66459aa 100644
--- a/lib/atscppapi/src/Headers.cc
+++ b/lib/atscppapi/src/Headers.cc
@@ -108,10 +108,10 @@ struct HeaderFieldValueIteratorState : noncopyable {
void
reset(TSMBuffer bufp, TSMLoc hdr_loc, TSMLoc field_loc, int index)
{
- hdr_buf_ = bufp;
- hdr_loc_ = hdr_loc;
+ hdr_buf_ = bufp;
+ hdr_loc_ = hdr_loc;
field_loc_ = field_loc;
- index_ = index;
+ index_ = index;
}
};
@@ -135,7 +135,7 @@ header_field_value_iterator::~header_field_value_iterator()
std::string header_field_value_iterator::operator*()
{
if (state_->index_ >= 0) {
- int length = 0;
+ int length = 0;
const char *str = TSMimeHdrFieldValueStringGet(state_->hdr_buf_, state_->hdr_loc_, state_->field_loc_, state_->index_, &length);
if (length && str) {
return std::string(str, length);
@@ -225,7 +225,7 @@ HeaderField::end()
HeaderFieldName
HeaderField::name() const
{
- int length = 0;
+ int length = 0;
const char *str = TSMimeHdrFieldNameGet(iter_.state_->mloc_container_->hdr_buf_, iter_.state_->mloc_container_->hdr_loc_,
iter_.state_->mloc_container_->field_loc_, &length);
if (str && length) {
@@ -417,8 +417,8 @@ HeaderFieldIteratorState *
advanceIterator(HeaderFieldIteratorState *state, TSMLoc (*getNextField)(TSMBuffer, TSMLoc, TSMLoc))
{
if (state->mloc_container_->field_loc_ != TS_NULL_MLOC) {
- TSMBuffer hdr_buf = state->mloc_container_->hdr_buf_;
- TSMLoc hdr_loc = state->mloc_container_->hdr_loc_;
+ TSMBuffer hdr_buf = state->mloc_container_->hdr_buf_;
+ TSMLoc hdr_loc = state->mloc_container_->hdr_loc_;
TSMLoc next_field_loc = getNextField(hdr_buf, hdr_loc, state->mloc_container_->field_loc_);
delete state;
state = new HeaderFieldIteratorState(hdr_buf, hdr_loc, next_field_loc);
@@ -474,8 +474,8 @@ struct HeadersState : noncopyable {
bool self_created_structures_;
HeadersState()
{
- hdr_buf_ = TSMBufferCreate();
- hdr_loc_ = TSHttpHdrCreate(hdr_buf_);
+ hdr_buf_ = TSMBufferCreate();
+ hdr_loc_ = TSHttpHdrCreate(hdr_buf_);
self_created_structures_ = true;
}
void
@@ -573,7 +573,7 @@ Headers::size_type
Headers::erase(const char *key, int length)
{
header_field_iterator iter = find(key, length);
- size_type erased_count = 0;
+ size_type erased_count = 0;
while (iter != end()) {
header_field_iterator iter_to_delete = iter;
iter.nextDup();
diff --git a/lib/atscppapi/src/InterceptPlugin.cc b/lib/atscppapi/src/InterceptPlugin.cc
index a55e2ef..2221d12 100644
--- a/lib/atscppapi/src/InterceptPlugin.cc
+++ b/lib/atscppapi/src/InterceptPlugin.cc
@@ -98,7 +98,7 @@ struct InterceptPlugin::State {
plugin_io_done_(false)
{
plugin_mutex_ = plugin->getMutex();
- http_parser_ = TSHttpParserCreate();
+ http_parser_ = TSHttpParserCreate();
}
~State()
@@ -122,7 +122,7 @@ void destroyCont(InterceptPlugin::State *state);
InterceptPlugin::InterceptPlugin(Transaction &transaction, InterceptPlugin::Type type) : TransactionPlugin(transaction)
{
TSCont cont = TSContCreate(handleEvents, TSMutexCreate());
- state_ = new State(cont, this);
+ state_ = new State(cont, this);
TSContDataSet(cont, state_);
TSHttpTxn txn = static_cast<TSHttpTxn>(transaction.getAtsHandle());
if (type == SERVER_INTERCEPT) {
@@ -154,7 +154,7 @@ InterceptPlugin::produce(const void *data, int data_size)
if (!state_->output_.buffer_) {
state_->output_.buffer_ = TSIOBufferCreate();
state_->output_.reader_ = TSIOBufferReaderAlloc(state_->output_.buffer_);
- state_->output_.vio_ = TSVConnWrite(state_->net_vc_, state_->cont_, state_->output_.reader_, INT64_MAX);
+ state_->output_.vio_ = TSVConnWrite(state_->net_vc_, state_->cont_, state_->output_.reader_, INT64_MAX);
}
int num_bytes_written = TSIOBufferWrite(state_->output_.buffer_, data, data_size);
if (num_bytes_written != data_size) {
@@ -208,7 +208,7 @@ InterceptPlugin::doRead()
const char *data, *startptr;
TSIOBufferBlock block = TSIOBufferReaderStart(state_->input_.reader_);
while (block != NULL) {
- startptr = data = TSIOBufferBlockReadStart(block, state_->input_.reader_, &data_len);
+ startptr = data = TSIOBufferBlockReadStart(block, state_->input_.reader_, &data_len);
num_body_bytes_in_block = 0;
if (!state_->hdr_parsed_) {
const char *endptr = data + data_len;
@@ -277,10 +277,10 @@ InterceptPlugin::handleEvent(int abstract_event, void *edata)
switch (event) {
case TS_EVENT_NET_ACCEPT:
LOG_DEBUG("Handling net accept");
- state_->net_vc_ = static_cast<TSVConn>(edata);
+ state_->net_vc_ = static_cast<TSVConn>(edata);
state_->input_.buffer_ = TSIOBufferCreate();
state_->input_.reader_ = TSIOBufferReaderAlloc(state_->input_.buffer_);
- state_->input_.vio_ = TSVConnRead(state_->net_vc_, state_->cont_, state_->input_.buffer_,
+ state_->input_.vio_ = TSVConnRead(state_->net_vc_, state_->cont_, state_->input_.buffer_,
INT64_MAX /* number of bytes to read - high value initially */);
state_->hdr_buf_ = TSMBufferCreate();
@@ -326,7 +326,7 @@ handleEvents(TSCont cont, TSEvent pristine_event, void *pristine_edata)
{
// Separating pristine and mutable data helps debugging
TSEvent event = pristine_event;
- void *edata = pristine_edata;
+ void *edata = pristine_edata;
InterceptPlugin::State *state = static_cast<InterceptPlugin::State *>(TSContDataGet(cont));
if (!state) { // plugin is done, return.
diff --git a/lib/atscppapi/src/Logger.cc b/lib/atscppapi/src/Logger.cc
index 774e282..3033dce 100644
--- a/lib/atscppapi/src/Logger.cc
+++ b/lib/atscppapi/src/Logger.cc
@@ -97,13 +97,13 @@ Logger::init(const string &file, bool add_timestamp, bool rename_file, LogLevel
state_->filename_.c_str());
return false;
}
- state_->filename_ = file;
- state_->add_timestamp_ = add_timestamp;
- state_->rename_file_ = rename_file;
- state_->level_ = level;
- state_->rolling_enabled_ = rolling_enabled;
+ state_->filename_ = file;
+ state_->add_timestamp_ = add_timestamp;
+ state_->rename_file_ = rename_file;
+ state_->level_ = level;
+ state_->rolling_enabled_ = rolling_enabled;
state_->rolling_interval_seconds_ = rolling_interval_seconds;
- state_->initialized_ = true; // set this to true always - we are not providing re-init() after a failed init()
+ state_->initialized_ = true; // set this to true always - we are not providing re-init() after a failed init()
int mode = 0;
if (state_->add_timestamp_) {
diff --git a/lib/atscppapi/src/Plugin.cc b/lib/atscppapi/src/Plugin.cc
index 63ee55b..1188622 100644
--- a/lib/atscppapi/src/Plugin.cc
+++ b/lib/atscppapi/src/Plugin.cc
@@ -32,8 +32,8 @@ void
atscppapi::RegisterGlobalPlugin(std::string name, std::string vendor, std::string email)
{
TSPluginRegistrationInfo info;
- info.plugin_name = const_cast<char *>(name.c_str());
- info.vendor_name = const_cast<char *>(vendor.c_str());
+ info.plugin_name = const_cast<char *>(name.c_str());
+ info.vendor_name = const_cast<char *>(vendor.c_str());
info.support_email = const_cast<char *>(email.c_str());
if (TSPluginRegister(&info) != TS_SUCCESS)
TSError("[Plugin.cc] Plugin registration failed.");
diff --git a/lib/atscppapi/src/RemapPlugin.cc b/lib/atscppapi/src/RemapPlugin.cc
index f96597f..1c9aa8c 100644
--- a/lib/atscppapi/src/RemapPlugin.cc
+++ b/lib/atscppapi/src/RemapPlugin.cc
@@ -32,10 +32,10 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
{
RemapPlugin *remap_plugin = static_cast<RemapPlugin *>(ih);
Url map_from_url(rri->requestBufp, rri->mapFromUrl), map_to_url(rri->requestBufp, rri->mapToUrl);
- Transaction &transaction = utils::internal::getTransaction(rh);
- bool redirect = false;
+ Transaction &transaction = utils::internal::getTransaction(rh);
+ bool redirect = false;
RemapPlugin::Result result = remap_plugin->doRemap(map_from_url, map_to_url, transaction, redirect);
- rri->redirect = redirect ? 1 : 0;
+ rri->redirect = redirect ? 1 : 0;
switch (result) {
case RemapPlugin::RESULT_ERROR:
return TSREMAP_ERROR;
diff --git a/lib/atscppapi/src/Request.cc b/lib/atscppapi/src/Request.cc
index 9f417ab..cdf0812 100644
--- a/lib/atscppapi/src/Request.cc
+++ b/lib/atscppapi/src/Request.cc
@@ -66,14 +66,14 @@ Request::Request(void *hdr_buf, void *hdr_loc)
Request::Request(const string &url_str, HttpMethod method, HttpVersion version)
{
- state_ = new RequestState();
- state_->method_ = method;
- state_->version_ = version;
+ state_ = new RequestState();
+ state_->method_ = method;
+ state_->version_ = version;
state_->destroy_buf_ = true;
- state_->hdr_buf_ = TSMBufferCreate();
+ state_->hdr_buf_ = TSMBufferCreate();
if (TSUrlCreate(state_->hdr_buf_, &state_->url_loc_) == TS_SUCCESS) {
const char *url_str_start = url_str.c_str();
- const char *url_str_end = url_str_start + url_str.size();
+ const char *url_str_end = url_str_start + url_str.size();
if (TSUrlParse(state_->hdr_buf_, state_->url_loc_, &url_str_start, url_str_end) != TS_PARSE_DONE) {
LOG_ERROR("[%s] does not represent a valid url", url_str.c_str());
} else {
diff --git a/lib/atscppapi/src/Transaction.cc b/lib/atscppapi/src/Transaction.cc
index 560062a..c08eacd 100644
--- a/lib/atscppapi/src/Transaction.cc
+++ b/lib/atscppapi/src/Transaction.cc
@@ -275,7 +275,7 @@ Transaction::getEffectiveUrl()
{
string ret_val;
int length = 0;
- char *buf = TSHttpTxnEffectiveUrlStringGet(state_->txn_, &length);
+ char *buf = TSHttpTxnEffectiveUrlStringGet(state_->txn_, &length);
if (buf && length) {
ret_val.assign(buf, length);
}
diff --git a/lib/atscppapi/src/TransactionPlugin.cc b/lib/atscppapi/src/TransactionPlugin.cc
index 537a25c..778aca9 100644
--- a/lib/atscppapi/src/TransactionPlugin.cc
+++ b/lib/atscppapi/src/TransactionPlugin.cc
@@ -48,7 +48,7 @@ namespace
static int
handleTransactionPluginEvents(TSCont cont, TSEvent event, void *edata)
{
- TSHttpTxn txn = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txn = static_cast<TSHttpTxn>(edata);
TransactionPlugin *plugin = static_cast<TransactionPlugin *>(TSContDataGet(cont));
LOG_DEBUG("cont=%p, event=%d, tshttptxn=%p, plugin=%p", cont, event, edata, plugin);
atscppapi::utils::internal::invokePluginForEvent(plugin, txn, event);
@@ -59,7 +59,7 @@ handleTransactionPluginEvents(TSCont cont, TSEvent event, void *edata)
TransactionPlugin::TransactionPlugin(Transaction &transaction)
{
- state_ = new TransactionPluginState(static_cast<TSHttpTxn>(transaction.getAtsHandle()));
+ state_ = new TransactionPluginState(static_cast<TSHttpTxn>(transaction.getAtsHandle()));
TSMutex mutex = NULL;
state_->cont_ = TSContCreate(handleTransactionPluginEvents, mutex);
TSContDataSet(state_->cont_, static_cast<void *>(this));
diff --git a/lib/atscppapi/src/TransformationPlugin.cc b/lib/atscppapi/src/TransformationPlugin.cc
index 3be796e..66e6141 100644
--- a/lib/atscppapi/src/TransformationPlugin.cc
+++ b/lib/atscppapi/src/TransformationPlugin.cc
@@ -71,7 +71,7 @@ struct atscppapi::TransformationPluginState : noncopyable {
bytes_written_(0),
input_complete_dispatched_(false)
{
- output_buffer_ = TSIOBufferCreate();
+ output_buffer_ = TSIOBufferCreate();
output_buffer_reader_ = TSIOBufferReaderAlloc(output_buffer_);
};
@@ -127,7 +127,7 @@ handleTransformationPluginRead(TSCont contp, TransformationPluginState *state)
if (to_read > 0) {
/* Create a buffer and a buffer reader */
- TSIOBuffer input_buffer = TSIOBufferCreate();
+ TSIOBuffer input_buffer = TSIOBufferCreate();
TSIOBufferReader input_reader = TSIOBufferReaderAlloc(input_buffer);
/* Copy the data from the read buffer to the input buffer. */
@@ -225,7 +225,7 @@ handleTransformationPluginEvents(TSCont contp, TSEvent event, void *edata)
/* Get the write VIO for the write operation that was
performed on ourself. This VIO contains the continuation of
our parent transformation. */
- write_vio = TSVConnWriteVIOGet(state->vconn_);
+ write_vio = TSVConnWriteVIOGet(state->vconn_);
TSCont vio_cont = TSVIOContGet(write_vio);
LOG_ERROR("Transformation contp=%p tshttptxn=%p received EVENT_ERROR forwarding to write_vio=%p viocont=%p", contp, state->txn_,
write_vio, vio_cont);
@@ -244,7 +244,7 @@ handleTransformationPluginEvents(TSCont contp, TSEvent event, void *edata)
TransformationPlugin::TransformationPlugin(Transaction &transaction, TransformationPlugin::Type type)
: TransactionPlugin(transaction)
{
- state_ = new TransformationPluginState(transaction, *this, type, static_cast<TSHttpTxn>(transaction.getAtsHandle()));
+ state_ = new TransformationPluginState(transaction, *this, type, static_cast<TSHttpTxn>(transaction.getAtsHandle()));
state_->vconn_ = TSTransformCreate(handleTransformationPluginEvents, state_->txn_);
TSContDataSet(state_->vconn_, static_cast<void *>(state_)); // edata in a TransformationHandler is NOT a TSHttpTxn.
LOG_DEBUG("Creating TransformationPlugin=%p (vconn)contp=%p tshttptxn=%p transformation_type=%d", this, state_->vconn_,
diff --git a/lib/atscppapi/src/include/atscppapi/AsyncHttpFetch.h b/lib/atscppapi/src/include/atscppapi/AsyncHttpFetch.h
index 57d40e0..89eba9d 100644
--- a/lib/atscppapi/src/include/atscppapi/AsyncHttpFetch.h
+++ b/lib/atscppapi/src/include/atscppapi/AsyncHttpFetch.h
@@ -57,7 +57,7 @@ public:
enum StreamingFlag {
STREAMING_DISABLED = 0,
- STREAMING_ENABLED = 0x1,
+ STREAMING_ENABLED = 0x1,
};
AsyncHttpFetch(const std::string &url_str, StreamingFlag streaming_flag, HttpMethod http_method = HTTP_METHOD_GET);
diff --git a/lib/atscppapi/src/include/atscppapi/HttpStatus.h b/lib/atscppapi/src/include/atscppapi/HttpStatus.h
index bfea2fd..5c2e373 100644
--- a/lib/atscppapi/src/include/atscppapi/HttpStatus.h
+++ b/lib/atscppapi/src/include/atscppapi/HttpStatus.h
@@ -35,65 +35,65 @@ namespace atscppapi
enum HttpStatus {
HTTP_STATUS_UNKNOWN = 0,
- HTTP_STATUS_CONTINUE = 100,
+ HTTP_STATUS_CONTINUE = 100,
HTTP_STATUS_SWITCHING_PROTOCOL = 101,
- HTTP_STATUS_OK = 200,
- HTTP_STATUS_CREATED = 201,
- HTTP_STATUS_ACCEPTED = 202,
+ HTTP_STATUS_OK = 200,
+ HTTP_STATUS_CREATED = 201,
+ HTTP_STATUS_ACCEPTED = 202,
HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
- HTTP_STATUS_NO_CONTENT = 204,
- HTTP_STATUS_RESET_CONTENT = 205,
- HTTP_STATUS_PARTIAL_CONTENT = 206,
- HTTP_STATUS_MULTI_STATUS = 207,
- HTTP_STATUS_ALREADY_REPORTED = 208,
- HTTP_STATUS_IM_USED = 211,
+ HTTP_STATUS_NO_CONTENT = 204,
+ HTTP_STATUS_RESET_CONTENT = 205,
+ HTTP_STATUS_PARTIAL_CONTENT = 206,
+ HTTP_STATUS_MULTI_STATUS = 207,
+ HTTP_STATUS_ALREADY_REPORTED = 208,
+ HTTP_STATUS_IM_USED = 211,
- HTTP_STATUS_MULTIPLE_CHOICES = 300,
- HTTP_STATUS_MOVED_PERMANENTLY = 301,
- HTTP_STATUS_MOVED_TEMPORARILY = 302,
- HTTP_STATUS_SEE_OTHER = 303,
- HTTP_STATUS_NOT_MODIFIED = 304,
- HTTP_STATUS_USE_PROXY = 305,
+ HTTP_STATUS_MULTIPLE_CHOICES = 300,
+ HTTP_STATUS_MOVED_PERMANENTLY = 301,
+ HTTP_STATUS_MOVED_TEMPORARILY = 302,
+ HTTP_STATUS_SEE_OTHER = 303,
+ HTTP_STATUS_NOT_MODIFIED = 304,
+ HTTP_STATUS_USE_PROXY = 305,
HTTP_STATUS_TEMPORARY_REDIRECT = 307,
HTTP_STATUS_PERMANENT_REDIRECT = 308,
- HTTP_STATUS_BAD_REQUEST = 400,
- HTTP_STATUS_UNAUTHORIZED = 401,
- HTTP_STATUS_PAYMENT_REQUIRED = 402,
- HTTP_STATUS_FORBIDDEN = 403,
- HTTP_STATUS_NOT_FOUND = 404,
- HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
- HTTP_STATUS_NOT_ACCEPTABLE = 406,
- HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
- HTTP_STATUS_REQUEST_TIMEOUT = 408,
- HTTP_STATUS_CONFLICT = 409,
- HTTP_STATUS_GONE = 410,
- HTTP_STATUS_LENGTH_REQUIRED = 411,
- HTTP_STATUS_PRECONDITION_FAILED = 412,
- HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
- HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
- HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
+ HTTP_STATUS_BAD_REQUEST = 400,
+ HTTP_STATUS_UNAUTHORIZED = 401,
+ HTTP_STATUS_PAYMENT_REQUIRED = 402,
+ HTTP_STATUS_FORBIDDEN = 403,
+ HTTP_STATUS_NOT_FOUND = 404,
+ HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
+ HTTP_STATUS_NOT_ACCEPTABLE = 406,
+ HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
+ HTTP_STATUS_REQUEST_TIMEOUT = 408,
+ HTTP_STATUS_CONFLICT = 409,
+ HTTP_STATUS_GONE = 410,
+ HTTP_STATUS_LENGTH_REQUIRED = 411,
+ HTTP_STATUS_PRECONDITION_FAILED = 412,
+ HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
+ HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
+ HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
HTTP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE = 416,
- HTTP_STATUS_EXPECTATION_FAILED = 417,
- HTTP_STATUS_UNPROCESSABLE_ENTITY = 422,
- HTTP_STATUS_LOCKED = 423,
- HTTP_STATUS_FAILED_DEPENDENCY = 424,
- HTTP_STATUS_UPGRADE_REQUIRED = 426,
- HTTP_STATUS_PRECONDITION_REQUIRED = 428,
- HTTP_STATUS_TOO_MANY_REQUESTS = 429,
+ HTTP_STATUS_EXPECTATION_FAILED = 417,
+ HTTP_STATUS_UNPROCESSABLE_ENTITY = 422,
+ HTTP_STATUS_LOCKED = 423,
+ HTTP_STATUS_FAILED_DEPENDENCY = 424,
+ HTTP_STATUS_UPGRADE_REQUIRED = 426,
+ HTTP_STATUS_PRECONDITION_REQUIRED = 428,
+ HTTP_STATUS_TOO_MANY_REQUESTS = 429,
HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431,
- HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
- HTTP_STATUS_NOT_IMPLEMENTED = 501,
- HTTP_STATUS_BAD_GATEWAY = 502,
- HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
- HTTP_STATUS_GATEWAY_TIMEOUT = 504,
- HTTP_STATUS_HTTPVER_NOT_SUPPORTED = 505,
- HTTP_STATUS_VARIANT_ALSO_NEGOTIATES = 506,
- HTTP_STATUS_INSUFFICIENT_STORAGE = 507,
- HTTP_STATUS_LOOP_DETECTED = 508,
- HTTP_STATUS_NOT_EXTENDED = 510,
+ HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
+ HTTP_STATUS_NOT_IMPLEMENTED = 501,
+ HTTP_STATUS_BAD_GATEWAY = 502,
+ HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
+ HTTP_STATUS_GATEWAY_TIMEOUT = 504,
+ HTTP_STATUS_HTTPVER_NOT_SUPPORTED = 505,
+ HTTP_STATUS_VARIANT_ALSO_NEGOTIATES = 506,
+ HTTP_STATUS_INSUFFICIENT_STORAGE = 507,
+ HTTP_STATUS_LOOP_DETECTED = 508,
+ HTTP_STATUS_NOT_EXTENDED = 510,
HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511
};
diff --git a/lib/atscppapi/src/include/atscppapi/Logger.h b/lib/atscppapi/src/include/atscppapi/Logger.h
index e5e86ff..546bbbb 100644
--- a/lib/atscppapi/src/include/atscppapi/Logger.h
+++ b/lib/atscppapi/src/include/atscppapi/Logger.h
@@ -163,9 +163,9 @@ public:
*/
enum LogLevel {
LOG_LEVEL_NO_LOG = 128, /**< This log level is used to disable all logging */
- LOG_LEVEL_DEBUG = 1, /**< This log level is used for DEBUG level logging (DEBUG + INFO + ERROR) */
- LOG_LEVEL_INFO = 2, /**< This log level is used for INFO level logging (INFO + ERROR) */
- LOG_LEVEL_ERROR = 4 /**< This log level is used for ERROR level logging (ERROR ONLY) */
+ LOG_LEVEL_DEBUG = 1, /**< This log level is used for DEBUG level logging (DEBUG + INFO + ERROR) */
+ LOG_LEVEL_INFO = 2, /**< This log level is used for INFO level logging (INFO + ERROR) */
+ LOG_LEVEL_ERROR = 4 /**< This log level is used for ERROR level logging (ERROR ONLY) */
};
Logger();
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/atscppapi/src/utils_internal.cc
index 1090f01..b868dea 100644
--- a/lib/atscppapi/src/utils_internal.cc
+++ b/lib/atscppapi/src/utils_internal.cc
@@ -40,7 +40,7 @@ namespace
{
// This is the highest txn arg that can be used, we choose this
// value to minimize the likelihood of it causing any problems.
-const int MAX_TXN_ARG = 15;
+const int MAX_TXN_ARG = 15;
const int TRANSACTION_STORAGE_INDEX = MAX_TXN_ARG;
void
@@ -105,7 +105,7 @@ setupTransactionManagement()
{
// We must always have a cleanup handler available
TSMutex mutex = NULL;
- TSCont cont = TSContCreate(handleTransactionEvents, mutex);
+ TSCont cont = TSContCreate(handleTransactionEvents, mutex);
TSHttpHookAdd(TS_HTTP_POST_REMAP_HOOK, cont);
TSHttpHookAdd(TS_HTTP_SEND_REQUEST_HDR_HOOK, cont);
TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, cont);
diff --git a/lib/raft/raft.h b/lib/raft/raft.h
index 7d557c0..2de4376 100644
--- a/lib/raft/raft.h
+++ b/lib/raft/raft.h
@@ -94,9 +94,9 @@ public:
virtual void Recover(const LogEntry &entry) = 0;
virtual void Start(double now, int64_t random_seed) = 0;
- virtual void Tick(double now) = 0; // Call every ~election_timeout/10.
+ virtual void Tick(double now) = 0; // Call every ~election_timeout/10.
virtual void Propose(const LogEntry &entry) = 0;
- virtual void Run(double now, const Message &message) = 0;
+ virtual void Run(double now, const Message &message) = 0;
virtual void Snapshot(bool uncommitted, ::std::vector<LogEntry> *entries) = 0;
virtual void Stop() = 0; // Clean shutdown for faster failover.
};
diff --git a/lib/raft/raft_impl.h b/lib/raft/raft_impl.h
index a224481..5c29b38 100644
--- a/lib/raft/raft_impl.h
+++ b/lib/raft/raft_impl.h
@@ -96,7 +96,7 @@ public:
double r = 0.0;
drand48_r(&rand_, &r);
random_election_delay_ = election_timeout_ * r;
- last_heartbeat_ = now;
+ last_heartbeat_ = now;
VoteForMe();
return;
}
@@ -140,8 +140,8 @@ public:
n.term = m.term();
n.vote = "";
}
- n.term = term_;
- n.last_log_term = m.last_log_term();
+ n.term = term_;
+ n.last_log_term = m.last_log_term();
n.last_log_index = m.last_log_index();
if (m.from() != leader_ || m.has_vote()) {
HandleAck(now, m, &n);
@@ -152,7 +152,7 @@ public:
last_heartbeat_ = now;
if (m.config_committed() > config_committed_ || m.data_committed() > data_committed_) {
config_committed_ = m.config_committed();
- data_committed_ = m.data_committed();
+ data_committed_ = m.data_committed();
WriteInternalLogEntry();
}
if (m.has_entry())
@@ -195,12 +195,12 @@ public:
private:
struct NodeState {
- int64_t term = -1;
- int64_t sent_term = 0;
- int64_t sent_index = 0;
- int64_t last_log_term = -1;
+ int64_t term = -1;
+ int64_t sent_term = 0;
+ int64_t sent_index = 0;
+ int64_t last_log_term = -1;
int64_t last_log_index = -1;
- double ack_received = -1.0e10;
+ double ack_received = -1.0e10;
::std::string vote;
};
@@ -221,8 +221,8 @@ private:
void
NewTerm(int64_t term, const ::std::string new_leader, bool in_recovery)
{
- vote_ = "";
- term_ = term;
+ vote_ = "";
+ term_ = term;
leader_ = new_leader;
waiting_commits_.clear();
if (!in_recovery) {
@@ -294,7 +294,7 @@ private:
m.set_nack(true);
m.set_last_log_term(last_log_committed_term_);
m.set_last_log_index(last_log_committed_index_);
- index_ = last_log_committed_index_;
+ index_ = last_log_committed_index_;
last_log_term_ = last_log_committed_term_;
}
server_->SendMessage(this, leader_, m);
@@ -306,7 +306,7 @@ private:
n->ack_received = now;
if (m.nack()) {
n->sent_index = n->last_log_index;
- n->sent_term = n->last_log_term;
+ n->sent_term = n->last_log_term;
} else if (i_am_leader()) {
int acks_needed = (other_nodes_.size() + 1) / 2;
for (auto &o : other_nodes_)
@@ -339,19 +339,19 @@ private:
return;
// Attempt to pass leadership to a worthy successor.
const ::std::string *best_node = nullptr;
- NodeState *best = nullptr;
+ NodeState *best = nullptr;
for (auto &n : other_nodes_) {
auto &s = node_state_[n];
if (!best || (s.last_log_term > best->last_log_term ||
(s.last_log_term == best->last_log_term && s.last_log_index > best->last_log_index))) {
best_node = &n;
- best = &s;
+ best = &s;
}
}
if (best_node) {
term_++;
leader_ = "";
- vote_ = *best_node;
+ vote_ = *best_node;
WriteInternalLogEntry();
Message m(InitializeMessage());
m.set_vote(vote_);
@@ -399,7 +399,7 @@ private:
if (last_log_term_ == entry->term() && entry->index() != index_ + 1)
return false; // Out of sequence.
last_log_term_ = entry->term();
- index_ = entry->index() + entry->extent();
+ index_ = entry->index() + entry->extent();
if (!in_recovery && i_am_leader()) {
if (!other_nodes_.size())
data_committed_ = index_;
@@ -463,7 +463,7 @@ private:
}
for (auto &e : pending) {
server_->CommitLogEntry(this, *e);
- last_log_committed_term_ = e->term();
+ last_log_committed_term_ = e->term();
last_log_committed_index_ = e->index();
}
CommitConfig(in_recovery);
@@ -520,7 +520,7 @@ private:
if (!server_->SendMessage(this, n, m))
return false;
s->sent_index = entry.index() + entry.extent();
- s->sent_term = entry.term();
+ s->sent_term = entry.term();
return true;
}
@@ -528,7 +528,7 @@ private:
Replicate(const ::std::string &n, bool heartbeat)
{
bool sent = false;
- auto &s = node_state_[n];
+ auto &s = node_state_[n];
if (s.term == term_) { // Replica has acknowledged me as leader.
int64_t end = index_;
if (waiting_commits_.size())
@@ -586,17 +586,17 @@ private:
Server *const server_;
struct drand48_data rand_;
const ::std::string node_;
- int64_t term_ = 0; // Current term.
- int64_t last_log_term_ = -1; // Term of last log entry this node has.
- int64_t index_ = 0; // Index of last log entry this node has.
- int64_t config_committed_ = -1;
- int64_t data_committed_ = -1;
+ int64_t term_ = 0; // Current term.
+ int64_t last_log_term_ = -1; // Term of last log entry this node has.
+ int64_t index_ = 0; // Index of last log entry this node has.
+ int64_t config_committed_ = -1;
+ int64_t data_committed_ = -1;
int64_t last_log_committed_index_ = -1;
- int64_t last_log_committed_term_ = -1;
- double election_timeout_ = 1.0;
- double last_heartbeat_ = -1.0e10;
- double last_heartbeat_sent_ = -1.0e10;
- double random_election_delay_ = 0.0;
+ int64_t last_log_committed_term_ = -1;
+ double election_timeout_ = 1.0;
+ double last_heartbeat_ = -1.0e10;
+ double last_heartbeat_sent_ = -1.0e10;
+ double random_election_delay_ = 0.0;
::std::string leader_; // The current leader. "" if there is no leader.
::std::string vote_; // My vote this term.
Config config_;
diff --git a/lib/raft/raft_test.cc b/lib/raft/raft_test.cc
index 4512835..f119aaf 100644
--- a/lib/raft/raft_test.cc
+++ b/lib/raft/raft_test.cc
@@ -103,7 +103,7 @@ public:
{
commits_.emplace_back(new LogEntry(entry));
string s = entry.data();
- auto p = s.find("=");
+ auto p = s.find("=");
if (p != string::npos)
state_[s.substr(0, p)] = make_pair(entry.index(), s.substr(p + 1));
}
@@ -431,7 +431,7 @@ TEST_F(RaftTest, OneTwoThreeThenAbdicate)
StartUp(3, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
raft.Stop();
down_.insert(to_string(ileader));
Ticks(1); // Abdication will cause immediate reelection.
@@ -509,8 +509,8 @@ TEST_F(RaftTest, OneTwoLogLog)
StartUp(2, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- int iother = ileader ? 0 : 1;
- auto &raft = *servers_[ileader]->raft_.get();
+ int iother = ileader ? 0 : 1;
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -540,7 +540,7 @@ TEST_F(RaftTest, OneTwoThreeLogDownLogUp)
StartUp(3, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -569,7 +569,7 @@ TEST_F(RaftTest, OneTwoThreeLogLogThreeDamagedLogRestore)
StartUp(3, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -597,7 +597,7 @@ TEST_F(RaftTest, OneTwoLogLogThenThree)
StartUp(2, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -644,7 +644,7 @@ TEST_F(RaftTest, OneTwoThreeCrashAndBurnLeader)
StartUp(3, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -670,7 +670,7 @@ TEST_F(RaftTest, FiveCrashLeaderAndAnotherAndRecover)
StartUp(5, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -698,7 +698,7 @@ TEST_F(RaftTest, FiveCrashAndBurnLeaderAndAnother)
StartUp(5, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a");
raft.Propose(log_entry);
@@ -740,7 +740,7 @@ TEST_F(RaftTest, FiveLogDown3LogDown2Up3LogUp2)
down_.insert(to_string(ileader));
Ticks(20);
int ileader2 = servers_[((ileader + 1) % 5)]->leader_[0] - '0';
- auto &raft2 = *servers_[ileader2]->raft_.get();
+ auto &raft2 = *servers_[ileader2]->raft_.get();
log_entry.set_data("c");
raft2.Propose(log_entry);
log_entry.set_data("d");
@@ -827,7 +827,7 @@ TEST_F(RaftTest, OneTwoThreeSnapshotOneTwoCrashAndBurnThree)
StartUp(3, config_log_entry);
Ticks(20);
int ileader = servers_[0]->leader_[0] - '0';
- auto &raft = *servers_[ileader]->raft_.get();
+ auto &raft = *servers_[ileader]->raft_.get();
LogEntry log_entry;
log_entry.set_data("a=1");
raft.Propose(log_entry);
diff --git a/lib/records/I_RecDefs.h b/lib/records/I_RecDefs.h
index ef92a53..d98417b 100644
--- a/lib/records/I_RecDefs.h
+++ b/lib/records/I_RecDefs.h
@@ -52,14 +52,14 @@ typedef int8_t RecByte;
typedef bool RecBool;
enum RecT {
- RECT_NULL = 0x00,
- RECT_CONFIG = 0x01,
+ RECT_NULL = 0x00,
+ RECT_CONFIG = 0x01,
RECT_PROCESS = 0x02,
- RECT_NODE = 0x04,
+ RECT_NODE = 0x04,
RECT_CLUSTER = 0x08,
- RECT_LOCAL = 0x10,
- RECT_PLUGIN = 0x20,
- RECT_ALL = 0x3F
+ RECT_LOCAL = 0x10,
+ RECT_PLUGIN = 0x20,
+ RECT_ALL = 0x3F
};
enum RecDataT {
diff --git a/lib/records/I_RecHttp.h b/lib/records/I_RecHttp.h
index f39004d..08665c7 100644
--- a/lib/records/I_RecHttp.h
+++ b/lib/records/I_RecHttp.h
@@ -153,8 +153,8 @@ extern SessionProtocolSet DEFAULT_TLS_SESSION_PROTOCOL_SET;
class SessionProtocolNameRegistry
{
public:
- static int const MAX = SessionProtocolSet::MAX; ///< Maximum # of registered names.
- static int const INVALID = -1; ///< Normalized invalid index value.
+ static int const MAX = SessionProtocolSet::MAX; ///< Maximum # of registered names.
+ static int const INVALID = -1; ///< Normalized invalid index value.
/// Default constructor.
/// Creates empty registry with no names.
diff --git a/lib/records/P_RecCore.cc b/lib/records/P_RecCore.cc
index 4f78cb7..f3ba79f 100644
--- a/lib/records/P_RecCore.cc
+++ b/lib/records/P_RecCore.cc
@@ -104,7 +104,7 @@ send_push_message()
int i, num_records;
bool send_msg = false;
- m = RecMessageAlloc(RECG_PUSH);
+ m = RecMessageAlloc(RECG_PUSH);
num_records = g_num_records;
for (i = 0; i < num_records; i++) {
r = &(g_records[i]);
@@ -380,19 +380,19 @@ RecSetRecord(RecT rec_type, const char *name, RecDataT data_type, RecData *data,
switch (r1->data_type) {
case RECD_INT:
r1->data.rec_int = ink_atoi64(data->rec_string);
- data_type = RECD_INT;
+ data_type = RECD_INT;
break;
case RECD_FLOAT:
r1->data.rec_float = atof(data->rec_string);
- data_type = RECD_FLOAT;
+ data_type = RECD_FLOAT;
break;
case RECD_STRING:
- data_type = RECD_STRING;
+ data_type = RECD_STRING;
r1->data.rec_string = data->rec_string;
break;
case RECD_COUNTER:
r1->data.rec_int = ink_atoi64(data->rec_string);
- data_type = RECD_COUNTER;
+ data_type = RECD_COUNTER;
break;
default:
err = REC_ERR_FAIL;
@@ -422,10 +422,10 @@ RecSetRecord(RecT rec_type, const char *name, RecDataT data_type, RecData *data,
RecRecord r2;
RecRecordInit(&r2);
- r2.rec_type = rec_type;
- r2.name = name;
+ r2.rec_type = rec_type;
+ r2.name = name;
r2.data_type = (data_type != RECD_NULL) ? data_type : r1->data_type;
- r2.data = *data;
+ r2.data = *data;
if (REC_TYPE_IS_STAT(r2.rec_type) && (data_raw != NULL)) {
r2.stat_meta.data_raw = *data_raw;
} else if (REC_TYPE_IS_CONFIG(r2.rec_type)) {
@@ -582,15 +582,15 @@ RecSyncStatsFile()
ink_assert(g_mode_type != RECM_NULL);
if (g_mode_type == RECM_SERVER || g_mode_type == RECM_STAND_ALONE) {
- m = RecMessageAlloc(RECG_NULL);
- num_records = g_num_records;
+ m = RecMessageAlloc(RECG_NULL);
+ num_records = g_num_records;
sync_to_disk = false;
for (i = 0; i < num_records; i++) {
r = &(g_records[i]);
rec_mutex_acquire(&(r->lock));
if (REC_TYPE_IS_STAT(r->rec_type)) {
if (r->stat_meta.persist_type == RECP_PERSISTENT) {
- m = RecMessageMarshal_Realloc(m, r);
+ m = RecMessageMarshal_Realloc(m, r);
sync_to_disk = true;
}
}
@@ -663,7 +663,7 @@ RecSyncConfigToTB(textBuffer *tb, bool *inc_version)
ink_mutex_acquire(&g_rec_config_lock);
- num_records = g_num_records;
+ num_records = g_num_records;
sync_to_disk = false;
for (i = 0; i < num_records; i++) {
r = &(g_records[i]);
@@ -671,14 +671,14 @@ RecSyncConfigToTB(textBuffer *tb, bool *inc_version)
if (REC_TYPE_IS_CONFIG(r->rec_type)) {
if (r->sync_required & REC_DISK_SYNC_REQUIRED) {
if (!ink_hash_table_isbound(g_rec_config_contents_ht, r->name)) {
- cfe = (RecConfigFileEntry *)ats_malloc(sizeof(RecConfigFileEntry));
+ cfe = (RecConfigFileEntry *)ats_malloc(sizeof(RecConfigFileEntry));
cfe->entry_type = RECE_RECORD;
- cfe->entry = ats_strdup(r->name);
+ cfe->entry = ats_strdup(r->name);
enqueue(g_rec_config_contents_llq, (void *)cfe);
ink_hash_table_insert(g_rec_config_contents_ht, r->name, NULL);
}
r->sync_required = r->sync_required & ~REC_DISK_SYNC_REQUIRED;
- sync_to_disk = true;
+ sync_to_disk = true;
if (r->sync_required & REC_INC_CONFIG_VERSION) {
r->sync_required = r->sync_required & ~REC_INC_CONFIG_VERSION;
if (r->rec_type != RECT_LOCAL && inc_version != NULL) {
@@ -827,7 +827,7 @@ int
RecResetStatRecord(const char *name)
{
RecRecord *r1 = NULL;
- int err = REC_ERR_OKAY;
+ int err = REC_ERR_OKAY;
if (ink_hash_table_lookup(g_records_ht, name, (void **)&r1)) {
if (i_am_the_record_owner(r1->rec_type)) {
@@ -840,10 +840,10 @@ RecResetStatRecord(const char *name)
RecRecord r2;
RecRecordInit(&r2);
- r2.rec_type = r1->rec_type;
- r2.name = r1->name;
+ r2.rec_type = r1->rec_type;
+ r2.name = r1->name;
r2.data_type = r1->data_type;
- r2.data = r1->data_default;
+ r2.data = r1->data_default;
err = send_reset_message(&r2);
RecRecordFree(&r2);
@@ -883,10 +883,10 @@ RecResetStatRecord(RecT type, bool all)
RecRecord r2;
RecRecordInit(&r2);
- r2.rec_type = r1->rec_type;
- r2.name = r1->name;
+ r2.rec_type = r1->rec_type;
+ r2.name = r1->name;
r2.data_type = r1->data_type;
- r2.data = r1->data_default;
+ r2.data = r1->data_default;
err = send_reset_message(&r2);
RecRecordFree(&r2);
@@ -958,7 +958,7 @@ RecWriteConfigFile(textBuffer *tb)
char buff[1024];
char *tmp_filename;
- filename_len = strlen(g_rec_config_fpath);
+ filename_len = strlen(g_rec_config_fpath);
tmp_filename_len = filename_len + TMP_FILENAME_EXT_LEN;
if (tmp_filename_len < (int)sizeof(buff)) {
tmp_filename = buff;
diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc
index 94f8100..81a74b4 100644
--- a/lib/records/RecConfigParse.cc
+++ b/lib/records/RecConfigParse.cc
@@ -35,8 +35,8 @@
#include "P_RecCore.h"
#include "ts/I_Layout.h"
-const char *g_rec_config_fpath = NULL;
-LLQ *g_rec_config_contents_llq = NULL;
+const char *g_rec_config_fpath = NULL;
+LLQ *g_rec_config_contents_llq = NULL;
InkHashTable *g_rec_config_contents_ht = NULL;
ink_mutex g_rec_config_lock;
@@ -48,7 +48,7 @@ RecConfigFileInit(void)
{
ink_mutex_init(&g_rec_config_lock, NULL);
g_rec_config_contents_llq = create_queue();
- g_rec_config_contents_ht = ink_hash_table_create(InkHashTableKeyType_String);
+ g_rec_config_contents_ht = ink_hash_table_create(InkHashTableKeyType_String);
}
//-------------------------------------------------------------------------
@@ -62,17 +62,17 @@ RecFileImport_Xmalloc(const char *file, char **file_buf, int *file_size)
int bytes_read;
if (file && file_buf && file_size) {
- *file_buf = 0;
+ *file_buf = 0;
*file_size = 0;
if ((h_file = RecFileOpenR(file)) != REC_HANDLE_INVALID) {
*file_size = RecFileGetSize(h_file);
- *file_buf = (char *)ats_malloc(*file_size + 1);
+ *file_buf = (char *)ats_malloc(*file_size + 1);
if (RecFileRead(h_file, *file_buf, *file_size, &bytes_read) != REC_ERR_FAIL && bytes_read == *file_size) {
(*file_buf)[*file_size] = '\0';
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
} else {
ats_free(*file_buf);
- *file_buf = 0;
+ *file_buf = 0;
*file_size = 0;
}
RecFileClose(h_file);
@@ -153,7 +153,7 @@ RecConfigFileParse(const char *path, RecConfigEntryCallback handler, bool inc_ve
g_rec_config_contents_ht = ink_hash_table_create(InkHashTableKeyType_String);
line_tok.Initialize(fbuf, SHARE_TOKS);
- line = line_tok.iterFirst(&line_tok_state);
+ line = line_tok.iterFirst(&line_tok_state);
line_num = 1;
while (line) {
char *lc = ats_strdup(line);
@@ -169,7 +169,7 @@ RecConfigFileParse(const char *path, RecConfigEntryCallback handler, bool inc_ve
goto L_next_line;
}
- name_str = strtok_r(NULL, " \t", &ln);
+ name_str = strtok_r(NULL, " \t", &ln);
data_type_str = strtok_r(NULL, " \t", &ln);
// extract the string data (a little bit tricker since it can have spaces)
@@ -239,9 +239,9 @@ RecConfigFileParse(const char *path, RecConfigEntryCallback handler, bool inc_ve
handler(rec_type, data_type, name_str, value_str, value_str == data_str ? REC_SOURCE_EXPLICIT : REC_SOURCE_ENV, inc_version);
// update our g_rec_config_contents_xxx
- cfe = (RecConfigFileEntry *)ats_malloc(sizeof(RecConfigFileEntry));
+ cfe = (RecConfigFileEntry *)ats_malloc(sizeof(RecConfigFileEntry));
cfe->entry_type = RECE_RECORD;
- cfe->entry = ats_strdup(name_str);
+ cfe->entry = ats_strdup(name_str);
enqueue(g_rec_config_contents_llq, (void *)cfe);
ink_hash_table_insert(g_rec_config_contents_ht, name_str, NULL);
goto L_done;
@@ -249,9 +249,9 @@ RecConfigFileParse(const char *path, RecConfigEntryCallback handler, bool inc_ve
L_next_line:
// store this line into g_rec_config_contents_llq so that we can
// write it out later
- cfe = (RecConfigFileEntry *)ats_malloc(sizeof(RecConfigFileEntry));
+ cfe = (RecConfigFileEntry *)ats_malloc(sizeof(RecConfigFileEntry));
cfe->entry_type = RECE_COMMENT;
- cfe->entry = ats_strdup(line);
+ cfe->entry = ats_strdup(line);
enqueue(g_rec_config_contents_llq, (void *)cfe);
L_done:
diff --git a/lib/records/RecCore.cc b/lib/records/RecCore.cc
index a6acf20..7268aac 100644
--- a/lib/records/RecCore.cc
+++ b/lib/records/RecCore.cc
@@ -32,7 +32,7 @@
static bool g_initialized = false;
-RecRecord *g_records = NULL;
+RecRecord *g_records = NULL;
InkHashTable *g_records_ht = NULL;
ink_rwlock g_records_rwlock;
int g_num_records = 0;
@@ -72,7 +72,7 @@ register_record(RecT rec_type, const char *name, RecDataT data_type, RecData dat
RecDataSet(data_type, &(r->data_default), &(data_default));
r->data_type = data_type;
- r->rec_type = rec_type;
+ r->rec_type = rec_type;
if (updated_p) {
*updated_p = true;
@@ -98,7 +98,7 @@ register_record(RecT rec_type, const char *name, RecDataT data_type, RecData dat
// we're now registered
r->registered = true;
- r->version = 0;
+ r->version = 0;
return r;
}
@@ -149,7 +149,7 @@ static int
link_byte(const char * /* name */, RecDataT /* data_type */, RecData data, void *cookie)
{
RecByte *rec_byte = (RecByte *)cookie;
- RecByte byte = static_cast<RecByte>(data.rec_int);
+ RecByte byte = static_cast<RecByte>(data.rec_int);
ink_atomic_swap(rec_byte, byte);
return REC_ERR_OKAY;
@@ -161,7 +161,7 @@ link_byte(const char * /* name */, RecDataT /* data_type */, RecData data, void
static int
link_string_alloc(const char * /* name */, RecDataT /* data_type */, RecData data, void *cookie)
{
- RecString _ss = data.rec_string;
+ RecString _ss = data.rec_string;
RecString _new_value = NULL;
if (_ss) {
@@ -169,7 +169,7 @@ link_string_alloc(const char * /* name */, RecDataT /* data_type */, RecData dat
}
// set new string for DEFAULT_xxx_str tp point to
- RecString _temp2 = *((RecString *)cookie);
+ RecString _temp2 = *((RecString *)cookie);
*((RecString *)cookie) = _new_value;
// free previous string DEFAULT_xxx_str points to
ats_free(_temp2);
@@ -216,7 +216,7 @@ RecCoreInit(RecModeT mode_type, Diags *_diags)
// ./records.config.shadow
// ./etc/trafficserver/records.config
// ./records.config
- bool file_exists = true;
+ bool file_exists = true;
g_rec_config_fpath = RecConfigReadConfigPath(NULL, REC_CONFIG_FILE REC_SHADOW_EXT);
if (RecFileExists(g_rec_config_fpath) == REC_ERR_FAIL) {
ats_free((char *)g_rec_config_fpath);
@@ -329,7 +329,7 @@ RecRegisterConfigUpdateCb(const char *name, RecConfigUpdateCb update_cb, void *c
RecConfigUpdateCbList *new_callback = (RecConfigUpdateCbList *)ats_malloc(sizeof(RecConfigUpdateCbList));
memset(new_callback, 0, sizeof(RecConfigUpdateCbList));
- new_callback->update_cb = update_cb;
+ new_callback->update_cb = update_cb;
new_callback->update_cookie = cookie;
new_callback->next = NULL;
@@ -338,7 +338,7 @@ RecRegisterConfigUpdateCb(const char *name, RecConfigUpdateCb update_cb, void *c
if (!r->config_meta.update_cb_list) {
r->config_meta.update_cb_list = new_callback;
} else {
- RecConfigUpdateCbList *cur_callback = NULL;
+ RecConfigUpdateCbList *cur_callback = NULL;
RecConfigUpdateCbList *prev_callback = NULL;
for (cur_callback = r->config_meta.update_cb_list; cur_callback; cur_callback = cur_callback->next) {
prev_callback = cur_callback;
@@ -521,7 +521,7 @@ RecGetRecordType(const char *name, RecT *rec_type, bool lock)
if (ink_hash_table_lookup(g_records_ht, name, (void **)&r)) {
rec_mutex_acquire(&(r->lock));
*rec_type = r->rec_type;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
rec_mutex_release(&(r->lock));
}
@@ -535,7 +535,7 @@ RecGetRecordType(const char *name, RecT *rec_type, bool lock)
int
RecGetRecordDataType(const char *name, RecDataT *data_type, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -548,7 +548,7 @@ RecGetRecordDataType(const char *name, RecDataT *data_type, bool lock)
err = REC_ERR_FAIL;
} else {
*data_type = r->data_type;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
}
rec_mutex_release(&(r->lock));
}
@@ -563,7 +563,7 @@ RecGetRecordDataType(const char *name, RecDataT *data_type, bool lock)
int
RecGetRecordPersistenceType(const char *name, RecPersistT *persist_type, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -576,7 +576,7 @@ RecGetRecordPersistenceType(const char *name, RecPersistT *persist_type, bool lo
rec_mutex_acquire(&(r->lock));
if (REC_TYPE_IS_STAT(r->rec_type)) {
*persist_type = r->stat_meta.persist_type;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
}
rec_mutex_release(&(r->lock));
}
@@ -591,7 +591,7 @@ RecGetRecordPersistenceType(const char *name, RecPersistT *persist_type, bool lo
int
RecGetRecordOrderAndId(const char *name, int *order, int *id, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -605,7 +605,7 @@ RecGetRecordOrderAndId(const char *name, int *order, int *id, bool lock)
*order = r->order;
if (id)
*id = r->rsb_id;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
rec_mutex_release(&(r->lock));
}
}
@@ -620,7 +620,7 @@ RecGetRecordOrderAndId(const char *name, int *order, int *id, bool lock)
int
RecGetRecordUpdateType(const char *name, RecUpdateT *update_type, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -631,7 +631,7 @@ RecGetRecordUpdateType(const char *name, RecUpdateT *update_type, bool lock)
rec_mutex_acquire(&(r->lock));
if (REC_TYPE_IS_CONFIG(r->rec_type)) {
*update_type = r->config_meta.update_type;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
} else {
ink_assert(!"rec_type is not CONFIG");
}
@@ -648,7 +648,7 @@ RecGetRecordUpdateType(const char *name, RecUpdateT *update_type, bool lock)
int
RecGetRecordCheckType(const char *name, RecCheckT *check_type, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -659,7 +659,7 @@ RecGetRecordCheckType(const char *name, RecCheckT *check_type, bool lock)
rec_mutex_acquire(&(r->lock));
if (REC_TYPE_IS_CONFIG(r->rec_type)) {
*check_type = r->config_meta.check_type;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
} else {
ink_assert(!"rec_type is not CONFIG");
}
@@ -676,7 +676,7 @@ RecGetRecordCheckType(const char *name, RecCheckT *check_type, bool lock)
int
RecGetRecordCheckExpr(const char *name, char **check_expr, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -687,7 +687,7 @@ RecGetRecordCheckExpr(const char *name, char **check_expr, bool lock)
rec_mutex_acquire(&(r->lock));
if (REC_TYPE_IS_CONFIG(r->rec_type)) {
*check_expr = r->config_meta.check_expr;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
} else {
ink_assert(!"rec_type is not CONFIG");
}
@@ -754,7 +754,7 @@ RecGetRecordDefaultDataString_Xmalloc(char *name, char **buf, bool lock)
int
RecGetRecordAccessType(const char *name, RecAccessT *access, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -764,7 +764,7 @@ RecGetRecordAccessType(const char *name, RecAccessT *access, bool lock)
if (ink_hash_table_lookup(g_records_ht, name, (void **)&r)) {
rec_mutex_acquire(&(r->lock));
*access = r->config_meta.access_type;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
rec_mutex_release(&(r->lock));
}
@@ -778,7 +778,7 @@ RecGetRecordAccessType(const char *name, RecAccessT *access, bool lock)
int
RecSetRecordAccessType(const char *name, RecAccessT access, bool lock)
{
- int err = REC_ERR_FAIL;
+ int err = REC_ERR_FAIL;
RecRecord *r = NULL;
if (lock) {
@@ -788,7 +788,7 @@ RecSetRecordAccessType(const char *name, RecAccessT access, bool lock)
if (ink_hash_table_lookup(g_records_ht, name, (void **)&r)) {
rec_mutex_acquire(&(r->lock));
r->config_meta.access_type = access;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
rec_mutex_release(&(r->lock));
}
@@ -843,13 +843,13 @@ RecRegisterConfig(RecT rec_type, const char *name, RecDataT data_type, RecData d
if ((r = register_record(rec_type, name, data_type, data_default, RECP_NULL, &updated_p)) != NULL) {
// Note: do not modify 'record->config_meta.update_required'
r->config_meta.update_type = update_type;
- r->config_meta.check_type = check_type;
+ r->config_meta.check_type = check_type;
if (r->config_meta.check_expr) {
ats_free(r->config_meta.check_expr);
}
- r->config_meta.check_expr = ats_strdup(check_expr);
+ r->config_meta.check_expr = ats_strdup(check_expr);
r->config_meta.update_cb_list = NULL;
- r->config_meta.access_type = access_type;
+ r->config_meta.access_type = access_type;
if (!updated_p)
r->config_meta.source = source;
}
@@ -907,7 +907,7 @@ RecForceInsert(RecRecord *record)
if (ink_hash_table_lookup(g_records_ht, record->name, (void **)&r)) {
r_is_a_new_record = false;
rec_mutex_acquire(&(r->lock));
- r->rec_type = record->rec_type;
+ r->rec_type = record->rec_type;
r->data_type = record->data_type;
} else {
r_is_a_new_record = true;
@@ -922,17 +922,17 @@ RecForceInsert(RecRecord *record)
RecDataSet(r->data_type, &(r->data_default), &(record->data_default));
r->registered = record->registered;
- r->rsb_id = record->rsb_id;
+ r->rsb_id = record->rsb_id;
if (REC_TYPE_IS_STAT(r->rec_type)) {
r->stat_meta.persist_type = record->stat_meta.persist_type;
- r->stat_meta.data_raw = record->stat_meta.data_raw;
+ r->stat_meta.data_raw = record->stat_meta.data_raw;
} else if (REC_TYPE_IS_CONFIG(r->rec_type)) {
r->config_meta.update_required = record->config_meta.update_required;
- r->config_meta.update_type = record->config_meta.update_type;
- r->config_meta.check_type = record->config_meta.check_type;
+ r->config_meta.update_type = record->config_meta.update_type;
+ r->config_meta.check_type = record->config_meta.check_type;
ats_free(r->config_meta.check_expr);
- r->config_meta.check_expr = ats_strdup(record->config_meta.check_expr);
+ r->config_meta.check_expr = ats_strdup(record->config_meta.check_expr);
r->config_meta.access_type = record->config_meta.access_type;
}
diff --git a/lib/records/RecFile.cc b/lib/records/RecFile.cc
index fe7dc5f..bbecec7 100644
--- a/lib/records/RecFile.cc
+++ b/lib/records/RecFile.cc
@@ -258,9 +258,9 @@ RecPipeConnect(const char *base_path, const char *name)
int
RecPipeRead(RecHandle h_pipe, char *buf, int size)
{
- int bytes_read = 0;
+ int bytes_read = 0;
int bytes_wanted = size;
- char *p = buf;
+ char *p = buf;
while (bytes_wanted > 0) {
bytes_read = read(h_pipe, p, bytes_wanted);
if (bytes_read < 0) {
@@ -280,9 +280,9 @@ RecPipeRead(RecHandle h_pipe, char *buf, int size)
int
RecPipeWrite(RecHandle h_pipe, char *buf, int size)
{
- int bytes_written = 0;
+ int bytes_written = 0;
int bytes_to_write = size;
- char *p = buf;
+ char *p = buf;
while (bytes_to_write > 0) {
bytes_written = write(h_pipe, p, bytes_to_write);
if (bytes_written < 0) {
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index 8620044..6551854 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -33,28 +33,28 @@ SessionProtocolNameRegistry globalSessionProtocolNameRegistry;
These are also used for NPN setup.
*/
-const char *const TS_NPN_PROTOCOL_HTTP_0_9 = "http/0.9";
-const char *const TS_NPN_PROTOCOL_HTTP_1_0 = "http/1.0";
-const char *const TS_NPN_PROTOCOL_HTTP_1_1 = "http/1.1";
-const char *const TS_NPN_PROTOCOL_HTTP_2_0_14 = "h2-14"; // Last H2 interrop draft. TODO: Should be removed later
-const char *const TS_NPN_PROTOCOL_HTTP_2_0 = "h2"; // HTTP/2 over TLS
-const char *const TS_NPN_PROTOCOL_SPDY_1 = "spdy/1"; // obsolete
-const char *const TS_NPN_PROTOCOL_SPDY_2 = "spdy/2";
-const char *const TS_NPN_PROTOCOL_SPDY_3 = "spdy/3";
-const char *const TS_NPN_PROTOCOL_SPDY_3_1 = "spdy/3.1";
-
-const char *const TS_NPN_PROTOCOL_GROUP_HTTP = "http";
+const char *const TS_NPN_PROTOCOL_HTTP_0_9 = "http/0.9";
+const char *const TS_NPN_PROTOCOL_HTTP_1_0 = "http/1.0";
+const char *const TS_NPN_PROTOCOL_HTTP_1_1 = "http/1.1";
+const char *const TS_NPN_PROTOCOL_HTTP_2_0_14 = "h2-14"; // Last H2 interrop draft. TODO: Should be removed later
+const char *const TS_NPN_PROTOCOL_HTTP_2_0 = "h2"; // HTTP/2 over TLS
+const char *const TS_NPN_PROTOCOL_SPDY_1 = "spdy/1"; // obsolete
+const char *const TS_NPN_PROTOCOL_SPDY_2 = "spdy/2";
+const char *const TS_NPN_PROTOCOL_SPDY_3 = "spdy/3";
+const char *const TS_NPN_PROTOCOL_SPDY_3_1 = "spdy/3.1";
+
+const char *const TS_NPN_PROTOCOL_GROUP_HTTP = "http";
const char *const TS_NPN_PROTOCOL_GROUP_HTTP2 = "http2";
-const char *const TS_NPN_PROTOCOL_GROUP_SPDY = "spdy";
+const char *const TS_NPN_PROTOCOL_GROUP_SPDY = "spdy";
// Precomputed indices for ease of use.
int TS_NPN_PROTOCOL_INDEX_HTTP_0_9 = SessionProtocolNameRegistry::INVALID;
int TS_NPN_PROTOCOL_INDEX_HTTP_1_0 = SessionProtocolNameRegistry::INVALID;
int TS_NPN_PROTOCOL_INDEX_HTTP_1_1 = SessionProtocolNameRegistry::INVALID;
int TS_NPN_PROTOCOL_INDEX_HTTP_2_0 = SessionProtocolNameRegistry::INVALID;
-int TS_NPN_PROTOCOL_INDEX_SPDY_1 = SessionProtocolNameRegistry::INVALID;
-int TS_NPN_PROTOCOL_INDEX_SPDY_2 = SessionProtocolNameRegistry::INVALID;
-int TS_NPN_PROTOCOL_INDEX_SPDY_3 = SessionProtocolNameRegistry::INVALID;
+int TS_NPN_PROTOCOL_INDEX_SPDY_1 = SessionProtocolNameRegistry::INVALID;
+int TS_NPN_PROTOCOL_INDEX_SPDY_2 = SessionProtocolNameRegistry::INVALID;
+int TS_NPN_PROTOCOL_INDEX_SPDY_3 = SessionProtocolNameRegistry::INVALID;
int TS_NPN_PROTOCOL_INDEX_SPDY_3_1 = SessionProtocolNameRegistry::INVALID;
// Predefined protocol sets for ease of use.
@@ -106,32 +106,32 @@ char const *const HttpProxyPort::PORTS_CONFIG_NAME = "proxy.config.http.server_p
// Each has a corresponding _LEN value that is the length of the option text.
// Options without _PREFIX are just flags with no additional data.
-char const *const HttpProxyPort::OPT_FD_PREFIX = "fd";
+char const *const HttpProxyPort::OPT_FD_PREFIX = "fd";
char const *const HttpProxyPort::OPT_OUTBOUND_IP_PREFIX = "ip-out";
-char const *const HttpProxyPort::OPT_INBOUND_IP_PREFIX = "ip-in";
-char const *const HttpProxyPort::OPT_HOST_RES_PREFIX = "ip-resolve";
-char const *const HttpProxyPort::OPT_PROTO_PREFIX = "proto";
-
-char const *const HttpProxyPort::OPT_IPV6 = "ipv6";
-char const *const HttpProxyPort::OPT_IPV4 = "ipv4";
-char const *const HttpProxyPort::OPT_TRANSPARENT_INBOUND = "tr-in";
-char const *const HttpProxyPort::OPT_TRANSPARENT_OUTBOUND = "tr-out";
-char const *const HttpProxyPort::OPT_TRANSPARENT_FULL = "tr-full";
+char const *const HttpProxyPort::OPT_INBOUND_IP_PREFIX = "ip-in";
+char const *const HttpProxyPort::OPT_HOST_RES_PREFIX = "ip-resolve";
+char const *const HttpProxyPort::OPT_PROTO_PREFIX = "proto";
+
+char const *const HttpProxyPort::OPT_IPV6 = "ipv6";
+char const *const HttpProxyPort::OPT_IPV4 = "ipv4";
+char const *const HttpProxyPort::OPT_TRANSPARENT_INBOUND = "tr-in";
+char const *const HttpProxyPort::OPT_TRANSPARENT_OUTBOUND = "tr-out";
+char const *const HttpProxyPort::OPT_TRANSPARENT_FULL = "tr-full";
char const *const HttpProxyPort::OPT_TRANSPARENT_PASSTHROUGH = "tr-pass";
-char const *const HttpProxyPort::OPT_SSL = "ssl";
-char const *const HttpProxyPort::OPT_PLUGIN = "plugin";
-char const *const HttpProxyPort::OPT_BLIND_TUNNEL = "blind";
-char const *const HttpProxyPort::OPT_COMPRESSED = "compressed";
+char const *const HttpProxyPort::OPT_SSL = "ssl";
+char const *const HttpProxyPort::OPT_PLUGIN = "plugin";
+char const *const HttpProxyPort::OPT_BLIND_TUNNEL = "blind";
+char const *const HttpProxyPort::OPT_COMPRESSED = "compressed";
// File local constants.
namespace
{
// Length values for _PREFIX options.
-size_t const OPT_FD_PREFIX_LEN = strlen(HttpProxyPort::OPT_FD_PREFIX);
+size_t const OPT_FD_PREFIX_LEN = strlen(HttpProxyPort::OPT_FD_PREFIX);
size_t const OPT_OUTBOUND_IP_PREFIX_LEN = strlen(HttpProxyPort::OPT_OUTBOUND_IP_PREFIX);
-size_t const OPT_INBOUND_IP_PREFIX_LEN = strlen(HttpProxyPort::OPT_INBOUND_IP_PREFIX);
-size_t const OPT_HOST_RES_PREFIX_LEN = strlen(HttpProxyPort::OPT_HOST_RES_PREFIX);
-size_t const OPT_PROTO_PREFIX_LEN = strlen(HttpProxyPort::OPT_PROTO_PREFIX);
+size_t const OPT_INBOUND_IP_PREFIX_LEN = strlen(HttpProxyPort::OPT_INBOUND_IP_PREFIX);
+size_t const OPT_HOST_RES_PREFIX_LEN = strlen(HttpProxyPort::OPT_HOST_RES_PREFIX);
+size_t const OPT_PROTO_PREFIX_LEN = strlen(HttpProxyPort::OPT_PROTO_PREFIX);
}
namespace
@@ -172,7 +172,7 @@ HttpProxyPort *
HttpProxyPort::findHttp(Group const &ports, uint16_t family)
{
bool check_family_p = ats_is_ip(family);
- self *zret = 0;
+ self *zret = 0;
for (int i = 0, n = ports.length(); i < n && !zret; ++i) {
HttpProxyPort &p = ports[i];
if (p.m_port && // has a valid port
@@ -245,18 +245,18 @@ HttpProxyPort::loadValue(Vec<self> &ports, char const *text)
bool
HttpProxyPort::processOptions(char const *opts)
{
- bool zret = false; // found a port?
- bool af_set_p = false; // AF explicitly specified?
+ bool zret = false; // found a port?
+ bool af_set_p = false; // AF explicitly specified?
bool host_res_set_p = false; // Host resolution order set explicitly?
- bool sp_set_p = false; // Session protocol set explicitly?
- bool bracket_p = false; // found an open bracket in the input?
+ bool sp_set_p = false; // Session protocol set explicitly?
+ bool bracket_p = false; // found an open bracket in the input?
char const *value; // Temp holder for value of a prefix option.
IpAddr ip; // temp for loading IP addresses.
Vec<char *> values; // Pointers to single option values.
// Make a copy we can modify safely.
size_t opts_len = strlen(opts) + 1;
- char *text = static_cast<char *>(alloca(opts_len));
+ char *text = static_cast<char *>(alloca(opts_len));
memcpy(text, opts, opts_len);
// Split the copy in to tokens.
@@ -294,7 +294,7 @@ HttpProxyPort::processOptions(char const *opts)
Warning("Port value '%s' out of range (1..65535) in port configuration '%s'", item, opts);
} else {
m_port = port;
- zret = true;
+ zret = true;
}
} else if (0 != (value = this->checkPrefix(item, OPT_FD_PREFIX, OPT_FD_PREFIX_LEN))) {
char *ptr; // tmp for syntax check.
@@ -343,7 +343,7 @@ HttpProxyPort::processOptions(char const *opts)
#endif
} else if (0 == strcasecmp(OPT_TRANSPARENT_FULL, item)) {
#if TS_USE_TPROXY
- m_inbound_transparent_p = true;
+ m_inbound_transparent_p = true;
m_outbound_transparent_p = true;
#else
Warning("Transparency requested [%s] in port descriptor '%s' but TPROXY was not configured.", item, opts);
@@ -532,7 +532,7 @@ HttpProxyPort::print(char *out, size_t n)
// session protocol options - look for condensed options first
// first two cases are the defaults so if those match, print nothing.
SessionProtocolSet sp_set = m_session_protocol_preference; // need to modify so copy.
- need_colon_p = true; // for listing case, turned off if we do a special case.
+ need_colon_p = true; // for listing case, turned off if we do a special case.
if (sp_set == DEFAULT_NON_TLS_SESSION_PROTOCOL_SET && !this->isSSL()) {
sp_set.markOut(DEFAULT_NON_TLS_SESSION_PROTOCOL_SET);
} else if (sp_set == DEFAULT_TLS_SESSION_PROTOCOL_SET && this->isSSL()) {
@@ -601,9 +601,9 @@ ts_session_protocol_well_known_name_indices_init()
TS_NPN_PROTOCOL_INDEX_HTTP_1_0 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_HTTP_1_0);
TS_NPN_PROTOCOL_INDEX_HTTP_1_1 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_HTTP_1_1);
TS_NPN_PROTOCOL_INDEX_HTTP_2_0 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_HTTP_2_0);
- TS_NPN_PROTOCOL_INDEX_SPDY_1 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_1);
- TS_NPN_PROTOCOL_INDEX_SPDY_2 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_2);
- TS_NPN_PROTOCOL_INDEX_SPDY_3 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_3);
+ TS_NPN_PROTOCOL_INDEX_SPDY_1 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_1);
+ TS_NPN_PROTOCOL_INDEX_SPDY_2 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_2);
+ TS_NPN_PROTOCOL_INDEX_SPDY_3 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_3);
TS_NPN_PROTOCOL_INDEX_SPDY_3_1 = globalSessionProtocolNameRegistry.toIndexConst(TS_NPN_PROTOCOL_SPDY_3_1);
// Now do the predefined protocol sets.
@@ -648,7 +648,7 @@ SessionProtocolNameRegistry::toIndex(char const *name)
if (m_n < static_cast<size_t>(MAX)) {
m_names[m_n] = ats_strdup(name);
m_flags[m_n] = F_ALLOCATED;
- zret = m_n++;
+ zret = m_n++;
} else {
ink_release_assert(!"Session protocol name registry overflow");
}
@@ -663,7 +663,7 @@ SessionProtocolNameRegistry::toIndexConst(char const *name)
if (INVALID == zret) {
if (m_n < static_cast<size_t>(MAX)) {
m_names[m_n] = name;
- zret = m_n++;
+ zret = m_n++;
} else {
ink_release_assert(!"Session protocol name registry overflow");
}
diff --git a/lib/records/RecLocal.cc b/lib/records/RecLocal.cc
index 489b4cc..5df9220 100644
--- a/lib/records/RecLocal.cc
+++ b/lib/records/RecLocal.cc
@@ -62,7 +62,7 @@ i_am_the_record_owner(RecT rec_type)
static void *
sync_thr(void *data)
{
- textBuffer *tb = new textBuffer(65536);
+ textBuffer *tb = new textBuffer(65536);
FileManager *configFiles = (FileManager *)data;
Rollback *rb;
@@ -246,7 +246,7 @@ RecMessageSend(RecMessage *msg)
// Make a copy of the record, but truncate it to the size actually used
if (g_mode_type == RECM_CLIENT || g_mode_type == RECM_SERVER) {
msg->o_end = msg->o_write;
- msg_size = sizeof(RecMessageHdr) + (msg->o_write - msg->o_start);
+ msg_size = sizeof(RecMessageHdr) + (msg->o_write - msg->o_start);
lmgmt->signalEvent(MGMT_EVENT_LIBRECORDS, (char *)msg, msg_size);
}
diff --git a/lib/records/RecMessage.cc b/lib/records/RecMessage.cc
index 48bb284..840521e 100644
--- a/lib/records/RecMessage.cc
+++ b/lib/records/RecMessage.cc
@@ -33,7 +33,7 @@
#include "ts/I_Layout.h"
static RecMessageRecvCb g_recv_cb = NULL;
-static void *g_recv_cookie = NULL;
+static void *g_recv_cookie = NULL;
//-------------------------------------------------------------------------
// RecMessageAlloc
@@ -46,10 +46,10 @@ RecMessageAlloc(RecMessageT msg_type, int initial_size)
msg = (RecMessage *)ats_malloc(sizeof(RecMessageHdr) + initial_size);
memset(msg, 0, sizeof(RecMessageHdr) + initial_size);
msg->msg_type = msg_type;
- msg->o_start = sizeof(RecMessageHdr);
- msg->o_write = sizeof(RecMessageHdr);
- msg->o_end = sizeof(RecMessageHdr) + initial_size;
- msg->entries = 0;
+ msg->o_start = sizeof(RecMessageHdr);
+ msg->o_write = sizeof(RecMessageHdr);
+ msg->o_end = sizeof(RecMessageHdr) + initial_size;
+ msg->entries = 0;
return msg;
}
@@ -72,10 +72,10 @@ RecMessage *
RecMessageMarshal_Realloc(RecMessage *msg, const RecRecord *record)
{
int msg_ele_size;
- int rec_name_len = -1;
- int rec_data_str_len = -1;
+ int rec_name_len = -1;
+ int rec_data_str_len = -1;
int rec_data_def_str_len = -1;
- int rec_cfg_chk_len = -1;
+ int rec_cfg_chk_len = -1;
RecMessageEleHdr *ele_hdr;
RecRecord *r;
char *p;
@@ -109,8 +109,8 @@ RecMessageMarshal_Realloc(RecMessage *msg, const RecRecord *record)
// get some space in our buffer
while (msg->o_end - msg->o_write < msg_ele_size) {
int realloc_size = (msg->o_end - msg->o_start) * 2;
- msg = (RecMessage *)ats_realloc(msg, sizeof(RecMessageHdr) + realloc_size);
- msg->o_end = msg->o_start + realloc_size;
+ msg = (RecMessage *)ats_realloc(msg, sizeof(RecMessageHdr) + realloc_size);
+ msg->o_end = msg->o_start + realloc_size;
}
ele_hdr = (RecMessageEleHdr *)((char *)msg + msg->o_write);
// The following memset() is pretty CPU intensive, replacing it with something
@@ -120,9 +120,9 @@ RecMessageMarshal_Realloc(RecMessage *msg, const RecRecord *record)
msg->o_write += msg_ele_size;
// store the record
- ele_hdr->magic = REC_MESSAGE_ELE_MAGIC;
+ ele_hdr->magic = REC_MESSAGE_ELE_MAGIC;
ele_hdr->o_next = msg->o_write;
- p = (char *)ele_hdr + sizeof(RecMessageEleHdr);
+ p = (char *)ele_hdr + sizeof(RecMessageEleHdr);
memcpy(p, record, sizeof(RecRecord));
r = (RecRecord *)p;
p += sizeof(RecRecord);
@@ -163,7 +163,7 @@ int
RecMessageUnmarshalFirst(RecMessage *msg, RecMessageItr *itr, RecRecord **record)
{
itr->ele_hdr = (RecMessageEleHdr *)((char *)msg + msg->o_start);
- itr->next = 1;
+ itr->next = 1;
return RecMessageUnmarshalNext(msg, NULL, record);
}
@@ -234,7 +234,7 @@ RecMessageRegisterRecvCb(RecMessageRecvCb recv_cb, void *cookie)
return REC_ERR_FAIL;
}
g_recv_cookie = cookie;
- g_recv_cb = recv_cb;
+ g_recv_cb = recv_cb;
return REC_ERR_OKAY;
}
diff --git a/lib/records/RecMutex.cc b/lib/records/RecMutex.cc
index 35d0190..94fcf1b 100644
--- a/lib/records/RecMutex.cc
+++ b/lib/records/RecMutex.cc
@@ -28,7 +28,7 @@ int
rec_mutex_init(RecMutex *m, const char *name)
{
m->nthread_holding = 0;
- m->thread_holding = 0;
+ m->thread_holding = 0;
return ink_mutex_init(&(m->the_mutex), name);
}
diff --git a/lib/records/RecProcess.cc b/lib/records/RecProcess.cc
index e6944b6..0a66f32 100644
--- a/lib/records/RecProcess.cc
+++ b/lib/records/RecProcess.cc
@@ -38,11 +38,11 @@
// Marks whether the message handler has been initialized.
static bool message_initialized_p = false;
-static bool g_started = false;
+static bool g_started = false;
static EventNotify g_force_req_notify;
static int g_rec_raw_stat_sync_interval_ms = REC_RAW_STAT_SYNC_INTERVAL_MS;
static int g_rec_config_update_interval_ms = REC_CONFIG_UPDATE_INTERVAL_MS;
-static int g_rec_remote_sync_interval_ms = REC_REMOTE_SYNC_INTERVAL_MS;
+static int g_rec_remote_sync_interval_ms = REC_REMOTE_SYNC_INTERVAL_MS;
static Event *raw_stat_sync_cont_event;
static Event *config_update_cont_event;
static Event *sync_cont_event;
@@ -343,7 +343,7 @@ RecMessageSend(RecMessage *msg)
// Make a copy of the record, but truncate it to the size actually used
if (g_mode_type == RECM_CLIENT || g_mode_type == RECM_SERVER) {
msg->o_end = msg->o_write;
- msg_size = sizeof(RecMessageHdr) + (msg->o_write - msg->o_start);
+ msg_size = sizeof(RecMessageHdr) + (msg->o_write - msg->o_start);
pmgmt->signalManager(MGMT_SIGNAL_LIBRECORDS, (char *)msg, msg_size);
}
diff --git a/lib/records/RecRawStats.cc b/lib/records/RecRawStats.cc
index 7737168..d998907 100644
--- a/lib/records/RecRawStats.cc
+++ b/lib/records/RecRawStats.cc
@@ -33,11 +33,11 @@ raw_stat_get_total(RecRawStatBlock *rsb, int id, RecRawStat *total)
int i;
RecRawStat *tlp;
- total->sum = 0;
+ total->sum = 0;
total->count = 0;
// get global values
- total->sum = rsb->global[id]->sum;
+ total->sum = rsb->global[id]->sum;
total->count = rsb->global[id]->count;
// get thread local values
@@ -70,7 +70,7 @@ raw_stat_sync_to_global(RecRawStatBlock *rsb, int id)
RecRawStat *tlp;
RecRawStat total;
- total.sum = 0;
+ total.sum = 0;
total.count = 0;
// sum the thread local values
@@ -95,7 +95,7 @@ raw_stat_sync_to_global(RecRawStatBlock *rsb, int id)
// get the delta from the last sync
RecRawStat delta;
- delta.sum = total.sum - rsb->global[id]->last_sum;
+ delta.sum = total.sum - rsb->global[id]->last_sum;
delta.count = total.count - rsb->global[id]->last_count;
// This is too verbose now, so leaving it out / leif
@@ -227,7 +227,7 @@ RecAllocateRawStatBlock(int num_stats)
rsb = (RecRawStatBlock *)ats_malloc(sizeof(RecRawStatBlock));
memset(rsb, 0, sizeof(RecRawStatBlock));
rsb->ethr_stat_offset = ethr_stat_offset;
- rsb->global = (RecRawStat **)ats_malloc(num_stats * sizeof(RecRawStat *));
+ rsb->global = (RecRawStat **)ats_malloc(num_stats * sizeof(RecRawStat *));
memset(rsb->global, 0, num_stats * sizeof(RecRawStat *));
rsb->num_stats = 0;
rsb->max_stats = num_stats;
@@ -266,8 +266,8 @@ _RecRegisterRawStat(RecRawStatBlock *rsb, RecT rec_type, const char *name, RecDa
}
// store a pointer to our record->stat_meta.data_raw in our rsb
- rsb->global[id] = &(r->stat_meta.data_raw);
- rsb->global[id]->last_sum = 0;
+ rsb->global[id] = &(r->stat_meta.data_raw);
+ rsb->global[id]->last_sum = 0;
rsb->global[id]->last_count = 0;
// setup the periodic sync callback
@@ -291,7 +291,7 @@ RecRawStatSyncSum(const char *name, RecDataT data_type, RecData *data, RecRawSta
Debug("stats", "raw sync:sum for %s", name);
raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
+ total.sum = rsb->global[id]->sum;
total.count = rsb->global[id]->count;
RecDataSetFromInk64(data_type, data, total.sum);
@@ -305,7 +305,7 @@ RecRawStatSyncCount(const char *name, RecDataT data_type, RecData *data, RecRawS
Debug("stats", "raw sync:count for %s", name);
raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
+ total.sum = rsb->global[id]->sum;
total.count = rsb->global[id]->count;
RecDataSetFromInk64(data_type, data, total.count);
@@ -320,7 +320,7 @@ RecRawStatSyncAvg(const char *name, RecDataT data_type, RecData *data, RecRawSta
Debug("stats", "raw sync:avg for %s", name);
raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
+ total.sum = rsb->global[id]->sum;
total.count = rsb->global[id]->count;
if (total.count != 0)
avg = (float)((double)total.sum / (double)total.count);
@@ -336,7 +336,7 @@ RecRawStatSyncHrTimeAvg(const char *name, RecDataT data_type, RecData *data, Rec
Debug("stats", "raw sync:hr-timeavg for %s", name);
raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
+ total.sum = rsb->global[id]->sum;
total.count = rsb->global[id]->count;
if (total.count == 0) {
r = 0.0f;
@@ -356,7 +356,7 @@ RecRawStatSyncIntMsecsToFloatSeconds(const char *name, RecDataT data_type, RecDa
Debug("stats", "raw sync:seconds for %s", name);
raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
+ total.sum = rsb->global[id]->sum;
total.count = rsb->global[id]->count;
if (total.count == 0) {
r = 0.0f;
@@ -375,7 +375,7 @@ RecRawStatSyncMHrTimeAvg(const char *name, RecDataT data_type, RecData *data, Re
Debug("stats", "raw sync:mhr-timeavg for %s", name);
raw_stat_sync_to_global(rsb, id);
- total.sum = rsb->global[id]->sum;
+ total.sum = rsb->global[id]->sum;
total.count = rsb->global[id]->count;
if (total.count == 0) {
r = 0.0f;
@@ -540,11 +540,11 @@ RecRegisterRawStatSyncCb(const char *name, RecRawStatSyncCb sync_cb, RecRawStatB
rec_mutex_acquire(&(r->lock));
if (REC_TYPE_IS_STAT(r->rec_type)) {
if (!(r->stat_meta.sync_cb)) {
- r->stat_meta.sync_rsb = rsb;
- r->stat_meta.sync_id = id;
- r->stat_meta.sync_cb = sync_cb;
+ r->stat_meta.sync_rsb = rsb;
+ r->stat_meta.sync_id = id;
+ r->stat_meta.sync_cb = sync_cb;
r->stat_meta.sync_rsb->global[r->stat_meta.sync_id]->version = r->version;
- err = REC_ERR_OKAY;
+ err = REC_ERR_OKAY;
} else {
ink_release_assert(false); // We shouldn't register CBs twice...
}
diff --git a/lib/records/RecUtils.cc b/lib/records/RecUtils.cc
index d58c0ab..28f478b 100644
--- a/lib/records/RecUtils.cc
+++ b/lib/records/RecUtils.cc
@@ -54,13 +54,13 @@ RecAlloc(RecT rec_type, const char *name, RecDataT data_type)
return NULL;
}
- int i = ink_atomic_increment(&g_num_records, 1);
+ int i = ink_atomic_increment(&g_num_records, 1);
RecRecord *r = &(g_records[i]);
RecRecordInit(r);
- r->rec_type = rec_type;
- r->name = ats_strdup(name);
- r->order = i;
+ r->rec_type = rec_type;
+ r->name = ats_strdup(name);
+ r->order = i;
r->data_type = data_type;
return r;
@@ -136,7 +136,7 @@ RecDataSet(RecDataT data_type, RecData *data_dst, RecData *data_src)
if (data_dst->rec_string != NULL) {
ats_free(data_dst->rec_string);
data_dst->rec_string = NULL;
- rec_set = true;
+ rec_set = true;
}
} else if (((data_dst->rec_string) && (strcmp(data_dst->rec_string, data_src->rec_string) != 0)) ||
((data_dst->rec_string == NULL) && (data_src->rec_string != NULL))) {
@@ -144,7 +144,7 @@ RecDataSet(RecDataT data_type, RecData *data_dst, RecData *data_src)
ats_free(data_dst->rec_string);
data_dst->rec_string = ats_strdup(data_src->rec_string);
- rec_set = true;
+ rec_set = true;
// Chop trailing spaces
char *end = data_dst->rec_string + strlen(data_dst->rec_string) - 1;
@@ -156,19 +156,19 @@ RecDataSet(RecDataT data_type, RecData *data_dst, RecData *data_src)
case RECD_INT:
if (data_dst->rec_int != data_src->rec_int) {
data_dst->rec_int = data_src->rec_int;
- rec_set = true;
+ rec_set = true;
}
break;
case RECD_FLOAT:
if (data_dst->rec_float != data_src->rec_float) {
data_dst->rec_float = data_src->rec_float;
- rec_set = true;
+ rec_set = true;
}
break;
case RECD_COUNTER:
if (data_dst->rec_counter != data_src->rec_counter) {
data_dst->rec_counter = data_src->rec_counter;
- rec_set = true;
+ rec_set = true;
}
break;
default:
diff --git a/lib/ts/Allocator.h b/lib/ts/Allocator.h
index 135ddfd..7df42f9 100644
--- a/lib/ts/Allocator.h
+++ b/lib/ts/Allocator.h
@@ -216,7 +216,7 @@ public:
{
void *callstack[3];
int frames = backtrace(callstack, 3);
- C *ptr = ClassAllocator<C>::alloc();
+ C *ptr = ClassAllocator<C>::alloc();
const void *symbol = NULL;
if (frames == 3 && callstack[2] != NULL) {
diff --git a/lib/ts/Arena.cc b/lib/ts/Arena.cc
index 41c4513..31a8525 100644
--- a/lib/ts/Arena.cc
+++ b/lib/ts/Arena.cc
@@ -47,8 +47,8 @@ blk_alloc(int size)
blk = (ArenaBlock *)ats_malloc(size + sizeof(ArenaBlock) - 8);
}
- blk->next = NULL;
- blk->m_heap_end = &blk->data[size];
+ blk->next = NULL;
+ blk->m_heap_end = &blk->data[size];
blk->m_water_level = &blk->data[0];
return blk;
@@ -114,8 +114,8 @@ Arena::alloc(size_t size, size_t alignment)
block_size = DEFAULT_BLOCK_SIZE;
}
- b = blk_alloc(block_size);
- b->next = m_blocks;
+ b = blk_alloc(block_size);
+ b->next = m_blocks;
m_blocks = b;
mem = block_alloc(b, size, alignment);
diff --git a/lib/ts/Arena.h b/lib/ts/Arena.h
index 978d234..1ced5a4 100644
--- a/lib/ts/Arena.h
+++ b/lib/ts/Arena.h
@@ -102,7 +102,7 @@ Arena::str_alloc(size_t len)
size_t tmp;
size = len + 1 + 1;
- tmp = len;
+ tmp = len;
while (tmp >= 128) {
size += 1;
@@ -112,7 +112,7 @@ Arena::str_alloc(size_t len)
mem = (unsigned char *)alloc(size, 1);
mem += (size - len - 1);
- p = mem - 1;
+ p = mem - 1;
tmp = len;
while (tmp >= 128) {
diff --git a/lib/ts/BaseLogFile.cc b/lib/ts/BaseLogFile.cc
index 15793b8..c18232b 100644
--- a/lib/ts/BaseLogFile.cc
+++ b/lib/ts/BaseLogFile.cc
@@ -84,15 +84,15 @@ BaseLogFile::~BaseLogFile()
void
BaseLogFile::init(const char *name)
{
- m_fp = NULL;
- m_start_time = time(0);
- m_end_time = 0L;
+ m_fp = NULL;
+ m_start_time = time(0);
+ m_end_time = 0L;
m_bytes_written = 0;
- m_name = ats_strdup(name);
- m_hostname = NULL;
- m_is_regfile = false;
- m_is_init = false;
- m_meta_info = NULL;
+ m_name = ats_strdup(name);
+ m_hostname = NULL;
+ m_is_regfile = false;
+ m_is_init = false;
+ m_meta_info = NULL;
}
/*
@@ -157,7 +157,7 @@ BaseLogFile::roll(long interval_start, long interval_end)
// Start with conservative values for the start and end bounds, then
// try to refine.
start = 0L;
- end = (interval_end >= m_end_time) ? interval_end : m_end_time;
+ end = (interval_end >= m_end_time) ? interval_end : m_end_time;
if (m_meta_info->data_from_metafile()) {
// If the metadata came from the metafile, this means that
@@ -217,7 +217,7 @@ BaseLogFile::roll(long interval_start, long interval_end)
}
// reset m_start_time
- m_start_time = 0;
+ m_start_time = 0;
m_bytes_written = 0;
log_log_trace("The logfile %s was rolled to %s.\n", m_name.get(), roll_name);
@@ -258,7 +258,7 @@ bool
BaseLogFile::rolled_logfile(char *path)
{
const int target_len = (int)strlen(LOGFILE_ROLLED_EXTENSION);
- int len = (int)strlen(path);
+ int len = (int)strlen(path);
if (len > target_len) {
char *str = &path[len - target_len];
if (!strcmp(str, LOGFILE_ROLLED_EXTENSION)) {
@@ -295,12 +295,12 @@ BaseLogFile::open_file(int perm)
return LOG_FILE_COULD_NOT_OPEN_FILE;
} else if (!strcmp(m_name.get(), "stdout")) {
log_log_trace("BaseLogFile: stdout opened\n");
- m_fp = stdout;
+ m_fp = stdout;
m_is_init = true;
return LOG_FILE_NO_ERROR;
} else if (!strcmp(m_name.get(), "stderr")) {
log_log_trace("BaseLogFile: stderr opened\n");
- m_fp = stderr;
+ m_fp = stderr;
m_is_init = true;
return LOG_FILE_NO_ERROR;
}
@@ -366,7 +366,7 @@ BaseLogFile::close_file()
if (is_open()) {
fclose(m_fp);
log_log_trace("BaseLogFile %s is closed\n", m_name.get());
- m_fp = NULL;
+ m_fp = NULL;
m_is_init = false;
}
}
@@ -405,7 +405,7 @@ BaseLogFile::log_log(LogLogPriorityLevel priority, const char *format, ...)
va_list args;
const char *priority_name = NULL;
- FILE *output = stdout;
+ FILE *output = stdout;
switch (priority) {
case LL_Debug:
priority_name = "DEBUG";
@@ -415,15 +415,15 @@ BaseLogFile::log_log(LogLogPriorityLevel priority, const char *format, ...)
break;
case LL_Warning:
priority_name = "WARNING";
- output = stderr;
+ output = stderr;
break;
case LL_Error:
priority_name = "ERROR";
- output = stderr;
+ output = stderr;
break;
case LL_Fatal:
priority_name = "FATAL";
- output = stderr;
+ output = stderr;
break;
default:
priority_name = "unknown priority";
diff --git a/lib/ts/BaseLogFile.h b/lib/ts/BaseLogFile.h
index 5a10d3d..ee86605 100644
--- a/lib/ts/BaseLogFile.h
+++ b/lib/ts/BaseLogFile.h
@@ -81,7 +81,7 @@ public:
DATA_FROM_METAFILE = 1, // metadata was read (or attempted to)
// from metafile
VALID_CREATION_TIME = 2, // creation time is valid
- VALID_SIGNATURE = 4, // signature is valid
+ VALID_SIGNATURE = 4, // signature is valid
// (i.e., creation time only)
FILE_OPEN_SUCCESSFUL = 8 // metafile was opened successfully
};
diff --git a/lib/ts/Bitops.h b/lib/ts/Bitops.h
index 078098e..77f6656 100644
--- a/lib/ts/Bitops.h
+++ b/lib/ts/Bitops.h
@@ -130,8 +130,8 @@ bitops_next_set(unsigned char *start, unsigned char *end, int offset)
int t;
idx = 0;
- p = start + offset / 8;
- t = (offset % 8) + 1;
+ p = start + offset / 8;
+ t = (offset % 8) + 1;
while (p != end) {
idx = bit_table[*p];
@@ -171,11 +171,11 @@ bitops_next_unset(unsigned char *start, unsigned char *end, int offset)
int t;
idx = 0;
- p = start + offset / 8;
- t = (offset % 8) + 1;
+ p = start + offset / 8;
+ t = (offset % 8) + 1;
while (p != end) {
- c = ~(*p);
+ c = ~(*p);
idx = bit_table[c];
if (idx) {
while (idx && (idx <= (size_t)t)) {
diff --git a/lib/ts/CompileParseRules.cc b/lib/ts/CompileParseRules.cc
index efb39a0..dacd040 100644
--- a/lib/ts/CompileParseRules.cc
+++ b/lib/ts/CompileParseRules.cc
@@ -26,8 +26,8 @@
#include "ts/ParseRules.h"
const unsigned int parseRulesCType[256] = {0};
-const char parseRulesCTypeToUpper[256] = {0};
-const char parseRulesCTypeToLower[256] = {0};
+const char parseRulesCTypeToUpper[256] = {0};
+const char parseRulesCTypeToLower[256] = {0};
unsigned int tparseRulesCType[256];
char tparseRulesCTypeToUpper[256];
@@ -54,7 +54,7 @@ main()
{
int c;
for (c = 0; c < 256; c++) {
- tparseRulesCType[c] = 0;
+ tparseRulesCType[c] = 0;
tparseRulesCTypeToLower[c] = ParseRules::ink_tolower(c);
tparseRulesCTypeToUpper[c] = ParseRules::ink_toupper(c);
diff --git a/lib/ts/Diags.cc b/lib/ts/Diags.cc
index 4d8b55f..d50b2e9 100644
--- a/lib/ts/Diags.cc
+++ b/lib/ts/Diags.cc
@@ -44,7 +44,7 @@
#include "ts/ink_thread.h"
#include "ts/Diags.h"
-int diags_on_for_plugins = 0;
+int diags_on_for_plugins = 0;
bool DiagsConfigState::enabled[2] = {false, false};
// Global, used for all diagnostics
@@ -141,14 +141,14 @@ Diags::Diags(const char *bdt, const char *bat, BaseLogFile *_diags_log)
base_action_tags = ats_strdup(bat);
}
- config.enabled[DiagsTagType_Debug] = (base_debug_tags != NULL);
+ config.enabled[DiagsTagType_Debug] = (base_debug_tags != NULL);
config.enabled[DiagsTagType_Action] = (base_action_tags != NULL);
- diags_on_for_plugins = config.enabled[DiagsTagType_Debug];
+ diags_on_for_plugins = config.enabled[DiagsTagType_Debug];
for (i = 0; i < DiagsLevel_Count; i++) {
- config.outputs[i].to_stdout = false;
- config.outputs[i].to_stderr = false;
- config.outputs[i].to_syslog = false;
+ config.outputs[i].to_stdout = false;
+ config.outputs[i].to_stderr = false;
+ config.outputs[i].to_syslog = false;
config.outputs[i].to_diagslog = true;
}
@@ -167,19 +167,19 @@ Diags::Diags(const char *bdt, const char *bat, BaseLogFile *_diags_log)
// start off with empty tag tables, will build in reconfigure() //
//////////////////////////////////////////////////////////////////
- activated_tags[DiagsTagType_Debug] = NULL;
+ activated_tags[DiagsTagType_Debug] = NULL;
activated_tags[DiagsTagType_Action] = NULL;
- prefix_str = "";
+ prefix_str = "";
- outputlog_rolling_enabled = RollingEnabledValues::NO_ROLLING;
+ outputlog_rolling_enabled = RollingEnabledValues::NO_ROLLING;
outputlog_rolling_interval = -1;
- outputlog_rolling_size = -1;
- diagslog_rolling_enabled = RollingEnabledValues::NO_ROLLING;
- diagslog_rolling_interval = -1;
- diagslog_rolling_size = -1;
+ outputlog_rolling_size = -1;
+ diagslog_rolling_enabled = RollingEnabledValues::NO_ROLLING;
+ diagslog_rolling_interval = -1;
+ diagslog_rolling_size = -1;
outputlog_time_last_roll = time(0);
- diagslog_time_last_roll = time(0);
+ diagslog_time_last_roll = time(0);
}
Diags::~Diags()
@@ -249,7 +249,7 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
// and format_buf_w_ts has the same thing with a prepended timestamp. //
////////////////////////////////////////////////////////////////////////
- format_buf[0] = NUL;
+ format_buf[0] = NUL;
format_buf_w_ts[0] = NUL;
/////////////////////////////////////////////////////
@@ -257,7 +257,7 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
// points to the current available character //
/////////////////////////////////////////////////////
- end_of_format = format_buf;
+ end_of_format = format_buf;
*end_of_format = NUL;
// add the thread id
@@ -310,17 +310,17 @@ Diags::print_va(const char *debug_tag, DiagsLevel diags_level, const SrcLoc *loc
// prepend timestamp into the timestamped version of the buffer //
//////////////////////////////////////////////////////////////////
- tp = ink_gettimeofday();
+ tp = ink_gettimeofday();
time_t cur_clock = (time_t)tp.tv_sec;
- buffer = ink_ctime_r(&cur_clock, timestamp_buf);
+ buffer = ink_ctime_r(&cur_clock, timestamp_buf);
snprintf(&(timestamp_buf[19]), (sizeof(timestamp_buf) - 20), ".%03d", (int)(tp.tv_usec / 1000));
- d = format_buf_w_ts;
+ d = format_buf_w_ts;
*d++ = '[';
for (int i = 4; buffer[i]; i++)
*d++ = buffer[i];
- *d++ = ']';
- *d++ = ' ';
+ *d++ = ']';
+ *d++ = ' ';
for (int k = 0; prefix_str[k]; k++)
*d++ = prefix_str[k];
@@ -607,17 +607,17 @@ setup_diagslog(BaseLogFile *blf)
void
Diags::config_roll_diagslog(RollingEnabledValues re, int ri, int rs)
{
- diagslog_rolling_enabled = re;
+ diagslog_rolling_enabled = re;
diagslog_rolling_interval = ri;
- diagslog_rolling_size = rs;
+ diagslog_rolling_size = rs;
}
void
Diags::config_roll_outputlog(RollingEnabledValues re, int ri, int rs)
{
- outputlog_rolling_enabled = re;
+ outputlog_rolling_enabled = re;
outputlog_rolling_interval = ri;
- outputlog_rolling_size = rs;
+ outputlog_rolling_size = rs;
}
/*
@@ -673,7 +673,7 @@ Diags::should_roll_diagslog()
fflush(diags_log->m_fp);
if (diags_log->roll()) {
diagslog_time_last_roll = now;
- char *oldname = ats_strdup(diags_log->get_name());
+ char *oldname = ats_strdup(diags_log->get_name());
log_log_trace("in should_roll_logs() for diags.log, oldname=%s\n", oldname);
BaseLogFile *n = new BaseLogFile(oldname);
if (setup_diagslog(n)) {
@@ -710,7 +710,7 @@ Diags::should_roll_outputlog()
ink_assert(stdout_log != NULL);
ink_assert(stderr_log != NULL);
- bool ret_val = false;
+ bool ret_val = false;
bool need_consider_stderr = true;
/*
@@ -765,7 +765,7 @@ Diags::should_roll_outputlog()
if (stdout_log->roll()) {
outputlog_time_last_roll = now;
- char *oldname = ats_strdup(stdout_log->get_name());
+ char *oldname = ats_strdup(stdout_log->get_name());
log_log_trace("in should_roll_logs(), oldname=%s\n", oldname);
set_stdout_output(oldname);
diff --git a/lib/ts/Diags.h b/lib/ts/Diags.h
index fc01fc7..06f136d 100644
--- a/lib/ts/Diags.h
+++ b/lib/ts/Diags.h
@@ -50,7 +50,7 @@ class Diags;
// extern int diags_on_for_plugins;
typedef enum {
- DiagsTagType_Debug = 0, // do not renumber --- used as array index
+ DiagsTagType_Debug = 0, // do not renumber --- used as array index
DiagsTagType_Action = 1
} DiagsTagType;
diff --git a/lib/ts/DynArray.h b/lib/ts/DynArray.h
index dff136f..d991d5c 100644
--- a/lib/ts/DynArray.h
+++ b/lib/ts/DynArray.h
@@ -122,7 +122,7 @@ DynArray<T>::detach()
{
T *d;
- d = data;
+ d = data;
data = NULL;
return d;
@@ -152,7 +152,7 @@ DynArray<T>::clear()
}
size = 0;
- pos = -1;
+ pos = -1;
}
template <class T>
diff --git a/lib/ts/EventNotify.cc b/lib/ts/EventNotify.cc
index 8cff3fc..4c0d537 100644
--- a/lib/ts/EventNotify.cc
+++ b/lib/ts/EventNotify.cc
@@ -53,7 +53,7 @@ EventNotify::EventNotify()
}
ink_release_assert(m_event_fd != -1);
- ev.events = EPOLLIN;
+ ev.events = EPOLLIN;
ev.data.fd = m_event_fd;
m_epoll_fd = epoll_create(1);
diff --git a/lib/ts/Hash.h b/lib/ts/Hash.h
index 31d05ae..89fa1cf 100644
--- a/lib/ts/Hash.h
+++ b/lib/ts/Hash.h
@@ -51,7 +51,7 @@ struct ATSHash : ATSHashBase {
};
virtual const void *get(void) const = 0;
- virtual size_t size(void) const = 0;
+ virtual size_t size(void) const = 0;
virtual bool operator==(const ATSHash &) const;
};
diff --git a/lib/ts/HashMD5.cc b/lib/ts/HashMD5.cc
index c771c13..ae6e051 100644
--- a/lib/ts/HashMD5.cc
+++ b/lib/ts/HashMD5.cc
@@ -24,7 +24,7 @@
ATSHashMD5::ATSHashMD5(void)
{
EVP_DigestInit(&ctx, EVP_md5());
- md_len = 0;
+ md_len = 0;
finalized = false;
}
@@ -66,7 +66,7 @@ ATSHashMD5::clear(void)
{
EVP_MD_CTX_cleanup(&ctx);
EVP_DigestInit(&ctx, EVP_md5());
- md_len = 0;
+ md_len = 0;
finalized = false;
}
diff --git a/lib/ts/HashSip.cc b/lib/ts/HashSip.cc
index 22899d6..714304f 100644
--- a/lib/ts/HashSip.cc
+++ b/lib/ts/HashSip.cc
@@ -117,7 +117,7 @@ ATSHash64Sip24::final(void)
SIPCOMPRESS(v0, v1, v2, v3);
SIPCOMPRESS(v0, v1, v2, v3);
SIPCOMPRESS(v0, v1, v2, v3);
- hfinal = v0 ^ v1 ^ v2 ^ v3;
+ hfinal = v0 ^ v1 ^ v2 ^ v3;
finalized = true;
}
}
@@ -135,11 +135,11 @@ ATSHash64Sip24::get(void) const
void
ATSHash64Sip24::clear(void)
{
- v0 = k0 ^ 0x736f6d6570736575ull;
- v1 = k1 ^ 0x646f72616e646f6dull;
- v2 = k0 ^ 0x6c7967656e657261ull;
- v3 = k1 ^ 0x7465646279746573ull;
- finalized = false;
- total_len = 0;
+ v0 = k0 ^ 0x736f6d6570736575ull;
+ v1 = k1 ^ 0x646f72616e646f6dull;
+ v2 = k0 ^ 0x6c7967656e657261ull;
+ v3 = k1 ^ 0x7465646279746573ull;
+ finalized = false;
+ total_len = 0;
block_buffer_len = 0;
}
diff --git a/lib/ts/HostLookup.cc b/lib/ts/HostLookup.cc
index ae3d22f..0ef3a9c 100644
--- a/lib/ts/HostLookup.cc
+++ b/lib/ts/HostLookup.cc
@@ -47,7 +47,7 @@ domaincmp(const char *hostname, const char *domain)
ink_assert(hostname != NULL);
ink_assert(domain != NULL);
- const char *host_cur = hostname + strlen(hostname);
+ const char *host_cur = hostname + strlen(hostname);
const char *domain_cur = domain + strlen(domain);
// Check to see if were passed emtpy stings for either
@@ -357,7 +357,7 @@ charIndex::Insert(const char *match_data, HostBranch *toInsert)
{
unsigned char index;
const char *match_start = match_data;
- charIndex_el *cur = root;
+ charIndex_el *cur = root;
charIndex_el *next;
if (*match_data == '\0') {
@@ -394,7 +394,7 @@ charIndex::Insert(const char *match_data, HostBranch *toInsert)
// Check to see if we need to expand the table
if (next == NULL) {
- next = new charIndex_el;
+ next = new charIndex_el;
cur->next_level[index] = next;
}
cur = next;
@@ -465,7 +465,7 @@ charIndex::iter_first(charIndexIterState *s)
{
s->cur_level = 0;
s->cur_index = -1;
- s->cur_el = root;
+ s->cur_el = root;
return iter_next(s);
}
@@ -482,7 +482,7 @@ charIndex::iter_next(charIndexIterState *s)
{
int index;
charIndex_el *current_el = s->cur_el;
- intptr_t level = s->cur_level;
+ intptr_t level = s->cur_level;
charIndexIterInternal stored_state;
HostBranch *r = NULL;
bool first_element;
@@ -492,10 +492,10 @@ charIndex::iter_next(charIndexIterState *s)
// it has unless we are being called from iter_first
if (s->cur_index < 0) {
first_element = false;
- index = s->cur_index + 1;
+ index = s->cur_index + 1;
} else {
first_element = true;
- index = s->cur_index;
+ index = s->cur_index;
}
while (1) {
@@ -511,7 +511,7 @@ charIndex::iter_next(charIndexIterState *s)
ink_assert(stored_state.index >= 0);
level--;
current_el = stored_state.ptr;
- index = stored_state.index + 1;
+ index = stored_state.index + 1;
}
} else {
// Check to see if there is something to return
@@ -521,19 +521,19 @@ charIndex::iter_next(charIndexIterState *s)
// be done with this index
//
if (current_el->branch_array[index] != NULL && first_element == false) {
- r = current_el->branch_array[index];
+ r = current_el->branch_array[index];
s->cur_level = level;
s->cur_index = index;
- s->cur_el = current_el;
+ s->cur_el = current_el;
break;
} else if (current_el->next_level[index] != NULL) {
// There is a lower level to iterate over, store our
// current state and descend
- stored_state.ptr = current_el;
+ stored_state.ptr = current_el;
stored_state.index = index;
- s->q(level) = stored_state;
- current_el = current_el->next_level[index];
- index = 0;
+ s->q(level) = stored_state;
+ current_el = current_el->next_level[index];
+ index = 0;
level++;
} else {
// Nothing here so advance to next index
@@ -600,7 +600,7 @@ hostArray::Insert(const char *match_data_in, HostBranch *toInsert)
return false;
} else {
branch_array[num_el] = toInsert;
- match_data[num_el] = ats_strdup(match_data_in);
+ match_data[num_el] = ats_strdup(match_data_in);
num_el++;
return true;
}
@@ -709,7 +709,7 @@ HostBranch::~HostBranch()
break;
case HOST_HASH:
ink_assert(next_level != NULL);
- ht = (InkHashTable *)next_level;
+ ht = (InkHashTable *)next_level;
ht_entry = ink_hash_table_iterator_first(ht, &ht_iter);
while (ht_entry != NULL) {
@@ -721,7 +721,7 @@ HostBranch::~HostBranch()
break;
case HOST_INDEX:
ink_assert(next_level != NULL);
- ci = (charIndex *)next_level;
+ ci = (charIndex *)next_level;
lower_branch = ci->iter_first(&ci_iter);
while (lower_branch != NULL) {
delete lower_branch;
@@ -731,7 +731,7 @@ HostBranch::~HostBranch()
break;
case HOST_ARRAY:
ink_assert(next_level != NULL);
- ha = (hostArray *)next_level;
+ ha = (hostArray *)next_level;
lower_branch = ha->iter_first(&ha_iter);
while (lower_branch != NULL) {
delete lower_branch;
@@ -744,9 +744,9 @@ HostBranch::~HostBranch()
HostLookup::HostLookup(const char *name) : leaf_array(NULL), array_len(-1), num_el(-1), matcher_name(name)
{
- root = new HostBranch;
- root->level = 0;
- root->type = HOST_TERMINAL;
+ root = new HostBranch;
+ root->level = 0;
+ root->type = HOST_TERMINAL;
root->next_level = NULL;
}
@@ -818,7 +818,7 @@ HostLookup::PrintHostBranch(HostBranch *hb, HostLookupPrintFunc f)
break;
case HOST_HASH:
ink_assert(hb->next_level != NULL);
- ht = (InkHashTable *)hb->next_level;
+ ht = (InkHashTable *)hb->next_level;
ht_entry = ink_hash_table_iterator_first(ht, &ht_iter);
while (ht_entry != NULL) {
@@ -829,7 +829,7 @@ HostLookup::PrintHostBranch(HostBranch *hb, HostLookupPrintFunc f)
break;
case HOST_INDEX:
ink_assert(hb->next_level != NULL);
- ci = (charIndex *)hb->next_level;
+ ci = (charIndex *)hb->next_level;
lower_branch = ci->iter_first(&ci_iter);
while (lower_branch != NULL) {
PrintHostBranch(lower_branch, f);
@@ -838,7 +838,7 @@ HostLookup::PrintHostBranch(HostBranch *hb, HostLookupPrintFunc f)
break;
case HOST_ARRAY:
ink_assert(hb->next_level != NULL);
- h_array = (hostArray *)hb->next_level;
+ h_array = (hostArray *)hb->next_level;
lower_branch = h_array->iter_first(&ha_iter);
while (lower_branch != NULL) {
PrintHostBranch(lower_branch, f);
@@ -867,12 +867,12 @@ HostLookup::TableNewLevel(HostBranch *from, const char *level_data)
// Use the charIndex for high speed matching at the first level of
// the table. The first level is short strings, ie: com, edu, jp, fr
if (from->level == 0) {
- new_ci_table = new charIndex;
- from->type = HOST_INDEX;
+ new_ci_table = new charIndex;
+ from->type = HOST_INDEX;
from->next_level = new_ci_table;
} else {
- new_ha_table = new hostArray;
- from->type = HOST_ARRAY;
+ new_ha_table = new hostArray;
+ from->type = HOST_ARRAY;
from->next_level = new_ha_table;
}
@@ -900,8 +900,8 @@ HostLookup::InsertBranch(HostBranch *insert_in, const char *level_data)
InkHashTable *new_ht;
HostBranch *new_branch = new HostBranch;
- new_branch->type = HOST_TERMINAL;
- new_branch->level = insert_in->level + 1;
+ new_branch->type = HOST_TERMINAL;
+ new_branch->level = insert_in->level + 1;
new_branch->next_level = NULL;
switch (insert_in->type) {
@@ -918,7 +918,7 @@ HostLookup::InsertBranch(HostBranch *insert_in, const char *level_data)
case HOST_ARRAY:
if (((hostArray *)insert_in->next_level)->Insert(level_data, new_branch) == false) {
// The array is out of space, time to move to a hash table
- ha = (hostArray *)insert_in->next_level;
+ ha = (hostArray *)insert_in->next_level;
new_ht = ink_hash_table_create(InkHashTableKeyType_String);
ink_hash_table_insert(new_ht, (char *)level_data, new_branch);
@@ -935,7 +935,7 @@ HostLookup::InsertBranch(HostBranch *insert_in, const char *level_data)
// Ring out the old, ring in the new
delete ha;
insert_in->next_level = new_ht;
- insert_in->type = HOST_HASH;
+ insert_in->type = HOST_HASH;
}
break;
}
@@ -1091,7 +1091,7 @@ HostLookup::MatchArray(HostLookupState *s, void **opaque_ptr, DynArray<int> &arr
switch (leaf_array[index].type) {
case HOST_PARTIAL:
if (hostcmp(s->hostname, leaf_array[index].match) == 0) {
- *opaque_ptr = leaf_array[index].opaque_data;
+ *opaque_ptr = leaf_array[index].opaque_data;
s->array_index = i;
return true;
}
@@ -1102,7 +1102,7 @@ HostLookup::MatchArray(HostLookupState *s, void **opaque_ptr, DynArray<int> &arr
// "www.example.com
//
if (host_done == true) {
- *opaque_ptr = leaf_array[index].opaque_data;
+ *opaque_ptr = leaf_array[index].opaque_data;
s->array_index = i;
return true;
}
@@ -1113,7 +1113,7 @@ HostLookup::MatchArray(HostLookupState *s, void **opaque_ptr, DynArray<int> &arr
}
// FALL THROUGH
case DOMAIN_COMPLETE:
- *opaque_ptr = leaf_array[index].opaque_data;
+ *opaque_ptr = leaf_array[index].opaque_data;
s->array_index = i;
return true;
case LEAF_INVALID:
@@ -1135,11 +1135,11 @@ HostLookup::MatchFirst(const char *host, HostLookupState *s, void **opaque_ptr)
{
char *last_dot = NULL;
- s->cur = root;
+ s->cur = root;
s->table_level = 0;
s->array_index = -1;
- s->hostname = host ? host : "";
- s->host_copy = ats_strdup(s->hostname);
+ s->hostname = host ? host : "";
+ s->host_copy = ats_strdup(s->hostname);
LowerCaseStr(s->host_copy);
// Find the top level domain in the host copy
@@ -1194,7 +1194,7 @@ HostLookup::MatchNext(HostLookupState *s, void **opaque_ptr)
if (cur == NULL) {
break;
} else {
- s->cur = cur;
+ s->cur = cur;
s->array_index = -1;
s->table_level++;
@@ -1246,7 +1246,7 @@ HostLookup::AllocateSpace(int num_entries)
memset(leaf_array, 0, sizeof(HostLeaf) * num_entries);
array_len = num_entries;
- num_el = 0;
+ num_el = 0;
}
// void HostLookup::NewEntry(const char* match_data, bool domain_record, void* opaque_data_in)
@@ -1263,14 +1263,14 @@ HostLookup::NewEntry(const char *match_data, bool domain_record, void *opaque_da
// Make sure we do not overrun the array;
ink_assert(num_el < array_len);
- leaf_array[num_el].match = ats_strdup(match_data);
+ leaf_array[num_el].match = ats_strdup(match_data);
leaf_array[num_el].opaque_data = opaque_data_in;
if ('!' != *(leaf_array[num_el].match)) {
- leaf_array[num_el].len = strlen(match_data);
+ leaf_array[num_el].len = strlen(match_data);
leaf_array[num_el].isNot = false;
} else {
- leaf_array[num_el].len = strlen(match_data) - 1;
+ leaf_array[num_el].len = strlen(match_data) - 1;
leaf_array[num_el].isNot = true;
}
diff --git a/lib/ts/HostLookup.h b/lib/ts/HostLookup.h
index df23c64..9cbb4ff 100644
--- a/lib/ts/HostLookup.h
+++ b/lib/ts/HostLookup.h
@@ -32,7 +32,7 @@
#define _HOST_LOOKUP_H_
// HostLookup constantss
const int HOST_TABLE_DEPTH = 3; // Controls the max number of levels in the logical tree
-const int HOST_ARRAY_MAX = 8; // Sets the fixed array size
+const int HOST_ARRAY_MAX = 8; // Sets the fixed array size
//
// Begin Host Lookup Helper types
diff --git a/lib/ts/IntrusiveDList.h b/lib/ts/IntrusiveDList.h
index b9469f0..a6eb5db 100644
--- a/lib/ts/IntrusiveDList.h
+++ b/lib/ts/IntrusiveDList.h
@@ -210,7 +210,7 @@ public:
elt->*P = 0;
if (_head)
_head->*P = elt;
- _head = elt;
+ _head = elt;
if (!_tail)
_tail = _head; // empty to non-empty transition
++_count;
@@ -226,7 +226,7 @@ public:
elt->*P = _tail;
if (_tail)
_tail->*N = elt;
- _tail = elt;
+ _tail = elt;
if (!_head)
_head = _tail; // empty to non-empty transition
++_count;
@@ -239,12 +239,12 @@ public:
{
T *zret = 0;
if (_head) {
- zret = _head;
+ zret = _head;
_head = _head->*N;
if (_head)
_head->*P = 0;
else
- _tail = 0; // non-empty to empty transition.
+ _tail = 0; // non-empty to empty transition.
zret->*N = 0; // erase traces of list.
zret->*P = 0;
--_count;
@@ -258,12 +258,12 @@ public:
{
T *zret = 0;
if (_tail) {
- zret = _tail;
+ zret = _tail;
_tail = _tail->*P = 0;
if (_tail)
_tail->*N = 0;
else
- _head = 0; // non-empty to empty transition.
+ _head = 0; // non-empty to empty transition.
zret->*N = 0; // erase traces of list.
zret->*P = 0;
--_count;
@@ -280,8 +280,8 @@ public:
)
{
// Should assert that !(elt->*N || elt->*P)
- elt->*N = target->*N;
- elt->*P = target;
+ elt->*N = target->*N;
+ elt->*P = target;
target->*N = elt;
if (elt->*N)
elt->*N->*P = elt;
@@ -300,8 +300,8 @@ public:
)
{
// Should assert that !(elt->*N || elt->*P)
- elt->*P = target->*P;
- elt->*N = target;
+ elt->*P = target->*P;
+ elt->*N = target;
target->*P = elt;
if (elt->*P)
elt->*P->*N = elt;
@@ -335,7 +335,7 @@ public:
clear()
{
_head = _tail = 0;
- _count = 0;
+ _count = 0;
return *this;
}
/// @return Number of elements in the list.
diff --git a/lib/ts/IpMap.cc b/lib/ts/IpMap.cc
index 2afc394..d54b064 100644
--- a/lib/ts/IpMap.cc
+++ b/lib/ts/IpMap.cc
@@ -279,8 +279,8 @@ namespace detail
N *
IpMapBase<N>::lowerBound(ArgType target)
{
- N *n = _root; // current node to test.
- N *zret = 0; // best node so far.
+ N *n = _root; // current node to test.
+ N *zret = 0; // best node so far.
while (n) {
if (target < n->_min)
n = left(n);
@@ -303,7 +303,7 @@ namespace detail
N *n = static_cast<N *>(_list.getHead());
while (n) {
N *x = n;
- n = next(n);
+ n = next(n);
delete x;
}
_list.clear();
@@ -398,7 +398,7 @@ namespace detail
return *this;
} else { // n is contained in range, skip over it.
x->setMaxMinusOne(n->_min);
- x = 0;
+ x = 0;
min = n->_max;
N::inc(min); // OK because n->_max maximal => next is null.
n = next(n);
@@ -664,7 +664,7 @@ namespace detail
IpMapBase<N>::contains(ArgType x, void **ptr) const
{
bool zret = false;
- N *n = _root; // current node to test.
+ N *n = _root; // current node to test.
while (n) {
if (x < n->_min)
n = left(n);
@@ -673,7 +673,7 @@ namespace detail
else {
if (ptr)
*ptr = n->_data;
- zret = true;
+ zret = true;
break;
}
}
@@ -775,7 +775,7 @@ namespace detail
setMin(ArgType min ///< Minimum value (host order).
)
{
- _min = min;
+ _min = min;
_sa._min.sin_addr.s_addr = htonl(min);
return *this;
}
@@ -786,7 +786,7 @@ namespace detail
setMax(ArgType max ///< Maximum value (host order).
)
{
- _max = max;
+ _max = max;
_sa._max.sin_addr.s_addr = htonl(max);
return *this;
}
@@ -1008,7 +1008,7 @@ namespace detail
)
{
uint8_t *addr = m.sin6_addr.s6_addr;
- uint8_t *b = addr + TS_IP6_SIZE;
+ uint8_t *b = addr + TS_IP6_SIZE;
// Ripple carry. Walk up the address incrementing until we don't
// have a carry.
do {
@@ -1022,7 +1022,7 @@ namespace detail
)
{
uint8_t *addr = m.sin6_addr.s6_addr;
- uint8_t *b = addr + TS_IP6_SIZE;
+ uint8_t *b = addr + TS_IP6_SIZE;
// Ripple borrow. Walk up the address decrementing until we don't
// have a borrow.
do {
@@ -1194,7 +1194,7 @@ IpMap::iterator &IpMap::iterator::operator++()
// and if so, move to the v6 list (if it's there).
Node *x = static_cast<Node *>(_node->_next);
if (!x && _tree->_m4 && _tree->_m6 && _node == _tree->_m4->getTail())
- x = _tree->_m6->getHead();
+ x = _tree->_m6->getHead();
_node = x;
}
return *this;
@@ -1207,7 +1207,7 @@ inline IpMap::iterator &IpMap::iterator::operator--()
// start of the v6 addresses and switch to the v4, if there are any.
Node *x = static_cast<Node *>(_node->_prev);
if (!x && _tree->_m4 && _tree->_m6 && _node == _tree->_m6->getHead())
- x = _tree->_m4->getTail();
+ x = _tree->_m4->getTail();
_node = x;
} else if (_tree) {
// We were at the end. Back up to v6 if possible, v4 if not.
diff --git a/lib/ts/IpMapConf.cc b/lib/ts/IpMapConf.cc
index 1c60044..e1294b5 100644
--- a/lib/ts/IpMapConf.cc
+++ b/lib/ts/IpMapConf.cc
@@ -28,7 +28,7 @@
#include <ts/ink_memory.h>
static size_t const ERR_STRING_LEN = 256;
-static size_t const MAX_LINE_SIZE = 2048;
+static size_t const MAX_LINE_SIZE = 2048;
// Returns 0 if successful, 1 if failed
// line Input text (source line).
@@ -41,7 +41,7 @@ read_addr(char *line, int n, int *i, sockaddr *addr, char *err)
{
int k;
char dst[INET6_ADDRSTRLEN];
- char *src = line + *i;
+ char *src = line + *i;
bool bracketed_p = false;
// Allow enclosing brackets to be more consistent but
@@ -76,8 +76,8 @@ char *
Load_IpMap_From_File(IpMap *map, int fd, const char *key_str)
{
char *zret = 0;
- int fd2 = dup(fd); // dup to avoid closing the original file.
- FILE *f = NULL;
+ int fd2 = dup(fd); // dup to avoid closing the original file.
+ FILE *f = NULL;
if (fd2 >= 0)
f = fdopen(fd2, "r");
diff --git a/lib/ts/IpMapTest.cc b/lib/ts/IpMapTest.cc
index af9a6b2..948ecd2 100644
--- a/lib/ts/IpMapTest.cc
+++ b/lib/ts/IpMapTest.cc
@@ -53,7 +53,7 @@ REGRESSION_TEST(IpMap_Basic)(RegressionTest *t, int /* atype ATS_UNUSED */, int
in_addr_t ip100 = htonl(100), ip120 = htonl(120), ip140 = htonl(140);
in_addr_t ip150 = htonl(150), ip160 = htonl(160);
in_addr_t ip200 = htonl(200);
- in_addr_t ip0 = 0;
+ in_addr_t ip0 = 0;
in_addr_t ipmax = ~static_cast<in_addr_t>(0);
*pstatus = REGRESSION_TEST_PASSED;
@@ -160,7 +160,7 @@ REGRESSION_TEST(IpMap_Fill)(RegressionTest *t, int /* atype ATS_UNUSED */, int *
IpMap map;
ip_text_buffer ipb1, ipb2;
void *const allow = reinterpret_cast<void *>(0);
- void *const deny = reinterpret_cast<void *>(~0);
+ void *const deny = reinterpret_cast<void *>(~0);
void *const markA = reinterpret_cast<void *>(1);
void *const markB = reinterpret_cast<void *>(2);
void *const markC = reinterpret_cast<void *>(3);
diff --git a/lib/ts/Layout.cc b/lib/ts/Layout.cc
index 309c102..39227f4 100644
--- a/lib/ts/Layout.cc
+++ b/lib/ts/Layout.cc
@@ -170,20 +170,20 @@ Layout::Layout(const char *_prefix)
prefix = ats_strdup(path);
}
- exec_prefix = layout_relative(prefix, TS_BUILD_EXEC_PREFIX);
- bindir = layout_relative(prefix, TS_BUILD_BINDIR);
- sbindir = layout_relative(prefix, TS_BUILD_SBINDIR);
- sysconfdir = layout_relative(prefix, TS_BUILD_SYSCONFDIR);
- datadir = layout_relative(prefix, TS_BUILD_DATADIR);
- includedir = layout_relative(prefix, TS_BUILD_INCLUDEDIR);
- libdir = layout_relative(prefix, TS_BUILD_LIBDIR);
- libexecdir = layout_relative(prefix, TS_BUILD_LIBEXECDIR);
+ exec_prefix = layout_relative(prefix, TS_BUILD_EXEC_PREFIX);
+ bindir = layout_relative(prefix, TS_BUILD_BINDIR);
+ sbindir = layout_relative(prefix, TS_BUILD_SBINDIR);
+ sysconfdir = layout_relative(prefix, TS_BUILD_SYSCONFDIR);
+ datadir = layout_relative(prefix, TS_BUILD_DATADIR);
+ includedir = layout_relative(prefix, TS_BUILD_INCLUDEDIR);
+ libdir = layout_relative(prefix, TS_BUILD_LIBDIR);
+ libexecdir = layout_relative(prefix, TS_BUILD_LIBEXECDIR);
localstatedir = layout_relative(prefix, TS_BUILD_LOCALSTATEDIR);
- runtimedir = layout_relative(prefix, TS_BUILD_RUNTIMEDIR);
- logdir = layout_relative(prefix, TS_BUILD_LOGDIR);
- mandir = layout_relative(prefix, TS_BUILD_MANDIR);
- infodir = layout_relative(prefix, TS_BUILD_INFODIR);
- cachedir = layout_relative(prefix, TS_BUILD_CACHEDIR);
+ runtimedir = layout_relative(prefix, TS_BUILD_RUNTIMEDIR);
+ logdir = layout_relative(prefix, TS_BUILD_LOGDIR);
+ mandir = layout_relative(prefix, TS_BUILD_MANDIR);
+ infodir = layout_relative(prefix, TS_BUILD_INFODIR);
+ cachedir = layout_relative(prefix, TS_BUILD_CACHEDIR);
}
Layout::~Layout()
diff --git a/lib/ts/List.h b/lib/ts/List.h
index edab76a..b70783c 100644
--- a/lib/ts/List.h
+++ b/lib/ts/List.h
@@ -196,7 +196,7 @@ inline void
SLL<C, L>::push(C *e)
{
next(e) = head;
- head = e;
+ head = e;
}
template <class C, class L>
@@ -205,7 +205,7 @@ SLL<C, L>::pop()
{
C *ret = head;
if (ret) {
- head = next(ret);
+ head = next(ret);
next(ret) = NULL;
}
return ret;
@@ -267,8 +267,8 @@ DLL<C, L>::push(C *e)
{
if (head)
prev(head) = e;
- next(e) = head;
- head = e;
+ next(e) = head;
+ head = e;
}
template <class C, class L>
@@ -283,8 +283,8 @@ DLL<C, L>::remove(C *e)
next(prev(e)) = next(e);
if (next(e))
prev(next(e)) = prev(e);
- prev(e) = NULL;
- next(e) = NULL;
+ prev(e) = NULL;
+ next(e) = NULL;
}
template <class C, class L>
@@ -296,7 +296,7 @@ DLL<C, L>::pop()
head = next(ret);
if (head)
prev(head) = NULL;
- next(ret) = NULL;
+ next(ret) = NULL;
return ret;
} else
return NULL;
@@ -310,8 +310,8 @@ DLL<C, L>::insert(C *e, C *after)
push(e);
return;
}
- prev(e) = after;
- next(e) = next(after);
+ prev(e) = after;
+ next(e) = next(after);
next(after) = e;
if (next(e))
prev(next(e)) = e;
@@ -403,9 +403,9 @@ Queue<C, L>::append(DLL<C, L> q)
tail = qtail;
} else {
if (q.head) {
- this->next(tail) = q.head;
+ this->next(tail) = q.head;
this->prev(q.head) = tail;
- tail = qtail;
+ tail = qtail;
}
}
}
@@ -419,9 +419,9 @@ Queue<C, L>::append(Queue<C, L> q)
tail = q.tail;
} else {
if (q.head) {
- this->next(tail) = q.head;
+ this->next(tail) = q.head;
this->prev(q.head) = tail;
- tail = q.tail;
+ tail = q.tail;
}
}
}
@@ -466,8 +466,8 @@ template <class C, class L = typename C::Link_link> struct SortableQueue : publi
bool clean = false;
while (!clean) {
clean = true;
- C *v = head;
- C *n = this->next(head);
+ C *v = head;
+ C *n = this->next(head);
while (n) {
C *f = this->next(n);
if (*n < *v) {
@@ -495,7 +495,7 @@ template <class C, class L = typename C::Link_link> struct SortableQueue : publi
this->next(n) = v;
} else
v = n;
- n = f;
+ n = f;
}
}
}
@@ -584,7 +584,7 @@ CountQueue<C, L>::append_clear(CountQueue<C, L> &q)
{
append(q);
q.head = q.tail = 0;
- q.size = 0;
+ q.size = 0;
}
//
@@ -650,7 +650,7 @@ template <class C, class A = DefaultAlloc> struct List {
C
pop()
{
- C a = car();
+ C a = car();
head = cdr();
return a;
}
@@ -675,9 +675,9 @@ List<C, A>::reverse()
{
ConsCell<C, A> *n, *t;
for (ConsCell<C, A> *p = head; p; p = n) {
- n = p->cdr;
+ n = p->cdr;
p->cdr = t;
- t = p;
+ t = p;
}
head = t;
}
diff --git a/lib/ts/MMH.cc b/lib/ts/MMH.cc
index 5c19cea..bed7268 100644
--- a/lib/ts/MMH.cc
+++ b/lib/ts/MMH.cc
@@ -100,11 +100,11 @@ int
ink_code_incr_MMH_init(MMH_CTX *ctx)
{
ctx->buffer_size = 0;
- ctx->blocks = 0;
- ctx->state[0] = ((uint64_t)MMH_x[MMH_X_SIZE + 0] << 32) + MMH_x[MMH_X_SIZE + 1];
- ctx->state[1] = ((uint64_t)MMH_x[MMH_X_SIZE + 2] << 32) + MMH_x[MMH_X_SIZE + 3];
- ctx->state[2] = ((uint64_t)MMH_x[MMH_X_SIZE + 4] << 32) + MMH_x[MMH_X_SIZE + 5];
- ctx->state[3] = ((uint64_t)MMH_x[MMH_X_SIZE + 6] << 32) + MMH_x[MMH_X_SIZE + 7];
+ ctx->blocks = 0;
+ ctx->state[0] = ((uint64_t)MMH_x[MMH_X_SIZE + 0] << 32) + MMH_x[MMH_X_SIZE + 1];
+ ctx->state[1] = ((uint64_t)MMH_x[MMH_X_SIZE + 2] << 32) + MMH_x[MMH_X_SIZE + 3];
+ ctx->state[2] = ((uint64_t)MMH_x[MMH_X_SIZE + 4] << 32) + MMH_x[MMH_X_SIZE + 5];
+ ctx->state[3] = ((uint64_t)MMH_x[MMH_X_SIZE + 6] << 32) + MMH_x[MMH_X_SIZE + 7];
return 0;
}
@@ -228,7 +228,7 @@ MMH_updatel3(MMH_CTX *ctx, unsigned char *ab)
int
ink_code_incr_MMH_update(MMH_CTX *ctx, const char *ainput, int input_length)
{
- unsigned char *in = (unsigned char *)ainput;
+ unsigned char *in = (unsigned char *)ainput;
unsigned char *end = in + input_length;
if (ctx->buffer_size) {
int l = 16 - ctx->buffer_size;
@@ -252,7 +252,7 @@ ink_code_incr_MMH_update(MMH_CTX *ctx, const char *ainput, int input_length)
#define big_endian 0
#else
unsigned int endian = 1;
- int big_endian = !*(char *)&endian;
+ int big_endian = !*(char *)&endian;
#endif
if (big_endian) {
if (alignment == 1) {
@@ -317,7 +317,7 @@ _memset(unsigned char *b, int c, int len)
int o = len & 0x3, i;
for (i = 0; i < o; i++)
b[i] = 0;
- for (i = 0; i < (len - o) / 4; i++)
+ for (i = 0; i < (len - o) / 4; i++)
((uint32_t *)(b + o))[i] = 0;
}
#endif
@@ -338,7 +338,7 @@ ink_code_incr_MMH_final(uint8_t *presult, MMH_CTX *ctx)
MMH_update(ctx, ctx->buffer);
// final phase
uint32_t *b = (uint32_t *)presult;
- uint64_t d = (((uint64_t)1) << 32) + 15;
+ uint64_t d = (((uint64_t)1) << 32) + 15;
uint32_t b0 = uint32_t(ctx->state[0] % d);
uint32_t b1 = uint32_t(ctx->state[1] % d);
uint32_t b2 = uint32_t(ctx->state[2] % d);
@@ -405,7 +405,7 @@ main()
} h;
xxh = (i4_t *)ats_malloc(4 * sizeof(uint32_t) * TEST_COLLISIONS);
- xf = (double *)ats_malloc(sizeof(double) * TEST_COLLISIONS);
+ xf = (double *)ats_malloc(sizeof(double) * TEST_COLLISIONS);
printf("test collisions\n");
char *sc1 = "http://npdev:19080/1.6664000000/4000";
@@ -435,8 +435,8 @@ main()
printf("********** collision %d\n", xy);
}
- unsigned char *s = (unsigned char *)MMH_x;
- int l = sizeof(MMH_x);
+ unsigned char *s = (unsigned char *)MMH_x;
+ int l = sizeof(MMH_x);
unsigned char *s1 = (unsigned char *)ats_malloc(l + 3);
s1 += 1;
memcpy(s1, s, l);
diff --git a/lib/ts/Map.h b/lib/ts/Map.h
index 9ed4fb9..772ca48 100644
--- a/lib/ts/Map.h
+++ b/lib/ts/Map.h
@@ -41,7 +41,7 @@ template <class A>
static inline char *
_dupstr(cchar *s, cchar *e = 0)
{
- int l = e ? e - s : strlen(s);
+ int l = e ? e - s : strlen(s);
char *ss = (char *)A::alloc(l + 1);
memcpy(ss, s, l);
ss[l] = 0;
@@ -437,7 +437,7 @@ HashSet<K, AHashFns, C, A>::get(K akey)
return 0;
}
uintptr_t h = AHashFns::hash(akey);
- h = h % n;
+ h = h % n;
for (int k = h, j = 0; j < i + 3; j++) {
if (!v[k])
return 0;
@@ -464,7 +464,7 @@ HashSet<K, AHashFns, C, A>::put(C avalue)
}
if (n > MAP_INTEGRAL_SIZE) {
uintptr_t h = AHashFns::hash(avalue);
- h = h % n;
+ h = h % n;
for (int k = h, j = 0; j < i + 3; j++) {
if (!v[k]) {
v[k] = avalue;
@@ -496,7 +496,7 @@ HashMap<K, AHashFns, C, A>::get_internal(K akey)
return 0;
}
uintptr_t h = AHashFns::hash(akey);
- h = h % n;
+ h = h % n;
for (size_t k = h, j = 0; j < i + 3; j++) {
if (!v[k].key)
return 0;
@@ -528,18 +528,18 @@ HashMap<K, AHashFns, C, A>::put(K akey, C avalue)
} else {
if (n < MAP_INTEGRAL_SIZE) {
if (!v)
- v = e;
- v[n].key = akey;
+ v = e;
+ v[n].key = akey;
v[n].value = avalue;
n++;
return &v[n - 1];
}
if (n > MAP_INTEGRAL_SIZE) {
uintptr_t h = AHashFns::hash(akey);
- h = h % n;
+ h = h % n;
for (size_t k = h, j = 0; j < i + 3; j++) {
if (!v[k].key) {
- v[k].key = akey;
+ v[k].key = akey;
v[k].value = avalue;
return &v[k];
}
@@ -814,7 +814,7 @@ inline cchar *
StringChainHash<F, A>::canonicalize(cchar *s, cchar *e)
{
uintptr_t h = 0;
- cchar *a = s;
+ cchar *a = s;
// 31 changed to 27, to avoid prime2 in vec.cpp
if (e)
while (a != e)
@@ -829,7 +829,7 @@ StringChainHash<F, A>::canonicalize(cchar *s, cchar *e)
typedef ConsCell<cchar *, A> TT;
forc_List(TT, x, *l)
{
- a = s;
+ a = s;
cchar *b = x->car;
while (1) {
if (!*b) {
@@ -844,7 +844,7 @@ StringChainHash<F, A>::canonicalize(cchar *s, cchar *e)
}
}
}
- s = _dupstr<A>(s, e);
+ s = _dupstr<A>(s, e);
cchar *ss = ChainHash<cchar *, F, A>::put(s);
if (ss)
return ss;
@@ -922,7 +922,7 @@ NBlockHash<C, AHashFns, N, A>::put(C c)
{
int a;
uintptr_t h = AHashFns::hash(c);
- C *x = &v[(h % n) * N];
+ C *x = &v[(h % n) * N];
for (a = 0; a < N; a++) {
if (!x[a])
break;
@@ -935,7 +935,7 @@ NBlockHash<C, AHashFns, N, A>::put(C c)
}
C *vv = first(), *ve = last();
C *old_v = v;
- i = i + 1;
+ i = i + 1;
size(i);
for (; vv < ve; vv++)
if (*vv)
@@ -961,7 +961,7 @@ NBlockHash<C, AHashFns, N, A>::get(C c)
if (!n)
return (C)0;
uintptr_t h = AHashFns::hash(c);
- C *x = &v[(h % n) * N];
+ C *x = &v[(h % n) * N];
for (int a = 0; a < N; a++) {
if (!x[a])
return (C)0;
@@ -978,8 +978,8 @@ NBlockHash<C, AHashFns, N, A>::assoc_get(C *c)
if (!n)
return (C *)0;
uintptr_t h = AHashFns::hash(*c);
- C *x = &v[(h % n) * N];
- int a = 0;
+ C *x = &v[(h % n) * N];
+ int a = 0;
if (c >= x && c < x + N)
a = c - x + 1;
for (; a < N; a++) {
@@ -997,7 +997,7 @@ NBlockHash<C, AHashFns, N, A>::assoc_put(C *c)
{
int a;
uintptr_t h = AHashFns::hash(*c);
- C *x = &v[(h % n) * N];
+ C *x = &v[(h % n) * N];
for (a = 0; a < N; a++) {
if (!x[a])
break;
@@ -1019,7 +1019,7 @@ NBlockHash<C, AHashFns, N, A>::del(C c)
if (!n)
return 0;
uintptr_t h = AHashFns::hash(c);
- C *x = &v[(h % n) * N];
+ C *x = &v[(h % n) * N];
for (a = 0; a < N; a++) {
if (!x[a])
return 0;
@@ -1030,7 +1030,7 @@ NBlockHash<C, AHashFns, N, A>::del(C c)
break;
}
if (b != a + 1)
- x[a] = x[b - 1];
+ x[a] = x[b - 1];
x[b - 1] = (C)0;
return 1;
} else {
@@ -1065,7 +1065,7 @@ inline int
NBlockHash<C, AHashFns, N, A>::count()
{
int nelements = 0;
- C *l = last();
+ C *l = last();
for (C *xx = first(); xx < l; xx++)
if (*xx)
nelements++;
@@ -1518,7 +1518,7 @@ template <typename H>
void
TSHashTable<H>::findBucket(Key key, Location &location)
{
- location.m_id = Hasher::hash(key);
+ location.m_id = Hasher::hash(key);
location.m_bucket = &(m_array[location.m_id % m_array.n]);
}
@@ -1533,7 +1533,7 @@ TSHashTable<H>::find(Key key)
v = zret.m_bucket->m_chain.head;
// Search for first matching key.
while (0 != v && !Hasher::equal(key, Hasher::key(v)))
- v = ListHead::next(v);
+ v = ListHead::next(v);
zret.m_value = v;
return zret;
}
@@ -1553,7 +1553,7 @@ template <typename H>
void
TSHashTable<H>::insert(Value *value)
{
- Key key = Hasher::key(value);
+ Key key = Hasher::key(value);
Bucket *bucket = &(m_array[Hasher::hash(key) % m_array.n]);
// Bad client if already in a list!
@@ -1588,7 +1588,7 @@ TSHashTable<H>::remove(Location const &l)
m_bucket_chain.remove(l.m_bucket);
else if (1 == l.m_bucket->m_count) // if count drops to 1, then it's not mixed any more.
l.m_bucket->m_mixed_p = false;
- zret = true;
+ zret = true;
}
return zret;
}
@@ -1598,7 +1598,7 @@ bool
TSHashTable<H>::remove(Key key)
{
Location loc = this->find(key);
- bool zret = loc.isValid();
+ bool zret = loc.isValid();
while (loc.isValid()) {
Location target(loc);
loc.advance();
@@ -1625,7 +1625,7 @@ template <typename H>
void
TSHashTable<H>::expand()
{
- Bucket *b = m_bucket_chain.head; // stash before reset.
+ Bucket *b = m_bucket_chain.head; // stash before reset.
ExpansionPolicy org_expansion_policy = m_expansion_policy;
Array tmp;
tmp.move(m_array); // stash the current array here.
diff --git a/lib/ts/MatcherUtils.cc b/lib/ts/MatcherUtils.cc
index a1f6f0b..77afc00 100644
--- a/lib/ts/MatcherUtils.cc
+++ b/lib/ts/MatcherUtils.cc
@@ -129,7 +129,7 @@ readIntoBuffer(const char *file_path, const char *module_name, int *read_size_pt
int
unescapifyStr(char *buffer)
{
- char *read = buffer;
+ char *read = buffer;
char *write = buffer;
char subStr[3];
@@ -138,7 +138,7 @@ unescapifyStr(char *buffer)
if (*read == '%' && *(read + 1) != '\0' && *(read + 2) != '\0') {
subStr[0] = *(++read);
subStr[1] = *(++read);
- *write = (char)strtol(subStr, (char **)NULL, 16);
+ *write = (char)strtol(subStr, (char **)NULL, 16);
read++;
write++;
} else if (*read == '+') {
@@ -268,7 +268,7 @@ tokLine(char *buf, char **last, char cont)
if (buf != NULL) {
start = cur = buf;
- *last = buf;
+ *last = buf;
} else {
start = cur = (*last) + 1;
}
@@ -277,9 +277,9 @@ tokLine(char *buf, char **last, char cont)
if (*cur == '\n') {
if (cont != '\0' && prev != NULL && *prev == cont) {
*prev = ' ';
- *cur = ' ';
+ *cur = ' ';
} else {
- *cur = '\0';
+ *cur = '\0';
*last = cur;
return start;
}
@@ -318,7 +318,7 @@ const char *matcher_type_str[] = {"invalid", "host", "domain", "ip", "url_regex"
const char *
processDurationString(char *str, int *seconds)
{
- char *s = str;
+ char *s = str;
char *current = str;
char unit;
int tmp;
@@ -425,14 +425,14 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
CONSUME,
};
- pState state = FIND_LABEL;
- bool inQuote = false;
+ pState state = FIND_LABEL;
+ bool inQuote = false;
char *copyForward = NULL;
- char *copyFrom = NULL;
- char *s = line;
- char *label = NULL;
- char *val = NULL;
- int num_el = 0;
+ char *copyFrom = NULL;
+ char *s = line;
+ char *label = NULL;
+ char *val = NULL;
+ int num_el = 0;
matcher_type type = MATCH_NONE;
// Zero out the parsed line structure
@@ -453,7 +453,7 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
break;
case PARSE_LABEL:
if (*s == '=') {
- *s = '\0';
+ *s = '\0';
state = START_PARSE_VAL;
}
s++;
@@ -461,17 +461,17 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
case START_PARSE_VAL:
// Init state needed for parsing values
copyForward = NULL;
- copyFrom = NULL;
+ copyFrom = NULL;
if (*s == '"') {
inQuote = true;
- val = s + 1;
+ val = s + 1;
} else if (*s == '\\') {
inQuote = false;
- val = s + 1;
+ val = s + 1;
} else {
inQuote = false;
- val = s;
+ val = s;
}
if (inQuote == false && (isspace(*s) || *(s + 1) == '\0')) {
@@ -504,7 +504,7 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
copyFrom = s + 1;
} else {
copyForward = s;
- copyFrom = s + 1;
+ copyFrom = s + 1;
}
// Scroll past the escape character
@@ -517,7 +517,7 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
}
} else if (*s == '"') {
state = CONSUME;
- *s = '\0';
+ *s = '\0';
}
} else if ((*s == '\\' && ParseRules::is_digit(*(s + 1))) || !ParseRules::is_char(*s)) {
// INKqa10511
@@ -526,7 +526,7 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
return "Unrecognized encoding scheme";
} else if (isspace(*s)) {
state = CONSUME;
- *s = '\0';
+ *s = '\0';
}
s++;
@@ -552,7 +552,7 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
p_line->line[0][num_el] = label;
p_line->line[1][num_el] = val;
- type = MATCH_NONE;
+ type = MATCH_NONE;
// Check to see if this the primary specifier we are looking for
if (tags->match_ip && strcasecmp(tags->match_ip, label) == 0) {
@@ -579,7 +579,7 @@ parseConfigLine(char *line, matcher_line *p_line, const matcher_tags *tags)
}
} else {
p_line->dest_entry = num_el;
- p_line->type = type;
+ p_line->type = type;
}
}
num_el++;
diff --git a/lib/ts/ParseRules.cc b/lib/ts/ParseRules.cc
index 6bd61b7..1ad940e 100644
--- a/lib/ts/ParseRules.cc
+++ b/lib/ts/ParseRules.cc
@@ -47,12 +47,12 @@ ParseRules::ink_tolower_buffer(char *ptr, unsigned int n)
unsigned int i;
if (n < 8) {
- for (i = 0; i < n; i++)
+ for (i = 0; i < n; i++)
ptr[i] = ParseRules::ink_tolower(ptr[i]);
} else {
- uintptr_t fpad = 4 - ((uintptr_t)ptr & 3);
+ uintptr_t fpad = 4 - ((uintptr_t)ptr & 3);
uintptr_t words = (n - fpad) >> 2;
- uintptr_t bpad = n - fpad - (words << 2);
+ uintptr_t bpad = n - fpad - (words << 2);
switch (fpad) {
case 3:
@@ -70,12 +70,12 @@ ParseRules::ink_tolower_buffer(char *ptr, unsigned int n)
uint32_t *wptr = (uint32_t *)ptr;
for (i = 0; i < words; i++) {
- uint32_t word = *wptr;
+ uint32_t word = *wptr;
((unsigned char *)&word)[0] = ParseRules::ink_tolower(((unsigned char *)&word)[0]);
((unsigned char *)&word)[1] = ParseRules::ink_tolower(((unsigned char *)&word)[1]);
((unsigned char *)&word)[2] = ParseRules::ink_tolower(((unsigned char *)&word)[2]);
((unsigned char *)&word)[3] = ParseRules::ink_tolower(((unsigned char *)&word)[3]);
- *wptr++ = word;
+ *wptr++ = word;
}
switch (bpad) {
@@ -103,7 +103,7 @@ ParseRules::ink_tolower_buffer(char *ptr, unsigned int n)
int64_t
ink_atoi64(const char *str)
{
- int64_t num = 0;
+ int64_t num = 0;
int negative = 0;
while (*str && ParseRules::is_wslfcr(*str))
@@ -177,7 +177,7 @@ ink_atoui64(const char *str)
int64_t
ink_atoi64(const char *str, int len)
{
- int64_t num = 0;
+ int64_t num = 0;
int negative = 0;
while (len > 0 && *str && ParseRules::is_wslfcr(*str)) {
diff --git a/lib/ts/ParseRules.h b/lib/ts/ParseRules.h
index 2b430cf..eef8c32 100644
--- a/lib/ts/ParseRules.h
+++ b/lib/ts/ParseRules.h
@@ -553,7 +553,7 @@ ParseRules::ink_toupper(char c)
#ifndef COMPILE_PARSE_RULES
return parseRulesCTypeToUpper[(unsigned char)c];
#else
- int up_case = c;
+ int up_case = c;
const int up_case_diff = 'a' - 'A';
if (c >= 'a' && c <= 'z') {
@@ -569,7 +569,7 @@ ParseRules::ink_tolower(char c)
#ifndef COMPILE_PARSE_RULES
return parseRulesCTypeToLower[(unsigned char)c];
#else
- int lo_case = c;
+ int lo_case = c;
const int lo_case_diff = 'a' - 'A';
if (c >= 'A' && c <= 'Z') {
diff --git a/lib/ts/PriorityQueue.h b/lib/ts/PriorityQueue.h
index 66ffbf3..109f7d4 100644
--- a/lib/ts/PriorityQueue.h
+++ b/lib/ts/PriorityQueue.h
@@ -150,8 +150,8 @@ void
PriorityQueue<T, Comp>::_swap(uint32_t i, uint32_t j)
{
PriorityQueueEntry<T> *tmp = _v[i];
- _v[i] = _v[j];
- _v[j] = tmp;
+ _v[i] = _v[j];
+ _v[j] = tmp;
_v[i]->index = i;
_v[j]->index = j;
diff --git a/lib/ts/Ptr.h b/lib/ts/Ptr.h
index c43330a..8a2584c 100644
--- a/lib/ts/Ptr.h
+++ b/lib/ts/Ptr.h
@@ -307,8 +307,8 @@ public:
to_ptr()
{
if (m_ptr && m_ptr->m_refcount == 1) {
- T *ptr = m_ptr;
- m_ptr = 0;
+ T *ptr = m_ptr;
+ m_ptr = 0;
ptr->m_refcount = 0;
return ptr;
}
diff --git a/lib/ts/RawHashTable.h b/lib/ts/RawHashTable.h
index 2a9b88d..55af4c4 100644
--- a/lib/ts/RawHashTable.h
+++ b/lib/ts/RawHashTable.h
@@ -42,7 +42,7 @@
typedef enum {
RawHashTable_KeyType_String = InkHashTableKeyType_String,
- RawHashTable_KeyType_Word = InkHashTableKeyType_Word
+ RawHashTable_KeyType_Word = InkHashTableKeyType_Word
} RawHashTable_KeyType;
typedef InkHashTableKey RawHashTable_Key;
@@ -217,7 +217,7 @@ RawHashTable::getOrCreateBinding(RawHashTable_Key key, bool *was_new)
int _was_new;
InkHashTableEntry *he_ptr;
- he_ptr = ink_hash_table_get_entry(ht, (InkHashTableKey)key, &_was_new);
+ he_ptr = ink_hash_table_get_entry(ht, (InkHashTableKey)key, &_was_new);
*was_new = (_was_new ? true : false);
return ((RawHashTable_Binding *)he_ptr);
}
@@ -281,9 +281,9 @@ RawHashTable::firstBinding(RawHashTable_IteratorState *state_ptr)
inline RawHashTable::RawHashTable(RawHashTable_KeyType akey_type, bool adeallocate_values_on_destruct)
{
- RawHashTable::key_type = akey_type;
+ RawHashTable::key_type = akey_type;
RawHashTable::deallocate_values_on_destruct = adeallocate_values_on_destruct;
- ht = ink_hash_table_create((InkHashTableKeyType)key_type);
+ ht = ink_hash_table_create((InkHashTableKeyType)key_type);
}
inline RawHashTable::~RawHashTable()
diff --git a/lib/ts/RbTree.cc b/lib/ts/RbTree.cc
index 7739e5c..958c6e5 100644
--- a/lib/ts/RbTree.cc
+++ b/lib/ts/RbTree.cc
@@ -51,10 +51,10 @@ namespace detail
RBNode *
RBNode::rotate(Direction d)
{
- self *parent = _parent; // Cache because it can change before we use it.
+ self *parent = _parent; // Cache because it can change before we use it.
Direction child_dir = _parent ? _parent->getChildDirection(this) : NONE;
Direction other_dir = this->flip(d);
- self *child = this;
+ self *child = this;
if (d != NONE && this->getChild(other_dir)) {
child = this->getChild(other_dir);
@@ -91,11 +91,11 @@ namespace detail
RBNode::rippleStructureFixup()
{
self *root = this; // last node seen, root node at the end
- self *p = this;
+ self *p = this;
while (p) {
p->structureFixup();
root = p;
- p = root->_parent;
+ p = root->_parent;
}
return root;
}
@@ -138,16 +138,16 @@ namespace detail
self *y = x->_parent->_parent->getChild(other_dir);
if (y == RED) {
x->_parent->_color = BLACK;
- y->_color = BLACK;
- x = x->_parent->_parent;
- x->_color = RED;
+ y->_color = BLACK;
+ x = x->_parent->_parent;
+ x->_color = RED;
} else {
if (x->_parent->getChild(other_dir) == x) {
x = x->_parent;
x->rotate(child_dir);
}
// Note setting the parent color to BLACK causes the loop to exit.
- x->_parent->_color = BLACK;
+ x->_parent->_color = BLACK;
x->_parent->_parent->_color = RED;
x->_parent->_parent->rotate(other_dir);
}
@@ -156,7 +156,7 @@ namespace detail
// every node above this one has a subtree structure change,
// so notify it. serendipitously, this makes it easy to return
// the new root node.
- self *root = this->rippleStructureFixup();
+ self *root = this->rippleStructureFixup();
root->_color = BLACK;
return root;
@@ -175,12 +175,12 @@ namespace detail
if (!_parent && !(_left && _right)) {
if (_left) {
_left->_parent = 0;
- root = _left;
- root->_color = BLACK;
+ root = _left;
+ root->_color = BLACK;
} else if (_right) {
_right->_parent = 0;
- root = _right;
- root->_color = BLACK;
+ root = _right;
+ root->_color = BLACK;
} // else that was the only node, so leave @a root @c NULL.
return root;
}
@@ -235,7 +235,7 @@ namespace detail
this->replaceWith(remove_node);
}
- root = splice_node->rebalanceAfterRemove(remove_color, d);
+ root = splice_node->rebalanceAfterRemove(remove_color, d);
root->_color = BLACK;
return root;
}
@@ -253,14 +253,14 @@ namespace detail
self *root;
if (BLACK == c) { // only rebalance if too much black
- self *n = this;
+ self *n = this;
self *parent = n->_parent;
// If @a direction is set, then we need to start at a leaf psuedo-node.
// This is why we need @a parent, otherwise we could just use @a n.
if (NONE != d) {
parent = n;
- n = 0;
+ n = 0;
}
while (parent) { // @a n is not the root
@@ -275,13 +275,13 @@ namespace detail
Direction near(LEFT), far(RIGHT);
if ((NONE == d && parent->getChildDirection(n) == RIGHT) || RIGHT == d) {
near = RIGHT;
- far = LEFT;
+ far = LEFT;
}
self *w = parent->getChild(far); // sibling(n)
if (w->_color == RED) {
- w->_color = BLACK;
+ w->_color = BLACK;
parent->_color = RED;
parent->rotate(near);
w = parent->getChild(far);
@@ -290,20 +290,20 @@ namespace detail
self *wfc = w->getChild(far);
if (w->getChild(near) == BLACK && wfc == BLACK) {
w->_color = RED;
- n = parent;
- parent = n->_parent;
- d = NONE; // Cancel any leaf node logic
+ n = parent;
+ parent = n->_parent;
+ d = NONE; // Cancel any leaf node logic
} else {
if (wfc->_color == BLACK) {
w->getChild(near)->_color = BLACK;
- w->_color = RED;
+ w->_color = RED;
w->rotate(far);
- w = parent->getChild(far);
+ w = parent->getChild(far);
wfc = w->getChild(far); // w changed, update far child cache.
}
- w->_color = parent->_color;
+ w->_color = parent->_color;
parent->_color = BLACK;
- wfc->_color = BLACK;
+ wfc->_color = BLACK;
parent->rotate(near);
break;
}
diff --git a/lib/ts/Regex.cc b/lib/ts/Regex.cc
index 5cb5c67..621d086 100644
--- a/lib/ts/Regex.cc
+++ b/lib/ts/Regex.cc
@@ -53,7 +53,7 @@ Regex::compile(const char *pattern, const unsigned flags)
{
const char *error;
int erroffset;
- int options = 0;
+ int options = 0;
int study_opts = 0;
if (regex)
@@ -158,19 +158,19 @@ DFA::build(const char *pattern, unsigned flags)
flags |= RE_ANCHORED;
}
- ret = (dfa_pattern *)ats_malloc(sizeof(dfa_pattern));
+ ret = (dfa_pattern *)ats_malloc(sizeof(dfa_pattern));
ret->_p = NULL;
ret->_re = new Regex();
- rv = ret->_re->compile(pattern, flags);
+ rv = ret->_re->compile(pattern, flags);
if (rv == -1) {
delete ret->_re;
ats_free(ret);
return NULL;
}
- ret->_idx = 0;
- ret->_p = ats_strndup(pattern, strlen(pattern));
+ ret->_idx = 0;
+ ret->_p = ats_strndup(pattern, strlen(pattern));
ret->_next = NULL;
return ret;
}
@@ -196,22 +196,22 @@ DFA::compile(const char **patterns, int npatterns, unsigned flags)
for (i = 0; i < npatterns; i++) {
pattern = patterns[i];
- ret = build(pattern, flags);
+ ret = build(pattern, flags);
if (!ret) {
continue;
}
if (!_my_patterns) {
- _my_patterns = ret;
+ _my_patterns = ret;
_my_patterns->_next = NULL;
- _my_patterns->_idx = i;
+ _my_patterns->_idx = i;
} else {
end = _my_patterns;
while (end->_next) {
end = end->_next;
}
end->_next = ret; // add to end
- ret->_idx = i;
+ ret->_idx = i;
}
}
diff --git a/lib/ts/Regex.h b/lib/ts/Regex.h
index d150f5b..2713e51 100644
--- a/lib/ts/Regex.h
+++ b/lib/ts/Regex.h
@@ -34,8 +34,8 @@
enum REFlags {
RE_CASE_INSENSITIVE = 0x0001, // default is case sensitive
- RE_UNANCHORED = 0x0002, // default (for DFA) is to anchor at the first matching position
- RE_ANCHORED = 0x0004, // default (for Regex) is unanchored
+ RE_UNANCHORED = 0x0002, // default (for DFA) is to anchor at the first matching position
+ RE_ANCHORED = 0x0004, // default (for Regex) is unanchored
};
class Regex
diff --git a/lib/ts/Regression.cc b/lib/ts/Regression.cc
index 878197c..b940baf 100644
--- a/lib/ts/Regression.cc
+++ b/lib/ts/Regression.cc
@@ -32,13 +32,13 @@
#include "ts/ink_assert.h"
#include "ts/Regression.h"
-static RegressionTest *test = NULL;
+static RegressionTest *test = NULL;
static RegressionTest *exclusive_test = NULL;
RegressionTest *RegressionTest::current = 0;
-int RegressionTest::ran_tests = 0;
+int RegressionTest::ran_tests = 0;
DFA RegressionTest::dfa;
-int regression_level = 0;
+int regression_level = 0;
int RegressionTest::final_status = REGRESSION_TEST_PASSED;
char *
@@ -52,20 +52,20 @@ regression_status_string(int status)
RegressionTest::RegressionTest(const char *name_arg, TestFunction *function_arg, int aopt)
{
- name = name_arg;
+ name = name_arg;
function = function_arg;
- status = REGRESSION_TEST_NOT_RUN;
- printed = 0;
- opt = aopt;
+ status = REGRESSION_TEST_NOT_RUN;
+ printed = 0;
+ opt = aopt;
if (opt == REGRESSION_OPT_EXCLUSIVE) {
if (exclusive_test)
- this->next = exclusive_test;
+ this->next = exclusive_test;
exclusive_test = this;
} else {
if (test)
this->next = test;
- test = this;
+ test = this;
}
}
@@ -143,7 +143,7 @@ RegressionTest::check_status()
return status;
}
RegressionTest *t = test;
- int exclusive = 0;
+ int exclusive = 0;
check_test_list:
while (t) {
@@ -168,7 +168,7 @@ check_test_list:
}
if (!exclusive) {
exclusive = 1;
- t = exclusive_test;
+ t = exclusive_test;
goto check_test_list;
}
diff --git a/lib/ts/SimpleTokenizer.h b/lib/ts/SimpleTokenizer.h
index 45c77e2..262081b 100644
--- a/lib/ts/SimpleTokenizer.h
+++ b/lib/ts/SimpleTokenizer.h
@@ -117,10 +117,10 @@ public:
// and right, and input string is copied (not overwritten)
//
enum {
- CONSIDER_NULL_FIELDS = 1,
- KEEP_WHITESPACE_LEFT = 2,
- KEEP_WHITESPACE_RIGHT = 4,
- KEEP_WHITESPACE = KEEP_WHITESPACE_LEFT + KEEP_WHITESPACE_RIGHT,
+ CONSIDER_NULL_FIELDS = 1,
+ KEEP_WHITESPACE_LEFT = 2,
+ KEEP_WHITESPACE_RIGHT = 4,
+ KEEP_WHITESPACE = KEEP_WHITESPACE_LEFT + KEEP_WHITESPACE_RIGHT,
OVERWRITE_INPUT_STRING = 8
};
@@ -142,9 +142,9 @@ public:
{
_clearData();
- _start = 0;
+ _start = 0;
_length = strlen(s);
- _data = (_mode & OVERWRITE_INPUT_STRING ? const_cast<char *>(s) : ats_strdup(s));
+ _data = (_mode & OVERWRITE_INPUT_STRING ? const_cast<char *>(s) : ats_strdup(s));
// to handle the case where there is a null field at the end of the
// input string, we replace the null character at the end of the
@@ -234,7 +234,7 @@ private:
// set end
//
- size_t end = _start;
+ size_t end = _start;
int delimCount = 0;
while (end < _length && (_data[end] != delimiter || (end && (_data[end - 1] == _escape ? (hasEsc = true) : 0)) ||
((++delimCount < numTokens) && (end < _length - 1)))) {
@@ -287,7 +287,7 @@ private:
_getNumTokensRemaining(char delimiter)
{
size_t startSave = _start; // save current position
- size_t count = 0;
+ size_t count = 0;
while (_getNext(delimiter, true)) {
++count;
};
diff --git a/lib/ts/TestHttpHeader.cc b/lib/ts/TestHttpHeader.cc
index 2927bda..37d5b4e 100644
--- a/lib/ts/TestHttpHeader.cc
+++ b/lib/ts/TestHttpHeader.cc
@@ -187,8 +187,8 @@ TestHttpHeader()
{
HttpHeader h;
h.m_message_type = HTTP_MESSAGE_TYPE_REQUEST;
- h.m_method = HTTP_METHOD_GET;
- h.m_version = HttpVersion(1, 0);
+ h.m_method = HTTP_METHOD_GET;
+ h.m_version = HttpVersion(1, 0);
test_add_fields(&h);
diff --git a/lib/ts/TextBuffer.cc b/lib/ts/TextBuffer.cc
index fa80391..7943c0f 100644
--- a/lib/ts/TextBuffer.cc
+++ b/lib/ts/TextBuffer.cc
@@ -37,7 +37,7 @@
textBuffer::textBuffer(int size)
{
bufferStart = NULL;
- nextAdd = NULL;
+ nextAdd = NULL;
currentSize = spaceLeft = 0;
if (size > 0) {
// Insitute a minimum size
@@ -46,10 +46,10 @@ textBuffer::textBuffer(int size)
}
bufferStart = (char *)ats_malloc(size);
- nextAdd = bufferStart;
+ nextAdd = bufferStart;
currentSize = size;
- spaceLeft = size - 1; // Leave room for a terminator;
- nextAdd[0] = '\0';
+ spaceLeft = size - 1; // Leave room for a terminator;
+ nextAdd[0] = '\0';
}
}
@@ -78,8 +78,8 @@ void
textBuffer::reUse()
{
if (bufferStart != NULL) {
- nextAdd = bufferStart;
- spaceLeft = currentSize - 1;
+ nextAdd = bufferStart;
+ spaceLeft = currentSize - 1;
nextAdd[0] = '\0';
}
}
@@ -124,7 +124,7 @@ int
textBuffer::enlargeBuffer(unsigned N)
{
unsigned addedSize = 0;
- unsigned newSize = (currentSize ? currentSize : 1) * 2;
+ unsigned newSize = (currentSize ? currentSize : 1) * 2;
char *newSpace;
if (spaceLeft < N) {
@@ -136,7 +136,7 @@ textBuffer::enlargeBuffer(unsigned N)
newSpace = (char *)ats_realloc(bufferStart, newSize);
if (newSpace != NULL) {
- nextAdd = newSpace + (unsigned)(nextAdd - bufferStart);
+ nextAdd = newSpace + (unsigned)(nextAdd - bufferStart);
bufferStart = newSpace;
spaceLeft += addedSize;
currentSize = newSize;
@@ -222,7 +222,7 @@ textBuffer::readFromFD(int fd)
// Error on read
return readSize;
} else {
- nextAdd = nextAdd + readSize;
+ nextAdd = nextAdd + readSize;
nextAdd[0] = '\0';
spaceLeft -= readSize + 1;
return readSize;
diff --git a/lib/ts/Tokenizer.cc b/lib/ts/Tokenizer.cc
index dfc501a..8897d82 100644
--- a/lib/ts/Tokenizer.cc
+++ b/lib/ts/Tokenizer.cc
@@ -42,7 +42,7 @@ Tokenizer::Tokenizer(const char *StrOfDelimiters)
if (StrOfDelimiters == NULL) {
strOfDelimit = NULL;
} else {
- length = (int)(strlen(StrOfDelimiters) + 1);
+ length = (int)(strlen(StrOfDelimiters) + 1);
strOfDelimit = new char[length];
memcpy(strOfDelimit, StrOfDelimiters, length);
}
@@ -50,17 +50,17 @@ Tokenizer::Tokenizer(const char *StrOfDelimiters)
memset(&start_node, 0, sizeof(tok_node));
numValidTokens = 0;
- maxTokens = UINT_MAX;
- options = 0;
+ maxTokens = UINT_MAX;
+ options = 0;
- add_node = &start_node;
- add_index = 0;
+ add_node = &start_node;
+ add_index = 0;
quoteFound = false;
}
Tokenizer::~Tokenizer()
{
- bool root = true;
+ bool root = true;
tok_node *cur = &start_node;
;
tok_node *next = NULL;
@@ -118,9 +118,9 @@ Tokenizer::Initialize(char *str, unsigned opt)
{
char *strStart;
int priorCharWasDelimit = 1;
- char *tokStart = NULL;
- unsigned tok_count = 0;
- bool max_limit_hit = false;
+ char *tokStart = NULL;
+ unsigned tok_count = 0;
+ bool max_limit_hit = false;
// We can't depend on ReUse() being called so just do it
// if the object needs it
@@ -138,11 +138,11 @@ Tokenizer::Initialize(char *str, unsigned opt)
// Make sure that both options are not set
ink_assert(!((opt & COPY_TOKS) && (opt & SHARE_TOKS)));
- str = strStart;
+ str = strStart;
priorCharWasDelimit = 1;
tok_count = 0;
- tokStart = str;
+ tokStart = str;
while (*str != '\0') {
// Check to see if we've run to maxToken limit
@@ -163,7 +163,7 @@ Tokenizer::Initialize(char *str, unsigned opt)
if (isDelimiter(*str)) {
addToken(tokStart, (int)(str - tokStart));
tok_count++;
- tokStart = str + 1;
+ tokStart = str + 1;
priorCharWasDelimit = 1;
} else {
priorCharWasDelimit = 0;
@@ -211,7 +211,7 @@ Tokenizer::Initialize(char *str, unsigned opt)
priorCharWasDelimit = 1;
} else {
// There is stuff to copy for the last token
- tokStart = str;
+ tokStart = str;
priorCharWasDelimit = 0;
// Advance until the end of the string
@@ -244,7 +244,7 @@ Tokenizer::addToken(char *startAddr, int length)
char *add_ptr;
if (options & SHARE_TOKS) {
startAddr[length] = '\0';
- add_ptr = startAddr;
+ add_ptr = startAddr;
} else {
add_ptr = (char *)ats_malloc(length + 1);
memcpy(add_ptr, startAddr, length);
@@ -264,7 +264,7 @@ Tokenizer::addToken(char *startAddr, int length)
add_node->next = (tok_node *)ats_malloc(sizeof(tok_node));
memset(add_node->next, 0, sizeof(tok_node));
}
- add_node = add_node->next;
+ add_node = add_node->next;
add_index = 0;
}
}
@@ -272,7 +272,7 @@ Tokenizer::addToken(char *startAddr, int length)
const char *Tokenizer::operator[](unsigned index) const
{
const tok_node *cur_node = &start_node;
- unsigned cur_start = 0;
+ unsigned cur_start = 0;
if (index >= numValidTokens) {
return NULL;
@@ -295,7 +295,7 @@ Tokenizer::count() const
const char *
Tokenizer::iterFirst(tok_iter_state *state)
{
- state->node = &start_node;
+ state->node = &start_node;
state->index = -1;
return iterNext(state);
}
@@ -318,7 +318,7 @@ Tokenizer::iterNext(tok_iter_state *state)
}
if (node->el[index] != NULL) {
- state->node = node;
+ state->node = node;
state->index = index;
return node->el[index];
} else {
@@ -330,8 +330,8 @@ void
Tokenizer::Print()
{
tok_node *cur_node = &start_node;
- int node_index = 0;
- int count = 0;
+ int node_index = 0;
+ int count = 0;
while (cur_node != NULL) {
if (cur_node->el[node_index] != NULL) {
@@ -343,7 +343,7 @@ Tokenizer::Print()
node_index++;
if (node_index >= TOK_NODE_ELEMENTS) {
- cur_node = cur_node->next;
+ cur_node = cur_node->next;
node_index = 0;
}
}
@@ -364,8 +364,8 @@ Tokenizer::ReUse()
}
numValidTokens = 0;
- add_node = &start_node;
- add_index = 0;
+ add_node = &start_node;
+ add_index = 0;
}
#if TS_HAS_TESTS
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index c307617..a0db666 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -64,9 +64,9 @@ private:
void
Clear()
{
- value = NULL;
+ value = NULL;
occupied = false;
- rank = 0;
+ rank = 0;
ink_zero(children);
}
@@ -125,7 +125,7 @@ Trie<T>::Insert(const char *key, T *value, int rank, int key_len /* = -1 */)
Node *next_node;
Node *curr_node = &m_root;
- int i = 0;
+ int i = 0;
while (true) {
if (is_debug_tag_set("Trie::Insert")) {
@@ -156,8 +156,8 @@ Trie<T>::Insert(const char *key, T *value, int rank, int key_len /* = -1 */)
}
curr_node->occupied = true;
- curr_node->value = value;
- curr_node->rank = rank;
+ curr_node->value = value;
+ curr_node->rank = rank;
m_value_list.enqueue(curr_node->value);
Debug("Trie::Insert", "inserted new element!");
return true;
@@ -170,8 +170,8 @@ Trie<T>::Search(const char *key, int key_len /* = -1 */) const
_CheckArgs(key, key_len);
const Node *found_node = 0;
- const Node *curr_node = &m_root;
- int i = 0;
+ const Node *curr_node = &m_root;
+ int i = 0;
while (curr_node) {
if (is_debug_tag_set("Trie::Search")) {
diff --git a/lib/ts/TsBuffer.h b/lib/ts/TsBuffer.h
index 76b8196..48b5127 100644
--- a/lib/ts/TsBuffer.h
+++ b/lib/ts/TsBuffer.h
@@ -296,7 +296,7 @@ inline Buffer::Buffer(char *ptr, size_t n) : _ptr(ptr), _size(n)
inline Buffer &
Buffer::set(char *ptr, size_t n)
{
- _ptr = ptr;
+ _ptr = ptr;
_size = n;
return *this;
}
@@ -306,7 +306,7 @@ inline Buffer::Buffer(char *start, char *end) : _ptr(start), _size(end - start)
inline Buffer &
Buffer::reset()
{
- _ptr = 0;
+ _ptr = 0;
_size = 0;
return *this;
}
@@ -374,7 +374,7 @@ inline ConstBuffer::ConstBuffer(Buffer const &that) : _ptr(that._ptr), _size(tha
inline ConstBuffer &
ConstBuffer::set(char const *ptr, size_t n)
{
- _ptr = ptr;
+ _ptr = ptr;
_size = n;
return *this;
}
@@ -382,7 +382,7 @@ ConstBuffer::set(char const *ptr, size_t n)
inline ConstBuffer &
ConstBuffer::set(char const *start, char const *end)
{
- _ptr = start;
+ _ptr = start;
_size = end - start;
return *this;
}
@@ -390,7 +390,7 @@ ConstBuffer::set(char const *start, char const *end)
inline ConstBuffer &
ConstBuffer::reset()
{
- _ptr = 0;
+ _ptr = 0;
_size = 0;
return *this;
}
@@ -412,7 +412,7 @@ ConstBuffer::operator==(self const &that) const
inline ConstBuffer &
ConstBuffer::operator=(Buffer const &that)
{
- _ptr = that._ptr;
+ _ptr = that._ptr;
_size = that._size;
return *this;
}
diff --git a/lib/ts/Vec.cc b/lib/ts/Vec.cc
index b11b91e..8773b2f 100644
--- a/lib/ts/Vec.cc
+++ b/lib/ts/Vec.cc
@@ -139,7 +139,7 @@ Lmore:
fill(n + 2);
if (n - 2 - l > 0)
memmove(v + l + 2, v + l, sizeof(int) * (n - 2 - l));
- v[l] = x;
+ v[l] = x;
v[l + 1] = x;
return;
Lmerge:
@@ -166,7 +166,7 @@ UnionFind::size(int s)
size_t nn = n;
fill(s);
for (size_t i = nn; i < n; i++)
- v[i] = -1;
+ v[i] = -1;
}
int
@@ -176,8 +176,8 @@ UnionFind::find(int n)
for (i = n; v[i] >= 0; i = v[i])
;
while (v[n] >= 0) {
- t = n;
- n = v[n];
+ t = n;
+ n = v[n];
v[t] = i;
}
return i;
diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h
index 8192914..00da28f 100644
--- a/lib/ts/Vec.h
+++ b/lib/ts/Vec.h
@@ -243,9 +243,9 @@ template <class C, class A, int S> inline Vec<C, A, S>::Vec(const Vec<C, A, S> &
template <class C, class A, int S> inline Vec<C, A, S>::Vec(C c)
{
- n = 1;
- i = 0;
- v = &e[0];
+ n = 1;
+ i = 0;
+ v = &e[0];
e[0] = c;
}
@@ -453,7 +453,7 @@ inline void
Vec<C, A, S>::fill(size_t nn)
{
for (size_t i = n; i < nn; i++)
- add() = 0;
+ add() = 0;
}
template <class C, class A, int S>
@@ -512,7 +512,7 @@ Vec<C, A, S>::set_add_internal(C c)
size_t j, k;
if (n) {
uintptr_t h = (uintptr_t)c;
- h = h % n;
+ h = h % n;
for (k = h, j = 0; j < i + 3; j++) {
if (!v[k]) {
v[k] = c;
@@ -539,7 +539,7 @@ Vec<C, A, S>::set_in_internal(C c)
size_t j, k;
if (n) {
uintptr_t h = (uintptr_t)c;
- h = h % n;
+ h = h % n;
for (k = h, j = 0; j < i + 3; j++) {
if (!v[k])
return 0;
@@ -724,7 +724,7 @@ Vec<C, A, S>::insert(size_t index, Vec<C> &vv)
{
fill(n + vv.n);
memmove(&v[index + vv.n], &v[index], (n - index - 1) * sizeof(C));
- for (int x = 0; x < vv.n; x++)
+ for (int x = 0; x < vv.n; x++)
v[index + x] = vv[x];
}
@@ -762,7 +762,7 @@ Vec<C, A, S>::copy_internal(const Vec<C, A, S> &vv)
nl++;
}
nl = 1 << nl;
- v = (C *)A::alloc(nl * sizeof(C));
+ v = (C *)A::alloc(nl * sizeof(C));
memcpy(v, vv.v, n * sizeof(C));
memset(v + n, 0, (nl - n) * sizeof(C));
if (i > n) // reset reserve
@@ -777,8 +777,8 @@ Vec<C, A, S>::set_expand()
i = SET_INITIAL_INDEX;
else
i = i + 1;
- n = prime2[i];
- v = (C *)A::alloc(n * sizeof(C));
+ n = prime2[i];
+ v = (C *)A::alloc(n * sizeof(C));
memset(v, 0, n * sizeof(C));
}
@@ -791,9 +791,9 @@ Vec<C, A, S>::reserve(size_t x)
unsigned xx = 1 << VEC_INITIAL_SHIFT;
while (xx < x)
xx *= 2;
- i = xx;
+ i = xx;
void *vv = (void *)v;
- v = (C *)A::alloc(i * sizeof(C));
+ v = (C *)A::alloc(i * sizeof(C));
if (vv && n)
memcpy(v, vv, n * sizeof(C));
memset(&v[n], 0, (i - n) * sizeof(C));
@@ -823,7 +823,7 @@ Vec<C, A, S>::addx()
i = 0;
}
void *vv = (void *)v;
- v = (C *)A::alloc(nl * sizeof(C));
+ v = (C *)A::alloc(nl * sizeof(C));
memcpy(v, vv, n * sizeof(C));
memset(&v[n], 0, n * sizeof(C));
A::free(vv);
@@ -891,7 +891,7 @@ template <class C, class A, int S>
inline int
marshal(Vec<C, A, S> &v, char *buf)
{
- char *x = buf;
+ char *x = buf;
*(int *)x = v.n;
x += sizeof(int);
*(int *)x = v.i;
@@ -906,7 +906,7 @@ inline int
unmarshal(Vec<C, A, S> &v, char *buf)
{
char *x = buf;
- v.n = *(int *)x;
+ v.n = *(int *)x;
x += sizeof(int);
v.i = *(int *)x;
x += sizeof(int);
@@ -967,7 +967,7 @@ qsort_Vec(C *left, C *right, bool (*lt)(C, C))
for (C *y = right - 1; y > left; y--) {
for (C *x = left; x < y; x++) {
if (lt(x[1], x[0])) {
- C t = x[0];
+ C t = x[0];
x[0] = x[1];
x[1] = t;
}
@@ -1033,7 +1033,7 @@ qsort_VecRef(C *left, C *right, bool (*lt)(const C &, const C &), unsigned int *
for (C *y = right - 1; y > left; y--) {
for (C *x = left; x < y; x++) {
if (lt(x[1], x[0])) {
- C t = x[0];
+ C t = x[0];
x[0] = x[1];
x[1] = t;
}
diff --git a/lib/ts/Version.cc b/lib/ts/Version.cc
index 4f7ae02..258b0bb 100644
--- a/lib/ts/Version.cc
+++ b/lib/ts/Version.cc
@@ -129,7 +129,7 @@ REGRESSION_TEST(AppVersionInfo)(RegressionTest *t, int /* atype ATS_UNUSED */, i
TestBox tb(t, pstatus);
const char *errMsgFormat = "wrong build number, expected '%s', got '%s'";
- const char *bench[][3] = {// date, time, resulting build number
+ const char *bench[][3] = {// date, time, resulting build number
{"Oct 4 1957", "19:28:34", BUILD_NUMBER},
{"Oct 4 1957", "19:28:34", "100419"},
{"Apr 4 1957", "09:08:04", "040409"},
diff --git a/lib/ts/X509HostnameValidator.cc b/lib/ts/X509HostnameValidator.cc
index fc3f969..7f79701 100644
--- a/lib/ts/X509HostnameValidator.cc
+++ b/lib/ts/X509HostnameValidator.cc
@@ -137,7 +137,7 @@ wildcard_match(const unsigned char *prefix, size_t prefix_len, const unsigned ch
if (!equal_nocase(prefix, prefix_len, subject, prefix_len))
return false;
wildcard_start = subject + prefix_len;
- wildcard_end = subject + (subject_len - suffix_len);
+ wildcard_end = subject + (subject_len - suffix_len);
if (!equal_nocase(wildcard_end, suffix_len, suffix, suffix_len))
return false;
/*
@@ -203,7 +203,7 @@ bool
validate_hostname(X509 *x, const unsigned char *hostname, bool is_ip, char **peername)
{
GENERAL_NAMES *gens = NULL;
- X509_NAME *name = NULL;
+ X509_NAME *name = NULL;
int i;
int alt_type;
bool retval = false;
@@ -213,10 +213,10 @@ validate_hostname(X509 *x, const unsigned char *hostname, bool is_ip, char **pee
if (!is_ip) {
alt_type = V_ASN1_IA5STRING;
- equal = equal_wildcard;
+ equal = equal_wildcard;
} else {
alt_type = V_ASN1_OCTET_STRING;
- equal = equal_case;
+ equal = equal_case;
}
// Check SANs for a match.
@@ -245,7 +245,7 @@ validate_hostname(X509 *x, const unsigned char *hostname, bool is_ip, char **pee
return retval;
}
// No SAN match -- check the subject
- i = -1;
+ i = -1;
name = X509_get_subject_name(x);
while ((i = X509_NAME_get_index_by_NID(name, NID_commonName, i)) >= 0) {
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 77c101e..1ade5f6 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -138,69 +138,63 @@ typedef enum { TS_HTTP_TYPE_UNKNOWN, TS_HTTP_TYPE_REQUEST, TS_HTTP_TYPE_RESPONSE
*/
typedef enum {
- TS_HTTP_STATUS_NONE = 0,
-
- TS_HTTP_STATUS_CONTINUE = 100,
- TS_HTTP_STATUS_SWITCHING_PROTOCOL = 101,
-
- TS_HTTP_STATUS_OK = 200,
- TS_HTTP_STATUS_CREATED = 201,
- TS_HTTP_STATUS_ACCEPTED = 202,
- TS_HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
- TS_HTTP_STATUS_NO_CONTENT = 204,
- TS_HTTP_STATUS_RESET_CONTENT = 205,
- TS_HTTP_STATUS_PARTIAL_CONTENT = 206,
- TS_HTTP_STATUS_MULTI_STATUS = 207,
- TS_HTTP_STATUS_ALREADY_REPORTED = 208,
- TS_HTTP_STATUS_IM_USED = 211,
-
- TS_HTTP_STATUS_MULTIPLE_CHOICES = 300,
- TS_HTTP_STATUS_MOVED_PERMANENTLY = 301,
- TS_HTTP_STATUS_MOVED_TEMPORARILY = 302,
- TS_HTTP_STATUS_SEE_OTHER = 303,
- TS_HTTP_STATUS_NOT_MODIFIED = 304,
- TS_HTTP_STATUS_USE_PROXY = 305,
- TS_HTTP_STATUS_TEMPORARY_REDIRECT = 307,
- TS_HTTP_STATUS_PERMANENT_REDIRECT = 308,
-
- TS_HTTP_STATUS_BAD_REQUEST = 400,
- TS_HTTP_STATUS_UNAUTHORIZED = 401,
- TS_HTTP_STATUS_PAYMENT_REQUIRED = 402,
- TS_HTTP_STATUS_FORBIDDEN = 403,
- TS_HTTP_STATUS_NOT_FOUND = 404,
- TS_HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
- TS_HTTP_STATUS_NOT_ACCEPTABLE = 406,
- TS_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
- TS_HTTP_STATUS_REQUEST_TIMEOUT = 408,
- TS_HTTP_STATUS_CONFLICT = 409,
- TS_HTTP_STATUS_GONE = 410,
- TS_HTTP_STATUS_LENGTH_REQUIRED = 411,
- TS_HTTP_STATUS_PRECONDITION_FAILED = 412,
- TS_HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
- TS_HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
- TS_HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
+ TS_HTTP_STATUS_NONE = 0,
+ TS_HTTP_STATUS_CONTINUE = 100,
+ TS_HTTP_STATUS_SWITCHING_PROTOCOL = 101,
+ TS_HTTP_STATUS_OK = 200,
+ TS_HTTP_STATUS_CREATED = 201,
+ TS_HTTP_STATUS_ACCEPTED = 202,
+ TS_HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
+ TS_HTTP_STATUS_NO_CONTENT = 204,
+ TS_HTTP_STATUS_RESET_CONTENT = 205,
+ TS_HTTP_STATUS_PARTIAL_CONTENT = 206,
+ TS_HTTP_STATUS_MULTI_STATUS = 207,
+ TS_HTTP_STATUS_ALREADY_REPORTED = 208,
+ TS_HTTP_STATUS_IM_USED = 211,
+ TS_HTTP_STATUS_MULTIPLE_CHOICES = 300,
+ TS_HTTP_STATUS_MOVED_PERMANENTLY = 301,
+ TS_HTTP_STATUS_MOVED_TEMPORARILY = 302,
+ TS_HTTP_STATUS_SEE_OTHER = 303,
+ TS_HTTP_STATUS_NOT_MODIFIED = 304,
+ TS_HTTP_STATUS_USE_PROXY = 305,
+ TS_HTTP_STATUS_TEMPORARY_REDIRECT = 307,
+ TS_HTTP_STATUS_PERMANENT_REDIRECT = 308,
+ TS_HTTP_STATUS_BAD_REQUEST = 400,
+ TS_HTTP_STATUS_UNAUTHORIZED = 401,
+ TS_HTTP_STATUS_PAYMENT_REQUIRED = 402,
+ TS_HTTP_STATUS_FORBIDDEN = 403,
+ TS_HTTP_STATUS_NOT_FOUND = 404,
+ TS_HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
+ TS_HTTP_STATUS_NOT_ACCEPTABLE = 406,
+ TS_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
+ TS_HTTP_STATUS_REQUEST_TIMEOUT = 408,
+ TS_HTTP_STATUS_CONFLICT = 409,
+ TS_HTTP_STATUS_GONE = 410,
+ TS_HTTP_STATUS_LENGTH_REQUIRED = 411,
+ TS_HTTP_STATUS_PRECONDITION_FAILED = 412,
+ TS_HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
+ TS_HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
+ TS_HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
TS_HTTP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE = 416,
- TS_HTTP_STATUS_EXPECTATION_FAILED = 417,
- TS_HTTP_STATUS_UNPROCESSABLE_ENTITY = 422,
- TS_HTTP_STATUS_LOCKED = 423,
- TS_HTTP_STATUS_FAILED_DEPENDENCY = 424,
- TS_HTTP_STATUS_UPGRADE_REQUIRED = 426,
- TS_HTTP_STATUS_PRECONDITION_REQUIRED = 428,
- TS_HTTP_STATUS_TOO_MANY_REQUESTS = 429,
+ TS_HTTP_STATUS_EXPECTATION_FAILED = 417,
+ TS_HTTP_STATUS_UNPROCESSABLE_ENTITY = 422,
+ TS_HTTP_STATUS_LOCKED = 423,
+ TS_HTTP_STATUS_FAILED_DEPENDENCY = 424,
+ TS_HTTP_STATUS_UPGRADE_REQUIRED = 426,
+ TS_HTTP_STATUS_PRECONDITION_REQUIRED = 428,
+ TS_HTTP_STATUS_TOO_MANY_REQUESTS = 429,
TS_HTTP_STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431,
-
- TS_HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
- TS_HTTP_STATUS_NOT_IMPLEMENTED = 501,
- TS_HTTP_STATUS_BAD_GATEWAY = 502,
- TS_HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
- TS_HTTP_STATUS_GATEWAY_TIMEOUT = 504,
- TS_HTTP_STATUS_HTTPVER_NOT_SUPPORTED = 505,
- TS_HTTP_STATUS_VARIANT_ALSO_NEGOTIATES = 506,
- TS_HTTP_STATUS_INSUFFICIENT_STORAGE = 507,
- TS_HTTP_STATUS_LOOP_DETECTED = 508,
- TS_HTTP_STATUS_NOT_EXTENDED = 510,
+ TS_HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
+ TS_HTTP_STATUS_NOT_IMPLEMENTED = 501,
+ TS_HTTP_STATUS_BAD_GATEWAY = 502,
+ TS_HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
+ TS_HTTP_STATUS_GATEWAY_TIMEOUT = 504,
+ TS_HTTP_STATUS_HTTPVER_NOT_SUPPORTED = 505,
+ TS_HTTP_STATUS_VARIANT_ALSO_NEGOTIATES = 506,
+ TS_HTTP_STATUS_INSUFFICIENT_STORAGE = 507,
+ TS_HTTP_STATUS_LOOP_DETECTED = 508,
+ TS_HTTP_STATUS_NOT_EXTENDED = 510,
TS_HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511
-
} TSHttpStatus;
/**
@@ -357,95 +351,82 @@ typedef enum {
*/
typedef enum {
- TS_EVENT_NONE = 0,
- TS_EVENT_IMMEDIATE = 1,
- TS_EVENT_TIMEOUT = 2,
- TS_EVENT_ERROR = 3,
- TS_EVENT_CONTINUE = 4,
-
- TS_EVENT_VCONN_READ_READY = 100,
- TS_EVENT_VCONN_WRITE_READY = 101,
- TS_EVENT_VCONN_READ_COMPLETE = 102,
- TS_EVENT_VCONN_WRITE_COMPLETE = 103,
- TS_EVENT_VCONN_EOS = 104,
- TS_EVENT_VCONN_INACTIVITY_TIMEOUT = 105,
- TS_EVENT_VCONN_ACTIVE_TIMEOUT = 106,
-
- TS_EVENT_NET_CONNECT = 200,
- TS_EVENT_NET_CONNECT_FAILED = 201,
- TS_EVENT_NET_ACCEPT = 202,
- TS_EVENT_NET_ACCEPT_FAILED = 204,
-
- /* EVENTS 206 - 212 for internal use */
- TS_EVENT_INTERNAL_206 = 206,
- TS_EVENT_INTERNAL_207 = 207,
- TS_EVENT_INTERNAL_208 = 208,
- TS_EVENT_INTERNAL_209 = 209,
- TS_EVENT_INTERNAL_210 = 210,
- TS_EVENT_INTERNAL_211 = 211,
- TS_EVENT_INTERNAL_212 = 212,
-
- TS_EVENT_HOST_LOOKUP = 500,
- TS_EVENT_CACHE_OPEN_READ = 1102,
- TS_EVENT_CACHE_OPEN_READ_FAILED = 1103,
- TS_EVENT_CACHE_OPEN_WRITE = 1108,
- TS_EVENT_CACHE_OPEN_WRITE_FAILED = 1109,
- TS_EVENT_CACHE_REMOVE = 1112,
- TS_EVENT_CACHE_REMOVE_FAILED = 1113,
- TS_EVENT_CACHE_SCAN = 1120,
- TS_EVENT_CACHE_SCAN_FAILED = 1121,
- TS_EVENT_CACHE_SCAN_OBJECT = 1122,
- TS_EVENT_CACHE_SCAN_OPERATION_BLOCKED = 1123,
- TS_EVENT_CACHE_SCAN_OPERATION_FAILED = 1124,
- TS_EVENT_CACHE_SCAN_DONE = 1125,
-
- TS_EVENT_CACHE_LOOKUP = 1126,
- TS_EVENT_CACHE_READ = 1127,
- TS_EVENT_CACHE_DELETE = 1128,
- TS_EVENT_CACHE_WRITE = 1129,
- TS_EVENT_CACHE_WRITE_HEADER = 1130,
- TS_EVENT_CACHE_CLOSE = 1131,
- TS_EVENT_CACHE_LOOKUP_READY = 1132,
- TS_EVENT_CACHE_LOOKUP_COMPLETE = 1133,
- TS_EVENT_CACHE_READ_READY = 1134,
- TS_EVENT_CACHE_READ_COMPLETE = 1135,
-
- /* EVENT 1200 for internal use */
- TS_EVENT_INTERNAL_1200 = 1200,
-
- /* EVENT 3900 is corresponding to event AIO_EVENT_DONE defined in I_AIO.h */
- TS_AIO_EVENT_DONE = 3900,
-
- TS_EVENT_HTTP_CONTINUE = 60000,
- TS_EVENT_HTTP_ERROR = 60001,
- TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
- TS_EVENT_HTTP_OS_DNS = 60003,
- TS_EVENT_HTTP_SEND_REQUEST_HDR = 60004,
- TS_EVENT_HTTP_READ_CACHE_HDR = 60005,
- TS_EVENT_HTTP_READ_RESPONSE_HDR = 60006,
- TS_EVENT_HTTP_SEND_RESPONSE_HDR = 60007,
- TS_EVENT_HTTP_REQUEST_TRANSFORM = 60008,
- TS_EVENT_HTTP_RESPONSE_TRANSFORM = 60009,
- TS_EVENT_HTTP_SELECT_ALT = 60010,
- TS_EVENT_HTTP_TXN_START = 60011,
- TS_EVENT_HTTP_TXN_CLOSE = 60012,
- TS_EVENT_HTTP_SSN_START = 60013,
- TS_EVENT_HTTP_SSN_CLOSE = 60014,
- TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE = 60015,
- TS_EVENT_HTTP_PRE_REMAP = 60016,
- TS_EVENT_HTTP_POST_REMAP = 60017,
- TS_EVENT_LIFECYCLE_PORTS_INITIALIZED = 60018,
- TS_EVENT_LIFECYCLE_PORTS_READY = 60019,
- TS_EVENT_LIFECYCLE_CACHE_READY = 60020,
+ TS_EVENT_NONE = 0,
+ TS_EVENT_IMMEDIATE = 1,
+ TS_EVENT_TIMEOUT = 2,
+ TS_EVENT_ERROR = 3,
+ TS_EVENT_CONTINUE = 4,
+ TS_EVENT_VCONN_READ_READY = 100,
+ TS_EVENT_VCONN_WRITE_READY = 101,
+ TS_EVENT_VCONN_READ_COMPLETE = 102,
+ TS_EVENT_VCONN_WRITE_COMPLETE = 103,
+ TS_EVENT_VCONN_EOS = 104,
+ TS_EVENT_VCONN_INACTIVITY_TIMEOUT = 105,
+ TS_EVENT_VCONN_ACTIVE_TIMEOUT = 106,
+ TS_EVENT_NET_CONNECT = 200,
+ TS_EVENT_NET_CONNECT_FAILED = 201,
+ TS_EVENT_NET_ACCEPT = 202,
+ TS_EVENT_NET_ACCEPT_FAILED = 204,
+ TS_EVENT_INTERNAL_206 = 206,
+ TS_EVENT_INTERNAL_207 = 207,
+ TS_EVENT_INTERNAL_208 = 208,
+ TS_EVENT_INTERNAL_209 = 209,
+ TS_EVENT_INTERNAL_210 = 210,
+ TS_EVENT_INTERNAL_211 = 211,
+ TS_EVENT_INTERNAL_212 = 212,
+ TS_EVENT_HOST_LOOKUP = 500,
+ TS_EVENT_CACHE_OPEN_READ = 1102,
+ TS_EVENT_CACHE_OPEN_READ_FAILED = 1103,
+ TS_EVENT_CACHE_OPEN_WRITE = 1108,
+ TS_EVENT_CACHE_OPEN_WRITE_FAILED = 1109,
+ TS_EVENT_CACHE_REMOVE = 1112,
+ TS_EVENT_CACHE_REMOVE_FAILED = 1113,
+ TS_EVENT_CACHE_SCAN = 1120,
+ TS_EVENT_CACHE_SCAN_FAILED = 1121,
+ TS_EVENT_CACHE_SCAN_OBJECT = 1122,
+ TS_EVENT_CACHE_SCAN_OPERATION_BLOCKED = 1123,
+ TS_EVENT_CACHE_SCAN_OPERATION_FAILED = 1124,
+ TS_EVENT_CACHE_SCAN_DONE = 1125,
+ TS_EVENT_CACHE_LOOKUP = 1126,
+ TS_EVENT_CACHE_READ = 1127,
+ TS_EVENT_CACHE_DELETE = 1128,
+ TS_EVENT_CACHE_WRITE = 1129,
+ TS_EVENT_CACHE_WRITE_HEADER = 1130,
+ TS_EVENT_CACHE_CLOSE = 1131,
+ TS_EVENT_CACHE_LOOKUP_READY = 1132,
+ TS_EVENT_CACHE_LOOKUP_COMPLETE = 1133,
+ TS_EVENT_CACHE_READ_READY = 1134,
+ TS_EVENT_CACHE_READ_COMPLETE = 1135,
+ TS_EVENT_INTERNAL_1200 = 1200,
+ TS_AIO_EVENT_DONE = 3900,
+ TS_EVENT_HTTP_CONTINUE = 60000,
+ TS_EVENT_HTTP_ERROR = 60001,
+ TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
+ TS_EVENT_HTTP_OS_DNS = 60003,
+ TS_EVENT_HTTP_SEND_REQUEST_HDR = 60004,
+ TS_EVENT_HTTP_READ_CACHE_HDR = 60005,
+ TS_EVENT_HTTP_READ_RESPONSE_HDR = 60006,
+ TS_EVENT_HTTP_SEND_RESPONSE_HDR = 60007,
+ TS_EVENT_HTTP_REQUEST_TRANSFORM = 60008,
+ TS_EVENT_HTTP_RESPONSE_TRANSFORM = 60009,
+ TS_EVENT_HTTP_SELECT_ALT = 60010,
+ TS_EVENT_HTTP_TXN_START = 60011,
+ TS_EVENT_HTTP_TXN_CLOSE = 60012,
+ TS_EVENT_HTTP_SSN_START = 60013,
+ TS_EVENT_HTTP_SSN_CLOSE = 60014,
+ TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE = 60015,
+ TS_EVENT_HTTP_PRE_REMAP = 60016,
+ TS_EVENT_HTTP_POST_REMAP = 60017,
+ TS_EVENT_LIFECYCLE_PORTS_INITIALIZED = 60018,
+ TS_EVENT_LIFECYCLE_PORTS_READY = 60019,
+ TS_EVENT_LIFECYCLE_CACHE_READY = 60020,
TS_EVENT_LIFECYCLE_SERVER_SSL_CTX_INITIALIZED = 60021,
TS_EVENT_LIFECYCLE_CLIENT_SSL_CTX_INITIALIZED = 60022,
- TS_EVENT_VCONN_PRE_ACCEPT = 60023,
- TS_EVENT_MGMT_UPDATE = 60100,
-
- /* EVENTS 60200 - 60202 for internal use */
- TS_EVENT_INTERNAL_60200 = 60200,
- TS_EVENT_INTERNAL_60201 = 60201,
- TS_EVENT_INTERNAL_60202 = 60202
+ TS_EVENT_VCONN_PRE_ACCEPT = 60023,
+ TS_EVENT_MGMT_UPDATE = 60100,
+ TS_EVENT_INTERNAL_60200 = 60200,
+ TS_EVENT_INTERNAL_60201 = 60201,
+ TS_EVENT_INTERNAL_60202 = 60202
} TSEvent;
#define TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP TS_EVENT_HTTP_PRE_REMAP /* backwards compat */
@@ -485,9 +466,9 @@ typedef enum { TS_CACHE_DATA_TYPE_NONE, TS_CACHE_DATA_TYPE_HTTP, TS_CACHE_DATA_T
typedef enum { TS_CACHE_ERROR_NO_DOC = -20400, TS_CACHE_ERROR_DOC_BUSY = -20401, TS_CACHE_ERROR_NOT_READY = -20407 } TSCacheError;
typedef enum {
- TS_CACHE_SCAN_RESULT_DONE = 0,
+ TS_CACHE_SCAN_RESULT_DONE = 0,
TS_CACHE_SCAN_RESULT_CONTINUE = 1,
- TS_CACHE_SCAN_RESULT_DELETE = 10,
+ TS_CACHE_SCAN_RESULT_DELETE = 10,
TS_CACHE_SCAN_RESULT_DELETE_ALL_ALTERNATES,
TS_CACHE_SCAN_RESULT_UPDATE,
TS_CACHE_SCAN_RESULT_RETRY
@@ -507,21 +488,21 @@ typedef enum {
typedef enum { TS_VC_CLOSE_ABORT = -1, TS_VC_CLOSE_NORMAL = 1 } TSVConnCloseFlags;
typedef enum {
- TS_IOBUFFER_SIZE_INDEX_128 = 0,
- TS_IOBUFFER_SIZE_INDEX_256 = 1,
- TS_IOBUFFER_SIZE_INDEX_512 = 2,
- TS_IOBUFFER_SIZE_INDEX_1K = 3,
- TS_IOBUFFER_SIZE_INDEX_2K = 4,
- TS_IOBUFFER_SIZE_INDEX_4K = 5,
- TS_IOBUFFER_SIZE_INDEX_8K = 6,
- TS_IOBUFFER_SIZE_INDEX_16K = 7,
- TS_IOBUFFER_SIZE_INDEX_32K = 8,
- TS_IOBUFFER_SIZE_INDEX_64K = 9,
+ TS_IOBUFFER_SIZE_INDEX_128 = 0,
+ TS_IOBUFFER_SIZE_INDEX_256 = 1,
+ TS_IOBUFFER_SIZE_INDEX_512 = 2,
+ TS_IOBUFFER_SIZE_INDEX_1K = 3,
+ TS_IOBUFFER_SIZE_INDEX_2K = 4,
+ TS_IOBUFFER_SIZE_INDEX_4K = 5,
+ TS_IOBUFFER_SIZE_INDEX_8K = 6,
+ TS_IOBUFFER_SIZE_INDEX_16K = 7,
+ TS_IOBUFFER_SIZE_INDEX_32K = 8,
+ TS_IOBUFFER_SIZE_INDEX_64K = 9,
TS_IOBUFFER_SIZE_INDEX_128K = 10,
TS_IOBUFFER_SIZE_INDEX_256K = 11,
TS_IOBUFFER_SIZE_INDEX_512K = 12,
- TS_IOBUFFER_SIZE_INDEX_1M = 13,
- TS_IOBUFFER_SIZE_INDEX_2M = 14
+ TS_IOBUFFER_SIZE_INDEX_1M = 13,
+ TS_IOBUFFER_SIZE_INDEX_2M = 14
} TSIOBufferSizeIndex;
typedef enum { TS_ERROR = -1, TS_SUCCESS = 0 } TSReturnCode;
@@ -548,14 +529,14 @@ typedef enum { TS_SERVER_SESSION_SHARING_POOL_GLOBAL, TS_SERVER_SESSION_SHARING_
/* The values of this enum must match enum RecT in I_RecDefs.h */
typedef enum {
- TS_RECORDTYPE_NULL = 0x00,
- TS_RECORDTYPE_CONFIG = 0x01,
+ TS_RECORDTYPE_NULL = 0x00,
+ TS_RECORDTYPE_CONFIG = 0x01,
TS_RECORDTYPE_PROCESS = 0x02,
- TS_RECORDTYPE_NODE = 0x04,
+ TS_RECORDTYPE_NODE = 0x04,
TS_RECORDTYPE_CLUSTER = 0x08,
- TS_RECORDTYPE_LOCAL = 0x10,
- TS_RECORDTYPE_PLUGIN = 0x20,
- TS_RECORDTYPE_ALL = 0x3F
+ TS_RECORDTYPE_LOCAL = 0x10,
+ TS_RECORDTYPE_PLUGIN = 0x20,
+ TS_RECORDTYPE_ALL = 0x3F
} TSRecordType;
/* The values of this enum must match enum RecDataT in I_RecDefs.h */
diff --git a/lib/ts/fastlz.c b/lib/ts/fastlz.c
index f077edd..18d9301 100644
--- a/lib/ts/fastlz.c
+++ b/lib/ts/fastlz.c
@@ -174,10 +174,10 @@ fastlz_compress_level(int level, const void *input, int length, void *output)
static FASTLZ_INLINE int
FASTLZ_COMPRESSOR(const void *input, int length, void *output)
{
- const flzuint8 *ip = (const flzuint8 *)input;
+ const flzuint8 *ip = (const flzuint8 *)input;
const flzuint8 *ip_bound = ip + length - 2;
const flzuint8 *ip_limit = ip + length - 12;
- flzuint8 *op = (flzuint8 *)output;
+ flzuint8 *op = (flzuint8 *)output;
const flzuint8 *htab[HASH_SIZE];
const flzuint8 **hslot;
@@ -203,7 +203,7 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
*hslot = ip;
/* we start with literal copy */
- copy = 2;
+ copy = 2;
*op++ = MAX_COPY - 1;
*op++ = *ip++;
*op++ = *ip++;
@@ -223,7 +223,7 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
#if FASTLZ_LEVEL == 2
if (ip[0] == ip[-1] && FASTLZ_READU16(ip - 1) == FASTLZ_READU16(ip + 1)) {
distance = 1;
- ref = anchor - 1 + 3;
+ ref = anchor - 1 + 3;
goto match;
}
#endif
@@ -231,7 +231,7 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
/* find potential match */
HASH_FUNCTION(hval, ip);
hslot = htab + hval;
- ref = htab[hval];
+ ref = htab[hval];
/* calculate distance to the match */
distance = anchor - ref;
@@ -324,8 +324,8 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
*op++ = (7 << 5) + (distance >> 8);
for (len -= 7; len >= 255; len -= 255)
*op++ = 255;
- *op++ = len;
- *op++ = (distance & 255);
+ *op++ = len;
+ *op++ = (distance & 255);
}
} else {
/* far away, but not yet in the another galaxy... */
@@ -340,10 +340,10 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
*op++ = (7 << 5) + 31;
for (len -= 7; len >= 255; len -= 255)
*op++ = 255;
- *op++ = len;
- *op++ = 255;
- *op++ = distance >> 8;
- *op++ = distance & 255;
+ *op++ = len;
+ *op++ = 255;
+ *op++ = distance >> 8;
+ *op++ = distance & 255;
}
}
#else
@@ -379,10 +379,10 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
literal:
*op++ = *anchor++;
- ip = anchor;
+ ip = anchor;
copy++;
if (FASTLZ_UNEXPECT_CONDITIONAL(copy == MAX_COPY)) {
- copy = 0;
+ copy = 0;
*op++ = MAX_COPY - 1;
}
}
@@ -393,7 +393,7 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
*op++ = *ip++;
copy++;
if (copy == MAX_COPY) {
- copy = 0;
+ copy = 0;
*op++ = MAX_COPY - 1;
}
}
@@ -415,17 +415,17 @@ FASTLZ_COMPRESSOR(const void *input, int length, void *output)
static FASTLZ_INLINE int
FASTLZ_DECOMPRESSOR(const void *input, int length, void *output, int maxout)
{
- const flzuint8 *ip = (const flzuint8 *)input;
+ const flzuint8 *ip = (const flzuint8 *)input;
const flzuint8 *ip_limit = ip + length;
- flzuint8 *op = (flzuint8 *)output;
- flzuint8 *op_limit = op + maxout;
- flzuint32 ctrl = (*ip++) & 31;
- int loop = 1;
+ flzuint8 *op = (flzuint8 *)output;
+ flzuint8 *op_limit = op + maxout;
+ flzuint32 ctrl = (*ip++) & 31;
+ int loop = 1;
do {
const flzuint8 *ref = op;
- flzuint32 len = ctrl >> 5;
- flzuint32 ofs = (ctrl & 31) << 8;
+ flzuint32 len = ctrl >> 5;
+ flzuint32 ofs = (ctrl & 31) << 8;
if (ctrl >= 32) {
#if FASTLZ_LEVEL == 2
@@ -470,9 +470,9 @@ FASTLZ_DECOMPRESSOR(const void *input, int length, void *output, int maxout)
if (ref == op) {
/* optimize copy for a run */
flzuint8 b = ref[-1];
- *op++ = b;
- *op++ = b;
- *op++ = b;
+ *op++ = b;
+ *op++ = b;
+ *op++ = b;
for (; len; --len)
*op++ = b;
} else {
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index d455198..1a14856 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -39,14 +39,14 @@ Process arguments
//
const char *file_arguments[MAX_FILE_ARGUMENTS] = {0};
-const char *program_name = (char *)"Traffic Server";
-unsigned n_file_arguments = 0;
+const char *program_name = (char *)"Traffic Server";
+unsigned n_file_arguments = 0;
//
// Local variables
//
-static const char *argument_types_keys = (char *)"ISDfFTL";
+static const char *argument_types_keys = (char *)"ISDfFTL";
static const char *argument_types_descriptions[] = {(char *)"int ", (char *)"str ", (char *)"dbl ", (char *)"off ",
(char *)"on ", (char *)"tog ", (char *)"i64 ", (char *)" "};
@@ -105,7 +105,7 @@ process_arg(const AppVersionInfo *appinfo, const ArgumentDescription *argument_d
case 'S':
if (argument_descriptions[i].type[1] == '*') {
char **out = (char **)argument_descriptions[i].location;
- *out = ats_strdup(arg);
+ *out = ats_strdup(arg);
} else {
ink_strlcpy((char *)argument_descriptions[i].location, arg, atoi(argument_descriptions[i].type + 1));
}
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index 03b81ca..6ac44be 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -114,7 +114,7 @@ ink_atomic_swap<int64_t>(pvint64 mem, int64_t value)
{
int64_t old;
ink_mutex_acquire(&__global_death);
- old = *mem;
+ old = *mem;
*mem = value;
ink_mutex_release(&__global_death);
return old;
diff --git a/lib/ts/ink_base64.cc b/lib/ts/ink_base64.cc
index b99a652..aa0f566 100644
--- a/lib/ts/ink_base64.cc
+++ b/lib/ts/ink_base64.cc
@@ -41,7 +41,7 @@ bool
ats_base64_encode(const unsigned char *inBuffer, size_t inBufferSize, char *outBuffer, size_t outBufSize, size_t *length)
{
static const char _codes[66] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- char *obuf = outBuffer;
+ char *obuf = outBuffer;
char in_tail[4];
if (outBufSize < ATS_BASE64_ENCODE_DSTLEN(inBufferSize))
@@ -73,15 +73,15 @@ ats_base64_encode(const unsigned char *inBuffer, size_t inBufferSize, char *outB
memset(in_tail, 0, sizeof(in_tail));
memcpy(in_tail, inBuffer, inBufferSize);
- *(obuf) = _codes[(in_tail[0] >> 2) & 077];
+ *(obuf) = _codes[(in_tail[0] >> 2) & 077];
*(obuf + 1) = _codes[((in_tail[0] & 03) << 4) | ((in_tail[1] >> 4) & 017)];
*(obuf + 2) = _codes[((in_tail[1] & 017) << 2) | ((in_tail[2] >> 6) & 017)];
*(obuf + 3) = _codes[in_tail[2] & 077];
if (inBufferSize == 1)
*(obuf + 2) = '=';
- *(obuf + 3) = '=';
- *(obuf + 4) = '\0';
+ *(obuf + 3) = '=';
+ *(obuf + 4) = '\0';
if (length)
*length = (obuf + 4) - outBuffer;
@@ -120,9 +120,9 @@ const unsigned char printableToSixBit[256] = {
bool
ats_base64_decode(const char *inBuffer, size_t inBufferSize, unsigned char *outBuffer, size_t outBufSize, size_t *length)
{
- size_t inBytes = 0;
- size_t decodedBytes = 0;
- unsigned char *buf = outBuffer;
+ size_t inBytes = 0;
+ size_t decodedBytes = 0;
+ unsigned char *buf = outBuffer;
int inputBytesDecoded = 0;
// Make sure there is sufficient space in the output buffer
diff --git a/lib/ts/ink_cap.cc b/lib/ts/ink_cap.cc
index 14be2ec..f025278 100644
--- a/lib/ts/ink_cap.cc
+++ b/lib/ts/ink_cap.cc
@@ -61,7 +61,7 @@ ink_mutex ElevateAccess::lock = INK_MUTEX_INIT;
#define DEBUG_PRIVILEGES(tag) \
do { \
if (is_debug_tag_set(tag)) { \
- cap_t caps = cap_get_proc(); \
+ cap_t caps = cap_get_proc(); \
char *caps_text = cap_to_text(caps, NULL); \
Debug(tag, "caps='%s', core=%s, death signal=%d, thread=0x%llx", caps_text, is_dumpable(), death_signal(), \
(unsigned long long)pthread_self()); \
@@ -86,7 +86,7 @@ ink_mutex ElevateAccess::lock = INK_MUTEX_INIT;
static int
getresuid(uid_t *uid, uid_t *euid, uid_t *suid)
{
- *uid = getuid();
+ *uid = getuid();
*euid = geteuid();
return 0;
}
@@ -96,7 +96,7 @@ getresuid(uid_t *uid, uid_t *euid, uid_t *suid)
static int
getresgid(gid_t *gid, gid_t *egid, gid_t *sgid)
{
- *gid = getgid();
+ *gid = getgid();
*egid = getegid();
return 0;
}
@@ -147,7 +147,7 @@ DebugCapabilities(char const *tag)
static void
impersonate(const struct passwd *pwd, ImpersonationLevel level)
{
- int deathsig = death_signal();
+ int deathsig = death_signal();
bool dumpable = false;
DEBUG_CREDENTIALS("privileges");
@@ -262,10 +262,10 @@ RestrictCapabilities()
#if TS_USE_POSIX_CAP
cap_t caps = cap_init(); // start with nothing.
// Capabilities we need.
- cap_value_t perm_list[] = {CAP_NET_ADMIN, CAP_NET_BIND_SERVICE, CAP_IPC_LOCK, CAP_DAC_OVERRIDE};
+ cap_value_t perm_list[] = {CAP_NET_ADMIN, CAP_NET_BIND_SERVICE, CAP_IPC_LOCK, CAP_DAC_OVERRIDE};
static int const PERM_CAP_COUNT = sizeof(perm_list) / sizeof(*perm_list);
- cap_value_t eff_list[] = {CAP_NET_ADMIN, CAP_NET_BIND_SERVICE, CAP_IPC_LOCK};
- static int const EFF_CAP_COUNT = sizeof(eff_list) / sizeof(*eff_list);
+ cap_value_t eff_list[] = {CAP_NET_ADMIN, CAP_NET_BIND_SERVICE, CAP_IPC_LOCK};
+ static int const EFF_CAP_COUNT = sizeof(eff_list) / sizeof(*eff_list);
cap_set_flag(caps, CAP_PERMITTED, PERM_CAP_COUNT, perm_list, CAP_SET);
cap_set_flag(caps, CAP_EFFECTIVE, EFF_CAP_COUNT, eff_list, CAP_SET);
@@ -374,7 +374,7 @@ ElevateAccess::acquirePrivilege(unsigned priv_mask)
if (cap_count > 0) {
this->cap_state = cap_get_proc(); // save current capabilities
- new_cap_state = cap_get_proc(); // and another instance to modify.
+ new_cap_state = cap_get_proc(); // and another instance to modify.
cap_set_flag(new_cap_state, CAP_EFFECTIVE, cap_count, cap_list, CAP_SET);
if (cap_set_proc(new_cap_state) != 0) {
diff --git a/lib/ts/ink_cap.h b/lib/ts/ink_cap.h
index fd93a60..e875083 100644
--- a/lib/ts/ink_cap.h
+++ b/lib/ts/ink_cap.h
@@ -72,9 +72,9 @@ class ElevateAccess
{
public:
typedef enum {
- FILE_PRIVILEGE = 0x1u, ///< Access filesystem objects with privilege
- TRACE_PRIVILEGE = 0x2u, ///< Trace other processes with privilege
- LOW_PORT_PRIVILEGE = 0x4u ///< Bind to privilege ports.
+ FILE_PRIVILEGE = 0x1u, ///< Access filesystem objects with privilege
+ TRACE_PRIVILEGE = 0x2u, ///< Trace other processes with privilege
+ LOW_PORT_PRIVILEGE = 0x4u ///< Bind to privilege ports.
} privilege_level;
ElevateAccess(unsigned level = FILE_PRIVILEGE);
diff --git a/lib/ts/ink_config.h.in b/lib/ts/ink_config.h.in
index c4edecd..7cfa2e1 100644
--- a/lib/ts/ink_config.h.in
+++ b/lib/ts/ink_config.h.in
@@ -23,7 +23,7 @@
*/
#ifndef _ink_config_h
-#define _ink_config_h
+#define _ink_config_h
// Note: All "defines" should be prefixed with TS_ when appropriate, please
// don't use ATS_ any more.
@@ -44,69 +44,67 @@
#define _TS_STR(x) #x
#define TS_STR(x) _TS_STR(x)
-#define BUILD_MACHINE "@build_machine@"
-#define BUILD_PERSON "@build_person@"
-#define BUILD_GROUP "@build_group@"
-#define BUILD_NUMBER "@build_number@"
+#define BUILD_MACHINE "@build_machine@"
+#define BUILD_PERSON "@build_person@"
+#define BUILD_GROUP "@build_group@"
+#define BUILD_NUMBER "@build_number@"
/* Libraries */
-#define TS_HAS_LIBZ @zlibh@
-#define TS_HAS_LZMA @lzmah@
-#define TS_HAS_JEMALLOC @jemalloch@
-#define TS_HAS_TCMALLOC @has_tcmalloc@
-
+#define TS_HAS_LIBZ @zlibh@
+#define TS_HAS_LZMA @lzmah@
+#define TS_HAS_JEMALLOC @jemalloch@
+#define TS_HAS_TCMALLOC @has_tcmalloc@
/* Features */
#define TS_HAS_IN6_IS_ADDR_UNSPECIFIED @has_in6_is_addr_unspecified@
-#define TS_HAS_BACKTRACE @has_backtrace@
-#define TS_HAS_PROFILER @has_profiler@
-#define TS_USE_FAST_SDK @use_fast_sdk@
-#define TS_USE_DIAGS @use_diags@
-#define TS_USE_EPOLL @use_epoll@
-#define TS_USE_KQUEUE @use_kqueue@
-#define TS_USE_PORT @use_port@
-#define TS_USE_POSIX_CAP @use_posix_cap@
-#define TS_USE_TPROXY @use_tproxy@
-#define TS_HAS_SO_MARK @has_so_mark@
-#define TS_HAS_SPDY @has_spdy@
-#define TS_HAS_IP_TOS @has_ip_tos@
-#define TS_USE_HWLOC @use_hwloc@
-#define TS_USE_TLS_NPN @use_tls_npn@
-#define TS_USE_TLS_ALPN @use_tls_alpn@
-#define TS_USE_TLS_SNI @use_tls_sni@
-#define TS_USE_CERT_CB @use_cert_cb@
-#define TS_USE_SET_RBIO @use_set_rbio@
-#define TS_USE_TLS_ECKEY @use_tls_eckey@
-#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio@
-#define TS_USE_REMOTE_UNWINDING @use_remote_unwinding@
-#define TS_USE_LUAJIT @use_luajit@
-
-#define TS_HAS_SO_PEERCRED @has_so_peercred@
+#define TS_HAS_BACKTRACE @has_backtrace@
+#define TS_HAS_PROFILER @has_profiler@
+#define TS_USE_FAST_SDK @use_fast_sdk@
+#define TS_USE_DIAGS @use_diags@
+#define TS_USE_EPOLL @use_epoll@
+#define TS_USE_KQUEUE @use_kqueue@
+#define TS_USE_PORT @use_port@
+#define TS_USE_POSIX_CAP @use_posix_cap@
+#define TS_USE_TPROXY @use_tproxy@
+#define TS_HAS_SO_MARK @has_so_mark@
+#define TS_HAS_SPDY @has_spdy@
+#define TS_HAS_IP_TOS @has_ip_tos@
+#define TS_USE_HWLOC @use_hwloc@
+#define TS_USE_TLS_NPN @use_tls_npn@
+#define TS_USE_TLS_ALPN @use_tls_alpn@
+#define TS_USE_TLS_SNI @use_tls_sni@
+#define TS_USE_CERT_CB @use_cert_cb@
+#define TS_USE_SET_RBIO @use_set_rbio@
+#define TS_USE_TLS_ECKEY @use_tls_eckey@
+#define TS_USE_LINUX_NATIVE_AIO @use_linux_native_aio@
+#define TS_USE_REMOTE_UNWINDING @use_remote_unwinding@
+#define TS_USE_LUAJIT @use_luajit@
+
+#define TS_HAS_SO_PEERCRED @has_so_peercred@
/* OS API definitions */
-#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
-#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
-#define TS_IP_TRANSPARENT @ip_transparent@
-#define TS_HAS_128BIT_CAS @has_128bit_cas@
+#define GETHOSTBYNAME_R_GLIBC2 @gethostbyname_r_glibc2@
+#define SIZEOF_VOID_POINTER @ac_cv_sizeof_voidp@
+#define TS_IP_TRANSPARENT @ip_transparent@
+#define TS_HAS_128BIT_CAS @has_128bit_cas@
/* API */
-#define TS_HAS_TESTS @has_tests@
-#define TS_HAS_WCCP @has_wccp@
-
-#define TS_MAX_THREADS_IN_EACH_THREAD_TYPE @max_threads_per_type@
-#define TS_MAX_NUMBER_EVENT_THREADS @max_event_threads@
+#define TS_HAS_TESTS @has_tests@
+#define TS_HAS_WCCP @has_wccp@
-#define TS_MAX_HOST_NAME_LEN @max_host_name_len@
+#define TS_MAX_THREADS_IN_EACH_THREAD_TYPE @max_threads_per_type@
+#define TS_MAX_NUMBER_EVENT_THREADS @max_event_threads@
-#define TS_MAX_API_STATS @max_api_stats@
+#define TS_MAX_HOST_NAME_LEN @max_host_name_len@
+#define TS_MAX_API_STATS @max_api_stats@
-#define SPLIT_DNS 1
-#define HTTP_CACHE 1
+#define SPLIT_DNS 1
+#define HTTP_CACHE 1
/* Defaults for user / group */
-#define TS_PKGSYSUSER "@pkgsysuser@"
-#define TS_PKGSYSGROUP "@pkgsysgroup@"
+#define TS_PKGSYSUSER "@pkgsysuser@"
+#define TS_PKGSYSGROUP "@pkgsysgroup@"
/* Various "build" defines */
#define TS_BUILD_PREFIX "@prefix@"
diff --git a/lib/ts/ink_defs.cc b/lib/ts/ink_defs.cc
index 66884cf..712df08 100644
--- a/lib/ts/ink_defs.cc
+++ b/lib/ts/ink_defs.cc
@@ -40,7 +40,7 @@
#endif /* MAGIC_EDITING_TAG */
int off = 0;
-int on = 1;
+int on = 1;
#if TS_USE_HWLOC
@@ -71,18 +71,18 @@ ink_get_topology()
int
ink_sys_name_release(char *name, int namelen, char *release, int releaselen)
{
- *name = 0;
+ *name = 0;
*release = 0;
#if defined(freebsd) || defined(darwin)
int mib[2];
size_t len = namelen;
- mib[0] = CTL_KERN;
- mib[1] = KERN_OSTYPE;
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_OSTYPE;
if (sysctl(mib, 2, name, &len, NULL, 0) == -1)
return -1;
- len = releaselen;
+ len = releaselen;
mib[0] = CTL_KERN;
mib[1] = KERN_OSRELEASE;
@@ -126,8 +126,8 @@ ink_number_of_processors()
#endif
#elif defined(freebsd)
int mib[2], n;
- mib[0] = CTL_HW;
- mib[1] = HW_NCPU;
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
size_t len = sizeof(n);
if (sysctl(mib, 2, &n, &len, NULL, 0) == -1)
return 1;
diff --git a/lib/ts/ink_error.cc b/lib/ts/ink_error.cc
index ebb54dd..5f9705a 100644
--- a/lib/ts/ink_error.cc
+++ b/lib/ts/ink_error.cc
@@ -86,7 +86,7 @@ ink_pfatal(const char *message_format, ...)
va_list ap;
char extended_format[4096], message[4096];
- int errsav = errno;
+ int errsav = errno;
const char *errno_string = strerror(errsav);
va_start(ap, message_format);
diff --git a/lib/ts/ink_file.cc b/lib/ts/ink_file.cc
index dafaf4b..3ceb402 100644
--- a/lib/ts/ink_file.cc
+++ b/lib/ts/ink_file.cc
@@ -184,9 +184,9 @@ ink_filepath_merge(char *path, int pathsz, const char *rootpath, const char *add
rootpath = curdir;
}
rootlen = strlen(rootpath);
- maxlen = rootlen + strlen(addpath) + 4; // 4 for slashes at start, after
- // root, and at end, plus trailing
- // null
+ maxlen = rootlen + strlen(addpath) + 4; // 4 for slashes at start, after
+ // root, and at end, plus trailing
+ // null
if (maxlen > (size_t)pathsz) {
return E2BIG; // APR_ENAMETOOLONG;
}
@@ -344,7 +344,7 @@ ink_filepath_make(char *path, int pathsz, const char *rootpath, const char *addp
return 0;
}
rootlen = strlen(rootpath);
- maxlen = strlen(addpath) + 2;
+ maxlen = strlen(addpath) + 2;
if (maxlen > (size_t)pathsz) {
*path = '\0';
return (int)maxlen;
@@ -515,7 +515,7 @@ int
ink_fileperm_parse(const char *perms)
{
if (perms && strlen(perms) == 9) {
- int re = 0;
+ int re = 0;
char *c = (char *)perms;
if (*c == 'r')
re |= S_IRUSR;
diff --git a/lib/ts/ink_hash_table.cc b/lib/ts/ink_hash_table.cc
index 4eff846..56e5dbd 100644
--- a/lib/ts/ink_hash_table.cc
+++ b/lib/ts/ink_hash_table.cc
@@ -162,7 +162,7 @@ ink_hash_table_lookup(InkHashTable *ht_ptr, const char *key, InkHashTableValue *
if (he_ptr == NULL)
return (0);
- value = ink_hash_table_entry_value(ht_ptr, he_ptr);
+ value = ink_hash_table_entry_value(ht_ptr, he_ptr);
*value_ptr = value;
return (1);
} /* End ink_hash_table_lookup */
@@ -184,7 +184,7 @@ ink_hash_table_delete(InkHashTable *ht_ptr, const char *key)
Tcl_HashTable *tcl_ht_ptr;
Tcl_HashEntry *tcl_he_ptr;
- tcl_key = (char *)key;
+ tcl_key = (char *)key;
tcl_ht_ptr = (Tcl_HashTable *)ht_ptr;
tcl_he_ptr = Tcl_FindHashEntry(tcl_ht_ptr, tcl_key);
@@ -214,7 +214,7 @@ ink_hash_table_lookup_entry(InkHashTable *ht_ptr, const char *key)
tcl_ht_ptr = (Tcl_HashTable *)ht_ptr;
tcl_he_ptr = Tcl_FindHashEntry(tcl_ht_ptr, key);
- he_ptr = (InkHashTableEntry *)tcl_he_ptr;
+ he_ptr = (InkHashTableEntry *)tcl_he_ptr;
return (he_ptr);
} /* End ink_hash_table_lookup_entry */
@@ -265,7 +265,7 @@ ink_hash_table_set_entry(InkHashTable *ht_ptr, InkHashTableEntry *he_ptr, InkHas
ClientData tcl_value;
Tcl_HashEntry *tcl_he_ptr;
- tcl_value = (ClientData)value;
+ tcl_value = (ClientData)value;
tcl_he_ptr = (Tcl_HashEntry *)he_ptr;
Tcl_SetHashValue(tcl_he_ptr, tcl_value);
} /* End ink_hash_table_set_entry */
@@ -370,7 +370,7 @@ DumpStringEntry(InkHashTable *ht_ptr, InkHashTableEntry *e)
InkHashTableKey key;
InkHashTableValue value;
- key = ink_hash_table_entry_key(ht_ptr, e);
+ key = ink_hash_table_entry_key(ht_ptr, e);
value = ink_hash_table_entry_value(ht_ptr, e);
fprintf(stderr, "key = '%s', value = '%s'\n", (char *)key, (char *)value);
diff --git a/lib/ts/ink_hash_table.h b/lib/ts/ink_hash_table.h
index 9a223cd..7ee263c 100644
--- a/lib/ts/ink_hash_table.h
+++ b/lib/ts/ink_hash_table.h
@@ -105,11 +105,11 @@ ink_hash_table_iterator_first(InkHashTable *ht_ptr, InkHashTableIteratorState *s
Tcl_HashEntry *tcl_he_ptr;
InkHashTableEntry *he_ptr;
- tcl_ht_ptr = (Tcl_HashTable *)ht_ptr;
+ tcl_ht_ptr = (Tcl_HashTable *)ht_ptr;
tcl_search_state_ptr = (Tcl_HashSearch *)state_ptr;
tcl_he_ptr = Tcl_FirstHashEntry(tcl_ht_ptr, tcl_search_state_ptr);
- he_ptr = (InkHashTableEntry *)tcl_he_ptr;
+ he_ptr = (InkHashTableEntry *)tcl_he_ptr;
return (he_ptr);
} /* End ink_hash_table_iterator_first */
@@ -136,7 +136,7 @@ ink_hash_table_iterator_next(InkHashTable *ht_ptr, InkHashTableIteratorState *st
tcl_search_state_ptr = (Tcl_HashSearch *)state_ptr;
tcl_he_ptr = Tcl_NextHashEntry(tcl_search_state_ptr);
- he_ptr = (InkHashTableEntry *)tcl_he_ptr;
+ he_ptr = (InkHashTableEntry *)tcl_he_ptr;
return (he_ptr);
} /* End ink_hash_table_iterator_next */
diff --git a/lib/ts/ink_hrtime.cc b/lib/ts/ink_hrtime.cc
index b38deae..b56730f 100644
--- a/lib/ts/ink_hrtime.cc
+++ b/lib/ts/ink_hrtime.cc
@@ -45,22 +45,22 @@ int64_to_str(char *buf, unsigned int buf_size, int64_t val, unsigned int *total_
const unsigned int local_buf_size = 32;
char local_buf[local_buf_size];
bool using_local_buffer = false;
- bool negative = false;
+ bool negative = false;
char *out_buf;
if (buf_size < 22) {
// int64_t may not fit in provided buffer, use the local one
- out_buf = &local_buf[local_buf_size - 1];
+ out_buf = &local_buf[local_buf_size - 1];
using_local_buffer = true;
} else {
out_buf = &buf[buf_size - 1];
}
unsigned int num_chars = 1; // includes eos
- *out_buf-- = 0;
+ *out_buf-- = 0;
if (val < 0) {
- val = -val;
+ val = -val;
negative = true;
}
@@ -86,7 +86,7 @@ int64_to_str(char *buf, unsigned int buf_size, int64_t val, unsigned int *total_
out_buf++;
}
if (req_width > buf_size)
- req_width = buf_size;
+ req_width = buf_size;
unsigned int num_padding = 0;
if (req_width > num_chars) {
num_padding = req_width - num_chars;
@@ -149,7 +149,7 @@ squid_timestamp_to_buf(char *buf, unsigned int buf_size, long timestamp_sec, lon
// convert milliseconds
//
tmp_buf[tmp_buf_size - 5] = '.';
- int ms = timestamp_usec / 1000;
+ int ms = timestamp_usec / 1000;
unsigned int num_chars_ms;
char ATS_UNUSED *ts_ms = int64_to_str(&tmp_buf[tmp_buf_size - 4], 4, ms, &num_chars_ms, 4, '0');
ink_assert(ts_ms && num_chars_ms == 4);
@@ -180,7 +180,7 @@ init_hrtime_TCS()
}
double hrtime_freq_float = 0.5; // 500 Mhz
-uint32_t hrtime_freq = init_hrtime_TCS();
+uint32_t hrtime_freq = init_hrtime_TCS();
#endif
#ifdef NEED_HRTIME_BASIS
@@ -204,19 +204,19 @@ init_hrtime_basis()
{
struct timeval tnow;
ink_assert(!gettimeofday(&tnow, NULL));
- timespec_basis.tv_sec = tnow.tv_sec;
+ timespec_basis.tv_sec = tnow.tv_sec;
timespec_basis.tv_nsec = tnow.tv_usec * 1000;
}
#endif
t2 = ink_get_hrtime_internal();
// accuracy must be at least 100 microseconds
} while (t2 - t1 > HRTIME_USECONDS(100));
- b = (t2 + t1) / 2;
+ b = (t2 + t1) / 2;
now = ink_hrtime_from_timespec(×pec_basis);
- ts = ink_hrtime_to_timespec(now);
+ ts = ink_hrtime_to_timespec(now);
ink_assert(ts.tv_sec == timespec_basis.tv_sec && ts.tv_nsec == timespec_basis.tv_nsec);
hrtime_offset = now - b;
- hrtime_basis = b;
+ hrtime_basis = b;
return b;
}
#endif
diff --git a/lib/ts/ink_hrtime.h b/lib/ts/ink_hrtime.h
index e118991..62d8635 100644
--- a/lib/ts/ink_hrtime.h
+++ b/lib/ts/ink_hrtime.h
@@ -188,7 +188,7 @@ ink_hrtime_to_timespec(ink_hrtime t)
{
struct timespec ts;
- ts.tv_sec = ink_hrtime_to_sec(t);
+ ts.tv_sec = ink_hrtime_to_sec(t);
ts.tv_nsec = t % HRTIME_SECOND;
return (ts);
}
@@ -199,8 +199,8 @@ ink_hrtime_to_timeval(ink_hrtime t)
int64_t usecs;
struct timeval tv;
- usecs = ink_hrtime_to_usec(t);
- tv.tv_sec = usecs / 1000000;
+ usecs = ink_hrtime_to_usec(t);
+ tv.tv_sec = usecs / 1000000;
tv.tv_usec = usecs % 1000000;
return (tv);
}
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index 4cf99e9..6e710d8 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -46,17 +46,17 @@ ink_gethostbyname_r(char *hostname, ink_gethostbyname_r_data *data)
#ifdef RENTRENT_GETHOSTBYNAME
struct hostent *r = gethostbyname(hostname);
if (r)
- data->ent = *r;
+ data->ent = *r;
data->herrno = errno;
#else // RENTRENT_GETHOSTBYNAME
#if GETHOSTBYNAME_R_GLIBC2
struct hostent *addrp = NULL;
- int res = gethostbyname_r(hostname, &data->ent, data->buf, INK_GETHOSTBYNAME_R_DATA_SIZE, &addrp, &data->herrno);
- struct hostent *r = NULL;
+ int res = gethostbyname_r(hostname, &data->ent, data->buf, INK_GETHOSTBYNAME_R_DATA_SIZE, &addrp, &data->herrno);
+ struct hostent *r = NULL;
if (!res && addrp)
- r = addrp;
+ r = addrp;
#else
struct hostent *r = gethostbyname_r(hostname, &data->ent, data->buf, INK_GETHOSTBYNAME_R_DATA_SIZE, &data->herrno);
@@ -69,7 +69,7 @@ struct hostent *
ink_gethostbyaddr_r(char *ip, int len, int type, ink_gethostbyaddr_r_data *data)
{
#if GETHOSTBYNAME_R_GLIBC2
- struct hostent *r = NULL;
+ struct hostent *r = NULL;
struct hostent *addrp = NULL;
int res = gethostbyaddr_r((char *)ip, len, type, &data->ent, data->buf, INK_GETHOSTBYNAME_R_DATA_SIZE, &addrp, &data->herrno);
if (!res && addrp)
@@ -89,8 +89,8 @@ uint32_t
ink_inet_addr(const char *s)
{
uint32_t u[4];
- uint8_t *pc = (uint8_t *)s;
- int n = 0;
+ uint8_t *pc = (uint8_t *)s;
+ int n = 0;
uint32_t base = 10;
if (NULL == s) {
@@ -230,7 +230,7 @@ ats_ip_parse(ts::ConstBuffer src, ts::ConstBuffer *addr, ts::ConstBuffer *port,
} else {
ts::ConstBuffer post = src.after(':');
if (post.data() && !post.find(':')) {
- *addr = src.splitOn(post.data() - 1);
+ *addr = src.splitOn(post.data() - 1);
colon_p = true;
} else { // presume no port, use everything.
*addr = src;
@@ -364,7 +364,7 @@ IpAddr::load(char const *text)
{
IpEndpoint ip;
int zret = ats_ip_pton(text, &ip);
- *this = ip;
+ *this = ip;
return zret;
}
@@ -426,7 +426,7 @@ operator==(IpAddr const &lhs, sockaddr const *rhs)
int
IpAddr::cmp(self const &that) const
{
- int zret = 0;
+ int zret = 0;
uint16_t rtype = that._family;
uint16_t ltype = _family;
@@ -488,8 +488,8 @@ ats_ip_getbestaddrinfo(char const *host, IpEndpoint *ip4, IpEndpoint *ip6)
}
ink_zero(ai_hints);
ai_hints.ai_family = AF_UNSPEC;
- ai_hints.ai_flags = AI_ADDRCONFIG;
- zret = getaddrinfo(addr_text.data(), 0, &ai_hints, &ai_result);
+ ai_hints.ai_flags = AI_ADDRCONFIG;
+ zret = getaddrinfo(addr_text.data(), 0, &ai_hints, &ai_result);
if (0 == zret) {
// Walk the returned addresses and pick the "best".
@@ -525,12 +525,12 @@ ats_ip_getbestaddrinfo(char const *host, IpEndpoint *ip4, IpEndpoint *ip6)
if (ats_is_ip4(ai_ip)) {
if (spot_type > ip4_type) {
- ip4_src = ai_ip;
+ ip4_src = ai_ip;
ip4_type = spot_type;
}
} else if (ats_is_ip6(ai_ip)) {
if (spot_type > ip6_type) {
- ip6_src = ai_ip;
+ ip6_src = ai_ip;
ip6_type = spot_type;
}
}
@@ -563,7 +563,7 @@ int
ats_ip_check_characters(ts::ConstBuffer text)
{
bool found_colon = false;
- bool found_hex = false;
+ bool found_hex = false;
for (char const *p = text.data(), *limit = p + text.size(); p < limit; ++p)
if (':' == *p)
found_colon = true;
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 6d13907..98d14e1 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -663,14 +663,14 @@ ats_is_ip_private(sockaddr const *ip)
bool zret = false;
if (ats_is_ip4(ip)) {
in_addr_t a = ats_ip4_addr_cast(ip);
- zret = ((a & htonl(0xFF000000)) == htonl(0x0A000000)) || // 10.0.0.0/8
- ((a & htonl(0xFFC00000)) == htonl(0x64400000)) || // 100.64.0.0/10
- ((a & htonl(0xFFF00000)) == htonl(0xAC100000)) || // 172.16.0.0/12
- ((a & htonl(0xFFFF0000)) == htonl(0xC0A80000)) // 192.168.0.0/16
+ zret = ((a & htonl(0xFF000000)) == htonl(0x0A000000)) || // 10.0.0.0/8
+ ((a & htonl(0xFFC00000)) == htonl(0x64400000)) || // 100.64.0.0/10
+ ((a & htonl(0xFFF00000)) == htonl(0xAC100000)) || // 172.16.0.0/12
+ ((a & htonl(0xFFFF0000)) == htonl(0xC0A80000)) // 192.168.0.0/16
;
} else if (ats_is_ip6(ip)) {
in6_addr a = ats_ip6_addr_cast(ip);
- zret = ((a.s6_addr[0] & 0xFE) == 0xFC) // fc00::/7
+ zret = ((a.s6_addr[0] & 0xFE) == 0xFC) // fc00::/7
;
}
return zret;
@@ -692,11 +692,11 @@ ats_is_ip_linklocal(sockaddr const *ip)
bool zret = false;
if (ats_is_ip4(ip)) {
in_addr_t a = ats_ip4_addr_cast(ip);
- zret = ((a & htonl(0xFFFF0000)) == htonl(0xA9FE0000)) // 169.254.0.0/16
+ zret = ((a & htonl(0xFFFF0000)) == htonl(0xA9FE0000)) // 169.254.0.0/16
;
} else if (ats_is_ip6(ip)) {
in6_addr a = ats_ip6_addr_cast(ip);
- zret = ((a.s6_addr[0] == 0xFE) && ((a.s6_addr[1] & 0xC0) == 0x80)) // fe80::/10
+ zret = ((a.s6_addr[0] == 0xFE) && ((a.s6_addr[1] & 0xC0) == 0x80)) // fe80::/10
;
}
return zret;
@@ -798,7 +798,7 @@ ats_ip_addr_cmp(sockaddr const *lhs, ///< Left hand operand.
sockaddr const *rhs ///< Right hand operand.
)
{
- int zret = 0;
+ int zret = 0;
uint16_t rtype = rhs->sa_family;
uint16_t ltype = lhs->sa_family;
@@ -822,7 +822,7 @@ ats_ip_addr_cmp(sockaddr const *lhs, ///< Left hand operand.
} else if (AF_INET6 == ltype) {
if (AF_INET6 == rtype) {
sockaddr_in6 const *lhs_in6 = ats_ip6_cast(lhs);
- zret = memcmp(&lhs_in6->sin6_addr, &ats_ip6_cast(rhs)->sin6_addr, sizeof(lhs_in6->sin6_addr));
+ zret = memcmp(&lhs_in6->sin6_addr, &ats_ip6_cast(rhs)->sin6_addr, sizeof(lhs_in6->sin6_addr));
} else {
zret = 1; // IPv6 greater than any other type.
}
@@ -934,9 +934,9 @@ ats_ip4_set(sockaddr_in *dst, ///< Destination storage.
#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
dst->sin_len = sizeof(sockaddr_in);
#endif
- dst->sin_family = AF_INET;
+ dst->sin_family = AF_INET;
dst->sin_addr.s_addr = addr;
- dst->sin_port = port;
+ dst->sin_port = port;
return ats_ip_sa_cast(dst);
}
@@ -1320,7 +1320,7 @@ struct IpAddr {
inline IpAddr &
IpAddr::operator=(in_addr_t ip)
{
- _family = AF_INET;
+ _family = AF_INET;
_addr._ip4 = ip;
return *this;
}
@@ -1328,7 +1328,7 @@ IpAddr::operator=(in_addr_t ip)
inline IpAddr &
IpAddr::operator=(in6_addr const &ip)
{
- _family = AF_INET6;
+ _family = AF_INET6;
_addr._ip6 = ip;
return *this;
}
@@ -1559,7 +1559,7 @@ IpEndpoint::setToLoopback(int family)
#endif
} else if (AF_INET6 == family) {
static const struct in6_addr init = IN6ADDR_LOOPBACK_INIT;
- sin6.sin6_addr = init;
+ sin6.sin6_addr = init;
#if HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
sin6.sin6_len = sizeof(sockaddr_in6);
#endif
diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc
index 9889806..7be6351 100644
--- a/lib/ts/ink_memory.cc
+++ b/lib/ts/ink_memory.cc
@@ -209,8 +209,8 @@ ats_mlock(caddr_t addr, size_t len)
size_t pagesize = ats_pagesize();
caddr_t a = (caddr_t)(((uintptr_t)addr) & ~(pagesize - 1));
- size_t l = (len + (addr - a) + pagesize - 1) & ~(pagesize - 1);
- int res = mlock(a, l);
+ size_t l = (len + (addr - a) + pagesize - 1) & ~(pagesize - 1);
+ int res = mlock(a, l);
return res;
}
@@ -229,7 +229,7 @@ ats_track_realloc(void *ptr, size_t size, uint64_t *alloc_stat, uint64_t *free_s
{
#ifdef HAVE_MALLOC_USABLE_SIZE
const size_t old_size = malloc_usable_size(ptr);
- ptr = ats_realloc(ptr, size);
+ ptr = ats_realloc(ptr, size);
const size_t new_size = malloc_usable_size(ptr);
if (old_size < new_size) {
// allocating something bigger
diff --git a/lib/ts/ink_memory.h b/lib/ts/ink_memory.h
index 049f011..2f1cbe0 100644
--- a/lib/ts/ink_memory.h
+++ b/lib/ts/ink_memory.h
@@ -105,7 +105,7 @@ static inline size_t __attribute__((const)) ats_pagesize(void)
return page_size;
#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
- long ret = sysconf(_SC_PAGESIZE);
+ long ret = sysconf(_SC_PAGESIZE);
page_size = (size_t)((ret > -1) ? ret : 8192);
#elif defined(HAVE_GETPAGESIZE)
page_size = (size_t)getpagesize()
@@ -285,7 +285,7 @@ public:
release()
{
value_type zret = _r;
- _r = Traits::initValue();
+ _r = Traits::initValue();
return zret;
}
@@ -503,8 +503,8 @@ public:
inline char *
path_join(ats_scoped_str const &lhs, ats_scoped_str const &rhs)
{
- size_t ln = strlen(lhs);
- size_t rn = strlen(rhs);
+ size_t ln = strlen(lhs);
+ size_t rn = strlen(rhs);
char const *rptr = rhs; // May need to be modified.
if (ln && lhs[ln - 1] == '/')
diff --git a/lib/ts/ink_queue.cc b/lib/ts/ink_queue.cc
index 01cc8be..3c35c67 100644
--- a/lib/ts/ink_queue.cc
+++ b/lib/ts/ink_queue.cc
@@ -84,11 +84,11 @@ static void *malloc_new(InkFreeList *f);
static void malloc_free(InkFreeList *f, void *item);
static void malloc_bulkfree(InkFreeList *f, void *head, void *tail, size_t num_item);
-static const ink_freelist_ops malloc_ops = {malloc_new, malloc_free, malloc_bulkfree};
+static const ink_freelist_ops malloc_ops = {malloc_new, malloc_free, malloc_bulkfree};
static const ink_freelist_ops freelist_ops = {freelist_new, freelist_free, freelist_bulkfree};
static const ink_freelist_ops *default_ops = &freelist_ops;
-static ink_freelist_list *freelists = NULL;
+static ink_freelist_list *freelists = NULL;
static const ink_freelist_ops *freelist_freelist_ops = default_ops;
const InkFreeListOps *
@@ -124,8 +124,8 @@ ink_freelist_init(InkFreeList **fl, const char *name, uint32_t type_size, uint32
f = (InkFreeList *)ats_memalign(alignment, sizeof(InkFreeList));
ink_zero(*f);
- fll = (ink_freelist_list *)ats_malloc(sizeof(ink_freelist_list));
- fll->fl = f;
+ fll = (ink_freelist_list *)ats_malloc(sizeof(ink_freelist_list));
+ fll->fl = f;
fll->next = freelists;
freelists = fll;
@@ -198,18 +198,18 @@ freelist_new(InkFreeList *f)
INK_QUEUE_LD(item, f->head);
if (TO_PTR(FREELIST_POINTER(item)) == NULL) {
uint32_t i;
- void *newp = NULL;
+ void *newp = NULL;
size_t alloc_size = f->chunk_size * f->type_size;
- size_t alignment = 0;
+ size_t alignment = 0;
if (ats_hugepage_enabled()) {
alignment = ats_hugepage_size();
- newp = ats_alloc_hugepage(alloc_size);
+ newp = ats_alloc_hugepage(alloc_size);
}
if (newp == NULL) {
alignment = ats_pagesize();
- newp = ats_memalign(alignment, INK_ALIGN(alloc_size, alignment));
+ newp = ats_memalign(alignment, INK_ALIGN(alloc_size, alignment));
}
ats_madvise((caddr_t)newp, INK_ALIGN(alloc_size, alignment), f->advice);
@@ -223,7 +223,7 @@ freelist_new(InkFreeList *f)
#ifdef DEADBEEF
const char str[4] = {(char)0xde, (char)0xad, (char)0xbe, (char)0xef};
for (int j = 0; j < (int)f->type_size; j++)
- a[j] = str[j % 4];
+ a[j] = str[j % 4];
#endif
freelist_free(f, a);
}
@@ -287,7 +287,7 @@ freelist_free(InkFreeList *f, void *item)
static const char str[4] = {(char)0xde, (char)0xad, (char)0xbe, (char)0xef};
// set the entire item to DEADBEEF
- for (int j = 0; j < (int)f->type_size; j++)
+ for (int j = 0; j < (int)f->type_size; j++)
((char *)item)[j] = str[j % 4];
}
#endif /* DEADBEEF */
@@ -344,7 +344,7 @@ freelist_bulkfree(InkFreeList *f, void *head, void *tail, size_t num_item)
// set the entire item to DEADBEEF;
void *temp = head;
for (size_t i = 0; i < num_item; i++) {
- for (int j = sizeof(void *); j < (int)f->type_size; j++)
+ for (int j = sizeof(void *); j < (int)f->type_size; j++)
((char *)temp)[j] = str[j % 4];
*ADDRESS_OF_NEXT(temp, 0) = FROM_PTR(*ADDRESS_OF_NEXT(temp, 0));
temp = TO_PTR(*ADDRESS_OF_NEXT(temp, 0));
@@ -398,8 +398,8 @@ ink_freelists_snap_baseline()
fll = freelists;
while (fll) {
fll->fl->allocated_base = fll->fl->allocated;
- fll->fl->used_base = fll->fl->used;
- fll = fll->next;
+ fll->fl->used_base = fll->fl->used;
+ fll = fll->next;
}
}
@@ -439,8 +439,8 @@ ink_freelists_dump(FILE *f)
fprintf(f, "--------------------|--------------------|------------|----------------------------------\n");
uint64_t total_allocated = 0;
- uint64_t total_used = 0;
- fll = freelists;
+ uint64_t total_used = 0;
+ fll = freelists;
while (fll) {
fprintf(f, " %18" PRIu64 " | %18" PRIu64 " | %10u | memory/%s\n", (uint64_t)fll->fl->allocated * (uint64_t)fll->fl->type_size,
(uint64_t)fll->fl->used * (uint64_t)fll->fl->type_size, fll->fl->type_size,
@@ -456,7 +456,7 @@ ink_freelists_dump(FILE *f)
void
ink_atomiclist_init(InkAtomicList *l, const char *name, uint32_t offset_to_next)
{
- l->name = name;
+ l->name = name;
l->offset = offset_to_next;
SET_FREELIST_POINTER_VERSION(l->head, FROM_PTR(0), 0);
}
@@ -496,7 +496,7 @@ ink_atomiclist_popall(InkAtomicList *l)
} while (result == 0);
{
void *ret = TO_PTR(FREELIST_POINTER(item));
- void *e = ret;
+ void *e = ret;
/* fixup forward pointers */
while (e) {
void *n = TO_PTR(*ADDRESS_OF_NEXT(e, l->offset));
@@ -513,11 +513,11 @@ ink_atomiclist_push(InkAtomicList *l, void *item)
volatile void **adr_of_next = (volatile void **)ADDRESS_OF_NEXT(item, l->offset);
head_p head;
head_p item_pair;
- int result = 0;
+ int result = 0;
volatile void *h = NULL;
do {
INK_QUEUE_LD(head, l->head);
- h = FREELIST_POINTER(head);
+ h = FREELIST_POINTER(head);
*adr_of_next = h;
ink_assert(item != TO_PTR(h));
SET_FREELIST_POINTER_VERSION(item_pair, FROM_PTR(item), FREELIST_VERSION(head));
@@ -532,10 +532,10 @@ void *
ink_atomiclist_remove(InkAtomicList *l, void *item)
{
head_p head;
- void *prev = NULL;
+ void *prev = NULL;
void **addr_next = ADDRESS_OF_NEXT(item, l->offset);
- void *item_next = *addr_next;
- int result = 0;
+ void *item_next = *addr_next;
+ int result = 0;
/*
* first, try to pop it if it is first
@@ -559,12 +559,12 @@ ink_atomiclist_remove(InkAtomicList *l, void *item)
prev = TO_PTR(FREELIST_POINTER(head));
while (prev) {
void **prev_adr_of_next = ADDRESS_OF_NEXT(prev, l->offset);
- void *prev_prev = prev;
- prev = TO_PTR(*prev_adr_of_next);
+ void *prev_prev = prev;
+ prev = TO_PTR(*prev_adr_of_next);
if (prev == item) {
ink_assert(prev_prev != item_next);
*prev_adr_of_next = item_next;
- *addr_next = NULL;
+ *addr_next = NULL;
return item;
}
}
diff --git a/lib/ts/ink_queue_utils.cc b/lib/ts/ink_queue_utils.cc
index 332fe4f..2fc547b 100644
--- a/lib/ts/ink_queue_utils.cc
+++ b/lib/ts/ink_queue_utils.cc
@@ -70,7 +70,7 @@ ink_queue_load_64(void *dst, void *src)
{
#if (defined(__i386__) || defined(__arm__) || defined(__mips__)) && (SIZEOF_VOIDP == 4)
volatile int32_t src_version = (*(head_p *)src).s.version;
- void *src_pointer = (*(head_p *)src).s.pointer;
+ void *src_pointer = (*(head_p *)src).s.pointer;
(*(head_p *)dst).s.version = src_version;
(*(head_p *)dst).s.pointer = src_pointer;
diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc
index 3e0d9fc..7a0134f 100644
--- a/lib/ts/ink_rand.cc
+++ b/lib/ts/ink_rand.cc
@@ -74,7 +74,7 @@ void
InkRand::seed(uint64_t seed)
{
mt[0] = seed;
- for (mti = 1; mti < NN; mti++)
+ for (mti = 1; mti < NN; mti++)
mt[mti] = (6364136223846793005ULL * (mt[mti - 1] ^ (mt[mti - 1] >> 62)) + mti);
}
@@ -86,14 +86,14 @@ InkRand::random()
if (mti >= NN) { /* generate NN words at one time */
for (i = 0; i < NN - MM; i++) {
- x = (mt[i] & UM) | (mt[i + 1] & LM);
+ x = (mt[i] & UM) | (mt[i + 1] & LM);
mt[i] = mt[i + MM] ^ (x >> 1) ^ mag01[(int)(x & 1ULL)];
}
for (; i < NN - 1; i++) {
- x = (mt[i] & UM) | (mt[i + 1] & LM);
+ x = (mt[i] & UM) | (mt[i + 1] & LM);
mt[i] = mt[i + (MM - NN)] ^ (x >> 1) ^ mag01[(int)(x & 1ULL)];
}
- x = (mt[NN - 1] & UM) | (mt[0] & LM);
+ x = (mt[NN - 1] & UM) | (mt[0] & LM);
mt[NN - 1] = mt[MM - 1] ^ (x >> 1) ^ mag01[(int)(x & 1ULL)];
mti = 0;
diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc
index 1376ed0..f52838b 100644
--- a/lib/ts/ink_res_init.cc
+++ b/lib/ts/ink_res_init.cc
@@ -148,7 +148,7 @@ ink_res_setservers(ink_res_state statp, IpEndpoint const *set, int cnt)
int
ink_res_getservers(ink_res_state statp, sockaddr *set, int cnt)
{
- int zret = 0; // return count.
+ int zret = 0; // return count.
IpEndpoint const *src = statp->nsaddr_list;
for (int i = 0; i < statp->nscount && i < cnt; ++i, ++src) {
@@ -301,8 +301,8 @@ ink_res_init(ink_res_state statp, ///< State object to update.
char *cp, **pp;
int n;
char buf[BUFSIZ];
- size_t nserv = 0;
- int haveenv = 0;
+ size_t nserv = 0;
+ int haveenv = 0;
int havesearch = 0;
int dots;
size_t maxns = INK_MAXNS;
@@ -311,17 +311,17 @@ ink_res_init(ink_res_state statp, ///< State object to update.
statp->res_h_errno = 0;
statp->retrans = INK_RES_TIMEOUT;
- statp->retry = INK_RES_DFLRETRY;
+ statp->retry = INK_RES_DFLRETRY;
statp->options = INK_RES_DEFAULT;
- statp->id = ink_res_randomid();
+ statp->id = ink_res_randomid();
statp->nscount = 0;
- statp->ndots = 1;
- statp->pfcode = 0;
+ statp->ndots = 1;
+ statp->pfcode = 0;
statp->_vcsock = -1;
- statp->_flags = 0;
- statp->qhook = NULL;
- statp->rhook = NULL;
+ statp->_flags = 0;
+ statp->qhook = NULL;
+ statp->rhook = NULL;
#ifdef SOLARIS2
/*
@@ -335,8 +335,8 @@ ink_res_init(ink_res_state statp, ///< State object to update.
if ((ret = sysinfo(SI_SRPC_DOMAIN, buf, sizeof(buf))) > 0 && (unsigned int)ret <= sizeof(buf)) {
if (buf[0] == '+')
buf[0] = '.';
- cp = strchr(buf, '.');
- cp = (cp == NULL) ? buf : (cp + 1);
+ cp = strchr(buf, '.');
+ cp = (cp == NULL) ? buf : (cp + 1);
ink_strlcpy(statp->defdname, cp, sizeof(statp->defdname));
}
}
@@ -354,25 +354,25 @@ ink_res_init(ink_res_state statp, ///< State object to update.
* one that they want to use as an individual (even more
* important now that the rfc1535 stuff restricts searches)
*/
- cp = statp->defdname;
- pp = statp->dnsrch;
+ cp = statp->defdname;
+ pp = statp->dnsrch;
*pp++ = cp;
for (n = 0; *cp && pp < statp->dnsrch + INK_MAXDNSRCH; cp++) {
if (*cp == '\n') /*%< silly backwards compat */
break;
else if (*cp == ' ' || *cp == '\t') {
*cp = 0;
- n = 1;
+ n = 1;
} else if (n) {
- *pp++ = cp;
- n = 0;
+ *pp++ = cp;
+ n = 0;
havesearch = 1;
}
}
/* null terminate last domain if there are excess */
while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
cp++;
- *cp = '\0';
+ *cp = '\0';
*pp++ = 0;
}
@@ -398,23 +398,23 @@ ink_res_init(ink_res_state statp, ///< State object to update.
* Set search list to be blank-separated strings
* on rest of line.
*/
- cp = statp->defdname;
- pp = statp->dnsrch;
+ cp = statp->defdname;
+ pp = statp->dnsrch;
*pp++ = cp;
for (n = 0; *cp && pp < statp->dnsrch + INK_MAXDNSRCH; cp++) {
if (*cp == ' ' || *cp == '\t') {
*cp = 0;
- n = 1;
+ n = 1;
} else if (n) {
*pp++ = cp;
- n = 0;
+ n = 0;
}
}
/* null terminate last domain if there are excess */
while (*cp != '\0' && *cp != ' ' && *cp != '\t')
cp++;
- *cp = '\0';
- *pp++ = 0;
+ *cp = '\0';
+ *pp++ = 0;
havesearch = 1;
}
@@ -449,7 +449,7 @@ ink_res_init(ink_res_state statp, ///< State object to update.
continue;
ink_strlcpy(statp->defdname, cp, sizeof(statp->defdname));
if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
- *cp = '\0';
+ *cp = '\0';
havesearch = 0;
continue;
}
@@ -469,23 +469,23 @@ ink_res_init(ink_res_state statp, ///< State object to update.
* Set search list to be blank-separated strings
* on rest of line.
*/
- cp = statp->defdname;
- pp = statp->dnsrch;
+ cp = statp->defdname;
+ pp = statp->dnsrch;
*pp++ = cp;
for (n = 0; *cp && pp < statp->dnsrch + INK_MAXDNSRCH; cp++) {
if (*cp == ' ' || *cp == '\t') {
*cp = 0;
- n = 1;
+ n = 1;
} else if (n) {
*pp++ = cp;
- n = 0;
+ n = 0;
}
}
/* null terminate last domain if there are excess */
while (*cp != '\0' && *cp != ' ' && *cp != '\t')
cp++;
- *cp = '\0';
- *pp++ = 0;
+ *cp = '\0';
+ *pp++ = 0;
havesearch = 1;
continue;
}
@@ -500,9 +500,9 @@ ink_res_init(ink_res_state statp, ///< State object to update.
cp[strcspn(cp, ";# \t\n")] = '\0';
if ((*cp != '\0') && (*cp != '\n')) {
memset(&hints, 0, sizeof(hints));
- hints.ai_family = PF_UNSPEC;
+ hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
- hints.ai_flags = AI_NUMERICHOST;
+ hints.ai_flags = AI_NUMERICHOST;
sprintf(sbuf, "%d", NAMESERVER_PORT);
if (getaddrinfo(cp, sbuf, &hints, &ai) == 0) {
if (ats_ip_copy(&statp->nsaddr_list[nserv].sa, ai->ai_addr))
@@ -528,9 +528,9 @@ ink_res_init(ink_res_state statp, ///< State object to update.
/* find components of local domain that might be searched */
if (havesearch == 0) {
- pp = statp->dnsrch;
+ pp = statp->dnsrch;
*pp++ = statp->defdname;
- *pp = NULL;
+ *pp = NULL;
if (dnsSearch == 1) {
dots = 0;
@@ -541,7 +541,7 @@ ink_res_init(ink_res_state statp, ///< State object to update.
while (pp < statp->dnsrch + INK_MAXDFLSRCH) {
if (dots < INK_LOCALDOMAINPARTS)
break;
- cp = strchr(cp, '.') + 1; /*%< we know there is one */
+ cp = strchr(cp, '.') + 1; /*%< we know there is one */
*pp++ = cp;
dots--;
}
@@ -578,7 +578,7 @@ parse_host_res_preference(char const *value, HostResPreferenceOrder order)
n = tokens.Initialize(value);
- for (i = 0; i < N_HOST_RES_PREFERENCE; ++i)
+ for (i = 0; i < N_HOST_RES_PREFERENCE; ++i)
found[i] = false;
for (i = 0; i < n && np < N_HOST_RES_PREFERENCE_ORDER; ++i) {
@@ -586,7 +586,7 @@ parse_host_res_preference(char const *value, HostResPreferenceOrder order)
// special case none/only because that terminates the sequence.
if (0 == strcasecmp(elt, HOST_RES_PREFERENCE_STRING[HOST_RES_PREFER_NONE])) {
found[HOST_RES_PREFER_NONE] = true;
- order[np] = HOST_RES_PREFER_NONE;
+ order[np] = HOST_RES_PREFER_NONE;
break;
} else {
// scan the other types
@@ -598,7 +598,7 @@ parse_host_res_preference(char const *value, HostResPreferenceOrder order)
}
}
if (HOST_RES_PREFER_NONE != ep && !found[ep]) { // ignore duplicates
- found[ep] = true;
+ found[ep] = true;
order[np++] = ep;
}
}
@@ -618,7 +618,7 @@ parse_host_res_preference(char const *value, HostResPreferenceOrder order)
int
ts_host_res_order_to_string(HostResPreferenceOrder const &order, char *out, int size)
{
- int zret = 0;
+ int zret = 0;
bool first = true;
for (int i = 0; i < N_HOST_RES_PREFERENCE_ORDER; ++i) {
/* Note we use a semi-colon here because this must be compatible
diff --git a/lib/ts/ink_res_mkquery.cc b/lib/ts/ink_res_mkquery.cc
index b17a3d5..c4892cf 100644
--- a/lib/ts/ink_res_mkquery.cc
+++ b/lib/ts/ink_res_mkquery.cc
@@ -108,17 +108,17 @@ int ink_res_mkquery(ink_res_state statp, int op, /*!< opcode of qu
if ((buf == NULL) || (buflen < HFIXEDSZ))
return (-1);
memset(buf, 0, HFIXEDSZ);
- hp = (HEADER *)buf;
- hp->id = htons(++statp->id);
+ hp = (HEADER *)buf;
+ hp->id = htons(++statp->id);
hp->opcode = op;
- hp->rd = (statp->options & INK_RES_RECURSE) != 0U;
- hp->rcode = NOERROR;
- cp = buf + HFIXEDSZ;
- ep = buf + buflen;
- dpp = dnptrs;
- *dpp++ = buf;
- *dpp++ = NULL;
- lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
+ hp->rd = (statp->options & INK_RES_RECURSE) != 0U;
+ hp->rcode = NOERROR;
+ cp = buf + HFIXEDSZ;
+ ep = buf + buflen;
+ dpp = dnptrs;
+ *dpp++ = buf;
+ *dpp++ = NULL;
+ lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
/*
* perform opcode specific processing
*/
@@ -218,12 +218,12 @@ static int
decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
{
const unsigned char *cp = *cpp;
- char *beg = dn, tc;
+ char *beg = dn, tc;
int b, blen, plen, i;
if ((blen = (*cp & 0xff)) == 0)
blen = 256;
- plen = (blen + 3) / 4;
+ plen = (blen + 3) / 4;
plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
if (dn + plen >= eom)
return (-1);
@@ -241,13 +241,13 @@ decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
}
if (b > 4) {
tc = *cp++;
- i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
+ i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
if (i < 0)
return (-1);
dn += i;
} else if (b > 0) {
tc = *cp++;
- i = SPRINTF((dn, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
+ i = SPRINTF((dn, "%1x", ((tc >> 4) & 0x0f) & (0x0f << (4 - b))));
if (i < 0)
return (-1);
dn += i;
@@ -306,8 +306,8 @@ ink_ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
unsigned n;
int l;
- cp = src;
- dn = dst;
+ cp = src;
+ dn = dst;
eom = dst + dstsiz;
while ((n = *cp++) != 0) {
@@ -412,8 +412,8 @@ ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
unsigned n;
int l;
- cp = src;
- dn = dst;
+ cp = src;
+ dn = dst;
eom = dst + dstsiz;
while ((n = *cp++) != 0) {
diff --git a/lib/ts/ink_resolver.h b/lib/ts/ink_resolver.h
index 5d2546a..a52751f 100644
--- a/lib/ts/ink_resolver.h
+++ b/lib/ts/ink_resolver.h
@@ -193,20 +193,20 @@ extern void parse_host_res_preference(char const *value, ///< [in] Con
);
#ifndef NS_GET16
-#define NS_GET16(s, cp) \
- do { \
- const u_char *t_cp = (const u_char *)(cp); \
- (s) = ((uint16_t)t_cp[0] << 8) | ((uint16_t)t_cp[1]); \
- (cp) += NS_INT16SZ; \
+#define NS_GET16(s, cp) \
+ do { \
+ const u_char *t_cp = (const u_char *)(cp); \
+ (s) = ((uint16_t)t_cp[0] << 8) | ((uint16_t)t_cp[1]); \
+ (cp) += NS_INT16SZ; \
} while (0)
#endif
#ifndef NS_GET32
-#define NS_GET32(l, cp) \
- do { \
- const u_char *t_cp = (const u_char *)(cp); \
- (l) = ((uint32_t)t_cp[0] << 24) | ((uint32_t)t_cp[1] << 16) | ((uint32_t)t_cp[2] << 8) | ((uint32_t)t_cp[3]); \
- (cp) += NS_INT32SZ; \
+#define NS_GET32(l, cp) \
+ do { \
+ const u_char *t_cp = (const u_char *)(cp); \
+ (l) = ((uint32_t)t_cp[0] << 24) | ((uint32_t)t_cp[1] << 16) | ((uint32_t)t_cp[2] << 8) | ((uint32_t)t_cp[3]); \
+ (cp) += NS_INT32SZ; \
} while (0)
#endif
@@ -215,8 +215,8 @@ extern void parse_host_res_preference(char const *value, ///< [in] Con
do { \
uint16_t t_s = (uint16_t)(s); \
u_char *t_cp = (u_char *)(cp); \
- *t_cp++ = t_s >> 8; \
- *t_cp = t_s; \
+ *t_cp++ = t_s >> 8; \
+ *t_cp = t_s; \
(cp) += NS_INT16SZ; \
} while (0)
#endif
@@ -226,10 +226,10 @@ extern void parse_host_res_preference(char const *value, ///< [in] Con
do { \
uint32_t t_l = (uint32_t)(l); \
u_char *t_cp = (u_char *)(cp); \
- *t_cp++ = t_l >> 24; \
- *t_cp++ = t_l >> 16; \
- *t_cp++ = t_l >> 8; \
- *t_cp = t_l; \
+ *t_cp++ = t_l >> 24; \
+ *t_cp++ = t_l >> 16; \
+ *t_cp++ = t_l >> 8; \
+ *t_cp = t_l; \
(cp) += NS_INT32SZ; \
} while (0)
#endif
diff --git a/lib/ts/ink_resource.cc b/lib/ts/ink_resource.cc
index 16cc6e7..f13df8b 100644
--- a/lib/ts/ink_resource.cc
+++ b/lib/ts/ink_resource.cc
@@ -28,7 +28,7 @@
volatile int res_track_memory = 0; // Disabled by default
uint64_t ssl_memory_allocated = 0;
-uint64_t ssl_memory_freed = 0;
+uint64_t ssl_memory_freed = 0;
std::map<const char *, Resource *> ResourceTracker::_resourceMap;
ink_mutex ResourceTracker::resourceLock = PTHREAD_MUTEX_INITIALIZER;
@@ -107,7 +107,7 @@ Resource::increment(const int64_t size)
void
ResourceTracker::increment(const char *name, const int64_t size)
{
- Resource &resource = lookup(name);
+ Resource &resource = lookup(name);
const char *lookup_name = resource.getName();
if (lookup_name[0] == '\0') {
resource.setName(name);
@@ -136,7 +136,7 @@ ResourceTracker::lookup(const char *name)
resource = it->second;
} else {
// create a new entry
- resource = new Resource;
+ resource = new Resource;
_resourceMap[name] = resource;
}
ink_mutex_release(&resourceLock);
@@ -159,7 +159,7 @@ ResourceTracker::dump(FILE *fd)
"--------------------------------------------------------------------\n");
for (std::map<const char *, Resource *>::const_iterator it = _resourceMap.begin(); it != _resourceMap.end(); ++it) {
const Resource &resource = *it->second;
- int64_t average_size = 0;
+ int64_t average_size = 0;
if (resource.getIncrement() - resource.getDecrement() > 0) {
average_size = resource.getValue() / (resource.getIncrement() - resource.getDecrement());
}
diff --git a/lib/ts/ink_rwlock.cc b/lib/ts/ink_rwlock.cc
index a2eb785..c92abee 100644
--- a/lib/ts/ink_rwlock.cc
+++ b/lib/ts/ink_rwlock.cc
@@ -43,7 +43,7 @@ ink_rwlock_init(ink_rwlock *rw)
rw->rw_nwaitwriters = 0;
// coverity[missing_lock]
rw->rw_refcount = 0;
- rw->rw_magic = RW_MAGIC;
+ rw->rw_magic = RW_MAGIC;
return 0;
diff --git a/lib/ts/ink_sock.cc b/lib/ts/ink_sock.cc
index b0ccb97..1dc4216 100644
--- a/lib/ts/ink_sock.cc
+++ b/lib/ts/ink_sock.cc
@@ -43,7 +43,7 @@
inline void
check_valid_sockaddr(sockaddr *sa, char *file, int line)
{
- sockaddr_in *si = (sockaddr_in *)sa;
+ sockaddr_in *si = (sockaddr_in *)sa;
unsigned short port = ntohs(si->sin_port);
unsigned short addr = ntohl(si->sin_addr.s_addr);
@@ -126,8 +126,8 @@ write_ready(int fd, int timeout_msec)
{
struct pollfd p;
p.events = POLLOUT;
- p.fd = fd;
- int r = poll(&p, 1, timeout_msec);
+ p.fd = fd;
+ int r = poll(&p, 1, timeout_msec);
if (r <= 0)
return r;
if (p.revents & (POLLERR | POLLNVAL))
@@ -142,8 +142,8 @@ read_ready(int fd, int timeout_msec)
{
struct pollfd p;
p.events = POLLIN;
- p.fd = fd;
- int r = poll(&p, 1, timeout_msec);
+ p.fd = fd;
+ int r = poll(&p, 1, timeout_msec);
if (r <= 0)
return r;
if (p.revents & (POLLERR | POLLNVAL))
diff --git a/lib/ts/ink_sprintf.cc b/lib/ts/ink_sprintf.cc
index 82a9dcd..016c438 100644
--- a/lib/ts/ink_sprintf.cc
+++ b/lib/ts/ink_sprintf.cc
@@ -107,7 +107,7 @@ ink_bvsprintf(char *buffer, const char *format, va_list ap)
case 's': // %s pattern
++s; // consume 's'
s_val = va_arg(ap_local, char *); // grab string argument
- p = s_val; // temporary pointer
+ p = s_val; // temporary pointer
if (buffer) // if have output buffer
while (*p) {
*d++ = *p++;
diff --git a/lib/ts/ink_string++.cc b/lib/ts/ink_string++.cc
index 647d6b1..b599120 100644
--- a/lib/ts/ink_string++.cc
+++ b/lib/ts/ink_string++.cc
@@ -70,8 +70,8 @@ StrList::_new_cell(const char *s, int len_not_counting_nul)
} else {
p = (char *)alloc(sizeof(Str) + 7);
if (p == NULL)
- return (NULL); // FIX: scale heap
- p = (char *)((((uintptr_t)p) + 7) & ~7); // round up to multiple of 8
+ return (NULL); // FIX: scale heap
+ p = (char *)((((uintptr_t)p) + 7) & ~7); // round up to multiple of 8
cell = (Str *)p;
}
++cells_allocated;
@@ -124,7 +124,7 @@ const int overflow_head_hdr_size = INK_ALIGN(sizeof(StrListOverflow), INIT_OVERF
void
StrListOverflow::init()
{
- next = NULL;
+ next = NULL;
heap_size = 0;
heap_used = 0;
}
@@ -159,7 +159,7 @@ StrListOverflow::alloc(int size, StrListOverflow **new_heap_ptr)
}
char *start = ((char *)this) + overflow_head_hdr_size;
- char *rval = start + heap_used;
+ char *rval = start + heap_used;
heap_used += size;
ink_assert(heap_used <= heap_size);
return (void *)rval;
diff --git a/lib/ts/ink_string++.h b/lib/ts/ink_string++.h
index ae44e37..1db17d0 100644
--- a/lib/ts/ink_string++.h
+++ b/lib/ts/ink_string++.h
@@ -50,15 +50,15 @@ struct Str {
Str() : str(NULL), len(0), next(NULL), prev(NULL) {}
Str(char *s)
{
- str = s;
- len = strlen(s);
+ str = s;
+ len = strlen(s);
next = NULL;
prev = NULL;
}
Str(char *s, int l)
{
- str = s;
- len = l;
+ str = s;
+ len = l;
next = NULL;
prev = NULL;
}
@@ -66,8 +66,8 @@ struct Str {
void
clean()
{
- str = NULL;
- len = 0;
+ str = NULL;
+ len = 0;
next = NULL;
prev = NULL;
}
@@ -146,12 +146,12 @@ struct StrListOverflow {
inline void
StrList::init()
{
- count = 0;
+ count = 0;
cells_allocated = 0;
- head = tail = NULL;
- base_heap_size = STRLIST_BASE_HEAP_SIZE;
- base_heap_used = 0;
- overflow_first = NULL;
+ head = tail = NULL;
+ base_heap_size = STRLIST_BASE_HEAP_SIZE;
+ base_heap_used = 0;
+ overflow_first = NULL;
overflow_current = NULL;
}
@@ -205,7 +205,7 @@ StrList::new_cell(const char *s, int len_not_counting_nul)
// allocate a cell from the array or heap
if ((cells_allocated < STRLIST_BASE_CELLS) && (!copy_when_adding_string)) {
- cell = &(base_cells[cells_allocated++]);
+ cell = &(base_cells[cells_allocated++]);
cell->str = s;
cell->len = l;
return (cell);
@@ -238,7 +238,7 @@ StrList::append(Str *str)
head = tail = str;
} else {
tail->next = str;
- tail = str;
+ tail = str;
}
}
@@ -255,7 +255,7 @@ StrList::prepend(Str *str)
head = tail = str;
} else {
head->prev = str;
- head = str;
+ head = str;
}
}
@@ -265,8 +265,8 @@ StrList::add_after(Str *prev, Str *str)
if (str == NULL || prev == NULL)
return;
++count;
- str->next = prev->next;
- str->prev = prev;
+ str->next = prev->next;
+ str->prev = prev;
prev->next = str;
if (tail == prev)
tail = str;
diff --git a/lib/ts/ink_string.cc b/lib/ts/ink_string.cc
index 65598a5..3ff577d 100644
--- a/lib/ts/ink_string.cc
+++ b/lib/ts/ink_string.cc
@@ -167,9 +167,9 @@ ink_string_append(char *dest, char *src, int n)
size_t
ink_strlcpy(char *dst, const char *src, size_t siz)
{
- char *d = dst;
+ char *d = dst;
const char *s = src;
- size_t n = siz;
+ size_t n = siz;
/* Copy as many bytes as will fit */
if (n != 0) {
@@ -195,16 +195,16 @@ ink_strlcpy(char *dst, const char *src, size_t siz)
size_t
ink_strlcat(char *dst, const char *src, size_t siz)
{
- char *d = dst;
+ char *d = dst;
const char *s = src;
- size_t n = siz;
+ size_t n = siz;
size_t dlen;
/* Find the end of dst and adjust bytes left but don't go past end */
while (n-- != 0 && *d != '\0')
d++;
dlen = d - dst;
- n = siz - dlen;
+ n = siz - dlen;
if (n == 0)
return (dlen + strlen(s));
diff --git a/lib/ts/ink_string.h b/lib/ts/ink_string.h
index 10f0d24..56183c4 100644
--- a/lib/ts/ink_string.h
+++ b/lib/ts/ink_string.h
@@ -145,7 +145,7 @@ inline const char *
ptr_len_str(const char *p1, int l1, const char *str)
{
if (str && str[0]) {
- int str_index = 0;
+ int str_index = 0;
const char *match_start = NULL;
while (l1 > 0) {
@@ -162,7 +162,7 @@ ptr_len_str(const char *p1, int l1, const char *str)
}
} else if (str_index > 0) {
l1 += (p1 - match_start);
- p1 = match_start;
+ p1 = match_start;
str_index = 0;
}
@@ -186,7 +186,7 @@ ptr_len_ncmp(const char *p1, int l1, const char *str, int n)
return 1;
}
- char p1c = *p1;
+ char p1c = *p1;
char strc = *str;
if (p1c != strc) {
@@ -227,7 +227,7 @@ ptr_len_ncasecmp(const char *p1, int l1, const char *str, int n)
return 1;
}
- char p1c = ParseRules::ink_tolower(*p1);
+ char p1c = ParseRules::ink_tolower(*p1);
char strc = ParseRules::ink_tolower(*str);
if (p1c != strc) {
@@ -268,7 +268,7 @@ ptr_len_casecmp(const char *p1, int l1, const char *str)
return 1;
}
- char p1c = ParseRules::ink_tolower(*p1);
+ char p1c = ParseRules::ink_tolower(*p1);
char strc = ParseRules::ink_tolower(*str);
if (p1c != strc) {
@@ -307,7 +307,7 @@ ptr_len_cmp(const char *p1, int l1, const char *str)
return 1;
}
- char p1c = *p1;
+ char p1c = *p1;
char strc = *str;
if (p1c != strc) {
diff --git a/lib/ts/ink_thread.h b/lib/ts/ink_thread.h
index a7d64a9..f824b2f 100644
--- a/lib/ts/ink_thread.h
+++ b/lib/ts/ink_thread.h
@@ -192,7 +192,7 @@ ink_thread_get_priority(ink_thread t, int *priority)
#else
int policy;
struct sched_param param;
- int res = pthread_getschedparam(t, &policy, ¶m);
+ int res = pthread_getschedparam(t, &policy, ¶m);
*priority = param.sched_priority;
return res;
#endif
diff --git a/lib/ts/ink_time.cc b/lib/ts/ink_time.cc
index 174f52c..e959693 100644
--- a/lib/ts/ink_time.cc
+++ b/lib/ts/ink_time.cc
@@ -144,9 +144,9 @@ convert_tm(const struct tm *tp)
int month;
int mday;
- year = tp->tm_year;
+ year = tp->tm_year;
month = tp->tm_mon;
- mday = tp->tm_mday;
+ mday = tp->tm_mday;
/* what should we do? */
if ((year < 70) || (year > 137))
diff --git a/lib/ts/llqueue.cc b/lib/ts/llqueue.cc
index c24ab87..9d20325 100644
--- a/lib/ts/llqueue.cc
+++ b/lib/ts/llqueue.cc
@@ -50,7 +50,7 @@ newrec(LLQ *Q)
}
Q->free = (LLQrec *)ats_malloc(RECORD_CHUNK * sizeof(LLQrec));
- for (i = 0; i < RECORD_CHUNK; i++)
+ for (i = 0; i < RECORD_CHUNK; i++)
Q->free[i].next = &Q->free[i + 1];
Q->free[RECORD_CHUNK - 1].next = NULL;
@@ -66,7 +66,7 @@ static void
freerec(LLQ *Q, LLQrec *rec)
{
rec->next = Q->free;
- Q->free = rec;
+ Q->free = rec;
}
#endif
@@ -104,13 +104,13 @@ enqueue(LLQ *Q, void *data)
LLQrec *new_val;
ink_mutex_acquire(&(Q->mux));
- new_val = (LLQrec *)ats_malloc(sizeof(LLQrec));
+ new_val = (LLQrec *)ats_malloc(sizeof(LLQrec));
new_val->data = data;
new_val->next = NULL;
if (Q->tail)
Q->tail->next = new_val;
- Q->tail = new_val;
+ Q->tail = new_val;
if (Q->head == NULL)
Q->head = Q->tail;
diff --git a/lib/ts/load_http_hdr.cc b/lib/ts/load_http_hdr.cc
index ff14f39..780f6e4 100644
--- a/lib/ts/load_http_hdr.cc
+++ b/lib/ts/load_http_hdr.cc
@@ -66,7 +66,7 @@ print_hdr(HTTPHdr to_print)
offset = 0;
do {
used = 0;
- tmp = offset;
+ tmp = offset;
done = to_print.print(b, 4095, &used, &tmp);
offset += used;
b[used] = '\0';
@@ -116,7 +116,7 @@ load_buffer(int fd, hdr_type h_type)
exit(1);
}
- char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
+ char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
file_buf[s_info.st_size] = '\0';
// Read in the entire file
@@ -139,7 +139,7 @@ load_buffer(int fd, hdr_type h_type)
Tokenizer el_tok(" \t");
int num_lines = line_tok.Initialize(file_buf);
- int num_el = el_tok.Initialize(line_tok[0]);
+ int num_el = el_tok.Initialize(line_tok[0]);
if (num_el < 3) {
fprintf(stderr, "Corrupted data file\n");
@@ -157,9 +157,9 @@ load_buffer(int fd, hdr_type h_type)
mbuf_size *= 2;
}
- char *mbuf = (char *)ats_malloc(mbuf_size);
+ char *mbuf = (char *)ats_malloc(mbuf_size);
int bytes_read = 0;
- int cur_line = 0;
+ int cur_line = 0;
while (cur_line < num_lines && bytes_read < mbuf_size) {
int *cur_ptr;
@@ -171,7 +171,7 @@ load_buffer(int fd, hdr_type h_type)
fprintf(stderr, "Corrupted data file\n");
exit(1);
}
- cur_ptr = (int *)(mbuf + bytes_read);
+ cur_ptr = (int *)(mbuf + bytes_read);
*cur_ptr = el;
bytes_read += 4;
}
@@ -198,7 +198,7 @@ load_buffer(int fd, hdr_type h_type)
memset(&m_buf_struct, 0, sizeof(MBuffer));
mbuffer_set(&m_buf_struct, mbuf);
m_buf_struct.m_ext_refcount = 1;
- m_buf_struct.m_size = bytes_read;
+ m_buf_struct.m_size = bytes_read;
walk_mbuffer(&m_buf_struct);
} else {
dump_hdr(mbuf, h_type);
@@ -252,7 +252,7 @@ char *marshal_type_strs[] = {"EMPTY ", "OBJ ", "STR ", "URL ", "URL_F ", "
void
walk_mbuffer(MBuffer *bufp)
{
- int offset = 3;
+ int offset = 3;
int max_offset = (*bufp->m_length) / 4;
do {
@@ -296,7 +296,7 @@ walk_mbuffer(MBuffer *bufp)
void
walk_mstring(MBuffer *bufp, int32_t offset)
{
- int bufindex = 0;
+ int bufindex = 0;
int dumpoffset = 0;
char fbuf[4096];
@@ -314,7 +314,7 @@ walk_mstring(MBuffer *bufp, int32_t offset)
void
walk_mime_field(MIMEField f)
{
- int bufindex = 0;
+ int bufindex = 0;
int dumpoffset = 0;
char fbuf[4096];
diff --git a/lib/ts/lockfile.cc b/lib/ts/lockfile.cc
index 119f63a..11d2cf6 100644
--- a/lib/ts/lockfile.cc
+++ b/lib/ts/lockfile.cc
@@ -58,10 +58,10 @@ Lockfile::Open(pid_t *holding_pid)
// Lock it. Note that if we can't get the lock EAGAIN will be the
// error we receive.
- lock.l_type = F_WRLCK;
- lock.l_start = 0;
+ lock.l_type = F_WRLCK;
+ lock.l_start = 0;
lock.l_whence = SEEK_SET;
- lock.l_len = 0;
+ lock.l_len = 0;
do {
err = fcntl(fd, F_SETLK, &lock);
diff --git a/lib/ts/mkdfa.c b/lib/ts/mkdfa.c
index 19c597f..3767b0c 100644
--- a/lib/ts/mkdfa.c
+++ b/lib/ts/mkdfa.c
@@ -211,24 +211,24 @@ info_t cache_controls[] = {
{NULL, "HTTP_CACHE_DIRECTIVE_CACHE_EXTENSION", -1},
};
-state_t *start = NULL;
+state_t *start = NULL;
int state_count = 0;
-int *map = NULL;
-int *basetbl = NULL;
-int *nexttbl = NULL;
-int *checktbl = NULL;
+int *map = NULL;
+int *basetbl = NULL;
+int *nexttbl = NULL;
+int *checktbl = NULL;
const char **accepttbl = NULL;
-char **prefixtbl = NULL;
+char **prefixtbl = NULL;
state_t *
mkstate()
{
state_t *state;
- state = (state_t *)malloc(sizeof(state_t));
- state->num = state_count++;
- state->value = NULL;
+ state = (state_t *)malloc(sizeof(state_t));
+ state->num = state_count++;
+ state->value = NULL;
state->transitions = NULL;
return state;
@@ -239,10 +239,10 @@ mktransition()
{
transition_t *transition;
- transition = (transition_t *)malloc(sizeof(transition_t));
+ transition = (transition_t *)malloc(sizeof(transition_t));
transition->value = 0;
transition->state = NULL;
- transition->next = NULL;
+ transition->next = NULL;
return transition;
}
@@ -299,9 +299,9 @@ add_states(state_t *state, info_t *info, int pos)
transitions = transitions->next;
transitions->next = mktransition();
- transitions = transitions->next;
+ transitions = transitions->next;
} else {
- transitions = mktransition();
+ transitions = mktransition();
state->transitions = transitions;
}
@@ -428,8 +428,8 @@ mktranstables(state_t *state)
assert(checktbl[basetbl[state->num] + map[transitions->value]] == -1);
checktbl[basetbl[state->num] + map[transitions->value]] = state->num;
- nexttbl[basetbl[state->num] + map[transitions->value]] = transitions->state->num;
- transitions = transitions->next;
+ nexttbl[basetbl[state->num] + map[transitions->value]] = transitions->state->num;
+ transitions = transitions->next;
}
transitions = state->transitions;
@@ -448,7 +448,7 @@ mktables(state_t *state, const char *defvalue, int useprefix)
/* make the character map */
map = (int *)malloc(sizeof(int) * 256);
- for (i = 0; i < 256; i++)
+ for (i = 0; i < 256; i++)
map[i] = 0;
char_count = mkmap(state);
@@ -458,7 +458,7 @@ mktables(state_t *state, const char *defvalue, int useprefix)
/* make the accept state table */
accepttbl = (const char **)malloc(sizeof(const char *) * state_count);
- for (i = 0; i < state_count; i++)
+ for (i = 0; i < state_count; i++)
accepttbl[i] = NULL;
mkaccept(state, defvalue);
@@ -475,7 +475,7 @@ mktables(state_t *state, const char *defvalue, int useprefix)
/* make the prefix table */
if (useprefix) {
prefixtbl = (char **)malloc(sizeof(char *) * state_count);
- for (i = 0; i < state_count; i++)
+ for (i = 0; i < state_count; i++)
prefixtbl[i] = NULL;
mkprefix(state, prefix, 0);
@@ -492,8 +492,8 @@ mktables(state_t *state, const char *defvalue, int useprefix)
/* make the state transition tables */
- basetbl = (int *)malloc(sizeof(int) * state_count);
- nexttbl = (int *)malloc(sizeof(int) * (state_count + char_count));
+ basetbl = (int *)malloc(sizeof(int) * state_count);
+ nexttbl = (int *)malloc(sizeof(int) * (state_count + char_count));
checktbl = (int *)malloc(sizeof(int) * (state_count + char_count));
for (i = 0; i < state_count; i++) {
@@ -501,7 +501,7 @@ mktables(state_t *state, const char *defvalue, int useprefix)
}
for (i = 0; i < (state_count + char_count); i++) {
- nexttbl[i] = 0;
+ nexttbl[i] = 0;
checktbl[i] = -1;
}
@@ -522,7 +522,7 @@ rundfa(const char *buf, int length)
int ch, tmp;
state = 0;
- end = buf + length;
+ end = buf + length;
while (buf != end) {
ch = map[(int)*buf++];
@@ -556,7 +556,7 @@ mkdfa(info_t *infos, int ninfos, int useprefix, int debug)
start = mkstate();
- for (i = 0; i < (ninfos - 1); i++)
+ for (i = 0; i < (ninfos - 1); i++)
infos[i].namelen = strlen(infos[i].name);
for (i = 0; i < (ninfos - 1); i++)
diff --git a/lib/ts/signals.cc b/lib/ts/signals.cc
index 93d6a2d..4722281 100644
--- a/lib/ts/signals.cc
+++ b/lib/ts/signals.cc
@@ -77,9 +77,9 @@ set_signal(int signo, signal_handler_t handler)
{
struct sigaction act;
- act.sa_handler = NULL;
+ act.sa_handler = NULL;
act.sa_sigaction = handler;
- act.sa_flags = SA_SIGINFO;
+ act.sa_flags = SA_SIGINFO;
sigemptyset(&(act.sa_mask));
ink_release_assert(sigaction(signo, &act, NULL) == 0);
@@ -92,7 +92,7 @@ signal_reset_default(int signo)
struct sigaction act;
act.sa_handler = SIG_DFL;
- act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND;
+ act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND;
sigemptyset(&(act.sa_mask));
ink_release_assert(sigaction(signo, &act, NULL) == 0);
diff --git a/lib/ts/test_List.cc b/lib/ts/test_List.cc
index 5642802..80b88f7 100644
--- a/lib/ts/test_List.cc
+++ b/lib/ts/test_List.cc
@@ -46,7 +46,7 @@ main()
DList(Foo, dlink) d;
Que(Foo, dlink) q;
Foo *f = new Foo;
- f->x = 7;
+ f->x = 7;
s.push(f);
d.push(s.pop());
q.enqueue(d.pop());
diff --git a/lib/ts/test_PriorityQueue.cc b/lib/ts/test_PriorityQueue.cc
index de5672c..3ade64b 100644
--- a/lib/ts/test_PriorityQueue.cc
+++ b/lib/ts/test_PriorityQueue.cc
@@ -65,8 +65,8 @@ REGRESSION_TEST(PriorityQueue_1)(RegressionTest *t, int /* atype ATS_UNUSED */,
TestBox box(t, pstatus);
box = REGRESSION_TEST_PASSED;
- PQ *pq = new PQ();
- N *a = new N(6, "A");
+ PQ *pq = new PQ();
+ N *a = new N(6, "A");
Entry *entry_a = new Entry(a);
pq->push(entry_a);
diff --git a/lib/ts/test_Vec.cc b/lib/ts/test_Vec.cc
index 6933cd2..c1dc5e9 100644
--- a/lib/ts/test_Vec.cc
+++ b/lib/ts/test_Vec.cc
@@ -31,7 +31,7 @@ static void
test_append()
{
static const char value[] = "this is a string";
- unsigned int len = (int)sizeof(value) - 1;
+ unsigned int len = (int)sizeof(value) - 1;
Vec<char> str;
diff --git a/lib/ts/test_X509HostnameValidator.cc b/lib/ts/test_X509HostnameValidator.cc
index fe5fd0b..d069e80 100644
--- a/lib/ts/test_X509HostnameValidator.cc
+++ b/lib/ts/test_X509HostnameValidator.cc
@@ -35,7 +35,7 @@
// A simple certificate for CN=test.sslheaders.trafficserver.apache.org.
static const char *test_certificate_cn_name = "test.sslheaders.trafficserver.apache.org";
-static const char *test_certificate_cn = "-----BEGIN CERTIFICATE-----\n"
+static const char *test_certificate_cn = "-----BEGIN CERTIFICATE-----\n"
"MIICGzCCAYSgAwIBAgIJAN/JvtOlj/5HMA0GCSqGSIb3DQEBBQUAMDMxMTAvBgNV\n"
"BAMMKHRlc3Quc3NsaGVhZGVycy50cmFmZmljc2VydmVyLmFwYWNoZS5vcmcwHhcN\n"
"MTQwNzIzMTc1MTA4WhcNMTcwNTEyMTc1MTA4WjAzMTEwLwYDVQQDDCh0ZXN0LnNz\n"
@@ -97,7 +97,7 @@ REGRESSION_TEST(CN_match)(RegressionTest *t, int /* atype ATS_UNUSED */, int *ps
TestBox box(t, pstatus);
char *matching;
- box = REGRESSION_TEST_PASSED;
+ box = REGRESSION_TEST_PASSED;
X509 *x = load_cert_from_string(test_certificate_cn);
box.check(x != NULL, "failed to load the test certificate");
box.check(validate_hostname(x, (unsigned char *)test_certificate_cn_name, false, &matching) == true, "Hostname should match");
@@ -110,7 +110,7 @@ REGRESSION_TEST(bad_wildcard_SANs)(RegressionTest *t, int /* atype ATS_UNUSED */
{
TestBox box(t, pstatus);
- box = REGRESSION_TEST_PASSED;
+ box = REGRESSION_TEST_PASSED;
X509 *x = load_cert_from_string(test_certificate_bad_sans);
box.check(x != NULL, "failed to load the test certificate");
box.check(validate_hostname(x, (unsigned char *)"something.or.other", false, NULL) == false, "Hostname shouldn't match");
@@ -125,7 +125,7 @@ REGRESSION_TEST(wildcard_SAN_and_CN)(RegressionTest *t, int /* atype ATS_UNUSED
TestBox box(t, pstatus);
char *matching;
- box = REGRESSION_TEST_PASSED;
+ box = REGRESSION_TEST_PASSED;
X509 *x = load_cert_from_string(test_certificate_cn_and_SANs);
box.check(x != NULL, "failed to load the test certificate");
box.check(validate_hostname(x, (unsigned char *)test_certificate_cn_name, false, &matching) == true, "Hostname should match");
@@ -143,7 +143,7 @@ REGRESSION_TEST(IDNA_hostnames)(RegressionTest *t, int /* atype ATS_UNUSED */, i
{
TestBox box(t, pstatus);
char *matching;
- box = REGRESSION_TEST_PASSED;
+ box = REGRESSION_TEST_PASSED;
X509 *x = load_cert_from_string(test_certificate_cn_and_SANs);
box.check(x != NULL, "failed to load the test certificate");
box.check(validate_hostname(x, (unsigned char *)"xn--foobar.trafficserver.org", false, &matching) == true,
@@ -160,7 +160,7 @@ REGRESSION_TEST(middle_label_match)(RegressionTest *t, int /* atype ATS_UNUSED *
{
TestBox box(t, pstatus);
char *matching;
- box = REGRESSION_TEST_PASSED;
+ box = REGRESSION_TEST_PASSED;
X509 *x = load_cert_from_string(test_certificate_cn_and_SANs);
box.check(x != NULL, "failed to load the test certificate");
box.check(validate_hostname(x, (unsigned char *)"foosomething.trafficserver.com", false, &matching) == true,
@@ -180,7 +180,7 @@ int
main(int /* argc ATS_UNUSED */, const char ** /* argv ATS_UNUSED */)
{
BaseLogFile *blf = new BaseLogFile("stdout");
- diags = new Diags(NULL, NULL, blf);
+ diags = new Diags(NULL, NULL, blf);
res_track_memory = 1;
SSL_library_init();
diff --git a/lib/ts/test_arena.cc b/lib/ts/test_arena.cc
index bc30448..4fd51aa 100644
--- a/lib/ts/test_arena.cc
+++ b/lib/ts/test_arena.cc
@@ -43,7 +43,7 @@ fill_test_data(char *ptr, int size, int seed)
for (int i = 0; i < size; i++) {
ptr[i] = a;
- a = (a + 1) % 52;
+ a = (a + 1) % 52;
}
}
@@ -51,7 +51,7 @@ int
check_test_data(char *ptr, int size, int seed)
{
int fail = 0;
- char a = 'a' + (seed % 52);
+ char a = 'a' + (seed % 52);
for (int i = 0; i < size; i++) {
if (ptr[i] != a) {
@@ -66,11 +66,11 @@ check_test_data(char *ptr, int size, int seed)
int
test_block_boundries()
{
- const int sizes_to_test = 12;
+ const int sizes_to_test = 12;
const int regions_to_test = 1024 * 2;
- char **test_regions = new char *[regions_to_test];
- int failures = 0;
- Arena *a = new Arena();
+ char **test_regions = new char *[regions_to_test];
+ int failures = 0;
+ Arena *a = new Arena();
for (int i = 0; i < sizes_to_test; i++) {
int test_size = 1 << i;
diff --git a/lib/ts/test_atomic.cc b/lib/ts/test_atomic.cc
index 9e79e1d..4459a97 100644
--- a/lib/ts/test_atomic.cc
+++ b/lib/ts/test_atomic.cc
@@ -85,11 +85,11 @@ init_data()
for (ali = 0; ali < MAX_ATOMIC_LISTS; ali++) {
for (j = 0; j < MAX_ITEMS_PER_LIST; j++) {
- plistItem = (struct listItem *)malloc(sizeof(struct listItem));
- items[ali + j] = plistItem;
+ plistItem = (struct listItem *)malloc(sizeof(struct listItem));
+ items[ali + j] = plistItem;
plistItem->data1 = ali + j;
plistItem->data2 = ali + rand();
- plistItem->link = 0;
+ plistItem->link = 0;
plistItem->data3 = j + rand();
plistItem->data4 = ali + j + rand();
plistItem->check = (plistItem->data1 ^ plistItem->data2 ^ plistItem->data3 ^ plistItem->data4);
@@ -107,7 +107,7 @@ cycle_data(void *d)
int iterations;
int me;
- me = (int)d;
+ me = (int)d;
iterations = 0;
while (1) {
@@ -120,7 +120,7 @@ cycle_data(void *d)
// Place listItems into random queues
while (pli) {
ink_assert((pli->data1 ^ pli->data2 ^ pli->data3 ^ pli->data4) == pli->check);
- pli_next = (struct listItem *)pli->link;
+ pli_next = (struct listItem *)pli->link;
pli->link = 0;
ink_atomiclist_push(&alists[(me + rand()) % MAX_ATOMIC_LISTS], (void *)pli);
pli = pli_next;
diff --git a/lib/ts/test_freelist.cc b/lib/ts/test_freelist.cc
index 18d16e5..d013cb2 100644
--- a/lib/ts/test_freelist.cc
+++ b/lib/ts/test_freelist.cc
@@ -38,7 +38,7 @@ test(void *d)
id = (intptr_t)d;
time_t start = time(NULL);
- int count = 0;
+ int count = 0;
for (;;) {
m1 = ink_freelist_new(flist);
m2 = ink_freelist_new(flist);
diff --git a/lib/wccp/Wccp.h b/lib/wccp/Wccp.h
index ded1a7d..a6679e5 100644
--- a/lib/wccp/Wccp.h
+++ b/lib/wccp/Wccp.h
@@ -59,9 +59,9 @@ namespace detail
/// Basic time unit for WCCP in seconds
/// @note Sec 4.14: HERE_I_AM_T.
-static time_t const TIME_UNIT = 10;
+static time_t const TIME_UNIT = 10;
static time_t const ASSIGN_WAIT = (3 * TIME_UNIT) / 2;
-static time_t const RAPID_TIME = TIME_UNIT / 10;
+static time_t const RAPID_TIME = TIME_UNIT / 10;
/// Service group related constants.
/// @internal In a struct so enum values can be imported to more than
@@ -71,18 +71,18 @@ struct ServiceConstants {
/// @internal Enumerations values match protocol values.
enum PacketStyle {
NO_PACKET_STYLE = 0, ///< Undefined or invalid.
- GRE = 1, ///< GRE tunnel only. [default]
- L2 = 2, ///< L2 rewrite only.
- GRE_OR_L2 = 3 ///< L2 rewrite or GRE tunnel.
+ GRE = 1, ///< GRE tunnel only. [default]
+ L2 = 2, ///< L2 rewrite only.
+ GRE_OR_L2 = 3 ///< L2 rewrite or GRE tunnel.
};
/// Cache assignment supported methods.
/// @internal Enumerations values match protocol values.
enum CacheAssignmentStyle {
NO_CACHE_ASSIGN_STYLE = 0, ///< Undefined or invalid.
- HASH_ONLY = 1, ///< Use only hash assignment. [default]
- MASK_ONLY = 2, ///< Use only mask assignment.
- HASH_OR_MASK = 3 ///< Use hash or mask assignment.
+ HASH_ONLY = 1, ///< Use only hash assignment. [default]
+ MASK_ONLY = 2, ///< Use only mask assignment.
+ HASH_OR_MASK = 3 ///< Use hash or mask assignment.
};
};
@@ -100,14 +100,14 @@ public:
/// Type of service.
enum Type {
STANDARD = 0, ///< Well known service.
- DYNAMIC = 1 ///< Dynamic (locally defined) service.
+ DYNAMIC = 1 ///< Dynamic (locally defined) service.
};
/// Result codes for service definition.
enum Result {
- DEFINED = 0, ///< Service group was created by the call.
- EXISTS = 1, ///< Service group already existed.
- CONFLICT = 2 ///< Service group existed but didn't match new definition.
+ DEFINED = 0, ///< Service group was created by the call.
+ EXISTS = 1, ///< Service group already existed.
+ CONFLICT = 2 ///< Service group existed but didn't match new definition.
};
/// @name Well known (standard) services.
@@ -206,7 +206,7 @@ protected:
/// Security component option (sub-type)
enum SecurityOption {
SECURITY_NONE = 0, ///< No security @c WCCP2_NO_SECURITY
- SECURITY_MD5 = 1 ///< MD5 security @c WCCP2_MD5_SECURITY
+ SECURITY_MD5 = 1 ///< MD5 security @c WCCP2_MD5_SECURITY
};
class EndPoint
diff --git a/lib/wccp/WccpConfig.cc b/lib/wccp/WccpConfig.cc
index 039cc2b..9759274 100644
--- a/lib/wccp/WccpConfig.cc
+++ b/lib/wccp/WccpConfig.cc
@@ -58,23 +58,23 @@ std::vector<uint32_t> Seed_Router;
// Names used for various elements and properties.
static char const *const SVC_NAME = "service";
-static char const *const SVC_PROP_ID = "id";
-static char const *const SVC_PROP_TYPE = "type";
-static char const *const SVC_PROP_PRIORITY = "priority";
-static char const *const SVC_PROP_PROTOCOL = "protocol";
+static char const *const SVC_PROP_ID = "id";
+static char const *const SVC_PROP_TYPE = "type";
+static char const *const SVC_PROP_PRIORITY = "priority";
+static char const *const SVC_PROP_PROTOCOL = "protocol";
static char const *const SVC_PROP_PRIMARY_HASH = "primary-hash";
-static char const *const SVC_PROP_ALT_HASH = "alt-hash";
-static char const *const SVC_PROP_PORTS = "ports";
-static char const *const SVC_PROP_PORT_TYPE = "port-type";
-static char const *const SVC_PROP_SECURITY = "security";
-static char const *const SVC_PROP_ROUTERS = "routers";
-static char const *const SVC_PROP_FORWARD = "forward";
-static char const *const SVC_PROP_RETURN = "return";
-static char const *const SVC_PROP_ASSIGN = "assignment";
-static char const *const SVC_PROP_PROC = "proc-name";
+static char const *const SVC_PROP_ALT_HASH = "alt-hash";
+static char const *const SVC_PROP_PORTS = "ports";
+static char const *const SVC_PROP_PORT_TYPE = "port-type";
+static char const *const SVC_PROP_SECURITY = "security";
+static char const *const SVC_PROP_ROUTERS = "routers";
+static char const *const SVC_PROP_FORWARD = "forward";
+static char const *const SVC_PROP_RETURN = "return";
+static char const *const SVC_PROP_ASSIGN = "assignment";
+static char const *const SVC_PROP_PROC = "proc-name";
static char const *const SECURITY_PROP_OPTION = "option";
-static char const *const SECURITY_PROP_KEY = "key";
+static char const *const SECURITY_PROP_KEY = "key";
/// Helper structure for processing configuration strings.
struct CfgString {
@@ -85,10 +85,10 @@ typedef std::vector<CfgString> CfgOpts;
#define N_OPTS(x) (sizeof(x) / sizeof(*x))
-CfgString FORWARD_OPTS[] = {{"gre"}, {"l2"}};
+CfgString FORWARD_OPTS[] = {{"gre"}, {"l2"}};
size_t const N_FORWARD_OPTS = sizeof(FORWARD_OPTS) / sizeof(*FORWARD_OPTS);
-CfgString RETURN_OPTS[] = {{"gre"}, {"l2"}};
+CfgString RETURN_OPTS[] = {{"gre"}, {"l2"}};
size_t const N_RETURN_OPTS = sizeof(RETURN_OPTS) / sizeof(*RETURN_OPTS);
CfgString ASSIGN_OPTS[] = {{"hash"}, {"mask"}};
@@ -98,8 +98,8 @@ CfgString HASH_OPTS[] = {{"src_ip"}, {"dst_ip"}, {"src_port"}, {"dst_port"}};
ts::Errata::Code
code_max(ts::Errata const &err)
{
- ts::Errata::Code zret = std::numeric_limits<ts::Errata::Code::raw_type>::min();
- ts::Errata::const_iterator spot = err.begin();
+ ts::Errata::Code zret = std::numeric_limits<ts::Errata::Code::raw_type>::min();
+ ts::Errata::const_iterator spot = err.begin();
ts::Errata::const_iterator limit = err.end();
for (; spot != limit; ++spot)
zret = std::max(zret, spot->getCode());
@@ -371,9 +371,9 @@ load_option_set(Value const &setting, CfgString *opts, size_t count)
{
ts::Errata zret;
CfgString *spot;
- CfgString *limit = opts + count;
+ CfgString *limit = opts + count;
ts::ConstBuffer const &name = setting.getName();
- int src_line = setting.getSourceLine();
+ int src_line = setting.getSourceLine();
// Clear all found flags.
for (spot = opts; spot < limit; ++spot)
@@ -381,7 +381,7 @@ load_option_set(Value const &setting, CfgString *opts, size_t count)
// Walk through the strings in the setting.
if (setting.isContainer()) {
- int nr = setting.childCount();
+ int nr = setting.childCount();
bool list_opts = false;
for (int i = 0; i < nr; ++i) {
Value item = setting[i];
@@ -470,7 +470,7 @@ load_routers(Value const &setting, ///< Source of addresses.
int nr = setting.childCount();
for (int i = 0; i < nr; ++i) {
Value const &addr_cfg = setting[i];
- int addr_line = addr_cfg.getSourceLine();
+ int addr_line = addr_cfg.getSourceLine();
in_addr addr;
if (ts::config::StringValue == addr_cfg.getType()) {
text = addr_cfg.getText()._ptr;
@@ -501,7 +501,7 @@ CacheImpl::loadServicesFromFile(char const *path)
return cv.errata();
ts::config::Configuration cfg = cv.result();
- Value svc_list = cfg.find("services");
+ Value svc_list = cfg.find("services");
// No point in going on from here.
if (!svc_list)
return Services_Not_Found();
@@ -529,8 +529,8 @@ CacheImpl::loadServicesFromFile(char const *path)
ts::ConstBuffer text;
SecurityOption security_style = SECURITY_NONE;
bool use_group_local_security = false;
- Value const &svc_cfg = svc_list[idx];
- int svc_line = svc_cfg.getSourceLine();
+ Value const &svc_cfg = svc_list[idx];
+ int svc_line = svc_cfg.getSourceLine();
ServiceGroup svc_info;
if (ts::config::GroupValue != svc_cfg.getType()) {
@@ -610,8 +610,8 @@ CacheImpl::loadServicesFromFile(char const *path)
svc_info.setFlags(0);
if ((prop = svc_cfg[SVC_PROP_PRIMARY_HASH]).hasValue()) {
ts::Errata status = load_option_set(prop, HASH_OPTS, N_OPTS(HASH_OPTS));
- uint32_t f = 0;
- src_line = prop.getSourceLine();
+ uint32_t f = 0;
+ src_line = prop.getSourceLine();
for (size_t i = 0; i < N_OPTS(HASH_OPTS); ++i)
if (HASH_OPTS[i].m_found)
f |= ServiceGroup::SRC_IP_HASH << i;
@@ -628,8 +628,8 @@ CacheImpl::loadServicesFromFile(char const *path)
if ((prop = svc_cfg[SVC_PROP_ALT_HASH]).hasValue()) {
ts::Errata status = load_option_set(prop, HASH_OPTS, N_OPTS(HASH_OPTS));
- uint32_t f = 0;
- src_line = prop.getSourceLine();
+ uint32_t f = 0;
+ src_line = prop.getSourceLine();
for (size_t i = 0; i < N_OPTS(HASH_OPTS); ++i)
if (HASH_OPTS[i].m_found)
f |= ServiceGroup::SRC_IP_ALT_HASH << i;
@@ -702,7 +702,7 @@ CacheImpl::loadServicesFromFile(char const *path)
if (security.isOK()) {
use_group_local_security = true;
if (security.result()._ptr) {
- md5_key = security.result()._ptr;
+ md5_key = security.result()._ptr;
security_style = SECURITY_MD5;
} else {
security_style = SECURITY_NONE;
@@ -755,8 +755,8 @@ CacheImpl::loadServicesFromFile(char const *path)
svc.m_packet_forward = ServiceGroup::GRE; // default
if ((prop = svc_cfg[SVC_PROP_FORWARD]).hasValue()) {
ts::Errata status = load_option_set(prop, FORWARD_OPTS, N_FORWARD_OPTS);
- bool gre = FORWARD_OPTS[0].m_found;
- bool l2 = FORWARD_OPTS[1].m_found;
+ bool gre = FORWARD_OPTS[0].m_found;
+ bool l2 = FORWARD_OPTS[1].m_found;
if (gre || l2) {
svc.m_packet_forward = gre ? l2 ? ServiceGroup::GRE_OR_L2 : ServiceGroup::GRE : ServiceGroup::L2;
if (!status.isOK())
@@ -769,8 +769,8 @@ CacheImpl::loadServicesFromFile(char const *path)
svc.m_packet_return = ServiceGroup::GRE; // default.
if ((prop = svc_cfg[SVC_PROP_RETURN]).hasValue()) {
ts::Errata status = load_option_set(prop, RETURN_OPTS, N_RETURN_OPTS);
- bool gre = RETURN_OPTS[0].m_found;
- bool l2 = RETURN_OPTS[1].m_found;
+ bool gre = RETURN_OPTS[0].m_found;
+ bool l2 = RETURN_OPTS[1].m_found;
if (gre || l2) {
svc.m_packet_return = gre ? l2 ? ServiceGroup::GRE_OR_L2 : ServiceGroup::GRE : ServiceGroup::L2;
if (!status.isOK())
@@ -783,8 +783,8 @@ CacheImpl::loadServicesFromFile(char const *path)
svc.m_cache_assign = ServiceGroup::HASH_ONLY; // default
if ((prop = svc_cfg[SVC_PROP_ASSIGN]).hasValue()) {
ts::Errata status = load_option_set(prop, ASSIGN_OPTS, N_OPTS(ASSIGN_OPTS));
- bool hash = ASSIGN_OPTS[0].m_found;
- bool mask = ASSIGN_OPTS[1].m_found;
+ bool hash = ASSIGN_OPTS[0].m_found;
+ bool mask = ASSIGN_OPTS[1].m_found;
if (hash || mask) {
svc.m_cache_assign = hash ? mask ? ServiceGroup::HASH_OR_MASK : ServiceGroup::HASH_ONLY : ServiceGroup::MASK_ONLY;
if (!status.isOK())
diff --git a/lib/wccp/WccpEndPoint.cc b/lib/wccp/WccpEndPoint.cc
index b254156..bd5e4ae 100644
--- a/lib/wccp/WccpEndPoint.cc
+++ b/lib/wccp/WccpEndPoint.cc
@@ -57,7 +57,7 @@ Impl::GroupData &
Impl::GroupData::setSecurity(SecurityOption style)
{
m_use_security_opt = true;
- m_security_opt = style;
+ m_security_opt = style;
return *this;
}
@@ -90,10 +90,10 @@ Impl::open(uint addr)
if (INADDR_ANY != addr)
m_addr = addr; // overridden.
memset(&saddr, 0, sizeof(saddr));
- in_addr.sin_family = AF_INET;
- in_addr.sin_port = htons(DEFAULT_PORT);
+ in_addr.sin_family = AF_INET;
+ in_addr.sin_port = htons(DEFAULT_PORT);
in_addr.sin_addr.s_addr = m_addr;
- int zret = bind(fd, &saddr, sizeof(saddr));
+ int zret = bind(fd, &saddr, sizeof(saddr));
if (-1 == zret) {
log_errno(LVL_FATAL, "Failed to bind socket to port");
this->close();
@@ -146,7 +146,7 @@ void
Impl::useMD5Security(ts::ConstBuffer const &key)
{
m_use_security_opt = true;
- m_security_opt = SECURITY_MD5;
+ m_security_opt = SECURITY_MD5;
m_use_security_key = true;
memset(m_security_key, 0, SecurityComp::KEY_SIZE);
// Great. Have to cast or we get a link error.
@@ -207,13 +207,13 @@ Impl::handleMessage()
return -ENOTCONN;
recv_buffer.iov_base = buffer;
- recv_buffer.iov_len = BUFFER_SIZE;
+ recv_buffer.iov_len = BUFFER_SIZE;
- recv_hdr.msg_name = &src_addr;
- recv_hdr.msg_namelen = sizeof(src_addr);
- recv_hdr.msg_iov = &recv_buffer;
- recv_hdr.msg_iovlen = 1;
- recv_hdr.msg_control = anc_buffer;
+ recv_hdr.msg_name = &src_addr;
+ recv_hdr.msg_namelen = sizeof(src_addr);
+ recv_hdr.msg_iov = &recv_buffer;
+ recv_hdr.msg_iovlen = 1;
+ recv_hdr.msg_control = anc_buffer;
recv_hdr.msg_controllen = ANC_BUFFER_SIZE;
n = recvmsg(m_fd, &recv_hdr, MSG_TRUNC);
@@ -298,10 +298,10 @@ CacheImpl::GroupData::seedRouter(uint32_t addr)
time_t
CacheImpl::GroupData::removeSeedRouter(uint32_t addr)
{
- time_t zret = 0;
+ time_t zret = 0;
std::vector<SeedRouter>::iterator begin = m_seed_routers.begin();
- std::vector<SeedRouter>::iterator end = m_seed_routers.end();
- std::vector<SeedRouter>::iterator spot = std::find_if(begin, end, ts::predicate(&SeedRouter::m_addr, addr));
+ std::vector<SeedRouter>::iterator end = m_seed_routers.end();
+ std::vector<SeedRouter>::iterator spot = std::find_if(begin, end, ts::predicate(&SeedRouter::m_addr, addr));
if (end != spot) {
zret = spot->m_xmit;
@@ -375,19 +375,19 @@ detail::cache::CacheData::idAddr() const
CacheImpl::GroupData &
CacheImpl::defineServiceGroup(ServiceGroup const &svc, ServiceGroup::Result *result)
{
- uint8_t svc_id = svc.getSvcId();
+ uint8_t svc_id = svc.getSvcId();
GroupMap::iterator spot = m_groups.find(svc_id);
GroupData *group; // service with target ID.
ServiceGroup::Result zret;
if (spot == m_groups.end()) { // not defined
- group = &(m_groups[svc_id]);
+ group = &(m_groups[svc_id]);
group->m_svc = svc;
memset(&group->m_id, 0, sizeof(group->m_id));
group->m_id.initDefaultHash(m_addr);
zret = ServiceGroup::DEFINED;
} else {
group = &spot->second;
- zret = group->m_svc == svc ? ServiceGroup::EXISTS : ServiceGroup::CONFLICT;
+ zret = group->m_svc == svc ? ServiceGroup::EXISTS : ServiceGroup::CONFLICT;
}
if (result)
*result = zret;
@@ -427,7 +427,7 @@ CacheImpl::GroupData::waitTime(time_t now) const
bool
CacheImpl::GroupData::processUp()
{
- bool zret = false;
+ bool zret = false;
const char *proc_pid_path = this->getProcName();
if (proc_pid_path == NULL || proc_pid_path[0] == '\0') {
zret = true; // No process to track, always chatter
@@ -440,7 +440,7 @@ CacheImpl::GroupData::processUp()
close(fd);
if (read_count > 0) {
buffer[read_count] = '\0';
- int pid = atoi(buffer);
+ int pid = atoi(buffer);
if (pid > 0) {
// If the process is still running, it has an entry in the proc file system, (Linux only)
sprintf(buffer, "/proc/%d/status", pid);
@@ -459,7 +459,7 @@ CacheImpl::GroupData::processUp()
bool
CacheImpl::GroupData::cullRouters(time_t now)
{
- bool zret = false;
+ bool zret = false;
size_t idx = 0, n = m_routers.size();
while (idx < n) {
RouterData &router = m_routers[idx];
@@ -611,8 +611,8 @@ CacheImpl::housekeeping()
{
int zret = 0;
sockaddr_in dst_addr;
- sockaddr *addr_ptr = reinterpret_cast<sockaddr *>(&dst_addr);
- time_t now = time(0);
+ sockaddr *addr_ptr = reinterpret_cast<sockaddr *>(&dst_addr);
+ time_t now = time(0);
static size_t const BUFFER_SIZE = 4096;
MsgBuffer msg_buffer;
char msg_data[BUFFER_SIZE];
@@ -621,7 +621,7 @@ CacheImpl::housekeeping()
// Set up everything except the IP address.
memset(&dst_addr, 0, sizeof(dst_addr));
dst_addr.sin_family = AF_INET;
- dst_addr.sin_port = htons(DEFAULT_PORT);
+ dst_addr.sin_port = htons(DEFAULT_PORT);
// Walk the service groups and do their housekeeping.
for (GroupMap::iterator svc_spot = m_groups.begin(), svc_limit = m_groups.end(); svc_spot != svc_limit; ++svc_spot) {
@@ -686,7 +686,7 @@ CacheImpl::housekeeping()
this->generateHereIAm(here_i_am, group);
dst_addr.sin_addr.s_addr = sspot->m_addr;
- zret = sendto(m_fd, msg_data, here_i_am.getCount(), 0, addr_ptr, sizeof(dst_addr));
+ zret = sendto(m_fd, msg_data, here_i_am.getCount(), 0, addr_ptr, sizeof(dst_addr));
if (0 <= zret) {
logf(LVL_DEBUG, "Sent HERE_I_AM for SG %d to seed router %s [gen=#%d,t=%lu,n=%lu].", group.m_svc.getSvcId(),
ip_addr_to_str(sspot->m_addr), group.m_generation, now, here_i_am.getCount());
@@ -709,8 +709,8 @@ CacheImpl::handleISeeYou(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buffer co
// Set if our view of the group changes enough to bump the
// generation number.
bool view_changed = false;
- time_t now = time(0); // don't call this over and over.
- int parse = msg.parse(chunk);
+ time_t now = time(0); // don't call this over and over.
+ int parse = msg.parse(chunk);
if (PARSE_SUCCESS != parse)
return logf(LVL_INFO, "Ignored malformed [%d] WCCP2_I_SEE_YOU message.", parse);
@@ -794,7 +794,7 @@ CacheImpl::handleISeeYou(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buffer co
}
group.m_routers.push_back(r);
- ar_spot = group.m_routers.end() - 1;
+ ar_spot = group.m_routers.end() - 1;
view_changed = true;
logf(LVL_INFO, "Added source router %s to view %d", ip_addr_to_str(router_addr), group.m_svc.getSvcId());
} else {
@@ -812,7 +812,7 @@ CacheImpl::handleISeeYou(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buffer co
time_t then = ar_spot->m_recv.m_time; // used for comparisons later.
ar_spot->m_recv.set(now, recv_id);
ar_spot->m_generation = msg.m_router_view.getChangeNumber();
- router_idx = ar_spot - group.m_routers.begin();
+ router_idx = ar_spot - group.m_routers.begin();
// Reply with our own capability options iff the router sent one to us.
// This is a violation of the spec but it's what we have to do in practice
// for mask assignment.
@@ -833,7 +833,7 @@ CacheImpl::handleISeeYou(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buffer co
group.resizeCacheSources();
uint32_t nc = msg.m_router_view.getCacheCount();
for (uint32_t idx = 0; idx < nc; ++idx) {
- CacheIdBox &cache = msg.m_router_view.cacheId(idx);
+ CacheIdBox &cache = msg.m_router_view.cacheId(idx);
CacheBag::iterator ac_spot = group.findCache(cache.getAddr());
if (group.m_caches.end() == ac_spot) {
group.m_caches.push_back(CacheData());
@@ -867,7 +867,7 @@ CacheImpl::handleRemovalQuery(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buff
ts::Errata zret;
RemovalQueryMsg msg;
time_t now = time(0);
- int parse = msg.parse(chunk);
+ int parse = msg.parse(chunk);
if (PARSE_SUCCESS != parse)
return log(LVL_INFO, "Ignored malformed WCCP2_REMOVAL_QUERY message.");
@@ -887,7 +887,7 @@ CacheImpl::handleRemovalQuery(IpHeader const & /* ip_hdr ATS_UNUSED */, ts::Buff
uint32_t target_addr = msg.m_query.getCacheAddr(); // intended cache
if (m_addr == target_addr) {
- uint32_t raddr = msg.m_query.getRouterAddr();
+ uint32_t raddr = msg.m_query.getRouterAddr();
RouterBag::iterator router = group.findRouter(raddr);
if (group.m_routers.end() != router) {
router->m_rapid = true; // do rapid responses.
@@ -927,17 +927,17 @@ RouterImpl::GroupData::findCache(uint32_t addr)
RouterImpl::GroupData &
RouterImpl::defineServiceGroup(ServiceGroup const &svc, ServiceGroup::Result *result)
{
- uint8_t svc_id = svc.getSvcId();
+ uint8_t svc_id = svc.getSvcId();
GroupMap::iterator spot = m_groups.find(svc_id);
GroupData *group; // service with target ID.
ServiceGroup::Result zret;
if (spot == m_groups.end()) { // not defined
- group = &(m_groups[svc_id]);
+ group = &(m_groups[svc_id]);
group->m_svc = svc;
- zret = ServiceGroup::DEFINED;
+ zret = ServiceGroup::DEFINED;
} else {
group = &spot->second;
- zret = group->m_svc == svc ? ServiceGroup::EXISTS : ServiceGroup::CONFLICT;
+ zret = group->m_svc == svc ? ServiceGroup::EXISTS : ServiceGroup::CONFLICT;
}
if (result)
*result = zret;
@@ -961,7 +961,7 @@ RouterImpl::handleHereIAm(IpHeader const &ip_hdr, ts::Buffer const &chunk)
bool view_changed = false;
int i; // scratch index var.
time_t now = time(0); // don't call this over and over.
- int parse = msg.parse(chunk);
+ int parse = msg.parse(chunk);
if (PARSE_SUCCESS != parse)
return log(LVL_INFO, "Ignored malformed WCCP2_HERE_I_AM message.\n");
@@ -985,7 +985,7 @@ RouterImpl::handleHereIAm(IpHeader const &ip_hdr, ts::Buffer const &chunk)
if (cache == group.m_caches.end()) { // not known
group.m_caches.push_back(CacheData());
// Vector modified, need clean end value.
- cache = group.m_caches.end() - 1;
+ cache = group.m_caches.end() - 1;
cache->m_recv_count = 0;
group.resizeRouterSources();
view_changed = true;
@@ -1008,12 +1008,12 @@ RouterImpl::handleHereIAm(IpHeader const &ip_hdr, ts::Buffer const &chunk)
// Add any new routers
i = msg.m_cache_view.getRouterCount();
while (i-- > 0) {
- uint32_t addr = msg.m_cache_view.routerElt(i).getAddr();
+ uint32_t addr = msg.m_cache_view.routerElt(i).getAddr();
RouterBag::iterator spot = find_by_member(group.m_routers, &RouterData::m_addr, addr);
if (spot == group.m_routers.end()) {
group.m_routers.push_back(RouterData());
// Can't count on previous end value, modified container.
- spot = group.m_routers.end() - 1;
+ spot = group.m_routers.end() - 1;
spot->m_addr = addr;
spot->m_src.resize(group.m_caches.size());
view_changed = true;
@@ -1031,7 +1031,7 @@ RouterImpl::generateISeeYou(ISeeYouMsg &msg, GroupData &group, CacheData &cache)
{
int i;
size_t n_routers = group.m_routers.size();
- size_t n_caches = group.m_caches.size();
+ size_t n_caches = group.m_caches.size();
// Not handling multi-cast so target caches is hardwired to 1.
msg.fill(group, this->setSecurity(msg, group), group.m_assign_info, 1, n_routers, n_caches);
@@ -1065,13 +1065,13 @@ RouterImpl::xmitISeeYou()
ISeeYouMsg msg;
MsgBuffer buffer;
sockaddr_in dst_addr;
- time_t now = time(0);
+ time_t now = time(0);
static size_t const BUFFER_SIZE = 4096;
- char *data = static_cast<char *>(alloca(BUFFER_SIZE));
+ char *data = static_cast<char *>(alloca(BUFFER_SIZE));
memset(&dst_addr, 0, sizeof(dst_addr));
dst_addr.sin_family = AF_INET;
- dst_addr.sin_port = htons(DEFAULT_PORT);
+ dst_addr.sin_port = htons(DEFAULT_PORT);
buffer.set(data, BUFFER_SIZE);
// Send out messages for each service group.
@@ -1086,10 +1086,10 @@ RouterImpl::xmitISeeYou()
msg.setBuffer(buffer);
this->generateISeeYou(msg, group, *cache);
dst_addr.sin_addr.s_addr = cache->m_id.getAddr();
- zret = sendto(m_fd, data, msg.getCount(), 0, reinterpret_cast<sockaddr *>(&dst_addr), sizeof(dst_addr));
+ zret = sendto(m_fd, data, msg.getCount(), 0, reinterpret_cast<sockaddr *>(&dst_addr), sizeof(dst_addr));
if (0 <= zret) {
cache->m_xmit.set(now, group.m_generation);
- cache->m_pending = false;
+ cache->m_pending = false;
cache->m_recv_count = msg.m_router_id.getRecvId();
logf(LVL_DEBUG, "I_SEE_YOU -> %s\n", ip_addr_to_str(cache->m_id.getAddr()));
} else {
diff --git a/lib/wccp/WccpLocal.h b/lib/wccp/WccpLocal.h
index 3cb9c77..24397b4 100644
--- a/lib/wccp/WccpLocal.h
+++ b/lib/wccp/WccpLocal.h
@@ -143,29 +143,29 @@ enum CacheAssignmentType {
/// Top level message types.
enum message_type_t {
INVALID_MSG_TYPE = 0,
- HERE_I_AM = 10,
- I_SEE_YOU = 11,
- REDIRECT_ASSIGN = 12,
- REMOVAL_QUERY = 13,
+ HERE_I_AM = 10,
+ I_SEE_YOU = 11,
+ REDIRECT_ASSIGN = 12,
+ REMOVAL_QUERY = 13,
};
/// Message component type.
/// See Sect 5.1 - 5.4
enum CompType {
- SECURITY_INFO = 0,
- SERVICE_INFO = 1,
- ROUTER_ID_INFO = 2,
- CACHE_ID_INFO = 3,
- RTR_VIEW_INFO = 4,
- CACHE_VIEW_INFO = 5,
+ SECURITY_INFO = 0,
+ SERVICE_INFO = 1,
+ ROUTER_ID_INFO = 2,
+ CACHE_ID_INFO = 3,
+ RTR_VIEW_INFO = 4,
+ CACHE_VIEW_INFO = 5,
REDIRECT_ASSIGNMENT = 6,
- QUERY_INFO = 7,
- CAPABILITY_INFO = 8,
- ALT_ASSIGNMENT = 13,
- ASSIGN_MAP = 14,
- COMMAND_EXTENSION = 15,
- COMP_TYPE_MIN = SECURITY_INFO,
- COMP_TYPE_MAX = COMMAND_EXTENSION
+ QUERY_INFO = 7,
+ CAPABILITY_INFO = 8,
+ ALT_ASSIGNMENT = 13,
+ ASSIGN_MAP = 14,
+ COMMAND_EXTENSION = 15,
+ COMP_TYPE_MIN = SECURITY_INFO,
+ COMP_TYPE_MAX = COMMAND_EXTENSION
};
/// Router Identity.
@@ -327,9 +327,9 @@ public:
/// Capability types.
enum Type {
- PACKET_FORWARD_METHOD = 1, ///< Packet forwarding methods.
+ PACKET_FORWARD_METHOD = 1, ///< Packet forwarding methods.
CACHE_ASSIGNMENT_METHOD = 2, ///< Cache assignment methods.
- PACKET_RETURN_METHOD = 3 ///< Packet return methods.
+ PACKET_RETURN_METHOD = 3 ///< Packet return methods.
};
CapabilityElt(); ///< Default constructor.
@@ -1754,8 +1754,8 @@ public:
/// Command types.
enum cmd_t {
- SHUTDOWN = 1, ///< Cache is shutting down.
- SHUTDOWN_RESPONSE = 2 ///< SHUTDOWN ack.
+ SHUTDOWN = 1, ///< Cache is shutting down.
+ SHUTDOWN_RESPONSE = 2 ///< SHUTDOWN ack.
};
/// Serialized data layout.
@@ -3330,8 +3330,8 @@ MsgBuffer::reset()
inline MsgBuffer &
MsgBuffer::set(void *ptr, size_t n)
{
- _ptr = static_cast<char *>(ptr);
- _size = n;
+ _ptr = static_cast<char *>(ptr);
+ _size = n;
_count = 0;
return *this;
}
@@ -3359,7 +3359,7 @@ inline PacketStamp &
PacketStamp::set(time_t time, uint32_t sn)
{
m_time = time;
- m_sn = sn;
+ m_sn = sn;
return *this;
}
@@ -3487,7 +3487,7 @@ MaskAssignElt::appender::initSet(uint32_t srcAddr, uint32_t dstAddr, uint16_t sr
inline MaskValueSetElt *
MaskAssignElt::appender::mask(uint32_t srcAddr, uint32_t dstAddr, uint16_t srcPort, uint16_t dstPort)
{
- m_set = reinterpret_cast<MaskValueSetElt *>(reinterpret_cast<char *>(m_set) + m_set->getSize());
+ m_set = reinterpret_cast<MaskValueSetElt *>(reinterpret_cast<char *>(m_set) + m_set->getSize());
m_elt->m_count = htonl(1 + m_elt->getCount()); // bump set count.
this->initSet(srcAddr, dstAddr, srcPort, dstPort);
return m_set;
@@ -3496,7 +3496,7 @@ inline MaskAssignElt::appender
MaskAssignElt::init(uint32_t srcAddr, uint32_t dstAddr, uint16_t srcPort, uint16_t dstPort)
{
appender zret;
- m_count = htonl(1);
+ m_count = htonl(1);
zret.m_set = reinterpret_cast<MaskValueSetElt *>(this + 1);
zret.m_elt = this;
zret.initSet(srcAddr, dstAddr, srcPort, dstPort);
diff --git a/lib/wccp/WccpMsg.cc b/lib/wccp/WccpMsg.cc
index 894b8b1..4ecda87 100644
--- a/lib/wccp/WccpMsg.cc
+++ b/lib/wccp/WccpMsg.cc
@@ -65,7 +65,7 @@ CacheHashIdElt &
CacheHashIdElt::setBucket(int idx, bool state)
{
uint8_t &bucket = m_buckets[idx >> 3];
- uint8_t mask = 1 << (idx & 7);
+ uint8_t mask = 1 << (idx & 7);
if (state)
bucket |= mask;
else
@@ -97,7 +97,7 @@ CacheIdBox::require(size_t n)
if (m_base && m_cap)
ats_free(m_base);
m_base = static_cast<CacheIdElt *>(ats_malloc(n));
- m_cap = n;
+ m_cap = n;
}
memset(m_base, 0, m_cap);
m_size = 0;
@@ -110,7 +110,7 @@ CacheIdBox::initDefaultHash(uint32_t addr)
this->require(sizeof(CacheHashIdElt));
m_size = sizeof(CacheHashIdElt);
m_base->initHashRev().setUnassigned(true).setMask(false).setAddr(addr);
- m_tail = static_cast<CacheHashIdElt *>(m_base)->getTailPtr();
+ m_tail = static_cast<CacheHashIdElt *>(m_base)->getTailPtr();
m_tail->m_weight = htons(0);
m_tail->m_status = htons(0);
return *this;
@@ -124,8 +124,8 @@ CacheIdBox::initDefaultMask(uint32_t addr)
CacheMaskIdElt *mid = static_cast<CacheMaskIdElt *>(m_base);
mid->initHashRev().setUnassigned(true).setMask(true).setAddr(addr);
mid->m_assign.init(0, 0, 0, 0)->addValue(addr, 0, 0, 0, 0);
- m_size = mid->getSize();
- m_tail = mid->getTailPtr();
+ m_size = mid->getSize();
+ m_tail = mid->getTailPtr();
m_tail->m_weight = htons(0);
m_tail->m_status = htons(0);
return *this;
@@ -151,7 +151,7 @@ CacheIdBox &
CacheIdBox::fill(void *base, self const &src)
{
m_size = src.getSize();
- m_cap = 0;
+ m_cap = 0;
m_base = static_cast<CacheIdElt *>(base);
memcpy(m_base, src.m_base, m_size);
return *this;
@@ -160,13 +160,13 @@ CacheIdBox::fill(void *base, self const &src)
int
CacheIdBox::parse(MsgBuffer base)
{
- int zret = PARSE_SUCCESS;
+ int zret = PARSE_SUCCESS;
CacheIdElt *ptr = reinterpret_cast<CacheIdElt *>(base.getTail());
- size_t n = base.getSpace();
- m_cap = 0;
+ size_t n = base.getSpace();
+ m_cap = 0;
if (ptr->isMask()) {
CacheMaskIdElt *mptr = static_cast<CacheMaskIdElt *>(ptr);
- size_t size = sizeof(CacheMaskIdElt);
+ size_t size = sizeof(CacheMaskIdElt);
// Sanity check - verify enough room for empty elements.
if (n < size || n < size + MaskValueSetElt::calcSize(0) * mptr->getCount()) {
zret = PARSE_BUFFER_TOO_SMALL;
@@ -308,7 +308,7 @@ size_t
MaskAssignElt::getVarSize() const
{
size_t zret = 0;
- int n = this->getCount();
+ int n = this->getCount();
MaskValueSetElt const *set = reinterpret_cast<MaskValueSetElt const *>(this + 1);
while (n--) {
@@ -323,7 +323,7 @@ HashAssignElt &
HashAssignElt::round_robin_assign()
{
uint32_t v_caches = this->getCount();
- Bucket *buckets = this->getBucketBase();
+ Bucket *buckets = this->getBucketBase();
if (1 == v_caches)
memset(buckets, 0, sizeof(Bucket) * N_BUCKETS);
else { // Assign round robin.
@@ -331,7 +331,7 @@ HashAssignElt::round_robin_assign()
for (Bucket *spot = buckets, *limit = spot + N_BUCKETS; spot < limit; ++spot) {
spot->m_idx = x;
spot->m_alt = 0;
- x = (x + 1) % v_caches;
+ x = (x + 1) % v_caches;
}
}
return *this;
@@ -340,7 +340,7 @@ HashAssignElt::round_robin_assign()
RouterAssignListElt &
RouterAssignListElt::updateRouterId(uint32_t addr, uint32_t rcvid, uint32_t cno)
{
- uint32_t n = this->getCount();
+ uint32_t n = this->getCount();
RouterAssignElt *elt = access_array<RouterAssignElt>(this + 1);
for (uint32_t i = 0; i < n; ++i, ++elt) {
if (addr == elt->getAddr()) {
@@ -411,7 +411,7 @@ MsgHeaderComp::fill(MsgBuffer &buffer, message_type_t t)
int
MsgHeaderComp::parse(MsgBuffer &base)
{
- int zret = PARSE_SUCCESS;
+ int zret = PARSE_SUCCESS;
size_t comp_size = this->calcSize();
if (base.getSpace() < comp_size) {
zret = PARSE_BUFFER_TOO_SMALL;
@@ -528,7 +528,7 @@ SecurityComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
Option opt = this->getOption();
if (SECURITY_NONE != opt && SECURITY_MD5 != opt)
@@ -595,13 +595,13 @@ ServiceComp::fill(MsgBuffer &buffer, ServiceGroup const &svc)
int
ServiceComp::parse(MsgBuffer &buffer)
{
- int zret = PARSE_SUCCESS;
+ int zret = PARSE_SUCCESS;
size_t comp_size = this->calcSize();
if (buffer.getSpace() < comp_size)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
ServiceGroup::Type svc = this->getSvcType();
if (ServiceGroup::DYNAMIC != svc && ServiceGroup::STANDARD != svc)
@@ -694,7 +694,7 @@ RouterIdComp::setFromAddr(int idx, uint32_t addr)
int
RouterIdComp::findFromAddr(uint32_t addr)
{
- int n = this->getFromCount();
+ int n = this->getFromCount();
uint32_t *addrs = access_array<uint32_t>(m_base + sizeof(raw_t)) + n;
while (n-- != 0 && *--addrs != addr)
;
@@ -746,7 +746,7 @@ RouterIdComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
size_t comp_size = this->calcSize(this->getFromCount());
if (this->getLength() != comp_size - sizeof(super::raw_t))
@@ -856,7 +856,7 @@ RouterViewComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
uint32_t ncaches; // # of caches.
if (this->getRouterCount() > MAX_ROUTERS)
@@ -872,7 +872,7 @@ RouterViewComp::parse(MsgBuffer &buffer)
// Walk the cache ID elements.
MsgBuffer spot(buffer);
CacheIdBox *box = m_cache_ids;
- uint32_t idx = 0;
+ uint32_t idx = 0;
spot.use(comp_size);
while (idx < ncaches && PARSE_SUCCESS == (zret = box->parse(spot))) {
size_t k = box->getSize();
@@ -912,7 +912,7 @@ CacheIdComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
MsgBuffer tmp(buffer);
tmp.use(reinterpret_cast<char *>(&(access_field(&raw_t::m_id, m_base))) - m_base);
@@ -1000,7 +1000,7 @@ CacheViewComp::fill(MsgBuffer &buffer, detail::cache::GroupData const &group)
{
int i;
size_t n_routers = group.m_routers.size();
- size_t n_caches = group.m_caches.size();
+ size_t n_caches = group.m_caches.size();
size_t comp_size = this->calcSize(n_routers, n_caches);
if (buffer.getSpace() < comp_size)
@@ -1012,7 +1012,7 @@ CacheViewComp::fill(MsgBuffer &buffer, detail::cache::GroupData const &group)
set_field(&raw_t::m_router_count, m_base, n_routers);
// Set the pointer to the count of caches.
- m_cache_count = reinterpret_cast<uint32_t *>(m_base + sizeof(raw_t) + n_routers * sizeof(RouterIdElt));
+ m_cache_count = reinterpret_cast<uint32_t *>(m_base + sizeof(raw_t) + n_routers * sizeof(RouterIdElt));
*m_cache_count = htonl(n_caches); // set the actual count.
// Fill routers.
@@ -1042,9 +1042,9 @@ CacheViewComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
- m_cache_count = reinterpret_cast<uint32_t *>(m_base + sizeof(raw_t) + this->getRouterCount() * sizeof(RouterIdElt));
+ m_cache_count = reinterpret_cast<uint32_t *>(m_base + sizeof(raw_t) + this->getRouterCount() * sizeof(RouterIdElt));
size_t comp_size = this->calcSize(this->getRouterCount(), this->getCacheCount());
if (this->getLength() != comp_size - sizeof(super::raw_t))
zret = PARSE_COMP_WRONG_SIZE;
@@ -1146,10 +1146,10 @@ AssignInfoComp &
AssignInfoComp::fill(MsgBuffer &buffer, detail::Assignment const &assign)
{
RouterAssignListElt const &ralist = assign.getRouterList();
- HashAssignElt const &ha = assign.getHash();
- size_t n_routers = ralist.getCount();
- size_t n_caches = ha.getCount();
- size_t comp_size = this->calcSize(n_routers, n_caches);
+ HashAssignElt const &ha = assign.getHash();
+ size_t n_routers = ralist.getCount();
+ size_t n_caches = ha.getCount();
+ size_t comp_size = this->calcSize(n_routers, n_caches);
if (buffer.getSpace() < comp_size)
throw ts::Exception(BUFFER_TOO_SMALL_FOR_COMP_TEXT);
@@ -1177,13 +1177,13 @@ AssignInfoComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
int n_routers = this->getRouterCount();
int n_caches;
- m_cache_count = this->calcCacheCountPtr();
- n_caches = this->getCacheCount();
- m_buckets = this->calcBucketPtr();
+ m_cache_count = this->calcCacheCountPtr();
+ n_caches = this->getCacheCount();
+ m_buckets = this->calcBucketPtr();
size_t comp_size = this->calcSize(n_routers, n_caches);
if (this->getLength() != comp_size - HEADER_SIZE)
zret = PARSE_COMP_WRONG_SIZE;
@@ -1236,10 +1236,10 @@ AltHashAssignComp &
AltHashAssignComp::fill(MsgBuffer &buffer, detail::Assignment const &assign)
{
RouterAssignListElt const &ralist = assign.getRouterList();
- HashAssignElt const &ha = assign.getHash();
- size_t n_routers = ralist.getCount();
- size_t n_caches = ha.getCount();
- size_t comp_size = this->calcSize(n_routers, n_caches);
+ HashAssignElt const &ha = assign.getHash();
+ size_t n_routers = ralist.getCount();
+ size_t n_caches = ha.getCount();
+ size_t comp_size = this->calcSize(n_routers, n_caches);
if (buffer.getSpace() < comp_size)
throw ts::Exception(BUFFER_TOO_SMALL_FOR_COMP_TEXT);
@@ -1269,12 +1269,12 @@ AltHashAssignComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
int n_routers = this->getRouterCount();
int n_caches;
- m_cache_count = static_cast<uint32_t *>(this->calcVarPtr());
- n_caches = this->getCacheCount();
+ m_cache_count = static_cast<uint32_t *>(this->calcVarPtr());
+ n_caches = this->getCacheCount();
size_t comp_size = this->calcSize(n_routers, n_caches);
if (this->getLength() != comp_size - HEADER_SIZE)
zret = PARSE_COMP_WRONG_SIZE;
@@ -1291,8 +1291,8 @@ AltMaskAssignComp &
AltMaskAssignComp::fill(MsgBuffer &buffer, detail::Assignment const &assign)
{
RouterAssignListElt const &ralist = assign.getRouterList();
- MaskAssignElt const &ma = assign.getMask();
- size_t comp_size = sizeof(raw_t) + ralist.getVarSize() + ma.getSize();
+ MaskAssignElt const &ma = assign.getMask();
+ size_t comp_size = sizeof(raw_t) + ralist.getVarSize() + ma.getSize();
if (buffer.getSpace() < comp_size)
throw ts::Exception(BUFFER_TOO_SMALL_FOR_COMP_TEXT);
@@ -1322,11 +1322,11 @@ AltMaskAssignComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
RouterAssignListElt *ralist = &(access_field(&raw_t::m_routers, m_base));
- m_mask_elt = static_cast<MaskAssignElt *>(this->calcVarPtr());
- size_t comp_size = sizeof(raw_t) + ralist->getVarSize() + m_mask_elt->getSize();
+ m_mask_elt = static_cast<MaskAssignElt *>(this->calcVarPtr());
+ size_t comp_size = sizeof(raw_t) + ralist->getVarSize() + m_mask_elt->getSize();
if (this->getLength() != comp_size - HEADER_SIZE)
zret = PARSE_COMP_WRONG_SIZE;
else
@@ -1396,7 +1396,7 @@ CmdComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
if (this->getLength() + sizeof(super::raw_t) != this->calcSize())
zret = PARSE_COMP_WRONG_SIZE;
@@ -1423,8 +1423,8 @@ CapComp::cache() const
uint32_t x; // scratch for bounds checking.
// Reset all values.
m_packet_forward = ServiceGroup::NO_PACKET_STYLE;
- m_packet_return = ServiceGroup::NO_PACKET_STYLE;
- m_cache_assign = ServiceGroup::NO_CACHE_ASSIGN_STYLE;
+ m_packet_return = ServiceGroup::NO_PACKET_STYLE;
+ m_cache_assign = ServiceGroup::NO_CACHE_ASSIGN_STYLE;
if (!m_base)
return; // No data, everything is default.
// Load from data.
@@ -1458,7 +1458,7 @@ CapComp &
CapComp::fill(MsgBuffer &buffer, int n)
{
size_t comp_size = this->calcSize(n);
- m_cached = false;
+ m_cached = false;
if (buffer.getSpace() < comp_size)
throw ts::Exception(BUFFER_TOO_SMALL_FOR_COMP_TEXT);
@@ -1480,7 +1480,7 @@ CapComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
// No explicit count, compute it from length.
m_count = this->getLength() / sizeof(CapabilityElt);
@@ -1498,7 +1498,7 @@ QueryComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret)
buffer.use(this->calcSize());
}
@@ -1514,9 +1514,9 @@ AssignMapComp::getCount() const
AssignMapComp &
AssignMapComp::fill(MsgBuffer &buffer, detail::Assignment const &assign)
{
- size_t comp_size = sizeof(raw_t);
+ size_t comp_size = sizeof(raw_t);
MaskAssignElt const &ma = assign.getMask();
- size_t ma_size = ma.getSize(); // Not constant time.
+ size_t ma_size = ma.getSize(); // Not constant time.
// Can't be precise, but we need at least one mask/value set with
// at least one value. If we don't have that it's a clear fail.
@@ -1541,7 +1541,7 @@ AssignMapComp::parse(MsgBuffer &buffer)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
- zret = this->checkHeader(buffer, COMP_TYPE);
+ zret = this->checkHeader(buffer, COMP_TYPE);
if (PARSE_SUCCESS == zret) {
// TBD - Actually check the mask/value set data !!
buffer.use(this->getLength() + HEADER_SIZE);
@@ -1566,7 +1566,7 @@ detail::Assignment::fill(cache::GroupData &group, uint32_t addr)
// mentioned by at least one router are purged.
size_t n_routers = group.m_routers.size(); // routers in group
- size_t n_caches = group.m_caches.size(); // caches in group
+ size_t n_caches = group.m_caches.size(); // caches in group
// We need both routers and caches to do something useful.
if (!(n_routers && n_caches))
diff --git a/lib/wccp/WccpStatic.cc b/lib/wccp/WccpStatic.cc
index 36c4405..3ee395f 100644
--- a/lib/wccp/WccpStatic.cc
+++ b/lib/wccp/WccpStatic.cc
@@ -45,16 +45,16 @@ namespace wccp
struct CompileTimeChecks {
static unsigned int const BUCKET_SIZE = sizeof(AssignInfoComp::Bucket);
- static unsigned int const UINT8_SIZE = sizeof(uint8_t);
+ static unsigned int const UINT8_SIZE = sizeof(uint8_t);
// A compiler error for the following line means that the size of
// an assignment bucket is incorrect. It must be exactly 1 byte.
ts::TEST_IF_TRUE<BUCKET_SIZE == UINT8_SIZE> m_check_bucket_size;
};
-ts::Errata::Code LVL_TMP = 1; ///< Temporary message.
+ts::Errata::Code LVL_TMP = 1; ///< Temporary message.
ts::Errata::Code LVL_FATAL = 3; ///< Fatal, cannot continue.
-ts::Errata::Code LVL_WARN = 2; ///< Significant, should be fixed.
-ts::Errata::Code LVL_INFO = 1; /// Interesting, not necessarily a problem.
+ts::Errata::Code LVL_WARN = 2; ///< Significant, should be fixed.
+ts::Errata::Code LVL_INFO = 1; /// Interesting, not necessarily a problem.
ts::Errata::Code LVL_DEBUG = 0; /// Debugging information.
// Find a valid local IP address given an open socket.
@@ -71,8 +71,8 @@ Get_Local_Address(int s)
conf.ifc_len = sizeof(req);
conf.ifc_req = req;
if (0 == ioctl(s, SIOCGIFCONF, &conf)) {
- int idx = 0;
- ifreq *ptr = req;
+ int idx = 0;
+ ifreq *ptr = req;
ifreq *limit = req + (conf.ifc_len / sizeof(*req));
for (; idx < N_REQ && ptr < limit; ++idx, ++ptr) {
zret = reinterpret_cast<sockaddr_in &>(ptr->ifr_addr).sin_addr.s_addr;
diff --git a/lib/wccp/WccpUtil.h b/lib/wccp/WccpUtil.h
index 9e3d22c..b00359c 100644
--- a/lib/wccp/WccpUtil.h
+++ b/lib/wccp/WccpUtil.h
@@ -191,7 +191,7 @@ find_by_member(std::vector<T> &container, ///< Vector with elements.
V const &value ///< Value to match.
)
{
- typename std::vector<T>::iterator spot = container.begin();
+ typename std::vector<T>::iterator spot = container.begin();
typename std::vector<T>::iterator limit = container.end();
while (spot != limit && (*spot).*member != value)
++spot;
diff --git a/lib/wccp/wccp-test-router.cc b/lib/wccp/wccp-test-router.cc
index b64f866..f3ab546 100644
--- a/lib/wccp/wccp-test-router.cc
+++ b/lib/wccp/wccp-test-router.cc
@@ -62,14 +62,14 @@ main(int argc, char **argv)
// Reading stdin support.
size_t in_size = 200;
- char *in_buff = 0;
+ char *in_buff = 0;
ssize_t in_count;
// getopt return values. Selected to avoid collisions with
// short arguments.
static int const OPT_ADDRESS = 257; ///< Bind to IP address option.
- static int const OPT_HELP = 258; ///< Print help message.
- static int const OPT_MD5 = 259; ///< MD5 key.
+ static int const OPT_HELP = 258; ///< Print help message.
+ static int const OPT_MD5 = 259; ///< MD5 key.
static option OPTIONS[] = {
{"address", 1, 0, OPT_ADDRESS}, {"md5", 1, 0, OPT_MD5}, {"help", 0, 0, OPT_HELP}, {0, 0, 0, 0} // required terminator.
@@ -87,16 +87,16 @@ main(int argc, char **argv)
switch (zret) {
case OPT_HELP:
FAIL_MSG = "Usage:";
- fail = true;
+ fail = true;
break;
case '?':
FAIL_MSG = "Invalid option specified.";
- fail = true;
+ fail = true;
break;
case OPT_ADDRESS:
if (0 == inet_aton(optarg, &ip_addr)) {
FAIL_MSG = "Invalid IP address specified for client.";
- fail = true;
+ fail = true;
}
break;
case OPT_MD5:
@@ -122,10 +122,10 @@ main(int argc, char **argv)
pollfd pfa[POLL_FD_COUNT];
// Poll on STDIN and the socket.
- pfa[0].fd = STDIN_FILENO;
+ pfa[0].fd = STDIN_FILENO;
pfa[0].events = POLLIN;
- pfa[1].fd = wcp.getSocket();
+ pfa[1].fd = wcp.getSocket();
pfa[1].events = POLLIN;
while (true) {
diff --git a/mgmt/Alarms.cc b/mgmt/Alarms.cc
index e309423..abf4c03 100644
--- a/mgmt/Alarms.cc
+++ b/mgmt/Alarms.cc
@@ -78,9 +78,9 @@ alarm_script_dir()
Alarms::Alarms()
{
- cur_cb = 0;
- cblist = ink_hash_table_create(InkHashTableKeyType_String);
- local_alarms = ink_hash_table_create(InkHashTableKeyType_String);
+ cur_cb = 0;
+ cblist = ink_hash_table_create(InkHashTableKeyType_String);
+ local_alarms = ink_hash_table_create(InkHashTableKeyType_String);
remote_alarms = ink_hash_table_create(InkHashTableKeyType_String);
ink_mutex_init(&mutex, "alarms-mutex");
alarmOEMcount = minOEMkey;
@@ -165,7 +165,7 @@ Alarms::resolveAlarm(alarm_t a, char *ip)
void
Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
{
- static time_t last_sent = 0;
+ static time_t last_sent = 0;
static char prev_alarm_text[2048] = "";
int priority;
@@ -257,26 +257,26 @@ Alarms::signalAlarm(alarm_t a, const char *desc, const char *ip)
if (ink_hash_table_lookup(remote_alarms, buf, &hash_value) != 0) {
// Reset the seen flag so that we know the remote alarm is
// still active
- atmp = (Alarm *)hash_value;
+ atmp = (Alarm *)hash_value;
atmp->seen = true;
ink_mutex_release(&mutex);
return;
}
}
- atmp = (Alarm *)ats_malloc(sizeof(Alarm));
- atmp->type = a;
- atmp->linger = true;
- atmp->seen = true;
- atmp->priority = priority;
+ atmp = (Alarm *)ats_malloc(sizeof(Alarm));
+ atmp->type = a;
+ atmp->linger = true;
+ atmp->seen = true;
+ atmp->priority = priority;
atmp->description = NULL;
if (!ip) {
- atmp->local = true;
+ atmp->local = true;
atmp->inet_address = 0;
ink_hash_table_insert(local_alarms, (InkHashTableKey)(buf), (atmp));
} else {
- atmp->local = false;
+ atmp->local = false;
atmp->inet_address = inet_addr(ip);
ink_hash_table_insert(remote_alarms, (InkHashTableKey)(buf), (atmp));
}
@@ -329,7 +329,7 @@ Alarms::resetSeenFlag(char *ip)
ink_mutex_acquire(&mutex);
for (entry = ink_hash_table_iterator_first(remote_alarms, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(remote_alarms, &iterator_state)) {
- char *key = (char *)ink_hash_table_entry_key(remote_alarms, entry);
+ char *key = (char *)ink_hash_table_entry_key(remote_alarms, entry);
Alarm *tmp = (Alarm *)ink_hash_table_entry_value(remote_alarms, entry);
if (strstr(key, ip)) {
@@ -354,7 +354,7 @@ Alarms::clearUnSeen(char *ip)
ink_mutex_acquire(&mutex);
for (entry = ink_hash_table_iterator_first(remote_alarms, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(remote_alarms, &iterator_state)) {
- char *key = (char *)ink_hash_table_entry_key(remote_alarms, entry);
+ char *key = (char *)ink_hash_table_entry_key(remote_alarms, entry);
Alarm *tmp = (Alarm *)ink_hash_table_entry_value(remote_alarms, entry);
if (strstr(key, ip)) { /* Make sure alarm is for correct ip */
@@ -462,7 +462,7 @@ Alarms::execAlarmBin(const char *desc)
// get email info
alarm_email_from_name = REC_readString("proxy.config.product_name", NULL);
alarm_email_from_addr = REC_readString("proxy.config.admin.admin_user", NULL);
- alarm_email_to_addr = REC_readString("proxy.config.alarm_email", NULL);
+ alarm_email_to_addr = REC_readString("proxy.config.alarm_email", NULL);
ink_filepath_make(cmd_line, sizeof(cmd_line), bindir, alarm_bin);
@@ -476,7 +476,7 @@ Alarms::execAlarmBin(const char *desc)
} else if (pid > 0) { /* Parent */
int status;
bool script_done = false;
- time_t timeout = (time_t)REC_readInteger("proxy.config.alarm.script_runtime", NULL);
+ time_t timeout = (time_t)REC_readInteger("proxy.config.alarm.script_runtime", NULL);
if (!timeout) {
timeout = 5; // default time = 5 secs
}
diff --git a/mgmt/BaseManager.cc b/mgmt/BaseManager.cc
index 9fb2751..d76dfd5 100644
--- a/mgmt/BaseManager.cc
+++ b/mgmt/BaseManager.cc
@@ -39,7 +39,7 @@
BaseManager::BaseManager()
{
/* Setup the event queue and callback tables */
- mgmt_event_queue = create_queue();
+ mgmt_event_queue = create_queue();
mgmt_callback_table = ink_hash_table_create(InkHashTableKeyType_Word);
} /* End BaseManager::BaseManager */
@@ -98,15 +98,15 @@ BaseManager::registerMgmtCallback(int msg_id, MgmtCallback cb, void *opaque_cb_d
for (tmp = cb_list; tmp->next; tmp = tmp->next)
;
- tmp->next = (MgmtCallbackList *)ats_malloc(sizeof(MgmtCallbackList));
- tmp->next->func = cb;
+ tmp->next = (MgmtCallbackList *)ats_malloc(sizeof(MgmtCallbackList));
+ tmp->next->func = cb;
tmp->next->opaque_data = opaque_cb_data;
- tmp->next->next = NULL;
+ tmp->next->next = NULL;
} else {
- cb_list = (MgmtCallbackList *)ats_malloc(sizeof(MgmtCallbackList));
- cb_list->func = cb;
+ cb_list = (MgmtCallbackList *)ats_malloc(sizeof(MgmtCallbackList));
+ cb_list->func = cb;
cb_list->opaque_data = opaque_cb_data;
- cb_list->next = NULL;
+ cb_list->next = NULL;
ink_hash_table_insert(mgmt_callback_table, (InkHashTableKey)(intptr_t)msg_id, cb_list);
}
return msg_id;
@@ -135,13 +135,13 @@ BaseManager::signalMgmtEntity(int msg_id, char *data_raw, int data_len)
MgmtMessageHdr *mh;
if (data_raw) {
- mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
- mh->msg_id = msg_id;
+ mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
+ mh->msg_id = msg_id;
mh->data_len = data_len;
memcpy((char *)mh + sizeof(MgmtMessageHdr), data_raw, data_len);
} else {
- mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr));
- mh->msg_id = msg_id;
+ mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr));
+ mh->msg_id = msg_id;
mh->data_len = 0;
}
ink_assert(enqueue(mgmt_event_queue, mh));
diff --git a/mgmt/Cop.h b/mgmt/Cop.h
index d1fab21..ed02db8 100644
--- a/mgmt/Cop.h
+++ b/mgmt/Cop.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-static const int cop_sleep_time = 10; // 10 sec
+static const int cop_sleep_time = 10; // 10 sec
static const int cop_manager_timeout = 3 * 60; // 3 min
-static const int cop_server_timeout = 3 * 60; // 3 min
-static const int cop_kill_timeout = 1 * 60; // 1 min
+static const int cop_server_timeout = 3 * 60; // 3 min
+static const int cop_kill_timeout = 1 * 60; // 1 min
diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc
index f42b36f..b65bfe5 100644
--- a/mgmt/FileManager.cc
+++ b/mgmt/FileManager.cc
@@ -71,7 +71,7 @@ FileManager::FileManager()
mgmt_fatal(stderr, 0, "[FileManager::FileManager] snapshot directory %s is not a directory\n", (const char *)snapshotDir);
}
- this->managedDir = snapshotDir.release();
+ this->managedDir = snapshotDir.release();
this->dirDescript = "snapshot";
}
@@ -92,7 +92,7 @@ FileManager::~FileManager()
ink_mutex_acquire(&accessLock);
ats_free(this->managedDir);
- this->managedDir = NULL;
+ this->managedDir = NULL;
this->dirDescript = NULL;
for (cb = cblist.pop(); cb != NULL; cb = cblist.pop()) {
@@ -156,7 +156,7 @@ FileManager::addFileHelper(const char *fileName, bool root_access_needed, Rollba
{
ink_assert(fileName != NULL);
- Rollback *rb = new Rollback(fileName, root_access_needed, parentRollback, flags);
+ Rollback *rb = new Rollback(fileName, root_access_needed, parentRollback, flags);
rb->configFiles = this;
ink_hash_table_insert(bindings, fileName, rb);
@@ -229,7 +229,7 @@ FileManager::filesManaged()
// do not change from under us
for (entry = ink_hash_table_iterator_first(bindings, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(bindings, &iterator_state)) {
- rb = (Rollback *)ink_hash_table_entry_value(bindings, entry);
+ rb = (Rollback *)ink_hash_table_entry_value(bindings, entry);
currentName = rb->getBaseName();
ink_assert(currentName);
@@ -351,7 +351,7 @@ FileManager::restoreSnap(const char *snapName, const char *snapDir)
//
for (entry = ink_hash_table_iterator_first(bindings, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(bindings, &iterator_state)) {
- rb = (Rollback *)ink_hash_table_entry_value(bindings, entry);
+ rb = (Rollback *)ink_hash_table_entry_value(bindings, entry);
filePath = newPathString(snapPath, rb->getBaseName());
if (readFile(filePath, &storage) != SNAP_OK) {
abortRestore(rb->getBaseName());
@@ -393,7 +393,7 @@ FileManager::removeSnap(const char *snapName, const char *snapDir)
char *snapFilePath;
bool unlinkFailed = false;
SnapResult result = SNAP_OK;
- snapPath = newPathString(snapDir, snapName);
+ snapPath = newPathString(snapDir, snapName);
dir = opendir(snapPath);
@@ -418,7 +418,7 @@ FileManager::removeSnap(const char *snapName, const char *snapDir)
if (unlink(snapFilePath) < 0) {
mgmt_log(stderr, "[FileManager::removeSnap] Unlink failed for %s: %s\n", snapFilePath, strerror(errno));
unlinkFailed = true;
- result = SNAP_REMOVE_FAILED;
+ result = SNAP_REMOVE_FAILED;
}
delete[] snapFilePath;
}
@@ -494,7 +494,7 @@ FileManager::takeSnap(const char *snapName, const char *snapDir)
// For each file, make a copy in the snap shot directory
for (entry = ink_hash_table_iterator_first(bindings, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(bindings, &iterator_state)) {
- rb = (Rollback *)ink_hash_table_entry_value(bindings, entry);
+ rb = (Rollback *)ink_hash_table_entry_value(bindings, entry);
callResult = this->copyFile(rb, snapPath);
if (callResult != SNAP_OK) {
// Remove the failed snapshot so that we do not have a partial
@@ -575,7 +575,7 @@ FileManager::copyFile(Rollback *rb, const char *snapPath)
}
// Create the new file
filePath = newPathString(snapPath, fileName);
- diskFD = mgmt_open_mode(filePath, O_RDWR | O_CREAT, FILE_MODE);
+ diskFD = mgmt_open_mode(filePath, O_RDWR | O_CREAT, FILE_MODE);
if (diskFD < 0) {
mgmt_log(stderr, "[FileManager::copyFile] Unable to create snapshot file %s: %s\n", fileName, strerror(errno));
@@ -739,10 +739,10 @@ FileManager::displaySnapOption(textBuffer *output)
void
FileManager::createSelect(char *action, textBuffer *output, ExpandingArray *options)
{
- const char formOpen[] = "<form method=POST action=\"/configure/snap_action.html\">\n<select name=snap>\n";
- const char formEnd[] = "</form>";
+ const char formOpen[] = "<form method=POST action=\"/configure/snap_action.html\">\n<select name=snap>\n";
+ const char formEnd[] = "</form>";
const char submitButton[] = "<input type=submit value=\"";
- const char hiddenInput[] = "<input type=hidden name=action value=";
+ const char hiddenInput[] = "<input type=hidden name=action value=";
int numOptions;
diff --git a/mgmt/LocalManager.cc b/mgmt/LocalManager.cc
index dac34ee..74accec 100644
--- a/mgmt/LocalManager.cc
+++ b/mgmt/LocalManager.cc
@@ -149,7 +149,7 @@ LocalManager::clearStats(const char *name)
bool
LocalManager::clusterOk()
{
- bool found = true;
+ bool found = true;
bool result = true;
if (processRunning() == true && time(NULL) > (this->proxy_started_at + 30) &&
@@ -180,13 +180,13 @@ LocalManager::LocalManager(bool proxy_on) : BaseManager(), run_proxy(proxy_on),
syslog_facility = 0;
- ccom = NULL;
- proxy_started_at = -1;
- proxy_launch_count = 0;
- manager_started_at = time(NULL);
- proxy_launch_outstanding = false;
+ ccom = NULL;
+ proxy_started_at = -1;
+ proxy_launch_count = 0;
+ manager_started_at = time(NULL);
+ proxy_launch_outstanding = false;
mgmt_shutdown_outstanding = MGMT_PENDING_NONE;
- proxy_running = 0;
+ proxy_running = 0;
RecSetRecordInt("proxy.node.proxy_running", 0, REC_SOURCE_DEFAULT);
virt_map = NULL;
@@ -232,12 +232,12 @@ LocalManager::LocalManager(bool proxy_on) : BaseManager(), run_proxy(proxy_on),
}
#endif
- process_server_timeout_secs = REC_readInteger("proxy.config.lm.pserver_timeout_secs", &found);
+ process_server_timeout_secs = REC_readInteger("proxy.config.lm.pserver_timeout_secs", &found);
process_server_timeout_msecs = REC_readInteger("proxy.config.lm.pserver_timeout_msecs", &found);
- proxy_name = REC_readString("proxy.config.proxy_name", &found);
- proxy_binary = REC_readString("proxy.config.proxy_binary", &found);
- proxy_options = REC_readString("proxy.config.proxy_binary_opts", &found);
- env_prep = REC_readString("proxy.config.env_prep", &found);
+ proxy_name = REC_readString("proxy.config.proxy_name", &found);
+ proxy_binary = REC_readString("proxy.config.proxy_binary", &found);
+ proxy_options = REC_readString("proxy.config.proxy_binary_opts", &found);
+ env_prep = REC_readString("proxy.config.env_prep", &found);
// Calculate proxy_binary from the absolute bin_path
absolute_proxy_binary = Layout::relative_to(bindir, proxy_binary);
@@ -251,8 +251,8 @@ LocalManager::LocalManager(bool proxy_on) : BaseManager(), run_proxy(proxy_on),
watched_process_pid = -1;
process_server_sockfd = -1;
- watched_process_fd = -1;
- proxy_launch_pid = -1;
+ watched_process_fd = -1;
+ proxy_launch_pid = -1;
return;
}
@@ -323,16 +323,16 @@ LocalManager::initCCom(const AppVersionInfo &version, FileManager *configFiles,
// Set the cluster ip addr variable so that proxy can read it
// and flush it to disk
const size_t envBuf_size = strlen(envVar) + strlen(clusterAddrStr) + 1;
- envBuf = (char *)ats_malloc(envBuf_size);
+ envBuf = (char *)ats_malloc(envBuf_size);
ink_strlcpy(envBuf, envVar, envBuf_size);
ink_strlcat(envBuf, clusterAddrStr, envBuf_size);
ink_release_assert(putenv(envBuf) == 0);
- ccom = new ClusterCom(ats_ip4_addr_cast(&cluster_ip), hostname, mcport, addr, rsport, rundir);
+ ccom = new ClusterCom(ats_ip4_addr_cast(&cluster_ip), hostname, mcport, addr, rsport, rundir);
virt_map = new VMap(intrName, ats_ip4_addr_cast(&cluster_ip), &lmgmt->ccom->mutex);
ccom->appVersionInfo = version;
- ccom->configFiles = configFiles;
+ ccom->configFiles = configFiles;
virt_map->appVersionInfo = version;
@@ -387,7 +387,7 @@ LocalManager::pollMgmtProcessServer()
while (1) {
// poll only
- timeout.tv_sec = process_server_timeout_secs;
+ timeout.tv_sec = process_server_timeout_secs;
timeout.tv_usec = process_server_timeout_msecs * 1000;
FD_ZERO(&fdlist);
FD_SET(process_server_sockfd, &fdlist);
@@ -419,7 +419,7 @@ LocalManager::pollMgmtProcessServer()
if (FD_ISSET(process_server_sockfd, &fdlist)) { /* New connection */
struct sockaddr_in clientAddr;
socklen_t clientLen = sizeof(clientAddr);
- int new_sockfd = mgmt_accept(process_server_sockfd, (struct sockaddr *)&clientAddr, &clientLen);
+ int new_sockfd = mgmt_accept(process_server_sockfd, (struct sockaddr *)&clientAddr, &clientLen);
mgmt_log(stderr, "[LocalManager::pollMgmtProcessServer] New process connecting fd '%d'\n", new_sockfd);
@@ -503,7 +503,7 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
watched_process_pid = *((pid_t *)data_raw);
lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_PROXY_PROCESS_BORN, NULL);
proxy_running++;
- proxy_launch_pid = -1;
+ proxy_launch_pid = -1;
proxy_launch_outstanding = false;
RecSetRecordInt("proxy.node.proxy_running", 1, REC_SOURCE_DEFAULT);
break;
@@ -598,9 +598,9 @@ LocalManager::handleMgmtMsgFromProcesses(MgmtMessageHdr *mh)
// Congestion Control - end
case MGMT_SIGNAL_CONFIG_FILE_CHILD: {
static const MgmtMarshallType fields[] = {MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING, MGMT_MARSHALL_INT};
- char *parent = NULL;
- char *child = NULL;
- MgmtMarshallInt options = 0;
+ char *parent = NULL;
+ char *child = NULL;
+ MgmtMarshallInt options = 0;
if (mgmt_message_parse(data_raw, mh->data_len, fields, countof(fields), &parent, &child, &options) != -1) {
configFiles->configFileChild(parent, child, (unsigned int)options);
} else {
@@ -632,8 +632,8 @@ LocalManager::sendMgmtMsgToProcesses(int msg_id, const char *data_raw, int data_
{
MgmtMessageHdr *mh;
- mh = (MgmtMessageHdr *)alloca(sizeof(MgmtMessageHdr) + data_len);
- mh->msg_id = msg_id;
+ mh = (MgmtMessageHdr *)alloca(sizeof(MgmtMessageHdr) + data_len);
+ mh->msg_id = msg_id;
mh->data_len = data_len;
memcpy((char *)mh + sizeof(MgmtMessageHdr), data_raw, data_len);
sendMgmtMsgToProcesses(mh);
@@ -670,7 +670,7 @@ LocalManager::sendMgmtMsgToProcesses(MgmtMessageHdr *mh)
char *data_raw;
data_raw = (char *)mh + sizeof(MgmtMessageHdr);
- fname = REC_readString(data_raw, &found);
+ fname = REC_readString(data_raw, &found);
RecT rec_type;
if (RecGetRecordType(data_raw, &rec_type) == REC_ERR_OKAY && rec_type == RECT_CONFIG) {
@@ -698,16 +698,16 @@ LocalManager::sendMgmtMsgToProcesses(MgmtMessageHdr *mh)
// Also, ensure that this whole thing is done only once because there will be a
// deluge of message in the traffic.log otherwise
- static pid_t check_prev_pid = watched_process_pid;
+ static pid_t check_prev_pid = watched_process_pid;
static pid_t check_current_pid = watched_process_pid;
if (check_prev_pid != watched_process_pid) {
- check_prev_pid = watched_process_pid;
+ check_prev_pid = watched_process_pid;
check_current_pid = watched_process_pid;
}
if (check_prev_pid == check_current_pid) {
check_current_pid = -1;
- int lerrno = errno;
+ int lerrno = errno;
mgmt_elog(stderr, errno, "[LocalManager::sendMgmtMsgToProcesses] Error writing message\n");
if (lerrno == ECONNRESET || lerrno == EPIPE) { // Connection closed by peer or Broken pipe
if ((kill(watched_process_pid, 0) < 0) && (errno == ESRCH)) {
@@ -771,8 +771,8 @@ LocalManager::signalEvent(int msg_id, const char *data_raw, int data_len)
{
MgmtMessageHdr *mh;
- mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
- mh->msg_id = msg_id;
+ mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
+ mh->msg_id = msg_id;
mh->data_len = data_len;
memcpy((char *)mh + sizeof(MgmtMessageHdr), data_raw, data_len);
ink_assert(enqueue(mgmt_event_queue, mh));
@@ -795,7 +795,7 @@ LocalManager::processEventQueue()
handled_by_mgmt = false;
MgmtMessageHdr *mh = (MgmtMessageHdr *)dequeue(mgmt_event_queue);
- char *data_raw = (char *)mh + sizeof(MgmtMessageHdr);
+ char *data_raw = (char *)mh + sizeof(MgmtMessageHdr);
// check if we have a local file update
if (mh->msg_id == MGMT_EVENT_CONFIG_FILE_UPDATE || mh->msg_id == MGMT_EVENT_CONFIG_FILE_UPDATE_NO_INC_VERSION) {
@@ -884,9 +884,9 @@ LocalManager::startProxy()
mgmt_elog(stderr, errno, "[LocalManager::startProxy] Unable to fork1 process\n");
return false;
} else if (pid > 0) { /* Parent */
- proxy_launch_pid = pid;
+ proxy_launch_pid = pid;
proxy_launch_outstanding = true;
- proxy_started_at = time(NULL);
+ proxy_started_at = time(NULL);
++proxy_launch_count;
RecSetRecordInt("proxy.node.restarts.proxy.start_time", proxy_started_at, REC_SOURCE_DEFAULT);
RecSetRecordInt("proxy.node.restarts.proxy.restart_count", proxy_launch_count, REC_SOURCE_DEFAULT);
@@ -930,9 +930,9 @@ LocalManager::startProxy()
Debug("lm", "[LocalManager::startProxy] Launching %s with options '%s'\n", absolute_proxy_binary, &real_proxy_options[0]);
ink_zero(options);
- options[0] = absolute_proxy_binary;
- i = 1;
- tok = strtok_r(&real_proxy_options[0], " ", &last);
+ options[0] = absolute_proxy_binary;
+ i = 1;
+ tok = strtok_r(&real_proxy_options[0], " ", &last);
options[i++] = tok;
while (i < 32 && (tok = strtok_r(NULL, " ", &last))) {
Debug("lm", "opt %d = '%s'\n", i, tok);
@@ -985,7 +985,7 @@ LocalManager::listenForProxy()
// read backlong configuration value and overwrite the default value if found
bool found;
RecInt backlog = REC_readInteger("proxy.config.net.listen_backlog", &found);
- backlog = (found && backlog >= 0) ? backlog : ats_tcp_somaxconn();
+ backlog = (found && backlog >= 0) ? backlog : ats_tcp_somaxconn();
if ((listen(p.m_fd, backlog)) < 0) {
mgmt_fatal(stderr, errno, "[LocalManager::listenForProxy] Unable to listen on port: %d (%s)\n", p.m_port,
@@ -1003,7 +1003,7 @@ LocalManager::listenForProxy()
void
LocalManager::bindProxyPort(HttpProxyPort &port)
{
- int one = 1;
+ int one = 1;
int priv = (port.m_port < 1024 && 0 != geteuid()) ? ElevateAccess::LOW_PORT_PRIVILEGE : 0;
ElevateAccess access(priv);
diff --git a/mgmt/MgmtDefs.h b/mgmt/MgmtDefs.h
index 8dde7b9..52b52be 100644
--- a/mgmt/MgmtDefs.h
+++ b/mgmt/MgmtDefs.h
@@ -47,11 +47,11 @@ typedef float MgmtFloat;
typedef char *MgmtString;
typedef enum {
- MGMT_INVALID = -1,
- MGMT_INT = 0,
- MGMT_FLOAT = 1,
- MGMT_STRING = 2,
- MGMT_COUNTER = 3,
+ MGMT_INVALID = -1,
+ MGMT_INT = 0,
+ MGMT_FLOAT = 1,
+ MGMT_STRING = 2,
+ MGMT_COUNTER = 3,
MGMT_TYPE_MAX = 4,
} MgmtType;
diff --git a/mgmt/MultiFile.cc b/mgmt/MultiFile.cc
index d83447d..4782cc9 100644
--- a/mgmt/MultiFile.cc
+++ b/mgmt/MultiFile.cc
@@ -46,7 +46,7 @@
MultiFile::MultiFile()
{
- managedDir = NULL;
+ managedDir = NULL;
dirDescript = NULL;
}
@@ -61,9 +61,9 @@ MultiFile::addTableEntries(ExpandingArray *fileList, textBuffer *output)
fileEntry *current;
char *safeName;
char dateBuf[64];
- const char dataOpen[] = "\t<td>";
+ const char dataOpen[] = "\t<td>";
const char dataClose[] = "</td>\n";
- const int dataOpenLen = strlen(dataOpen);
+ const int dataOpenLen = strlen(dataOpen);
const int dataCloseLen = strlen(dataClose);
for (int i = 0; i < numFiles; i++) {
@@ -117,8 +117,8 @@ MultiFile::WalkFiles(ExpandingArray *fileList)
while (readdir_r(dir, dirEntry, &result) == 0) {
if (!result)
break;
- fileName = dirEntry->d_name;
- filePath = newPathString(managedDir, fileName);
+ fileName = dirEntry->d_name;
+ filePath = newPathString(managedDir, fileName);
records_config_filePath = newPathString(filePath, "records.config");
if (stat(filePath, &fileInfo) < 0) {
mgmt_log(stderr, "[MultiFile::WalkFiles] Stat of a %s failed %s: %s\n", dirDescript, fileName, strerror(errno));
@@ -130,7 +130,7 @@ MultiFile::WalkFiles(ExpandingArray *fileList)
}
// Ignore ., .., and any dot files
if (*fileName != '.' && isManaged(fileName)) {
- fileListEntry = (fileEntry *)ats_malloc(sizeof(fileEntry));
+ fileListEntry = (fileEntry *)ats_malloc(sizeof(fileEntry));
fileListEntry->c_time = fileInfo.st_ctime;
ink_strlcpy(fileListEntry->name, fileName, sizeof(fileListEntry->name));
fileList->addEntry(fileListEntry);
@@ -160,9 +160,9 @@ MultiFile::isManaged(const char *fileName)
void
MultiFile::addSelectOptions(textBuffer *output, ExpandingArray *options)
{
- const char selectEnd[] = "</select>\n";
- const char option[] = "\t<option value='";
- const int optionLen = strlen(option);
+ const char selectEnd[] = "</select>\n";
+ const char option[] = "\t<option value='";
+ const int optionLen = strlen(option);
const char option_end[] = "'>";
char *safeCurrent;
@@ -218,7 +218,7 @@ MultiFile::newPathString(const char *s1, const char *s2)
// Treat null as an empty path.
if (!s2)
- s2 = "";
+ s2 = "";
addLen = strlen(s2) + 1;
if (*s2 == '/') {
// If addpath is rooted, then rootpath is unused.
diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index 87f76f9..4eaeed0 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -76,7 +76,7 @@ ProcessManager::ProcessManager(bool rlm) : BaseManager(), require_lm(rlm), local
// Making the process_manager thread a spinning thread to start traffic server
// as quickly as possible. Will reset this timeout when reconfigure()
timeout = 0;
- pid = getpid();
+ pid = getpid();
} /* End ProcessManager::ProcessManager */
void
@@ -95,8 +95,8 @@ ProcessManager::signalConfigFileChild(const char *parent, const char *child, uns
static const MgmtMarshallType fields[] = {MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING, MGMT_MARSHALL_INT};
MgmtMarshallInt mgmtopt = options;
- size_t len = mgmt_message_length(fields, countof(fields), &parent, &child, &mgmtopt);
- void *buffer = ats_malloc(len);
+ size_t len = mgmt_message_length(fields, countof(fields), &parent, &child, &mgmtopt);
+ void *buffer = ats_malloc(len);
mgmt_message_marshall(buffer, len, fields, countof(fields), &parent, &child, &mgmtopt);
signalManager(MGMT_SIGNAL_CONFIG_FILE_CHILD, (const char *)buffer, len);
@@ -116,8 +116,8 @@ ProcessManager::signalManager(int msg_id, const char *data_raw, int data_len)
{
MgmtMessageHdr *mh;
- mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
- mh->msg_id = msg_id;
+ mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
+ mh->msg_id = msg_id;
mh->data_len = data_len;
memcpy((char *)mh + sizeof(MgmtMessageHdr), data_raw, data_len);
ink_assert(enqueue(mgmt_signal_queue, mh));
@@ -206,9 +206,9 @@ ProcessManager::initLMConnection()
(const char *)sockpath);
}
- data_len = sizeof(pid_t);
- mh_full = (MgmtMessageHdr *)alloca(sizeof(MgmtMessageHdr) + data_len);
- mh_full->msg_id = MGMT_SIGNAL_PID;
+ data_len = sizeof(pid_t);
+ mh_full = (MgmtMessageHdr *)alloca(sizeof(MgmtMessageHdr) + data_len);
+ mh_full->msg_id = MGMT_SIGNAL_PID;
mh_full->data_len = data_len;
memcpy((char *)mh_full + sizeof(MgmtMessageHdr), &(pid), data_len);
if (mgmt_write_pipe(local_manager_sockfd, (char *)mh_full, sizeof(MgmtMessageHdr) + data_len) <= 0) {
@@ -237,7 +237,7 @@ ProcessManager::pollLMConnection()
} else if (num > 0) { /* We have a message */
if ((res = mgmt_read_pipe(local_manager_sockfd, (char *)&mh_hdr, sizeof(MgmtMessageHdr))) > 0) {
size_t mh_full_size = sizeof(MgmtMessageHdr) + mh_hdr.data_len;
- mh_full = (MgmtMessageHdr *)ats_malloc(mh_full_size);
+ mh_full = (MgmtMessageHdr *)ats_malloc(mh_full_size);
memcpy(mh_full, &mh_hdr, sizeof(MgmtMessageHdr));
data_raw = (char *)mh_full + sizeof(MgmtMessageHdr);
diff --git a/mgmt/ProxyConfig.cc b/mgmt/ProxyConfig.cc
index b3a92fa..59d3785 100644
--- a/mgmt/ProxyConfig.cc
+++ b/mgmt/ProxyConfig.cc
@@ -65,7 +65,7 @@ config_long_long_cb(void *data, void *value)
void *
config_string_alloc_cb(void *data, void *value)
{
- char *_ss = (char *)value;
+ char *_ss = (char *)value;
char *_new_value = 0;
//#define DEBUG_CONFIG_STRING_UPDATE
@@ -74,12 +74,12 @@ config_string_alloc_cb(void *data, void *value)
#endif
int len = -1;
if (_ss) {
- len = strlen(_ss);
+ len = strlen(_ss);
_new_value = (char *)ats_malloc(len + 1);
memcpy(_new_value, _ss, len + 1);
}
- char *_temp2 = *(char **)data;
+ char *_temp2 = *(char **)data;
*(char **)data = _new_value;
// free old data
@@ -178,7 +178,7 @@ ConfigProcessor::get(unsigned int id)
return NULL;
}
- idx = id - 1;
+ idx = id - 1;
info = infos[idx];
// Hand out a refcount to the caller. We should still have out
@@ -213,8 +213,8 @@ ConfigProcessor::release(unsigned int id, ConfigInfo *info)
#if TS_HAS_TESTS
enum {
- REGRESSION_CONFIG_FIRST = 1, // last config in a sequence
- REGRESSION_CONFIG_LAST = 2, // last config in a sequence
+ REGRESSION_CONFIG_FIRST = 1, // last config in a sequence
+ REGRESSION_CONFIG_LAST = 2, // last config in a sequence
REGRESSION_CONFIG_SINGLE = 4, // single-owner config
};
@@ -302,7 +302,7 @@ EXCLUSIVE_REGRESSION_TEST(ProxyConfig_Set)(RegressionTest *test, int /* atype AT
{
int configid = 0;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
RegressionConfig::nobjects = 0;
configid = configProcessor.set(configid, new RegressionConfig(test, pstatus, REGRESSION_CONFIG_FIRST), 1);
@@ -337,12 +337,12 @@ EXCLUSIVE_REGRESSION_TEST(ProxyConfig_Release)(RegressionTest *test, int /* atyp
int configid = 0;
RegressionConfig *config;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
RegressionConfig::nobjects = 0;
// Set an initial config, then get it back to hold a reference count.
configid = configProcessor.set(configid, new RegressionConfig(test, pstatus, REGRESSION_CONFIG_LAST), 1);
- config = (RegressionConfig *)configProcessor.get(configid);
+ config = (RegressionConfig *)configProcessor.get(configid);
// Now update the config a few times.
configid = configProcessor.set(configid, new RegressionConfig(test, pstatus, REGRESSION_CONFIG_FIRST), 1);
diff --git a/mgmt/RecordsConfigUtils.cc b/mgmt/RecordsConfigUtils.cc
index 3dc776e..cdacc79 100644
--- a/mgmt/RecordsConfigUtils.cc
+++ b/mgmt/RecordsConfigUtils.cc
@@ -65,8 +65,8 @@ RecordsConfigOverrideFromEnvironment()
static void
initialize_record(const RecordElement *record, void *)
{
- RecInt tempInt = 0;
- RecFloat tempFloat = 0.0;
+ RecInt tempInt = 0;
+ RecFloat tempFloat = 0.0;
RecCounter tempCounter = 0;
RecUpdateT update;
@@ -75,14 +75,14 @@ initialize_record(const RecordElement *record, void *)
RecT type;
// Less typing ...
- type = record->type;
+ type = record->type;
update = record->update;
- check = record->check;
+ check = record->check;
access = record->access;
if (REC_TYPE_IS_CONFIG(type)) {
const char *value = RecConfigOverrideFromEnvironment(record->name, record->value);
- RecData data = {0};
+ RecData data = {0};
RecSourceT source = value == record->value ? REC_SOURCE_DEFAULT : REC_SOURCE_ENV;
// If you specify a consistency check, you have to specify a regex expression. We abort here
diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index aa68566..ff1e7ed 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -77,7 +77,7 @@ Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *pa
// Copy the file name.
fileNameLen = strlen(fileName_);
- fileName = ats_strdup(fileName_);
+ fileName = ats_strdup(fileName_);
// Extract the file base name.
fileBaseName = strrchr(fileName, '/');
@@ -108,7 +108,7 @@ Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *pa
}
currentVersion = 0; // Prevent UMR with stat file
- highestSeen = findVersions_ml(versionQ);
+ highestSeen = findVersions_ml(versionQ);
// Check to make sure that our configuratio file exists
//
@@ -127,7 +127,7 @@ Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *pa
if (highestSeen > 0) {
highestSeenStr = createPathStr(highestSeen);
- activeVerStr = createPathStr(ACTIVE_VERSION);
+ activeVerStr = createPathStr(ACTIVE_VERSION);
if (rename(highestSeenStr, activeVerStr) < 0) {
mgmt_log(stderr, "[RollBack::Rollback] Automatic Rollback to prior version failed for %s : %s\n", fileName,
@@ -173,12 +173,12 @@ Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *pa
}
} else {
fileLastModified = TS_ARCHIVE_STAT_MTIME(fileInfo);
- currentVersion = highestSeen + 1;
+ currentVersion = highestSeen + 1;
// Make sure that we have a backup of the file
if (highestSeen == 0) {
textBuffer *version0 = NULL;
- char failStr[] = "[Rollback::Rollback] Automatic Roll of Version 1 failed: %s";
+ char failStr[] = "[Rollback::Rollback] Automatic Roll of Version 1 failed: %s";
if (getVersion_ml(ACTIVE_VERSION, &version0) != OK_ROLLBACK) {
mgmt_log(stderr, failStr, fileName);
} else {
@@ -201,7 +201,7 @@ Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *pa
if (testFD < 0) {
// We failed to open read-write
alarmMsg = (char *)ats_malloc(2048);
- testFD = openFile(ACTIVE_VERSION, O_RDONLY, &testErrno);
+ testFD = openFile(ACTIVE_VERSION, O_RDONLY, &testErrno);
if (testFD < 0) {
// We are unable to either read or write the file
@@ -234,11 +234,11 @@ Rollback::~Rollback()
char *
Rollback::createPathStr(version_t version)
{
- int bufSize = 0;
+ int bufSize = 0;
char *buffer = NULL;
ats_scoped_str sysconfdir(RecConfigReadConfigDir());
bufSize = strlen(sysconfdir) + fileNameLen + MAX_VERSION_DIGITS + 1;
- buffer = (char *)ats_malloc(bufSize);
+ buffer = (char *)ats_malloc(bufSize);
Layout::get()->relative_to(buffer, bufSize, sysconfdir, fileName);
if (version != ACTIVE_VERSION) {
size_t pos = strlen(buffer);
@@ -379,7 +379,7 @@ Rollback::internalUpdate(textBuffer *buf, version_t newVersion, bool notifyChang
versionInfo *toRemove;
versionInfo *newBak;
bool failedLink = false;
- char *alarmMsg = NULL;
+ char *alarmMsg = NULL;
// Check to see if the callee has specified a newVersion number
// If the newVersion argument is less than zero, the callee
@@ -402,8 +402,8 @@ Rollback::internalUpdate(textBuffer *buf, version_t newVersion, bool notifyChang
newVersion);
currentVersion_local = createPathStr(this->currentVersion);
- activeVersion = createPathStr(ACTIVE_VERSION);
- nextVersion = createPathStr(newVersion);
+ activeVersion = createPathStr(ACTIVE_VERSION);
+ nextVersion = createPathStr(newVersion);
// Create the new configuration file
// TODO: Make sure they are not created in Sysconfigdir!
diskFD = openFile(newVersion, O_WRONLY | O_CREAT | O_TRUNC);
@@ -416,7 +416,7 @@ Rollback::internalUpdate(textBuffer *buf, version_t newVersion, bool notifyChang
}
// Write the buffer into the new configuration file
writeBytes = write(diskFD, buf->bufPtr(), buf->spaceUsed());
- ret = closeFile(diskFD, true);
+ ret = closeFile(diskFD, true);
if ((ret < 0) || ((size_t)writeBytes != buf->spaceUsed())) {
mgmt_log(stderr, "[Rollback::internalUpdate] Unable to write new version of %s : %s\n", fileName, strerror(errno));
returnCode = SYS_CALL_ERROR_ROLLBACK;
@@ -467,7 +467,7 @@ Rollback::internalUpdate(textBuffer *buf, version_t newVersion, bool notifyChang
// If we created a backup version add it to the
// List of backup Versions
if (failedLink == false) {
- newBak = new versionInfo;
+ newBak = new versionInfo;
newBak->version = this->currentVersion;
newBak->modTime = 0;
versionQ.enqueue(newBak);
@@ -644,7 +644,7 @@ Rollback::findVersions(ExpandingArray *listNames)
version_t
Rollback::findVersions_ml(ExpandingArray *listNames)
{
- int count = 0;
+ int count = 0;
version_t highestSeen = 0, version = 0;
ats_scoped_str sysconfdir(RecConfigReadConfigDir());
@@ -724,7 +724,7 @@ Rollback::extractVersionInfo(ExpandingArray *listNames, const char *testFileName
versionInfo *verInfo;
if (statFile(version, &fileInfo) >= 0) {
- verInfo = (versionInfo *)ats_malloc(sizeof(versionInfo));
+ verInfo = (versionInfo *)ats_malloc(sizeof(versionInfo));
verInfo->version = version;
verInfo->modTime = fileInfo.st_mtime;
listNames->addEntry((void *)verInfo);
@@ -756,7 +756,7 @@ Rollback::findVersions_ml(Queue<versionInfo> &q)
// Get the version info and sort it
highest = this->findVersions_ml(&versions);
- num = versions.getNumEntries();
+ num = versions.getNumEntries();
versions.sortWithFunction(versionCmp);
// Add the entries on to our passed in q
@@ -764,7 +764,7 @@ Rollback::findVersions_ml(Queue<versionInfo> &q)
foundVer = (versionInfo *)versions[i];
// We need to create our own copy so that
// constructor gets run
- addInfo = new versionInfo;
+ addInfo = new versionInfo;
addInfo->version = foundVer->version;
addInfo->modTime = foundVer->modTime;
q.enqueue(addInfo);
@@ -791,7 +791,7 @@ Rollback::removeVersion_ml(version_t version)
struct stat statInfo;
char *versionPath;
versionInfo *removeInfo = NULL;
- bool infoFound = false;
+ bool infoFound = false;
if (this->statFile(version, &statInfo) < 0) {
mgmt_log(stderr, "[Rollback::removeVersion] Stat failed on %s version %d\n", fileName, version);
@@ -917,7 +917,7 @@ Rollback::checkForUserUpdate(RollBackCheckType how)
if (how == ROLLBACK_CHECK_AND_UPDATE) {
// We've been modified, Roll a new version
currentVersion_local = this->getCurrentVersion();
- r = this->getVersion_ml(currentVersion_local, &buf);
+ r = this->getVersion_ml(currentVersion_local, &buf);
if (r == OK_ROLLBACK) {
r = this->updateVersion_ml(buf, currentVersion_local);
delete buf;
diff --git a/mgmt/WebMgmtUtils.cc b/mgmt/WebMgmtUtils.cc
index 2392102..bc515e2 100644
--- a/mgmt/WebMgmtUtils.cc
+++ b/mgmt/WebMgmtUtils.cc
@@ -54,8 +54,8 @@ bool
varSetFromStr(const char *varName, const char *value)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int err = REC_ERR_FAIL;
+ bool found = true;
+ int err = REC_ERR_FAIL;
RecData data;
memset(&data, 0, sizeof(RecData));
@@ -123,8 +123,8 @@ bool
varSetFloat(const char *varName, RecFloat value, bool convert)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int err = REC_ERR_FAIL;
+ bool found = true;
+ int err = REC_ERR_FAIL;
err = RecGetRecordDataType((char *)varName, &varDataType);
if (err != REC_ERR_OKAY) {
@@ -169,8 +169,8 @@ bool
varSetCounter(const char *varName, RecCounter value, bool convert)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int err = REC_ERR_FAIL;
+ bool found = true;
+ int err = REC_ERR_FAIL;
err = RecGetRecordDataType((char *)varName, &varDataType);
if (err != REC_ERR_OKAY) {
@@ -214,8 +214,8 @@ bool
varSetInt(const char *varName, RecInt value, bool convert)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int err = REC_ERR_FAIL;
+ bool found = true;
+ int err = REC_ERR_FAIL;
err = RecGetRecordDataType((char *)varName, &varDataType);
if (err != REC_ERR_OKAY) {
@@ -300,8 +300,8 @@ bool
varCounterFromName(const char *varName, RecCounter *value)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int err = REC_ERR_FAIL;
+ bool found = true;
+ int err = REC_ERR_FAIL;
err = RecGetRecordDataType((char *)varName, &varDataType);
@@ -331,7 +331,7 @@ varCounterFromName(const char *varName, RecCounter *value)
case RECD_NULL:
default:
*value = -1;
- found = false;
+ found = false;
break;
}
@@ -349,7 +349,7 @@ bool
varFloatFromName(const char *varName, RecFloat *value)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
+ bool found = true;
int err = REC_ERR_FAIL;
@@ -381,7 +381,7 @@ varFloatFromName(const char *varName, RecFloat *value)
case RECD_NULL:
default:
*value = -1.0;
- found = false;
+ found = false;
break;
}
@@ -399,8 +399,8 @@ bool
varIntFromName(const char *varName, RecInt *value)
{
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int err = REC_ERR_FAIL;
+ bool found = true;
+ int err = REC_ERR_FAIL;
err = RecGetRecordDataType((char *)varName, &varDataType);
@@ -430,7 +430,7 @@ varIntFromName(const char *varName, RecInt *value)
case RECD_NULL:
default:
*value = -1;
- found = false;
+ found = false;
break;
}
@@ -473,8 +473,8 @@ commaStrFromInt(RecInt bytes, char *bufVal)
}
numCommas = (len - 1) / 3;
- curPtr = bufVal + (len + numCommas);
- *curPtr = '\0';
+ curPtr = bufVal + (len + numCommas);
+ *curPtr = '\0';
curPtr--;
for (int i = 0; i < len; i++) {
@@ -513,7 +513,7 @@ MbytesFromInt(RecInt bytes, char *bufVal)
void
bytesFromInt(RecInt bytes, char *bufVal)
{
- const int64_t gb = 1073741824;
+ const int64_t gb = 1073741824;
const long int mb = 1048576;
const long int kb = 1024;
int bytesP;
@@ -558,11 +558,11 @@ bytesFromInt(RecInt bytes, char *bufVal)
bool
varStrFromName(const char *varNameConst, char *bufVal, int bufLen)
{
- char *varName = NULL;
+ char *varName = NULL;
RecDataT varDataType = RECD_NULL;
- bool found = true;
- int varNameLen = 0;
- char formatOption = '\0';
+ bool found = true;
+ int varNameLen = 0;
+ char formatOption = '\0';
RecData data;
int err = REC_ERR_FAIL;
@@ -575,7 +575,7 @@ varStrFromName(const char *varNameConst, char *bufVal, int bufLen)
/// b - bytes. Ints and Counts only. Amounts are
// transformed into one of GB, MB, KB, or B
//
- varName = ats_strdup(varNameConst);
+ varName = ats_strdup(varNameConst);
varNameLen = strlen(varName);
if (varNameLen > 3 && varName[varNameLen - 2] == '\\') {
formatOption = varName[varNameLen - 1];
@@ -813,7 +813,7 @@ processFormSubmission(char *submission)
}
submission_copy = ats_strdup(submission);
- numUpdates = updates.Initialize(submission_copy, SHARE_TOKS);
+ numUpdates = updates.Initialize(submission_copy, SHARE_TOKS);
for (int i = 0; i < numUpdates; i++) {
pairNum = pair.Initialize(updates[i]);
@@ -871,7 +871,7 @@ processFormSubmission_noSubstitute(char *submission)
}
submission_copy = ats_strdup(submission);
- numUpdates = updates.Initialize(submission_copy, SHARE_TOKS);
+ numUpdates = updates.Initialize(submission_copy, SHARE_TOKS);
for (int i = 0; i < numUpdates; i++) {
pairNum = pair.Initialize(updates[i]);
@@ -906,9 +906,9 @@ processFormSubmission_noSubstitute(char *submission)
int
convertHtmlToUnix(char *buffer)
{
- char *read = buffer;
+ char *read = buffer;
char *write = buffer;
- int numSub = 0;
+ int numSub = 0;
while (*read != '\0') {
if (*read == '\015') {
@@ -933,7 +933,7 @@ convertHtmlToUnix(char *buffer)
int
substituteUnsafeChars(char *buffer)
{
- char *read = buffer;
+ char *read = buffer;
char *write = buffer;
char subStr[3];
long charVal;
@@ -944,8 +944,8 @@ substituteUnsafeChars(char *buffer)
if (*read == '%') {
subStr[0] = *(++read);
subStr[1] = *(++read);
- charVal = strtol(subStr, (char **)NULL, 16);
- *write = (char)charVal;
+ charVal = strtol(subStr, (char **)NULL, 16);
+ *write = (char)charVal;
read++;
write++;
numSub++;
@@ -971,15 +971,15 @@ substituteUnsafeChars(char *buffer)
char *
substituteForHTMLChars(const char *buffer)
{
- char *safeBuf; // the return "safe" character buffer
- char *safeCurrent; // where we are in the return buffer
- const char *inCurrent = buffer; // where we are in the original buffer
- int inLength = strlen(buffer); // how long the orig buffer in
+ char *safeBuf; // the return "safe" character buffer
+ char *safeCurrent; // where we are in the return buffer
+ const char *inCurrent = buffer; // where we are in the original buffer
+ int inLength = strlen(buffer); // how long the orig buffer in
// Maximum character expansion is one to three
unsigned int bufferToAllocate = (inLength * 5) + 1;
- safeBuf = new char[bufferToAllocate];
- safeCurrent = safeBuf;
+ safeBuf = new char[bufferToAllocate];
+ safeCurrent = safeBuf;
while (*inCurrent != '\0') {
switch (*inCurrent) {
@@ -1090,8 +1090,8 @@ setHostnameVar()
void
appendDefaultDomain(char *hostname, int bufLength)
{
- int len = strlen(hostname);
- const char msg[] = "Nodes will be know by their unqualified host name";
+ int len = strlen(hostname);
+ const char msg[] = "Nodes will be know by their unqualified host name";
static int error_before = 0; // Race ok since effect is multple error msg
ink_assert(len < bufLength);
@@ -1196,7 +1196,7 @@ recordRangeCheck(const char *pattern, const char *value)
if (dashTok.Initialize(++p, COPY_TOKS) == 2) {
l_limit = atoi(dashTok[0]);
u_limit = atoi(dashTok[1]);
- val = atoi(value);
+ val = atoi(value);
if (val >= l_limit && val <= u_limit) {
return true;
}
@@ -1307,7 +1307,7 @@ getFilesInDirectory(char *managedDir, ExpandingArray *fileList)
} else {
// Ignore ., .., and any dot files
if (fileName && *fileName != '.') {
- fileListEntry = (fileEntry *)ats_malloc(sizeof(fileEntry));
+ fileListEntry = (fileEntry *)ats_malloc(sizeof(fileEntry));
fileListEntry->c_time = fileInfo.st_ctime;
ink_strlcpy(fileListEntry->name, fileName, sizeof(fileListEntry->name));
fileList->addEntry(fileListEntry);
@@ -1337,7 +1337,7 @@ newPathString(const char *s1, const char *s2)
// Treat null as an empty path.
if (!s2)
- s2 = "";
+ s2 = "";
addLen = strlen(s2) + 1;
if (*s2 == '/') {
// If addpath is rooted, then rootpath is unused.
diff --git a/mgmt/api/APITestCliRemote.cc b/mgmt/api/APITestCliRemote.cc
index a6a38e7..40a11ad 100644
--- a/mgmt/api/APITestCliRemote.cc
+++ b/mgmt/api/APITestCliRemote.cc
@@ -1010,8 +1010,8 @@ test_records()
TSActionNeedT action;
char *rec_value;
char new_str[] = "new_record_value";
- TSInt port1, port2, new_port = 52432;
- TSFloat flt1, flt2, new_flt = 1.444;
+ TSInt port1, port2, new_port = 52432;
+ TSFloat flt1, flt2, new_flt = 1.444;
TSCounter ctr1, ctr2, new_ctr = 6666;
TSMgmtError err;
@@ -1211,25 +1211,25 @@ test_record_get_mlt(void)
TSMgmtError ret;
name_list = TSStringListCreate();
- rec_list = TSListCreate();
+ rec_list = TSListCreate();
const size_t v1_size = (sizeof(char) * (strlen("proxy.config.proxy_name") + 1));
- v1 = (char *)TSmalloc(v1_size);
+ v1 = (char *)TSmalloc(v1_size);
ink_strlcpy(v1, "proxy.config.proxy_name", v1_size);
const size_t v2_size = (sizeof(char) * (strlen("proxy.config.bin_path") + 1));
- v2 = (char *)TSmalloc(v2_size);
+ v2 = (char *)TSmalloc(v2_size);
ink_strlcpy(v2, "proxy.config.bin_path", v2_size);
const size_t v3_size = (sizeof(char) * (strlen("proxy.config.manager_binary") + 1));
- v3 = (char *)TSmalloc(v3_size);
+ v3 = (char *)TSmalloc(v3_size);
ink_strlcpy(v3, "proxy.config.manager_binary", v3_size);
const size_t v6_size = (sizeof(char) * (strlen("proxy.config.env_prep") + 1));
- v6 = (char *)TSmalloc(v6_size);
+ v6 = (char *)TSmalloc(v6_size);
ink_strlcpy(v6, "proxy.config.env_prep", v6_size);
const size_t v7_size = (sizeof(char) * (strlen("proxy.config.cop.core_signal") + 1));
- v7 = (char *)TSmalloc(v7_size);
+ v7 = (char *)TSmalloc(v7_size);
ink_strlcpy(v7, "proxy.config.cop.core_signal", v7_size);
const size_t v8_size = (sizeof(char) * (strlen("proxy.config.http.cache.fuzz.probability") + 1));
- v8 = (char *)TSmalloc(v8_size);
+ v8 = (char *)TSmalloc(v8_size);
ink_strlcpy(v8, "proxy.config.http.cache.fuzz.probability", v8_size);
// add the names to the get_list
@@ -1298,29 +1298,29 @@ test_record_set_mlt(void)
list = TSListCreate();
- ele1 = TSRecordEleCreate(); // TS_TYPE_UNDEFINED action
- ele1->rec_name = TSstrdup("proxy.config.cli_binary");
- ele1->rec_type = TS_REC_STRING;
+ ele1 = TSRecordEleCreate(); // TS_TYPE_UNDEFINED action
+ ele1->rec_name = TSstrdup("proxy.config.cli_binary");
+ ele1->rec_type = TS_REC_STRING;
ele1->valueT.string_val = TSstrdup(ele1->rec_name);
- ele2 = TSRecordEleCreate(); // reread action
- ele2->rec_name = TSstrdup("proxy.config.http.cache.fuzz.probability");
- ele2->rec_type = TS_REC_FLOAT;
+ ele2 = TSRecordEleCreate(); // reread action
+ ele2->rec_name = TSstrdup("proxy.config.http.cache.fuzz.probability");
+ ele2->rec_type = TS_REC_FLOAT;
ele2->valueT.float_val = 0.1234;
- ele3 = TSRecordEleCreate(); // undefined action
- ele3->rec_name = TSstrdup("proxy.config.cop.core_signal");
- ele3->rec_type = TS_REC_INT;
+ ele3 = TSRecordEleCreate(); // undefined action
+ ele3->rec_name = TSstrdup("proxy.config.cop.core_signal");
+ ele3->rec_type = TS_REC_INT;
ele3->valueT.int_val = -4;
- ele4 = TSRecordEleCreate(); // restart TM
- ele4->rec_name = (char *)TSstrdup("proxy.local.cluster.type");
- ele4->rec_type = TS_REC_INT;
+ ele4 = TSRecordEleCreate(); // restart TM
+ ele4->rec_name = (char *)TSstrdup("proxy.local.cluster.type");
+ ele4->rec_type = TS_REC_INT;
ele4->valueT.int_val = 2;
- ele5 = TSRecordEleCreate(); // reread action
- ele5->rec_name = (char *)TSstrdup("proxy.config.cluster.mc_ttl");
- ele5->rec_type = TS_REC_INT;
+ ele5 = TSRecordEleCreate(); // reread action
+ ele5->rec_name = (char *)TSstrdup("proxy.config.cluster.mc_ttl");
+ ele5->rec_type = TS_REC_INT;
ele5->valueT.int_val = 555;
TSListEnqueue(list, ele4);
@@ -1429,8 +1429,8 @@ void
test_read_file()
{
char *f_text = NULL;
- int f_size = -1;
- int f_ver = -1;
+ int f_size = -1;
+ int f_ver = -1;
printf("\n");
if (TSConfigFileRead(TS_FNAME_HOSTING, &f_text, &f_size, &f_ver) != TS_ERR_OKAY)
@@ -1450,11 +1450,11 @@ test_read_file()
void
test_write_file()
{
- char *f_text = NULL;
- int f_size = -1;
- int f_ver = -1;
+ char *f_text = NULL;
+ int f_size = -1;
+ int f_ver = -1;
char new_f_text[] = "blah, blah blah\n I hope this works. please!!! \n";
- int new_f_size = strlen(new_f_text);
+ int new_f_size = strlen(new_f_text);
printf("\n");
if (TSConfigFileWrite(TS_FNAME_HOSTING, new_f_text, new_f_size, -1) != TS_ERR_OKAY)
@@ -1683,10 +1683,10 @@ test_cfg_context_ops()
printf("\nappend new ele\n");
ele = TSVirtIpAddrEleCreate();
if (ele) {
- ele->ip_addr = TSstrdup("201.201.201.201");
- ele->intr = TSstrdup("appended");
+ ele->ip_addr = TSstrdup("201.201.201.201");
+ ele->intr = TSstrdup("appended");
ele->sub_intr = 201;
- err = TSCfgContextAppendEle(ctx, (TSCfgEle *)ele);
+ err = TSCfgContextAppendEle(ctx, (TSCfgEle *)ele);
if (err != TS_ERR_OKAY) {
printf("ERROR: append ele\n");
TSVirtIpAddrEleDestroy(ele);
@@ -1702,10 +1702,10 @@ test_cfg_context_ops()
printf("\nINSERT NEW ELE at %d index\n", insert_at);
ele = TSVirtIpAddrEleCreate();
if (ele) {
- ele->ip_addr = TSstrdup("101.101.101.101");
- ele->intr = (char *)TSstrdup("inserted");
+ ele->ip_addr = TSstrdup("101.101.101.101");
+ ele->intr = (char *)TSstrdup("inserted");
ele->sub_intr = 100;
- err = TSCfgContextInsertEleAt(ctx, (TSCfgEle *)ele, insert_at);
+ err = TSCfgContextInsertEleAt(ctx, (TSCfgEle *)ele, insert_at);
if (err != TS_ERR_OKAY) {
printf("ERROR: insert ele at index %d\n", insert_at);
TSVirtIpAddrEleDestroy(ele);
@@ -1769,7 +1769,7 @@ test_cfg_plugin()
// retrieve and modify ele
printf("test_cfg_plugin: modifying the first ele...\n");
cfg_ele = TSCfgContextGetEleAt(ctx, 0);
- ele = (TSPluginEle *)cfg_ele;
+ ele = (TSPluginEle *)cfg_ele;
if (ele) {
// free(ele->name);
ele->name = ats_strdup("change-plugin.so");
@@ -1818,7 +1818,7 @@ test_cfg_socks()
// retrieving an ele
printf("test_socks_set: modifying the fourth ele...\n");
cfg_ele = TSCfgContextGetEleAt(ctx, 3);
- ele = (TSSocksEle *)cfg_ele;
+ ele = (TSSocksEle *)cfg_ele;
if (ele) {
if (ele->rr != TS_RR_NONE)
ele->rr = TS_RR_FALSE;
@@ -1830,33 +1830,33 @@ test_cfg_socks()
// create new structs for new rules
TSIpAddrEle *ip1 = TSIpAddrEleCreate();
- ip1->type = TS_IP_SINGLE;
- ip1->ip_a = TSstrdup("1.1.1.1");
+ ip1->type = TS_IP_SINGLE;
+ ip1->ip_a = TSstrdup("1.1.1.1");
TSDomainList dlist = TSDomainListCreate();
- TSDomain *dom1 = TSDomainCreate();
- dom1->domain_val = TSstrdup("www.mucky.com");
- dom1->port = 8888;
+ TSDomain *dom1 = TSDomainCreate();
+ dom1->domain_val = TSstrdup("www.mucky.com");
+ dom1->port = 8888;
TSDomainListEnqueue(dlist, dom1);
- TSDomain *dom2 = TSDomainCreate();
+ TSDomain *dom2 = TSDomainCreate();
dom2->domain_val = TSstrdup("freakazoid.com");
- dom2->port = 2222;
+ dom2->port = 2222;
TSDomainListEnqueue(dlist, dom2);
- TSDomain *dom3 = TSDomainCreate();
+ TSDomain *dom3 = TSDomainCreate();
dom3->domain_val = TSstrdup("hong.kong.com");
- dom3->port = 3333;
+ dom3->port = 3333;
TSDomainListEnqueue(dlist, dom3);
// create and add new ele
printf("test_socks_set: appending a new ele...\n");
ele = TSSocksEleCreate(TS_TYPE_UNDEFINED);
if (ele) {
- ele->cfg_ele.type = TS_SOCKS_MULTIPLE;
- ele->dest_ip_addr = ip1;
+ ele->cfg_ele.type = TS_SOCKS_MULTIPLE;
+ ele->dest_ip_addr = ip1;
ele->socks_servers = dlist;
- ele->rr = TS_RR_STRICT;
+ ele->rr = TS_RR_STRICT;
TSCfgContextAppendEle(ctx, (TSCfgEle *)ele);
} else {
@@ -1889,7 +1889,7 @@ print_active_events()
printf("[print_active_events]\n");
events = TSListCreate();
- ret = TSActiveEventGetMlt(events);
+ ret = TSActiveEventGetMlt(events);
if (ret != TS_ERR_OKAY) {
print_err("TSActiveEventGetMlt", ret);
goto END;
@@ -2017,7 +2017,7 @@ print_snapshots()
char *name;
list = TSStringListCreate();
- err = TSSnapshotGetMlt(list);
+ err = TSSnapshotGetMlt(list);
print_err("TSSnapshotGetMlt", err);
printf("All Snapshots:\n");
diff --git a/mgmt/api/CfgContextImpl.cc b/mgmt/api/CfgContextImpl.cc
index cb93731..b77a6fe 100644
--- a/mgmt/api/CfgContextImpl.cc
+++ b/mgmt/api/CfgContextImpl.cc
@@ -39,7 +39,7 @@
//--------------------------------------------------------------------------
CommentObj::CommentObj(char *comment)
{
- m_ele = comment_ele_create(comment);
+ m_ele = comment_ele_create(comment);
m_valid = (comment ? true : false);
}
@@ -71,7 +71,7 @@ CommentObj::getCfgEleCopy()
//--------------------------------------------------------------------------
CacheObj::CacheObj(TSCacheEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -80,9 +80,9 @@ CacheObj::CacheObj(TSCacheEle *ele)
CacheObj::CacheObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSCacheEleCreate(TS_TYPE_UNDEFINED);
+ m_ele = TSCacheEleCreate(TS_TYPE_UNDEFINED);
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens) {
goto FORMAT_ERR;
@@ -115,7 +115,7 @@ CacheObj::CacheObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
CacheObj::~CacheObj()
@@ -250,7 +250,7 @@ CacheObj::getCfgEleCopy()
//--------------------------------------------------------------------------
CongestionObj::CongestionObj(TSCongestionEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -258,9 +258,9 @@ CongestionObj::CongestionObj(TSCongestionEle *ele)
CongestionObj::CongestionObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSCongestionEleCreate();
+ m_ele = TSCongestionEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens) {
goto FORMAT_ERR;
@@ -337,7 +337,7 @@ CongestionObj::CongestionObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
CongestionObj::~CongestionObj()
@@ -467,7 +467,7 @@ CongestionObj::getCfgEleCopy()
//--------------------------------------------------------------------------
HostingObj::HostingObj(TSHostingEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -476,9 +476,9 @@ HostingObj::HostingObj(TokenList *tokens)
{
Token *token;
- m_ele = TSHostingEleCreate();
+ m_ele = TSHostingEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || tokens->length != 2) {
goto FORMAT_ERR;
@@ -515,7 +515,7 @@ HostingObj::HostingObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
HostingObj::~HostingObj()
@@ -607,7 +607,7 @@ HostingObj::getCfgEleCopy()
//--------------------------------------------------------------------------
IcpObj::IcpObj(TSIcpEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -617,9 +617,9 @@ IcpObj::IcpObj(TokenList *tokens)
Token *token;
int i;
- m_ele = TSIcpEleCreate();
+ m_ele = TSIcpEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || tokens->length < 8) {
goto FORMAT_ERR;
@@ -715,7 +715,7 @@ IcpObj::IcpObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
IcpObj::~IcpObj()
@@ -842,7 +842,7 @@ IcpObj::getCfgEleCopy()
//--------------------------------------------------------------------------
IpAllowObj::IpAllowObj(TSIpAllowEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -851,9 +851,9 @@ IpAllowObj::IpAllowObj(TokenList *tokens)
{
Token *token;
- m_ele = TSIpAllowEleCreate();
+ m_ele = TSIpAllowEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || (tokens->length != 2)) {
goto FORMAT_ERR;
@@ -893,7 +893,7 @@ IpAllowObj::IpAllowObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
IpAllowObj::~IpAllowObj()
@@ -977,7 +977,7 @@ IpAllowObj::getCfgEleCopy()
//--------------------------------------------------------------------------
ParentProxyObj::ParentProxyObj(TSParentProxyEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -985,9 +985,9 @@ ParentProxyObj::ParentProxyObj(TSParentProxyEle *ele)
ParentProxyObj::ParentProxyObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSParentProxyEleCreate(TS_TYPE_UNDEFINED);
+ m_ele = TSParentProxyEleCreate(TS_TYPE_UNDEFINED);
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || tokens->length < 1) {
goto FORMAT_ERR;
@@ -1174,7 +1174,7 @@ ParentProxyObj::getCfgEleCopy()
//--------------------------------------------------------------------------
VolumeObj::VolumeObj(TSVolumeEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -1183,9 +1183,9 @@ VolumeObj::VolumeObj(TokenList *tokens)
{
Token *token;
- m_ele = TSVolumeEleCreate();
+ m_ele = TSVolumeEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || tokens->length != 3) {
goto FORMAT_ERR;
@@ -1228,7 +1228,7 @@ VolumeObj::VolumeObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
VolumeObj::~VolumeObj()
@@ -1320,7 +1320,7 @@ VolumeObj::getCfgEleCopy()
//--------------------------------------------------------------------------
PluginObj::PluginObj(TSPluginEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -1329,9 +1329,9 @@ PluginObj::PluginObj(TokenList *tokens)
{
Token *token;
- m_ele = TSPluginEleCreate();
+ m_ele = TSPluginEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || tokens->length < 1) {
goto FORMAT_ERR;
@@ -1362,7 +1362,7 @@ PluginObj::PluginObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
PluginObj::~PluginObj()
@@ -1418,7 +1418,7 @@ PluginObj::getCfgEleCopy()
//--------------------------------------------------------------------------
RemapObj::RemapObj(TSRemapEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -1431,9 +1431,9 @@ RemapObj::RemapObj(TokenList *tokens)
Tokenizer toTok(":/");
char buf[MAX_RULE_SIZE];
- m_ele = TSRemapEleCreate(TS_TYPE_UNDEFINED);
+ m_ele = TSRemapEleCreate(TS_TYPE_UNDEFINED);
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || ((tokens->length != 2) && (tokens->length != 3))) {
goto FORMAT_ERR;
@@ -1561,7 +1561,7 @@ RemapObj::RemapObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
RemapObj::~RemapObj()
@@ -1729,7 +1729,7 @@ RemapObj::getCfgEleCopy()
//--------------------------------------------------------------------------
SocksObj::SocksObj(TSSocksEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -1738,9 +1738,9 @@ SocksObj::SocksObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSSocksEleCreate(TS_TYPE_UNDEFINED);
+ m_ele = TSSocksEleCreate(TS_TYPE_UNDEFINED);
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens) {
goto FORMAT_ERR;
@@ -1767,7 +1767,7 @@ SocksObj::SocksObj(TokenList *tokens)
goto FORMAT_ERR;
}
if (tok && tok->name) {
- tok = tokens->next(tok);
+ tok = tokens->next(tok);
m_ele->password = ats_strdup(tok->name);
} else {
goto FORMAT_ERR;
@@ -1816,7 +1816,7 @@ SocksObj::SocksObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
SocksObj::~SocksObj()
@@ -1953,7 +1953,7 @@ SocksObj::getCfgEleCopy()
//--------------------------------------------------------------------------
SplitDnsObj::SplitDnsObj(TSSplitDnsEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -1962,9 +1962,9 @@ SplitDnsObj::SplitDnsObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSSplitDnsEleCreate();
+ m_ele = TSSplitDnsEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || (tokens->length > 6)) {
goto FORMAT_ERR;
@@ -1983,28 +1983,28 @@ SplitDnsObj::SplitDnsObj(TokenList *tokens)
goto FORMAT_ERR;
}
m_ele->pd_type = TS_PD_DOMAIN;
- m_ele->pd_val = ats_strdup(tok->value);
+ m_ele->pd_val = ats_strdup(tok->value);
} else if (strcmp(tok->name, "dest_host") == 0) {
if ((m_ele->pd_type != TS_PD_UNDEFINED) || (m_ele->pd_val != NULL) || (!tok->value)) {
// fields are already defined!!
goto FORMAT_ERR;
}
m_ele->pd_type = TS_PD_HOST;
- m_ele->pd_val = ats_strdup(tok->value);
+ m_ele->pd_val = ats_strdup(tok->value);
} else if (strcmp(tok->name, "url_regex") == 0) {
if ((m_ele->pd_type != TS_PD_UNDEFINED) || (m_ele->pd_val != NULL) || (!tok->value)) {
// fields are already defined!!
goto FORMAT_ERR;
}
m_ele->pd_type = TS_PD_URL_REGEX;
- m_ele->pd_val = ats_strdup(tok->value);
+ m_ele->pd_val = ats_strdup(tok->value);
} else if (strcmp(tok->name, "url") == 0) {
if ((m_ele->pd_type != TS_PD_UNDEFINED) || (m_ele->pd_val != NULL) || (!tok->value)) {
// fields are already defined!!
goto FORMAT_ERR;
}
m_ele->pd_type = TS_PD_URL;
- m_ele->pd_val = ats_strdup(tok->value);
+ m_ele->pd_val = ats_strdup(tok->value);
} else if (strcmp(tok->name, "named") == 0) {
if ((m_ele->dns_servers_addrs != NULL) || (!tok->value)) {
// fields are already defined!!
@@ -2034,7 +2034,7 @@ SplitDnsObj::SplitDnsObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
SplitDnsObj::~SplitDnsObj()
@@ -2185,7 +2185,7 @@ SplitDnsObj::getCfgEleCopy()
//--------------------------------------------------------------------------
StorageObj::StorageObj(TSStorageEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid(); // now validate
}
@@ -2195,9 +2195,9 @@ StorageObj::StorageObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSStorageEleCreate();
+ m_ele = TSStorageEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || (tokens->length > 6)) {
goto FORMAT_ERR;
@@ -2223,7 +2223,7 @@ StorageObj::StorageObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
StorageObj::~StorageObj()
@@ -2278,7 +2278,7 @@ StorageObj::getCfgEleCopy()
//--------------------------------------------------------------------------
VirtIpAddrObj::VirtIpAddrObj(TSVirtIpAddrEle *ele)
{
- m_ele = ele;
+ m_ele = ele;
m_valid = true;
m_valid = isValid();
}
@@ -2287,9 +2287,9 @@ VirtIpAddrObj::VirtIpAddrObj(TokenList *tokens)
{
Token *tok;
- m_ele = TSVirtIpAddrEleCreate();
+ m_ele = TSVirtIpAddrEleCreate();
m_ele->cfg_ele.error = TS_ERR_OKAY;
- m_valid = true;
+ m_valid = true;
if (!tokens || (tokens->length != 3)) {
goto FORMAT_ERR;
@@ -2324,7 +2324,7 @@ VirtIpAddrObj::VirtIpAddrObj(TokenList *tokens)
FORMAT_ERR:
m_ele->cfg_ele.error = TS_ERR_INVALID_CONFIG_RULE;
- m_valid = false;
+ m_valid = false;
}
VirtIpAddrObj::~VirtIpAddrObj()
@@ -2388,7 +2388,7 @@ VirtIpAddrObj::getCfgEleCopy()
CfgContext::CfgContext(TSFileNameT filename)
{
m_file = filename;
- m_ver = -1;
+ m_ver = -1;
}
CfgContext::~CfgContext()
diff --git a/mgmt/api/CfgContextImpl.h b/mgmt/api/CfgContextImpl.h
index 6928618..184ab25 100644
--- a/mgmt/api/CfgContextImpl.h
+++ b/mgmt/api/CfgContextImpl.h
@@ -49,10 +49,10 @@ public:
virtual ~CfgEleObj() {} // virtual destructor
virtual char *formatEleToRule() = 0;
- virtual bool isValid() = 0;
+ virtual bool isValid() = 0;
/* these are implemented as inline functons by subclasses */
- virtual TSCfgEle *getCfgEle() = 0; /* returns actual ele */
+ virtual TSCfgEle *getCfgEle() = 0; /* returns actual ele */
virtual TSCfgEle *getCfgEleCopy() = 0; /* returns copy of ele */
virtual TSRuleTypeT getRuleType() = 0;
diff --git a/mgmt/api/CfgContextManager.cc b/mgmt/api/CfgContextManager.cc
index b2d79fe..b4b3951 100644
--- a/mgmt/api/CfgContextManager.cc
+++ b/mgmt/api/CfgContextManager.cc
@@ -55,7 +55,7 @@ CfgContext *
CfgContextCreate(TSFileNameT file)
{
CfgContext *ctx = NULL;
- ctx = new CfgContext(file);
+ ctx = new CfgContext(file);
return ctx;
}
@@ -88,29 +88,29 @@ CfgContextCommit(CfgContext *ctx, LLQ *errRules)
{
int ret;
char *new_text = NULL;
- char *rule = NULL;
+ char *rule = NULL;
CfgEleObj *ele;
int ver, size = 0, index;
int *iPtr;
- TSMgmtError err = TS_ERR_OKAY;
+ TSMgmtError err = TS_ERR_OKAY;
int max_file_size = MAX_FILE_SIZE;
- int len = 0;
+ int len = 0;
ink_assert(ctx);
if (!ctx)
return TS_ERR_PARAMS;
- new_text = (char *)ats_malloc(max_file_size + 1);
+ new_text = (char *)ats_malloc(max_file_size + 1);
new_text[0] = '\0';
- ele = ctx->first();
- index = 0;
+ ele = ctx->first();
+ index = 0;
while (ele) {
rule = ele->formatEleToRule(); // use polymorphism
if (!rule) {
- err = TS_ERR_INVALID_CONFIG_RULE;
+ err = TS_ERR_INVALID_CONFIG_RULE;
rule = ats_strdup(FORMAT_TO_RULE_ERROR);
if (errRules) {
- iPtr = (int *)ats_malloc(sizeof(int));
+ iPtr = (int *)ats_malloc(sizeof(int));
*iPtr = index;
enqueue(errRules, (void *)iPtr);
}
@@ -154,9 +154,9 @@ CfgContextGet(CfgContext *ctx)
{
TSMgmtError ret;
int size, ver;
- char *old_text = NULL;
+ char *old_text = NULL;
RuleList *rule_list = NULL;
- CfgEleObj *ele = NULL;
+ CfgEleObj *ele = NULL;
ink_assert(ctx);
if (!ctx)
@@ -383,7 +383,7 @@ CfgContextMoveEleUp(CfgContext *ctx, int index)
{
CfgEleObj *curr_ele_obj;
TSCfgEle *ele_copy = 0; /* lv: just to make gcc happy */
- int count = 0; // start counting from 0
+ int count = 0; // start counting from 0
TSMgmtError ret;
ink_assert(ctx && index >= 0);
@@ -435,7 +435,7 @@ CfgContextMoveEleDown(CfgContext *ctx, int index)
{
CfgEleObj *curr_ele_obj;
TSCfgEle *ele_copy = 0; /* lv: just to make gcc happy */
- int count = 0; // start counting from 0
+ int count = 0; // start counting from 0
TSMgmtError ret;
int tot_ele;
@@ -514,8 +514,8 @@ TSMgmtError
CfgContextInsertEleAt(CfgContext *ctx, TSCfgEle *ele, int index)
{
CfgEleObj *ele_obj, *curr_ele_obj, *last_comment = NULL;
- int count = 0;
- TSMgmtError err = TS_ERR_OKAY;
+ int count = 0;
+ TSMgmtError err = TS_ERR_OKAY;
bool has_comment = false;
// need to convert the ele into appropriate Ele object type
@@ -528,7 +528,7 @@ CfgContextInsertEleAt(CfgContext *ctx, TSCfgEle *ele, int index)
if (curr_ele_obj->getRuleType() == TS_TYPE_COMMENT) { /* a comment ele */
last_comment = curr_ele_obj;
curr_ele_obj = ctx->next(curr_ele_obj);
- has_comment = true;
+ has_comment = true;
continue;
} else {
// special case if inserting the ele at head of CfgContext
diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc
index f42ed81..bfaf7bf 100644
--- a/mgmt/api/CfgContextUtils.cc
+++ b/mgmt/api/CfgContextUtils.cc
@@ -75,17 +75,17 @@ string_to_ip_addr_ele(const char *str)
} else { // Single, CIDR TYPE
if (!isNumber(cidr_tokens[1]))
goto Lerror;
- ele->ip_a = string_to_ip_addr(cidr_tokens[0]);
+ ele->ip_a = string_to_ip_addr(cidr_tokens[0]);
ele->cidr_a = ink_atoi(cidr_tokens[1]);
}
if (!ele->ip_a) // ERROR: Invalid ip
goto Lerror;
} else { // RANGE TYPE
- ele->type = TS_IP_RANGE;
+ ele->type = TS_IP_RANGE;
const_ip_a = range_tokens[0];
const_ip_b = range_tokens[1];
- ip_a = ats_strdup(const_ip_a);
- ip_b = ats_strdup(const_ip_b);
+ ip_a = ats_strdup(const_ip_a);
+ ip_b = ats_strdup(const_ip_b);
// determine if ip's are cidr type; only test if ip_a is cidr, assume both are same
cidr_tokens.Initialize(ip_a, COPY_TOKS);
@@ -94,10 +94,10 @@ string_to_ip_addr_ele(const char *str)
ele->ip_a = string_to_ip_addr(ip_a);
ele->ip_b = string_to_ip_addr(ip_b);
} else { // Range, CIDR TYPE */
- ele->ip_a = string_to_ip_addr(cidr_tokens[0]);
+ ele->ip_a = string_to_ip_addr(cidr_tokens[0]);
ele->cidr_a = ink_atoi(cidr_tokens[1]);
cidr_tokens2.Initialize(ip_b, COPY_TOKS);
- ele->ip_b = string_to_ip_addr(cidr_tokens2[0]);
+ ele->ip_b = string_to_ip_addr(cidr_tokens2[0]);
ele->cidr_b = ink_atoi(cidr_tokens2[1]);
if (!isNumber(cidr_tokens[1]) || !isNumber(cidr_tokens2[1]))
goto Lerror;
@@ -598,12 +598,12 @@ string_to_int_list(const char *str_list, const char *delimiter)
tokens.Initialize(str_list);
numToks = tokens.count();
- list = TSIntListCreate();
+ list = TSIntListCreate();
for (i = 0; i < numToks; i++) {
if (!isNumber(tokens[i]))
goto Lerror;
- ele = (int *)ats_malloc(sizeof(int));
+ ele = (int *)ats_malloc(sizeof(int));
*ele = ink_atoi(tokens[i]); // What about we can't convert? ERROR?
TSIntListEnqueue(list, ele);
}
@@ -753,7 +753,7 @@ string_to_domain(const char *str)
// get hostname
ink_strlcpy(buf, str, sizeof(buf));
- token = strtok_r(buf, ":", &token_pos);
+ token = strtok_r(buf, ":", &token_pos);
remain = token_pos;
if (token)
dom->domain_val = ats_strdup(token);
@@ -1072,7 +1072,7 @@ string_to_hms_time(const char *str, TSHmsTime *time)
return TS_ERR_PARAMS;
memset(unit, 0, 10);
- len = strlen(str);
+ len = strlen(str);
time->d = time->h = time->m = time->s = 0;
for (i = 0; i < len; i++) {
valid = false;
@@ -1081,28 +1081,28 @@ string_to_hms_time(const char *str, TSHmsTime *time)
goto Lerror;
time->d = ink_atoi(unit);
memset(unit, 0, 10);
- pos = 0;
+ pos = 0;
valid = true;
} else if ((*str) == 'h') {
if (time->h > 0 || !isNumber(unit))
goto Lerror;
time->h = ink_atoi(unit);
memset(unit, 0, 10);
- pos = 0;
+ pos = 0;
valid = true;
} else if ((*str) == 'm') {
if (time->m > 0 || !isNumber(unit))
goto Lerror;
time->m = ink_atoi(unit);
memset(unit, 0, 10);
- pos = 0;
+ pos = 0;
valid = true;
} else if ((*str) == 's') {
if (time->s > 0 || !isNumber(unit))
goto Lerror;
time->s = ink_atoi(unit);
memset(unit, 0, 10);
- pos = 0;
+ pos = 0;
valid = true;
} else {
unit[pos] = *str;
@@ -1498,7 +1498,7 @@ Token *
tokens_to_pdss_format(TokenList *tokens, Token *first_tok, TSPdSsFormat *pdss)
{
Token *tok, *last_tok;
- int i = 0;
+ int i = 0;
const char *sspecs[NUM_SEC_SPECS] = {"time", "src_ip", "prefix", "suffix", "port", "method", "scheme", "tag"};
// ink_assert(tokens && first_tok && pdss);
@@ -1527,7 +1527,7 @@ tokens_to_pdss_format(TokenList *tokens, Token *first_tok, TSPdSsFormat *pdss)
// state determines which sec specifier being checked
// the state is only set if there's a sec spec match
last_tok = first_tok;
- tok = tokens->next(first_tok);
+ tok = tokens->next(first_tok);
while (tok) {
bool matchFound = false;
for (i = 0; i < NUM_SEC_SPECS; i++) {
@@ -1571,7 +1571,7 @@ tokens_to_pdss_format(TokenList *tokens, Token *first_tok, TSPdSsFormat *pdss)
next_token: // Get the next token
last_tok = tok;
- tok = tokens->next(tok);
+ tok = tokens->next(tok);
} // end while loop
@@ -2173,7 +2173,7 @@ copy_cfg_ele(TSCfgEle *src_ele, TSCfgEle *dst_ele)
if (!src_ele || !dst_ele)
return;
- dst_ele->type = src_ele->type;
+ dst_ele->type = src_ele->type;
dst_ele->error = src_ele->error;
}
@@ -2184,20 +2184,20 @@ copy_sspec(TSSspec *src, TSSspec *dst)
if (!src || !dst)
return;
- dst->active = src->active;
+ dst->active = src->active;
dst->time.hour_a = src->time.hour_a;
- dst->time.min_a = src->time.min_a;
+ dst->time.min_a = src->time.min_a;
dst->time.hour_b = src->time.hour_b;
- dst->time.min_b = src->time.min_b;
+ dst->time.min_b = src->time.min_b;
if (src->src_ip)
dst->src_ip = ats_strdup(src->src_ip);
if (src->prefix)
dst->prefix = ats_strdup(src->prefix);
if (src->suffix)
dst->suffix = ats_strdup(src->suffix);
- dst->port = copy_port_ele(src->port);
- dst->method = src->method;
- dst->scheme = src->scheme;
+ dst->port = copy_port_ele(src->port);
+ dst->method = src->method;
+ dst->scheme = src->scheme;
}
void
@@ -2233,7 +2233,7 @@ copy_ip_addr_ele(TSIpAddrEle *src_ele)
if (!src_ele)
return NULL;
- dst_ele = TSIpAddrEleCreate();
+ dst_ele = TSIpAddrEleCreate();
dst_ele->type = src_ele->type;
if (src_ele->ip_a)
dst_ele->ip_a = ats_strdup(src_ele->ip_a);
@@ -2255,7 +2255,7 @@ copy_port_ele(TSPortEle *src_ele)
if (!src_ele)
return NULL;
- dst_ele = TSPortEleCreate();
+ dst_ele = TSPortEleCreate();
dst_ele->port_a = src_ele->port_a;
dst_ele->port_b = src_ele->port_b;
@@ -2273,7 +2273,7 @@ copy_domain(TSDomain *src_dom)
dst_dom = TSDomainCreate();
if (src_dom->domain_val)
dst_dom->domain_val = ats_strdup(src_dom->domain_val);
- dst_dom->port = src_dom->port;
+ dst_dom->port = src_dom->port;
return dst_dom;
}
@@ -2291,7 +2291,7 @@ copy_ip_addr_list(TSIpAddrList list)
nlist = TSIpAddrListCreate();
count = TSIpAddrListLen(list);
for (i = 0; i < count; i++) {
- ele = TSIpAddrListDequeue(list);
+ ele = TSIpAddrListDequeue(list);
nele = copy_ip_addr_ele(ele);
TSIpAddrListEnqueue(list, ele);
TSIpAddrListEnqueue(nlist, nele);
@@ -2313,7 +2313,7 @@ copy_port_list(TSPortList list)
nlist = TSPortListCreate();
count = TSPortListLen(list);
for (i = 0; i < count; i++) {
- ele = TSPortListDequeue(list);
+ ele = TSPortListDequeue(list);
nele = copy_port_ele(ele);
TSPortListEnqueue(list, ele);
TSPortListEnqueue(nlist, nele);
@@ -2335,7 +2335,7 @@ copy_domain_list(TSDomainList list)
nlist = TSDomainListCreate();
count = TSDomainListLen(list);
for (i = 0; i < count; i++) {
- ele = TSDomainListDequeue(list);
+ ele = TSDomainListDequeue(list);
nele = copy_domain(ele);
TSDomainListEnqueue(list, ele);
TSDomainListEnqueue(nlist, nele);
@@ -2357,7 +2357,7 @@ copy_string_list(TSStringList list)
nlist = TSStringListCreate();
count = TSStringListLen(list);
for (i = 0; i < count; i++) {
- ele = TSStringListDequeue(list);
+ ele = TSStringListDequeue(list);
nele = ats_strdup(ele);
TSStringListEnqueue(list, ele);
TSStringListEnqueue(nlist, nele);
@@ -2379,8 +2379,8 @@ copy_int_list(TSIntList list)
nlist = TSIntListCreate();
count = TSIntListLen(list);
for (i = 0; i < count; i++) {
- elem = TSIntListDequeue(list);
- nelem = (int *)ats_malloc(sizeof(int));
+ elem = TSIntListDequeue(list);
+ nelem = (int *)ats_malloc(sizeof(int));
*nelem = *elem;
TSIntListEnqueue(list, elem);
TSIntListEnqueue(nlist, nelem);
@@ -2420,21 +2420,21 @@ copy_congestion_ele(TSCongestionEle *ele)
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
// copy_pdss_format(&(ele->congestion_info), &(nele->congestion_info));
nele->pd_type = ele->pd_type;
- nele->pd_val = ats_strdup(ele->pd_val);
+ nele->pd_val = ats_strdup(ele->pd_val);
if (ele->prefix)
- nele->prefix = ats_strdup(ele->prefix);
- nele->port = ele->port;
- nele->scheme = ele->scheme;
+ nele->prefix = ats_strdup(ele->prefix);
+ nele->port = ele->port;
+ nele->scheme = ele->scheme;
nele->max_connection_failures = ele->max_connection_failures;
- nele->fail_window = ele->fail_window;
- nele->proxy_retry_interval = ele->proxy_retry_interval;
- nele->client_wait_interval = ele->client_wait_interval;
- nele->wait_interval_alpha = ele->wait_interval_alpha;
- nele->live_os_conn_timeout = ele->live_os_conn_timeout;
- nele->live_os_conn_retries = ele->live_os_conn_retries;
- nele->dead_os_conn_timeout = ele->dead_os_conn_timeout;
- nele->dead_os_conn_retries = ele->dead_os_conn_retries;
- nele->max_connection = ele->max_connection;
+ nele->fail_window = ele->fail_window;
+ nele->proxy_retry_interval = ele->proxy_retry_interval;
+ nele->client_wait_interval = ele->client_wait_interval;
+ nele->wait_interval_alpha = ele->wait_interval_alpha;
+ nele->live_os_conn_timeout = ele->live_os_conn_timeout;
+ nele->live_os_conn_retries = ele->live_os_conn_retries;
+ nele->dead_os_conn_timeout = ele->dead_os_conn_timeout;
+ nele->dead_os_conn_retries = ele->dead_os_conn_retries;
+ nele->max_connection = ele->max_connection;
if (ele->error_page_uri)
nele->error_page_uri = ats_strdup(ele->error_page_uri);
@@ -2456,7 +2456,7 @@ copy_hosting_ele(TSHostingEle *ele)
nele->pd_type = ele->pd_type;
if (ele->pd_val)
nele->pd_val = ats_strdup(ele->pd_val);
- ele->volumes = copy_int_list(ele->volumes);
+ ele->volumes = copy_int_list(ele->volumes);
return nele;
}
@@ -2477,13 +2477,13 @@ copy_icp_ele(TSIcpEle *ele)
nele->peer_hostname = ats_strdup(ele->peer_hostname);
if (ele->peer_host_ip_addr)
nele->peer_host_ip_addr = ats_strdup(ele->peer_host_ip_addr);
- nele->peer_type = ele->peer_type;
- nele->peer_proxy_port = ele->peer_proxy_port;
- nele->peer_icp_port = ele->peer_icp_port;
- nele->is_multicast = ele->is_multicast;
+ nele->peer_type = ele->peer_type;
+ nele->peer_proxy_port = ele->peer_proxy_port;
+ nele->peer_icp_port = ele->peer_icp_port;
+ nele->is_multicast = ele->is_multicast;
if (ele->mc_ip_addr)
nele->mc_ip_addr = ats_strdup(ele->mc_ip_addr);
- nele->mc_ttl = ele->mc_ttl;
+ nele->mc_ttl = ele->mc_ttl;
return nele;
}
@@ -2500,7 +2500,7 @@ copy_ip_allow_ele(TSIpAllowEle *ele)
return NULL;
if (ele->src_ip_addr)
nele->src_ip_addr = copy_ip_addr_ele(ele->src_ip_addr);
- nele->action = ele->action;
+ nele->action = ele->action;
return nele;
}
@@ -2521,10 +2521,10 @@ copy_log_filter_ele(TSLogFilterEle *ele)
ele->filter_name = ats_strdup(nele->filter_name);
if (ele->log_field)
nele->log_field = ats_strdup(ele->log_field);
- nele->compare_op = ele->compare_op;
+ nele->compare_op = ele->compare_op;
if (ele->compare_str)
nele->compare_str = ats_strdup(ele->compare_str);
- nele->compare_int = ele->compare_int;
+ nele->compare_int = ele->compare_int;
return nele;
}
@@ -2544,7 +2544,7 @@ copy_log_format_ele(TSLogFormatEle *ele)
if (ele->name)
nele->name = ats_strdup(ele->name);
if (ele->format)
- nele->format = ats_strdup(ele->format);
+ nele->format = ats_strdup(ele->format);
nele->aggregate_interval_secs = ele->aggregate_interval_secs;
return nele;
@@ -2565,12 +2565,12 @@ copy_log_object_ele(TSLogObjectEle *ele)
if (ele->format_name)
nele->format_name = ats_strdup(ele->format_name);
if (ele->file_name)
- nele->file_name = ats_strdup(ele->file_name);
- nele->log_mode = ele->log_mode;
+ nele->file_name = ats_strdup(ele->file_name);
+ nele->log_mode = ele->log_mode;
nele->collation_hosts = copy_domain_list(ele->collation_hosts);
- nele->filters = copy_string_list(ele->filters);
- nele->protocols = copy_string_list(ele->protocols);
- nele->server_hosts = copy_string_list(ele->server_hosts);
+ nele->filters = copy_string_list(ele->filters);
+ nele->protocols = copy_string_list(ele->protocols);
+ nele->server_hosts = copy_string_list(ele->server_hosts);
return nele;
}
@@ -2588,9 +2588,9 @@ copy_parent_proxy_ele(TSParentProxyEle *ele)
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
copy_pdss_format(&(ele->parent_info), &(nele->parent_info));
- nele->rr = ele->rr;
+ nele->rr = ele->rr;
nele->proxy_list = copy_domain_list(ele->proxy_list);
- nele->direct = ele->direct;
+ nele->direct = ele->direct;
return nele;
}
@@ -2607,8 +2607,8 @@ copy_volume_ele(TSVolumeEle *ele)
return NULL;
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
- nele->volume_num = ele->volume_num;
- nele->scheme = ele->scheme;
+ nele->volume_num = ele->volume_num;
+ nele->scheme = ele->scheme;
nele->volume_size = ele->volume_size;
nele->size_format = ele->size_format;
@@ -2629,7 +2629,7 @@ copy_plugin_ele(TSPluginEle *ele)
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
if (ele->name)
nele->name = ats_strdup(ele->name);
- nele->args = copy_string_list(ele->args);
+ nele->args = copy_string_list(ele->args);
return nele;
}
@@ -2646,17 +2646,17 @@ copy_remap_ele(TSRemapEle *ele)
return NULL;
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
- nele->map = ele->map;
+ nele->map = ele->map;
nele->from_scheme = ele->from_scheme;
if (ele->from_host)
nele->from_host = ats_strdup(ele->from_host);
- nele->from_port = ele->from_port;
+ nele->from_port = ele->from_port;
if (ele->from_path_prefix)
nele->from_path_prefix = ats_strdup(ele->from_path_prefix);
- nele->to_scheme = ele->to_scheme;
+ nele->to_scheme = ele->to_scheme;
if (ele->to_host)
nele->to_host = ats_strdup(ele->to_host);
- nele->to_port = ele->to_port;
+ nele->to_port = ele->to_port;
if (ele->to_path_prefix)
nele->to_path_prefix = ats_strdup(ele->to_path_prefix);
@@ -2675,10 +2675,10 @@ copy_socks_ele(TSSocksEle *ele)
return NULL;
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
- nele->ip_addrs = copy_ip_addr_list(ele->ip_addrs);
- nele->dest_ip_addr = copy_ip_addr_ele(ele->dest_ip_addr);
+ nele->ip_addrs = copy_ip_addr_list(ele->ip_addrs);
+ nele->dest_ip_addr = copy_ip_addr_ele(ele->dest_ip_addr);
nele->socks_servers = copy_domain_list(ele->socks_servers);
- nele->rr = ele->rr;
+ nele->rr = ele->rr;
if (ele->username)
nele->username = ats_strdup(ele->username);
if (ele->password)
@@ -2701,11 +2701,11 @@ copy_split_dns_ele(TSSplitDnsEle *ele)
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
nele->pd_type = ele->pd_type;
if (ele->pd_val)
- nele->pd_val = ats_strdup(ele->pd_val);
+ nele->pd_val = ats_strdup(ele->pd_val);
nele->dns_servers_addrs = copy_domain_list(ele->dns_servers_addrs);
if (ele->def_domain)
nele->def_domain = ats_strdup(ele->def_domain);
- nele->search_list = copy_domain_list(ele->search_list);
+ nele->search_list = copy_domain_list(ele->search_list);
return nele;
}
@@ -2724,7 +2724,7 @@ copy_storage_ele(TSStorageEle *ele)
copy_cfg_ele(&(ele->cfg_ele), &(nele->cfg_ele));
if (ele->pathname)
nele->pathname = ats_strdup(ele->pathname);
- nele->size = ele->size;
+ nele->size = ele->size;
return nele;
}
@@ -2744,8 +2744,8 @@ copy_virt_ip_addr_ele(TSVirtIpAddrEle *ele)
// copy cfg ele
copy_cfg_ele(&(ele->cfg_ele), &(new_ele->cfg_ele));
- new_ele->ip_addr = ats_strdup(ele->ip_addr);
- new_ele->intr = ats_strdup(ele->intr);
+ new_ele->ip_addr = ats_strdup(ele->ip_addr);
+ new_ele->intr = ats_strdup(ele->intr);
new_ele->sub_intr = ele->sub_intr;
return new_ele;
@@ -2771,7 +2771,7 @@ comment_ele_create(char *comment)
ele = (INKCommentEle *)ats_malloc(sizeof(INKCommentEle));
- ele->cfg_ele.type = TS_TYPE_COMMENT;
+ ele->cfg_ele.type = TS_TYPE_COMMENT;
ele->cfg_ele.error = TS_ERR_OKAY;
if (comment)
ele->comment = ats_strdup(comment);
diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc
index ed5e3ea..91272ee 100644
--- a/mgmt/api/CoreAPI.cc
+++ b/mgmt/api/CoreAPI.cc
@@ -196,7 +196,7 @@ ProxyStateSet(TSProxyStateT state, TSCacheClearT clear)
case TS_CACHE_CLEAR_OFF:
// use default tsargs in records.config
int rec_err = RecGetRecordString_Xmalloc("proxy.config.proxy_binary_opts", &proxy_options);
- found = (rec_err == REC_ERR_OKAY);
+ found = (rec_err == REC_ERR_OKAY);
if (!found)
goto Lerror;
@@ -241,7 +241,7 @@ typedef Vec<pid_t> threadlist;
static threadlist
threads_for_process(pid_t proc)
{
- DIR *dir = NULL;
+ DIR *dir = NULL;
struct dirent *entry = NULL;
char path[64];
@@ -284,8 +284,8 @@ backtrace_for_thread(pid_t threadid, textBuffer &text)
int status;
unw_addr_space_t addr_space = NULL;
unw_cursor_t cursor;
- void *ap = NULL;
- pid_t target = -1;
+ void *ap = NULL;
+ pid_t target = -1;
unsigned level = 0;
// First, attach to the child, causing it to stop.
@@ -535,7 +535,7 @@ MgmtRecordGet(const char *rec_name, TSRecordEle *rec_ele)
str_val = ats_strdup("NULL");
}
- rec_ele->rec_type = TS_REC_STRING;
+ rec_ele->rec_type = TS_REC_STRING;
rec_ele->valueT.string_val = str_val;
Debug("RecOp", "[MgmtRecordGet] Get String Var %s = %s\n", rec_ele->rec_name, rec_ele->valueT.string_val);
break;
@@ -748,7 +748,7 @@ ReadFile(TSFileNameT file, char **text, int *size, int *version)
// don't need to allocate memory b/c "getVersion" allocates memory
old_file_lines = old_file_content->bufPtr();
- old_file_len = strlen(old_file_lines);
+ old_file_len = strlen(old_file_lines);
*text = ats_strdup(old_file_lines); // make copy before deleting textBuffer
*size = old_file_len;
@@ -801,7 +801,7 @@ WriteFile(TSFileNameT file, const char *text, int size, int version)
}
// use rollback object to update file with new content
file_content = new textBuffer(size + 1);
- ret = file_content->copyFrom(text, size);
+ ret = file_content->copyFrom(text, size);
if (ret < 0) {
delete file_content;
return TS_ERR_WRITE_FILE;
@@ -892,7 +892,7 @@ ActiveEventGetMlt(LLQ *active_events)
char *key = (char *)ink_hash_table_entry_key(event_ht, entry);
// convert key to int; insert into llQ
- event_id = ink_atoi(key);
+ event_id = ink_atoi(key);
event_name = get_event_name(event_id);
if (event_name) {
if (!enqueue(active_events, event_name)) // returns true if successful
diff --git a/mgmt/api/CoreAPIRemote.cc b/mgmt/api/CoreAPIRemote.cc
index ee1c931..1cd9948 100644
--- a/mgmt/api/CoreAPIRemote.cc
+++ b/mgmt/api/CoreAPIRemote.cc
@@ -82,7 +82,7 @@ send_and_parse_list(OpType op, LLQ *list)
MgmtMarshallInt optype = op;
MgmtMarshallInt err;
- MgmtMarshallData reply = {NULL, 0};
+ MgmtMarshallData reply = {NULL, 0};
MgmtMarshallString strval = NULL;
if (!list) {
@@ -142,8 +142,8 @@ mgmt_record_set(const char *rec_name, const char *rec_val, TSActionNeedT *action
{
TSMgmtError ret;
- MgmtMarshallInt optype = RECORD_SET;
- MgmtMarshallString name = const_cast<MgmtMarshallString>(rec_name);
+ MgmtMarshallInt optype = RECORD_SET;
+ MgmtMarshallString name = const_cast<MgmtMarshallString>(rec_name);
MgmtMarshallString value = const_cast<MgmtMarshallString>(rec_val);
MgmtMarshallData reply = {NULL, 0};
@@ -276,7 +276,7 @@ Terminate()
ink_thread_join(ts_event_thread);
// Clear operation
- ts_test_thread = static_cast<ink_thread>(NULL);
+ ts_test_thread = static_cast<ink_thread>(NULL);
ts_event_thread = static_cast<ink_thread>(NULL);
set_socket_paths(NULL); // clear the socket_path
@@ -293,7 +293,7 @@ DiagnosticMessage(TSDiagsT mode, const char *fmt, va_list ap)
char diag_msg[MAX_BUF_SIZE];
MgmtMarshallInt optype = DIAGS;
- MgmtMarshallInt level = mode;
+ MgmtMarshallInt level = mode;
MgmtMarshallString msg = diag_msg;
// format the diag message now so it can be sent
@@ -353,8 +353,8 @@ ServerBacktrace(unsigned options, char **trace)
TSMgmtError ret;
MgmtMarshallInt optype = SERVER_BACKTRACE;
MgmtMarshallInt err;
- MgmtMarshallInt flags = options;
- MgmtMarshallData reply = {NULL, 0};
+ MgmtMarshallInt flags = options;
+ MgmtMarshallData reply = {NULL, 0};
MgmtMarshallString strval = NULL;
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, SERVER_BACKTRACE, &optype, &flags);
@@ -411,7 +411,7 @@ Restart(unsigned options)
{
TSMgmtError ret;
MgmtMarshallInt optype = RESTART;
- MgmtMarshallInt oval = options;
+ MgmtMarshallInt oval = options;
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, RESTART, &optype, &oval);
if (ret != TS_ERR_OKAY) {
@@ -436,7 +436,7 @@ Bounce(unsigned options)
{
TSMgmtError ret;
MgmtMarshallInt optype = BOUNCE;
- MgmtMarshallInt oval = options;
+ MgmtMarshallInt oval = options;
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, BOUNCE, &optype, &oval);
@@ -452,7 +452,7 @@ TSMgmtError
StorageDeviceCmdOffline(char const *dev)
{
TSMgmtError ret;
- MgmtMarshallInt optype = STORAGE_DEVICE_CMD_OFFLINE;
+ MgmtMarshallInt optype = STORAGE_DEVICE_CMD_OFFLINE;
MgmtMarshallString name = const_cast<MgmtMarshallString>(dev);
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, STORAGE_DEVICE_CMD_OFFLINE, &optype, &name);
@@ -500,7 +500,7 @@ mgmt_record_get_reply(OpType op, TSRecordEle *rec_ele)
MgmtMarshallInt rclass;
MgmtMarshallInt type;
MgmtMarshallString name = NULL;
- MgmtMarshallData value = {NULL, 0};
+ MgmtMarshallData value = {NULL, 0};
ink_zero(*rec_ele);
rec_ele->rec_type = TS_REC_UNDEFINED;
@@ -523,8 +523,8 @@ mgmt_record_get_reply(OpType op, TSRecordEle *rec_ele)
}
rec_ele->rec_class = (TSInt)rclass;
- rec_ele->rec_type = (TSRecordT)type;
- rec_ele->rec_name = ats_strdup(name);
+ rec_ele->rec_type = (TSRecordT)type;
+ rec_ele->rec_name = ats_strdup(name);
mgmt_record_convert_value(rec_ele->rec_type, value, rec_ele->valueT);
done:
@@ -547,8 +547,8 @@ mgmt_record_describe_reply(TSConfigRecordDescription *val)
MgmtMarshallInt err;
MgmtMarshallString name = NULL;
MgmtMarshallString expr = NULL;
- MgmtMarshallData value = {NULL, 0};
- MgmtMarshallData deflt = {NULL, 0};
+ MgmtMarshallData value = {NULL, 0};
+ MgmtMarshallData deflt = {NULL, 0};
MgmtMarshallInt rtype;
MgmtMarshallInt rclass;
@@ -576,17 +576,17 @@ mgmt_record_describe_reply(TSConfigRecordDescription *val)
}
// Everything is cool, populate the description ...
- val->rec_name = ats_strdup(name);
- val->rec_checkexpr = ats_strdup(expr);
- val->rec_type = (TSRecordT)rtype;
- val->rec_class = rclass;
- val->rec_version = version;
- val->rec_rsb = rsb;
- val->rec_order = order;
- val->rec_access = access;
+ val->rec_name = ats_strdup(name);
+ val->rec_checkexpr = ats_strdup(expr);
+ val->rec_type = (TSRecordT)rtype;
+ val->rec_class = rclass;
+ val->rec_version = version;
+ val->rec_rsb = rsb;
+ val->rec_order = order;
+ val->rec_access = access;
val->rec_updatetype = updatetype;
- val->rec_checktype = checktype;
- val->rec_source = source;
+ val->rec_checktype = checktype;
+ val->rec_source = source;
mgmt_record_convert_value(val->rec_type, value, val->rec_value);
mgmt_record_convert_value(val->rec_type, deflt, val->rec_default);
@@ -605,7 +605,7 @@ TSMgmtError
MgmtRecordGet(const char *rec_name, TSRecordEle *rec_ele)
{
TSMgmtError ret;
- MgmtMarshallInt optype = RECORD_GET;
+ MgmtMarshallInt optype = RECORD_GET;
MgmtMarshallString record = const_cast<MgmtMarshallString>(rec_name);
if (!rec_name || !rec_ele) {
@@ -621,8 +621,8 @@ TSMgmtError
MgmtConfigRecordDescribeMatching(const char *rec_name, unsigned options, TSList rec_vals)
{
TSMgmtError ret;
- MgmtMarshallInt optype = RECORD_DESCRIBE_CONFIG;
- MgmtMarshallInt flags = options | RECORD_DESCRIBE_FLAGS_MATCH;
+ MgmtMarshallInt optype = RECORD_DESCRIBE_CONFIG;
+ MgmtMarshallInt flags = options | RECORD_DESCRIBE_FLAGS_MATCH;
MgmtMarshallString record = const_cast<MgmtMarshallString>(rec_name);
// create and send request
@@ -667,8 +667,8 @@ TSMgmtError
MgmtConfigRecordDescribe(const char *rec_name, unsigned options, TSConfigRecordDescription *val)
{
TSMgmtError ret;
- MgmtMarshallInt optype = RECORD_DESCRIBE_CONFIG;
- MgmtMarshallInt flags = options & ~RECORD_DESCRIBE_FLAGS_MATCH;
+ MgmtMarshallInt optype = RECORD_DESCRIBE_CONFIG;
+ MgmtMarshallInt flags = options & ~RECORD_DESCRIBE_FLAGS_MATCH;
MgmtMarshallString record = const_cast<MgmtMarshallString>(rec_name);
// create and send request
@@ -686,7 +686,7 @@ MgmtRecordGetMatching(const char *regex, TSList rec_vals)
TSMgmtError ret;
TSRecordEle *rec_ele;
- MgmtMarshallInt optype = RECORD_MATCH_GET;
+ MgmtMarshallInt optype = RECORD_MATCH_GET;
MgmtMarshallString record = const_cast<MgmtMarshallString>(regex);
if (!regex || !rec_vals) {
@@ -823,7 +823,7 @@ ReadFile(TSFileNameT file, char **text, int *size, int *version)
{
TSMgmtError ret;
MgmtMarshallInt optype = FILE_READ;
- MgmtMarshallInt fid = file;
+ MgmtMarshallInt fid = file;
MgmtMarshallData reply = {NULL, 0};
MgmtMarshallInt err;
@@ -855,8 +855,8 @@ ReadFile(TSFileNameT file, char **text, int *size, int *version)
}
*version = vers;
- *text = (char *)data.ptr;
- *size = (int)data.len;
+ *text = (char *)data.ptr;
+ *size = (int)data.len;
return TS_ERR_OKAY;
}
@@ -880,9 +880,9 @@ WriteFile(TSFileNameT file, const char *text, int size, int version)
TSMgmtError ret;
MgmtMarshallInt optype = FILE_WRITE;
- MgmtMarshallInt fid = file;
- MgmtMarshallInt vers = version;
- MgmtMarshallData data = {(void *)text, (size_t)size};
+ MgmtMarshallInt fid = file;
+ MgmtMarshallInt vers = version;
+ MgmtMarshallData data = {(void *)text, (size_t)size};
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, FILE_WRITE, &optype, &fid, &vers, &data);
return (ret == TS_ERR_OKAY) ? parse_generic_response(FILE_WRITE, main_socket_fd) : ret;
@@ -913,7 +913,7 @@ TSMgmtError
EventResolve(const char *event_name)
{
TSMgmtError ret;
- MgmtMarshallInt optype = EVENT_RESOLVE;
+ MgmtMarshallInt optype = EVENT_RESOLVE;
MgmtMarshallString name = const_cast<MgmtMarshallString>(event_name);
if (!event_name)
@@ -947,7 +947,7 @@ TSMgmtError
EventIsActive(const char *event_name, bool *is_current)
{
TSMgmtError ret;
- MgmtMarshallInt optype = EVENT_ACTIVE;
+ MgmtMarshallInt optype = EVENT_ACTIVE;
MgmtMarshallString name = const_cast<MgmtMarshallString>(event_name);
MgmtMarshallData reply = {NULL, 0};
@@ -1005,7 +1005,7 @@ EventSignalCbRegister(const char *event_name, TSEventSignalFunc func, void *data
// if we need to notify traffic manager of the event then send msg
if (first_time) {
- MgmtMarshallInt optype = EVENT_REG_CALLBACK;
+ MgmtMarshallInt optype = EVENT_REG_CALLBACK;
MgmtMarshallString name = const_cast<MgmtMarshallString>(event_name);
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, EVENT_REG_CALLBACK, &optype, &name);
@@ -1059,7 +1059,7 @@ static TSMgmtError
snapshot_message(OpType op, const char *snapshot_name)
{
TSMgmtError ret;
- MgmtMarshallInt optype = op;
+ MgmtMarshallInt optype = op;
MgmtMarshallString name = const_cast<MgmtMarshallString>(snapshot_name);
if (!snapshot_name)
@@ -1100,8 +1100,8 @@ TSMgmtError
StatsReset(bool cluster, const char *stat_name)
{
TSMgmtError ret;
- OpType op = cluster ? STATS_RESET_CLUSTER : STATS_RESET_NODE;
- MgmtMarshallInt optype = op;
+ OpType op = cluster ? STATS_RESET_CLUSTER : STATS_RESET_NODE;
+ MgmtMarshallInt optype = op;
MgmtMarshallString name = const_cast<MgmtMarshallString>(stat_name);
ret = MGMTAPI_SEND_MESSAGE(main_socket_fd, op, &optype, &name);
diff --git a/mgmt/api/CoreAPIShared.cc b/mgmt/api/CoreAPIShared.cc
index bebf752..764d5c3 100644
--- a/mgmt/api/CoreAPIShared.cc
+++ b/mgmt/api/CoreAPIShared.cc
@@ -211,7 +211,7 @@ connectDirect(const char *host, int port, uint64_t /* timeout ATS_UNUSED */)
}
// Connect to the specified port on the machine we're running on.
name.sin_family = AF_INET;
- name.sin_port = htons(port);
+ name.sin_port = htons(port);
struct hostent *pHostent;
pHostent = gethostbyname(host);
@@ -244,8 +244,8 @@ poll_read(int fd, int timeout)
struct pollfd info;
int err;
- info.fd = fd;
- info.events = POLLIN;
+ info.fd = fd;
+ info.events = POLLIN;
info.revents = 0;
do {
@@ -265,8 +265,8 @@ poll_write(int fd, int timeout)
struct pollfd info;
int err;
- info.fd = fd;
- info.events = POLLOUT;
+ info.fd = fd;
+ info.events = POLLOUT;
info.revents = 0;
do {
diff --git a/mgmt/api/EventCallback.cc b/mgmt/api/EventCallback.cc
index 9f15a76..2bdf83d 100644
--- a/mgmt/api/EventCallback.cc
+++ b/mgmt/api/EventCallback.cc
@@ -83,7 +83,7 @@ create_callback_table(const char *lock_name)
{
CallbackTable *cb_table = (CallbackTable *)ats_malloc(sizeof(CallbackTable));
- for (int i = 0; i < NUM_EVENTS; i++)
+ for (int i = 0; i < NUM_EVENTS; i++)
cb_table->event_callback_l[i] = NULL;
// initialize the mutex
@@ -197,7 +197,7 @@ cb_table_register(CallbackTable *cb_table, const char *event_name, TSEventSignal
for (int i = 0; i < NUM_EVENTS; i++) {
if (!cb_table->event_callback_l[i]) {
cb_table->event_callback_l[i] = create_queue();
- first_time = 1;
+ first_time = 1;
}
if (!cb_table->event_callback_l[i]) {
@@ -214,7 +214,7 @@ cb_table_register(CallbackTable *cb_table, const char *event_name, TSEventSignal
if (id != -1) {
if (!cb_table->event_callback_l[id]) {
cb_table->event_callback_l[id] = create_queue();
- first_time = 1;
+ first_time = 1;
}
if (!cb_table->event_callback_l[id]) {
@@ -279,7 +279,7 @@ cb_table_unregister(CallbackTable *cb_table, const char *event_name, TSEventSign
// remove this function
for (int j = 0; j < queue_depth; j++) {
event_cb = (EventCallbackT *)dequeue(cb_table->event_callback_l[i]);
- cb_fun = event_cb->func;
+ cb_fun = event_cb->func;
// the pointers are the same so don't enqueue the fn back on
if (*cb_fun == *func) {
@@ -319,7 +319,7 @@ cb_table_unregister(CallbackTable *cb_table, const char *event_name, TSEventSign
// remove this function
for (int j = 0; j < queue_depth; j++) {
event_cb = (EventCallbackT *)dequeue(cb_table->event_callback_l[id]);
- cb_fun = event_cb->func;
+ cb_fun = event_cb->func;
// the pointers are the same
if (*cb_fun == *func) {
diff --git a/mgmt/api/EventControlMain.cc b/mgmt/api/EventControlMain.cc
index 44ad69c..ac41c79 100644
--- a/mgmt/api/EventControlMain.cc
+++ b/mgmt/api/EventControlMain.cc
@@ -61,7 +61,7 @@ new_event_client()
EventClientT *ele = (EventClientT *)ats_malloc(sizeof(EventClientT));
// now set the alarms registered section
- for (int i = 0; i < NUM_EVENTS; i++)
+ for (int i = 0; i < NUM_EVENTS; i++)
ele->events_registered[i] = 0;
ele->adr = (struct sockaddr *)ats_malloc(sizeof(struct sockaddr));
@@ -209,8 +209,8 @@ apiEventCallback(alarm_t newAlarm, const char * /* ip ATS_UNUSED */, const char
// addEvent(new_alarm, ip, desc) // adds event to mgmt_events
TSMgmtEvent *newEvent;
- newEvent = TSEventCreate();
- newEvent->id = newAlarm;
+ newEvent = TSEventCreate();
+ newEvent->id = newAlarm;
newEvent->name = get_event_name(newEvent->id);
// newEvent->ip = ats_strdup(ip);
if (desc)
@@ -242,7 +242,7 @@ event_callback_main(void *arg)
int *socket_fd;
int con_socket_fd; // main socket for listening to new connections
- socket_fd = (int *)arg;
+ socket_fd = (int *)arg;
con_socket_fd = *socket_fd; // the socket for event callbacks
Debug("event", "[event_callback_main] listen on socket = %d\n", con_socket_fd);
@@ -272,7 +272,7 @@ event_callback_main(void *arg)
while (1) {
// LINUX fix: to prevent hard-spin reset timeout on each loop
- timeout.tv_sec = 1;
+ timeout.tv_sec = 1;
timeout.tv_usec = 0;
FD_ZERO(&selectFDs);
@@ -312,7 +312,7 @@ event_callback_main(void *arg)
} else {
// accept connection
socklen_t addr_len = (sizeof(struct sockaddr));
- new_con_fd = mgmt_accept(con_socket_fd, new_client_con->adr, &addr_len);
+ new_con_fd = mgmt_accept(con_socket_fd, new_client_con->adr, &addr_len);
new_client_con->fd = new_con_fd;
ink_hash_table_insert(accepted_clients, (char *)&new_client_con->fd, new_client_con);
Debug("event", "[event_callback_main] Accept new connection: fd=%d\n", new_con_fd);
@@ -386,7 +386,7 @@ event_callback_main(void *arg)
while (con_entry) {
client_entry = (EventClientT *)ink_hash_table_entry_value(accepted_clients, con_entry);
if (client_entry->events_registered[event->id]) {
- MgmtMarshallInt optype = EVENT_NOTIFY;
+ MgmtMarshallInt optype = EVENT_NOTIFY;
MgmtMarshallString name = event->name;
MgmtMarshallString desc = event->description;
diff --git a/mgmt/api/GenericParser.cc b/mgmt/api/GenericParser.cc
index 7a00b9d..0eb5121 100644
--- a/mgmt/api/GenericParser.cc
+++ b/mgmt/api/GenericParser.cc
@@ -62,8 +62,8 @@ Token::setValue(const char *str)
ink_assert(value == NULL);
if (str_copy) {
size_t len = strlen(str_copy);
- value = (char *)ats_malloc(sizeof(char) * (BUFSIZ));
- len = (len < BUFSIZ) ? len : BUFSIZ - 1;
+ value = (char *)ats_malloc(sizeof(char) * (BUFSIZ));
+ len = (len < BUFSIZ) ? len : BUFSIZ - 1;
memcpy(value, str_copy, len);
value[len] = '\0';
ats_free(str_copy);
@@ -73,7 +73,7 @@ Token::setValue(const char *str)
void
Token::appendValue(const char *str)
{
- char *str_copy = (char *)strtrim(str);
+ char *str_copy = (char *)strtrim(str);
static bool firstTime = true;
if (value == NULL) {
@@ -233,8 +233,8 @@ Rule::arm_securityParse(char *rule)
Tokenizer ruleTok(" \t");
ruleTok.Initialize(rule);
tok_iter_state ruleTok_state;
- const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
- Token *token = (Token *)NULL;
+ const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
+ Token *token = (Token *)NULL;
TokenList *m_tokenList = new TokenList();
// ASSUMPTIONS:
@@ -278,8 +278,8 @@ Rule::cacheParse(char *rule, unsigned short minNumToken, unsigned short maxNumTo
int numRuleTok = ruleTok.Initialize(rule);
tok_iter_state ruleTok_state;
const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
- Token *token = NULL;
- bool insideQuote = false;
+ Token *token = NULL;
+ bool insideQuote = false;
const char *newStr;
// Sanity Check -- number of token
@@ -450,7 +450,7 @@ Rule::log_hostsParse(char *rule)
return NULL;
}
- Token *token = new Token();
+ Token *token = new Token();
TokenList *m_tokenList = new TokenList();
token->setName(rule);
m_tokenList->enqueue(token);
@@ -558,8 +558,8 @@ Rule::socksParse(char *rule)
int numRuleTok = ruleTok.Initialize(rule);
tok_iter_state ruleTok_state;
const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
- Token *token = NULL;
- bool insideQuote = false;
+ Token *token = NULL;
+ bool insideQuote = false;
const char *newStr;
if (numRuleTok < 2) {
@@ -670,8 +670,8 @@ Rule::splitdnsParse(char *rule)
int numRuleTok = ruleTok.Initialize(rule);
tok_iter_state ruleTok_state;
const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
- Token *token = NULL;
- bool insideQuote = false;
+ Token *token = NULL;
+ bool insideQuote = false;
const char *newStr;
// Sanity Check -- number of token
@@ -973,7 +973,7 @@ RuleList::parse(char *fileBuf, TSFileNameT filetype)
} else {
// rule->setComment("## WARNING: The following configuration rule is invalid!");
size_t error_rule_size = sizeof(char) * (strlen(line) + strlen("#ERROR: ") + 1);
- char *error_rule = (char *)ats_malloc(error_rule_size);
+ char *error_rule = (char *)ats_malloc(error_rule_size);
snprintf(error_rule, error_rule_size, "#ERROR: %s", line);
rule->setComment(error_rule);
diff --git a/mgmt/api/INKMgmtAPI.cc b/mgmt/api/INKMgmtAPI.cc
index f989b71..b1851e1 100644
--- a/mgmt/api/INKMgmtAPI.cc
+++ b/mgmt/api/INKMgmtAPI.cc
@@ -657,19 +657,19 @@ TSIntListIsValid(TSIntList intl, int min, int max)
void
init_pdss_format(TSPdSsFormat &info)
{
- info.pd_type = TS_PD_UNDEFINED;
- info.pd_val = NULL;
- info.sec_spec.active = 0;
+ info.pd_type = TS_PD_UNDEFINED;
+ info.pd_val = NULL;
+ info.sec_spec.active = 0;
info.sec_spec.time.hour_a = 0;
- info.sec_spec.time.min_a = 0;
+ info.sec_spec.time.min_a = 0;
info.sec_spec.time.hour_b = 0;
- info.sec_spec.time.min_b = 0;
- info.sec_spec.src_ip = TS_INVALID_IP_ADDR;
- info.sec_spec.prefix = NULL;
- info.sec_spec.suffix = NULL;
- info.sec_spec.port = TS_INVALID_PORT;
- info.sec_spec.method = TS_METHOD_UNDEFINED;
- info.sec_spec.scheme = TS_SCHEME_UNDEFINED;
+ info.sec_spec.time.min_b = 0;
+ info.sec_spec.src_ip = TS_INVALID_IP_ADDR;
+ info.sec_spec.prefix = NULL;
+ info.sec_spec.suffix = NULL;
+ info.sec_spec.port = TS_INVALID_PORT;
+ info.sec_spec.method = TS_METHOD_UNDEFINED;
+ info.sec_spec.scheme = TS_SCHEME_UNDEFINED;
}
/*--- allocate/deallocate operations --------------------------------------*/
@@ -678,10 +678,10 @@ TSEventCreate(void)
{
TSMgmtEvent *event = (TSMgmtEvent *)ats_malloc(sizeof(TSMgmtEvent));
- event->id = -1;
- event->name = NULL;
+ event->id = -1;
+ event->name = NULL;
event->description = NULL;
- event->priority = TS_EVENT_PRIORITY_UNDEFINED;
+ event->priority = TS_EVENT_PRIORITY_UNDEFINED;
return event;
}
@@ -726,11 +726,11 @@ TSIpAddrEleCreate(void)
TSIpAddrEle *ele = (TSIpAddrEle *)ats_malloc(sizeof(TSIpAddrEle));
/* set default values */
- ele->type = TS_IP_UNDEFINED;
- ele->ip_a = TS_INVALID_IP_ADDR;
+ ele->type = TS_IP_UNDEFINED;
+ ele->ip_a = TS_INVALID_IP_ADDR;
ele->cidr_a = TS_INVALID_IP_CIDR;
ele->port_a = TS_INVALID_PORT;
- ele->ip_b = TS_INVALID_IP_ADDR;
+ ele->ip_b = TS_INVALID_IP_ADDR;
ele->cidr_b = TS_INVALID_IP_CIDR;
ele->port_b = TS_INVALID_PORT;
return ele;
@@ -772,7 +772,7 @@ TSDomainCreate()
TSDomain *ele = (TSDomain *)ats_malloc(sizeof(TSDomain));
ele->domain_val = NULL;
- ele->port = TS_INVALID_PORT;
+ ele->port = TS_INVALID_PORT;
return ele;
}
@@ -792,17 +792,17 @@ TSSspecCreate(void)
TSSspec *sec_spec = (TSSspec *)ats_malloc(sizeof(TSSspec));
/* set defaults */
- sec_spec->active = 0;
+ sec_spec->active = 0;
(sec_spec->time).hour_a = 0;
- (sec_spec->time).min_a = 0;
+ (sec_spec->time).min_a = 0;
(sec_spec->time).hour_b = 0;
- (sec_spec->time).min_b = 0;
- sec_spec->src_ip = TS_INVALID_IP_ADDR;
- sec_spec->prefix = NULL;
- sec_spec->suffix = NULL;
- sec_spec->port = NULL;
- sec_spec->method = TS_METHOD_UNDEFINED;
- sec_spec->scheme = TS_SCHEME_UNDEFINED;
+ (sec_spec->time).min_b = 0;
+ sec_spec->src_ip = TS_INVALID_IP_ADDR;
+ sec_spec->prefix = NULL;
+ sec_spec->suffix = NULL;
+ sec_spec->port = NULL;
+ sec_spec->method = TS_METHOD_UNDEFINED;
+ sec_spec->scheme = TS_SCHEME_UNDEFINED;
return sec_spec;
}
@@ -826,19 +826,19 @@ TSPdSsFormatCreate(void)
/* should set default values here */
ele->pd_type = TS_PD_UNDEFINED;
- ele->pd_val = NULL;
+ ele->pd_val = NULL;
- ele->sec_spec.active = 0;
+ ele->sec_spec.active = 0;
(ele->sec_spec.time).hour_a = -1;
- (ele->sec_spec.time).min_a = -1;
+ (ele->sec_spec.time).min_a = -1;
(ele->sec_spec.time).hour_b = -1;
- (ele->sec_spec.time).min_b = -1;
- ele->sec_spec.src_ip = TS_INVALID_IP_ADDR;
- ele->sec_spec.prefix = NULL;
- ele->sec_spec.suffix = NULL;
- ele->sec_spec.port = NULL;
- ele->sec_spec.method = TS_METHOD_UNDEFINED;
- ele->sec_spec.scheme = TS_SCHEME_UNDEFINED;
+ (ele->sec_spec.time).min_b = -1;
+ ele->sec_spec.src_ip = TS_INVALID_IP_ADDR;
+ ele->sec_spec.prefix = NULL;
+ ele->sec_spec.suffix = NULL;
+ ele->sec_spec.port = NULL;
+ ele->sec_spec.method = TS_METHOD_UNDEFINED;
+ ele->sec_spec.scheme = TS_SCHEME_UNDEFINED;
return ele;
}
@@ -870,7 +870,7 @@ TSCacheEleCreate(TSRuleTypeT type)
ele = (TSCacheEle *)ats_malloc(sizeof(TSCacheEle));
/* set defaults */
- ele->cfg_ele.type = type;
+ ele->cfg_ele.type = type;
ele->cfg_ele.error = TS_ERR_OKAY;
init_pdss_format(ele->cache_info);
ele->time_period.d = 0;
@@ -903,25 +903,25 @@ TSCongestionEleCreate()
TSCongestionEle *ele = (TSCongestionEle *)ats_malloc(sizeof(TSCongestionEle));
/* set defaults */
- ele->cfg_ele.type = TS_CONGESTION;
+ ele->cfg_ele.type = TS_CONGESTION;
ele->cfg_ele.error = TS_ERR_OKAY;
// init_pdss_format(ele->congestion_info);
- ele->pd_type = TS_PD_UNDEFINED;
- ele->pd_val = NULL;
- ele->prefix = NULL;
- ele->port = TS_INVALID_PORT;
- ele->scheme = TS_HTTP_CONGEST_PER_IP;
+ ele->pd_type = TS_PD_UNDEFINED;
+ ele->pd_val = NULL;
+ ele->prefix = NULL;
+ ele->port = TS_INVALID_PORT;
+ ele->scheme = TS_HTTP_CONGEST_PER_IP;
ele->max_connection_failures = 5;
- ele->fail_window = 120;
- ele->proxy_retry_interval = 10;
- ele->client_wait_interval = 300;
- ele->wait_interval_alpha = 30;
- ele->live_os_conn_timeout = 60;
- ele->live_os_conn_retries = 2;
- ele->dead_os_conn_timeout = 15;
- ele->dead_os_conn_retries = 1;
- ele->max_connection = -1;
- ele->error_page_uri = ats_strdup("congestion#retryAfter");
+ ele->fail_window = 120;
+ ele->proxy_retry_interval = 10;
+ ele->client_wait_interval = 300;
+ ele->wait_interval_alpha = 30;
+ ele->live_os_conn_timeout = 60;
+ ele->live_os_conn_retries = 2;
+ ele->dead_os_conn_timeout = 15;
+ ele->dead_os_conn_retries = 1;
+ ele->max_connection = -1;
+ ele->error_page_uri = ats_strdup("congestion#retryAfter");
return ele;
}
@@ -946,11 +946,11 @@ TSHostingEleCreate()
{
TSHostingEle *ele = (TSHostingEle *)ats_malloc(sizeof(TSHostingEle));
- ele->cfg_ele.type = TS_HOSTING;
+ ele->cfg_ele.type = TS_HOSTING;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->pd_type = TS_PD_UNDEFINED;
- ele->pd_val = NULL;
- ele->volumes = TS_INVALID_LIST;
+ ele->pd_type = TS_PD_UNDEFINED;
+ ele->pd_val = NULL;
+ ele->volumes = TS_INVALID_LIST;
return ele;
}
@@ -976,16 +976,16 @@ TSIcpEleCreate()
TSIcpEle *ele = (TSIcpEle *)ats_malloc(sizeof(TSIcpEle));
/* set defaults */
- ele->cfg_ele.type = TS_ICP;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->peer_hostname = NULL;
+ ele->cfg_ele.type = TS_ICP;
+ ele->cfg_ele.error = TS_ERR_OKAY;
+ ele->peer_hostname = NULL;
ele->peer_host_ip_addr = TS_INVALID_IP_ADDR;
- ele->peer_type = TS_ICP_UNDEFINED;
- ele->peer_proxy_port = TS_INVALID_PORT;
- ele->peer_icp_port = TS_INVALID_PORT;
- ele->is_multicast = false;
- ele->mc_ip_addr = TS_INVALID_IP_ADDR;
- ele->mc_ttl = TS_MC_TTL_SINGLE_SUBNET; // default value
+ ele->peer_type = TS_ICP_UNDEFINED;
+ ele->peer_proxy_port = TS_INVALID_PORT;
+ ele->peer_icp_port = TS_INVALID_PORT;
+ ele->is_multicast = false;
+ ele->mc_ip_addr = TS_INVALID_IP_ADDR;
+ ele->mc_ttl = TS_MC_TTL_SINGLE_SUBNET; // default value
return ele;
}
@@ -1010,10 +1010,10 @@ TSIpAllowEleCreate()
{
TSIpAllowEle *ele = (TSIpAllowEle *)ats_malloc(sizeof(TSIpAllowEle));
- ele->cfg_ele.type = TS_IP_ALLOW;
+ ele->cfg_ele.type = TS_IP_ALLOW;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->src_ip_addr = TS_INVALID_IP_ADDR;
- ele->action = TS_IP_ALLOW_UNDEFINED;
+ ele->src_ip_addr = TS_INVALID_IP_ADDR;
+ ele->action = TS_IP_ALLOW_UNDEFINED;
return ele;
}
@@ -1037,14 +1037,14 @@ TSLogFilterEleCreate()
{
TSLogFilterEle *ele = (TSLogFilterEle *)ats_malloc(sizeof(TSLogFilterEle));
- ele->cfg_ele.type = TS_LOG_FILTER;
+ ele->cfg_ele.type = TS_LOG_FILTER;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->action = TS_LOG_FILT_UNDEFINED;
- ele->filter_name = NULL;
- ele->log_field = NULL;
- ele->compare_op = TS_LOG_COND_UNDEFINED;
- ele->compare_str = NULL;
- ele->compare_int = -1;
+ ele->action = TS_LOG_FILT_UNDEFINED;
+ ele->filter_name = NULL;
+ ele->log_field = NULL;
+ ele->compare_op = TS_LOG_COND_UNDEFINED;
+ ele->compare_str = NULL;
+ ele->compare_int = -1;
return ele;
}
@@ -1068,10 +1068,10 @@ TSLogFormatEleCreate()
{
TSLogFormatEle *ele = (TSLogFormatEle *)ats_malloc(sizeof(TSLogFormatEle));
- ele->cfg_ele.type = TS_LOG_FORMAT;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->name = NULL;
- ele->format = NULL;
+ ele->cfg_ele.type = TS_LOG_FORMAT;
+ ele->cfg_ele.error = TS_ERR_OKAY;
+ ele->name = NULL;
+ ele->format = NULL;
ele->aggregate_interval_secs = 0;
return ele;
@@ -1096,15 +1096,15 @@ TSLogObjectEleCreate()
{
TSLogObjectEle *ele = (TSLogObjectEle *)ats_malloc(sizeof(TSLogObjectEle));
- ele->cfg_ele.type = TS_LOG_OBJECT;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->format_name = NULL;
- ele->file_name = NULL;
- ele->log_mode = TS_LOG_MODE_UNDEFINED;
+ ele->cfg_ele.type = TS_LOG_OBJECT;
+ ele->cfg_ele.error = TS_ERR_OKAY;
+ ele->format_name = NULL;
+ ele->file_name = NULL;
+ ele->log_mode = TS_LOG_MODE_UNDEFINED;
ele->collation_hosts = TS_INVALID_LIST;
- ele->filters = TS_INVALID_LIST;
- ele->protocols = TS_INVALID_LIST;
- ele->server_hosts = TS_INVALID_LIST;
+ ele->filters = TS_INVALID_LIST;
+ ele->protocols = TS_INVALID_LIST;
+ ele->server_hosts = TS_INVALID_LIST;
return ele;
}
@@ -1141,12 +1141,12 @@ TSParentProxyEleCreate(TSRuleTypeT type)
ele = (TSParentProxyEle *)ats_malloc(sizeof(TSParentProxyEle));
- ele->cfg_ele.type = type;
+ ele->cfg_ele.type = type;
ele->cfg_ele.error = TS_ERR_OKAY;
init_pdss_format(ele->parent_info);
- ele->rr = TS_RR_NONE;
+ ele->rr = TS_RR_NONE;
ele->proxy_list = TS_INVALID_LIST;
- ele->direct = false;
+ ele->direct = false;
return ele;
}
@@ -1172,12 +1172,12 @@ TSVolumeEleCreate()
{
TSVolumeEle *ele = (TSVolumeEle *)ats_malloc(sizeof(TSVolumeEle));
- ele->cfg_ele.type = TS_VOLUME;
+ ele->cfg_ele.type = TS_VOLUME;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->volume_num = 0;
- ele->scheme = TS_VOLUME_UNDEFINED;
- ele->volume_size = 0;
- ele->size_format = TS_SIZE_FMT_UNDEFINED;
+ ele->volume_num = 0;
+ ele->scheme = TS_VOLUME_UNDEFINED;
+ ele->volume_size = 0;
+ ele->size_format = TS_SIZE_FMT_UNDEFINED;
return ele;
}
@@ -1197,10 +1197,10 @@ TSPluginEleCreate()
{
TSPluginEle *ele = (TSPluginEle *)ats_malloc(sizeof(TSPluginEle));
- ele->cfg_ele.type = TS_PLUGIN;
+ ele->cfg_ele.type = TS_PLUGIN;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->name = NULL;
- ele->args = TS_INVALID_LIST;
+ ele->name = NULL;
+ ele->args = TS_INVALID_LIST;
return ele;
}
@@ -1229,18 +1229,18 @@ TSRemapEleCreate(TSRuleTypeT type)
type != TS_TYPE_UNDEFINED)
return NULL;
- ele = (TSRemapEle *)ats_malloc(sizeof(TSRemapEle));
- ele->cfg_ele.type = type;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->map = true;
- ele->from_scheme = TS_SCHEME_UNDEFINED;
- ele->from_host = NULL;
- ele->from_port = TS_INVALID_PORT;
+ ele = (TSRemapEle *)ats_malloc(sizeof(TSRemapEle));
+ ele->cfg_ele.type = type;
+ ele->cfg_ele.error = TS_ERR_OKAY;
+ ele->map = true;
+ ele->from_scheme = TS_SCHEME_UNDEFINED;
+ ele->from_host = NULL;
+ ele->from_port = TS_INVALID_PORT;
ele->from_path_prefix = NULL;
- ele->to_scheme = TS_SCHEME_UNDEFINED;
- ele->to_host = NULL;
- ele->to_port = TS_INVALID_PORT;
- ele->to_path_prefix = NULL;
+ ele->to_scheme = TS_SCHEME_UNDEFINED;
+ ele->to_host = NULL;
+ ele->to_port = TS_INVALID_PORT;
+ ele->to_path_prefix = NULL;
return ele;
}
@@ -1265,14 +1265,14 @@ TSSocksEleCreate(TSRuleTypeT type)
{
TSSocksEle *ele = (TSSocksEle *)ats_malloc(sizeof(TSSocksEle));
- ele->cfg_ele.type = type;
+ ele->cfg_ele.type = type;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->ip_addrs = TS_INVALID_LIST;
- ele->dest_ip_addr = TS_INVALID_IP_ADDR;
+ ele->ip_addrs = TS_INVALID_LIST;
+ ele->dest_ip_addr = TS_INVALID_IP_ADDR;
ele->socks_servers = TS_INVALID_LIST;
- ele->rr = TS_RR_NONE;
- ele->username = NULL;
- ele->password = NULL;
+ ele->rr = TS_RR_NONE;
+ ele->username = NULL;
+ ele->password = NULL;
return ele;
}
@@ -1301,13 +1301,13 @@ TSSplitDnsEleCreate()
{
TSSplitDnsEle *ele = (TSSplitDnsEle *)ats_malloc(sizeof(TSSplitDnsEle));
- ele->cfg_ele.type = TS_SPLIT_DNS;
- ele->cfg_ele.error = TS_ERR_OKAY;
- ele->pd_type = TS_PD_UNDEFINED;
- ele->pd_val = NULL;
+ ele->cfg_ele.type = TS_SPLIT_DNS;
+ ele->cfg_ele.error = TS_ERR_OKAY;
+ ele->pd_type = TS_PD_UNDEFINED;
+ ele->pd_val = NULL;
ele->dns_servers_addrs = TS_INVALID_LIST;
- ele->def_domain = NULL;
- ele->search_list = TS_INVALID_LIST;
+ ele->def_domain = NULL;
+ ele->search_list = TS_INVALID_LIST;
return ele;
}
@@ -1335,10 +1335,10 @@ TSStorageEleCreate()
{
TSStorageEle *ele = (TSStorageEle *)ats_malloc(sizeof(TSStorageEle));
- ele->cfg_ele.type = TS_STORAGE;
+ ele->cfg_ele.type = TS_STORAGE;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->pathname = NULL;
- ele->size = -1;
+ ele->pathname = NULL;
+ ele->size = -1;
return ele;
}
@@ -1361,11 +1361,11 @@ TSVirtIpAddrEleCreate()
{
TSVirtIpAddrEle *ele = (TSVirtIpAddrEle *)ats_malloc(sizeof(TSVirtIpAddrEle));
- ele->cfg_ele.type = TS_VADDRS;
+ ele->cfg_ele.type = TS_VADDRS;
ele->cfg_ele.error = TS_ERR_OKAY;
- ele->intr = NULL;
- ele->sub_intr = -1;
- ele->ip_addr = TS_INVALID_IP_ADDR;
+ ele->intr = NULL;
+ ele->sub_intr = -1;
+ ele->ip_addr = TS_INVALID_IP_ADDR;
return ele;
}
@@ -1406,7 +1406,7 @@ TSRecordGetInt(const char *rec_name, TSInt *int_val)
TSMgmtError ret = TS_ERR_OKAY;
TSRecordEle *ele = TSRecordEleCreate();
- ret = MgmtRecordGet(rec_name, ele);
+ ret = MgmtRecordGet(rec_name, ele);
if (ret != TS_ERR_OKAY)
goto END;
@@ -1423,7 +1423,7 @@ TSRecordGetCounter(const char *rec_name, TSCounter *counter_val)
TSMgmtError ret;
TSRecordEle *ele = TSRecordEleCreate();
- ret = MgmtRecordGet(rec_name, ele);
+ ret = MgmtRecordGet(rec_name, ele);
if (ret != TS_ERR_OKAY)
goto END;
*counter_val = ele->valueT.counter_val;
@@ -1439,7 +1439,7 @@ TSRecordGetFloat(const char *rec_name, TSFloat *float_val)
TSMgmtError ret;
TSRecordEle *ele = TSRecordEleCreate();
- ret = MgmtRecordGet(rec_name, ele);
+ ret = MgmtRecordGet(rec_name, ele);
if (ret != TS_ERR_OKAY)
goto END;
*float_val = ele->valueT.float_val;
@@ -1455,7 +1455,7 @@ TSRecordGetString(const char *rec_name, TSString *string_val)
TSMgmtError ret;
TSRecordEle *ele = TSRecordEleCreate();
- ret = MgmtRecordGet(rec_name, ele);
+ ret = MgmtRecordGet(rec_name, ele);
if (ret != TS_ERR_OKAY)
goto END;
@@ -1583,7 +1583,7 @@ TSRecordSetMlt(TSList rec_list, TSActionNeedT *action_need)
{
int num_recs, ret, i;
TSRecordEle *ele;
- TSMgmtError status = TS_ERR_OKAY;
+ TSMgmtError status = TS_ERR_OKAY;
TSActionNeedT top_action_req = TS_ACTION_UNDEFINED;
if (!rec_list || !action_need)
@@ -1862,7 +1862,7 @@ TSEncryptPassword(char *passwd, char **e_passwd)
ink_assert(TS_ENCRYPT_PASSWD_LEN <= passwd_md5_str_len);
const size_t md5StringSize = (passwd_md5_str_len + 1) * sizeof(char);
- passwd_md5_str = (char *)ats_malloc(md5StringSize);
+ passwd_md5_str = (char *)ats_malloc(md5StringSize);
ink_code_incr_md5_init(&md5_context);
ink_code_incr_md5_update(&md5_context, passwd, strlen(passwd));
@@ -1871,7 +1871,7 @@ TSEncryptPassword(char *passwd, char **e_passwd)
// use only a subset of the MD5 string
passwd_md5_str[TS_ENCRYPT_PASSWD_LEN] = '\0';
- *e_passwd = passwd_md5_str;
+ *e_passwd = passwd_md5_str;
return TS_ERR_OKAY;
}
@@ -1916,11 +1916,11 @@ TSReadFromUrl(char *url, char **header, int *headerSize, char **body, int *bodyS
tsapi TSMgmtError
TSReadFromUrlEx(const char *url, char **header, int *headerSize, char **body, int *bodySize, int timeout)
{
- int hFD = -1;
+ int hFD = -1;
char *httpHost = NULL;
char *httpPath = NULL;
- int httpPort = HTTP_PORT;
- int bufsize = URL_BUFSIZE;
+ int httpPort = HTTP_PORT;
+ int bufsize = URL_BUFSIZE;
char buffer[URL_BUFSIZE];
char request[BUFSIZE];
char *hdr_temp;
@@ -1947,7 +1947,7 @@ TSReadFromUrlEx(const char *url, char **header, int *headerSize, char **body, in
httpPath = ats_strdup(tempPath);
} else {
host_and_port = ats_strdup(url);
- httpPath = ats_strdup("");
+ httpPath = ats_strdup("");
}
// the port proceed by a ":", if it exists
@@ -1983,7 +1983,7 @@ TSReadFromUrlEx(const char *url, char **header, int *headerSize, char **body, in
if (header && headerSize)
*header = ats_strndup(hdr_temp, *headerSize);
- *body = ats_strndup(bdy_temp, *bodySize);
+ *body = ats_strndup(bdy_temp, *bodySize);
END:
ats_free(httpHost);
@@ -2005,7 +2005,7 @@ TSLookupFromCacheUrl(TSString url, TSString *info)
char *body;
int hdr_size;
int bdy_size;
- int timeout = URL_TIMEOUT;
+ int timeout = URL_TIMEOUT;
TSInt ts_port = 8080;
if ((err = TSRecordGetInt("proxy.config.http.server_port", &ts_port)) != TS_ERR_OKAY)
@@ -2036,14 +2036,14 @@ tsapi TSMgmtError
TSLookupFromCacheUrlRegex(TSString url_regex, TSString *list)
{
TSMgmtError err = TS_ERR_OKAY;
- int fd = -1;
+ int fd = -1;
char request[BUFSIZE];
char response[URL_BUFSIZE];
char *header;
char *body;
int hdr_size;
int bdy_size;
- int timeout = -1;
+ int timeout = -1;
TSInt ts_port = 8080;
if ((err = TSRecordGetInt("proxy.config.http.server_port", &ts_port)) != TS_ERR_OKAY)
@@ -2073,14 +2073,14 @@ tsapi TSMgmtError
TSDeleteFromCacheUrl(TSString url, TSString *info)
{
TSMgmtError err = TS_ERR_OKAY;
- int fd = -1;
+ int fd = -1;
char request[BUFSIZE];
char response[URL_BUFSIZE];
char *header;
char *body;
int hdr_size;
int bdy_size;
- int timeout = URL_TIMEOUT;
+ int timeout = URL_TIMEOUT;
TSInt ts_port = 8080;
if ((err = TSRecordGetInt("proxy.config.http.server_port", &ts_port)) != TS_ERR_OKAY)
@@ -2111,14 +2111,14 @@ tsapi TSMgmtError
TSDeleteFromCacheUrlRegex(TSString url_regex, TSString *list)
{
TSMgmtError err = TS_ERR_OKAY;
- int fd = -1;
+ int fd = -1;
char request[BUFSIZE];
char response[URL_BUFSIZE];
char *header;
char *body;
int hdr_size;
int bdy_size;
- int timeout = -1;
+ int timeout = -1;
TSInt ts_port = 8080;
if ((err = TSRecordGetInt("proxy.config.http.server_port", &ts_port)) != TS_ERR_OKAY)
@@ -2148,14 +2148,14 @@ tsapi TSMgmtError
TSInvalidateFromCacheUrlRegex(TSString url_regex, TSString *list)
{
TSMgmtError err = TS_ERR_OKAY;
- int fd = -1;
+ int fd = -1;
char request[BUFSIZE];
char response[URL_BUFSIZE];
char *header;
char *body;
int hdr_size;
int bdy_size;
- int timeout = -1;
+ int timeout = -1;
TSInt ts_port = 8080;
if ((err = TSRecordGetInt("proxy.config.http.server_port", &ts_port)) != TS_ERR_OKAY)
diff --git a/mgmt/api/NetworkMessage.cc b/mgmt/api/NetworkMessage.cc
index 2ef23df..fc529bc 100644
--- a/mgmt/api/NetworkMessage.cc
+++ b/mgmt/api/NetworkMessage.cc
@@ -157,7 +157,7 @@ send_mgmt_request(int fd, OpType optype, ...)
{
va_list ap;
MgmtMarshallInt msglen;
- MgmtMarshallData req = {NULL, 0};
+ MgmtMarshallData req = {NULL, 0};
const MgmtMarshallType fields[] = {MGMT_MARSHALL_DATA};
const NetCmdOperation *cmd;
@@ -196,9 +196,9 @@ send_mgmt_request(int fd, OpType optype, ...)
TSMgmtError
send_mgmt_error(int fd, OpType optype, TSMgmtError error)
{
- MgmtMarshallInt ecode = error;
- MgmtMarshallInt intval = 0;
- MgmtMarshallData dataval = {NULL, 0};
+ MgmtMarshallInt ecode = error;
+ MgmtMarshallInt intval = 0;
+ MgmtMarshallData dataval = {NULL, 0};
MgmtMarshallString strval = NULL;
// Switch on operations, grouped by response format.
@@ -274,7 +274,7 @@ send_mgmt_response(int fd, OpType optype, ...)
{
va_list ap;
MgmtMarshallInt msglen;
- MgmtMarshallData reply = {NULL, 0};
+ MgmtMarshallData reply = {NULL, 0};
const MgmtMarshallType fields[] = {MGMT_MARSHALL_DATA};
const NetCmdOperation *cmd;
diff --git a/mgmt/api/NetworkUtilsLocal.cc b/mgmt/api/NetworkUtilsLocal.cc
index a627b2d..7275b45 100644
--- a/mgmt/api/NetworkUtilsLocal.cc
+++ b/mgmt/api/NetworkUtilsLocal.cc
@@ -57,7 +57,7 @@ preprocess_msg(int fd, void **req, size_t *reqlen)
TSMgmtError ret;
MgmtMarshallData msg;
- *req = NULL;
+ *req = NULL;
*reqlen = 0;
ret = recv_mgmt_message(fd, msg);
@@ -70,7 +70,7 @@ preprocess_msg(int fd, void **req, size_t *reqlen)
return TS_ERR_NET_READ;
}
- *req = msg.ptr;
+ *req = msg.ptr;
*reqlen = msg.len;
Debug("ts_main", "[preprocess_msg] read message length = %zd\n", msg.len);
return TS_ERR_OKAY;
diff --git a/mgmt/api/NetworkUtilsRemote.cc b/mgmt/api/NetworkUtilsRemote.cc
index 9ce659e..a117b6b 100644
--- a/mgmt/api/NetworkUtilsRemote.cc
+++ b/mgmt/api/NetworkUtilsRemote.cc
@@ -35,11 +35,11 @@
CallbackTable *remote_event_callbacks;
-int main_socket_fd = -1;
+int main_socket_fd = -1;
int event_socket_fd = -1;
// need to store for reconnecting scenario
-char *main_socket_path = NULL; // "<path>/mgmtapi.sock"
+char *main_socket_path = NULL; // "<path>/mgmtapi.sock"
char *event_socket_path = NULL; // "<path>/eventapi.sock"
static void *event_callback_thread(void *arg);
@@ -57,10 +57,10 @@ set_socket_paths(const char *path)
// construct paths based on user input
// form by replacing "mgmtapi.sock" with "eventapi.sock"
if (path) {
- main_socket_path = Layout::relative_to(path, MGMTAPI_MGMT_SOCKET_NAME);
+ main_socket_path = Layout::relative_to(path, MGMTAPI_MGMT_SOCKET_NAME);
event_socket_path = Layout::relative_to(path, MGMTAPI_EVENT_SOCKET_NAME);
} else {
- main_socket_path = NULL;
+ main_socket_path = NULL;
event_socket_path = NULL;
}
@@ -80,7 +80,7 @@ static bool
socket_test(int fd)
{
MgmtMarshallInt optype = API_PING;
- MgmtMarshallInt now = time(NULL);
+ MgmtMarshallInt now = time(NULL);
if (MGMTAPI_SEND_MESSAGE(fd, API_PING, &optype, &now) == TS_ERR_OKAY) {
return true; // write was successful; connection still open
@@ -156,7 +156,7 @@ ts_connect()
close(event_socket_fd);
close(main_socket_fd);
event_socket_fd = -1;
- main_socket_fd = -1;
+ main_socket_fd = -1;
goto ERROR; // connection is down
}
@@ -180,14 +180,14 @@ disconnect()
int ret;
if (main_socket_fd > 0) {
- ret = close(main_socket_fd);
+ ret = close(main_socket_fd);
main_socket_fd = -1;
if (ret < 0)
return TS_ERR_FAIL;
}
if (event_socket_fd > 0) {
- ret = close(event_socket_fd);
+ ret = close(event_socket_fd);
event_socket_fd = -1;
if (ret < 0)
return TS_ERR_FAIL;
@@ -253,7 +253,7 @@ reconnect()
TSMgmtError
reconnect_loop(int num_attempts)
{
- int numTries = 0;
+ int numTries = 0;
TSMgmtError err = TS_ERR_FAIL;
while (numTries < num_attempts) {
@@ -358,7 +358,7 @@ mgmtapi_sender::send(void *msg, size_t msglen) const
// clean-up sockets
close(main_socket_fd);
close(event_socket_fd);
- main_socket_fd = -1;
+ main_socket_fd = -1;
event_socket_fd = -1;
err = main_socket_reconnect();
@@ -443,7 +443,7 @@ send_register_all_callbacks(int fd, CallbackTable *cb_table)
events_with_cb = get_events_with_callbacks(cb_table);
// need to check that the list has all the events registered
if (!events_with_cb) { // all events have registered callback
- MgmtMarshallInt optype = EVENT_REG_CALLBACK;
+ MgmtMarshallInt optype = EVENT_REG_CALLBACK;
MgmtMarshallString event_name = NULL;
err = MGMTAPI_SEND_MESSAGE(fd, EVENT_REG_CALLBACK, &optype, &event_name);
@@ -453,15 +453,15 @@ send_register_all_callbacks(int fd, CallbackTable *cb_table)
int num_events = queue_len(events_with_cb);
// iterate through the LLQ and send request for each event
for (int i = 0; i < num_events; i++) {
- MgmtMarshallInt optype = EVENT_REG_CALLBACK;
- MgmtMarshallInt event_id = *(int *)dequeue(events_with_cb);
+ MgmtMarshallInt optype = EVENT_REG_CALLBACK;
+ MgmtMarshallInt event_id = *(int *)dequeue(events_with_cb);
MgmtMarshallString event_name = (char *)get_event_name(event_id);
if (event_name) {
err = MGMTAPI_SEND_MESSAGE(fd, EVENT_REG_CALLBACK, &optype, &event_name);
ats_free(event_name); // free memory
if (err != TS_ERR_OKAY) {
- send_err = err; // save the type of send error
+ send_err = err; // save the type of send error
no_errors = false;
}
}
@@ -508,7 +508,7 @@ send_unregister_all_callbacks(int fd, CallbackTable *cb_table)
int num_events = queue_len(events_with_cb);
// iterate through the LLQ and mark events that have a callback
for (int i = 0; i < num_events; i++) {
- event_id = *(int *)dequeue(events_with_cb);
+ event_id = *(int *)dequeue(events_with_cb);
reg_callback[event_id] = 1; // mark the event as having a callback
}
delete_queue(events_with_cb);
@@ -517,13 +517,13 @@ send_unregister_all_callbacks(int fd, CallbackTable *cb_table)
// send message to TM to mark unregister
for (int k = 0; k < NUM_EVENTS; k++) {
if (reg_callback[k] == 0) { // event has no registered callbacks
- MgmtMarshallInt optype = EVENT_UNREG_CALLBACK;
+ MgmtMarshallInt optype = EVENT_UNREG_CALLBACK;
MgmtMarshallString event_name = get_event_name(k);
err = MGMTAPI_SEND_MESSAGE(fd, EVENT_UNREG_CALLBACK, &optype, &event_name);
ats_free(event_name);
if (err != TS_ERR_OKAY) {
- send_err = err; // save the type of the sending error
+ send_err = err; // save the type of the sending error
no_errors = false;
}
// REMEMBER: WON"T GET A REPLY!
@@ -628,9 +628,9 @@ event_poll_thread_main(void *arg)
ink_assert(optype == EVENT_NOTIFY);
// The new event takes ownership of the message strings.
- event = TSEventCreate();
- event->name = name;
- event->id = get_event_id(name);
+ event = TSEventCreate();
+ event->name = name;
+ event->id = get_event_id(name);
event->description = desc;
// got event notice; spawn new thread to handle the event's callback functions
@@ -658,7 +658,7 @@ event_callback_thread(void *arg)
int index;
event_notice = (TSMgmtEvent *)arg;
- index = (int)event_notice->id;
+ index = (int)event_notice->id;
LLQ *func_q; // list of callback functions need to call
func_q = create_queue();
@@ -679,7 +679,7 @@ event_callback_thread(void *arg)
for (int i = 0; i < queue_depth; i++) {
event_cb = (EventCallbackT *)dequeue(remote_event_callbacks->event_callback_l[index]);
- cb = event_cb->func;
+ cb = event_cb->func;
enqueue(remote_event_callbacks->event_callback_l[index], event_cb);
enqueue(func_q, (void *)cb); // add callback function only to list
}
diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc
index 8506058..e82dbd3 100644
--- a/mgmt/api/TSControlMain.cc
+++ b/mgmt/api/TSControlMain.cc
@@ -123,7 +123,7 @@ ts_ctrl_main(void *arg)
int *socket_fd;
int con_socket_fd; // main socket for listening to new connections
- socket_fd = (int *)arg;
+ socket_fd = (int *)arg;
con_socket_fd = *socket_fd;
// initialize queue for accepted con
@@ -147,7 +147,7 @@ ts_ctrl_main(void *arg)
// loops until TM dies; waits for and processes requests from clients
while (1) {
// LINUX: to prevent hard-spin of CPU, reset timeout on each loop
- timeout.tv_sec = TIMEOUT_SECS;
+ timeout.tv_sec = TIMEOUT_SECS;
timeout.tv_usec = 0;
FD_ZERO(&selectFDs);
@@ -185,7 +185,7 @@ ts_ctrl_main(void *arg)
Debug("ts_main", "[ts_ctrl_main] can't allocate new ClientT\n");
} else { // accept connection
socklen_t addr_len = (sizeof(struct sockaddr));
- new_con_fd = mgmt_accept(con_socket_fd, new_client_con->adr, &addr_len);
+ new_con_fd = mgmt_accept(con_socket_fd, new_client_con->adr, &addr_len);
new_client_con->fd = new_con_fd;
ink_hash_table_insert(accepted_con, (char *)&new_client_con->fd, new_client_con);
Debug("ts_main", "[ts_ctrl_main] Add new client connection \n");
@@ -310,28 +310,28 @@ send_record_get_response(int fd, const RecRecord *rec)
MgmtMarshallData value = {NULL, 0};
if (rec) {
- type = rec->data_type;
+ type = rec->data_type;
rclass = rec->rec_type;
- name = const_cast<MgmtMarshallString>(rec->name);
+ name = const_cast<MgmtMarshallString>(rec->name);
} else {
- type = RECD_NULL;
+ type = RECD_NULL;
rclass = RECT_NULL;
- name = NULL;
+ name = NULL;
}
switch (type) {
case RECD_INT:
- type = TS_REC_INT;
+ type = TS_REC_INT;
value.ptr = (void *)&rec->data.rec_int;
value.len = sizeof(RecInt);
break;
case RECD_COUNTER:
- type = TS_REC_COUNTER;
+ type = TS_REC_COUNTER;
value.ptr = (void *)&rec->data.rec_counter;
value.len = sizeof(RecCounter);
break;
case RECD_FLOAT:
- type = TS_REC_FLOAT;
+ type = TS_REC_FLOAT;
value.ptr = (void *)&rec->data.rec_float;
value.len = sizeof(RecFloat);
break;
@@ -369,7 +369,7 @@ static void
send_record_get(const RecRecord *rec, void *edata)
{
int *fd = (int *)edata;
- *fd = send_record_get_response(*fd, rec);
+ *fd = send_record_get_response(*fd, rec);
}
static TSMgmtError
@@ -443,7 +443,7 @@ handle_record_match(int fd, void *req, size_t reqlen)
}
match.err = TS_ERR_OKAY;
- match.fd = fd;
+ match.fd = fd;
if (RecLookupMatchingRecords(RECT_ALL, name, send_record_match, &match) != REC_ERR_OKAY) {
ats_free(name);
@@ -473,7 +473,7 @@ handle_record_set(int fd, void *req, size_t reqlen)
TSMgmtError ret;
TSActionNeedT action = TS_ACTION_UNDEFINED;
MgmtMarshallInt optype;
- MgmtMarshallString name = NULL;
+ MgmtMarshallString name = NULL;
MgmtMarshallString value = NULL;
ret = recv_mgmt_request(req, reqlen, RECORD_SET, &optype, &name, &value);
@@ -516,7 +516,7 @@ handle_file_read(int fd, void *req, size_t reqlen)
MgmtMarshallInt fid;
MgmtMarshallInt err;
- MgmtMarshallInt vers = 0;
+ MgmtMarshallInt vers = 0;
MgmtMarshallData data = {NULL, 0};
err = recv_mgmt_request(req, reqlen, FILE_READ, &optype, &fid);
@@ -527,7 +527,7 @@ handle_file_read(int fd, void *req, size_t reqlen)
// make CoreAPI call on Traffic Manager side
err = ReadFile((TSFileNameT)fid, &text, &size, &version);
if (err == TS_ERR_OKAY) {
- vers = version;
+ vers = version;
data.ptr = text;
data.len = size;
}
@@ -1023,19 +1023,19 @@ handle_server_backtrace(int fd, void *req, size_t reqlen)
static void
send_record_describe(const RecRecord *rec, void *edata)
{
- MgmtMarshallString rec_name = NULL;
- MgmtMarshallData rec_value = {NULL, 0};
- MgmtMarshallData rec_default = {NULL, 0};
- MgmtMarshallInt rec_type = TS_REC_UNDEFINED;
- MgmtMarshallInt rec_class = RECT_NULL;
- MgmtMarshallInt rec_version = 0;
- MgmtMarshallInt rec_rsb = 0;
- MgmtMarshallInt rec_order = 0;
- MgmtMarshallInt rec_access = RECA_NULL;
- MgmtMarshallInt rec_update = RECU_NULL;
- MgmtMarshallInt rec_updatetype = 0;
- MgmtMarshallInt rec_checktype = RECC_NULL;
- MgmtMarshallInt rec_source = REC_SOURCE_NULL;
+ MgmtMarshallString rec_name = NULL;
+ MgmtMarshallData rec_value = {NULL, 0};
+ MgmtMarshallData rec_default = {NULL, 0};
+ MgmtMarshallInt rec_type = TS_REC_UNDEFINED;
+ MgmtMarshallInt rec_class = RECT_NULL;
+ MgmtMarshallInt rec_version = 0;
+ MgmtMarshallInt rec_rsb = 0;
+ MgmtMarshallInt rec_order = 0;
+ MgmtMarshallInt rec_access = RECA_NULL;
+ MgmtMarshallInt rec_update = RECU_NULL;
+ MgmtMarshallInt rec_updatetype = 0;
+ MgmtMarshallInt rec_checktype = RECC_NULL;
+ MgmtMarshallInt rec_source = REC_SOURCE_NULL;
MgmtMarshallString rec_checkexpr = NULL;
TSMgmtError err = TS_ERR_OKAY;
@@ -1053,18 +1053,18 @@ send_record_describe(const RecRecord *rec, void *edata)
return;
}
- rec_name = const_cast<char *>(rec->name);
- rec_type = rec->data_type;
- rec_class = rec->rec_type;
- rec_version = rec->version;
- rec_rsb = rec->rsb_id;
- rec_order = rec->order;
- rec_access = rec->config_meta.access_type;
- rec_update = rec->config_meta.update_required;
+ rec_name = const_cast<char *>(rec->name);
+ rec_type = rec->data_type;
+ rec_class = rec->rec_type;
+ rec_version = rec->version;
+ rec_rsb = rec->rsb_id;
+ rec_order = rec->order;
+ rec_access = rec->config_meta.access_type;
+ rec_update = rec->config_meta.update_required;
rec_updatetype = rec->config_meta.update_type;
- rec_checktype = rec->config_meta.check_type;
- rec_source = rec->config_meta.source;
- rec_checkexpr = rec->config_meta.check_expr;
+ rec_checktype = rec->config_meta.check_type;
+ rec_source = rec->config_meta.source;
+ rec_checkexpr = rec->config_meta.check_expr;
switch (rec_type) {
case RECD_INT:
@@ -1122,7 +1122,7 @@ handle_record_describe(int fd, void *req, size_t reqlen)
}
match.err = TS_ERR_OKAY;
- match.fd = fd;
+ match.fd = fd;
if (options & RECORD_DESCRIBE_FLAGS_MATCH) {
if (RecLookupMatchingRecords(RECT_CONFIG | RECT_LOCAL, name, send_record_describe, &match) != REC_ERR_OKAY) {
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index fbadc9c..bf3ea70 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -370,9 +370,9 @@ typedef enum {
} TSInitOptionT;
typedef enum {
- TS_RESTART_OPT_NONE = 0x0,
+ TS_RESTART_OPT_NONE = 0x0,
TS_RESTART_OPT_CLUSTER = 0x01, /* Restart across the cluster */
- TS_RESTART_OPT_DRAIN = 0x02, /* Wait for traffic to drain before restarting. */
+ TS_RESTART_OPT_DRAIN = 0x02, /* Wait for traffic to drain before restarting. */
} TSRestartOptionT;
/***************************************************************************
diff --git a/mgmt/cluster/ClusterCom.cc b/mgmt/cluster/ClusterCom.cc
index 0a28264..8241bb5 100644
--- a/mgmt/cluster/ClusterCom.cc
+++ b/mgmt/cluster/ClusterCom.cc
@@ -168,7 +168,7 @@ drainIncomingChannel(void *arg)
if (mgmt_read_timeout(ccom->reliable_server_fd, ccom->mc_poll_timeout /* secs */, 0 /* usecs */) > 0) {
/* Reliable(TCP) request */
socklen_t clilen = sizeof(cli_addr);
- int req_fd = mgmt_accept(ccom->reliable_server_fd, (struct sockaddr *)&cli_addr, &clilen);
+ int req_fd = mgmt_accept(ccom->reliable_server_fd, (struct sockaddr *)&cli_addr, &clilen);
if (req_fd < 0) {
mgmt_elog(stderr, errno, "[drainIncomingChannel] error accepting "
"reliable connection\n");
@@ -271,8 +271,8 @@ drainIncomingChannel(void *arg)
if (ccom->configFiles->getRollbackObj(fname, &rb) && (rb->getCurrentVersion() == ver) &&
(rb->getVersion(ver, &buff) == OK_ROLLBACK)) {
size_t bytes_written = 0;
- stat = true;
- bytes_written = write_socket(req_fd, buff->bufPtr(), strlen(buff->bufPtr()));
+ stat = true;
+ bytes_written = write_socket(req_fd, buff->bufPtr(), strlen(buff->bufPtr()));
if (bytes_written != strlen(buff->bufPtr())) {
stat = false;
mgmt_log(stderr, "[drainIncomingChannel] Failed file req: %s v: %d\n", fname, ver);
@@ -366,9 +366,9 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, i
cluster_type = CLUSTER_INVALID;
RecInt rec_int;
- rec_err = RecGetRecordInt("proxy.local.cluster.type", &rec_int);
+ rec_err = RecGetRecordInt("proxy.local.cluster.type", &rec_int);
cluster_type = (MgmtClusterType)rec_int;
- found = (rec_err == REC_ERR_OKAY);
+ found = (rec_err == REC_ERR_OKAY);
ink_assert(found);
switch (cluster_type) {
@@ -387,7 +387,7 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, i
RecString cluster_file;
rec_err = RecGetRecordString_Xmalloc("proxy.config.cluster.cluster_configuration", &cluster_file);
- found = (rec_err == REC_ERR_OKAY);
+ found = (rec_err == REC_ERR_OKAY);
if (!found) {
mgmt_fatal(stderr, 0, "[ClusterCom::ClusterCom] no cluster_configuration filename configured\n");
@@ -424,7 +424,7 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, i
}
ink_strlcpy(mc_group, group, sizeof(mc_group));
- mc_port = mcport;
+ mc_port = mcport;
reliable_server_port = rsport;
mc_ttl = REC_readInteger("proxy.config.cluster.mc_ttl", &found);
@@ -457,7 +457,7 @@ ClusterCom::ClusterCom(unsigned long oip, char *host, int mcport, char *group, i
last_shared_send = 0;
ink_mutex_init(&mutex, "ccom-mutex");
- peers = ink_hash_table_create(InkHashTableKeyType_String);
+ peers = ink_hash_table_create(InkHashTableKeyType_String);
mismatchLog = ink_hash_table_create(InkHashTableKeyType_String);
if (cluster_type != NO_CLUSTER) {
@@ -476,8 +476,8 @@ void
ClusterCom::checkPeers(time_t *ticker)
{
static int number_of_nodes = -1;
- bool signal_alarm = false;
- time_t t = time(NULL);
+ bool signal_alarm = false;
+ time_t t = time(NULL);
InkHashTableEntry *entry;
InkHashTableIteratorState iterator_state;
@@ -548,7 +548,7 @@ ClusterCom::checkPeers(time_t *ticker)
for (entry = ink_hash_table_iterator_first(peers, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(peers, &iterator_state)) {
char str_number[80];
- char *key = (char *)ink_hash_table_entry_key(peers, entry);
+ char *key = (char *)ink_hash_table_entry_key(peers, entry);
ClusterPeerInfo *tmp = (ClusterPeerInfo *)ink_hash_table_entry_value(peers, entry);
if (!c) { /* First pass */
@@ -618,7 +618,7 @@ ClusterCom::checkPeers(time_t *ticker)
mgmt_elog(0, "[ClusterCom::checkPeers] Failed update: cluster.config\n");
signal_alarm = true; /* Throw the alarm after releasing the lock */
} else {
- number_of_nodes = num_peers; /* Update the static count */
+ number_of_nodes = num_peers; /* Update the static count */
alive_peers_count = num_peers;
}
}
@@ -698,7 +698,7 @@ ClusterCom::handleMultiCastMessage(char *message)
{
int peer_cluster_port, ccom_port;
char *last, *line, ip[1024], hostname[1024];
- char tsver[128] = "Before 2.X";
+ char tsver[128] = "Before 2.X";
char cluster_name[1024] = "UNKNOWN";
RecT type;
ClusterPeerInfo *p;
@@ -707,7 +707,7 @@ ClusterCom::handleMultiCastMessage(char *message)
++MultiCastMessages;
- t = time(NULL); /* Get current time for determining most recent changes */
+ t = time(NULL); /* Get current time for determining most recent changes */
our_wall_clock = t;
/* Grab the ip address, we need to know this so that we only complain
@@ -829,15 +829,15 @@ ClusterCom::handleMultiCastMessage(char *message)
/* Have we see this guy before? */
ink_mutex_acquire(&(mutex)); /* Grab cluster lock to access hash table */
if (ink_hash_table_lookup(peers, (InkHashTableKey)ip, &hash_value) == 0) {
- p = (ClusterPeerInfo *)ats_malloc(sizeof(ClusterPeerInfo));
- p->inet_address = inet_addr(ip);
+ p = (ClusterPeerInfo *)ats_malloc(sizeof(ClusterPeerInfo));
+ p->inet_address = inet_addr(ip);
p->num_virt_addrs = 0;
// Safe since these are completely static
// TODO: This might no longer be completely optimal, since we don't keep track of
// how many RECT_NODE stats there are. I'm hoping it's negligible though, but worst
// case we can reoptimize this later (and more efficiently).
- int cnt = 0;
+ int cnt = 0;
p->node_rec_data.recs = (RecRecord *)ats_malloc(sizeof(RecRecord) * g_num_records);
for (int j = 0; j < g_num_records; j++) {
RecRecord *rec = &(g_records[j]);
@@ -847,12 +847,12 @@ ClusterCom::handleMultiCastMessage(char *message)
* defined in mgmt/RecordsConfig.cc are placed continuously.
*/
if (rec->rec_type == RECT_NODE) {
- p->node_rec_data.recs[cnt].rec_type = rec->rec_type;
- p->node_rec_data.recs[cnt].name = rec->name;
+ p->node_rec_data.recs[cnt].rec_type = rec->rec_type;
+ p->node_rec_data.recs[cnt].name = rec->name;
p->node_rec_data.recs[cnt].data_type = rec->data_type;
memset(&p->node_rec_data.recs[cnt].data, 0, sizeof(rec->data));
memset(&p->node_rec_data.recs[cnt].data_default, 0, sizeof(rec->data_default));
- p->node_rec_data.recs[cnt].lock = rec->lock;
+ p->node_rec_data.recs[cnt].lock = rec->lock;
p->node_rec_data.recs[cnt].sync_required = rec->sync_required;
++cnt;
}
@@ -872,12 +872,12 @@ ClusterCom::handleMultiCastMessage(char *message)
Note("marking server on node %s as up", ip);
}
}
- p->port = peer_cluster_port;
- p->ccom_port = ccom_port;
+ p->port = peer_cluster_port;
+ p->ccom_port = ccom_port;
p->idle_ticks = p->manager_idle_ticks = our_wall_clock;
- p->last_time_recorded = peer_wall_clock;
- p->delta = peer_wall_clock - our_wall_clock;
- p->manager_alive = 1;
+ p->last_time_recorded = peer_wall_clock;
+ p->delta = peer_wall_clock - our_wall_clock;
+ p->manager_alive = 1;
ink_assert(type == RECT_CLUSTER);
handleMultiCastStatPacket(last, p);
@@ -905,27 +905,27 @@ ClusterCom::handleMultiCastStatPacket(char *last, ClusterPeerInfo *peer)
{
char *line;
RecRecords *rec_ptr = NULL;
- int tmp_id = -1;
- RecDataT tmp_type = RECD_NULL;
- RecRecord *rec = NULL;
+ int tmp_id = -1;
+ RecDataT tmp_type = RECD_NULL;
+ RecRecord *rec = NULL;
/* Loop over records, updating peer copy(summed later) */
rec_ptr = &(peer->node_rec_data);
for (int i = 0; (line = strtok_r(NULL, "\n", &last)) && i < rec_ptr->num_recs; i++) {
- tmp_id = -1;
+ tmp_id = -1;
tmp_type = RECD_NULL;
- rec = &(rec_ptr->recs[i]);
+ rec = &(rec_ptr->recs[i]);
// rec = &(g_records[g_type_records[RECT_NODE][i]]);
switch (rec->data_type) {
case RECD_INT:
case RECD_COUNTER: {
RecInt tmp_msg_val = -1;
- tmp_id = ink_atoi(line);
+ tmp_id = ink_atoi(line);
char *v2 = strchr(line, ':'), *v3 = NULL;
if (v2) {
tmp_type = (RecDataT)ink_atoi(v2 + 1);
- v3 = strchr(v2 + 1, ':');
+ v3 = strchr(v2 + 1, ':');
if (v3)
tmp_msg_val = ink_atoi64(v3 + 1);
}
@@ -1029,7 +1029,7 @@ extract_locals(MgmtHashTable *local_ht, char *record_buffer)
p = record_buffer;
for (eof = false; !eof;) {
line = q = p;
- eof = scan_and_terminate(p, '\r', '\n');
+ eof = scan_and_terminate(p, '\r', '\n');
Debug("ccom_rec", "[extract_locals] %s\n", line);
while ((*q == ' ') || (*q == '\t'))
q++;
@@ -1058,10 +1058,10 @@ insert_locals(textBuffer *rec_cfg_new, textBuffer *rec_cfg, MgmtHashTable *local
InkHashTableEntry *hte;
InkHashTableIteratorState htis;
MgmtHashTable *local_access_ht = new MgmtHashTable("local_access_ht", false, InkHashTableKeyType_String);
- p = rec_cfg->bufPtr();
+ p = rec_cfg->bufPtr();
for (eof = false; !eof;) {
line = q = p;
- eof = scan_and_terminate(p, '\r', '\n');
+ eof = scan_and_terminate(p, '\r', '\n');
Debug("ccom_rec", "[insert_locals] %s\n", line);
while ((*q == ' ') || (*q == '\t'))
q++;
@@ -1175,7 +1175,7 @@ ClusterCom::handleMultiCastFilePacket(char *last, char *ip)
if (rb->getVersion(our_ver, &our_rec_cfg) != OK_ROLLBACK) {
file_update_failure = true;
} else {
- our_locals_ht = new MgmtHashTable("our_locals_ht", true, InkHashTableKeyType_String);
+ our_locals_ht = new MgmtHashTable("our_locals_ht", true, InkHashTableKeyType_String);
our_rec_cfg_cp = ats_strdup(our_rec_cfg->bufPtr());
extract_locals(our_locals_ht, our_rec_cfg_cp);
reply_new = new textBuffer(reply->spaceUsed());
@@ -1386,7 +1386,7 @@ ClusterCom::constructSharedGenericPacket(char *message, int max, RecT packet_typ
/* Insert the standard packet header */
resolved_addr.s_addr = our_ip;
- running_sum = constructSharedPacketHeader(appVersionInfo, message, inet_ntoa(resolved_addr), max);
+ running_sum = constructSharedPacketHeader(appVersionInfo, message, inet_ntoa(resolved_addr), max);
if (packet_type == RECT_NODE) {
ink_strlcpy(&message[running_sum], "type: stat\n", (max - running_sum));
@@ -1524,15 +1524,15 @@ ClusterCom::constructSharedFilePacket(char *message, int max)
/* Insert the standard packet header */
resolved_addr.s_addr = our_ip;
- running_sum = constructSharedPacketHeader(appVersionInfo, message, inet_ntoa(resolved_addr), max);
+ running_sum = constructSharedPacketHeader(appVersionInfo, message, inet_ntoa(resolved_addr), max);
ink_strlcpy(&message[running_sum], "type: files\n", (max - running_sum));
running_sum += strlen("type: files\n");
ink_release_assert(running_sum < max);
- buff = configFiles->filesManaged();
+ buff = configFiles->filesManaged();
files = buff->bufPtr();
- line = strtok_r(files, "\n", &last);
+ line = strtok_r(files, "\n", &last);
if (line == NULL) {
delete buff;
return;
@@ -1606,9 +1606,9 @@ ClusterCom::establishChannels()
}
memset(&serv_addr, 0, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
+ serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
- serv_addr.sin_port = htons(reliable_server_port);
+ serv_addr.sin_port = htons(reliable_server_port);
if ((bind(reliable_server_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr))) < 0) {
mgmt_fatal(errno, "[ClusterCom::establishChannels] Unable to bind socket (port:%d)\n", reliable_server_port);
@@ -1646,9 +1646,9 @@ ClusterCom::establishBroadcastChannel(void)
}
memset(&broadcast_addr, 0, sizeof(broadcast_addr));
- broadcast_addr.sin_family = AF_INET;
+ broadcast_addr.sin_family = AF_INET;
broadcast_addr.sin_addr.s_addr = inet_addr(mc_group);
- broadcast_addr.sin_port = htons(mc_port);
+ broadcast_addr.sin_port = htons(mc_port);
u_char ttl = mc_ttl, loop = 0;
@@ -1704,9 +1704,9 @@ ClusterCom::establishReceiveChannel(int fatal_on_error)
}
memset(&receive_addr, 0, sizeof(receive_addr));
- receive_addr.sin_family = AF_INET;
+ receive_addr.sin_family = AF_INET;
receive_addr.sin_addr.s_addr = htonl(INADDR_ANY);
- receive_addr.sin_port = htons(mc_port);
+ receive_addr.sin_port = htons(mc_port);
if (bind(receive_fd, (struct sockaddr *)&receive_addr, sizeof(receive_addr)) < 0) {
if (!fatal_on_error) {
@@ -1754,7 +1754,7 @@ ClusterCom::sendOutgoingMessage(char *buf, int len)
bool
ClusterCom::sendClusterMessage(int msg_type, const char *args)
{
- bool ret = true, tmp_ret;
+ bool ret = true, tmp_ret;
char msg[1124] = {0};
InkHashTableEntry *entry;
InkHashTableIteratorState iterator_state;
@@ -1850,9 +1850,9 @@ ClusterCom::rl_sendReliableMessage(unsigned long addr, const char *buf, int len)
cport = ((ClusterPeerInfo *)hash_value)->ccom_port;
memset(&serv_addr, 0, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
+ serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = addr;
- serv_addr.sin_port = htons(cport);
+ serv_addr.sin_port = htons(cport);
if ((fd = mgmt_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
mgmt_elog(errno, "[ClusterCom::rl_sendReliableMessage] Unable to create socket\n");
@@ -1906,9 +1906,9 @@ ClusterCom::sendReliableMessage(unsigned long addr, char *buf, int len, char *re
cport = ((ClusterPeerInfo *)hash_value)->ccom_port;
memset(&serv_addr, 0, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
+ serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = addr;
- serv_addr.sin_port = htons(cport);
+ serv_addr.sin_port = htons(cport);
if ((fd = mgmt_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
mgmt_elog(errno, "[ClusterCom::sendReliableMessage] Unable to create socket\n");
@@ -1985,9 +1985,9 @@ ClusterCom::sendReliableMessageReadTillClose(unsigned long addr, char *buf, int
cport = ((ClusterPeerInfo *)hash_value)->ccom_port;
memset(&serv_addr, 0, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
+ serv_addr.sin_family = AF_INET;
serv_addr.sin_addr.s_addr = addr;
- serv_addr.sin_port = htons(cport);
+ serv_addr.sin_port = htons(cport);
if ((fd = mgmt_socket(AF_INET, SOCK_STREAM, 0)) < 0) {
mgmt_elog(errno, "[ClusterCom::sendReliableMessageReadTillClose] Unable create sock\n");
@@ -2063,7 +2063,7 @@ ClusterCom::receiveIncomingMessage(char *buf, int max)
bool
ClusterCom::isMaster()
{
- bool init_flag = false;
+ bool init_flag = false;
unsigned long min = 0;
InkHashTableEntry *entry;
InkHashTableIteratorState iterator_state;
@@ -2076,7 +2076,7 @@ ClusterCom::isMaster()
continue;
} else if (!init_flag) {
init_flag = true;
- min = pinfo->inet_address;
+ min = pinfo->inet_address;
} else if (min > pinfo->inet_address) {
min = pinfo->inet_address;
}
@@ -2096,8 +2096,8 @@ ClusterCom::isMaster()
unsigned long
ClusterCom::lowestPeer(int *no)
{
- bool flag = true;
- int naddrs = -1;
+ bool flag = true;
+ int naddrs = -1;
unsigned long min_ip = 0;
InkHashTableEntry *entry;
InkHashTableIteratorState iterator_state;
@@ -2108,7 +2108,7 @@ ClusterCom::lowestPeer(int *no)
if (tmp->num_virt_addrs == -1) {
continue;
} else if (flag) {
- flag = false;
+ flag = false;
min_ip = tmp->inet_address;
naddrs = tmp->num_virt_addrs;
} else if (naddrs > tmp->num_virt_addrs) {
@@ -2169,8 +2169,8 @@ ClusterCom::logClusterMismatch(const char *ip, ClusterMismatch type, char *data)
unsigned long
ClusterCom::highestPeer(int *no)
{
- bool flag = true;
- int naddrs = -1;
+ bool flag = true;
+ int naddrs = -1;
unsigned long max_ip = 0;
InkHashTableEntry *entry;
InkHashTableIteratorState iterator_state;
@@ -2181,7 +2181,7 @@ ClusterCom::highestPeer(int *no)
if (tmp->num_virt_addrs == -1) {
continue;
} else if (flag) {
- flag = false;
+ flag = false;
max_ip = tmp->inet_address;
naddrs = tmp->num_virt_addrs;
} else if (naddrs < tmp->num_virt_addrs) {
@@ -2228,7 +2228,7 @@ checkBackDoor(int req_fd, char *message)
}
map_empty = true;
- tmp_msg = "\nPeer Map (virtual-ip real-ip):\n------------------------------\n";
+ tmp_msg = "\nPeer Map (virtual-ip real-ip):\n------------------------------\n";
mgmt_writeline(req_fd, tmp_msg, strlen(tmp_msg));
for (entry = ink_hash_table_iterator_first(lmgmt->virt_map->ext_map, &iterator_state); entry != NULL;
entry = ink_hash_table_iterator_next(lmgmt->virt_map->ext_map, &iterator_state)) {
@@ -2257,7 +2257,7 @@ checkBackDoor(int req_fd, char *message)
RecDataT stype = RECD_NULL;
if (RecGetRecordDataType(variable, &stype) == REC_ERR_OKAY) {
- bool found = false;
+ bool found = false;
int rep_len = 0;
switch (stype) {
diff --git a/mgmt/cluster/VMap.cc b/mgmt/cluster/VMap.cc
index 832ea2e..7cb9559 100644
--- a/mgmt/cluster/VMap.cc
+++ b/mgmt/cluster/VMap.cc
@@ -48,7 +48,7 @@ vmapEnableHandler(const char *tok, RecDataT /* data_type ATS_UNUSED */, RecData
bool before = true;
ink_assert(!tok);
if (!lmgmt->virt_map->enabled)
- before = false;
+ before = false;
lmgmt->virt_map->enabled = (RecInt)data.rec_int;
if (!lmgmt->virt_map->enabled && before) {
lmgmt->virt_map->turning_off = true; // turing VIP from off to on
@@ -66,18 +66,18 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
} // Wait until mutex pointer is initialized
mutex = m;
- our_ip = ip;
- num_interfaces = 0;
- id_map = NULL;
+ our_ip = ip;
+ num_interfaces = 0;
+ id_map = NULL;
interface_realip_map = ink_hash_table_create(InkHashTableKeyType_String);
- our_map = ink_hash_table_create(InkHashTableKeyType_String);
- ext_map = ink_hash_table_create(InkHashTableKeyType_String);
- addr_list = NULL;
- num_addrs = 0;
- num_nics = 0;
+ our_map = ink_hash_table_create(InkHashTableKeyType_String);
+ ext_map = ink_hash_table_create(InkHashTableKeyType_String);
+ addr_list = NULL;
+ num_addrs = 0;
+ num_nics = 0;
this->interface = ats_strdup(interface);
- turning_off = false; // we are not turning off VIP
+ turning_off = false; // we are not turning off VIP
enabled = REC_readInteger("proxy.config.vmap.enabled", &found);
/*
@@ -94,8 +94,8 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
tmp_addr.s_addr = ip;
- tmp_realip_info = (RealIPInfo *)ats_malloc(sizeof(RealIPInfo));
- tmp_realip_info->real_ip = tmp_addr;
+ tmp_realip_info = (RealIPInfo *)ats_malloc(sizeof(RealIPInfo));
+ tmp_realip_info->real_ip = tmp_addr;
tmp_realip_info->mappings_for_interface = true;
num_nics++;
@@ -120,9 +120,9 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
// INKqa06739
// Fetch the list of network interfaces
// . from Stevens, Unix Network Prog., pg 434-435
- ifbuf = 0;
+ ifbuf = 0;
lastlen = 0;
- len = 128 * sizeof(struct ifreq); // initial buffer size guess
+ len = 128 * sizeof(struct ifreq); // initial buffer size guess
for (;;) {
ifbuf = (char *)ats_malloc(len);
memset(ifbuf, 0, len); // prevent UMRs
@@ -160,8 +160,8 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
tmp = (struct sockaddr_in *)&ifr->ifr_ifru.ifru_addr;
- tmp_realip_info = (RealIPInfo *)ats_malloc(sizeof(RealIPInfo));
- tmp_realip_info->real_ip = tmp->sin_addr;
+ tmp_realip_info = (RealIPInfo *)ats_malloc(sizeof(RealIPInfo));
+ tmp_realip_info->real_ip = tmp->sin_addr;
tmp_realip_info->mappings_for_interface = false;
if (ink_hash_table_lookup(interface_realip_map, ifr->ifr_name, &hash_value) != 0) {
@@ -203,7 +203,7 @@ VMap::VMap(char *interface, unsigned long ip, ink_mutex *m)
lt_readAListFile(addr_list_fname);
map_change_thresh = 10;
- last_map_change = time(NULL);
+ last_map_change = time(NULL);
return;
@@ -500,7 +500,7 @@ VMap::rl_map(char *virt_ip, char *real_ip)
return false;
}
- entry = (bool *)ats_malloc(sizeof(bool));
+ entry = (bool *)ats_malloc(sizeof(bool));
*entry = true;
if (!real_ip) {
@@ -547,7 +547,7 @@ VMap::rl_unmap(char *virt_ip, char *real_ip)
char *
VMap::rl_checkConflict(char *virt_ip)
{
- char *key = NULL;
+ char *key = NULL;
bool in_our_map = false, in_ext_map = false;
InkHashTableValue hash_value;
InkHashTableEntry *entry;
diff --git a/mgmt/utils/ExpandingArray.cc b/mgmt/utils/ExpandingArray.cc
index d5e21b5..7afdcf1 100644
--- a/mgmt/utils/ExpandingArray.cc
+++ b/mgmt/utils/ExpandingArray.cc
@@ -34,8 +34,8 @@ ExpandingArray::ExpandingArray(int initialSize, bool freeContents)
internalArray = (void **)ats_malloc(initialSize * sizeof(void *));
freeContentsOnDestruct = freeContents;
- internalArraySize = initialSize;
- numValidValues = 0;
+ internalArraySize = initialSize;
+ numValidValues = 0;
}
ExpandingArray::~ExpandingArray()
diff --git a/mgmt/utils/MgmtHashTable.h b/mgmt/utils/MgmtHashTable.h
index dcd9a88..9f22194 100644
--- a/mgmt/utils/MgmtHashTable.h
+++ b/mgmt/utils/MgmtHashTable.h
@@ -44,7 +44,7 @@ public:
{
ink_mutex_init(&mutex, name);
destroy_and_free = free_on_delete;
- ht = ink_hash_table_create(type);
+ ht = ink_hash_table_create(type);
}
~MgmtHashTable()
diff --git a/mgmt/utils/MgmtMarshall.cc b/mgmt/utils/MgmtMarshall.cc
index f4531b2..4490e14 100644
--- a/mgmt/utils/MgmtMarshall.cc
+++ b/mgmt/utils/MgmtMarshall.cc
@@ -151,7 +151,7 @@ socket_read_buffer(int fd, MgmtMarshallData *data)
if (data->len) {
data->ptr = ats_malloc(data->len);
- nread = socket_read_bytes(fd, data->ptr, data->len);
+ nread = socket_read_bytes(fd, data->ptr, data->len);
if (nread != (ssize_t)data->len) {
goto fail;
}
@@ -271,11 +271,11 @@ mgmt_message_write_v(int fd, const MgmtMarshallType *fields, unsigned count, va_
switch (fields[n]) {
case MGMT_MARSHALL_INT:
ptr.m_int = va_arg(ap, MgmtMarshallInt *);
- nwritten = socket_write_bytes(fd, ptr.m_void, 4);
+ nwritten = socket_write_bytes(fd, ptr.m_void, 4);
break;
case MGMT_MARSHALL_LONG:
ptr.m_long = va_arg(ap, MgmtMarshallLong *);
- nwritten = socket_write_bytes(fd, ptr.m_void, 8);
+ nwritten = socket_write_bytes(fd, ptr.m_void, 8);
break;
case MGMT_MARSHALL_STRING: {
MgmtMarshallData data;
@@ -290,7 +290,7 @@ mgmt_message_write_v(int fd, const MgmtMarshallType *fields, unsigned count, va_
}
case MGMT_MARSHALL_DATA:
ptr.m_data = va_arg(ap, MgmtMarshallData *);
- nwritten = socket_write_buffer(fd, ptr.m_data);
+ nwritten = socket_write_buffer(fd, ptr.m_data);
break;
default:
errno = EINVAL;
@@ -332,11 +332,11 @@ mgmt_message_read_v(int fd, const MgmtMarshallType *fields, unsigned count, va_l
switch (fields[n]) {
case MGMT_MARSHALL_INT:
ptr.m_int = va_arg(ap, MgmtMarshallInt *);
- nread = socket_read_bytes(fd, ptr.m_void, 4);
+ nread = socket_read_bytes(fd, ptr.m_void, 4);
break;
case MGMT_MARSHALL_LONG:
ptr.m_long = va_arg(ap, MgmtMarshallLong *);
- nread = socket_read_bytes(fd, ptr.m_void, 8);
+ nread = socket_read_bytes(fd, ptr.m_void, 8);
break;
case MGMT_MARSHALL_STRING: {
MgmtMarshallData data;
@@ -347,13 +347,13 @@ mgmt_message_read_v(int fd, const MgmtMarshallType *fields, unsigned count, va_l
}
ink_assert(data_is_nul_terminated(&data));
- ptr.m_string = va_arg(ap, MgmtMarshallString *);
+ ptr.m_string = va_arg(ap, MgmtMarshallString *);
*ptr.m_string = (char *)data.ptr;
break;
}
case MGMT_MARSHALL_DATA:
ptr.m_data = va_arg(ap, MgmtMarshallData *);
- nread = socket_read_buffer(fd, ptr.m_data);
+ nread = socket_read_buffer(fd, ptr.m_data);
break;
default:
errno = EINVAL;
@@ -502,13 +502,13 @@ mgmt_message_parse_v(const void *buf, size_t len, const MgmtMarshallType *fields
ink_assert(data_is_nul_terminated(&data));
- ptr.m_string = va_arg(ap, MgmtMarshallString *);
+ ptr.m_string = va_arg(ap, MgmtMarshallString *);
*ptr.m_string = (char *)data.ptr;
break;
}
case MGMT_MARSHALL_DATA:
ptr.m_data = va_arg(ap, MgmtMarshallData *);
- nread = buffer_read_buffer((const uint8_t *)buf, len, ptr.m_data);
+ nread = buffer_read_buffer((const uint8_t *)buf, len, ptr.m_data);
if (nread == -1) {
goto nospace;
}
diff --git a/mgmt/utils/MgmtSocket.cc b/mgmt/utils/MgmtSocket.cc
index 65ae0f4..563328a 100644
--- a/mgmt/utils/MgmtSocket.cc
+++ b/mgmt/utils/MgmtSocket.cc
@@ -43,7 +43,7 @@ bool
mgmt_transient_error()
{
bool transient = false;
- transient = (errno == EINTR);
+ transient = (errno == EINTR);
#ifdef ENOMEM
transient = transient || (errno == ENOMEM);
#endif
@@ -217,7 +217,7 @@ mgmt_write_timeout(int fd, int sec, int usec)
{
struct timeval timeout;
fd_set writeSet;
- timeout.tv_sec = sec;
+ timeout.tv_sec = sec;
timeout.tv_usec = usec;
if (fd < 0 || fd >= FD_SETSIZE) {
@@ -255,7 +255,7 @@ mgmt_read_timeout(int fd, int sec, int usec)
{
struct timeval timeout;
fd_set readSet;
- timeout.tv_sec = sec;
+ timeout.tv_sec = sec;
timeout.tv_usec = usec;
if (fd < 0 || fd >= FD_SETSIZE) {
diff --git a/mgmt/utils/MgmtUtils.cc b/mgmt/utils/MgmtUtils.cc
index 304157d..78161c6 100644
--- a/mgmt/utils/MgmtUtils.cc
+++ b/mgmt/utils/MgmtUtils.cc
@@ -129,8 +129,8 @@ mgmt_writeline(int soc, const char *data, int nbytes)
int
mgmt_read_pipe(int fd, char *buf, int bytes_to_read)
{
- int err = 0;
- char *p = buf;
+ int err = 0;
+ char *p = buf;
int bytes_read = 0;
while (bytes_to_read > 0) {
err = read_socket(fd, p, bytes_to_read);
@@ -171,8 +171,8 @@ mgmt_read_pipe(int fd, char *buf, int bytes_to_read)
int
mgmt_write_pipe(int fd, char *buf, int bytes_to_write)
{
- int err = 0;
- char *p = buf;
+ int err = 0;
+ char *p = buf;
int bytes_written = 0;
while (bytes_to_write > 0) {
err = write_socket(fd, p, bytes_to_write);
@@ -467,9 +467,9 @@ mgmt_getAddrForIntr(char *intrName, sockaddr *addr, int *mtu)
// INKqa06739
// Fetch the list of network interfaces
// . from Stevens, Unix Network Prog., pg 434-435
- ifbuf = 0;
+ ifbuf = 0;
lastlen = 0;
- len = 128 * sizeof(struct ifreq); // initial buffer size guess
+ len = 128 * sizeof(struct ifreq); // initial buffer size guess
for (;;) {
ifbuf = (char *)ats_malloc(len);
memset(ifbuf, 0, len); // prevent UMRs
@@ -535,12 +535,12 @@ mgmt_sortipaddrs(int num, struct in_addr **list)
unsigned long min;
struct in_addr *entry, *tmp;
- min = (list[0])->s_addr;
+ min = (list[0])->s_addr;
entry = list[0];
while (i < num && (tmp = (struct in_addr *)list[i]) != NULL) {
i++;
if (min > tmp->s_addr) {
- min = tmp->s_addr;
+ min = tmp->s_addr;
entry = tmp;
}
}
diff --git a/mgmt/utils/test_marshall.cc b/mgmt/utils/test_marshall.cc
index 3b4b8da..aa0d885 100644
--- a/mgmt/utils/test_marshall.cc
+++ b/mgmt/utils/test_marshall.cc
@@ -62,7 +62,7 @@ const MgmtMarshallType afields[] = {
MGMT_MARSHALL_DATA, MGMT_MARSHALL_INT, MGMT_MARSHALL_LONG, MGMT_MARSHALL_STRING, MGMT_MARSHALL_LONG, MGMT_MARSHALL_LONG,
};
-const char alpha[] = "abcdefghijklmnopqrstuvwxyz0123456789";
+const char alpha[] = "abcdefghijklmnopqrstuvwxyz0123456789";
const char *stringvals[] = {NULL, "", "randomstring"};
static bool
@@ -76,14 +76,14 @@ message_connect_channel(RegressionTest *t, int listenfd, int clientfd, int serve
{
// bool need_connect = true;
bool need_accept = true;
- int serverfd = -1;
+ int serverfd = -1;
struct sockaddr_in in;
ink_zero(in);
- in.sin_family = AF_INET;
+ in.sin_family = AF_INET;
in.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- in.sin_port = htons(serverport);
+ in.sin_port = htons(serverport);
fcntl(clientfd, F_SETFL, O_NONBLOCK);
fcntl(listenfd, F_SETFL, O_NONBLOCK);
@@ -142,15 +142,15 @@ REGRESSION_TEST(MessageReadWriteA)(RegressionTest *t, int /* atype ATS_UNUSED */
{
TestBox box(t, pstatus, REGRESSION_TEST_PASSED);
- int listenfd = -1;
- int serverfd = -1;
- int clientfd = -1;
+ int listenfd = -1;
+ int serverfd = -1;
+ int clientfd = -1;
int serverport = 0;
- MgmtMarshallInt mint = 0;
- MgmtMarshallLong mlong = 0;
+ MgmtMarshallInt mint = 0;
+ MgmtMarshallLong mlong = 0;
MgmtMarshallString mstring = NULL;
- MgmtMarshallData mdata = {NULL, 0};
+ MgmtMarshallData mdata = {NULL, 0};
clientfd = mgmt_socket(AF_INET, SOCK_STREAM, 0);
listenfd = message_listen(serverport);
@@ -160,7 +160,7 @@ REGRESSION_TEST(MessageReadWriteA)(RegressionTest *t, int /* atype ATS_UNUSED */
fcntl(clientfd, F_SETFL, O_NDELAY);
fcntl(serverfd, F_SETFL, O_NDELAY);
- mint = 99;
+ mint = 99;
mlong = (MgmtMarshallLong)(&listenfd);
// Check invalid Fd write. ToDo: Commented out, see TS-3052.
@@ -168,7 +168,7 @@ REGRESSION_TEST(MessageReadWriteA)(RegressionTest *t, int /* atype ATS_UNUSED */
CHECK_EQ(mgmt_message_write(clientfd, ifields, countof(ifields), &mint, &mlong), 12);
- mint = 0;
+ mint = 0;
mlong = 0;
CHECK_EQ(mgmt_message_read(serverfd, ifields, countof(ifields), &mint, &mlong), 12);
CHECK_VALUE(mint, 99, "%" PRId32);
@@ -177,7 +177,7 @@ REGRESSION_TEST(MessageReadWriteA)(RegressionTest *t, int /* atype ATS_UNUSED */
// Marshall a string.
for (unsigned i = 0; i < countof(stringvals); ++i) {
const char *s = stringvals[i];
- size_t len = 4 /* length */ + (s ? strlen(s) : 0) /* bytes */ + 1 /* NULL */;
+ size_t len = 4 /* length */ + (s ? strlen(s) : 0) /* bytes */ + 1 /* NULL */;
mstring = s ? ats_strdup(s) : NULL;
CHECK_EQ(mgmt_message_write(clientfd, sfields, countof(sfields), &mstring), len);
@@ -214,10 +214,10 @@ REGRESSION_TEST(MessageMarshall)(RegressionTest *t, int /* atype ATS_UNUSED */,
char msgbuf[4096];
- MgmtMarshallInt mint = 0;
- MgmtMarshallLong mlong = 0;
+ MgmtMarshallInt mint = 0;
+ MgmtMarshallLong mlong = 0;
MgmtMarshallString mstring = NULL;
- MgmtMarshallData mdata = {NULL, 0};
+ MgmtMarshallData mdata = {NULL, 0};
// Parse empty message.
CHECK_EQ(mgmt_message_parse(NULL, 0, NULL, 0), 0);
@@ -226,7 +226,7 @@ REGRESSION_TEST(MessageMarshall)(RegressionTest *t, int /* atype ATS_UNUSED */,
CHECK_EQ(mgmt_message_marshall(NULL, 0, NULL, 0), 0);
// Marshall some integral types.
- mint = -156;
+ mint = -156;
mlong = UINT32_MAX;
CHECK_EQ(mgmt_message_marshall(msgbuf, 1, ifields, countof(ifields), &mint, &mlong), -1);
CHECK_EQ(mgmt_message_marshall(msgbuf, sizeof(msgbuf), ifields, countof(ifields), &mint, &mlong), 12);
@@ -238,7 +238,7 @@ REGRESSION_TEST(MessageMarshall)(RegressionTest *t, int /* atype ATS_UNUSED */,
// Marshall a string.
for (unsigned i = 0; i < countof(stringvals); ++i) {
const char *s = stringvals[i];
- size_t len = 4 /* length */ + (s ? strlen(s) : 0) /* bytes */ + 1 /* NULL */;
+ size_t len = 4 /* length */ + (s ? strlen(s) : 0) /* bytes */ + 1 /* NULL */;
mstring = s ? ats_strdup(s) : NULL;
CHECK_EQ(mgmt_message_marshall(msgbuf, 1, sfields, countof(sfields), &mstring), -1);
@@ -282,10 +282,10 @@ REGRESSION_TEST(MessageLength)(RegressionTest *t, int /* atype ATS_UNUSED */, in
{
TestBox box(t, pstatus, REGRESSION_TEST_PASSED);
- MgmtMarshallInt mint = 0;
- MgmtMarshallLong mlong = 0;
+ MgmtMarshallInt mint = 0;
+ MgmtMarshallLong mlong = 0;
MgmtMarshallString mstring = NULL;
- MgmtMarshallData mdata = {NULL, 0};
+ MgmtMarshallData mdata = {NULL, 0};
// Check invalid marshall type.
CHECK_EQ(mgmt_message_length(inval, countof(inval), NULL), -1);
@@ -310,7 +310,7 @@ REGRESSION_TEST(MessageLength)(RegressionTest *t, int /* atype ATS_UNUSED */, in
mdata.ptr = NULL;
CHECK_EQ(mgmt_message_length(dfields, countof(dfields), &mdata), 99 + 4);
- mstring = (char *)"all fields";
+ mstring = (char *)"all fields";
mdata.len = 31;
CHECK_EQ(mgmt_message_length(afields, countof(afields), &mdata, &mint, &mlong, &mstring, &mlong, &mlong),
31 + 4 + 4 + 8 + sizeof("all fields") + 4 + 8 + 8);
diff --git a/plugins/cacheurl/cacheurl.cc b/plugins/cacheurl/cacheurl.cc
index d75f213..97eafcf 100644
--- a/plugins/cacheurl/cacheurl.cc
+++ b/plugins/cacheurl/cacheurl.cc
@@ -112,7 +112,7 @@ regex_substitute(char **buf, char *str, regex_info *info)
/* perform string replacement */
offset = 0; /* Where we are adding new data in the string */
- prev = 0;
+ prev = 0;
for (i = 0; i < info->tokcount; i++) {
memcpy(*buf + offset, info->replacement + prev, info->tokenoffset[i] - prev);
offset += (info->tokenoffset[i] - prev);
@@ -134,10 +134,10 @@ regex_compile(regex_info **buf, char *pattern, char *replacement)
int reerroffset; /* Offset where any pcre error occured */
int tokcount;
- int *tokens = NULL;
+ int *tokens = NULL;
int *tokenoffset = NULL;
- int status = 1; /* Status (return value) of the function */
+ int status = 1; /* Status (return value) of the function */
regex_info *info = (regex_info *)TSmalloc(sizeof(regex_info));
/* Precompile the regular expression */
@@ -150,7 +150,7 @@ regex_compile(regex_info **buf, char *pattern, char *replacement)
/* Precalculate the location of $X tokens in the replacement */
tokcount = 0;
if (status) {
- tokens = (int *)TSmalloc(sizeof(int) * TOKENCOUNT);
+ tokens = (int *)TSmalloc(sizeof(int) * TOKENCOUNT);
tokenoffset = (int *)TSmalloc(sizeof(int) * TOKENCOUNT);
for (unsigned i = 0; i < strlen(replacement); i++) {
if (replacement[i] == '$') {
@@ -168,7 +168,7 @@ regex_compile(regex_info **buf, char *pattern, char *replacement)
} else {
/* Store the location of the replacement */
/* Convert '0' to 0 */
- tokens[tokcount] = replacement[i + 1] - '0';
+ tokens[tokcount] = replacement[i + 1] - '0';
tokenoffset[tokcount] = i;
tokcount++;
/* Skip the next char */
@@ -180,11 +180,11 @@ regex_compile(regex_info **buf, char *pattern, char *replacement)
if (status) {
/* Everything went OK */
- info->tokcount = tokcount;
- info->tokens = tokens;
+ info->tokcount = tokcount;
+ info->tokens = tokens;
info->tokenoffset = tokenoffset;
- info->pattern = TSstrdup(pattern);
+ info->pattern = TSstrdup(pattern);
info->replacement = TSstrdup(replacement);
*buf = info;
@@ -304,7 +304,7 @@ load_config_file(const char *config_file)
static int
rewrite_cacheurl(pr_list *prl, TSHttpTxn txnp)
{
- int ok = 1;
+ int ok = 1;
char *newurl = 0;
int retval;
char *url;
@@ -438,8 +438,8 @@ TSPluginInit(int argc, const char *argv[])
TSCont contp;
pr_list *prl;
- info.plugin_name = (char *)PLUGIN_NAME;
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)PLUGIN_NAME;
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/conf_remap/conf_remap.cc b/plugins/conf_remap/conf_remap.cc
index c81b911..b0ebe76 100644
--- a/plugins/conf_remap/conf_remap.cc
+++ b/plugins/conf_remap/conf_remap.cc
@@ -84,7 +84,7 @@ RemapConfigs::parse_inline(const char *arg)
return false;
}
- key = std::string(arg, std::distance(arg, sep));
+ key = std::string(arg, std::distance(arg, sep));
value = std::string(sep + 1, std::distance(sep + 1, arg + strlen(arg)));
if (TSHttpTxnConfigFind(key.c_str(), -1 /* len */, &name, &type) != TS_SUCCESS) {
@@ -99,10 +99,10 @@ RemapConfigs::parse_inline(const char *arg)
case TS_RECORDDATATYPE_STRING:
if (strcmp(value.c_str(), "NULL") == 0) {
_items[_current]._data.rec_string = NULL;
- _items[_current]._data_len = 0;
+ _items[_current]._data_len = 0;
} else {
_items[_current]._data.rec_string = TSstrdup(value.c_str());
- _items[_current]._data_len = value.size();
+ _items[_current]._data_len = value.size();
}
break;
default:
@@ -217,10 +217,10 @@ RemapConfigs::parse_file(const char *filename)
case TS_RECORDDATATYPE_STRING:
if (strcmp(tok, "NULL") == 0) {
_items[_current]._data.rec_string = NULL;
- _items[_current]._data_len = 0;
+ _items[_current]._data_len = 0;
} else {
_items[_current]._data.rec_string = TSstrdup(tok);
- _items[_current]._data_len = strlen(tok);
+ _items[_current]._data_len = strlen(tok);
}
break;
default:
@@ -309,7 +309,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo * /* rri ATS_UNUSED */
{
if (NULL != ih) {
RemapConfigs *conf = static_cast<RemapConfigs *>(ih);
- TSHttpTxn txnp = static_cast<TSHttpTxn>(rh);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(rh);
for (int ix = 0; ix < conf->_current; ++ix) {
switch (conf->_items[ix]._type) {
diff --git a/plugins/experimental/acme/acme.c b/plugins/experimental/acme/acme.c
index cb0244f..ec547e8 100644
--- a/plugins/experimental/acme/acme.c
+++ b/plugins/experimental/acme/acme.c
@@ -28,9 +28,9 @@ limitations under the License.
#include "ts/ink_platform.h"
#include "ts/ink_defs.h"
-static const char PLUGIN_NAME[] = "acme";
-static const char ACME_WK_PATH[] = ".well-known/acme-challenge/";
-static const char ACME_OK_RESP[] = "HTTP/1.1 200 OK\r\nContent-Type: application/jose\r\nCache-Control: no-cache\r\n";
+static const char PLUGIN_NAME[] = "acme";
+static const char ACME_WK_PATH[] = ".well-known/acme-challenge/";
+static const char ACME_OK_RESP[] = "HTTP/1.1 200 OK\r\nContent-Type: application/jose\r\nCache-Control: no-cache\r\n";
static const char ACME_DENIED_RESP[] = "HTTP/1.1 404 Not Found\r\nContent-Type: application/jose\r\nCache-Control: no-cache\r\n";
#define MAX_PATH_LEN 4096
@@ -221,10 +221,10 @@ acme_process_write(TSCont contp, TSEvent event, AcmeState *my_state)
static void
acme_process_accept(TSCont contp, AcmeState *my_state)
{
- my_state->req_buffer = TSIOBufferCreate();
+ my_state->req_buffer = TSIOBufferCreate();
my_state->resp_buffer = TSIOBufferCreate();
my_state->resp_reader = TSIOBufferReaderAlloc(my_state->resp_buffer);
- my_state->read_vio = TSVConnRead(my_state->net_vc, contp, my_state->req_buffer, INT64_MAX);
+ my_state->read_vio = TSVConnRead(my_state->net_vc, contp, my_state->req_buffer, INT64_MAX);
}
/* Implement the server intercept */
@@ -260,7 +260,7 @@ acme_hook(TSCont contp ATS_UNUSED, TSEvent event ATS_UNUSED, void *edata)
TSDebug(PLUGIN_NAME, "kicking off ACME hook");
if ((TS_SUCCESS == TSHttpTxnClientReqGet(txnp, &reqp, &hdr_loc)) && (TS_SUCCESS == TSHttpHdrUrlGet(reqp, hdr_loc, &url_loc))) {
- int path_len = 0;
+ int path_len = 0;
const char *path = TSUrlPathGet(reqp, url_loc, &path_len);
/* Short circuit the / path, common case */
@@ -324,7 +324,7 @@ TSPluginInit(int argc, const char *argv[])
if ('/' != *proof) {
const char *confdir = TSConfigDirGet();
- int len = strlen(proof) + strlen(confdir) + 8;
+ int len = strlen(proof) + strlen(confdir) + 8;
gConfig.proof = TSmalloc(len);
snprintf(gConfig.proof, len - 1, "%s/%s", confdir, proof);
@@ -333,8 +333,8 @@ TSPluginInit(int argc, const char *argv[])
gConfig.proof = TSstrdup(proof);
}
- info.plugin_name = "acme";
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = "acme";
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TS_SUCCESS != TSPluginRegister(&info)) {
diff --git a/plugins/experimental/ats_pagespeed/ats_base_fetch.cc b/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
index 0e717cf..197a4a5 100644
--- a/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
+++ b/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
@@ -131,8 +131,8 @@ AtsBaseFetch::ForwardData(const StringPiece &sp, bool reenable, bool last)
Lock();
if (references_ == 2) {
while (to_write > 0) {
- downstream_blkp = TSIOBufferStart(downstream_buffer_);
- downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
+ downstream_blkp = TSIOBufferStart(downstream_buffer_);
+ downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
int64_t bytes_written = to_write > downstream_length ? downstream_length : to_write;
memcpy(downstream_buffer, sp.data() + (sp.size() - to_write), bytes_written);
to_write -= bytes_written;
@@ -164,7 +164,7 @@ AtsBaseFetch::HandleDone(bool success)
done_called_ = true;
int status_code = response_headers()->status_code();
- bool status_ok = (status_code != 0) && (status_code < 400);
+ bool status_ok = (status_code != 0) && (status_code < 400);
if (status_code == CacheUrlAsyncFetcher::kNotInCacheStatus) {
TSDebug("ats-speed", "ipro lookup base fetch -> not found in cache");
ctx_->record_in_place = true;
@@ -180,8 +180,8 @@ AtsBaseFetch::HandleDone(bool success)
return;
}
ctx_->serve_in_place = true;
- TransformCtx *ctx = ctx_;
- TSHttpTxn txn = ctx_->txn;
+ TransformCtx *ctx = ctx_;
+ TSHttpTxn txn = ctx_->txn;
// TODO(oschaaf): deduplicate with code that hooks the resource intercept
TSHttpTxnServerRespNoStoreSet(txn, 1);
@@ -195,9 +195,9 @@ AtsBaseFetch::HandleDone(bool success)
return;
}
- TSCont interceptCont = TSContCreate((int (*)(tsapi_cont *, TSEvent, void *))ipro_callback_, TSMutexCreate());
- InterceptCtx *intercept_ctx = new InterceptCtx();
- intercept_ctx->request_ctx = ctx;
+ TSCont interceptCont = TSContCreate((int (*)(tsapi_cont *, TSEvent, void *))ipro_callback_, TSMutexCreate());
+ InterceptCtx *intercept_ctx = new InterceptCtx();
+ intercept_ctx->request_ctx = ctx;
intercept_ctx->request_headers = new RequestHeaders();
intercept_ctx->response->append(buffer_);
copy_request_headers_to_psol(reqp, req_hdr_loc, intercept_ctx->request_headers);
@@ -211,7 +211,7 @@ AtsBaseFetch::HandleDone(bool success)
// TODO(oschaaf): I don't think we need to lock here, but double check that
// to make sure.
ctx_->base_fetch = NULL;
- ctx_ = NULL;
+ ctx_ = NULL;
DecrefAndDeleteIfUnreferenced();
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return;
diff --git a/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc b/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
index e59a79d..46181ad 100644
--- a/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
+++ b/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
@@ -116,10 +116,10 @@ InterceptCtx::init(TSVConn vconn)
input.buffer = TSIOBufferCreate();
input.reader = TSIOBufferReaderAlloc(input.buffer);
- input.vio = TSVConnRead(net_vc, contp, input.buffer, INT_MAX);
+ input.vio = TSVConnRead(net_vc, contp, input.buffer, INT_MAX);
req_hdr_bufp = TSMBufferCreate();
- req_hdr_loc = TSHttpHdrCreate(req_hdr_bufp);
+ req_hdr_loc = TSHttpHdrCreate(req_hdr_bufp);
TSHttpHdrTypeSet(req_hdr_bufp, req_hdr_loc, TS_HTTP_TYPE_REQUEST);
initialized = true;
@@ -133,7 +133,7 @@ InterceptCtx::setupWrite()
TSAssert(output.buffer == 0);
output.buffer = TSIOBufferCreate();
output.reader = TSIOBufferReaderAlloc(output.buffer);
- output.vio = TSVConnWrite(net_vc, contp, output.reader, INT_MAX);
+ output.vio = TSVConnWrite(net_vc, contp, output.reader, INT_MAX);
}
// Parses out query params from the request.
@@ -256,7 +256,7 @@ processRequest(InterceptCtx *cont_data)
StringPiece query_param_beacon_data;
ps_query_params_handler(cont_data->request_context->url_string->c_str(), &query_param_beacon_data);
- GoogleString beacon_data = net_instaweb::StrCat(query_param_beacon_data, "&", cont_data->body);
+ GoogleString beacon_data = net_instaweb::StrCat(query_param_beacon_data, "&", cont_data->body);
ServerContext *server_context = cont_data->request_context->server_context;
SystemRequestContext *system_request_context =
@@ -295,8 +295,8 @@ txn_intercept(TSCont contp, TSEvent event, void *edata)
TSDebug(DEBUG_TAG, "[%s] Received event: %d", __FUNCTION__, (int)event);
InterceptCtx *cont_data = static_cast<InterceptCtx *>(TSContDataGet(contp));
- bool read_complete = false;
- bool shutdown = false;
+ bool read_complete = false;
+ bool shutdown = false;
switch (event) {
case TS_EVENT_NET_ACCEPT:
TSDebug(DEBUG_TAG, "[%s] Received net accept event", __FUNCTION__);
@@ -365,7 +365,7 @@ hook_beacon_intercept(TSHttpTxn txnp)
TSError("[ats_beacon_intercept][%s] Could not create intercept request", __FUNCTION__);
return false;
}
- InterceptCtx *cont_data = new InterceptCtx(contp);
+ InterceptCtx *cont_data = new InterceptCtx(contp);
cont_data->request_context = get_transaction_context(txnp);
TSContDataSet(contp, cont_data);
TSHttpTxnIntercept(contp, txnp);
diff --git a/plugins/experimental/ats_pagespeed/ats_config.cc b/plugins/experimental/ats_pagespeed/ats_config.cc
index b2c7b10..704191a 100644
--- a/plugins/experimental/ats_pagespeed/ats_config.cc
+++ b/plugins/experimental/ats_pagespeed/ats_config.cc
@@ -190,7 +190,7 @@ AtsConfig::Parse(const char *path)
if (v.size() == 1) {
string token = v[0];
if ((token[0] == '[') && (token[token.size() - 1] == ']')) {
- GoogleString current_host = token.substr(1, token.size() - 2);
+ GoogleString current_host = token.substr(1, token.size() - 2);
current_host_configuration = new AtsHostConfig(current_host, new AtsRewriteOptions(thread_system_));
AddHostConfig(current_host_configuration);
} else if (StringCaseEqual(token, "override_expiry")) {
diff --git a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
index f537d33..fdb08bb 100644
--- a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
+++ b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
@@ -96,7 +96,7 @@ static int TXN_INDEX_OWNED_ARG;
static int TXN_INDEX_OWNED_ARG_SET;
static int TXN_INDEX_OWNED_ARG_UNSET;
TSMutex config_mutex = TSMutexCreate();
-AtsConfig *config = NULL;
+AtsConfig *config = NULL;
TransformCtx *
get_transaction_context(TSHttpTxn txnp)
{
@@ -108,37 +108,37 @@ ats_ctx_alloc()
{
TransformCtx *ctx;
- ctx = (TransformCtx *)TSmalloc(sizeof(TransformCtx));
- ctx->downstream_vio = NULL;
+ ctx = (TransformCtx *)TSmalloc(sizeof(TransformCtx));
+ ctx->downstream_vio = NULL;
ctx->downstream_buffer = NULL;
ctx->downstream_length = 0;
- ctx->state = transform_state_initialized;
+ ctx->state = transform_state_initialized;
- ctx->base_fetch = NULL;
+ ctx->base_fetch = NULL;
ctx->proxy_fetch = NULL;
- ctx->inflater = NULL;
- ctx->url_string = NULL;
- ctx->gurl = NULL;
- ctx->write_pending = false;
- ctx->fetch_done = false;
- ctx->resource_request = false;
- ctx->beacon_request = false;
- ctx->transform_added = false;
- ctx->mps_user_agent = false;
- ctx->user_agent = NULL;
- ctx->server_context = NULL;
- ctx->html_rewrite = false;
- ctx->request_method = NULL;
- ctx->alive = 0xaaaa;
- ctx->options = NULL;
- ctx->to_host = NULL;
- ctx->in_place = false;
- ctx->driver = NULL;
- ctx->record_in_place = false;
- ctx->recorder = NULL;
+ ctx->inflater = NULL;
+ ctx->url_string = NULL;
+ ctx->gurl = NULL;
+ ctx->write_pending = false;
+ ctx->fetch_done = false;
+ ctx->resource_request = false;
+ ctx->beacon_request = false;
+ ctx->transform_added = false;
+ ctx->mps_user_agent = false;
+ ctx->user_agent = NULL;
+ ctx->server_context = NULL;
+ ctx->html_rewrite = false;
+ ctx->request_method = NULL;
+ ctx->alive = 0xaaaa;
+ ctx->options = NULL;
+ ctx->to_host = NULL;
+ ctx->in_place = false;
+ ctx->driver = NULL;
+ ctx->record_in_place = false;
+ ctx->recorder = NULL;
ctx->ipro_response_headers = NULL;
- ctx->serve_in_place = false;
+ ctx->serve_in_place = false;
return ctx;
}
@@ -223,7 +223,7 @@ ps_determine_request_options(const RewriteOptions *domain_options, /* may be nul
return NULL;
}
- *pagespeed_query_params = rewrite_query.pagespeed_query_params().ToEscapedString();
+ *pagespeed_query_params = rewrite_query.pagespeed_query_params().ToEscapedString();
*pagespeed_option_cookies = rewrite_query.pagespeed_option_cookies().ToEscapedString();
// Will be NULL if there aren't any options set with query params or in
@@ -318,7 +318,7 @@ handle_send_response_headers(TSHttpTxn txnp)
if (TSHttpTxnClientRespGet(txnp, &bufp, &hdr_loc) == TS_SUCCESS) {
ResponseHeaders *pagespeed_headers = ctx->base_fetch->response_headers();
for (int i = 0; i < pagespeed_headers->NumAttributes(); i++) {
- const GoogleString &name_gs = pagespeed_headers->Name(i);
+ const GoogleString &name_gs = pagespeed_headers->Name(i);
const GoogleString &value_gs = pagespeed_headers->Value(i);
// We should avoid touching these fields, as ATS will drop keepalive when we do.
@@ -428,7 +428,7 @@ get_host_options(const StringPiece &host, ServerContext *server_context)
{
TSMutexLock(config_mutex);
AtsRewriteOptions *r = (AtsRewriteOptions *)server_context->global_options()->Clone();
- AtsHostConfig *hc = config->Find(host.data(), host.size());
+ AtsHostConfig *hc = config->Find(host.data(), host.size());
if (hc->options() != NULL) {
// We return a clone here to avoid having to thing about
// configuration reloads and outstanding options
@@ -481,9 +481,9 @@ ats_transform_init(TSCont contp, TransformCtx *ctx)
CHECK(false) << "PageSpeed resource should not get here!";
}
- downstream_conn = TSTransformOutputVConnGet(contp);
+ downstream_conn = TSTransformOutputVConnGet(contp);
ctx->downstream_buffer = TSIOBufferCreate();
- ctx->downstream_vio = TSVConnWrite(downstream_conn, contp, TSIOBufferReaderAlloc(ctx->downstream_buffer), INT64_MAX);
+ ctx->downstream_vio = TSVConnWrite(downstream_conn, contp, TSIOBufferReaderAlloc(ctx->downstream_buffer), INT64_MAX);
if (ctx->recorder != NULL) {
TSHandleMLocRelease(reqp, TS_NULL_MLOC, req_hdr_loc);
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
@@ -504,7 +504,7 @@ ats_transform_init(TSCont contp, TransformCtx *ctx)
TSHttpStatus status = TSHttpHdrStatusGet(bufp, hdr_loc);
copy_response_headers_to_psol(bufp, hdr_loc, &response_headers);
- std::string host = ctx->gurl->HostAndPort().as_string();
+ std::string host = ctx->gurl->HostAndPort().as_string();
RewriteOptions *options = NULL;
if (host.size() > 0) {
options = get_host_options(host.c_str(), server_context);
@@ -667,7 +667,7 @@ ats_transform_do(TSCont contp)
ats_transform_init(contp, ctx);
}
- upstream_vio = TSVConnWriteVIOGet(contp);
+ upstream_vio = TSVConnWriteVIOGet(contp);
downstream_bytes_written = ctx->downstream_length;
if (!TSVIOBufferGet(upstream_vio)) {
@@ -774,11 +774,11 @@ handle_read_request_header(TSHttpTxn txnp)
{
TSMBuffer reqp = NULL;
TSMLoc hdr_loc = NULL;
- char *url = NULL;
+ char *url = NULL;
int url_length = -1;
TransformCtx *ctx = ats_ctx_alloc();
- ctx->txn = txnp;
+ ctx->txn = txnp;
TSHttpTxnArgSet(txnp, TXN_INDEX_ARG, (void *)ctx);
TSHttpTxnArgSet(txnp, TXN_INDEX_OWNED_ARG, &TXN_INDEX_OWNED_ARG_SET);
@@ -791,19 +791,19 @@ handle_read_request_header(TSHttpTxn txnp)
GoogleUrl gurl(s_url);
ctx->url_string = new GoogleString(url, url_length);
- ctx->gurl = new GoogleUrl(*(ctx->url_string));
+ ctx->gurl = new GoogleUrl(*(ctx->url_string));
if (!ctx->gurl->IsWebValid()) {
TSDebug("ats-speed", "URL != WebValid(): %s", ctx->url_string->c_str());
} else {
const char *method;
int method_len;
- method = TSHttpHdrMethodGet(reqp, hdr_loc, &method_len);
- bool head_or_get = method == TS_HTTP_METHOD_GET || method == TS_HTTP_METHOD_HEAD;
- ctx->request_method = method;
+ method = TSHttpHdrMethodGet(reqp, hdr_loc, &method_len);
+ bool head_or_get = method == TS_HTTP_METHOD_GET || method == TS_HTTP_METHOD_HEAD;
+ ctx->request_method = method;
GoogleString user_agent = get_header(reqp, hdr_loc, "User-Agent");
- ctx->user_agent = new GoogleString(user_agent);
- ctx->server_context = ats_process_context->server_context();
+ ctx->user_agent = new GoogleString(user_agent);
+ ctx->server_context = ats_process_context->server_context();
TSDebug("ats-speed", "static asset prefix: %s",
((AtsRewriteDriverFactory *)ctx->server_context->factory())->static_asset_prefix().c_str());
if (user_agent.find(kModPagespeedSubrequestUserAgent) != user_agent.npos) {
@@ -962,7 +962,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
return 0;
} else if (event == TS_EVENT_HTTP_SEND_REQUEST_HDR) {
TSMBuffer request_header_buf = NULL;
- TSMLoc request_header_loc = NULL;
+ TSMLoc request_header_loc = NULL;
if (TSHttpTxnServerReqGet(txn, &request_header_buf, &request_header_loc) == TS_SUCCESS) {
hide_accept_encoding(request_header_buf, request_header_loc, "@xxAccept-Encoding");
@@ -976,7 +976,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
return 0;
} else if (event == TS_EVENT_HTTP_READ_RESPONSE_HDR) {
TSMBuffer request_header_buf = NULL;
- TSMLoc request_header_loc = NULL;
+ TSMLoc request_header_loc = NULL;
if (TSHttpTxnServerReqGet(txn, &request_header_buf, &request_header_loc) == TS_SUCCESS) {
restore_accept_encoding(request_header_buf, request_header_loc, "@xxAccept-Encoding");
@@ -1001,9 +1001,9 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
}
std::string *to_host = new std::string();
to_host->append(get_remapped_host(ctx->txn));
- ctx->to_host = to_host;
+ ctx->to_host = to_host;
TSMBuffer response_header_buf = NULL;
- TSMLoc response_header_loc = NULL;
+ TSMLoc response_header_loc = NULL;
// TODO(oschaaf): from configuration!
bool override_expiry = false;
@@ -1067,7 +1067,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
}
if (ok) {
- StringPiece s_content_type = get_header(response_header_buf, response_header_loc, "Content-Type");
+ StringPiece s_content_type = get_header(response_header_buf, response_header_loc, "Content-Type");
const net_instaweb::ContentType *content_type = net_instaweb::MimeTypeToContentType(s_content_type);
if (ctx->record_in_place && content_type != NULL) {
@@ -1113,10 +1113,10 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
bool is_encoded = false;
if (StringCaseEqual(content_encoding, "deflate")) {
- is_encoded = true;
+ is_encoded = true;
inflate_type = GzipInflater::kDeflate;
} else if (StringCaseEqual(content_encoding, "gzip")) {
- is_encoded = true;
+ is_encoded = true;
inflate_type = GzipInflater::kGzip;
}
@@ -1148,8 +1148,8 @@ RegisterPlugin()
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"ats_pagespeed";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"ats_pagespeed";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -1200,7 +1200,7 @@ process_configuration()
TSMutexLock(config_mutex);
fprintf(stderr, "Update configuration\n");
old_config = config;
- config = new_config;
+ config = new_config;
TSMutexUnlock(config_mutex);
if (old_config != NULL) {
delete old_config;
@@ -1224,15 +1224,15 @@ config_notification_callback(void *data)
wd = inotify_add_watch(fd, "/usr/local/etc/trafficserver/psol/", IN_MODIFY | IN_CREATE | IN_DELETE);
while (1) {
- int len = read(fd, buf, BUF_MAX);
- int i = 0;
+ int len = read(fd, buf, BUF_MAX);
+ int i = 0;
bool do_update = false;
while (i < len) {
struct inotify_event *event = (struct inotify_event *)&buf[i];
if (event->len) {
if (!(event->mask & IN_ISDIR)) {
const char *name = event->name;
- size_t name_len = strlen(event->name);
+ size_t name_len = strlen(event->name);
if (name_len > 0 && name[0] != '.' && name[0] != '#' && name[name_len - 1] != '~') {
do_update = true;
}
diff --git a/plugins/experimental/ats_pagespeed/ats_process_context.cc b/plugins/experimental/ats_pagespeed/ats_process_context.cc
index 1efd6d2..e94a7dd 100644
--- a/plugins/experimental/ats_pagespeed/ats_process_context.cc
+++ b/plugins/experimental/ats_pagespeed/ats_process_context.cc
@@ -43,9 +43,9 @@ AtsProcessContext::AtsProcessContext() : ProcessContext()
driver_factory_->Init();
server_context_ = driver_factory()->MakeAtsServerContext();
- AtsRewriteOptions *root_options_ = (AtsRewriteOptions *)driver_factory_->default_options();
+ AtsRewriteOptions *root_options_ = (AtsRewriteOptions *)driver_factory_->default_options();
AtsRewriteOptions *server_options = root_options_->Clone();
- AtsRewriteOptions *options = new AtsRewriteOptions(driver_factory_->thread_system());
+ AtsRewriteOptions *options = new AtsRewriteOptions(driver_factory_->thread_system());
server_options->Merge(*options);
delete options;
@@ -62,7 +62,7 @@ AtsProcessContext::AtsProcessContext() : ProcessContext()
// Statistics* statistics =
// driver_factory_->MakeGlobalSharedMemStatistics(*(SystemRewriteOptions*)server_context_->global_options());
GoogleString error_message;
- int error_index = -1;
+ int error_index = -1;
Statistics *global_statistics = NULL;
driver_factory_.get()->PostConfig(server_contexts, &error_message, &error_index, &global_statistics);
if (error_index != -1) {
diff --git a/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc b/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
index a27d15a..2206745 100644
--- a/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
+++ b/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
@@ -89,15 +89,15 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
{
TSDebug("ats-speed", "resource_intercept event: %d", (int)event);
InterceptCtx *intercept_ctx = static_cast<InterceptCtx *>(TSContDataGet(cont));
- bool shutDown = false;
+ bool shutDown = false;
// TODO(oschaaf): have a look at https://github.com/apache/trafficserver/blob/master/plugins/experimental/esi/serverIntercept.c
// and see if we have any edge cases we should fix.
switch (event) {
case TS_EVENT_NET_ACCEPT: {
- intercept_ctx->vconn = static_cast<TSVConn>(edata);
- intercept_ctx->req_buffer = TSIOBufferCreate();
- intercept_ctx->req_reader = TSIOBufferReaderAlloc(intercept_ctx->req_buffer);
+ intercept_ctx->vconn = static_cast<TSVConn>(edata);
+ intercept_ctx->req_buffer = TSIOBufferCreate();
+ intercept_ctx->req_reader = TSIOBufferReaderAlloc(intercept_ctx->req_buffer);
intercept_ctx->resp_buffer = TSIOBufferCreate();
intercept_ctx->resp_reader = TSIOBufferReaderAlloc(intercept_ctx->resp_buffer);
TSVConnRead(intercept_ctx->vconn, cont, intercept_ctx->req_buffer, 0x7fffffff);
@@ -127,7 +127,7 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
new AtsBaseFetch(server_context, system_request_context, downstream_vio, intercept_ctx->resp_buffer, true);
intercept_ctx->request_ctx->base_fetch->set_request_headers(intercept_ctx->request_headers);
- std::string host = intercept_ctx->request_ctx->gurl->HostAndPort().as_string();
+ std::string host = intercept_ctx->request_ctx->gurl->HostAndPort().as_string();
RewriteOptions *options = NULL;
if (host.size() > 0) {
options = get_host_options(host.c_str(), server_context);
@@ -217,7 +217,7 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
static int
read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
{
- TSHttpTxn txn = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txn = static_cast<TSHttpTxn>(edata);
TransformCtx *ctx = get_transaction_context(txn);
if (ctx == NULL) {
@@ -254,10 +254,10 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
AtsRewriteDriverFactory *factory = (AtsRewriteDriverFactory *)server_context->factory();
GoogleString output;
StringWriter writer(&output);
- HttpStatus::Code status = HttpStatus::kOK;
- ContentType content_type = kContentTypeHtml;
- StringPiece cache_control = HttpAttributes::kNoCache;
- const char *error_message = NULL;
+ HttpStatus::Code status = HttpStatus::kOK;
+ ContentType content_type = kContentTypeHtml;
+ StringPiece cache_control = HttpAttributes::kNoCache;
+ const char *error_message = NULL;
StringPiece request_uri_path = ctx->gurl->PathAndLeaf();
if (false && ctx->gurl->PathSansQuery() == "/robots.txt") {
@@ -288,9 +288,9 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
return 0;
}
- TSCont interceptCont = TSContCreate(resource_intercept, TSMutexCreate());
- InterceptCtx *intercept_ctx = new InterceptCtx();
- intercept_ctx->request_ctx = ctx;
+ TSCont interceptCont = TSContCreate(resource_intercept, TSMutexCreate());
+ InterceptCtx *intercept_ctx = new InterceptCtx();
+ intercept_ctx->request_ctx = ctx;
intercept_ctx->request_headers = new RequestHeaders();
copy_request_headers_to_psol(reqp, req_hdr_loc, intercept_ctx->request_headers);
TSHandleMLocRelease(reqp, TS_NULL_MLOC, req_hdr_loc);
@@ -302,9 +302,9 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
}
if (error_message != NULL) {
- status = HttpStatus::kNotFound;
+ status = HttpStatus::kNotFound;
content_type = kContentTypeHtml;
- output = error_message;
+ output = error_message;
}
ResponseHeaders response_headers;
@@ -327,9 +327,9 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
StringWriter header_writer(&header);
response_headers.WriteAsHttp(&header_writer, server_context->message_handler());
- TSCont interceptCont = TSContCreate(resource_intercept, TSMutexCreate());
+ TSCont interceptCont = TSContCreate(resource_intercept, TSMutexCreate());
InterceptCtx *intercept_ctx = new InterceptCtx();
- intercept_ctx->request_ctx = ctx;
+ intercept_ctx->request_ctx = ctx;
header.append(output);
TSHttpTxnRespCacheableSet(txn, 0);
TSHttpTxnReqCacheableSet(txn, 0);
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
index b1c78c7..e790639 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
@@ -206,7 +206,7 @@ AtsRewriteDriverFactory::StartThreads()
CHECK(false) << "threads already started";
}
SchedulerThread *thread = new SchedulerThread(thread_system(), scheduler());
- bool ok = thread->Start();
+ bool ok = thread->Start();
CHECK(ok) << "Unable to start scheduler thread";
defer_cleanup(thread->MakeDeleter());
threads_started_ = true;
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc b/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
index ca02dcc..8960042 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_options.cc
@@ -149,7 +149,7 @@ AtsRewriteOptions::ParseAndSetOptions(vector<string> args, MessageHandler *handl
StringPiece arg = args[1];
if (IsDirective(directive, "UsePerVHostStatistics")) {
if (!SetBoolFlag(&global_config.use_per_vhost_statistics, arg)) {
- msg = "Failed to set UsePerVHostStatistics value";
+ msg = "Failed to set UsePerVHostStatistics value";
result = RewriteOptions::kOptionValueInvalid;
} else {
result = RewriteOptions::kOptionOk;
@@ -161,14 +161,14 @@ AtsRewriteOptions::ParseAndSetOptions(vector<string> args, MessageHandler *handl
bool ok = StringToInt(arg.as_string(), &message_buffer_size);
if (ok && message_buffer_size >= 0) {
global_config.message_buffer_size = message_buffer_size;
- result = RewriteOptions::kOptionOk;
+ result = RewriteOptions::kOptionOk;
} else {
- msg = "Failed to set MessageBufferSize value";
+ msg = "Failed to set MessageBufferSize value";
result = RewriteOptions::kOptionValueInvalid;
}
} else if (IsDirective(directive, "UseNativeFetcher")) {
if (!SetBoolFlag(&global_config.info_urls_local_only, arg)) {
- msg = "Failed to set UseNativeFetcher value";
+ msg = "Failed to set UseNativeFetcher value";
result = RewriteOptions::kOptionValueInvalid;
} else {
msg = "Native fetcher is not available in this release";
@@ -177,7 +177,7 @@ AtsRewriteOptions::ParseAndSetOptions(vector<string> args, MessageHandler *handl
}
} else if (IsDirective(directive, "InfoUrlsLocalOnly")) {
if (!SetBoolFlag(&global_config.info_urls_local_only, arg)) {
- msg = "Failed to set InfoUrlsLocalOnly value";
+ msg = "Failed to set InfoUrlsLocalOnly value";
result = RewriteOptions::kOptionValueInvalid;
} else {
result = RewriteOptions::kOptionOk;
@@ -218,10 +218,10 @@ AtsRewriteOptions::ParseAndSetOptions(vector<string> args, MessageHandler *handl
int64 kb = 0;
if (!StringToInt64(args[2], &kb) || kb < 0) {
result = RewriteOptions::kOptionValueInvalid;
- msg = "size_kb must be a positive 64-bit integer";
+ msg = "size_kb must be a positive 64-bit integer";
} else {
global_config.shm_cache_size_kb = kb;
- result = kOptionOk;
+ result = kOptionOk;
// bool ok = driver_factory->caches()->CreateShmMetadataCache(
// args[1].as_string(), kb, &msg);
// result = ok ? kOptionOk : kOptionValueInvalid;
diff --git a/plugins/experimental/ats_pagespeed/gzip/configuration.cc b/plugins/experimental/ats_pagespeed/gzip/configuration.cc
index afdd70a..bf8d2f3 100644
--- a/plugins/experimental/ats_pagespeed/gzip/configuration.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/configuration.cc
@@ -153,7 +153,7 @@ HostConfiguration::ContentTypeIsCompressible(const char *content_type, int conte
for (size_t i = 0; i < compressible_content_types_.size(); i++) {
const char *match_string = compressible_content_types_[i].c_str();
- bool exclude = match_string[0] == '!';
+ bool exclude = match_string[0] == '!';
if (exclude) {
match_string++; // skip '!'
}
@@ -182,7 +182,7 @@ Configuration::Parse(const char *path)
trim_if(pathstring, isspace);
- Configuration *c = new Configuration();
+ Configuration *c = new Configuration();
HostConfiguration *current_host_configuration = new HostConfiguration("");
c->AddHostConfiguration(current_host_configuration);
current_host_configuration->add_compressible_content_type("text/*");
@@ -236,7 +236,7 @@ Configuration::Parse(const char *path)
switch (state) {
case kParseStart:
if ((token[0] == '[') && (token[token.size() - 1] == ']')) {
- std::string current_host = token.substr(1, token.size() - 2);
+ std::string current_host = token.substr(1, token.size() - 2);
current_host_configuration = new HostConfiguration(current_host);
c->AddHostConfiguration(current_host_configuration);
} else if (token == "compressible-content-type") {
diff --git a/plugins/experimental/ats_pagespeed/gzip/gzip.cc b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
index 4fd9edc..a886b19 100644
--- a/plugins/experimental/ats_pagespeed/gzip/gzip.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
@@ -54,7 +54,7 @@ int arg_idx_host_configuration;
int arg_idx_url_disallowed;
const char *global_hidden_header_name;
-Configuration *config = NULL;
+Configuration *config = NULL;
const char *dictionary = NULL;
static GzipData *
@@ -63,23 +63,23 @@ gzip_data_alloc(int compression_type)
GzipData *data;
int err;
- data = (GzipData *)TSmalloc(sizeof(GzipData));
- data->downstream_vio = NULL;
+ data = (GzipData *)TSmalloc(sizeof(GzipData));
+ data->downstream_vio = NULL;
data->downstream_buffer = NULL;
data->downstream_reader = NULL;
data->downstream_length = 0;
- data->state = transform_state_initialized;
- data->compression_type = compression_type;
- data->zstrm.next_in = Z_NULL;
- data->zstrm.avail_in = 0;
- data->zstrm.total_in = 0;
- data->zstrm.next_out = Z_NULL;
- data->zstrm.avail_out = 0;
- data->zstrm.total_out = 0;
- data->zstrm.zalloc = gzip_alloc;
- data->zstrm.zfree = gzip_free;
- data->zstrm.opaque = (voidpf)0;
- data->zstrm.data_type = Z_ASCII;
+ data->state = transform_state_initialized;
+ data->compression_type = compression_type;
+ data->zstrm.next_in = Z_NULL;
+ data->zstrm.avail_in = 0;
+ data->zstrm.total_in = 0;
+ data->zstrm.next_out = Z_NULL;
+ data->zstrm.avail_out = 0;
+ data->zstrm.total_out = 0;
+ data->zstrm.zalloc = gzip_alloc;
+ data->zstrm.zfree = gzip_free;
+ data->zstrm.opaque = (voidpf)0;
+ data->zstrm.data_type = Z_ASCII;
int window_bits = (compression_type == COMPRESSION_TYPE_GZIP) ? WINDOW_BITS_GZIP : WINDOW_BITS_DEFLATE;
@@ -237,10 +237,10 @@ gzip_transform_init(TSCont contp, GzipData *data)
if (gzip_content_encoding_header(bufp, hdr_loc, data->compression_type) == TS_SUCCESS &&
gzip_vary_header(bufp, hdr_loc) == TS_SUCCESS && gzip_etag_header(bufp, hdr_loc) == TS_SUCCESS) {
- downstream_conn = TSTransformOutputVConnGet(contp);
+ downstream_conn = TSTransformOutputVConnGet(contp);
data->downstream_buffer = TSIOBufferCreate();
data->downstream_reader = TSIOBufferReaderAlloc(data->downstream_buffer);
- data->downstream_vio = TSVConnWrite(downstream_conn, contp, data->downstream_reader, INT64_MAX);
+ data->downstream_vio = TSVConnWrite(downstream_conn, contp, data->downstream_reader, INT64_MAX);
}
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
@@ -272,14 +272,14 @@ gzip_transform_one(GzipData *data, TSIOBufferReader upstream_reader, int amount)
upstream_length = amount;
}
- data->zstrm.next_in = (unsigned char *)upstream_buffer;
+ data->zstrm.next_in = (unsigned char *)upstream_buffer;
data->zstrm.avail_in = upstream_length;
while (data->zstrm.avail_in > 0) {
- downstream_blkp = TSIOBufferStart(data->downstream_buffer);
+ downstream_blkp = TSIOBufferStart(data->downstream_buffer);
downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
- data->zstrm.next_out = (unsigned char *)downstream_buffer;
+ data->zstrm.next_out = (unsigned char *)downstream_buffer;
data->zstrm.avail_out = downstream_length;
err = deflate(&data->zstrm, Z_NO_FLUSH);
@@ -318,8 +318,8 @@ gzip_transform_finish(GzipData *data)
for (;;) {
downstream_blkp = TSIOBufferStart(data->downstream_buffer);
- downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
- data->zstrm.next_out = (unsigned char *)downstream_buffer;
+ downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
+ data->zstrm.next_out = (unsigned char *)downstream_buffer;
data->zstrm.avail_out = downstream_length;
err = deflate(&data->zstrm, Z_FINISH);
@@ -361,7 +361,7 @@ gzip_transform_do(TSCont contp)
gzip_transform_init(contp, data);
}
- upstream_vio = TSVConnWriteVIOGet(contp);
+ upstream_vio = TSVConnWriteVIOGet(contp);
downstream_bytes_written = data->downstream_length;
if (!TSVIOBufferGet(upstream_vio)) {
@@ -488,7 +488,7 @@ gzip_transformable(TSHttpTxn txnp, int server, HostConfiguration *host_configura
cfield = TSMimeHdrFieldFind(cbuf, chdr, TS_MIME_FIELD_ACCEPT_ENCODING, TS_MIME_LEN_ACCEPT_ENCODING);
if (cfield != TS_NULL_MLOC) {
compression_acceptable = 0;
- nvalues = TSMimeHdrFieldValuesCount(cbuf, chdr, cfield);
+ nvalues = TSMimeHdrFieldValuesCount(cbuf, chdr, cfield);
for (i = 0; i < nvalues; i++) {
value = TSMimeHdrFieldValueStringGet(cbuf, chdr, cfield, i, &len);
if (!value) {
@@ -497,11 +497,11 @@ gzip_transformable(TSHttpTxn txnp, int server, HostConfiguration *host_configura
if (strncasecmp(value, "deflate", sizeof("deflate") - 1) == 0) {
compression_acceptable = 1;
- *compress_type = COMPRESSION_TYPE_DEFLATE;
+ *compress_type = COMPRESSION_TYPE_DEFLATE;
break;
} else if (strncasecmp(value, "gzip", sizeof("gzip") - 1) == 0) {
compression_acceptable = 1;
- *compress_type = COMPRESSION_TYPE_GZIP;
+ *compress_type = COMPRESSION_TYPE_GZIP;
break;
}
}
@@ -597,8 +597,8 @@ gzip_transform_add(TSHttpTxn txnp, int /* server ATS_UNUSED */, HostConfiguratio
TSVConn connp;
GzipData *data;
- connp = TSTransformCreate(gzip_transform, txnp);
- data = gzip_data_alloc(compress_type);
+ connp = TSTransformCreate(gzip_transform, txnp);
+ data = gzip_data_alloc(compress_type);
data->txn = txnp;
TSContDataSet(connp, data);
@@ -646,7 +646,7 @@ find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc
static int
transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
int compress_type = COMPRESSION_TYPE_DEFLATE;
switch (event) {
@@ -655,7 +655,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
TSMLoc req_loc;
if (TSHttpTxnClientReqGet(txnp, &req_buf, &req_loc) == TS_SUCCESS) {
int url_len;
- char *url = TSHttpTxnEffectiveUrlStringGet(txnp, &url_len);
+ char *url = TSHttpTxnEffectiveUrlStringGet(txnp, &url_len);
HostConfiguration *hc = find_host_configuration(txnp, req_buf, req_loc);
// we could clone the hosting configuration here, to make it deletable on reload?
TSHttpTxnArgSet(txnp, arg_idx_host_configuration, (void *)hc);
@@ -711,7 +711,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
} break;
case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE: {
- int allowed = !TSHttpTxnArgGet(txnp, arg_idx_url_disallowed);
+ int allowed = !TSHttpTxnArgGet(txnp, arg_idx_url_disallowed);
HostConfiguration *hc = (HostConfiguration *)TSHttpTxnArgGet(txnp, arg_idx_host_configuration);
if (hc != NULL) {
if (allowed && cache_transformable(txnp) && gzip_transformable(txnp, 0, hc, &compress_type)) {
@@ -731,7 +731,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
static void
read_configuration(TSCont contp)
{
- const char *path = (const char *)TSContDataGet(contp);
+ const char *path = (const char *)TSContDataGet(contp);
Configuration *newconfig = Configuration::Parse(path);
Configuration *oldconfig = __sync_lock_test_and_set(&config, newconfig);
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.cc b/plugins/experimental/ats_pagespeed/gzip/misc.cc
index 0ab94c5..3822fad 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.cc
@@ -45,8 +45,8 @@ void
normalize_accept_encoding(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer reqp, TSMLoc hdr_loc)
{
TSMLoc field = TSMimeHdrFieldFind(reqp, hdr_loc, TS_MIME_FIELD_ACCEPT_ENCODING, TS_MIME_LEN_ACCEPT_ENCODING);
- int deflate = 0;
- int gzip = 0;
+ int deflate = 0;
+ int gzip = 0;
// remove the accept encoding field(s),
// while finding out if gzip or deflate is supported.
@@ -131,8 +131,8 @@ init_hidden_header_name()
if (TSMgmtStringGet(var_name, &result) != TS_SUCCESS) {
fatal("failed to get server name");
} else {
- int hidden_header_name_len = strlen("x-accept-encoding-") + strlen(result);
- hidden_header_name = (char *)TSmalloc(hidden_header_name_len + 1);
+ int hidden_header_name_len = strlen("x-accept-encoding-") + strlen(result);
+ hidden_header_name = (char *)TSmalloc(hidden_header_name_len + 1);
hidden_header_name[hidden_header_name_len] = 0;
sprintf(hidden_header_name, "x-accept-encoding-%s", result);
}
@@ -144,8 +144,8 @@ register_plugin()
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"gzip";
- info.vendor_name = (char *)"Apache";
+ info.plugin_name = (char *)"gzip";
+ info.vendor_name = (char *)"Apache";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -157,7 +157,7 @@ register_plugin()
const char *
load_dictionary(const char *preload_file)
{
- char *dict = (char *)malloc(800000);
+ char *dict = (char *)malloc(800000);
uLong dictId = adler32(0L, Z_NULL, 0);
uLong *adler = &dictId;
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.h b/plugins/experimental/ats_pagespeed/gzip/misc.h
index a57ff98..bc10e73 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.h
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.h
@@ -31,16 +31,16 @@
#include <stdio.h>
// zlib stuff, see [deflateInit2] at http://www.zlib.net/manual.html
-static const int ZLIB_MEMLEVEL = 9; // min=1 (optimize for memory),max=9 (optimized for speed)
+static const int ZLIB_MEMLEVEL = 9; // min=1 (optimize for memory),max=9 (optimized for speed)
static const int WINDOW_BITS_DEFLATE = -15;
-static const int WINDOW_BITS_GZIP = 31;
+static const int WINDOW_BITS_GZIP = 31;
// misc
static const int COMPRESSION_TYPE_DEFLATE = 1;
-static const int COMPRESSION_TYPE_GZIP = 2;
+static const int COMPRESSION_TYPE_GZIP = 2;
// this one is just for txnargset/get to point to
-static const int GZIP_ONE = 1;
-static const int DICT_PATH_MAX = 512;
+static const int GZIP_ONE = 1;
+static const int DICT_PATH_MAX = 512;
static const int DICT_ENTRY_MAX = 2048;
// this one is used to rename the accept encoding header
diff --git a/plugins/experimental/authproxy/authproxy.cc b/plugins/experimental/authproxy/authproxy.cc
index 1fa7a6c..315ee5c 100644
--- a/plugins/experimental/authproxy/authproxy.cc
+++ b/plugins/experimental/authproxy/authproxy.cc
@@ -225,7 +225,7 @@ pump:
// Move to the next state. We have to set this *before* invoking the
// handler because the handler itself can invoke the next handler.
auth->state = s->next;
- event = s->handler(auth, edata);
+ event = s->handler(auth, edata);
// If the handler returns TS_EVENT_NONE, it means that a re-entrant event
// was dispatched. In this case, the state machine continues from the
@@ -400,7 +400,7 @@ static TSEvent
StateAuthProxyConnect(AuthRequestContext *auth, void * /* edata ATS_UNUSED */)
{
const AuthOptions *options = auth->options();
- struct sockaddr const *ip = TSHttpTxnClientAddrGet(auth->txn);
+ struct sockaddr const *ip = TSHttpTxnClientAddrGet(auth->txn);
TSReleaseAssert(ip); // We must have a client IP.
@@ -501,7 +501,7 @@ StateAuthProxyReadHeaders(AuthRequestContext *auth, void * /* edata ATS_UNUSED *
{
TSIOBufferBlock blk;
ssize_t consumed = 0;
- bool complete = false;
+ bool complete = false;
AuthLogDebug("reading header data, %u bytes available", (unsigned)TSIOBufferReaderAvail(auth->iobuf.reader));
@@ -516,7 +516,7 @@ StateAuthProxyReadHeaders(AuthRequestContext *auth, void * /* edata ATS_UNUSED *
continue;
}
- end = ptr + nbytes;
+ end = ptr + nbytes;
result = TSHttpHdrParseResp(auth->hparser, auth->rheader.buffer, auth->rheader.header, &ptr, end);
switch (result) {
case TS_PARSE_ERROR:
@@ -563,7 +563,7 @@ StateAuthProxyReadContent(AuthRequestContext *auth, void * /* edata ATS_UNUSED *
unsigned needed;
int64_t avail = 0;
- avail = TSIOBufferReaderAvail(auth->iobuf.reader);
+ avail = TSIOBufferReaderAvail(auth->iobuf.reader);
needed = HttpGetContentLength(auth->rheader.buffer, auth->rheader.header);
AuthLogDebug("we have %u of %u needed bytes", (unsigned)avail, needed);
@@ -583,7 +583,7 @@ StateAuthProxyCompleteContent(AuthRequestContext *auth, void * /* edata ATS_UNUS
unsigned needed;
int64_t avail;
- avail = TSIOBufferReaderAvail(auth->iobuf.reader);
+ avail = TSIOBufferReaderAvail(auth->iobuf.reader);
needed = HttpGetContentLength(auth->rheader.buffer, auth->rheader.header);
AuthLogDebug("we have %u of %u needed bytes", (unsigned)avail, needed);
@@ -664,9 +664,9 @@ AuthProxyGlobalHook(TSCont /* cont ATS_UNUSED */, TSEvent event, void *edata)
// Hook this request if we are in global authorization mode or if a
// remap rule tagged it.
if (AuthGlobalOptions != NULL || AuthRequestIsTagged(txn)) {
- auth = AuthRequestContext::allocate();
+ auth = AuthRequestContext::allocate();
auth->state = StateTableInit;
- auth->txn = txn;
+ auth->txn = txn;
return AuthRequestContext::dispatch(auth->cont, event, edata);
}
// fallthru
@@ -744,8 +744,8 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"authproxy";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"authproxy";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -755,7 +755,7 @@ TSPluginInit(int argc, const char *argv[])
TSReleaseAssert(TSHttpArgIndexReserve("AuthProxy", "AuthProxy authorization tag", &AuthTaggedRequestArg) == TS_SUCCESS);
AuthOsDnsContinuation = TSContCreate(AuthProxyGlobalHook, NULL);
- AuthGlobalOptions = AuthParseOptions(argc, argv);
+ AuthGlobalOptions = AuthParseOptions(argc, argv);
AuthLogDebug("using authorization proxy at %s:%d", AuthGlobalOptions->hostname.c_str(), AuthGlobalOptions->hostport);
// Use the appropriate hook for consistent auth checks.
diff --git a/plugins/experimental/authproxy/utils.cc b/plugins/experimental/authproxy/utils.cc
index c5cd919..8199b03 100644
--- a/plugins/experimental/authproxy/utils.cc
+++ b/plugins/experimental/authproxy/utils.cc
@@ -74,9 +74,9 @@ HttpDebugHeader(TSMBuffer mbuf, TSMLoc mhdr)
TSHttpHdrPrint(mbuf, mhdr, iobuf.buffer);
- blk = TSIOBufferReaderStart(iobuf.reader);
+ blk = TSIOBufferReaderStart(iobuf.reader);
avail = TSIOBufferBlockReadAvail(blk, iobuf.reader);
- ptr = (const char *)TSIOBufferBlockReadStart(blk, iobuf.reader, &nbytes);
+ ptr = (const char *)TSIOBufferBlockReadStart(blk, iobuf.reader, &nbytes);
AuthLogDebug("http request (%u of %u bytes):\n%*.*s", (unsigned)nbytes, (unsigned)avail, (int)nbytes, (int)nbytes, ptr);
}
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index b2a4bd5..ccb7995 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -77,7 +77,7 @@ public:
TSMutexLock(_lock);
if (_urls.end() == _urls.find(url)) {
_urls[url] = true;
- ret = true;
+ ret = true;
} else {
ret = false;
}
@@ -220,7 +220,7 @@ bool
BgFetchData::initialize(TSMBuffer request, TSMLoc req_hdr, TSHttpTxn txnp)
{
struct sockaddr const *ip = TSHttpTxnClientAddrGet(txnp);
- bool ret = false;
+ bool ret = false;
TSAssert(TS_NULL_MLOC == hdr_loc);
TSAssert(TS_NULL_MLOC == url_loc);
@@ -300,9 +300,9 @@ BgFetchData::schedule()
TSContDataSet(_cont, static_cast<void *>(this));
// Initialize the VIO stuff (for the fetch)
- req_io_buf = TSIOBufferCreate();
- req_io_buf_reader = TSIOBufferReaderAlloc(req_io_buf);
- resp_io_buf = TSIOBufferCreate();
+ req_io_buf = TSIOBufferCreate();
+ req_io_buf_reader = TSIOBufferReaderAlloc(req_io_buf);
+ resp_io_buf = TSIOBufferCreate();
resp_io_buf_reader = TSIOBufferReaderAlloc(resp_io_buf);
// Schedule
@@ -500,7 +500,7 @@ static int
cont_handle_response(TSCont contp, TSEvent event, void *edata)
{
// ToDo: If we want to support per-remap configurations, we have to pass along the data here
- TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
BgFetchConfig *config = static_cast<BgFetchConfig *>(TSContDataGet(contp));
if (NULL == config) {
@@ -555,8 +555,8 @@ TSPluginInit(int argc, const char *argv[])
{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
- info.plugin_name = (char *)PLUGIN_NAME;
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)PLUGIN_NAME;
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TS_SUCCESS != TSPluginRegister(&info)) {
@@ -621,7 +621,7 @@ TSRemapInit(TSRemapInterface *api_info, char *errbuf, int errbuf_size)
TSReturnCode
TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf */, int /* errbuf_size */)
{
- TSCont cont = TSContCreate(cont_handle_response, NULL);
+ TSCont cont = TSContCreate(cont_handle_response, NULL);
BgFetchConfig *config = new BgFetchConfig(cont);
config->acquire(); // Inc refcount
diff --git a/plugins/experimental/background_fetch/configs.cc b/plugins/experimental/background_fetch/configs.cc
index ddac1e2..7b3fda6 100644
--- a/plugins/experimental/background_fetch/configs.cc
+++ b/plugins/experimental/background_fetch/configs.cc
@@ -69,14 +69,14 @@ BgFetchConfig::readConfig(const char *config_file)
}
char *savePtr = NULL;
- char *cfg = strtok_r(buffer, "\n\r\n", &savePtr);
+ char *cfg = strtok_r(buffer, "\n\r\n", &savePtr);
if (NULL != cfg) {
TSDebug(PLUGIN_NAME, "setting background_fetch exclusion criterion based on string: %s", cfg);
- char *cfg_type = strtok_r(buffer, " ", &savePtr);
- char *cfg_name = NULL;
+ char *cfg_type = strtok_r(buffer, " ", &savePtr);
+ char *cfg_name = NULL;
char *cfg_value = NULL;
- bool exclude = false;
+ bool exclude = false;
if (cfg_type) {
if (!strcmp(cfg_type, "exclude")) {
diff --git a/plugins/experimental/background_fetch/headers.cc b/plugins/experimental/background_fetch/headers.cc
index 69f1bbe..01ed907 100644
--- a/plugins/experimental/background_fetch/headers.cc
+++ b/plugins/experimental/background_fetch/headers.cc
@@ -33,7 +33,7 @@ int
remove_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len)
{
TSMLoc field = TSMimeHdrFieldFind(bufp, hdr_loc, header, len);
- int cnt = 0;
+ int cnt = 0;
while (field) {
TSMLoc tmp = TSMimeHdrFieldNextDup(bufp, hdr_loc, field);
@@ -58,7 +58,7 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
return false;
}
- bool ret = false;
+ bool ret = false;
TSMLoc field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, header, len);
if (!field_loc) {
@@ -104,7 +104,7 @@ dump_headers(TSMBuffer bufp, TSMLoc hdr_loc)
int64_t block_avail;
output_buffer = TSIOBufferCreate();
- reader = TSIOBufferReaderAlloc(output_buffer);
+ reader = TSIOBufferReaderAlloc(output_buffer);
/* This will print just MIMEFields and not the http request line */
TSMimeHdrPrint(bufp, hdr_loc, output_buffer);
diff --git a/plugins/experimental/background_fetch/rules.cc b/plugins/experimental/background_fetch/rules.cc
index 8f626eb..abc9eae 100644
--- a/plugins/experimental/background_fetch/rules.cc
+++ b/plugins/experimental/background_fetch/rules.cc
@@ -124,7 +124,7 @@ check_field_configured(TSHttpTxn txnp, const char *field_name, const char *cfg_v
TSDebug(PLUGIN_NAME, "Found %s wild card", field_name);
hdr_found = true;
} else {
- int val_len = 0;
+ int val_len = 0;
const char *val_str = TSMimeHdrFieldValueStringGet(hdr_bufp, hdr_loc, loc, 0, &val_len);
if (!val_str || val_len <= 0) {
diff --git a/plugins/experimental/balancer/balancer.cc b/plugins/experimental/balancer/balancer.cc
index 337dcf2..4d3bee2 100644
--- a/plugins/experimental/balancer/balancer.cc
+++ b/plugins/experimental/balancer/balancer.cc
@@ -37,7 +37,7 @@ static BalancerInstance *
MakeBalancerInstance(const char *opt)
{
const char *end = strchr(opt, ',');
- size_t len = end ? std::distance(opt, end) : strlen(opt);
+ size_t len = end ? std::distance(opt, end) : strlen(opt);
if (len == lengthof("hash") && strncmp(opt, "hash", len) == 0) {
return MakeHashBalancer(end ? end + 1 : NULL);
@@ -163,7 +163,7 @@ TSRemapDeleteInstance(void *instance)
TSRemapStatus
TSRemapDoRemap(void *instance, TSHttpTxn txn, TSRemapRequestInfo *rri)
{
- BalancerInstance *balancer = (BalancerInstance *)instance;
+ BalancerInstance *balancer = (BalancerInstance *)instance;
const BalancerTarget &target = balancer->balance(txn, rri);
if (TSIsDebugTagSet("balancer")) {
diff --git a/plugins/experimental/balancer/hash.cc b/plugins/experimental/balancer/hash.cc
index ff12758..d6a32f6 100644
--- a/plugins/experimental/balancer/hash.cc
+++ b/plugins/experimental/balancer/hash.cc
@@ -116,7 +116,7 @@ void
HashTxnKey(TSHttpTxn txn, TSRemapRequestInfo *rri, MD5_CTX *ctx)
{
TSMLoc url = TS_NULL_MLOC;
- char *str = NULL;
+ char *str = NULL;
int len;
if (TSUrlCreate(rri->requestBufp, &url) != TS_SUCCESS) {
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index c4c6a3f..768736b 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -167,7 +167,7 @@ write_buffer_to_disk(TSIOBufferReader reader, pvc_state *my_state, TSCont contp)
// LOG_SET_FUNCTION_NAME("write_buffer_to_disk");
block = TSIOBufferReaderStart(reader);
while (block != NULL) {
- ptr = TSIOBufferBlockReadStart(block, reader, &size);
+ ptr = TSIOBufferBlockReadStart(block, reader, &size);
pBuf = (char *)TSmalloc(sizeof(char) * size);
if (pBuf == NULL) {
LOG_ERROR_AND_RETURN("TSAIOWrite");
@@ -526,7 +526,7 @@ pvc_process_p_write(TSCont contp, TSEvent event, pvc_state *my_state)
static int
pvc_plugin(TSCont contp, TSEvent event, void *edata)
{
- pvc_state *my_state = static_cast<pvc_state *>(TSContDataGet(contp));
+ pvc_state *my_state = static_cast<pvc_state *>(TSContDataGet(contp));
TSAIOCallback callback = static_cast<TSAIOCallback>(edata);
if (my_state == NULL) {
@@ -546,7 +546,7 @@ pvc_plugin(TSCont contp, TSEvent event, void *edata)
pvc_process_n_write(contp, event, my_state);
} else if (event == TS_AIO_EVENT_DONE && uconfig->use_disk_buffer) {
TSMutexLock(my_state->disk_io_mutex);
- int size = TSAIONBytesGet(callback);
+ int size = TSAIONBytesGet(callback);
char *buf = TSAIOBufGet(callback);
if (buf != my_state->chunk_buffer) {
// this TS_AIO_EVENT_DONE event is from TSAIOWrite()
@@ -611,7 +611,7 @@ convert_url_func(TSMBuffer req_bufp, TSMLoc req_loc)
const char *colon;
// if (VALID_PTR(str))
// TSHandleStringRelease(req_bufp, url_loc, str);
- str = TSUrlPathGet(req_bufp, url_loc, &len);
+ str = TSUrlPathGet(req_bufp, url_loc, &len);
slash = strstr(str, "/");
if (slash == NULL) {
// if (VALID_PTR(str))
@@ -631,7 +631,7 @@ convert_url_func(TSMBuffer req_bufp, TSMLoc req_loc)
TSUrlPortSet(req_bufp, url_loc, atoi(port_str));
TSfree(port_str);
} else {
- int length = 0;
+ int length = 0;
const char *scheme = TSUrlSchemeGet(req_bufp, url_loc, &length);
if ((length == TS_URL_LEN_HTTP && strncmp(TS_URL_SCHEME_HTTP, scheme, length) == 0 && port != 80) ||
@@ -753,9 +753,9 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
const char *colon = strchr(replacement_host_str, ':');
if (colon != NULL && colon[1] != '\0') {
- int length = 0;
+ int length = 0;
const char *scheme = TSUrlSchemeGet(req_bufp, url_loc, &length);
- int port_str_val = atoi(colon + 1);
+ int port_str_val = atoi(colon + 1);
if ((length == TS_URL_LEN_HTTP && strncmp(TS_URL_SCHEME_HTTP, scheme, length) == 0 && port_str_val != 80) ||
(length == TS_URL_LEN_HTTPS && strncmp(TS_URL_SCHEME_HTTPS, scheme, length) == 0 && port_str_val != 443)) {
@@ -772,7 +772,7 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
}
int i = uconfig->url_num;
- url = TSUrlStringGet(req_bufp, url_loc, &url_len);
+ url = TSUrlStringGet(req_bufp, url_loc, &url_len);
if (VALID_PTR(url)) {
char urlStr[url_len + 1];
memcpy(urlStr, url, url_len);
@@ -834,34 +834,34 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
break;
}
- my_state = (pvc_state *)TSmalloc(sizeof(pvc_state));
- my_state->req_size = content_length;
- my_state->p_vc = NULL;
- my_state->p_read_vio = NULL;
+ my_state = (pvc_state *)TSmalloc(sizeof(pvc_state));
+ my_state->req_size = content_length;
+ my_state->p_vc = NULL;
+ my_state->p_read_vio = NULL;
my_state->p_write_vio = NULL;
- my_state->net_vc = NULL;
- my_state->n_read_vio = NULL;
+ my_state->net_vc = NULL;
+ my_state->n_read_vio = NULL;
my_state->n_write_vio = NULL;
- my_state->req_buffer = NULL;
- my_state->req_reader = NULL;
- my_state->resp_buffer = NULL;
- my_state->resp_reader = NULL;
- my_state->fd = -1;
+ my_state->req_buffer = NULL;
+ my_state->req_reader = NULL;
+ my_state->resp_buffer = NULL;
+ my_state->resp_reader = NULL;
+ my_state->fd = -1;
my_state->disk_io_mutex = NULL;
my_state->http_txnp = txnp; // not in use now, may need in the future
- my_state->req_finished = 0;
+ my_state->req_finished = 0;
my_state->resp_finished = 0;
my_state->nbytes_to_consume =
-1; // the length of server request header to remove from incoming stream (will replace with client request header)
- my_state->size_written = 0;
- my_state->size_read = 0;
- my_state->write_offset = 0;
- my_state->read_offset = 0;
+ my_state->size_written = 0;
+ my_state->size_read = 0;
+ my_state->write_offset = 0;
+ my_state->read_offset = 0;
my_state->is_reading_from_disk = 0;
my_state->chunk_buffer = (char *)TSmalloc(sizeof(char) * uconfig->chunk_size);
@@ -906,7 +906,7 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
if (my_state->fd < 0) {
LOG_ERROR("open");
uconfig->use_disk_buffer = 0;
- my_state->fd = -1;
+ my_state->fd = -1;
} else {
TSDebug(DEBUG_TAG, "temp filename: %s", path);
}
@@ -996,7 +996,7 @@ load_urls(char *filename)
char *eol;
int i;
- url_buf = (char *)TSmalloc(sizeof(char) * (uconfig->max_url_length + 1));
+ url_buf = (char *)TSmalloc(sizeof(char) * (uconfig->max_url_length + 1));
url_buf[uconfig->max_url_length] = '\0';
for (i = 0; i < 2; i++) {
@@ -1037,8 +1037,8 @@ void
parse_config_line(char *line, const struct config_val_ul *cv)
{
const char *delim = "\t\r\n ";
- char *save = NULL;
- char *tok = strtok_r(line, delim, &save);
+ char *save = NULL;
+ char *tok = strtok_r(line, delim, &save);
while (tok && cv->str) {
if (!strcmp(tok, cv->str)) {
@@ -1047,7 +1047,7 @@ parse_config_line(char *line, const struct config_val_ul *cv)
switch (cv->type) {
case TYPE_INT: {
char *end = tok;
- int iv = strtol(tok, &end, 10);
+ int iv = strtol(tok, &end, 10);
if (end && *end == '\0') {
*((int *)cv->val) = iv;
TSError("[buffer_upload] Parsed int config value %s : %d", cv->str, iv);
@@ -1056,7 +1056,7 @@ parse_config_line(char *line, const struct config_val_ul *cv)
break;
}
case TYPE_UINT: {
- char *end = tok;
+ char *end = tok;
unsigned int uiv = strtoul(tok, &end, 10);
if (end && *end == '\0') {
*((unsigned int *)cv->val) = uiv;
@@ -1067,7 +1067,7 @@ parse_config_line(char *line, const struct config_val_ul *cv)
}
case TYPE_LONG: {
char *end = tok;
- long lv = strtol(tok, &end, 10);
+ long lv = strtol(tok, &end, 10);
if (end && *end == '\0') {
*((long *)cv->val) = lv;
TSError("[buffer_upload] Parsed long config value %s : %ld", cv->str, lv);
@@ -1076,7 +1076,7 @@ parse_config_line(char *line, const struct config_val_ul *cv)
break;
}
case TYPE_ULONG: {
- char *end = tok;
+ char *end = tok;
unsigned long ulv = strtoul(tok, &end, 10);
if (end && *end == '\0') {
*((unsigned long *)cv->val) = ulv;
@@ -1120,18 +1120,18 @@ bool
read_upload_config(const char *file_name)
{
TSDebug(DEBUG_TAG, "read_upload_config: %s", file_name);
- uconfig = (upload_config *)TSmalloc(sizeof(upload_config));
+ uconfig = (upload_config *)TSmalloc(sizeof(upload_config));
uconfig->use_disk_buffer = true;
- uconfig->convert_url = false;
- uconfig->chunk_size = 16 * 1024;
+ uconfig->convert_url = false;
+ uconfig->chunk_size = 16 * 1024;
uconfig->mem_buffer_size = 32 * 1024;
- uconfig->url_list_file = NULL;
- uconfig->max_url_length = 4096;
- uconfig->url_num = 0;
- uconfig->urls = NULL;
- uconfig->base_dir = NULL;
- uconfig->subdir_num = 64;
- uconfig->thread_num = 4;
+ uconfig->url_list_file = NULL;
+ uconfig->max_url_length = 4096;
+ uconfig->url_num = 0;
+ uconfig->urls = NULL;
+ uconfig->base_dir = NULL;
+ uconfig->subdir_num = 64;
+ uconfig->thread_num = 4;
struct config_val_ul config_vals[] = {{"use_disk_buffer", TYPE_BOOL, &(uconfig->use_disk_buffer)},
{"convert_url", TYPE_BOOL, &(uconfig->convert_url)},
@@ -1216,8 +1216,8 @@ TSPluginInit(int argc, const char *argv[])
TSDebug(DEBUG_TAG, "loaded uconfig->url_list_file, num urls: %d", uconfig->url_num);
}
- info.plugin_name = const_cast<char *>("buffer_upload");
- info.vendor_name = const_cast<char *>("Apache Software Foundation");
+ info.plugin_name = const_cast<char *>("buffer_upload");
+ info.vendor_name = const_cast<char *>("Apache Software Foundation");
info.support_email = const_cast<char *>("dev@trafficserver.apache.org");
if (uconfig->use_disk_buffer && !create_directory()) {
diff --git a/plugins/experimental/cache_key_genid/cache_key_genid.c b/plugins/experimental/cache_key_genid/cache_key_genid.c
index cfaf1ac..4d0ac60 100644
--- a/plugins/experimental/cache_key_genid/cache_key_genid.c
+++ b/plugins/experimental/cache_key_genid/cache_key_genid.c
@@ -44,7 +44,7 @@ get_genid_host(char **host, char *url)
if (pt1 && pt2 && pt2 > pt1) {
host_len = pt2 - pt1;
- *host = calloc(num, host_len + 1);
+ *host = calloc(num, host_len + 1);
strncpy(*host, pt1, host_len);
}
}
@@ -154,8 +154,8 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)PLUGIN_NAME;
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)PLUGIN_NAME;
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (argc > 1) {
diff --git a/plugins/experimental/cache_promote/cache_promote.cc b/plugins/experimental/cache_promote/cache_promote.cc
index ca236b0..c35c570 100644
--- a/plugins/experimental/cache_promote/cache_promote.cc
+++ b/plugins/experimental/cache_promote/cache_promote.cc
@@ -102,7 +102,7 @@ public:
// These are pure virtual
virtual bool doPromote(TSHttpTxn txnp) = 0;
virtual const char *policyName() const = 0;
- virtual void usage() const = 0;
+ virtual void usage() const = 0;
private:
float _sample;
@@ -238,9 +238,9 @@ public:
{
LRUHash hash;
LRUMap::iterator map_it;
- char *url = NULL;
+ char *url = NULL;
int url_len = 0;
- bool ret = false;
+ bool ret = false;
TSMBuffer request;
TSMLoc req_hdr;
@@ -299,8 +299,8 @@ public:
_list.push_front(NULL_LRU_ENTRY);
}
// Update the "new" LRUEntry and add it to the hash
- _list.begin()->first = hash;
- _list.begin()->second = 1;
+ _list.begin()->first = hash;
+ _list.begin()->second = 1;
_map[&(_list.begin()->first)] = _list.begin();
}
@@ -419,7 +419,7 @@ cont_nocache_response(TSCont contp, TSEvent event, void *edata)
static int
cont_handle_policy(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
PromotionConfig *config = static_cast<PromotionConfig *>(TSContDataGet(contp));
switch (event) {
@@ -507,7 +507,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf */, int /
void
TSRemapDeleteInstance(void *ih)
{
- TSCont contp = static_cast<TSCont>(ih);
+ TSCont contp = static_cast<TSCont>(ih);
PromotionConfig *config = static_cast<PromotionConfig *>(TSContDataGet(contp));
delete config;
diff --git a/plugins/experimental/cache_range_requests/cache_range_requests.cc b/plugins/experimental/cache_range_requests/cache_range_requests.cc
index a439021..2abe34c 100644
--- a/plugins/experimental/cache_range_requests/cache_range_requests.cc
+++ b/plugins/experimental/cache_range_requests/cache_range_requests.cc
@@ -81,7 +81,7 @@ range_header_check(TSHttpTxn txnp)
struct txndata *txn_state;
TSMBuffer hdr_bufp;
TSMLoc req_hdrs = NULL;
- TSMLoc loc = NULL;
+ TSMLoc loc = NULL;
TSCont txn_contp;
if (TS_SUCCESS == TSHttpTxnClientReqGet(txnp, &hdr_bufp, &req_hdrs)) {
@@ -94,7 +94,7 @@ range_header_check(TSHttpTxn txnp)
if (NULL == (txn_contp = TSContCreate((TSEventFunc)transaction_handler, NULL))) {
ERROR_LOG("failed to create the transaction handler continuation.");
} else {
- txn_state = (struct txndata *)TSmalloc(sizeof(struct txndata));
+ txn_state = (struct txndata *)TSmalloc(sizeof(struct txndata));
txn_state->range_value = TSstrndup(hdr_value, length);
DEBUG_LOG("length: %d, txn_state->range_value: %s", length, txn_state->range_value);
txn_state->range_value[length] = '\0'; // workaround for bug in core
@@ -238,7 +238,7 @@ static int
remove_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len)
{
TSMLoc field = TSMimeHdrFieldFind(bufp, hdr_loc, header, len);
- int cnt = 0;
+ int cnt = 0;
while (field) {
TSMLoc tmp = TSMimeHdrFieldNextDup(bufp, hdr_loc, field);
@@ -267,7 +267,7 @@ set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char *header, int len, const ch
}
DEBUG_LOG("header: %s, len: %d, val: %s, val_len: %d", header, len, val, val_len);
- bool ret = false;
+ bool ret = false;
TSMLoc field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, header, len);
if (!field_loc) {
@@ -359,8 +359,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
TSCont txnp_cont;
- info.plugin_name = (char *)PLUGIN_NAME;
- info.vendor_name = (char *)"Comcast";
+ info.plugin_name = (char *)PLUGIN_NAME;
+ info.vendor_name = (char *)"Comcast";
info.support_email = (char *)"John_Rushford@cable.comcast.com";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -383,7 +383,7 @@ TSPluginInit(int argc, const char *argv[])
static void
transaction_handler(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
struct txndata *txn_state = (struct txndata *)TSContDataGet(contp);
switch (event) {
diff --git a/plugins/experimental/cachekey/configs.cc b/plugins/experimental/cachekey/configs.cc
index f82ca29..e2666e8 100644
--- a/plugins/experimental/cachekey/configs.cc
+++ b/plugins/experimental/cachekey/configs.cc
@@ -343,7 +343,7 @@ Configs::init(int argc, char *argv[])
{0, 0, 0, 0}};
bool status = true;
- optind = 0;
+ optind = 0;
/* argv contains the "to" and "from" URLs. Skip the first so that the second one poses as the program name. */
argc--;
diff --git a/plugins/experimental/cachekey/pattern.cc b/plugins/experimental/cachekey/pattern.cc
index 4d884e6..d4de7e6 100644
--- a/plugins/experimental/cachekey/pattern.cc
+++ b/plugins/experimental/cachekey/pattern.cc
@@ -82,12 +82,12 @@ Pattern::init(const String &config)
String pattern;
String replacement;
- size_t start = 1;
+ size_t start = 1;
size_t current = 0;
- size_t next = 1;
+ size_t next = 1;
do {
current = next + 1;
- next = config.find_first_of("/", current);
+ next = config.find_first_of("/", current);
} while (next != String::npos && '\\' == config[next - 1]);
if (next != String::npos) {
@@ -101,7 +101,7 @@ Pattern::init(const String &config)
start = next + 1;
do {
current = next + 1;
- next = config.find_first_of("/", current);
+ next = config.find_first_of("/", current);
} while (next != String::npos && '\\' == config[next - 1]);
if (next != String::npos) {
@@ -265,7 +265,7 @@ Pattern::capture(const String &subject, StringVector &result)
}
for (int i = 0; i < _matchCount; i++) {
- int start = _ovector[2 * i];
+ int start = _ovector[2 * i];
int length = _ovector[2 * i + 1] - _ovector[2 * i];
String dst(subject, start, length);
@@ -308,8 +308,8 @@ Pattern::replace(const String &subject, String &result)
int previous = 0;
for (int i = 0; i < _tokenCount; i++) {
int replIndex = _tokens[i];
- int start = _ovector[2 * replIndex];
- int length = _ovector[2 * replIndex + 1] - _ovector[2 * replIndex];
+ int start = _ovector[2 * replIndex];
+ int length = _ovector[2 * replIndex + 1] - _ovector[2 * replIndex];
String src(_replacement, _tokenOffset[i], 2);
String dst(subject, start, length);
@@ -368,7 +368,7 @@ Pattern::compile()
return true;
}
- _tokenCount = 0;
+ _tokenCount = 0;
bool success = true;
for (unsigned i = 0; i < _replacement.length(); i++) {
@@ -386,7 +386,7 @@ Pattern::compile()
} else {
/* Store the location of the replacement */
/* Convert '0' to 0 */
- _tokens[_tokenCount] = _replacement[i + 1] - '0';
+ _tokens[_tokenCount] = _replacement[i + 1] - '0';
_tokenOffset[_tokenCount] = i;
_tokenCount++;
/* Skip the next char */
@@ -484,7 +484,7 @@ Classifier::classify(const String &subject, String &name) const
if ((*p)->empty()) {
continue;
} else if ((*p)->match(subject)) {
- name = (*p)->name();
+ name = (*p)->name();
matched = true;
break;
}
diff --git a/plugins/experimental/cachekey/pattern.h b/plugins/experimental/cachekey/pattern.h
index f1941c1..4eda42f 100644
--- a/plugins/experimental/cachekey/pattern.h
+++ b/plugins/experimental/cachekey/pattern.h
@@ -40,8 +40,8 @@
class Pattern
{
public:
- static const int TOKENCOUNT = 10; /**< @brief Capturing groups $0..$9 */
- static const int OVECOUNT = TOKENCOUNT * 3; /**< @brief pcre_exec() array count, handle 10 capture groups */
+ static const int TOKENCOUNT = 10; /**< @brief Capturing groups $0..$9 */
+ static const int OVECOUNT = TOKENCOUNT * 3; /**< @brief pcre_exec() array count, handle 10 capture groups */
Pattern();
virtual ~Pattern();
diff --git a/plugins/experimental/channel_stats/channel_stats.cc b/plugins/experimental/channel_stats/channel_stats.cc
index 446e60f..057850d 100644
--- a/plugins/experimental/channel_stats/channel_stats.cc
+++ b/plugins/experimental/channel_stats/channel_stats.cc
@@ -227,10 +227,10 @@ get_api_params(TSMBuffer bufp, TSMLoc url_loc, int *show_global, char **channel,
{
const char *query; // not null-terminated, get from TS api
char *tmp_query = NULL; // null-terminated
- int query_len = 0;
+ int query_len = 0;
*show_global = 0;
- *topn = -1;
+ *topn = -1;
query = TSUrlHttpQueryGet(bufp, url_loc, &query_len);
if (query_len == 0)
@@ -418,9 +418,9 @@ get_channel_stat(const std::string &host, channel_stat *&stat, int status_code_t
static uint64_t
get_txn_user_speed(TSHttpTxn txnp, uint64_t body_bytes)
{
- uint64_t user_speed = 0;
- TSHRTime start_time = 0;
- TSHRTime end_time = 0;
+ uint64_t user_speed = 0;
+ TSHRTime start_time = 0;
+ TSHRTime end_time = 0;
TSHRTime interval_time = 0;
#if (TS_VERSION_NUMBER < 3003001)
@@ -469,9 +469,9 @@ handle_txn_close(TSCont /* contp ATS_UNUSED */, TSHttpTxn txnp)
return;
}
- status_code = TSHttpHdrStatusGet(bufp, hdr_loc);
+ status_code = TSHttpHdrStatusGet(bufp, hdr_loc);
status_code_type = status_code / 100;
- body_bytes = TSHttpTxnClientRespBodyBytesGet(txnp);
+ body_bytes = TSHttpTxnClientRespBodyBytesGet(txnp);
__sync_fetch_and_add(&global_response_bytes_content, body_bytes);
if (status_code_type == 2)
@@ -544,10 +544,10 @@ stats_cleanup(TSCont contp, intercept_state *api_state)
static void
stats_process_accept(TSCont contp, intercept_state *api_state)
{
- api_state->req_buffer = TSIOBufferCreate();
+ api_state->req_buffer = TSIOBufferCreate();
api_state->resp_buffer = TSIOBufferCreate();
api_state->resp_reader = TSIOBufferReaderAlloc(api_state->resp_buffer);
- api_state->read_vio = TSVConnRead(api_state->net_vc, contp, api_state->req_buffer, INT64_MAX);
+ api_state->read_vio = TSVConnRead(api_state->net_vc, contp, api_state->req_buffer, INT64_MAX);
}
static int
@@ -798,8 +798,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)PLUGIN_NAME;
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)PLUGIN_NAME;
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/collapsed_connection/MurmurHash3.cc b/plugins/experimental/collapsed_connection/MurmurHash3.cc
index 252c4b0..7531a14 100644
--- a/plugins/experimental/collapsed_connection/MurmurHash3.cc
+++ b/plugins/experimental/collapsed_connection/MurmurHash3.cc
@@ -80,7 +80,7 @@ void
MurmurHash3_x86_32(const void *key, int len, uint32_t seed, void *out)
{
const uint8_t *data = (const uint8_t *)key;
- const int nblocks = len / 4;
+ const int nblocks = len / 4;
uint32_t h1 = seed;
@@ -140,7 +140,7 @@ void
MurmurHash3_x86_128(const void *key, const int len, uint32_t seed, void *out)
{
const uint8_t *data = (const uint8_t *)key;
- const int nblocks = len / 16;
+ const int nblocks = len / 16;
uint32_t h1 = seed;
uint32_t h2 = seed;
diff --git a/plugins/experimental/collapsed_connection/collapsed_connection.cc b/plugins/experimental/collapsed_connection/collapsed_connection.cc
index 7161359..d0d5273 100644
--- a/plugins/experimental/collapsed_connection/collapsed_connection.cc
+++ b/plugins/experimental/collapsed_connection/collapsed_connection.cc
@@ -125,24 +125,24 @@ static CcPluginConfig *
initConfig(const char *fn)
{
CcPluginData *plugin_data = getCcPlugin();
- CcPluginConfig *config = static_cast<CcPluginConfig *>(TSmalloc(sizeof(CcPluginConfig)));
+ CcPluginConfig *config = static_cast<CcPluginConfig *>(TSmalloc(sizeof(CcPluginConfig)));
// Default config
if (NULL == plugin_data || NULL == plugin_data->global_config) {
- config->enabled = true;
- config->required_header = NULL;
+ config->enabled = true;
+ config->required_header = NULL;
config->insert_lock_retry_time = DEFAULT_INSERT_LOCK_RETRY_TIME;
config->max_lock_retry_timeout = DEFAULT_MAX_LOCK_RETRY_TIMEOUT;
- config->keep_pass_record_time = DEFAULT_KEEP_PASS_RECORD_TIME;
+ config->keep_pass_record_time = DEFAULT_KEEP_PASS_RECORD_TIME;
} else {
// Inherit from global config
CcPluginConfig *global_config = plugin_data->global_config;
- config->enabled = global_config->enabled;
- config->required_header = TSstrdup(global_config->required_header);
+ config->enabled = global_config->enabled;
+ config->required_header = TSstrdup(global_config->required_header);
config->insert_lock_retry_time = global_config->insert_lock_retry_time;
config->max_lock_retry_timeout = global_config->max_lock_retry_timeout;
- config->keep_pass_record_time = global_config->keep_pass_record_time;
+ config->keep_pass_record_time = global_config->keep_pass_record_time;
}
if (NULL != fn) {
@@ -282,8 +282,8 @@ getCurrentHashEntries(UintMap *map)
{
static int64_t cur = 0;
static int64_t max = 0;
- int64_t size = map->size();
- int64_t diff = size - cur;
+ int64_t size = map->size();
+ int64_t diff = size - cur;
cur = size;
if (diff != 0) {
@@ -311,10 +311,10 @@ static int64_t
getCurrentKeepPassEntries(UsecList *list)
{
CcPluginData *plugin_data = getCcPlugin();
- static int64_t cur = 0;
- static int64_t max = 0;
- int64_t size = list->size();
- int64_t diff = size - cur;
+ static int64_t cur = 0;
+ static int64_t max = 0;
+ int64_t size = list->size();
+ int64_t diff = size - cur;
cur = size;
if (diff != 0) {
@@ -340,11 +340,11 @@ static TSReturnCode
addOrCheckKeepPassRecords(uint32_t hash_key, int64_t timeout)
{
CcPluginData *plugin_data = getCcPlugin();
- UintMap *active_hash_map = plugin_data->active_hash_map;
- UsecList *keep_pass_list = plugin_data->keep_pass_list;
+ UintMap *active_hash_map = plugin_data->active_hash_map;
+ UsecList *keep_pass_list = plugin_data->keep_pass_list;
std::list<PassRecord>::iterator it;
PassRecord passRecord;
- bool added = true;
+ bool added = true;
TSHRTime cur_ms = TShrtime() / TS_HRTIME_MSECOND; // TS-2200, ats_dev-4.1+
// Only gc per 0.1ms
@@ -354,7 +354,7 @@ addOrCheckKeepPassRecords(uint32_t hash_key, int64_t timeout)
}
}
- passRecord.timeout = cur_ms + timeout;
+ passRecord.timeout = cur_ms + timeout;
passRecord.hash_key = hash_key;
if (hash_key > 0) {
@@ -421,8 +421,8 @@ static CcTxnState
insertNewHashEntry(CcTxnData *txn_data)
{
CcPluginData *plugin_data = getCcPlugin();
- CcTxnState ret = CC_NONE;
- UintMap *active_hash_map = plugin_data->active_hash_map;
+ CcTxnState ret = CC_NONE;
+ UintMap *active_hash_map = plugin_data->active_hash_map;
if (0 == txn_data->hash_key) {
return ret;
@@ -433,7 +433,7 @@ insertNewHashEntry(CcTxnData *txn_data)
int64_t size = 0;
addOrCheckKeepPassRecords(0, 0);
map_ret = active_hash_map->insert(std::make_pair(txn_data->hash_key, CC_INSERT));
- size = getCurrentHashEntries(active_hash_map);
+ size = getCurrentHashEntries(active_hash_map);
TSMutexUnlock(plugin_data->mutex);
if (false != map_ret.second) {
TSDebug(PLUGIN_NAME, "[%" PRIu64 "] hash_key inserted, active_hash_map.size = %" PRId64, txn_data->seq_id, size);
@@ -479,9 +479,9 @@ insertNewHashEntry(CcTxnData *txn_data)
static TSReturnCode
updateOrRemoveHashEntry(CcTxnData *txn_data)
{
- TSReturnCode ret = TS_ERROR;
+ TSReturnCode ret = TS_ERROR;
CcPluginData *plugin_data = getCcPlugin();
- UintMap *active_hash_map = plugin_data->active_hash_map;
+ UintMap *active_hash_map = plugin_data->active_hash_map;
if (0 == txn_data->hash_key || CC_PASSED == txn_data->cc_state) {
return TS_SUCCESS;
@@ -493,7 +493,7 @@ updateOrRemoveHashEntry(CcTxnData *txn_data)
if (TS_SUCCESS == TSMutexLockTry(plugin_data->mutex)) {
UintMap::iterator pos = active_hash_map->find(txn_data->hash_key);
- int64_t size = 0;
+ int64_t size = 0;
if (pos != active_hash_map->end()) {
active_hash_map->erase(pos);
}
@@ -535,7 +535,7 @@ getCacheUrlHashKey(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc /* hdr_loc ATS_UNUSED
{
TSMLoc url_loc = TS_NULL_MLOC;
int url_len;
- char *url = NULL;
+ char *url = NULL;
uint32_t hash_key = 0;
if (TS_SUCCESS != TSUrlCreate(bufp, &url_loc)) {
@@ -570,11 +570,11 @@ getCacheUrlHashKey(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc /* hdr_loc ATS_UNUSED
static bool
isResponseCacheable(TSMBuffer bufp, TSMLoc hdr_loc)
{
- bool cacheable = false;
+ bool cacheable = false;
bool found_public = false;
bool found_maxage = false;
bool found_expire = false;
- TSMLoc field_loc = TS_NULL_MLOC;
+ TSMLoc field_loc = TS_NULL_MLOC;
if (0 != (field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, TS_MIME_FIELD_EXPIRES, TS_MIME_LEN_EXPIRES))) {
found_expire = true;
@@ -585,7 +585,7 @@ isResponseCacheable(TSMBuffer bufp, TSMLoc hdr_loc)
int field_cnt = TSMimeHdrFieldValuesCount(bufp, hdr_loc, field_loc);
for (int i = 0; i < field_cnt; i++) {
- int len = 0;
+ int len = 0;
const char *val = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, i, &len);
if (0 == i) {
TSDebug(PLUGIN_NAME, "Cache-Control: %s", val);
@@ -644,10 +644,10 @@ retryCacheUrlLock(TSCont contp, TSEvent /* event ATS_UNUSED */, void * /* edata
static void
addMutexRetry(CcTxnData *txn_data, TSEvent event, TSHRTime timeout)
{
- TSCont contp = TSContCreate(retryCacheUrlLock, NULL);
+ TSCont contp = TSContCreate(retryCacheUrlLock, NULL);
TryLockData *data = static_cast<TryLockData *>(TSmalloc(sizeof(TryLockData)));
- data->event = event;
+ data->event = event;
data->txn_data = txn_data;
TSContDataSet(contp, data);
TSContSchedule(contp, timeout, TS_THREAD_POOL_DEFAULT);
@@ -668,17 +668,17 @@ static CcTxnData *
getCcTxnData(TSHttpTxn txnp, bool create, bool remap)
{
CcPluginData *plugin_data = getCcPlugin();
- CcTxnData *txn_data = NULL;
+ CcTxnData *txn_data = NULL;
txn_data = reinterpret_cast<CcTxnData *>(TSHttpTxnArgGet(txnp, plugin_data->txn_slot));
if (NULL == txn_data && true == create) {
- txn_data = static_cast<CcTxnData *>(TSmalloc(sizeof(CcTxnData)));
- txn_data->config = plugin_data->global_config;
- txn_data->seq_id = plugin_data->seq_id++;
- txn_data->txnp = txnp;
- txn_data->contp = NULL;
- txn_data->hash_key = 0;
- txn_data->cc_state = CC_NONE;
+ txn_data = static_cast<CcTxnData *>(TSmalloc(sizeof(CcTxnData)));
+ txn_data->config = plugin_data->global_config;
+ txn_data->seq_id = plugin_data->seq_id++;
+ txn_data->txnp = txnp;
+ txn_data->contp = NULL;
+ txn_data->hash_key = 0;
+ txn_data->cc_state = CC_NONE;
txn_data->wait_time = 0;
TSHttpTxnArgSet(txnp, plugin_data->txn_slot, txn_data);
if (remap) {
@@ -899,7 +899,7 @@ testCacheLookupResult(CcTxnData *txn_data)
static int
collapsedConnectionMainHandler(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
- TSHttpTxn txnp = reinterpret_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = reinterpret_cast<TSHttpTxn>(edata);
CcTxnData *txn_data = getCcTxnData(txnp, TS_EVENT_HTTP_POST_REMAP == event, false);
if (NULL != txn_data) {
@@ -980,12 +980,12 @@ getCcPlugin()
if (NULL == data) {
TSMgmtInt read_while_writer = 0;
- data = static_cast<CcPluginData *>(TSmalloc(sizeof(CcPluginData)));
- data->mutex = TSMutexCreate();
- data->active_hash_map = new UintMap();
- data->keep_pass_list = new UsecList();
- data->seq_id = 0;
- data->global_config = NULL;
+ data = static_cast<CcPluginData *>(TSmalloc(sizeof(CcPluginData)));
+ data->mutex = TSMutexCreate();
+ data->active_hash_map = new UintMap();
+ data->keep_pass_list = new UsecList();
+ data->seq_id = 0;
+ data->global_config = NULL;
TSHttpArgIndexReserve(PLUGIN_NAME, "reserve txn_data slot", &(data->txn_slot));
if (TS_SUCCESS == TSMgmtIntGet("proxy.config.cache.enable_read_while_writer", &read_while_writer) && read_while_writer > 0) {
@@ -1073,9 +1073,9 @@ TSRemapDeleteInstance(void *ih)
TSRemapStatus
TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo * /* rri ATS_UNUSED */)
{
- TSHttpTxn txnp = static_cast<TSHttpTxn>(rh);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(rh);
CcPluginData *plugin_data = getCcPlugin();
- CcTxnData *txn_data = getCcTxnData(txnp, true, true);
+ CcTxnData *txn_data = getCcTxnData(txnp, true, true);
txn_data->config = reinterpret_cast<CcPluginConfig *>(ih);
@@ -1107,10 +1107,10 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
TSMgmtInt http_cache = 0;
- TSCont contp = NULL;
+ TSCont contp = NULL;
- info.plugin_name = const_cast<char *>(PLUGIN_NAME);
- info.vendor_name = const_cast<char *>(PLUGIN_VENDOR);
+ info.plugin_name = const_cast<char *>(PLUGIN_NAME);
+ info.vendor_name = const_cast<char *>(PLUGIN_VENDOR);
info.support_email = const_cast<char *>(PLUGIN_SUPPORT);
if (TS_SUCCESS != TSPluginRegister(&info)) {
diff --git a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
index 3a40e4c..00c56de 100644
--- a/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
+++ b/plugins/experimental/collapsed_forwarding/collapsed_forwarding.cc
@@ -67,12 +67,12 @@
static const char *DEBUG_TAG = (char *)"collapsed_forwarding";
-static const char *LOCATION_HEADER = "Location";
-static const char *REDIRECT_REASON = "See Other";
+static const char *LOCATION_HEADER = "Location";
+static const char *REDIRECT_REASON = "See Other";
static const char *ATS_INTERNAL_MESSAGE = "@Ats-Internal";
static int OPEN_WRITE_FAIL_MAX_REQ_DELAY_RETRIES = 5;
-static int OPEN_WRITE_FAIL_REQ_DELAY_TIMEOUT = 500;
+static int OPEN_WRITE_FAIL_REQ_DELAY_TIMEOUT = 500;
typedef struct _RequestData {
TSHttpTxn txnp;
@@ -233,7 +233,7 @@ on_send_response_header(RequestData *req, TSHttpTxn &txnp, TSCont &contp)
static int
collapsed_cont(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
RequestData *my_req = static_cast<RequestData *>(TSContDataGet(contp));
switch (event) {
@@ -294,11 +294,11 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
RequestData *req_data = new RequestData();
- req_data->txnp = rh;
+ req_data->txnp = rh;
req_data->wl_retry = 0;
int url_len = 0;
- char *url = TSHttpTxnEffectiveUrlStringGet(rh, &url_len);
+ char *url = TSHttpTxnEffectiveUrlStringGet(rh, &url_len);
req_data->req_url.assign(url, url_len);
TSfree(url);
diff --git a/plugins/experimental/custom_redirect/custom_redirect.cc b/plugins/experimental/custom_redirect/custom_redirect.cc
index eb87c26..de69afa 100644
--- a/plugins/experimental/custom_redirect/custom_redirect.cc
+++ b/plugins/experimental/custom_redirect/custom_redirect.cc
@@ -34,9 +34,9 @@
#include <string.h>
#include <stdlib.h>
-static char *redirect_url_header = NULL;
+static char *redirect_url_header = NULL;
static int redirect_url_header_len = 0;
-static int return_code = TS_HTTP_STATUS_NONE;
+static int return_code = TS_HTTP_STATUS_NONE;
static void
handle_response(TSHttpTxn txnp, TSCont /* contp ATS_UNUSED */)
@@ -123,8 +123,8 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
/* This plugin supports following types of url redirect here:
*
@@ -141,14 +141,14 @@ TSPluginInit(int argc, const char *argv[])
*/
if (argc > 1) {
if (isNumber(argv[1])) {
- return_code = atoi(argv[1]);
+ return_code = atoi(argv[1]);
redirect_url_header = TSstrdup(TS_MIME_FIELD_LOCATION);
} else {
redirect_url_header = TSstrdup(argv[1]);
}
} else {
// default header name is x-redirect-url
- redirect_url_header = TSstrdup("x-redirect-url");
+ redirect_url_header = TSstrdup("x-redirect-url");
redirect_url_header_len = strlen(redirect_url_header);
}
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/epic/epic.cc b/plugins/experimental/epic/epic.cc
index 8f4c738..8c91e72 100644
--- a/plugins/experimental/epic/epic.cc
+++ b/plugins/experimental/epic/epic.cc
@@ -307,8 +307,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"epic";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"epic";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/escalate/escalate.cc b/plugins/experimental/escalate/escalate.cc
index 6bca821..1885dc2 100644
--- a/plugins/experimental/escalate/escalate.cc
+++ b/plugins/experimental/escalate/escalate.cc
@@ -84,7 +84,7 @@ MakeEscalateUrl(TSMBuffer mbuf, TSMLoc url, const char *host, size_t host_len, i
static int
EscalateResponse(TSCont cont, TSEvent event, void *edata)
{
- TSHttpTxn txn = (TSHttpTxn)edata;
+ TSHttpTxn txn = (TSHttpTxn)edata;
EscalationState *es = static_cast<EscalationState *>(TSContDataGet(cont));
EscalationState::StatusMapType::const_iterator entry;
TSMBuffer mbuf;
diff --git a/plugins/experimental/esi/combo_handler.cc b/plugins/experimental/esi/combo_handler.cc
index df664f4..3636df1 100644
--- a/plugins/experimental/esi/combo_handler.cc
+++ b/plugins/experimental/esi/combo_handler.cc
@@ -148,10 +148,10 @@ InterceptData::init(TSVConn vconn)
input.buffer = TSIOBufferCreate();
input.reader = TSIOBufferReaderAlloc(input.buffer);
- input.vio = TSVConnRead(net_vc, contp, input.buffer, INT64_MAX);
+ input.vio = TSVConnRead(net_vc, contp, input.buffer, INT64_MAX);
req_hdr_bufp = TSMBufferCreate();
- req_hdr_loc = TSHttpHdrCreate(req_hdr_bufp);
+ req_hdr_loc = TSHttpHdrCreate(req_hdr_bufp);
TSHttpHdrTypeSet(req_hdr_bufp, req_hdr_loc, TS_HTTP_TYPE_REQUEST);
fetcher = new HttpDataFetcherImpl(contp, creq.client_addr, "combohandler_fetcher");
@@ -167,7 +167,7 @@ InterceptData::setupWrite()
TSAssert(output.buffer == 0);
output.buffer = TSIOBufferCreate();
output.reader = TSIOBufferReaderAlloc(output.buffer);
- output.vio = TSVConnWrite(net_vc, contp, output.reader, INT64_MAX);
+ output.vio = TSVConnWrite(net_vc, contp, output.reader, INT64_MAX);
}
InterceptData::~InterceptData()
@@ -333,7 +333,7 @@ static bool
isComboHandlerRequest(TSMBuffer bufp, TSMLoc hdr_loc, TSMLoc url_loc)
{
int method_len;
- bool retval = false;
+ bool retval = false;
const char *method = TSHttpHdrMethodGet(bufp, hdr_loc, &method_len);
if (!method) {
@@ -367,7 +367,7 @@ getDefaultBucket(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc hdr_obj
LOG_DEBUG("In getDefaultBucket");
TSMLoc field_loc;
const char *host;
- int host_len = 0;
+ int host_len = 0;
bool defaultBucketFound = false;
field_loc = TSMimeHdrFieldFind(bufp, hdr_obj, TS_MIME_FIELD_HOST, -1);
@@ -434,16 +434,16 @@ getClientRequest(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc hdr_loc, TSMLoc url_loc,
static void
parseQueryParameters(const char *query, int query_len, ClientRequest &creq)
{
- creq.status = TS_HTTP_STATUS_OK;
+ creq.status = TS_HTTP_STATUS_OK;
int param_start_pos = 0;
- bool sig_verified = false;
- int colon_pos = -1;
+ bool sig_verified = false;
+ int colon_pos = -1;
string file_url("http://localhost/");
- size_t file_base_url_size = file_url.size();
- const char *common_prefix = 0;
- int common_prefix_size = 0;
+ size_t file_base_url_size = file_url.size();
+ const char *common_prefix = 0;
+ int common_prefix_size = 0;
const char *common_prefix_path = 0;
- int common_prefix_path_size = 0;
+ int common_prefix_path_size = 0;
for (int i = 0; i <= query_len; ++i) {
if ((i == query_len) || (query[i] == '&')) {
@@ -470,13 +470,13 @@ parseQueryParameters(const char *query, int query_len, ClientRequest &creq)
break; // nothing useful after the signature
}
if ((param_len >= 2) && (param[0] == 'p') && (param[1] == '=')) {
- common_prefix_size = param_len - 2;
+ common_prefix_size = param_len - 2;
common_prefix_path_size = 0;
if (common_prefix_size) {
common_prefix = param + 2;
for (int i = 0; i < common_prefix_size; ++i) {
if (common_prefix[i] == ':') {
- common_prefix_path = common_prefix;
+ common_prefix_path = common_prefix;
common_prefix_path_size = i;
++i; // go beyond the ':'
common_prefix += i;
@@ -507,8 +507,8 @@ parseQueryParameters(const char *query, int query_len, ClientRequest &creq)
// modify these to point to the "actual" file path
param_start_pos = colon_pos + 1;
- param_len = i - param_start_pos;
- param = query + param_start_pos;
+ param_len = i - param_start_pos;
+ param = query + param_start_pos;
} else {
file_url += creq.defaultBucket; // default path
}
@@ -546,7 +546,7 @@ static void
checkGzipAcceptance(TSMBuffer bufp, TSMLoc hdr_loc, ClientRequest &creq)
{
creq.gzip_accepted = false;
- TSMLoc field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, TS_MIME_FIELD_ACCEPT_ENCODING, TS_MIME_LEN_ACCEPT_ENCODING);
+ TSMLoc field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, TS_MIME_FIELD_ACCEPT_ENCODING, TS_MIME_LEN_ACCEPT_ENCODING);
if (field_loc != TS_NULL_MLOC) {
const char *value;
int value_len;
@@ -574,7 +574,7 @@ static int
handleServerEvent(TSCont contp, TSEvent event, void *edata)
{
InterceptData *int_data = static_cast<InterceptData *>(TSContDataGet(contp));
- bool write_response = false;
+ bool write_response = false;
switch (event) {
case TS_EVENT_NET_ACCEPT_FAILED:
@@ -687,7 +687,7 @@ readInterceptRequest(InterceptData &int_data)
const char *data;
TSIOBufferBlock block = TSIOBufferReaderStart(int_data.input.reader);
while (block != NULL) {
- data = TSIOBufferBlockReadStart(block, int_data.input.reader, &data_len);
+ data = TSIOBufferBlockReadStart(block, int_data.input.reader, &data_len);
const char *endptr = data + data_len;
if (TSHttpHdrParseReq(int_data.http_parser, int_data.req_hdr_bufp, int_data.req_hdr_loc, &data, endptr) == TS_PARSE_DONE) {
int_data.read_complete = true;
@@ -714,7 +714,7 @@ static const string OK_REPLY_LINE("HTTP/1.0 200 OK\r\n");
static const string BAD_REQUEST_RESPONSE("HTTP/1.0 400 Bad Request\r\n\r\n");
static const string ERROR_REPLY_RESPONSE("HTTP/1.0 500 Internal Server Error\r\n\r\n");
static const string FORBIDDEN_RESPONSE("HTTP/1.0 403 Forbidden\r\n\r\n");
-static const char GZIP_ENCODING_FIELD[] = {"Content-Encoding: gzip\r\n"};
+static const char GZIP_ENCODING_FIELD[] = {"Content-Encoding: gzip\r\n"};
static const int GZIP_ENCODING_FIELD_SIZE = sizeof(GZIP_ENCODING_FIELD) - 1;
static bool
@@ -782,11 +782,11 @@ prepareResponse(InterceptData &int_data, ByteBlockList &body_blocks, string &res
if (int_data.creq.status == TS_HTTP_STATUS_OK) {
HttpDataFetcherImpl::ResponseData resp_data;
TSMLoc field_loc;
- int max_age = 0;
+ int max_age = 0;
bool got_max_age = false;
time_t expires_time;
bool got_expires_time = false;
- int num_headers = HEADER_WHITELIST.size();
+ int num_headers = HEADER_WHITELIST.size();
int flags_list[num_headers];
for (int i = 0; i < num_headers; i++) {
@@ -805,7 +805,7 @@ prepareResponse(InterceptData &int_data, ByteBlockList &body_blocks, string &res
int curr_field_max_age = getMaxAge(resp_data.bufp, resp_data.hdr_loc);
if (curr_field_max_age > 0) {
if (!got_max_age) {
- max_age = curr_field_max_age;
+ max_age = curr_field_max_age;
got_max_age = true;
} else if (curr_field_max_age < max_age) {
max_age = curr_field_max_age;
@@ -819,7 +819,7 @@ prepareResponse(InterceptData &int_data, ByteBlockList &body_blocks, string &res
if ((n_values != TS_ERROR) && (n_values > 0)) {
curr_field_expires_time = TSMimeHdrFieldValueDateGet(resp_data.bufp, resp_data.hdr_loc, field_loc);
if (!got_expires_time) {
- expires_time = curr_field_expires_time;
+ expires_time = curr_field_expires_time;
got_expires_time = true;
} else if (curr_field_expires_time < expires_time) {
expires_time = curr_field_expires_time;
@@ -907,7 +907,7 @@ prepareResponse(InterceptData &int_data, ByteBlockList &body_blocks, string &res
static bool
getContentType(TSMBuffer bufp, TSMLoc hdr_loc, string &resp_header_fields)
{
- bool retval = false;
+ bool retval = false;
TSMLoc field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, TS_MIME_FIELD_CONTENT_TYPE, TS_MIME_LEN_CONTENT_TYPE);
if (field_loc != TS_NULL_MLOC) {
bool values_added = false;
@@ -946,7 +946,7 @@ getMaxAge(TSMBuffer bufp, TSMLoc hdr_loc)
if ((n_values != TS_ERROR) && (n_values > 0)) {
for (int i = 0; i < n_values; i++) {
value = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, i, &value_len);
- ptr = value;
+ ptr = value;
if (strncmp(value, TS_HTTP_VALUE_MAX_AGE, TS_HTTP_LEN_MAX_AGE) == 0) {
ptr += TS_HTTP_LEN_MAX_AGE;
while ((*ptr == ' ') || (*ptr == '\t')) {
@@ -966,7 +966,7 @@ getMaxAge(TSMBuffer bufp, TSMLoc hdr_loc)
return max_age;
}
-static const char INVARIANT_FIELD_LINES[] = {"Vary: Accept-Encoding\r\n"};
+static const char INVARIANT_FIELD_LINES[] = {"Vary: Accept-Encoding\r\n"};
static const char INVARIANT_FIELD_LINES_SIZE = sizeof(INVARIANT_FIELD_LINES) - 1;
static bool
diff --git a/plugins/experimental/esi/esi.cc b/plugins/experimental/esi/esi.cc
index 2583d2a..40c6f29 100644
--- a/plugins/experimental/esi/esi.cc
+++ b/plugins/experimental/esi/esi.cc
@@ -79,13 +79,13 @@ static HandlerManager *gHandlerManager = NULL;
#define HTTP_VALUE_PRIVATE_CC "max-age=0, private"
enum DataType {
- DATA_TYPE_RAW_ESI = 0,
+ DATA_TYPE_RAW_ESI = 0,
DATA_TYPE_GZIPPED_ESI = 1,
- DATA_TYPE_PACKED_ESI = 2,
+ DATA_TYPE_PACKED_ESI = 2,
};
static const char *DATA_TYPE_NAMES_[] = {"RAW_ESI", "GZIPPED_ESI", "PACKED_ESI"};
-static const char *HEADER_MASK_PREFIX = "Mask-";
+static const char *HEADER_MASK_PREFIX = "Mask-";
static const int HEADER_MASK_PREFIX_SIZE = 5;
struct ContData {
@@ -150,7 +150,7 @@ struct ContData {
os_response_cacheable(true)
{
client_addr = TSHttpTxnClientAddrGet(txnp);
- *debug_tag = '\0';
+ *debug_tag = '\0';
}
void fillPostHeader(TSMBuffer bufp, TSMLoc hdr_loc);
@@ -262,7 +262,7 @@ ContData::init()
createDebugTag(PROCESSOR_DEBUG_TAG, contp, proc_tag), createDebugTag(PARSER_DEBUG_TAG, contp, fetcher_tag),
createDebugTag(EXPR_DEBUG_TAG, contp, expr_tag), &TSDebug, &TSError, *data_fetcher, *esi_vars, *gHandlerManager);
- esi_gzip = new EsiGzip(createDebugTag(GZIP_DEBUG_TAG, contp, gzip_tag), &TSDebug, &TSError);
+ esi_gzip = new EsiGzip(createDebugTag(GZIP_DEBUG_TAG, contp, gzip_tag), &TSDebug, &TSError);
esi_gunzip = new EsiGunzip(createDebugTag(GUNZIP_DEBUG_TAG, contp, gunzip_tag), &TSDebug, &TSError);
TSDebug(debug_tag, "[%s] Set input data type to [%s]", __FUNCTION__, DATA_TYPE_NAMES_[input_type]);
@@ -328,7 +328,7 @@ ContData::getClientState()
n_values = TSMimeHdrFieldValuesCount(req_bufp, req_hdr_loc, field_loc);
if (n_values && (n_values != TS_ERROR)) {
const char *value = NULL;
- int value_len = 0;
+ int value_len = 0;
if (n_values == 1) {
value = TSMimeHdrFieldValueStringGet(req_bufp, req_hdr_loc, field_loc, 0, &value_len);
@@ -522,10 +522,10 @@ removeCacheKey(TSHttpTxn txnp)
{
TSMBuffer req_bufp;
TSMLoc req_hdr_loc;
- TSMLoc url_loc = NULL;
- TSCont contp = NULL;
+ TSMLoc url_loc = NULL;
+ TSCont contp = NULL;
TSCacheKey cacheKey = NULL;
- bool result = false;
+ bool result = false;
if (TSHttpTxnClientReqGet(txnp, &req_bufp, &req_hdr_loc) != TS_SUCCESS) {
TSError("[esi][%s] Error while retrieving client request", __FUNCTION__);
@@ -628,7 +628,7 @@ transformData(TSCont contp)
{
ContData *cont_data;
int64_t toread, consumed = 0, avail;
- bool input_vio_buf_null = false;
+ bool input_vio_buf_null = false;
bool process_input_complete = false;
// Get the output (downstream) vconnection where we'll write data to.
@@ -761,7 +761,7 @@ transformData(TSCont contp)
out_data_len, (out_data_len ? out_data : "(null)"));
} else {
TSError("[esi][%s] ESI processor failed to process document; will return empty document", __FUNCTION__);
- out_data = "";
+ out_data = "";
out_data_len = 0;
}
@@ -772,12 +772,12 @@ transformData(TSCont contp)
if (!gzip(out_data, out_data_len, cdata)) {
TSError("[esi][%s] Error while gzipping content", __FUNCTION__);
out_data_len = 0;
- out_data = "";
+ out_data = "";
} else {
TSDebug(cont_data->debug_tag, "[%s] Compressed document from size %d to %d bytes", __FUNCTION__, out_data_len,
(int)cdata.size());
out_data_len = cdata.size();
- out_data = cdata.data();
+ out_data = cdata.data();
}
}
@@ -931,7 +931,7 @@ transformHandler(TSCont contp, TSEvent event, void *edata)
TSDebug(cont_debug_tag, "[%s] Requested data has been fetched; will skip event and marking processing as complete ",
__FUNCTION__);
cont_data->curr_state = ContData::PROCESSING_COMPLETE;
- process_event = false;
+ process_event = false;
} else {
if (is_fetch_event) {
TSDebug(cont_debug_tag, "[%s] Going to process received data", __FUNCTION__);
@@ -1060,9 +1060,9 @@ addMimeHeaderField(TSMBuffer bufp, TSMLoc hdr_loc, const char *name, int name_le
static int
modifyResponseHeader(TSCont contp, TSEvent event, void *edata)
{
- int retval = 0;
+ int retval = 0;
RespHdrModData *mod_data = static_cast<RespHdrModData *>(TSContDataGet(contp));
- TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
if (event != TS_EVENT_HTTP_SEND_RESPONSE_HDR) {
TSError("[esi][%s] Unexpected event (%d)", __FUNCTION__, event);
goto lReturn;
@@ -1222,7 +1222,7 @@ maskOsCacheHeaders(TSHttpTxn txnp)
name = TSMimeHdrFieldNameGet(bufp, hdr_loc, field_loc, &name_len);
if (name) {
mask_header = is_cache_header = false;
- n_field_values = TSMimeHdrFieldValuesCount(bufp, hdr_loc, field_loc);
+ n_field_values = TSMimeHdrFieldValuesCount(bufp, hdr_loc, field_loc);
for (int j = 0; j < n_field_values; ++j) {
value = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, j, &value_len);
if (NULL == value || !value_len) {
@@ -1369,7 +1369,7 @@ isInterceptRequest(TSHttpTxn txnp)
}
bool valid_request = false;
- bool retval = false;
+ bool retval = false;
int method_len;
const char *method = TSHttpHdrMethodGet(bufp, hdr_loc, &method_len);
if (!method) {
@@ -1421,10 +1421,10 @@ addSendResponseHeaderHook(TSHttpTxn txnp, const ContData *src_cont_data)
}
TSHttpTxnHookAdd(txnp, TS_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
RespHdrModData *cont_data = new RespHdrModData();
- cont_data->option_info = src_cont_data->option_info;
- cont_data->cache_txn = src_cont_data->cache_txn;
- cont_data->head_only = src_cont_data->head_only;
- cont_data->gzip_encoding = src_cont_data->gzip_output;
+ cont_data->option_info = src_cont_data->option_info;
+ cont_data->cache_txn = src_cont_data->cache_txn;
+ cont_data->head_only = src_cont_data->head_only;
+ cont_data->gzip_encoding = src_cont_data->gzip_output;
TSContDataSet(contp, cont_data);
return true;
}
@@ -1433,7 +1433,7 @@ static bool
addTransform(TSHttpTxn txnp, const bool processing_os_response, const bool intercept_header, const bool head_only,
const struct OptionInfo *pOptionInfo)
{
- TSCont contp = 0;
+ TSCont contp = 0;
ContData *cont_data = 0;
contp = TSTransformCreate(transformHandler, txnp);
@@ -1445,10 +1445,10 @@ addTransform(TSHttpTxn txnp, const bool processing_os_response, const bool inter
cont_data = new ContData(contp, txnp);
TSContDataSet(contp, cont_data);
- cont_data->option_info = pOptionInfo;
- cont_data->cache_txn = !processing_os_response;
+ cont_data->option_info = pOptionInfo;
+ cont_data->cache_txn = !processing_os_response;
cont_data->intercept_header = intercept_header;
- cont_data->head_only = head_only;
+ cont_data->head_only = head_only;
cont_data->getClientState();
cont_data->getServerState();
@@ -1495,10 +1495,10 @@ pthread_key_t threadKey = 0;
static int
globalHookHandler(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
- bool intercept_header = false;
- bool head_only = false;
- bool intercept_req = isInterceptRequest(txnp);
+ TSHttpTxn txnp = (TSHttpTxn)edata;
+ bool intercept_header = false;
+ bool head_only = false;
+ bool intercept_req = isInterceptRequest(txnp);
struct OptionInfo *pOptionInfo = (struct OptionInfo *)TSContDataGet(contp);
switch (event) {
@@ -1606,7 +1606,7 @@ esiPluginInit(int argc, const char *argv[], struct OptionInfo *pOptionInfo)
optarg = NULL;
optind = opterr = optopt = 0;
- int longindex = 0;
+ int longindex = 0;
while ((c = getopt_long(argc, (char *const *)argv, "npzbf:", longopts, &longindex)) != -1) {
switch (c) {
case 'n':
@@ -1660,8 +1660,8 @@ void
TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"esi";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"esi";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcher.h b/plugins/experimental/esi/fetcher/HttpDataFetcher.h
index 897803e..71f4b5a 100644
--- a/plugins/experimental/esi/fetcher/HttpDataFetcher.h
+++ b/plugins/experimental/esi/fetcher/HttpDataFetcher.h
@@ -29,9 +29,9 @@
#include "FetchedDataProcessor.h"
enum DataStatus {
- STATUS_ERROR = -1,
+ STATUS_ERROR = -1,
STATUS_DATA_AVAILABLE = 0,
- STATUS_DATA_PENDING = 1,
+ STATUS_DATA_PENDING = 1,
};
class HttpDataFetcher
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
index ab1c50b..2b4872a 100644
--- a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
+++ b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
@@ -128,8 +128,8 @@ HttpDataFetcherImpl::handleFetchEvent(TSEvent event, void *edata)
}
UrlToContentMap::iterator &req_entry = _page_entry_lookup[base_event_id];
- const string &req_str = req_entry->first;
- RequestData &req_data = req_entry->second;
+ const string &req_str = req_entry->first;
+ RequestData &req_data = req_entry->second;
if (req_data.complete) {
// can only happen if there's a bug in this or fetch API code
@@ -153,17 +153,17 @@ HttpDataFetcherImpl::handleFetchEvent(TSEvent event, void *edata)
bool valid_data_received = false;
const char *startptr = req_data.response.data(), *endptr = startptr + page_data_len;
- req_data.bufp = TSMBufferCreate();
+ req_data.bufp = TSMBufferCreate();
req_data.hdr_loc = TSHttpHdrCreate(req_data.bufp);
TSHttpHdrTypeSet(req_data.bufp, req_data.hdr_loc, TS_HTTP_TYPE_RESPONSE);
TSHttpParserClear(_http_parser);
if (TSHttpHdrParseResp(_http_parser, req_data.bufp, req_data.hdr_loc, &startptr, endptr) == TS_PARSE_DONE) {
req_data.resp_status = TSHttpHdrStatusGet(req_data.bufp, req_data.hdr_loc);
- valid_data_received = true;
+ valid_data_received = true;
if (req_data.resp_status == TS_HTTP_STATUS_OK) {
req_data.body_len = endptr - startptr;
- req_data.body = startptr;
+ req_data.body = startptr;
TSDebug(_debug_tag, "[%s] Inserted page data of size %d starting with [%.6s] for request [%s]", __FUNCTION__,
req_data.body_len, (req_data.body_len ? req_data.body : "(null)"), req_str.c_str());
@@ -179,7 +179,7 @@ HttpDataFetcherImpl::handleFetchEvent(TSEvent event, void *edata)
TSError("[HttpDataFetcherImpl][%s] Error while gunzipping data", __FUNCTION__);
}
req_data.body_len = req_data.raw_response.size();
- req_data.body = req_data.raw_response.data();
+ req_data.body = req_data.raw_response.data();
}
for (CallbackObjectList::iterator list_iter = req_data.callback_objects.begin(); list_iter != req_data.callback_objects.end();
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
index a4b8f0a..c8a50d8 100644
--- a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
+++ b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
@@ -90,7 +90,7 @@ public:
{
ResponseData resp;
if (getData(url, resp)) {
- content = resp.content;
+ content = resp.content;
content_len = resp.content_len;
return true;
}
@@ -154,11 +154,11 @@ private:
inline void
HttpDataFetcherImpl::ResponseData::set(const char *c, int clen, TSMBuffer b, TSMLoc loc, TSHttpStatus s)
{
- content = c;
+ content = c;
content_len = clen;
- bufp = b;
- hdr_loc = loc;
- status = s;
+ bufp = b;
+ hdr_loc = loc;
+ status = s;
}
#endif
diff --git a/plugins/experimental/esi/lib/DocNode.h b/plugins/experimental/esi/lib/DocNode.h
index f217c1f..7c1dfc5 100644
--- a/plugins/experimental/esi/lib/DocNode.h
+++ b/plugins/experimental/esi/lib/DocNode.h
@@ -72,19 +72,19 @@ class DocNode
{
public:
enum TYPE {
- TYPE_UNKNOWN = 0,
- TYPE_PRE = 1,
- TYPE_INCLUDE = 2,
- TYPE_COMMENT = 3,
- TYPE_REMOVE = 4,
- TYPE_VARS = 5,
- TYPE_CHOOSE = 6,
- TYPE_WHEN = 7,
- TYPE_OTHERWISE = 8,
- TYPE_TRY = 9,
- TYPE_ATTEMPT = 10,
- TYPE_EXCEPT = 11,
- TYPE_HTML_COMMENT = 12,
+ TYPE_UNKNOWN = 0,
+ TYPE_PRE = 1,
+ TYPE_INCLUDE = 2,
+ TYPE_COMMENT = 3,
+ TYPE_REMOVE = 4,
+ TYPE_VARS = 5,
+ TYPE_CHOOSE = 6,
+ TYPE_WHEN = 7,
+ TYPE_OTHERWISE = 8,
+ TYPE_TRY = 9,
+ TYPE_ATTEMPT = 10,
+ TYPE_EXCEPT = 11,
+ TYPE_HTML_COMMENT = 12,
TYPE_SPECIAL_INCLUDE = 13,
};
diff --git a/plugins/experimental/esi/lib/EsiGunzip.cc b/plugins/experimental/esi/lib/EsiGunzip.cc
index 53aa3e0..8217e8a 100644
--- a/plugins/experimental/esi/lib/EsiGunzip.cc
+++ b/plugins/experimental/esi/lib/EsiGunzip.cc
@@ -32,7 +32,7 @@ using namespace EsiLib;
EsiGunzip::EsiGunzip(const char *debug_tag, ComponentBase::Debug debug_func, ComponentBase::Error error_func)
: ComponentBase(debug_tag, debug_func, error_func), _downstream_length(0), _total_data_length(0)
{
- _init = false;
+ _init = false;
_success = true;
}
@@ -56,10 +56,10 @@ EsiGunzip::stream_decode(const char *data, int data_len, std::string &udata)
BufferList buf_list;
if (!_init) {
- _zstrm.zalloc = Z_NULL;
- _zstrm.zfree = Z_NULL;
- _zstrm.opaque = Z_NULL;
- _zstrm.next_in = 0;
+ _zstrm.zalloc = Z_NULL;
+ _zstrm.zfree = Z_NULL;
+ _zstrm.opaque = Z_NULL;
+ _zstrm.next_in = 0;
_zstrm.avail_in = 0;
if (inflateInit2(&_zstrm, MAX_WBITS + 16) != Z_OK) {
@@ -71,7 +71,7 @@ EsiGunzip::stream_decode(const char *data, int data_len, std::string &udata)
}
if (data && (data_len > 0)) {
- _zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
+ _zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
_zstrm.avail_in = data_len;
char raw_buf[BUF_SIZE];
int inflate_result;
@@ -79,10 +79,10 @@ EsiGunzip::stream_decode(const char *data, int data_len, std::string &udata)
int32_t curr_buf_size;
do {
- _zstrm.next_out = reinterpret_cast<Bytef *>(raw_buf);
+ _zstrm.next_out = reinterpret_cast<Bytef *>(raw_buf);
_zstrm.avail_out = BUF_SIZE;
- inflate_result = inflate(&_zstrm, Z_SYNC_FLUSH);
- curr_buf_size = -1;
+ inflate_result = inflate(&_zstrm, Z_SYNC_FLUSH);
+ curr_buf_size = -1;
if ((inflate_result == Z_OK) || (inflate_result == Z_BUF_ERROR)) {
curr_buf_size = BUF_SIZE - _zstrm.avail_out;
} else if (inflate_result == Z_STREAM_END) {
@@ -123,6 +123,6 @@ EsiGunzip::~EsiGunzip()
{
_downstream_length = 0;
_total_data_length = 0;
- _init = false;
- _success = true;
+ _init = false;
+ _success = true;
}
diff --git a/plugins/experimental/esi/lib/EsiGzip.cc b/plugins/experimental/esi/lib/EsiGzip.cc
index a7e7854..81408c0 100644
--- a/plugins/experimental/esi/lib/EsiGzip.cc
+++ b/plugins/experimental/esi/lib/EsiGzip.cc
@@ -50,9 +50,9 @@ runDeflateLoop(z_stream &zstrm, int flush, std::string &cdata)
char buf[BUF_SIZE];
int deflate_result = Z_OK;
do {
- zstrm.next_out = reinterpret_cast<Bytef *>(buf);
+ zstrm.next_out = reinterpret_cast<Bytef *>(buf);
zstrm.avail_out = BUF_SIZE;
- deflate_result = deflate(&zstrm, flush);
+ deflate_result = deflate(&zstrm, flush);
if ((deflate_result == Z_OK) || (deflate_result == Z_STREAM_END)) {
cdata.append(buf, BUF_SIZE - zstrm.avail_out);
if ((deflate_result == Z_STREAM_END) || zstrm.avail_out > 6) {
@@ -88,7 +88,7 @@ EsiGzip::stream_encode(const char *data, int data_len, std::string &cdata)
}
_zstrm.zalloc = Z_NULL;
- _zstrm.zfree = 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__);
@@ -97,9 +97,9 @@ EsiGzip::stream_encode(const char *data, int data_len, std::string &cdata)
int deflate_result = Z_OK;
if (data && (data_len > 0)) {
- _zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
+ _zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
_zstrm.avail_in = data_len;
- deflate_result = runDeflateLoop(_zstrm, Z_FULL_FLUSH, cdata);
+ deflate_result = runDeflateLoop(_zstrm, Z_FULL_FLUSH, cdata);
if (deflate_result != Z_OK) {
_errorLog("[%s] runDeflateLoop failed!", __FUNCTION__);
@@ -123,14 +123,14 @@ EsiGzip::stream_finish(std::string &cdata, int &downstream_length)
char buf[BUF_SIZE];
_zstrm.zalloc = Z_NULL;
- _zstrm.zfree = 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;
}
- _zstrm.next_in = reinterpret_cast<Bytef *>(buf);
+ _zstrm.next_in = reinterpret_cast<Bytef *>(buf);
_zstrm.avail_in = 0;
// required for the "finish" loop as no data has been given so far
int deflate_result = runDeflateLoop(_zstrm, Z_FINISH, cdata);
diff --git a/plugins/experimental/esi/lib/EsiParser.cc b/plugins/experimental/esi/lib/EsiParser.cc
index 5a776b9..f6d6240 100644
--- a/plugins/experimental/esi/lib/EsiParser.cc
+++ b/plugins/experimental/esi/lib/EsiParser.cc
@@ -29,7 +29,7 @@
using std::string;
using namespace EsiLib;
-const char *EsiParser::ESI_TAG_PREFIX = "<esi:";
+const char *EsiParser::ESI_TAG_PREFIX = "<esi:";
const int EsiParser::ESI_TAG_PREFIX_LEN = 5;
const string EsiParser::SRC_ATTR_STR("src");
@@ -83,7 +83,7 @@ EsiParser::_setup(string &data, int &parse_start_pos, size_t &orig_output_list_s
}
}
if (parse_start_pos == -1) { // first time this cycle that input is being provided
- parse_start_pos = 0;
+ parse_start_pos = 0;
orig_output_list_size = node_list.size();
}
return retval;
@@ -127,7 +127,7 @@ EsiParser::MATCH_TYPE
EsiParser::_searchData(const string &data, size_t start_pos, const char *str, int str_len, size_t &pos) const
{
const char *data_ptr = data.data() + start_pos;
- int data_len = data.size() - start_pos;
+ int data_len = data.size() - start_pos;
int i_data = 0, i_str = 0;
while (i_data < data_len) {
@@ -161,7 +161,7 @@ EsiParser::_searchData(const string &data, size_t start_pos, const char *str, in
EsiParser::MATCH_TYPE
EsiParser::_compareData(const string &data, size_t pos, const char *str, int str_len) const
{
- int i_str = 0;
+ int i_str = 0;
size_t i_data = pos;
for (; i_data < data.size(); ++i_data) {
if (data[i_data] == str[i_str]) {
@@ -196,7 +196,7 @@ EsiParser::_findOpeningTag(const string &data, size_t start_pos, size_t &opening
if (data[i_data] == ESI_TAG_PREFIX[i_esi]) {
if (++i_esi == ESI_TAG_PREFIX_LEN) {
is_html_comment_node = false;
- opening_tag_pos = i_data - i_esi + 1;
+ opening_tag_pos = i_data - i_esi + 1;
return COMPLETE_MATCH;
}
} else {
@@ -215,7 +215,7 @@ EsiParser::_findOpeningTag(const string &data, size_t start_pos, size_t &opening
char ch = data[i_data + 1]; //<!--esi must follow by a space char
if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n') {
is_html_comment_node = true;
- opening_tag_pos = i_data - i_html_comment + 1;
+ opening_tag_pos = i_data - i_html_comment + 1;
return COMPLETE_MATCH;
}
}
@@ -237,12 +237,12 @@ EsiParser::_findOpeningTag(const string &data, size_t start_pos, size_t &opening
// takes no action for a partial match
if (i_esi) {
is_html_comment_node = false;
- opening_tag_pos = i_data - i_esi;
+ opening_tag_pos = i_data - i_esi;
return PARTIAL_MATCH;
}
if (i_html_comment) {
is_html_comment_node = true;
- opening_tag_pos = i_data - i_html_comment;
+ opening_tag_pos = i_data - i_html_comment;
return PARTIAL_MATCH;
}
return NO_MATCH;
@@ -267,7 +267,7 @@ EsiParser::_parse(const string &data, int &parse_start_pos, DocNodeList &node_li
size_t curr_pos, end_pos;
const char *data_ptr;
const char *const data_start_ptr = data.data();
- size_t data_size = data.size();
+ size_t data_size = data.size();
const EsiNodeInfo *node_info;
MATCH_TYPE search_result;
bool is_html_comment_node;
@@ -300,7 +300,7 @@ EsiParser::_parse(const string &data, int &parse_start_pos, DocNodeList &node_li
if (is_html_comment_node) {
_debugLog(_debug_tag, "[%s] Found html comment tag at position %d", __FUNCTION__, curr_pos);
- data_ptr = data_start_ptr + curr_pos;
+ data_ptr = data_start_ptr + curr_pos;
node_info = &HTML_COMMENT_NODE_INFO;
++curr_pos;
} else {
@@ -454,7 +454,7 @@ EsiParser::_processSpecialIncludeTag(const string &data, size_t curr_pos, size_t
node_list.push_back(DocNode(DocNode::TYPE_SPECIAL_INCLUDE));
DocNode &node = node_list.back();
node.attr_list.push_back(handler_info);
- node.data = data.data() + curr_pos;
+ node.data = data.data() + curr_pos;
node.data_len = end_pos - curr_pos;
_debugLog(_debug_tag, "[%s] Added special include tag with handler [%.*s] and data [%.*s]", __FUNCTION__, handler_info.value_len,
handler_info.value, node.data_len, node.data);
@@ -483,7 +483,7 @@ EsiParser::_processWhenTag(const string &data, size_t curr_pos, size_t end_pos,
}
++term_pos; // go past the terminator
const char *data_start_ptr = data.data() + term_pos;
- int data_size = end_pos - term_pos;
+ int data_size = end_pos - term_pos;
if (!_processSimpleContentTag(DocNode::TYPE_WHEN, data_start_ptr, data_size, node_list)) {
_errorLog("[%s] Could not parse when node's content", __FUNCTION__);
return false;
@@ -498,7 +498,7 @@ bool
EsiParser::_processTryTag(const string &data, size_t curr_pos, size_t end_pos, DocNodeList &node_list) const
{
const char *data_start_ptr = data.data() + curr_pos;
- int data_size = end_pos - curr_pos;
+ int data_size = end_pos - curr_pos;
DocNode try_node(DocNode::TYPE_TRY);
if (!parse(try_node.child_nodes, data_start_ptr, data_size)) {
_errorLog("[%s] Could not parse try node's content", __FUNCTION__);
@@ -506,9 +506,9 @@ EsiParser::_processTryTag(const string &data, size_t curr_pos, size_t end_pos, D
}
DocNodeList::iterator iter, end_node, attempt_node, except_node, temp_iter;
- end_node = try_node.child_nodes.end();
+ end_node = try_node.child_nodes.end();
attempt_node = except_node = end_node;
- iter = try_node.child_nodes.begin();
+ iter = try_node.child_nodes.begin();
while (iter != end_node) {
if (iter->type == DocNode::TYPE_ATTEMPT) {
if (attempt_node != end_node) {
@@ -553,15 +553,15 @@ bool
EsiParser::_processChooseTag(const string &data, size_t curr_pos, size_t end_pos, DocNodeList &node_list) const
{
const char *data_start_ptr = data.data() + curr_pos;
- size_t data_size = end_pos - curr_pos;
+ size_t data_size = end_pos - curr_pos;
DocNode choose_node(DocNode::TYPE_CHOOSE);
if (!parse(choose_node.child_nodes, data_start_ptr, data_size)) {
_errorLog("[%s] Couldn't parse choose node content", __FUNCTION__);
return false;
}
- DocNodeList::iterator end_node = choose_node.child_nodes.end();
+ DocNodeList::iterator end_node = choose_node.child_nodes.end();
DocNodeList::iterator otherwise_node = end_node, iter, temp_iter;
- iter = choose_node.child_nodes.begin();
+ iter = choose_node.child_nodes.begin();
while (iter != end_node) {
if (iter->type == DocNode::TYPE_OTHERWISE) {
if (otherwise_node != end_node) {
@@ -633,10 +633,10 @@ EsiParser::parse(DocNodeList &node_list, const char *ext_data_ptr, int data_len
string data;
size_t orig_output_list_size;
int parse_start_pos = -1;
- bool retval = _completeParse(data, parse_start_pos, orig_output_list_size, node_list, ext_data_ptr, data_len);
+ bool retval = _completeParse(data, parse_start_pos, orig_output_list_size, node_list, ext_data_ptr, data_len);
if (retval && (node_list.size() - orig_output_list_size)) {
// adjust all pointers to addresses in input parameter
- const char *int_data_start = data.data();
+ const char *int_data_start = data.data();
DocNodeList::iterator node_iter = node_list.begin();
for (size_t i = 0; i < orig_output_list_size; ++i, ++node_iter)
;
diff --git a/plugins/experimental/esi/lib/EsiProcessor.cc b/plugins/experimental/esi/lib/EsiProcessor.cc
index e2633a5..cb5ef57 100644
--- a/plugins/experimental/esi/lib/EsiProcessor.cc
+++ b/plugins/experimental/esi/lib/EsiProcessor.cc
@@ -61,7 +61,7 @@ EsiProcessor::start()
_debugLog(_debug_tag, "[%s] Implicit call to stop()", __FUNCTION__);
stop();
}
- _curr_state = PARSING;
+ _curr_state = PARSING;
_usePackedNodeList = false;
return true;
}
@@ -174,7 +174,7 @@ EsiProcessor::_getIncludeStatus(const DocNode &node)
return STATUS_ERROR;
}
const string &processed_url = iter->second;
- DataStatus status = _fetcher.getRequestStatus(processed_url);
+ DataStatus status = _fetcher.getRequestStatus(processed_url);
_debugLog(_debug_tag, "[%s] Got status %d successfully for URL [%.*s]", __FUNCTION__, status, processed_url.size(),
processed_url.data());
return status;
@@ -185,9 +185,9 @@ EsiProcessor::_getIncludeStatus(const DocNode &node)
break;
}
}
- int include_data_id = attr_iter->value_len;
+ int include_data_id = attr_iter->value_len;
SpecialIncludeHandler *handler = reinterpret_cast<SpecialIncludeHandler *>(const_cast<char *>(attr_iter->value));
- DataStatus status = handler->getIncludeStatus(include_data_id);
+ DataStatus status = handler->getIncludeStatus(include_data_id);
_debugLog(_debug_tag, "[%s] Successfully got status for special include with id %d", __FUNCTION__, status, include_data_id);
return status;
@@ -204,7 +204,7 @@ EsiProcessor::_getIncludeData(const DocNode &node, const char **content_ptr /* =
if (url.value_len == 0) { // allow empty url
if (content_ptr && content_len_ptr) {
- *content_ptr = NULL;
+ *content_ptr = NULL;
*content_len_ptr = 0;
return true;
} else {
@@ -239,7 +239,7 @@ EsiProcessor::_getIncludeData(const DocNode &node, const char **content_ptr /* =
break;
}
}
- int include_data_id = attr_iter->value_len;
+ int include_data_id = attr_iter->value_len;
SpecialIncludeHandler *handler = reinterpret_cast<SpecialIncludeHandler *>(const_cast<char *>(attr_iter->value));
bool result;
if (content_ptr && content_len_ptr) {
@@ -362,7 +362,7 @@ EsiProcessor::process(const char *&data, int &data_len)
}
}
_addFooterData();
- data = _output_data.c_str();
+ data = _output_data.c_str();
data_len = _output_data.size();
_debugLog(_debug_tag, "[%s] ESI processed document of size %d starting with [%.10s]", __FUNCTION__, data_len,
(data_len ? data : "(null)"));
@@ -475,7 +475,7 @@ EsiProcessor::flush(string &data, int &overall_len)
}
node_pending = false;
- node_iter = _node_list.begin();
+ node_iter = _node_list.begin();
for (int i = 0; i < _n_processed_nodes; ++i, ++node_iter)
;
for (; node_iter != _node_list.end(); ++node_iter) {
@@ -520,7 +520,7 @@ EsiProcessor::flush(string &data, int &overall_len)
}
data.assign(_output_data);
_overall_len = _overall_len + data.size();
- overall_len = _overall_len;
+ overall_len = _overall_len;
_debugLog(_debug_tag, "[%s] ESI processed document of size %d starting with [%.10s]", __FUNCTION__, data.size(),
(data.size() ? data.data() : "(null)"));
@@ -534,9 +534,9 @@ EsiProcessor::stop()
_node_list.clear();
_include_urls.clear();
_try_blocks.clear();
- _n_prescanned_nodes = 0;
+ _n_prescanned_nodes = 0;
_n_try_blocks_processed = 0;
- _overall_len = 0;
+ _overall_len = 0;
for (IncludeHandlerMap::iterator map_iter = _include_handlers.begin(); map_iter != _include_handlers.end(); ++map_iter) {
delete map_iter->second;
}
@@ -598,7 +598,7 @@ bool
EsiProcessor::_handleChoose(DocNodeList::iterator &curr_node)
{
DocNodeList::iterator iter, otherwise_node, winning_node, end_node;
- end_node = curr_node->child_nodes.end();
+ end_node = curr_node->child_nodes.end();
otherwise_node = end_node;
for (iter = curr_node->child_nodes.begin(); iter != end_node; ++iter) {
if (iter->type == DocNode::TYPE_OTHERWISE) {
@@ -762,7 +762,7 @@ EsiProcessor::_preprocess(DocNodeList &node_list, int &n_prescanned_nodes)
FailureInfo *info;
if (it != threadData->end()) {
- info = it->second;
+ info = it->second;
fetch = _reqAdded = info->isAttemptReq();
_debugLog(_debug_tag, "[%s] Fetch result is %d", __FUNCTION__, fetch);
}
diff --git a/plugins/experimental/esi/lib/Expression.cc b/plugins/experimental/esi/lib/Expression.cc
index c9e47de..0bb7270 100644
--- a/plugins/experimental/esi/lib/Expression.cc
+++ b/plugins/experimental/esi/lib/Expression.cc
@@ -84,7 +84,7 @@ Expression::expand(const char *expr, int expr_len /* = -1 */)
++i; // skip past '$'; for loop's incrementor will skip past '('
} else if (((expr[i] == ')') || (expr[i] == '|')) && (var_start_index != -1)) {
last_variable_expanded = false;
- var_size = i - var_start_index;
+ var_size = i - var_start_index;
if (var_size) {
const string &var_value = _variables.getValue(expr + var_start_index, var_size);
_debugLog(_debug_tag, "[%s] Got value [%.*s] for variable [%.*s]", __FUNCTION__, var_value.size(), var_value.data(),
@@ -108,7 +108,7 @@ Expression::expand(const char *expr, int expr_len /* = -1 */)
goto lFail;
}
const char *default_value = expr + default_value_start;
- int default_value_len = i - default_value_start;
+ int default_value_len = i - default_value_start;
if (!_stripQuotes(default_value, default_value_len)) {
goto lFail;
}
@@ -142,7 +142,7 @@ Expression::_findOperator(const char *expr, int expr_len, Operator &op) const
size_t sep;
for (int i = 0; i < N_OPERATORS; ++i) {
const OperatorString &op_str = OPERATOR_STRINGS[i];
- sep = (op_str.str_len == 1) ? expr_str.find(op_str.str[0]) : expr_str.find(op_str.str);
+ sep = (op_str.str_len == 1) ? expr_str.find(op_str.str[0]) : expr_str.find(op_str.str);
if (sep < expr_str.size()) {
op = static_cast<Operator>(i);
return static_cast<int>(sep);
@@ -173,23 +173,23 @@ Expression::evaluate(const char *expr, int expr_len /* = -1 */)
int subexpr_len;
string lhs, rhs;
bool retval = false;
- int sep = _findOperator(expr, expr_len, op);
+ int sep = _findOperator(expr, expr_len, op);
if (sep == -1) {
retval = _evalSimpleExpr(expr, expr_len);
} else if (_isBinaryOperator(op)) {
- subexpr = expr;
+ subexpr = expr;
subexpr_len = sep;
- lhs = expand(subexpr, subexpr_len);
+ lhs = expand(subexpr, subexpr_len);
_debugLog(_debug_tag, "[%s] LHS [%.*s] expanded to [%.*s]", __FUNCTION__, subexpr_len, subexpr, lhs.size(), lhs.data());
- subexpr = expr + sep + OPERATOR_STRINGS[op].str_len;
+ subexpr = expr + sep + OPERATOR_STRINGS[op].str_len;
subexpr_len = expr_len - subexpr_len - OPERATOR_STRINGS[op].str_len;
- rhs = expand(subexpr, subexpr_len);
+ rhs = expand(subexpr, subexpr_len);
_debugLog(_debug_tag, "[%s] RHS [%.*s] expanded to [%.*s]", __FUNCTION__, subexpr_len, subexpr, rhs.size(), rhs.data());
double lhs_numerical = 0;
double rhs_numerical = 0;
- bool are_numerical = _convert(lhs, lhs_numerical);
- are_numerical = are_numerical ? _convert(rhs, rhs_numerical) : false;
+ bool are_numerical = _convert(lhs, lhs_numerical);
+ are_numerical = are_numerical ? _convert(rhs, rhs_numerical) : false;
switch (op) {
case OP_EQ:
retval = are_numerical ? (lhs_numerical == rhs_numerical) : (lhs == rhs);
diff --git a/plugins/experimental/esi/lib/FailureInfo.cc b/plugins/experimental/esi/lib/FailureInfo.cc
index 715fef3..11f4c4b 100644
--- a/plugins/experimental/esi/lib/FailureInfo.cc
+++ b/plugins/experimental/esi/lib/FailureInfo.cc
@@ -24,7 +24,7 @@
#include "FailureInfo.h"
#include <cstdlib>
-static int LOWER_CUT_OFF = 300;
+static int LOWER_CUT_OFF = 300;
static int HIGHER_CUT_OFF = 1000;
void
diff --git a/plugins/experimental/esi/lib/FailureInfo.h b/plugins/experimental/esi/lib/FailureInfo.h
index 78b3a9b..e5b80e7 100644
--- a/plugins/experimental/esi/lib/FailureInfo.h
+++ b/plugins/experimental/esi/lib/FailureInfo.h
@@ -30,7 +30,7 @@
#if defined(solaris) && !defined(timersub)
#define timersub(a, b, result) \
do { \
- (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
+ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
(result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
if ((result)->tv_usec < 0) { \
--(result)->tv_sec; \
@@ -46,7 +46,7 @@ using namespace std;
typedef std::vector<std::pair<double, double>> FailureToSuccess;
typedef std::map<std::string, class FailureInfo *> FailureData;
-static const int WINDOW_SIZE = 200;
+static const int WINDOW_SIZE = 200;
static const int TOTAL_DURATION = 2000;
class FailureInfo : private EsiLib::ComponentBase
@@ -55,7 +55,7 @@ public:
FailureInfo(const char *debug_tag, ComponentBase::Debug debug_func, ComponentBase::Error error_func)
: ComponentBase(debug_tag, debug_func, error_func), _windowsPassed(0), _avgOverWindow(0), _requestMade(true)
{
- _totalSlots = TOTAL_DURATION / WINDOW_SIZE;
+ _totalSlots = TOTAL_DURATION / WINDOW_SIZE;
_windowMarker = 0;
for (size_t i = 0; i < _totalSlots; i++) {
_statistics.push_back(make_pair(0, 0));
diff --git a/plugins/experimental/esi/lib/HandlerManager.cc b/plugins/experimental/esi/lib/HandlerManager.cc
index 6fda5af..219a93f 100644
--- a/plugins/experimental/esi/lib/HandlerManager.cc
+++ b/plugins/experimental/esi/lib/HandlerManager.cc
@@ -39,7 +39,7 @@ HandlerManager::loadObjects(const Utils::KeyValueMap &handlers)
ModuleHandleMap::iterator path_map_iter;
for (Utils::KeyValueMap::const_iterator id_map_iter = handlers.begin(); id_map_iter != handlers.end(); ++id_map_iter) {
- const string &id = id_map_iter->first;
+ const string &id = id_map_iter->first;
const string &path = id_map_iter->second;
path_map_iter = _path_to_module_map.find(path);
diff --git a/plugins/experimental/esi/lib/SpecialIncludeHandler.h b/plugins/experimental/esi/lib/SpecialIncludeHandler.h
index 7a0d6e3..3c0213b 100644
--- a/plugins/experimental/esi/lib/SpecialIncludeHandler.h
+++ b/plugins/experimental/esi/lib/SpecialIncludeHandler.h
@@ -57,7 +57,7 @@ public:
virtual void
getFooter(const char *&footer, int &footer_len)
{
- footer = NULL;
+ footer = NULL;
footer_len = 0;
}
diff --git a/plugins/experimental/esi/lib/Stats.cc b/plugins/experimental/esi/lib/Stats.cc
index a16614b..be29d5c 100644
--- a/plugins/experimental/esi/lib/Stats.cc
+++ b/plugins/experimental/esi/lib/Stats.cc
@@ -34,7 +34,7 @@ namespace Stats
"esi.n_spcl_include_errs"};
int g_stat_indices[Stats::MAX_STAT_ENUM] = {0};
- StatSystem *g_system = 0;
+ StatSystem *g_system = 0;
void
init(StatSystem *system)
diff --git a/plugins/experimental/esi/lib/Stats.h b/plugins/experimental/esi/lib/Stats.h
index 5f56821..32841cd 100644
--- a/plugins/experimental/esi/lib/Stats.h
+++ b/plugins/experimental/esi/lib/Stats.h
@@ -42,14 +42,14 @@ public:
namespace Stats
{
enum STAT {
- N_OS_DOCS = 0,
- N_CACHE_DOCS = 1,
- N_PARSE_ERRS = 2,
- N_INCLUDES = 3,
- N_INCLUDE_ERRS = 4,
- N_SPCL_INCLUDES = 5,
+ N_OS_DOCS = 0,
+ N_CACHE_DOCS = 1,
+ N_PARSE_ERRS = 2,
+ N_INCLUDES = 3,
+ N_INCLUDE_ERRS = 4,
+ N_SPCL_INCLUDES = 5,
N_SPCL_INCLUDE_ERRS = 6,
- MAX_STAT_ENUM = 7
+ MAX_STAT_ENUM = 7
};
extern const char *STAT_NAMES[MAX_STAT_ENUM];
diff --git a/plugins/experimental/esi/lib/Utils.cc b/plugins/experimental/esi/lib/Utils.cc
index 3f569fd..9d61b07 100644
--- a/plugins/experimental/esi/lib/Utils.cc
+++ b/plugins/experimental/esi/lib/Utils.cc
@@ -50,7 +50,7 @@ Utils::getAttribute(const string &data, const string &attr, size_t curr_pos, siz
ERROR_LOG("[%s] Tag has no [%.*s] attribute", __FUNCTION__, attr.size(), attr.data());
return false;
}
- curr_pos = attr_start + attr.size();
+ curr_pos = attr_start + attr.size();
bool equals_found = false;
for (; curr_pos < end_pos; ++curr_pos) {
if (data[curr_pos] == ' ') {
@@ -72,11 +72,11 @@ Utils::getAttribute(const string &data, const string &attr, size_t curr_pos, siz
return false;
}
bool in_quoted_part = false;
- bool quoted = false;
+ bool quoted = false;
size_t i;
for (i = curr_pos; i < end_pos; ++i) {
if (data[i] == '"') {
- quoted = true;
+ quoted = true;
in_quoted_part = !in_quoted_part;
} else if (data[i] == ' ') {
if (!in_quoted_part) {
@@ -99,9 +99,9 @@ Utils::getAttribute(const string &data, const string &attr, size_t curr_pos, siz
return false;
}
}
- attr_info.name = data_start_ptr + attr_start;
- attr_info.name_len = attr.size();
- attr_info.value = data_start_ptr + curr_pos;
+ attr_info.name = data_start_ptr + attr_start;
+ attr_info.name_len = attr.size();
+ attr_info.value = data_start_ptr + curr_pos;
attr_info.value_len = i - curr_pos;
if (quoted) {
++attr_info.value;
@@ -149,10 +149,10 @@ Utils::parseAttributes(const char *data, int data_len, AttributeList &attr_list,
}
Attribute attr;
bool inside_quotes = false, end_of_attribute;
- bool escape_on = false;
+ bool escape_on = false;
for (i = 0; (i < data_len) && ((isspace(data[i]) || separator_lookup[static_cast<unsigned int>(data[i])])); ++i)
;
- attr.name = data + i;
+ attr.name = data + i;
attr.value = 0;
for (; i <= data_len; ++i) {
end_of_attribute = false;
@@ -180,15 +180,15 @@ Utils::parseAttributes(const char *data, int data_len, AttributeList &attr_list,
} // else ignore variable with unterminated quotes
for (; (i < data_len) && ((isspace(data[i]) || separator_lookup[static_cast<unsigned int>(data[i])])); ++i)
;
- attr.name = data + i;
- attr.value = 0;
+ attr.name = data + i;
+ attr.value = 0;
inside_quotes = false;
} else if (data[i] == '"') {
if (!escape_on) {
inside_quotes = !inside_quotes;
}
} else if ((data[i] == '=') && !attr.value && !inside_quotes) {
- attr.value = data + i + 1;
+ attr.value = data + i + 1;
attr.name_len = data + i - attr.name;
}
escape_on = (data[i] == '\\') ? true : false;
diff --git a/plugins/experimental/esi/lib/Variables.cc b/plugins/experimental/esi/lib/Variables.cc
index 3d77173..aca3fec 100644
--- a/plugins/experimental/esi/lib/Variables.cc
+++ b/plugins/experimental/esi/lib/Variables.cc
@@ -84,7 +84,7 @@ Variables::populate(const HttpHeader &header)
{
if (header.name && header.name_len && header.value && header.value_len) {
// doing this because we can't change our const input arg
- int name_len = (header.name_len == -1) ? strlen(header.name) : header.name_len;
+ int name_len = (header.name_len == -1) ? strlen(header.name) : header.name_len;
int value_len = (header.value_len == -1) ? strlen(header.value) : header.value_len;
// we need to save the cookie string to build the jar from
@@ -267,7 +267,7 @@ Variables::_parseSubCookies()
{
StringHash &cookies = _dict_data[HTTP_COOKIE];
for (StringHash::const_iterator it_cookie = cookies.begin(); it_cookie != cookies.end(); ++it_cookie) {
- const std::string &name = it_cookie->first;
+ const std::string &name = it_cookie->first;
const std::string &value = it_cookie->second;
if (strchr(value.c_str(), '=') == NULL) {
continue;
@@ -304,9 +304,9 @@ Variables::_getSubCookieValue(const string &cookie_str, size_t cookie_part_divid
string &non_const_cookie_str = const_cast<string &>(cookie_str);
StringHash::const_iterator it_part;
- non_const_cookie_str[cookie_part_divider] = '\0'; // make sure cookie name is NULL terminated
- const char *cookie_name = non_const_cookie_str.data(); /* above NULL will take effect */
- const char *part_name = non_const_cookie_str.c_str() + cookie_part_divider + 1;
+ non_const_cookie_str[cookie_part_divider] = '\0'; // make sure cookie name is NULL terminated
+ const char *cookie_name = non_const_cookie_str.data(); /* above NULL will take effect */
+ const char *part_name = non_const_cookie_str.c_str() + cookie_part_divider + 1;
StringKeyHash<StringHash>::const_iterator it_cookie = _sub_cookies.find(cookie_name);
if (it_cookie == _sub_cookies.end()) {
@@ -404,7 +404,7 @@ Variables::_parseDictVariable(const std::string &variable, const char *&header,
int &attr_len) const
{
const char *var_ptr = variable.data();
- int var_size = variable.size();
+ int var_size = variable.size();
if ((var_size <= 4) || (variable[var_size - 1] != '}')) {
return false;
}
@@ -434,9 +434,9 @@ Variables::_parseDictVariable(const std::string &variable, const char *&header,
_debugLog(_debug_tag, "[%s] Dict variable has no attribute name [%.*s]", __FUNCTION__, var_size, var_ptr);
return false;
}
- header = var_ptr;
+ header = var_ptr;
header_len = paranth_index;
- attr = var_ptr + paranth_index + 1;
- attr_len = var_size - header_len - 2;
+ attr = var_ptr + paranth_index + 1;
+ attr_len = var_size - header_len - 2;
return true;
}
diff --git a/plugins/experimental/esi/lib/Variables.h b/plugins/experimental/esi/lib/Variables.h
index 64edd64..7e14691 100644
--- a/plugins/experimental/esi/lib/Variables.h
+++ b/plugins/experimental/esi/lib/Variables.h
@@ -104,17 +104,17 @@ private:
static const std::string PLATFORM_STRING;
enum SimpleHeader {
- HTTP_HOST = 0,
+ HTTP_HOST = 0,
HTTP_REFERER = 1,
};
static const std::string SIMPLE_HEADERS[]; // indices should map to enum values above
enum SpecialHeader {
HTTP_ACCEPT_LANGUAGE = 0,
- HTTP_COOKIE = 1,
- HTTP_USER_AGENT = 2,
- QUERY_STRING = 3,
- HTTP_HEADER = 4,
+ HTTP_COOKIE = 1,
+ HTTP_USER_AGENT = 2,
+ QUERY_STRING = 3,
+ HTTP_HEADER = 4,
};
static const std::string SPECIAL_HEADERS[]; // indices should map to enum values above
@@ -122,7 +122,7 @@ private:
static const std::string NORM_SIMPLE_HEADERS[];
static const std::string NORM_SPECIAL_HEADERS[]; // indices should again map to enum values
- static const int N_SIMPLE_HEADERS = HTTP_REFERER + 1;
+ static const int N_SIMPLE_HEADERS = HTTP_REFERER + 1;
static const int N_SPECIAL_HEADERS = HTTP_HEADER + 1;
StringHash _simple_data;
diff --git a/plugins/experimental/esi/lib/gzip.cc b/plugins/experimental/esi/lib/gzip.cc
index 6d70427..0a39824 100644
--- a/plugins/experimental/esi/lib/gzip.cc
+++ b/plugins/experimental/esi/lib/gzip.cc
@@ -58,9 +58,9 @@ runDeflateLoop(z_stream &zstrm, int flush, std::string &cdata)
char buf[BUF_SIZE];
int deflate_result = Z_OK;
do {
- zstrm.next_out = reinterpret_cast<Bytef *>(buf);
+ zstrm.next_out = reinterpret_cast<Bytef *>(buf);
zstrm.avail_out = BUF_SIZE;
- deflate_result = deflate(&zstrm, flush);
+ deflate_result = deflate(&zstrm, flush);
if ((deflate_result == Z_OK) || (deflate_result == Z_STREAM_END)) {
cdata.append(buf, BUF_SIZE - zstrm.avail_out);
if ((deflate_result == Z_STREAM_END) || zstrm.avail_out) {
@@ -79,7 +79,7 @@ EsiLib::gzip(const ByteBlockList &blocks, std::string &cdata)
cdata.assign(GZIP_HEADER_SIZE, 0); // reserving space for the header
z_stream zstrm;
zstrm.zalloc = Z_NULL;
- zstrm.zfree = 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) {
Utils::ERROR_LOG("[%s] deflateInit2 failed!", __FUNCTION__);
@@ -87,12 +87,12 @@ EsiLib::gzip(const ByteBlockList &blocks, std::string &cdata)
}
int total_data_len = 0;
- uLong crc = crc32(0, Z_NULL, 0);
+ uLong crc = crc32(0, Z_NULL, 0);
int deflate_result = Z_OK;
- int in_data_size = 0;
+ int in_data_size = 0;
for (ByteBlockList::const_iterator iter = blocks.begin(); iter != blocks.end(); ++iter) {
if (iter->data && (iter->data_len > 0)) {
- zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(iter->data));
+ zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(iter->data));
zstrm.avail_in = iter->data_len;
in_data_size += iter->data_len;
deflate_result = runDeflateLoop(zstrm, 0, cdata);
@@ -138,16 +138,16 @@ EsiLib::gunzip(const char *data, int data_len, BufferList &buf_list)
data_len -= (GZIP_HEADER_SIZE + GZIP_TRAILER_SIZE);
buf_list.clear();
z_stream zstrm;
- zstrm.zalloc = Z_NULL;
- zstrm.zfree = Z_NULL;
- zstrm.opaque = Z_NULL;
- zstrm.next_in = 0;
+ zstrm.zalloc = Z_NULL;
+ zstrm.zfree = Z_NULL;
+ zstrm.opaque = Z_NULL;
+ zstrm.next_in = 0;
zstrm.avail_in = 0;
if (inflateInit2(&zstrm, -MAX_WBITS) != Z_OK) {
Utils::ERROR_LOG("[%s] inflateInit2 failed!", __FUNCTION__);
return false;
}
- zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
+ zstrm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
zstrm.avail_in = data_len;
char raw_buf[BUF_SIZE];
int inflate_result;
@@ -155,10 +155,10 @@ EsiLib::gunzip(const char *data, int data_len, BufferList &buf_list)
int32_t curr_buf_size;
uLong crc = crc32(0, Z_NULL, 0);
do {
- zstrm.next_out = reinterpret_cast<Bytef *>(raw_buf);
+ zstrm.next_out = reinterpret_cast<Bytef *>(raw_buf);
zstrm.avail_out = BUF_SIZE;
- inflate_result = inflate(&zstrm, Z_SYNC_FLUSH);
- curr_buf_size = -1;
+ inflate_result = inflate(&zstrm, Z_SYNC_FLUSH);
+ curr_buf_size = -1;
if ((inflate_result == Z_OK) || (inflate_result == Z_BUF_ERROR)) {
curr_buf_size = BUF_SIZE;
} else if (inflate_result == Z_STREAM_END) {
diff --git a/plugins/experimental/esi/lib/gzip.h b/plugins/experimental/esi/lib/gzip.h
index 05e17b9..ba3da0c 100644
--- a/plugins/experimental/esi/lib/gzip.h
+++ b/plugins/experimental/esi/lib/gzip.h
@@ -30,14 +30,14 @@
// Defines for various GZIP constants
static const int COMPRESSION_LEVEL = 6;
-static const int ZLIB_MEM_LEVEL = 8;
+static const int ZLIB_MEM_LEVEL = 8;
-static const int GZIP_HEADER_SIZE = 10;
+static const int GZIP_HEADER_SIZE = 10;
static const int GZIP_TRAILER_SIZE = 8;
static const char MAGIC_BYTE_1 = 0x1f;
static const char MAGIC_BYTE_2 = 0x8b;
-static const char OS_TYPE = 3; // Unix
+static const char OS_TYPE = 3; // Unix
static const int BUF_SIZE = 1 << 15; // 32k buffer
diff --git a/plugins/experimental/esi/serverIntercept.cc b/plugins/experimental/esi/serverIntercept.cc
index e553cd2..d767a90 100644
--- a/plugins/experimental/esi/serverIntercept.cc
+++ b/plugins/experimental/esi/serverIntercept.cc
@@ -29,9 +29,9 @@
#include <strings.h>
#include <stdio.h>
-const char *ECHO_HEADER_PREFIX = "Echo-";
-const int ECHO_HEADER_PREFIX_LEN = 5;
-const char *SERVER_INTERCEPT_HEADER = "Esi-Internal";
+const char *ECHO_HEADER_PREFIX = "Echo-";
+const int ECHO_HEADER_PREFIX_LEN = 5;
+const char *SERVER_INTERCEPT_HEADER = "Esi-Internal";
const int SERVER_INTERCEPT_HEADER_LEN = 12;
using std::string;
@@ -113,10 +113,10 @@ SContData::init(TSVConn vconn)
input.buffer = TSIOBufferCreate();
input.reader = TSIOBufferReaderAlloc(input.buffer);
- input.vio = TSVConnRead(net_vc, contp, input.buffer, INT_MAX);
+ input.vio = TSVConnRead(net_vc, contp, input.buffer, INT_MAX);
req_hdr_bufp = TSMBufferCreate();
- req_hdr_loc = TSHttpHdrCreate(req_hdr_bufp);
+ req_hdr_loc = TSHttpHdrCreate(req_hdr_bufp);
TSHttpHdrTypeSet(req_hdr_bufp, req_hdr_loc, TS_HTTP_TYPE_REQUEST);
initialized = true;
@@ -130,7 +130,7 @@ SContData::setupWrite()
TSAssert(output.buffer == 0);
output.buffer = TSIOBufferCreate();
output.reader = TSIOBufferReaderAlloc(output.buffer);
- output.vio = TSVConnWrite(net_vc, contp, output.reader, INT_MAX);
+ output.vio = TSVConnWrite(net_vc, contp, output.reader, INT_MAX);
}
static bool
@@ -289,8 +289,8 @@ serverIntercept(TSCont contp, TSEvent event, void *edata)
TSDebug(DEBUG_TAG, "[%s] Received event: %d", __FUNCTION__, (int)event);
SContData *cont_data = static_cast<SContData *>(TSContDataGet(contp));
- bool read_complete = false;
- bool shutdown = false;
+ bool read_complete = false;
+ bool shutdown = false;
switch (event) {
case TS_EVENT_NET_ACCEPT:
TSDebug(DEBUG_TAG, "[%s] Received net accept event", __FUNCTION__);
diff --git a/plugins/experimental/esi/test/StubIncludeHandler.cc b/plugins/experimental/esi/test/StubIncludeHandler.cc
index 7c0cdd8..1083d7a 100644
--- a/plugins/experimental/esi/test/StubIncludeHandler.cc
+++ b/plugins/experimental/esi/test/StubIncludeHandler.cc
@@ -26,12 +26,12 @@
using namespace EsiLib;
-bool StubIncludeHandler::includeResult = true;
+bool StubIncludeHandler::includeResult = true;
const char *const StubIncludeHandler::DATA_PREFIX = "Special data for include id ";
-const int StubIncludeHandler::DATA_PREFIX_SIZE = strlen(StubIncludeHandler::DATA_PREFIX);
+const int StubIncludeHandler::DATA_PREFIX_SIZE = strlen(StubIncludeHandler::DATA_PREFIX);
const char *StubIncludeHandler::FOOTER = 0;
-int StubIncludeHandler::FOOTER_SIZE = 0;
+int StubIncludeHandler::FOOTER_SIZE = 0;
int
StubIncludeHandler::handleInclude(const char *data, int data_len)
@@ -55,8 +55,8 @@ StubIncludeHandler::getData(int include_id, const char *&data, int &data_len)
TestHttpDataFetcher &test_fetcher = dynamic_cast<TestHttpDataFetcher &>(_http_fetcher);
if (test_fetcher.getReturnData()) {
char *buf = new char[1024];
- data_len = snprintf(buf, 1024, "%s%d", DATA_PREFIX, include_id);
- data = buf;
+ data_len = snprintf(buf, 1024, "%s%d", DATA_PREFIX, include_id);
+ data = buf;
heap_strings.push_back(buf);
return true;
}
@@ -66,7 +66,7 @@ StubIncludeHandler::getData(int include_id, const char *&data, int &data_len)
void
StubIncludeHandler::getFooter(const char *&footer, int &footer_len)
{
- footer = FOOTER;
+ footer = FOOTER;
footer_len = FOOTER_SIZE;
}
diff --git a/plugins/experimental/esi/test/TestHandlerManager.cc b/plugins/experimental/esi/test/TestHandlerManager.cc
index de399c0..40da883 100644
--- a/plugins/experimental/esi/test/TestHandlerManager.cc
+++ b/plugins/experimental/esi/test/TestHandlerManager.cc
@@ -35,7 +35,7 @@ SpecialIncludeHandler *
HandlerManager::getHandler(Variables &esi_vars, Expression &esi_expr, HttpDataFetcher &fetcher, const std::string &id) const
{
StubIncludeHandler *handler = new StubIncludeHandler(esi_vars, esi_expr, fetcher);
- gHandlerMap[id] = handler;
+ gHandlerMap[id] = handler;
return handler;
}
diff --git a/plugins/experimental/esi/test/TestHttpDataFetcher.h b/plugins/experimental/esi/test/TestHttpDataFetcher.h
index 2663fc6..61c6ccd 100644
--- a/plugins/experimental/esi/test/TestHttpDataFetcher.h
+++ b/plugins/experimental/esi/test/TestHttpDataFetcher.h
@@ -65,7 +65,7 @@ public:
curr_obj._data.append(">>>>> Content for URL [");
curr_obj._data.append(url);
curr_obj._data.append("] <<<<<");
- content = curr_obj._data.data();
+ content = curr_obj._data.data();
content_len = curr_obj._data.size();
return true;
}
diff --git a/plugins/experimental/esi/test/docnode_test.cc b/plugins/experimental/esi/test/docnode_test.cc
index e1f0652..b648d2f 100644
--- a/plugins/experimental/esi/test/docnode_test.cc
+++ b/plugins/experimental/esi/test/docnode_test.cc
@@ -38,7 +38,7 @@ using namespace EsiLib;
void
check_node_attr(const Attribute &attr, const char *name, const char *value)
{
- int name_len = strlen(name);
+ int name_len = strlen(name);
int value_len = strlen(value);
assert(attr.name_len == name_len);
assert(attr.value_len == value_len);
diff --git a/plugins/experimental/esi/test/parser_test.cc b/plugins/experimental/esi/test/parser_test.cc
index a3bfd33..b65face 100644
--- a/plugins/experimental/esi/test/parser_test.cc
+++ b/plugins/experimental/esi/test/parser_test.cc
@@ -38,7 +38,7 @@ using namespace EsiLib;
void
check_node_attr(const Attribute &attr, const char *name, const char *value)
{
- int name_len = strlen(name);
+ int name_len = strlen(name);
int value_len = strlen(value);
assert(attr.name_len == name_len);
assert(attr.value_len == value_len);
@@ -842,7 +842,7 @@ main()
input_data[0] = 'b';
input_data[1] = 'a';
input_data[2] = 'r';
- list_iter = new_node_list.begin();
+ list_iter = new_node_list.begin();
assert(strncmp(list_iter->data, "bar", 3) == 0);
}
@@ -1553,7 +1553,7 @@ main()
"</esi:choose>");
DocNodeList node_list;
assert(parser.completeParse(node_list, input_data) == true);
- DocNodeList::iterator list_iter = node_list.begin()->child_nodes.begin();
+ DocNodeList::iterator list_iter = node_list.begin()->child_nodes.begin();
AttributeList::iterator attr_iter = list_iter->attr_list.begin();
assert(attr_iter->value_len == 3);
assert(strncmp(attr_iter->value, "a>b", attr_iter->value_len) == 0);
diff --git a/plugins/experimental/esi/test/processor_test.cc b/plugins/experimental/esi/test/processor_test.cc
index 24dc9d6..bbb6548 100644
--- a/plugins/experimental/esi/test/processor_test.cc
+++ b/plugins/experimental/esi/test/processor_test.cc
@@ -1005,8 +1005,8 @@ main()
"</esi:try>");
const char *output_data;
- int output_data_len = 0;
- StubIncludeHandler::FOOTER = "<!--footer-->";
+ int output_data_len = 0;
+ StubIncludeHandler::FOOTER = "<!--footer-->";
StubIncludeHandler::FOOTER_SIZE = strlen(StubIncludeHandler::FOOTER);
assert(esi_proc.completeParse(input_data) == true);
data_fetcher.setReturnData(false);
@@ -1017,7 +1017,7 @@ main()
assert(strncmp(output_data, "Special data for include id 2", output_data_len - StubIncludeHandler::FOOTER_SIZE) == 0);
assert(strncmp(output_data + StubIncludeHandler::DATA_PREFIX_SIZE + 1, StubIncludeHandler::FOOTER,
StubIncludeHandler::FOOTER_SIZE) == 0);
- StubIncludeHandler::FOOTER = 0;
+ StubIncludeHandler::FOOTER = 0;
StubIncludeHandler::FOOTER_SIZE = 0;
}
diff --git a/plugins/experimental/esi/test/sampleProb.cc b/plugins/experimental/esi/test/sampleProb.cc
index aaaa3d5..3d453cb 100644
--- a/plugins/experimental/esi/test/sampleProb.cc
+++ b/plugins/experimental/esi/test/sampleProb.cc
@@ -30,10 +30,10 @@
#include <sys/time.h>
using namespace std;
-static int windowSize = 200; // ms
+static int windowSize = 200; // ms
static int totalDuration = 2000; // seconds
-static int lowerCutOff = 300;
-static int higherCutOff = 1000;
+static int lowerCutOff = 300;
+static int higherCutOff = 1000;
class FailureInfo
{
@@ -42,12 +42,12 @@ public:
{
gettimeofday(&_start, NULL);
_totalSlot = totalDuration / windowSize; // INtegral multiple
- _marker = 0;
+ _marker = 0;
for (int i = 0; i < _totalSlot; i++)
_passFail.push_back(make_pair(0, 0));
_avgOverWindow = 0;
- _windowPassed = 0;
+ _windowPassed = 0;
};
~FailureInfo() {}
@@ -143,7 +143,7 @@ isAttemptReq(string URL, FailureData &data)
else {
double mapFactor = (((avg * 1000 - lowerCutOff) * (avg * 1000 - lowerCutOff)) / (higherCutOff - lowerCutOff)) + lowerCutOff;
- prob = mapFactor / 1000;
+ prob = mapFactor / 1000;
cout << prob << endl;
}
@@ -163,7 +163,7 @@ isAttemptReq(string URL, FailureData &data)
} else {
FailureInfo *info = new FailureInfo();
- data[URL] = info;
+ data[URL] = info;
return true;
}
}
diff --git a/plugins/experimental/generator/generator.cc b/plugins/experimental/generator/generator.cc
index a4e9537..e185808 100644
--- a/plugins/experimental/generator/generator.cc
+++ b/plugins/experimental/generator/generator.cc
@@ -76,7 +76,7 @@
static TSCont TxnHook;
static uint8_t GeneratorData[32 * 1024];
-static int StatCountBytes = -1;
+static int StatCountBytes = -1;
static int StatCountResponses = -1;
static int GeneratorInterceptionHook(TSCont contp, TSEvent event, void *edata);
@@ -162,7 +162,7 @@ struct GeneratorRequest {
enum {
CACHEABLE = 0x0001,
- ISHEAD = 0x0002,
+ ISHEAD = 0x0002,
};
GeneratorRequest() : nbytes(0), flags(0) {}
@@ -413,13 +413,13 @@ GeneratorInterceptionHook(TSCont contp, TSEvent event, void *edata)
}
case TS_EVENT_VCONN_READ_READY: {
- argument_type cdata = TSContDataGet(contp);
+ argument_type cdata = TSContDataGet(contp);
GeneratorHttpHeader &rqheader = cdata.grq->rqheader;
VDEBUG("reading vio=%p vc=%p, grq=%p", arg.vio, TSVIOVConnGet(arg.vio), cdata.grq);
TSIOBufferBlock blk;
- ssize_t consumed = 0;
+ ssize_t consumed = 0;
TSParseResult result = TS_PARSE_CONT;
for (blk = TSIOBufferReaderStart(cdata.grq->readio.reader); blk; blk = TSIOBufferBlockNext(blk)) {
@@ -432,7 +432,7 @@ GeneratorInterceptionHook(TSCont contp, TSEvent event, void *edata)
continue;
}
- end = ptr + nbytes;
+ end = ptr + nbytes;
result = TSHttpHdrParseReq(rqheader.parser, rqheader.buffer, rqheader.header, &ptr, end);
switch (result) {
case TS_PARSE_ERROR:
@@ -590,8 +590,8 @@ TSPluginInit(int /* argc */, const char * /* argv */ [])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)PLUGIN;
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)PLUGIN;
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/geoip_acl/acl.cc b/plugins/experimental/geoip_acl/acl.cc
index e5e09ff..2206c3a 100644
--- a/plugins/experimental/geoip_acl/acl.cc
+++ b/plugins/experimental/geoip_acl/acl.cc
@@ -56,7 +56,7 @@ int
Acl::country_id_by_addr(const sockaddr *addr) const
{
int iso = -1;
- int v = 4;
+ int v = 4;
switch (addr->sa_family) {
case AF_INET: {
@@ -68,7 +68,7 @@ Acl::country_id_by_addr(const sockaddr *addr) const
geoipv6_t ip = reinterpret_cast<const struct sockaddr_in6 *>(addr)->sin6_addr;
iso = GeoIP_id_by_ipnum_v6(_geoip6, ip);
- v = 6;
+ v = 6;
} break;
default:
break;
@@ -137,7 +137,7 @@ RegexAcl::parse_line(const char *filename, const std::string &line, int lineno,
pos2 = line.find_first_of(_SEPARATOR, pos1);
if (pos2 != std::string::npos) {
regex = line.substr(pos1, pos2 - pos1);
- pos1 = line.find_first_not_of(_SEPARATOR, pos2);
+ pos1 = line.find_first_not_of(_SEPARATOR, pos2);
if (pos1 != std::string::npos) {
pos2 = line.find_first_of(_SEPARATOR, pos1);
if (pos2 != std::string::npos) {
@@ -153,7 +153,7 @@ RegexAcl::parse_line(const char *filename, const std::string &line, int lineno,
// The rest are "tokens"
while ((pos1 = line.find_first_not_of(_SEPARATOR, pos2)) != std::string::npos) {
pos2 = line.find_first_of(_SEPARATOR, pos1);
- tmp = line.substr(pos1, pos2 - pos1);
+ tmp = line.substr(pos1, pos2 - pos1);
_acl->add_token(tmp);
++tokens;
}
@@ -174,7 +174,7 @@ RegexAcl::compile(const std::string &str, const char *filename, int lineno)
int erroffset;
_regex_s = str;
- _rex = pcre_compile(_regex_s.c_str(), 0, &error, &erroffset, NULL);
+ _rex = pcre_compile(_regex_s.c_str(), 0, &error, &erroffset, NULL);
if (NULL != _rex) {
_extra = pcre_study(_rex, 0, &error);
@@ -200,7 +200,7 @@ RegexAcl::append(RegexAcl *ra)
RegexAcl *cur = _next;
while (cur->_next)
- cur = cur->_next;
+ cur = cur->_next;
cur->_next = ra;
}
}
diff --git a/plugins/experimental/geoip_acl/acl.h b/plugins/experimental/geoip_acl/acl.h
index 45bd500..81cb11f 100644
--- a/plugins/experimental/geoip_acl/acl.h
+++ b/plugins/experimental/geoip_acl/acl.h
@@ -51,8 +51,8 @@ public:
Acl() : _allow(true), _added_tokens(0) {}
virtual ~Acl() {}
// These have to be implemented for each ACL type
- virtual void read_regex(const char *fn, int &tokens) = 0;
- virtual int process_args(int argc, char *argv[]) = 0;
+ virtual void read_regex(const char *fn, int &tokens) = 0;
+ virtual int process_args(int argc, char *argv[]) = 0;
virtual bool eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) const = 0;
virtual void add_token(const std::string &str) = 0;
diff --git a/plugins/experimental/header_normalize/header_normalize.cc b/plugins/experimental/header_normalize/header_normalize.cc
index 1ca6e3c..7c773de 100644
--- a/plugins/experimental/header_normalize/header_normalize.cc
+++ b/plugins/experimental/header_normalize/header_normalize.cc
@@ -63,80 +63,80 @@ std::map<std::string, std::string, std::less<std::string>> hdrMap;
static void
buildHdrMap()
{
- hdrMap["accept"] = "Accept";
- hdrMap["accept-charset"] = "Accept-Charset";
- hdrMap["accept-encoding"] = "Accept-Encoding";
- hdrMap["accept-language"] = "Accept-Language";
- hdrMap["accept-ranges"] = "Accept-Ranges";
- hdrMap["age"] = "Age";
- hdrMap["allow"] = "Allow";
- hdrMap["approved"] = "Approved";
- hdrMap["bytes"] = "Bytes";
- hdrMap["cache-control"] = "Cache-Control";
- hdrMap["client-ip"] = "Client-Ip";
- hdrMap["connection"] = "Connection";
- hdrMap["content-base"] = "Content-Base";
- hdrMap["content-encoding"] = "Content-Encoding";
- hdrMap["content-language"] = "Content-Language";
- hdrMap["content-length"] = "Content-Length";
- hdrMap["content-location"] = "Content-Location";
- hdrMap["content-md5"] = "Content-MD5";
- hdrMap["content-range"] = "Content-Range";
- hdrMap["content-type"] = "Content-Type";
- hdrMap["control"] = "Control";
- hdrMap["cookie"] = "Cookie";
- hdrMap["date"] = "Date";
- hdrMap["distribution"] = "Distribution";
- hdrMap["etag"] = "Etag";
- hdrMap["expect"] = "Expect";
- hdrMap["expires"] = "Expires";
- hdrMap["followup-to"] = "Followup-To";
- hdrMap["from"] = "From";
- hdrMap["host"] = "Host";
- hdrMap["if-match"] = "If-Match";
- hdrMap["if-modified-since"] = "If-Modified-Since";
- hdrMap["if-none-match"] = "If-None-Match";
- hdrMap["if-range"] = "If-Range";
- hdrMap["if-unmodified-since"] = "If-Unmodified-Since";
- hdrMap["keep-alive"] = "Keep-Alive";
- hdrMap["keywords"] = "Keywords";
- hdrMap["last-modified"] = "Last-Modified";
- hdrMap["lines"] = "Lines";
- hdrMap["location"] = "Location";
- hdrMap["max-forwards"] = "Max-Forwards";
- hdrMap["message-id"] = "Message-Id";
- hdrMap["newsgroups"] = "Newsgroups";
- hdrMap["organization"] = "Organization";
- hdrMap["path"] = "Path";
- hdrMap["pragma"] = "Pragma";
- hdrMap["proxy-authenticate"] = "Proxy-Authenticate";
- hdrMap["proxy-authorization"] = "Proxy-Authorization";
- hdrMap["proxy-connection"] = "Proxy-Connection";
- hdrMap["public"] = "Public";
- hdrMap["range"] = "Range";
- hdrMap["references"] = "References";
- hdrMap["referer"] = "Referer";
- hdrMap["reply-to"] = "Reply-To";
- hdrMap["retry-after"] = "Retry-After";
- hdrMap["sender"] = "Sender";
- hdrMap["server"] = "Server";
- hdrMap["set-cookie"] = "Set-Cookie";
+ hdrMap["accept"] = "Accept";
+ hdrMap["accept-charset"] = "Accept-Charset";
+ hdrMap["accept-encoding"] = "Accept-Encoding";
+ hdrMap["accept-language"] = "Accept-Language";
+ hdrMap["accept-ranges"] = "Accept-Ranges";
+ hdrMap["age"] = "Age";
+ hdrMap["allow"] = "Allow";
+ hdrMap["approved"] = "Approved";
+ hdrMap["bytes"] = "Bytes";
+ hdrMap["cache-control"] = "Cache-Control";
+ hdrMap["client-ip"] = "Client-Ip";
+ hdrMap["connection"] = "Connection";
+ hdrMap["content-base"] = "Content-Base";
+ hdrMap["content-encoding"] = "Content-Encoding";
+ hdrMap["content-language"] = "Content-Language";
+ hdrMap["content-length"] = "Content-Length";
+ hdrMap["content-location"] = "Content-Location";
+ hdrMap["content-md5"] = "Content-MD5";
+ hdrMap["content-range"] = "Content-Range";
+ hdrMap["content-type"] = "Content-Type";
+ hdrMap["control"] = "Control";
+ hdrMap["cookie"] = "Cookie";
+ hdrMap["date"] = "Date";
+ hdrMap["distribution"] = "Distribution";
+ hdrMap["etag"] = "Etag";
+ hdrMap["expect"] = "Expect";
+ hdrMap["expires"] = "Expires";
+ hdrMap["followup-to"] = "Followup-To";
+ hdrMap["from"] = "From";
+ hdrMap["host"] = "Host";
+ hdrMap["if-match"] = "If-Match";
+ hdrMap["if-modified-since"] = "If-Modified-Since";
+ hdrMap["if-none-match"] = "If-None-Match";
+ hdrMap["if-range"] = "If-Range";
+ hdrMap["if-unmodified-since"] = "If-Unmodified-Since";
+ hdrMap["keep-alive"] = "Keep-Alive";
+ hdrMap["keywords"] = "Keywords";
+ hdrMap["last-modified"] = "Last-Modified";
+ hdrMap["lines"] = "Lines";
+ hdrMap["location"] = "Location";
+ hdrMap["max-forwards"] = "Max-Forwards";
+ hdrMap["message-id"] = "Message-Id";
+ hdrMap["newsgroups"] = "Newsgroups";
+ hdrMap["organization"] = "Organization";
+ hdrMap["path"] = "Path";
+ hdrMap["pragma"] = "Pragma";
+ hdrMap["proxy-authenticate"] = "Proxy-Authenticate";
+ hdrMap["proxy-authorization"] = "Proxy-Authorization";
+ hdrMap["proxy-connection"] = "Proxy-Connection";
+ hdrMap["public"] = "Public";
+ hdrMap["range"] = "Range";
+ hdrMap["references"] = "References";
+ hdrMap["referer"] = "Referer";
+ hdrMap["reply-to"] = "Reply-To";
+ hdrMap["retry-after"] = "Retry-After";
+ hdrMap["sender"] = "Sender";
+ hdrMap["server"] = "Server";
+ hdrMap["set-cookie"] = "Set-Cookie";
hdrMap["strict-transport-security"] = "Strict-Transport-Security";
- hdrMap["subject"] = "Subject";
- hdrMap["summary"] = "Summary";
- hdrMap["te"] = "Te";
- hdrMap["transfer-encoding"] = "Transfer-Encoding";
- hdrMap["upgrade"] = "Upgrade";
- hdrMap["user-agent"] = "User-Agent";
- hdrMap["vary"] = "Vary";
- hdrMap["via"] = "Via";
- hdrMap["warning"] = "Warning";
- hdrMap["www-authenticate"] = "Www-Authenticate";
- hdrMap["xref"] = "Xref";
- hdrMap["x-id"] = "X-ID";
- hdrMap["x-forwarded-for"] = "X-Forwarded-For";
- hdrMap["sec-websocket-key"] = "Sec-WebSocket-Key";
- hdrMap["sec-websocket-version"] = "Sec-WebSocket-Version";
+ hdrMap["subject"] = "Subject";
+ hdrMap["summary"] = "Summary";
+ hdrMap["te"] = "Te";
+ hdrMap["transfer-encoding"] = "Transfer-Encoding";
+ hdrMap["upgrade"] = "Upgrade";
+ hdrMap["user-agent"] = "User-Agent";
+ hdrMap["vary"] = "Vary";
+ hdrMap["via"] = "Via";
+ hdrMap["warning"] = "Warning";
+ hdrMap["www-authenticate"] = "Www-Authenticate";
+ hdrMap["xref"] = "Xref";
+ hdrMap["x-id"] = "X-ID";
+ hdrMap["x-forwarded-for"] = "X-Forwarded-For";
+ hdrMap["sec-websocket-key"] = "Sec-WebSocket-Key";
+ hdrMap["sec-websocket-version"] = "Sec-WebSocket-Version";
}
///////////////////////////////////////////////////////////////////////////////
@@ -185,7 +185,7 @@ read_request_hook(TSCont /* contp */, TSEvent /* event */, void *edata)
TSMLoc req_hdrs;
if (TSHttpTxnClientReqGet(rh, &hdr_bufp, &req_hdrs) == TS_SUCCESS) {
- hdr = TSMimeHdrFieldGet(hdr_bufp, req_hdrs, 0);
+ hdr = TSMimeHdrFieldGet(hdr_bufp, req_hdrs, 0);
int n_mime_headers = TSMimeHdrFieldsCount(hdr_bufp, req_hdrs);
TSDebug(PLUGIN_NAME, "*** Camel Casing %u hdrs in the request", n_mime_headers);
@@ -207,7 +207,7 @@ read_request_hook(TSCont /* contp */, TSEvent /* event */, void *edata)
continue;
}
- int hdr_value_len = 0;
+ int hdr_value_len = 0;
const char *hdr_value = TSMimeHdrFieldValueStringGet(hdr_bufp, req_hdrs, hdr, 0, &hdr_value_len);
// hdr returned by TSMimeHdrFieldNameGet is already
diff --git a/plugins/experimental/hipes/hipes.cc b/plugins/experimental/hipes/hipes.cc
index f1b8b2e..7e80d41 100644
--- a/plugins/experimental/hipes/hipes.cc
+++ b/plugins/experimental/hipes/hipes.cc
@@ -27,10 +27,10 @@
#include <ts/ts.h>
#include <ts/remap.h>
-static const char *PLUGIN_NAME = "hipes";
+static const char *PLUGIN_NAME = "hipes";
static const char *HIPES_SERVER_NAME = "hipes.example.com";
-static const int MAX_PATH_SIZE = 2048;
+static const int MAX_PATH_SIZE = 2048;
static const int MAX_REDIRECT_URL = 2048;
///////////////////////////////////////////////////////////////////////////////
@@ -47,8 +47,8 @@ escapify_url(const char *src, int src_len, char *dst, int dst_len)
static char hex_digit[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
const char *from = src;
- char *to = dst;
- int len = 0;
+ char *to = dst;
+ int len = 0;
// Sanity check
if (!src)
@@ -190,7 +190,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
}
for (int ix = 2; ix < argc; ++ix) {
- std::string arg = argv[ix];
+ std::string arg = argv[ix];
std::string::size_type sep = arg.find_first_of(":");
if (sep == std::string::npos) {
@@ -215,7 +215,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
ri->svc_server = arg_val;
} else {
ri->svc_server = arg_val.substr(0, port);
- ri->svc_port = atoi(arg_val.substr(port + 1).c_str());
+ ri->svc_port = atoi(arg_val.substr(port + 1).c_str());
}
} else if (arg.compare(0, 6, "server") == 0) {
std::string::size_type port = arg_val.find_first_of(":");
@@ -224,7 +224,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
ri->hipes_server = arg_val;
} else {
ri->hipes_server = arg_val.substr(0, port);
- ri->hipes_port = atoi(arg_val.substr(port + 1).c_str());
+ ri->hipes_port = atoi(arg_val.substr(port + 1).c_str());
}
} else if (arg.compare(0, 14, "active_timeout") == 0) {
ri->active_timeout = atoi(arg_val.c_str());
@@ -271,7 +271,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
return TSREMAP_NO_REMAP;
}
- int param_len = 0;
+ int param_len = 0;
const char *param = TSUrlHttpParamsGet(rri->requestBufp, rri->requestUrl, ¶m_len);
// Make sure we have a matrix parameter, anything without is a bogus request.
@@ -351,9 +351,9 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
}
// Test if we should redirect or not
- bool do_redirect = false;
+ bool do_redirect = false;
int redirect_flag = h_conf->default_redirect_flag;
- char *pos = new_query;
+ char *pos = new_query;
while (pos && (pos = (char *)memchr(pos, '_', new_query_size - (pos - new_query)))) {
if (pos) {
@@ -488,8 +488,8 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
redirect_url_size = pos - redirect_url + 1;
TSDebug(PLUGIN_NAME, "Redirecting to %.*s", redirect_url_size, redirect_url);
const char *start = redirect_url;
- const char *end = start + redirect_url_size;
- rri->redirect = 1;
+ const char *end = start + redirect_url_size;
+ rri->redirect = 1;
TSUrlParse(rri->requestBufp, rri->requestUrl, &start, end);
TSHttpTxnSetHttpRetStatus(rh, TS_HTTP_STATUS_MOVED_TEMPORARILY);
}
diff --git a/plugins/experimental/inliner/ats-inliner.cc b/plugins/experimental/inliner/ats-inliner.cc
index 594d8a4..a5d9c39 100644
--- a/plugins/experimental/inliner/ats-inliner.cc
+++ b/plugins/experimental/inliner/ats-inliner.cc
@@ -67,7 +67,7 @@ handle_transform(const TSCont c)
if (todo > 0) {
const TSIOBufferReader reader = TSVIOReaderGet(vio);
- todo = std::min(todo, TSIOBufferReaderAvail(reader));
+ todo = std::min(todo, TSIOBufferReaderAvail(reader));
if (todo > 0) {
if (!data) {
@@ -140,11 +140,11 @@ transformable(TSHttpTxn txnp)
returnValue = TSHttpHdrStatusGet(buffer, location) == TS_HTTP_STATUS_OK;
if (returnValue) {
- returnValue = false;
+ returnValue = false;
const TSMLoc field = TSMimeHdrFieldFind(buffer, location, TS_MIME_FIELD_CONTENT_TYPE, TS_MIME_LEN_CONTENT_TYPE);
if (field != TS_NULL_MLOC) {
- int length = 0;
+ int length = 0;
const char *const content = TSMimeHdrFieldValueStringGet(buffer, location, field, 0, &length);
if (content != NULL && length > 0) {
@@ -200,8 +200,8 @@ TSPluginInit(int, const char **)
{
TSPluginRegistrationInfo info;
- info.plugin_name = const_cast<char *>(PLUGIN_TAG);
- info.vendor_name = const_cast<char *>("MyCompany");
+ info.plugin_name = const_cast<char *>(PLUGIN_TAG);
+ info.vendor_name = const_cast<char *>("MyCompany");
info.support_email = const_cast<char *>("ts-api-support@MyCompany.com");
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/inliner/cache-handler.h b/plugins/experimental/inliner/cache-handler.h
index c55d374..f3bef9f 100644
--- a/plugins/experimental/inliner/cache-handler.h
+++ b/plugins/experimental/inliner/cache-handler.h
@@ -50,13 +50,13 @@ namespace ats
bool
getHeader(TSMBuffer buffer, TSMLoc location, const std::string &name, std::string &value)
{
- bool result = false;
+ bool result = false;
const TSMLoc field = TSMimeHdrFieldFind(buffer, location, name.c_str(), name.size());
if (field != NULL) {
- int length = 0;
+ int length = 0;
const char *const content = TSMimeHdrFieldValueStringGet(buffer, location, field, -1, &length);
if (content != NULL && length > 0) {
- value = std::string(content, length);
+ value = std::string(content, length);
result = true;
}
TSHandleMLocRelease(buffer, location, field);
@@ -87,7 +87,7 @@ namespace inliner
int64_t length = 0;
for (; block && l > 0; block = TSIOBufferBlockNext(block)) {
- int64_t size = 0;
+ int64_t size = 0;
const char *const pointer = TSIOBufferBlockReadStart(block, r, &size);
if (pointer != NULL && size > 0) {
size = std::min(size, l);
@@ -128,7 +128,7 @@ namespace inliner
{
const int64_t s = output.size();
- size_t size = 0;
+ size_t size = 0;
output.resize(content_.size() * 5);
CHECK(TSBase64Encode(content_.data(), content_.size(), const_cast<char *>(output.data()) + s, output.size() - s, &size));
output.resize(size + s);
@@ -192,7 +192,7 @@ namespace inliner
uint64_t length = 0;
for (; block && l > 0; block = TSIOBufferBlockNext(block)) {
- int64_t size = 0;
+ int64_t size = 0;
const char *const pointer = TSIOBufferBlockReadStart(block, r, &size);
if (pointer != NULL && size > 0) {
size = std::min(size, l);
diff --git a/plugins/experimental/inliner/chunk-decoder.cc b/plugins/experimental/inliner/chunk-decoder.cc
index d9ad9b9..8d72ff8 100644
--- a/plugins/experimental/inliner/chunk-decoder.cc
+++ b/plugins/experimental/inliner/chunk-decoder.cc
@@ -162,7 +162,7 @@ ChunkDecoder::decode(const TSIOBufferReader &r)
if (p != NULL) {
if (size > size_) {
length += size_;
- size_ = 0;
+ size_ = 0;
state_ = State::kSizeR;
break;
} else {
diff --git a/plugins/experimental/inliner/fetcher.cc b/plugins/experimental/inliner/fetcher.cc
index 8dd9ac0..b1e7553 100644
--- a/plugins/experimental/inliner/fetcher.cc
+++ b/plugins/experimental/inliner/fetcher.cc
@@ -62,9 +62,9 @@ HttpParser::parse(io::IO &io)
}
TSIOBufferBlock block = TSIOBufferReaderStart(io.reader);
while (block != NULL) {
- int64_t size = 0;
+ int64_t size = 0;
const char *const begin = TSIOBufferBlockReadStart(block, io.reader, &size);
- const char *iterator = begin;
+ const char *iterator = begin;
parsed_ = (TSHttpHdrParseResp(parser_, buffer_, location_, &iterator, iterator + size) == TS_PARSE_DONE);
TSIOBufferReaderConsume(io.reader, iterator - begin);
diff --git a/plugins/experimental/inliner/fetcher.h b/plugins/experimental/inliner/fetcher.h
index 1b72ec6..09fd04c 100644
--- a/plugins/experimental/inliner/fetcher.h
+++ b/plugins/experimental/inliner/fetcher.h
@@ -180,7 +180,7 @@ template <class T> struct HttpTransaction {
{
assert(b != NULL);
assert(l != NULL);
- bool result = false;
+ bool result = false;
const TSMLoc field = TSMimeHdrFieldFind(b, l, TS_MIME_FIELD_TRANSFER_ENCODING, TS_MIME_LEN_TRANSFER_ENCODING);
if (field != NULL) {
int length;
@@ -304,7 +304,7 @@ get(const std::string &a, io::IO *const i, const int64_t l, const T &t, const in
typedef HttpTransaction<T> Transaction;
struct sockaddr_in socket;
socket.sin_family = AF_INET;
- socket.sin_port = 80;
+ socket.sin_port = 80;
if (!inet_pton(AF_INET, a.c_str(), &socket.sin_addr)) {
TSDebug(PLUGIN_TAG, "ats::get Invalid address provided \"%s\".", a.c_str());
return false;
diff --git a/plugins/experimental/inliner/html-parser.cc b/plugins/experimental/inliner/html-parser.cc
index ecd88fd..98ac85d 100644
--- a/plugins/experimental/inliner/html-parser.cc
+++ b/plugins/experimental/inliner/html-parser.cc
@@ -313,7 +313,7 @@ namespace inliner
if (state_ == State::kUndefined) {
if (*c == '<') {
state_ = State::kTag;
- tag_ = Tag::kTag;
+ tag_ = Tag::kTag;
}
continue;
}
diff --git a/plugins/experimental/inliner/inliner-handler.cc b/plugins/experimental/inliner/inliner-handler.cc
index 09cf3cf..866730e 100644
--- a/plugins/experimental/inliner/inliner-handler.cc
+++ b/plugins/experimental/inliner/inliner-handler.cc
@@ -71,9 +71,9 @@ namespace inliner
{
assert(reader_ != NULL);
TSIOBufferBlock block = TSIOBufferReaderStart(reader_);
- int64_t offset = 0;
+ int64_t offset = 0;
while (block != NULL) {
- int64_t length = 0;
+ int64_t length = 0;
const char *const buffer = TSIOBufferBlockReadStart(block, reader_, &length);
assert(buffer != NULL);
if (length > 0) {
diff --git a/plugins/experimental/inliner/png.h b/plugins/experimental/inliner/png.h
index 3285333..40501a6 100644
--- a/plugins/experimental/inliner/png.h
+++ b/plugins/experimental/inliner/png.h
@@ -85,7 +85,7 @@ namespace inliner
// chunk length (4) + chunk type (4) + chunk crc (4)
const int32_t N = 12;
- const char *iterator = content.data();
+ const char *iterator = content.data();
const char *const end = iterator + content.size();
if (std::distance(iterator, end) > HEADER_SIZE) {
@@ -95,8 +95,8 @@ namespace inliner
while (iterator < end) {
const ChunkHeader *const header = reinterpret_cast<const ChunkHeader *>(iterator);
- const std::string type = header->type();
- const uint32_t length = header->length();
+ const std::string type = header->type();
+ const uint32_t length = header->length();
// iterator cannot go backwards
if (iterator >= iterator + (length + N)) {
diff --git a/plugins/experimental/inliner/ts.cc b/plugins/experimental/inliner/ts.cc
index 81a15e1..2dd501a 100644
--- a/plugins/experimental/inliner/ts.cc
+++ b/plugins/experimental/inliner/ts.cc
@@ -34,7 +34,7 @@ namespace io
IO::read(TSVConn v, TSCont c, const int64_t s)
{
assert(s > 0);
- IO *io = new IO();
+ IO *io = new IO();
io->vio = TSVConnRead(v, c, io->buffer, s);
return io;
}
@@ -43,7 +43,7 @@ namespace io
IO::write(TSVConn v, TSCont c, const int64_t s)
{
assert(s > 0);
- IO *io = new IO();
+ IO *io = new IO();
io->vio = TSVConnWrite(v, c, io->reader, s);
return io;
}
@@ -377,7 +377,7 @@ namespace io
assert(buffer_ != NULL);
assert(reader_ != NULL);
const size_t available = TSIOBufferReaderAvail(reader_);
- const size_t copied = TSIOBufferCopy(b, reader_, available, 0);
+ const size_t copied = TSIOBufferCopy(b, reader_, available, 0);
assert(copied == available);
TSIOBufferReaderConsume(reader_, copied);
// TSDebug(PLUGIN_TAG, "BufferNode::process %lu", copied);
diff --git a/plugins/experimental/inliner/ts.h b/plugins/experimental/inliner/ts.h
index 9116f07..718dc93 100644
--- a/plugins/experimental/inliner/ts.h
+++ b/plugins/experimental/inliner/ts.h
@@ -94,7 +94,7 @@ namespace io
}
ReaderSize(const ReaderSize &) = delete;
- ReaderSize &operator=(const ReaderSize &) = delete;
+ ReaderSize &operator=(const ReaderSize &) = delete;
void *operator new(const std::size_t) throw(std::bad_alloc) = delete;
};
@@ -104,7 +104,7 @@ namespace io
ReaderOffset(const TSIOBufferReader r, const size_t o) : reader(r), offset(o) { assert(reader != NULL); }
ReaderOffset(const ReaderOffset &) = delete;
- ReaderOffset &operator=(const ReaderOffset &) = delete;
+ ReaderOffset &operator=(const ReaderOffset &) = delete;
void *operator new(const std::size_t) throw(std::bad_alloc) = delete;
};
diff --git a/plugins/experimental/memcache/protocol_binary.h b/plugins/experimental/memcache/protocol_binary.h
index 7307e02..bb80489 100644
--- a/plugins/experimental/memcache/protocol_binary.h
+++ b/plugins/experimental/memcache/protocol_binary.h
@@ -56,17 +56,17 @@ typedef enum { PROTOCOL_BINARY_REQ = 0x80, PROTOCOL_BINARY_RES = 0x81 } protocol
* See section 3.2 Response Status
*/
typedef enum {
- PROTOCOL_BINARY_RESPONSE_SUCCESS = 0x00,
- PROTOCOL_BINARY_RESPONSE_KEY_ENOENT = 0x01,
- PROTOCOL_BINARY_RESPONSE_KEY_EEXISTS = 0x02,
- PROTOCOL_BINARY_RESPONSE_E2BIG = 0x03,
- PROTOCOL_BINARY_RESPONSE_EINVAL = 0x04,
- PROTOCOL_BINARY_RESPONSE_NOT_STORED = 0x05,
- PROTOCOL_BINARY_RESPONSE_DELTA_BADVAL = 0x06,
- PROTOCOL_BINARY_RESPONSE_AUTH_ERROR = 0x20,
- PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE = 0x21,
+ PROTOCOL_BINARY_RESPONSE_SUCCESS = 0x00,
+ PROTOCOL_BINARY_RESPONSE_KEY_ENOENT = 0x01,
+ PROTOCOL_BINARY_RESPONSE_KEY_EEXISTS = 0x02,
+ PROTOCOL_BINARY_RESPONSE_E2BIG = 0x03,
+ PROTOCOL_BINARY_RESPONSE_EINVAL = 0x04,
+ PROTOCOL_BINARY_RESPONSE_NOT_STORED = 0x05,
+ PROTOCOL_BINARY_RESPONSE_DELTA_BADVAL = 0x06,
+ PROTOCOL_BINARY_RESPONSE_AUTH_ERROR = 0x20,
+ PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE = 0x21,
PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND = 0x81,
- PROTOCOL_BINARY_RESPONSE_ENOMEM = 0x82
+ PROTOCOL_BINARY_RESPONSE_ENOMEM = 0x82
} protocol_binary_response_status;
/**
@@ -74,55 +74,55 @@ typedef enum {
* See section 3.3 Command Opcodes
*/
typedef enum {
- PROTOCOL_BINARY_CMD_GET = 0x00,
- PROTOCOL_BINARY_CMD_SET = 0x01,
- PROTOCOL_BINARY_CMD_ADD = 0x02,
- PROTOCOL_BINARY_CMD_REPLACE = 0x03,
- PROTOCOL_BINARY_CMD_DELETE = 0x04,
- PROTOCOL_BINARY_CMD_INCREMENT = 0x05,
- PROTOCOL_BINARY_CMD_DECREMENT = 0x06,
- PROTOCOL_BINARY_CMD_QUIT = 0x07,
- PROTOCOL_BINARY_CMD_FLUSH = 0x08,
- PROTOCOL_BINARY_CMD_GETQ = 0x09,
- PROTOCOL_BINARY_CMD_NOOP = 0x0a,
- PROTOCOL_BINARY_CMD_VERSION = 0x0b,
- PROTOCOL_BINARY_CMD_GETK = 0x0c,
- PROTOCOL_BINARY_CMD_GETKQ = 0x0d,
- PROTOCOL_BINARY_CMD_APPEND = 0x0e,
- PROTOCOL_BINARY_CMD_PREPEND = 0x0f,
- PROTOCOL_BINARY_CMD_STAT = 0x10,
- PROTOCOL_BINARY_CMD_SETQ = 0x11,
- PROTOCOL_BINARY_CMD_ADDQ = 0x12,
- PROTOCOL_BINARY_CMD_REPLACEQ = 0x13,
- PROTOCOL_BINARY_CMD_DELETEQ = 0x14,
+ PROTOCOL_BINARY_CMD_GET = 0x00,
+ PROTOCOL_BINARY_CMD_SET = 0x01,
+ PROTOCOL_BINARY_CMD_ADD = 0x02,
+ PROTOCOL_BINARY_CMD_REPLACE = 0x03,
+ PROTOCOL_BINARY_CMD_DELETE = 0x04,
+ PROTOCOL_BINARY_CMD_INCREMENT = 0x05,
+ PROTOCOL_BINARY_CMD_DECREMENT = 0x06,
+ PROTOCOL_BINARY_CMD_QUIT = 0x07,
+ PROTOCOL_BINARY_CMD_FLUSH = 0x08,
+ PROTOCOL_BINARY_CMD_GETQ = 0x09,
+ PROTOCOL_BINARY_CMD_NOOP = 0x0a,
+ PROTOCOL_BINARY_CMD_VERSION = 0x0b,
+ PROTOCOL_BINARY_CMD_GETK = 0x0c,
+ PROTOCOL_BINARY_CMD_GETKQ = 0x0d,
+ PROTOCOL_BINARY_CMD_APPEND = 0x0e,
+ PROTOCOL_BINARY_CMD_PREPEND = 0x0f,
+ PROTOCOL_BINARY_CMD_STAT = 0x10,
+ PROTOCOL_BINARY_CMD_SETQ = 0x11,
+ PROTOCOL_BINARY_CMD_ADDQ = 0x12,
+ PROTOCOL_BINARY_CMD_REPLACEQ = 0x13,
+ PROTOCOL_BINARY_CMD_DELETEQ = 0x14,
PROTOCOL_BINARY_CMD_INCREMENTQ = 0x15,
PROTOCOL_BINARY_CMD_DECREMENTQ = 0x16,
- PROTOCOL_BINARY_CMD_QUITQ = 0x17,
- PROTOCOL_BINARY_CMD_FLUSHQ = 0x18,
- PROTOCOL_BINARY_CMD_APPENDQ = 0x19,
- PROTOCOL_BINARY_CMD_PREPENDQ = 0x1a,
+ PROTOCOL_BINARY_CMD_QUITQ = 0x17,
+ PROTOCOL_BINARY_CMD_FLUSHQ = 0x18,
+ PROTOCOL_BINARY_CMD_APPENDQ = 0x19,
+ PROTOCOL_BINARY_CMD_PREPENDQ = 0x1a,
PROTOCOL_BINARY_CMD_SASL_LIST_MECHS = 0x20,
- PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
- PROTOCOL_BINARY_CMD_SASL_STEP = 0x22,
+ PROTOCOL_BINARY_CMD_SASL_AUTH = 0x21,
+ PROTOCOL_BINARY_CMD_SASL_STEP = 0x22,
/* These commands are used for range operations and exist within
* this header for use in other projects. Range operations are
* not expected to be implemented in the memcached server itself.
*/
- PROTOCOL_BINARY_CMD_RGET = 0x30,
- PROTOCOL_BINARY_CMD_RSET = 0x31,
- PROTOCOL_BINARY_CMD_RSETQ = 0x32,
- PROTOCOL_BINARY_CMD_RAPPEND = 0x33,
- PROTOCOL_BINARY_CMD_RAPPENDQ = 0x34,
- PROTOCOL_BINARY_CMD_RPREPEND = 0x35,
+ PROTOCOL_BINARY_CMD_RGET = 0x30,
+ PROTOCOL_BINARY_CMD_RSET = 0x31,
+ PROTOCOL_BINARY_CMD_RSETQ = 0x32,
+ PROTOCOL_BINARY_CMD_RAPPEND = 0x33,
+ PROTOCOL_BINARY_CMD_RAPPENDQ = 0x34,
+ PROTOCOL_BINARY_CMD_RPREPEND = 0x35,
PROTOCOL_BINARY_CMD_RPREPENDQ = 0x36,
- PROTOCOL_BINARY_CMD_RDELETE = 0x37,
- PROTOCOL_BINARY_CMD_RDELETEQ = 0x38,
- PROTOCOL_BINARY_CMD_RINCR = 0x39,
- PROTOCOL_BINARY_CMD_RINCRQ = 0x3a,
- PROTOCOL_BINARY_CMD_RDECR = 0x3b,
- PROTOCOL_BINARY_CMD_RDECRQ = 0x3c
+ PROTOCOL_BINARY_CMD_RDELETE = 0x37,
+ PROTOCOL_BINARY_CMD_RDELETEQ = 0x38,
+ PROTOCOL_BINARY_CMD_RINCR = 0x39,
+ PROTOCOL_BINARY_CMD_RINCRQ = 0x3a,
+ PROTOCOL_BINARY_CMD_RDECR = 0x3b,
+ PROTOCOL_BINARY_CMD_RDECRQ = 0x3c
/* End Range operations */
} protocol_binary_command;
diff --git a/plugins/experimental/memcache/tsmemcache.cc b/plugins/experimental/memcache/tsmemcache.cc
index 30c4102..ffc397a 100644
--- a/plugins/experimental/memcache/tsmemcache.cc
+++ b/plugins/experimental/memcache/tsmemcache.cc
@@ -39,9 +39,9 @@ ClassAllocator<MC> theMCAllocator("MC");
static time_t base_day_time;
// These should be persistent.
-volatile int32_t MC::verbosity = 0;
+volatile int32_t MC::verbosity = 0;
volatile ink_hrtime MC::last_flush = 0;
-volatile int64_t MC::next_cas = 1;
+volatile int64_t MC::next_cas = 1;
static void
tsmemcache_constants()
@@ -49,9 +49,9 @@ tsmemcache_constants()
struct tm tm;
memset(&tm, 0, sizeof(tm));
// jan 1 2010
- tm.tm_year = 110;
- tm.tm_mon = 1;
- tm.tm_mday = 1;
+ tm.tm_year = 110;
+ tm.tm_mon = 1;
+ tm.tm_mday = 1;
base_day_time = mktime(&tm);
ink_assert(base_day_time != (time_t)-1);
}
@@ -91,7 +91,7 @@ static uint64_t
ink_hton64(uint64_t in)
{
int32_t val = 1;
- uint8_t *c = (uint8_t *)&val;
+ uint8_t *c = (uint8_t *)&val;
if (*c == 1) {
union {
uint64_t rv;
@@ -100,8 +100,8 @@ ink_hton64(uint64_t in)
#define SWP1B(_x, _y) \
do { \
uint8_t t = (_y); \
- (_y) = (_x); \
- (_x) = t; \
+ (_y) = (_x); \
+ (_x) = t; \
} while (0)
x.rv = in;
SWP1B(x.b[0], x.b[7]);
@@ -120,7 +120,7 @@ MCAccept::main_event(int event, void *data)
{
if (event == NET_EVENT_ACCEPT) {
NetVConnection *netvc = (NetVConnection *)data;
- MC *mc = theMCAllocator.alloc();
+ MC *mc = theMCAllocator.alloc();
if (!mutex->thread_holding)
mc->new_connection(netvc, netvc->thread);
else
@@ -135,17 +135,17 @@ MCAccept::main_event(int event, void *data)
void
MC::new_connection(NetVConnection *netvc, EThread *thread)
{
- nvc = netvc;
- mutex = new_ProxyMutex();
- rbuf = new_MIOBuffer(MAX_IOBUFFER_SIZE);
+ nvc = netvc;
+ mutex = new_ProxyMutex();
+ rbuf = new_MIOBuffer(MAX_IOBUFFER_SIZE);
rbuf->water_mark = TSMEMCACHE_TMP_CMD_BUFFER_SIZE;
- reader = rbuf->alloc_reader();
- wbuf = new_empty_MIOBuffer();
- cbuf = 0;
- writer = wbuf->alloc_reader();
+ reader = rbuf->alloc_reader();
+ wbuf = new_empty_MIOBuffer();
+ cbuf = 0;
+ writer = wbuf->alloc_reader();
SCOPED_MUTEX_LOCK(lock, mutex, thread);
- rvio = nvc->do_io_read(this, INT64_MAX, rbuf);
- wvio = nvc->do_io_write(this, 0, writer);
+ rvio = nvc->do_io_read(this, INT64_MAX, rbuf);
+ wvio = nvc->do_io_write(this, 0, writer);
header.magic = TSMEMCACHE_HEADER_MAGIC;
read_from_client();
}
@@ -209,15 +209,15 @@ MC::add_binary_header(uint16_t err, uint8_t hdr_len, uint16_t key_len, uint32_t
{
protocol_binary_response_header r;
- r.response.magic = (uint8_t)PROTOCOL_BINARY_RES;
- r.response.opcode = binary_header.request.opcode;
- r.response.keylen = (uint16_t)htons(key_len);
- r.response.extlen = (uint8_t)hdr_len;
+ r.response.magic = (uint8_t)PROTOCOL_BINARY_RES;
+ r.response.opcode = binary_header.request.opcode;
+ r.response.keylen = (uint16_t)htons(key_len);
+ r.response.extlen = (uint8_t)hdr_len;
r.response.datatype = (uint8_t)PROTOCOL_BINARY_RAW_BYTES;
- r.response.status = (uint16_t)htons(err);
- r.response.bodylen = htonl(body_len);
- r.response.opaque = binary_header.request.opaque;
- r.response.cas = ink_hton64(header.cas);
+ r.response.status = (uint16_t)htons(err);
+ r.response.bodylen = htonl(body_len);
+ r.response.opaque = binary_header.request.opaque;
+ r.response.cas = ink_hton64(header.cas);
wbuf->write(&r, sizeof(r));
}
@@ -278,7 +278,7 @@ MC::write_binary_error(protocol_binary_response_status err, int swallow)
int
MC::swallow_then_read_event(int event, void *data)
{
- rvio->nbytes = INT64_MAX;
+ rvio->nbytes = INT64_MAX;
int64_t avail = reader->read_avail();
if (avail >= swallow_bytes) {
reader->consume(swallow_bytes);
@@ -320,17 +320,17 @@ MC::read_from_client()
if (swallow_bytes)
return TS_SET_CALL(&MC::swallow_then_read_event, VC_EVENT_READ_READY, rvio);
read_offset = 0;
- end_of_cmd = 0;
- ngets = 0;
- ff = 0;
+ end_of_cmd = 0;
+ ngets = 0;
+ ff = 0;
if (crvc) {
crvc->do_io_close();
- crvc = 0;
+ crvc = 0;
crvio = NULL;
}
if (cwvc) {
cwvc->do_io_close();
- cwvc = 0;
+ cwvc = 0;
cwvio = NULL;
}
if (cbuf)
@@ -409,7 +409,7 @@ MC::cache_read_event(int event, void *data)
{
switch (event) {
case CACHE_EVENT_OPEN_READ: {
- crvc = (CacheVConnection *)data;
+ crvc = (CacheVConnection *)data;
int hlen = 0;
if (crvc->get_header((void **)&rcache_header, &hlen) < 0)
goto Lfail;
@@ -428,7 +428,7 @@ MC::cache_read_event(int event, void *data)
break;
Lfail:
crvc->do_io_close();
- crvc = 0;
+ crvc = 0;
crvio = NULL;
event = CACHE_EVENT_OPEN_READ_FAILED; // convert to failure
break;
@@ -475,7 +475,7 @@ MC::binary_get_event(int event, void *data)
ink_assert(!"EVENT_ITEM_GOT is incorrect here");
if (event != TSMEMCACHE_EVENT_GOT_ITEM) {
CHECK_READ_AVAIL(binary_header.request.keylen, &MC::binary_get);
- key = binary_get_key(this);
+ key = binary_get_key(this);
header.nkey = binary_header.request.keylen;
return get_item();
} else if (event == CACHE_EVENT_OPEN_READ_FAILED) {
@@ -489,8 +489,8 @@ MC::binary_get_event(int event, void *data)
return write_binary_error(PROTOCOL_BINARY_RESPONSE_KEY_ENOENT, 0);
} else if (event == CACHE_EVENT_OPEN_READ) {
protocol_binary_response_get *rsp = &res.get;
- uint16_t keylen = 0;
- uint32_t bodylen = sizeof(rsp->message.body) + (rcache_header->nbytes - 2);
+ uint16_t keylen = 0;
+ uint32_t bodylen = sizeof(rsp->message.body) + (rcache_header->nbytes - 2);
bool getk =
(binary_header.request.opcode == PROTOCOL_BINARY_CMD_GETK || binary_header.request.opcode == PROTOCOL_BINARY_CMD_GETKQ);
if (getk) {
@@ -499,7 +499,7 @@ MC::binary_get_event(int event, void *data)
}
add_binary_header(0, sizeof(rsp->message.body), keylen, bodylen);
rsp->message.header.response.cas = ink_hton64(rcache_header->cas);
- rsp->message.body.flags = htonl(rcache_header->flags);
+ rsp->message.body.flags = htonl(rcache_header->flags);
wbuf->write(&rsp->message.body, sizeof(rsp->message.body));
if (getk)
wbuf->write(key, header.nkey);
@@ -528,9 +528,9 @@ MC::read_binary_from_client_event(int event, void *data)
}
int keylen = binary_header.request.keylen = ntohs(binary_header.request.keylen);
int bodylen = binary_header.request.bodylen = ntohl(binary_header.request.bodylen);
- binary_header.request.cas = ink_ntoh64(binary_header.request.cas);
- int extlen = binary_header.request.extlen;
- end_of_cmd = sizeof(binary_header) + extlen;
+ binary_header.request.cas = ink_ntoh64(binary_header.request.cas);
+ int extlen = binary_header.request.extlen;
+ end_of_cmd = sizeof(binary_header) + extlen;
#define CHECK_PROTOCOL(_e) \
if (!(_e)) \
@@ -579,12 +579,12 @@ MC::read_binary_from_client_event(int event, void *data)
Lset:
if (bin_read_key() < 0)
return EVENT_CONT;
- key = binary_get_key(this);
- header.nkey = keylen;
+ key = binary_get_key(this);
+ header.nkey = keylen;
protocol_binary_request_set *req = (protocol_binary_request_set *)&binary_header;
- req->message.body.flags = ntohl(req->message.body.flags);
- req->message.body.expiration = ntohl(req->message.body.expiration);
- nbytes = bodylen - (header.nkey + extlen);
+ req->message.body.flags = ntohl(req->message.body.flags);
+ req->message.body.expiration = ntohl(req->message.body.expiration);
+ nbytes = bodylen - (header.nkey + extlen);
break;
}
case PROTOCOL_BINARY_CMD_DELETEQ:
@@ -670,7 +670,7 @@ MC::get_ascii_input(int n, int *end)
if (block_read_avail == read_avail)
goto Lblock;
char *c = tmp_cmd_buffer;
- int e = read_avail;
+ int e = read_avail;
if (e > n)
e = n;
reader->memcpy(c, e);
@@ -703,14 +703,14 @@ MC::ascii_get_event(int event, void *data)
}
wbuf->WRITE("\r\n");
int ntowrite = writer->read_avail() + rcache_header->nbytes;
- crvio = crvc->do_io_read(this, rcache_header->nbytes, wbuf);
- creader = reader;
+ crvio = crvc->do_io_read(this, rcache_header->nbytes, wbuf);
+ creader = reader;
TS_PUSH_HANDLER(&MC::stream_event);
return write_to_client(ntowrite);
}
case TSMEMCACHE_STREAM_DONE:
crvc->do_io_close();
- crvc = 0;
+ crvc = 0;
crvio = NULL;
reader->consume(read_offset);
read_offset = 0;
@@ -733,7 +733,7 @@ MC::ascii_set_event(int event, void *data)
case EVENT_INTERVAL:
return read_from_client();
case CACHE_EVENT_OPEN_WRITE: {
- cwvc = (CacheVConnection *)data;
+ cwvc = (CacheVConnection *)data;
int hlen = 0;
if (cwvc->get_header((void **)&wcache_header, &hlen) >= 0) {
if (hlen < (int)sizeof(MCCacheHeader) || wcache_header->magic != TSMEMCACHE_HEADER_MAGIC)
@@ -776,22 +776,22 @@ MC::ascii_set_event(int event, void *data)
header.nbytes = nbytes;
cwvc->set_header(&header, header.len());
reader->consume(end_of_cmd);
- end_of_cmd = -1;
+ end_of_cmd = -1;
swallow_bytes = 2; // \r\n
if (f.set_append) {
TS_PUSH_HANDLER(&MC::tunnel_event);
if (!cbuf)
- cbuf = new_empty_MIOBuffer();
+ cbuf = new_empty_MIOBuffer();
creader = cbuf->alloc_reader();
- crvio = crvc->do_io_read(this, rcache_header->nbytes, cbuf);
- cwvio = cwvc->do_io_write(this, header.nbytes, creader);
+ crvio = crvc->do_io_read(this, rcache_header->nbytes, cbuf);
+ cwvio = cwvc->do_io_write(this, header.nbytes, creader);
} else {
if (f.set_prepend) {
int64_t a = reader->read_avail();
if (a >= (int64_t)nbytes)
a = (int64_t)nbytes;
if (!cbuf)
- cbuf = new_empty_MIOBuffer();
+ cbuf = new_empty_MIOBuffer();
creader = cbuf->alloc_reader();
if (a) {
cbuf->write(reader, a);
@@ -820,7 +820,7 @@ MC::ascii_set_event(int event, void *data)
return ASCII_RESPONSE("STORED");
case TSMEMCACHE_TUNNEL_DONE:
crvc->do_io_close();
- crvc = 0;
+ crvc = 0;
crvio = NULL;
if (f.set_append) {
int64_t a = reader->read_avail();
@@ -877,7 +877,7 @@ MC::ascii_incr_decr_event(int event, void *data)
return read_from_client();
case CACHE_EVENT_OPEN_WRITE: {
int hlen = 0;
- cwvc = (CacheVConnection *)data;
+ cwvc = (CacheVConnection *)data;
{
if (cwvc->get_header((void **)&wcache_header, &hlen) >= 0) {
if (hlen < (int)sizeof(MCCacheHeader) || wcache_header->magic != TSMEMCACHE_HEADER_MAGIC)
@@ -906,7 +906,7 @@ MC::ascii_incr_decr_event(int event, void *data)
header.cas = ink_atomic_increment(&next_cas, 1);
{
char *data = 0;
- int len = 0;
+ int len = 0;
// must be huge, why convert to a counter ??
if (cwvc->get_single_data((void **)&data, &len) < 0)
goto Lfail;
@@ -920,8 +920,8 @@ MC::ascii_incr_decr_event(int event, void *data)
new_value -= delta;
}
char new_value_str_buffer[32], *e = &new_value_str_buffer[30];
- e[0] = '\r';
- e[1] = '\n';
+ e[0] = '\r';
+ e[1] = '\n';
char *s = xutoa(new_value, e);
creader = wbuf->clone_reader(writer);
wbuf->write(s, e - s + 2);
@@ -1213,7 +1213,7 @@ MC::read_ascii_from_client_event(int event, void *data)
case 'g': // get gets
if (s[3] == 's' && s[4] == ' ') {
f.return_cas = 1;
- read_offset = 5;
+ read_offset = 5;
goto Lget;
} else if (s[3] == ' ') {
read_offset = 4;
@@ -1288,7 +1288,7 @@ MC::read_ascii_from_client_event(int event, void *data)
int32_t time_offset = 0;
if (isdigit(*s))
GET_NUM(time_offset);
- f.noreply = is_noreply(&s, e);
+ f.noreply = is_noreply(&s, e);
ink_hrtime new_last_flush = Thread::get_hrtime() + HRTIME_SECONDS(time_offset);
#if __WORDSIZE == 64
last_flush = new_last_flush; // this will be atomic for native word size
@@ -1489,7 +1489,7 @@ init_tsmemcache(int port)
{
tsmemcache_constants();
MCAccept *a = new MCAccept;
- a->mutex = new_ProxyMutex();
+ a->mutex = new_ProxyMutex();
NetProcessor::AcceptOptions options(NetProcessor::DEFAULT_ACCEPT_OPTIONS);
options.local_port = a->accept_port = port;
netProcessor.accept(a, options);
@@ -1502,8 +1502,8 @@ TSPluginInit(int argc, const char *argv[])
ink_assert(sizeof(protocol_binary_request_header) == 24);
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"tsmemcache";
- info.vendor_name = (char *)"ats";
+ info.plugin_name = (char *)"tsmemcache";
+ info.vendor_name = (char *)"ats";
info.support_email = (char *)"jplevyak@apache.org";
int port = 11211;
diff --git a/plugins/experimental/memcached_remap/memcached_remap.cc b/plugins/experimental/memcached_remap/memcached_remap.cc
index a6c9a8f..eede647 100644
--- a/plugins/experimental/memcached_remap/memcached_remap.cc
+++ b/plugins/experimental/memcached_remap/memcached_remap.cc
@@ -43,7 +43,7 @@ do_memcached_remap(TSCont contp, TSHttpTxn txnp)
int request_host_length = 0;
const char *request_scheme;
int request_scheme_length = 0;
- int request_port = 80;
+ int request_port = 80;
char ikey[1024];
char *m_result = NULL;
size_t oval_length;
@@ -74,7 +74,7 @@ do_memcached_remap(TSCont contp, TSHttpTxn txnp)
}
request_scheme = TSUrlSchemeGet(reqp, url_loc, &request_scheme_length);
- request_port = TSUrlPortGet(reqp, url_loc);
+ request_port = TSUrlPortGet(reqp, url_loc);
TSDebug(PLUGIN_NAME, " +++++MEMCACHED REMAP+++++ ");
@@ -143,7 +143,7 @@ release_hdr:
static int
memcached_remap(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
TSEvent reenable = TS_EVENT_HTTP_CONTINUE;
if (event == TS_EVENT_HTTP_READ_REQUEST_HDR) {
@@ -166,8 +166,8 @@ TSPluginInit(int argc, const char *argv[])
// FILE *fp;
// char servers_string[8192];
- info.plugin_name = const_cast<char *>(PLUGIN_NAME);
- info.vendor_name = const_cast<char *>("Apache Software Foundation");
+ info.plugin_name = const_cast<char *>(PLUGIN_NAME);
+ info.vendor_name = const_cast<char *>("Apache Software Foundation");
info.support_email = const_cast<char *>("dev@trafficserver.apache.org");
TSDebug(PLUGIN_NAME, "about to init memcached");
diff --git a/plugins/experimental/metalink/metalink.cc b/plugins/experimental/metalink/metalink.cc
index 0b16b1b..91767f7 100644
--- a/plugins/experimental/metalink/metalink.cc
+++ b/plugins/experimental/metalink/metalink.cc
@@ -115,7 +115,7 @@ cache_open_write(TSCont contp, void *edata)
int length;
WriteData *data = (WriteData *)TSContDataGet(contp);
- data->connp = (TSVConn)edata;
+ data->connp = (TSVConn)edata;
TSCacheKeyDestroy(data->key);
@@ -157,7 +157,7 @@ cache_open_write(TSCont contp, void *edata)
/* Store the request URL */
- data->cache_bufp = TSIOBufferCreate();
+ data->cache_bufp = TSIOBufferCreate();
TSIOBufferReader readerp = TSIOBufferReaderAlloc(data->cache_bufp);
int nbytes = TSIOBufferWrite(data->cache_bufp, value, length);
@@ -374,13 +374,13 @@ vconn_write_ready(TSCont contp, void * /* edata ATS_UNUSED */)
TSVConn output_connp = TSTransformOutputVConnGet(contp);
transform_data->output_bufp = TSIOBufferCreate();
- TSIOBufferReader readerp = TSIOBufferReaderAlloc(transform_data->output_bufp);
+ TSIOBufferReader readerp = TSIOBufferReaderAlloc(transform_data->output_bufp);
/* Determines the Content-Length header (or a chunked response) */
/* Reentrant! Avoid failed assert "nbytes >= 0" if the response
* is chunked. */
- int nbytes = TSVIONBytesGet(input_viop);
+ int nbytes = TSVIONBytesGet(input_viop);
transform_data->output_viop = TSVConnWrite(output_connp, contp, readerp, nbytes < 0 ? INT64_MAX : nbytes);
SHA256_Init(&transform_data->c);
@@ -449,7 +449,7 @@ vconn_write_ready(TSCont contp, void * /* edata ATS_UNUSED */)
SHA256_Final((unsigned char *)digest, &transform_data->c);
WriteData *write_data = (WriteData *)TSmalloc(sizeof(WriteData));
- write_data->txnp = transform_data->txnp;
+ write_data->txnp = transform_data->txnp;
/* Don't finish computing the digest more than once! */
transform_data->txnp = NULL;
@@ -516,7 +516,7 @@ static int
http_read_response_hdr(TSCont /* contp ATS_UNUSED */, void *edata)
{
TransformData *data = (TransformData *)TSmalloc(sizeof(TransformData));
- data->txnp = (TSHttpTxn)edata;
+ data->txnp = (TSHttpTxn)edata;
/* Can't initialize data here because we can't call TSVConnWrite()
* before TS_HTTP_RESPONSE_TRANSFORM_HOOK */
@@ -541,7 +541,7 @@ static int
cache_open_read(TSCont contp, void *edata)
{
SendData *data = (SendData *)TSContDataGet(contp);
- data->connp = (TSVConn)edata;
+ data->connp = (TSVConn)edata;
data->cache_bufp = TSIOBufferCreate();
@@ -770,7 +770,7 @@ http_send_response_hdr(TSCont contp, void *edata)
int length;
SendData *data = (SendData *)TSmalloc(sizeof(SendData));
- data->txnp = (TSHttpTxn)edata;
+ data->txnp = (TSHttpTxn)edata;
if (TSHttpTxnClientRespGet(data->txnp, &data->resp_bufp, &data->hdr_loc) != TS_SUCCESS) {
TSError("[metalink] Couldn't retrieve client response header");
@@ -905,8 +905,8 @@ TSPluginInit(int /* argc ATS_UNUSED */, const char * /* argv ATS_UNUSED */ [])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"metalink";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"metalink";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/mp4/mp4.cc b/plugins/experimental/mp4/mp4.cc
index a63261b..2361d08 100644
--- a/plugins/experimental/mp4/mp4.cc
+++ b/plugins/experimental/mp4/mp4.cc
@@ -110,7 +110,7 @@ TSRemapDoRemap(void * /* ih ATS_UNUSED */, TSHttpTxn rh, TSRemapRequestInfo *rri
}
// reset args
- left = val - sizeof("start") - query;
+ left = val - sizeof("start") - query;
right = query + query_len - val - val_len;
if (left > 0) {
@@ -138,7 +138,7 @@ TSRemapDoRemap(void * /* ih ATS_UNUSED */, TSHttpTxn rh, TSRemapRequestInfo *rri
TSHandleMLocRelease(rri->requestBufp, rri->requestHdrp, range_field);
}
- mc = new Mp4Context(start);
+ mc = new Mp4Context(start);
contp = TSContCreate(mp4_handler, NULL);
TSContDataSet(contp, mc);
@@ -155,7 +155,7 @@ mp4_handler(TSCont contp, TSEvent event, void *edata)
Mp4Context *mc;
txnp = (TSHttpTxn)edata;
- mc = (Mp4Context *)TSContDataGet(contp);
+ mc = (Mp4Context *)TSContDataGet(contp);
switch (event) {
case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE:
@@ -244,7 +244,7 @@ mp4_read_response(Mp4Context *mc, TSHttpTxn txnp)
if (status != TS_HTTP_STATUS_OK)
goto release;
- n = 0;
+ n = 0;
cl_field = TSMimeHdrFieldFind(bufp, hdrp, TS_MIME_FIELD_CONTENT_LENGTH, TS_MIME_LEN_CONTENT_LENGTH);
if (cl_field) {
n = TSMimeHdrFieldValueInt64Get(bufp, hdrp, cl_field, -1);
@@ -325,8 +325,8 @@ mp4_transform_handler(TSCont contp, Mp4Context *mc)
mtc = mc->mtc;
- output_conn = TSTransformOutputVConnGet(contp);
- input_vio = TSVConnWriteVIOGet(contp);
+ output_conn = TSTransformOutputVConnGet(contp);
+ input_vio = TSVConnWriteVIOGet(contp);
input_reader = TSVIOReaderGet(input_vio);
if (!TSVIOBufferGet(input_vio)) {
@@ -337,14 +337,14 @@ mp4_transform_handler(TSCont contp, Mp4Context *mc)
return 1;
}
- avail = TSIOBufferReaderAvail(input_reader);
+ avail = TSIOBufferReaderAvail(input_reader);
upstream_done = TSVIONDoneGet(input_vio);
TSIOBufferCopy(mtc->res_buffer, input_reader, avail, 0);
TSIOBufferReaderConsume(input_reader, avail);
TSVIONDoneSet(input_vio, upstream_done + avail);
- toread = TSVIONTodoGet(input_vio);
+ toread = TSVIONTodoGet(input_vio);
write_down = false;
if (!mtc->parse_over) {
@@ -352,12 +352,12 @@ mp4_transform_handler(TSCont contp, Mp4Context *mc)
if (ret == 0)
goto trans;
- mtc->parse_over = true;
+ mtc->parse_over = true;
mtc->output.buffer = TSIOBufferCreate();
mtc->output.reader = TSIOBufferReaderAlloc(mtc->output.buffer);
if (ret < 0) {
- mtc->output.vio = TSVConnWrite(output_conn, contp, mtc->output.reader, mc->cl);
+ mtc->output.vio = TSVConnWrite(output_conn, contp, mtc->output.reader, mc->cl);
mtc->raw_transform = true;
} else {
@@ -386,7 +386,7 @@ mp4_transform_handler(TSCont contp, Mp4Context *mc)
// ignore useless part
if (mtc->pos < mtc->tail) {
avail = TSIOBufferReaderAvail(mtc->res_reader);
- need = mtc->tail - mtc->pos;
+ need = mtc->tail - mtc->pos;
if (need > avail) {
need = avail;
}
@@ -440,7 +440,7 @@ mp4_parse_meta(Mp4TransformContext *mtc, bool body_complete)
mm = &mtc->mm;
avail = TSIOBufferReaderAvail(mtc->dup_reader);
- blk = TSIOBufferReaderStart(mtc->dup_reader);
+ blk = TSIOBufferReaderStart(mtc->dup_reader);
while (blk != NULL) {
data = TSIOBufferBlockReadStart(blk, mtc->dup_reader, &bytes);
@@ -456,9 +456,9 @@ mp4_parse_meta(Mp4TransformContext *mtc, bool body_complete)
ret = mm->parse_meta(body_complete);
if (ret > 0) { // meta success
- mtc->tail = mm->start_pos;
+ mtc->tail = mm->start_pos;
mtc->content_length = mm->content_length;
- mtc->meta_length = TSIOBufferReaderAvail(mm->out_handle.reader);
+ mtc->meta_length = TSIOBufferReaderAvail(mm->out_handle.reader);
}
if (ret != 0) {
@@ -480,7 +480,7 @@ ts_arg(const char *param, size_t param_len, const char *key, size_t key_len, siz
if (!param || !param_len)
return NULL;
- p = param;
+ p = param;
last = p + param_len;
for (; p < last; p++) {
diff --git a/plugins/experimental/mp4/mp4_common.h b/plugins/experimental/mp4/mp4_common.h
index cb824ab..c55b534 100644
--- a/plugins/experimental/mp4/mp4_common.h
+++ b/plugins/experimental/mp4/mp4_common.h
@@ -65,7 +65,7 @@ public:
dup_reader = TSIOBufferReaderAlloc(res_buffer);
mm.start = offset * 1000;
- mm.cl = cl;
+ mm.cl = cl;
}
~Mp4TransformContext()
diff --git a/plugins/experimental/mp4/mp4_meta.cc b/plugins/experimental/mp4/mp4_meta.cc
index 152444a..863bc75 100644
--- a/plugins/experimental/mp4/mp4_meta.cc
+++ b/plugins/experimental/mp4/mp4_meta.cc
@@ -250,7 +250,7 @@ Mp4Meta::parse_root_atoms()
return -1;
}
- atom_size = mp4_get_64value(atom_header + 8);
+ atom_size = mp4_get_64value(atom_header + 8);
atom_header_size = sizeof(mp4_atom_header64);
} else { // regular atom
@@ -349,7 +349,7 @@ Mp4Meta::mp4_read_atom(mp4_atom_handler *atom, int64_t size)
return -1;
}
- atom_size = mp4_get_64value(atom_header + 8);
+ atom_size = mp4_get_64value(atom_header + 8);
atom_header_size = sizeof(mp4_atom_header64);
} else { // regular atom
@@ -416,7 +416,7 @@ Mp4Meta::mp4_read_ftyp_atom(int64_t atom_header_size, int64_t atom_data_size)
mp4_meta_consume(atom_size);
content_length = atom_size;
- ftyp_size = atom_size;
+ ftyp_size = atom_size;
return 1;
}
@@ -493,7 +493,7 @@ Mp4Meta::mp4_read_trak_atom(int64_t atom_header_size, int64_t atom_data_size)
if (trak_num >= MP4_MAX_TRAK_NUM - 1)
return -1;
- trak = new Mp4Trak();
+ trak = new Mp4Trak();
trak_vec[trak_num++] = trak;
trak->atoms[MP4_TRAK_ATOM].buffer = TSIOBufferCreate();
@@ -520,7 +520,7 @@ Mp4Meta::mp4_read_tkhd_atom(int64_t atom_header_size, int64_t atom_data_size)
atom_size = atom_header_size + atom_data_size;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->tkhd_size = atom_size;
trak->atoms[MP4_TKHD_ATOM].buffer = TSIOBufferCreate();
@@ -563,20 +563,20 @@ Mp4Meta::mp4_read_mdhd_atom(int64_t atom_header_size, int64_t atom_data_size)
mdhd = (mp4_mdhd_atom *)&mdhd64;
if (mdhd->version[0] == 0) {
- ts = mp4_get_32value(mdhd->timescale);
+ ts = mp4_get_32value(mdhd->timescale);
duration = mp4_get_32value(mdhd->duration);
} else {
- ts = mp4_get_32value(mdhd64.timescale);
+ ts = mp4_get_32value(mdhd64.timescale);
duration = mp4_get_64value(mdhd64.duration);
}
atom_size = atom_header_size + atom_data_size;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->mdhd_size = atom_size;
trak->timescale = ts;
- trak->duration = duration;
+ trak->duration = duration;
trak->atoms[MP4_MDHD_ATOM].buffer = TSIOBufferCreate();
trak->atoms[MP4_MDHD_ATOM].reader = TSIOBufferReaderAlloc(trak->atoms[MP4_MDHD_ATOM].buffer);
@@ -597,7 +597,7 @@ Mp4Meta::mp4_read_hdlr_atom(int64_t atom_header_size, int64_t atom_data_size)
atom_size = atom_header_size + atom_data_size;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->hdlr_size = atom_size;
trak->atoms[MP4_HDLR_ATOM].buffer = TSIOBufferCreate();
@@ -736,12 +736,12 @@ Mp4Meta::mp4_read_stts_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &stts, sizeof(mp4_stts_atom));
entries = mp4_get_32value(stts.entries);
- esize = entries * sizeof(mp4_stts_entry);
+ esize = entries * sizeof(mp4_stts_entry);
if (sizeof(mp4_stts_atom) - 8 + esize > (size_t)atom_data_size)
return -1;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->time_to_sample_entries = entries;
trak->atoms[MP4_STTS_ATOM].buffer = TSIOBufferCreate();
@@ -770,12 +770,12 @@ Mp4Meta::mp4_read_stss_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &stss, sizeof(mp4_stss_atom));
entries = mp4_get_32value(stss.entries);
- esize = entries * sizeof(int32_t);
+ esize = entries * sizeof(int32_t);
if (sizeof(mp4_stss_atom) - 8 + esize > (size_t)atom_data_size)
return -1;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->sync_samples_entries = entries;
trak->atoms[MP4_STSS_ATOM].buffer = TSIOBufferCreate();
@@ -804,12 +804,12 @@ Mp4Meta::mp4_read_ctts_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &ctts, sizeof(mp4_ctts_atom));
entries = mp4_get_32value(ctts.entries);
- esize = entries * sizeof(mp4_ctts_entry);
+ esize = entries * sizeof(mp4_ctts_entry);
if (sizeof(mp4_ctts_atom) - 8 + esize > (size_t)atom_data_size)
return -1;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->composition_offset_entries = entries;
trak->atoms[MP4_CTTS_ATOM].buffer = TSIOBufferCreate();
@@ -838,12 +838,12 @@ Mp4Meta::mp4_read_stsc_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &stsc, sizeof(mp4_stsc_atom));
entries = mp4_get_32value(stsc.entries);
- esize = entries * sizeof(mp4_stsc_entry);
+ esize = entries * sizeof(mp4_stsc_entry);
if (sizeof(mp4_stsc_atom) - 8 + esize > (size_t)atom_data_size)
return -1;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->sample_to_chunk_entries = entries;
trak->atoms[MP4_STSC_ATOM].buffer = TSIOBufferCreate();
@@ -872,7 +872,7 @@ Mp4Meta::mp4_read_stsz_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &stsz, sizeof(mp4_stsz_atom));
entries = mp4_get_32value(stsz.entries);
- esize = entries * sizeof(int32_t);
+ esize = entries * sizeof(int32_t);
trak = trak_vec[trak_num - 1];
size = mp4_get_32value(stsz.uniform_size);
@@ -915,12 +915,12 @@ Mp4Meta::mp4_read_stco_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &stco, sizeof(mp4_stco_atom));
entries = mp4_get_32value(stco.entries);
- esize = entries * sizeof(int32_t);
+ esize = entries * sizeof(int32_t);
if (sizeof(mp4_stco_atom) - 8 + esize > (size_t)atom_data_size)
return -1;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->chunks = entries;
trak->atoms[MP4_STCO_ATOM].buffer = TSIOBufferCreate();
@@ -949,12 +949,12 @@ Mp4Meta::mp4_read_co64_atom(int64_t atom_header_size, int64_t atom_data_size)
IOBufferReaderCopy(meta_reader, &co64, sizeof(mp4_co64_atom));
entries = mp4_get_32value(co64.entries);
- esize = entries * sizeof(int64_t);
+ esize = entries * sizeof(int64_t);
if (sizeof(mp4_co64_atom) - 8 + esize > (size_t)atom_data_size)
return -1;
- trak = trak_vec[trak_num - 1];
+ trak = trak_vec[trak_num - 1];
trak->chunks = entries;
trak->atoms[MP4_CO64_ATOM].buffer = TSIOBufferCreate();
@@ -994,18 +994,18 @@ Mp4Meta::mp4_update_stts_atom(Mp4Trak *trak)
sum = start_count = 0;
- entries = trak->time_to_sample_entries;
+ entries = trak->time_to_sample_entries;
start_time = this->start * trak->timescale / 1000;
if (this->rs > 0) {
start_time = (uint64_t)(this->rs * trak->timescale / 1000);
}
start_sample = 0;
- readerp = TSIOBufferReaderClone(trak->atoms[MP4_STTS_DATA].reader);
+ readerp = TSIOBufferReaderClone(trak->atoms[MP4_STTS_DATA].reader);
for (i = 0; i < entries; i++) {
duration = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_stts_entry, duration));
- count = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_stts_entry, count));
+ count = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_stts_entry, count));
if (start_time < (uint64_t)count * duration) {
pass = (uint32_t)(start_time / duration);
@@ -1036,7 +1036,7 @@ found:
for (i = 0; i < entries; i++) {
duration = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_stts_entry, duration));
- count = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_stts_entry, count));
+ count = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_stts_entry, count));
if (start_sample < count) {
count -= start_sample;
@@ -1083,7 +1083,7 @@ Mp4Meta::mp4_update_stss_atom(Mp4Trak *trak)
readerp = TSIOBufferReaderClone(trak->atoms[MP4_STSS_DATA].reader);
start_sample = trak->start_sample + 1;
- entries = trak->sync_samples_entries;
+ entries = trak->sync_samples_entries;
for (i = 0; i < entries; i++) {
sample = (uint32_t)mp4_reader_get_32value(readerp, 0);
@@ -1137,7 +1137,7 @@ Mp4Meta::mp4_update_ctts_atom(Mp4Trak *trak)
readerp = TSIOBufferReaderClone(trak->atoms[MP4_CTTS_DATA].reader);
start_sample = trak->start_sample + 1;
- entries = trak->composition_offset_entries;
+ entries = trak->composition_offset_entries;
for (i = 0; i < entries; i++) {
count = (uint32_t)mp4_reader_get_32value(readerp, offsetof(mp4_ctts_entry, count));
@@ -1171,7 +1171,7 @@ Mp4Meta::mp4_update_ctts_atom(Mp4Trak *trak)
found:
- left = entries - i;
+ left = entries - i;
atom_size = sizeof(mp4_ctts_atom) + left * sizeof(mp4_ctts_entry);
trak->size += atom_size;
@@ -1203,9 +1203,9 @@ Mp4Meta::mp4_update_stsc_atom(Mp4Trak *trak)
readerp = TSIOBufferReaderClone(trak->atoms[MP4_STSC_DATA].reader);
- chunk = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, chunk));
+ chunk = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, chunk));
samples = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, samples));
- id = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, id));
+ id = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, id));
TSIOBufferReaderConsume(readerp, sizeof(mp4_stsc_entry));
@@ -1220,9 +1220,9 @@ Mp4Meta::mp4_update_stsc_atom(Mp4Trak *trak)
start_sample -= n;
- chunk = next_chunk;
+ chunk = next_chunk;
samples = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, samples));
- id = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, id));
+ id = mp4_reader_get_32value(readerp, offsetof(mp4_stsc_entry, id));
TSIOBufferReaderConsume(readerp, sizeof(mp4_stsc_entry));
}
@@ -1308,7 +1308,7 @@ Mp4Meta::mp4_update_stsz_atom(Mp4Trak *trak)
return -1;
readerp = TSIOBufferReaderClone(trak->atoms[MP4_STSZ_DATA].reader);
- avail = TSIOBufferReaderAvail(readerp);
+ avail = TSIOBufferReaderAvail(readerp);
pass = trak->start_sample * sizeof(uint32_t);
@@ -1345,9 +1345,9 @@ Mp4Meta::mp4_update_co64_atom(Mp4Trak *trak)
return -1;
readerp = trak->atoms[MP4_CO64_DATA].reader;
- avail = TSIOBufferReaderAvail(readerp);
+ avail = TSIOBufferReaderAvail(readerp);
- pass = trak->start_chunk * sizeof(uint64_t);
+ pass = trak->start_chunk * sizeof(uint64_t);
atom_size = sizeof(mp4_co64_atom) + avail - pass;
trak->size += atom_size;
@@ -1376,9 +1376,9 @@ Mp4Meta::mp4_update_stco_atom(Mp4Trak *trak)
return -1;
readerp = trak->atoms[MP4_STCO_DATA].reader;
- avail = TSIOBufferReaderAvail(readerp);
+ avail = TSIOBufferReaderAvail(readerp);
- pass = trak->start_chunk * sizeof(uint32_t);
+ pass = trak->start_chunk * sizeof(uint32_t);
atom_size = sizeof(mp4_stco_atom) + avail - pass;
trak->size += atom_size;
@@ -1438,7 +1438,7 @@ Mp4Meta::mp4_adjust_co64_atom(Mp4Trak *trak, off_t adjustment)
TSIOBufferReader readerp;
readerp = TSIOBufferReaderClone(trak->atoms[MP4_CO64_DATA].reader);
- avail = TSIOBufferReaderAvail(readerp);
+ avail = TSIOBufferReaderAvail(readerp);
for (pos = 0; pos < avail; pos += sizeof(uint64_t)) {
offset = mp4_reader_get_64value(readerp, 0);
@@ -1459,7 +1459,7 @@ Mp4Meta::mp4_adjust_stco_atom(Mp4Trak *trak, int32_t adjustment)
TSIOBufferReader readerp;
readerp = TSIOBufferReaderClone(trak->atoms[MP4_STCO_DATA].reader);
- avail = TSIOBufferReaderAvail(readerp);
+ avail = TSIOBufferReaderAvail(readerp);
for (pos = 0; pos < avail; pos += sizeof(uint32_t)) {
offset = mp4_reader_get_32value(readerp, 0);
@@ -1481,18 +1481,18 @@ Mp4Meta::mp4_update_mdat_atom(int64_t start_offset)
int64_t atom_header_size;
u_char *atom_header;
- atom_data_size = this->cl - start_offset;
+ atom_data_size = this->cl - start_offset;
this->start_pos = start_offset;
atom_header = mdat_atom_header;
if (atom_data_size > 0xffffffff) {
- atom_size = 1;
+ atom_size = 1;
atom_header_size = sizeof(mp4_atom_header64);
mp4_set_64value(atom_header + sizeof(mp4_atom_header), sizeof(mp4_atom_header64) + atom_data_size);
} else {
- atom_size = sizeof(mp4_atom_header) + atom_data_size;
+ atom_size = sizeof(mp4_atom_header) + atom_data_size;
atom_header_size = sizeof(mp4_atom_header);
}
@@ -1520,7 +1520,7 @@ Mp4Meta::mp4_find_key_sample(uint32_t start_sample, Mp4Trak *trak)
return start_sample;
prev_sample = 1;
- entries = trak->sync_samples_entries;
+ entries = trak->sync_samples_entries;
readerp = TSIOBufferReaderClone(trak->atoms[MP4_STSS_DATA].reader);
@@ -1665,7 +1665,7 @@ mp4_reader_set_32value(TSIOBufferReader readerp, int64_t offset, uint32_t n)
} else {
left = avail - offset;
- ptr = (u_char *)(const_cast<char *>(start) + offset);
+ ptr = (u_char *)(const_cast<char *>(start) + offset);
while (pos < 4 && left > 0) {
*ptr++ = (u_char)((n) >> ((3 - pos) * 8));
@@ -1703,7 +1703,7 @@ mp4_reader_set_64value(TSIOBufferReader readerp, int64_t offset, uint64_t n)
} else {
left = avail - offset;
- ptr = (u_char *)(const_cast<char *>(start) + offset);
+ ptr = (u_char *)(const_cast<char *>(start) + offset);
while (pos < 8 && left > 0) {
*ptr++ = (u_char)((n) >> ((7 - pos) * 8));
@@ -1742,7 +1742,7 @@ mp4_reader_get_32value(TSIOBufferReader readerp, int64_t offset)
} else {
left = avail - offset;
- ptr = (u_char *)(start + offset);
+ ptr = (u_char *)(start + offset);
while (pos < 4 && left > 0) {
res[3 - pos] = *ptr++;
@@ -1784,7 +1784,7 @@ mp4_reader_get_64value(TSIOBufferReader readerp, int64_t offset)
} else {
left = avail - offset;
- ptr = (u_char *)(start + offset);
+ ptr = (u_char *)(start + offset);
while (pos < 8 && left > 0) {
res[7 - pos] = *ptr++;
@@ -1812,12 +1812,12 @@ IOBufferReaderCopy(TSIOBufferReader readerp, void *buf, int64_t length)
const char *start;
TSIOBufferBlock blk;
- n = 0;
+ n = 0;
blk = TSIOBufferReaderStart(readerp);
while (blk) {
start = TSIOBufferBlockReadStart(blk, readerp, &avail);
- need = length < avail ? length : avail;
+ need = length < avail ? length : avail;
if (need > 0) {
memcpy((char *)buf + n, start, need);
diff --git a/plugins/experimental/multiplexer/ats-multiplexer.cc b/plugins/experimental/multiplexer/ats-multiplexer.cc
index adbfefe..3a32ace 100644
--- a/plugins/experimental/multiplexer/ats-multiplexer.cc
+++ b/plugins/experimental/multiplexer/ats-multiplexer.cc
@@ -44,7 +44,7 @@ TSReturnCode
TSRemapInit(TSRemapInterface *, char *, int)
{
{
- timeout = 0;
+ timeout = 0;
const char *const timeoutEnv = getenv(PLUGIN_TAG "__timeout");
if (timeoutEnv != NULL) {
timeout = atol(timeoutEnv);
diff --git a/plugins/experimental/multiplexer/chunk-decoder.cc b/plugins/experimental/multiplexer/chunk-decoder.cc
index 113cf47..e25d09d 100644
--- a/plugins/experimental/multiplexer/chunk-decoder.cc
+++ b/plugins/experimental/multiplexer/chunk-decoder.cc
@@ -143,7 +143,7 @@ ChunkDecoder::decode(const TSIOBufferReader &r)
if (p != NULL) {
if (size > size_) {
length += size_;
- size_ = 0;
+ size_ = 0;
state_ = State::kSizeR;
break;
} else {
diff --git a/plugins/experimental/multiplexer/dispatch.cc b/plugins/experimental/multiplexer/dispatch.cc
index bd4c56c..258694f 100644
--- a/plugins/experimental/multiplexer/dispatch.cc
+++ b/plugins/experimental/multiplexer/dispatch.cc
@@ -63,7 +63,7 @@ Request::Request(const Request &r) : host(r.host), length(r.length), io(const_ca
Request &
Request::operator=(const Request &r)
{
- host = r.host;
+ host = r.host;
length = r.length;
io.reset(const_cast<Request &>(r).io.release());
assert(!host.empty());
@@ -83,7 +83,7 @@ copy(const TSIOBufferReader &r, const TSIOBuffer b)
uint64_t length = 0;
for (; block; block = TSIOBufferBlockNext(block)) {
- int64_t size = 0;
+ int64_t size = 0;
const void *const pointer = TSIOBufferBlockReadStart(block, r, &size);
if (pointer != NULL && size > 0) {
@@ -111,7 +111,7 @@ read(const TSIOBufferReader &r, std::string &o, int64_t l = 0)
uint64_t length = 0;
for (; block && l > 0; block = TSIOBufferBlockNext(block)) {
- int64_t size = 0;
+ int64_t size = 0;
const char *const pointer = TSIOBufferBlockReadStart(block, r, &size);
if (pointer != NULL && size > 0) {
size = std::min(size, l);
@@ -128,7 +128,7 @@ uint64_t
read(const TSIOBuffer &b, std::string &o, const int64_t l = 0)
{
TSIOBufferReader reader = TSIOBufferReaderAlloc(b);
- const uint64_t length = read(reader, o);
+ const uint64_t length = read(reader, o);
TSIOBufferReaderFree(reader);
return length;
}
@@ -214,7 +214,7 @@ generateRequests(const Origins &o, const TSMBuffer buffer, const TSMLoc location
assert(buffer != NULL);
assert(location != NULL);
- Origins::const_iterator iterator = o.begin();
+ Origins::const_iterator iterator = o.begin();
const Origins::const_iterator end = o.end();
OriginalRequest request(buffer, location);
@@ -234,9 +234,9 @@ void
addBody(Requests &r, const TSIOBufferReader re)
{
assert(re != NULL);
- Requests::iterator iterator = r.begin();
+ Requests::iterator iterator = r.begin();
const Requests::iterator end = r.end();
- const int64_t length = TSIOBufferReaderAvail(re);
+ const int64_t length = TSIOBufferReaderAvail(re);
if (length == 0) {
return;
}
@@ -252,7 +252,7 @@ addBody(Requests &r, const TSIOBufferReader re)
void
dispatch(Requests &r, const int t)
{
- Requests::iterator iterator = r.begin();
+ Requests::iterator iterator = r.begin();
const Requests::iterator end = r.end();
for (; iterator != end; ++iterator) {
assert(iterator->io.get() != NULL);
diff --git a/plugins/experimental/multiplexer/fetcher.cc b/plugins/experimental/multiplexer/fetcher.cc
index 7b60f1d..aff390a 100644
--- a/plugins/experimental/multiplexer/fetcher.cc
+++ b/plugins/experimental/multiplexer/fetcher.cc
@@ -42,9 +42,9 @@ HttpParser::parse(io::IO &io)
}
TSIOBufferBlock block = TSIOBufferReaderStart(io.reader);
while (block != NULL) {
- int64_t size = 0;
+ int64_t size = 0;
const char *const begin = TSIOBufferBlockReadStart(block, io.reader, &size);
- const char *iterator = begin;
+ const char *iterator = begin;
parsed_ = (TSHttpHdrParseResp(parser_, buffer_, location_, &iterator, iterator + size) == TS_PARSE_DONE);
TSIOBufferReaderConsume(io.reader, iterator - begin);
diff --git a/plugins/experimental/multiplexer/fetcher.h b/plugins/experimental/multiplexer/fetcher.h
index 96798eb..4c88553 100644
--- a/plugins/experimental/multiplexer/fetcher.h
+++ b/plugins/experimental/multiplexer/fetcher.h
@@ -159,7 +159,7 @@ template <class T> struct HttpTransaction {
{
assert(b != NULL);
assert(l != NULL);
- bool result = false;
+ bool result = false;
const TSMLoc field = TSMimeHdrFieldFind(b, l, TS_MIME_FIELD_TRANSFER_ENCODING, TS_MIME_LEN_TRANSFER_ENCODING);
if (field != NULL) {
int length;
@@ -282,7 +282,7 @@ get(const std::string &a, io::IO *const i, const int64_t l, const T &t, const in
typedef HttpTransaction<T> Transaction;
struct sockaddr_in socket;
socket.sin_family = AF_INET;
- socket.sin_port = 80;
+ socket.sin_port = 80;
if (!inet_pton(AF_INET, a.c_str(), &socket.sin_addr)) {
TSDebug(PLUGIN_TAG, "ats::get Invalid address provided \"%s\".", a.c_str());
return false;
diff --git a/plugins/experimental/multiplexer/original-request.cc b/plugins/experimental/multiplexer/original-request.cc
index 3ea76f9..701c5b8 100644
--- a/plugins/experimental/multiplexer/original-request.cc
+++ b/plugins/experimental/multiplexer/original-request.cc
@@ -29,7 +29,7 @@ template <class T>
std::string
get(const TSMBuffer &b, const TSMLoc &l, const T &t)
{
- int length = 0;
+ int length = 0;
const char *const buffer = t(b, l, &length);
assert(buffer != NULL);
@@ -42,7 +42,7 @@ get(const TSMBuffer &b, const TSMLoc &l, const T &t)
std::string
get(const TSMBuffer &b, const TSMLoc &l, const TSMLoc &f, const int i = 0)
{
- int length = 0;
+ int length = 0;
const char *const buffer = TSMimeHdrFieldValueStringGet(b, l, f, i, &length);
assert(buffer != NULL);
@@ -59,7 +59,7 @@ OriginalRequest::OriginalRequest(const TSMBuffer b, const TSMLoc l) : buffer_(b)
assert(url_ != NULL);
const_cast<std::string &>(original.urlScheme) = get(buffer_, url_, TSUrlSchemeGet);
- const_cast<std::string &>(original.urlHost) = get(buffer_, url_, TSUrlHostGet);
+ const_cast<std::string &>(original.urlHost) = get(buffer_, url_, TSUrlHostGet);
// TODO(dmorilha): handle port
/*
diff --git a/plugins/experimental/multiplexer/ts.cc b/plugins/experimental/multiplexer/ts.cc
index 0a53cc9..ba5413b 100644
--- a/plugins/experimental/multiplexer/ts.cc
+++ b/plugins/experimental/multiplexer/ts.cc
@@ -30,7 +30,7 @@ namespace io
IO::read(TSVConn v, TSCont c, const int64_t s)
{
assert(s > 0);
- IO *io = new IO();
+ IO *io = new IO();
io->vio = TSVConnRead(v, c, io->buffer, s);
return io;
}
diff --git a/plugins/experimental/mysql_remap/lib/dictionary.c b/plugins/experimental/mysql_remap/lib/dictionary.c
index 5cb60e4..24ffaa2 100644
--- a/plugins/experimental/mysql_remap/lib/dictionary.c
+++ b/plugins/experimental/mysql_remap/lib/dictionary.c
@@ -159,8 +159,8 @@ dictionary_new(int size)
return NULL;
}
d->size = size;
- d->val = (char **)calloc(size, sizeof(char *));
- d->key = (char **)calloc(size, sizeof(char *));
+ d->val = (char **)calloc(size, sizeof(char *));
+ d->key = (char **)calloc(size, sizeof(char *));
d->hash = (unsigned int *)calloc(size, sizeof(unsigned));
return d;
}
@@ -287,8 +287,8 @@ dictionary_set(dictionary *d, char *key, char *val)
/* See if dictionary needs to grow */
if (d->n == d->size) {
/* Reached maximum size: reallocate dictionary */
- d->val = (char **)mem_double(d->val, d->size * sizeof(char *));
- d->key = (char **)mem_double(d->key, d->size * sizeof(char *));
+ d->val = (char **)mem_double(d->val, d->size * sizeof(char *));
+ d->key = (char **)mem_double(d->key, d->size * sizeof(char *));
d->hash = (unsigned int *)mem_double(d->hash, d->size * sizeof(unsigned));
if ((d->val == NULL) || (d->key == NULL) || (d->hash == NULL)) {
/* Cannot grow dictionary */
@@ -306,8 +306,8 @@ dictionary_set(dictionary *d, char *key, char *val)
}
}
/* Copy key */
- d->key[i] = xstrdup(key);
- d->val[i] = val ? xstrdup(val) : NULL;
+ d->key[i] = xstrdup(key);
+ d->val[i] = val ? xstrdup(val) : NULL;
d->hash[i] = hash;
d->n++;
return 0;
diff --git a/plugins/experimental/mysql_remap/lib/iniparser.c b/plugins/experimental/mysql_remap/lib/iniparser.c
index f47e1ef..007ae78 100644
--- a/plugins/experimental/mysql_remap/lib/iniparser.c
+++ b/plugins/experimental/mysql_remap/lib/iniparser.c
@@ -267,7 +267,7 @@ iniparser_dump_ini(dictionary *d, FILE *f)
}
for (i = 0; i < nsec; i++) {
secname = iniparser_getsecname(d, i);
- seclen = (int)strlen(secname);
+ seclen = (int)strlen(secname);
fprintf(f, "\n[%s]\n", secname);
sprintf(keym, "%s:", secname);
for (j = 0; j < d->size; j++) {
@@ -307,7 +307,7 @@ iniparser_getstring(dictionary *d, const char *key, char *def)
return def;
lc_key = strlwc(key);
- sval = dictionary_get(d, lc_key, def);
+ sval = dictionary_get(d, lc_key, def);
return sval;
}
@@ -538,7 +538,7 @@ iniparser_line(char *input_line, char *section, char *key, char *value)
strcpy(key, strstrip(key));
strcpy(key, strlwc(key));
value[0] = 0;
- sta = LINE_VALUE;
+ sta = LINE_VALUE;
} else {
/* Generate syntax error */
sta = LINE_ERROR;
@@ -574,7 +574,7 @@ iniparser_load(const char *ininame)
int last = 0;
int len;
int lineno = 0;
- int errs = 0;
+ int errs = 0;
dictionary *dict;
diff --git a/plugins/experimental/mysql_remap/mysql_remap.cc b/plugins/experimental/mysql_remap/mysql_remap.cc
index 476a115..f0818b1 100644
--- a/plugins/experimental/mysql_remap/mysql_remap.cc
+++ b/plugins/experimental/mysql_remap/mysql_remap.cc
@@ -42,14 +42,14 @@ do_mysql_remap(TSCont contp, TSHttpTxn txnp)
int request_host_length = 0;
const char *request_scheme;
int request_scheme_length = 0;
- int request_port = 80;
+ int request_port = 80;
char *query;
MYSQL_ROW row;
MYSQL_RES *res;
my_data *data = (my_data *)TSContDataGet(contp);
- query = data->query;
+ query = data->query;
if (TSHttpTxnClientReqGet(txnp, &reqp, &hdr_loc) != TS_SUCCESS) {
TSDebug(PLUGIN_NAME, "could not get request data");
@@ -77,7 +77,7 @@ do_mysql_remap(TSCont contp, TSHttpTxn txnp)
}
request_scheme = TSUrlSchemeGet(reqp, url_loc, &request_scheme_length);
- request_port = TSUrlPortGet(reqp, url_loc);
+ request_port = TSUrlPortGet(reqp, url_loc);
TSDebug(PLUGIN_NAME, " +++++MYSQL REMAP+++++ ");
@@ -152,7 +152,7 @@ release_hdr:
static int
mysql_remap(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
TSEvent reenable = TS_EVENT_HTTP_CONTINUE;
switch (event) {
@@ -186,8 +186,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
my_bool reconnect = 1;
- info.plugin_name = const_cast<char *>(PLUGIN_NAME);
- info.vendor_name = const_cast<char *>("Apache Software Foundation");
+ info.plugin_name = const_cast<char *>(PLUGIN_NAME);
+ info.vendor_name = const_cast<char *>("Apache Software Foundation");
info.support_email = const_cast<char *>("dev@trafficserver.apache.org");
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -206,11 +206,11 @@ TSPluginInit(int argc, const char *argv[])
return;
}
- host = iniparser_getstring(ini, "mysql_remap:mysql_host", (char *)"localhost");
- port = iniparser_getint(ini, "mysql_remap:mysql_port", 3306);
+ host = iniparser_getstring(ini, "mysql_remap:mysql_host", (char *)"localhost");
+ port = iniparser_getint(ini, "mysql_remap:mysql_port", 3306);
username = iniparser_getstring(ini, "mysql_remap:mysql_username", NULL);
password = iniparser_getstring(ini, "mysql_remap:mysql_password", NULL);
- db = iniparser_getstring(ini, "mysql_remap:mysql_database", (char *)"mysql_remap");
+ db = iniparser_getstring(ini, "mysql_remap:mysql_database", (char *)"mysql_remap");
if (mysql_library_init(0, NULL, NULL)) {
TSError("[mysql_remap] Error initializing mysql client library");
diff --git a/plugins/experimental/regex_revalidate/regex_revalidate.c b/plugins/experimental/regex_revalidate/regex_revalidate.c
index a1f728f..2782924 100644
--- a/plugins/experimental/regex_revalidate/regex_revalidate.c
+++ b/plugins/experimental/regex_revalidate/regex_revalidate.c
@@ -78,12 +78,12 @@ typedef struct {
static invalidate_t *
init_invalidate_t(invalidate_t *i)
{
- i->regex_text = NULL;
- i->regex = NULL;
+ i->regex_text = NULL;
+ i->regex = NULL;
i->regex_extra = NULL;
- i->epoch = 0;
- i->expiry = 0;
- i->next = NULL;
+ i->epoch = 0;
+ i->expiry = 0;
+ i->next = NULL;
return i;
}
@@ -115,9 +115,9 @@ static plugin_state_t *
init_plugin_state_t(plugin_state_t *pstate)
{
pstate->invalidate_list = NULL;
- pstate->config_file = NULL;
- pstate->last_load = 0;
- pstate->log = NULL;
+ pstate->config_file = NULL;
+ pstate->last_load = 0;
+ pstate->log = NULL;
return pstate;
}
@@ -140,13 +140,13 @@ copy_invalidate_t(invalidate_t *i)
const char *errptr;
int erroffset;
- iptr = (invalidate_t *)TSmalloc(sizeof(invalidate_t));
- iptr->regex_text = TSstrdup(i->regex_text);
- iptr->regex = pcre_compile(iptr->regex_text, 0, &errptr, &erroffset, NULL); // There is no pcre_copy :-(
- iptr->regex_extra = pcre_study(iptr->regex, 0, &errptr); // Assuming no errors since this worked before :-/
- iptr->epoch = i->epoch;
- iptr->expiry = i->expiry;
- iptr->next = NULL;
+ iptr = (invalidate_t *)TSmalloc(sizeof(invalidate_t));
+ iptr->regex_text = TSstrdup(i->regex_text);
+ iptr->regex = pcre_compile(iptr->regex_text, 0, &errptr, &erroffset, NULL); // There is no pcre_copy :-(
+ iptr->regex_extra = pcre_study(iptr->regex, 0, &errptr); // Assuming no errors since this worked before :-/
+ iptr->epoch = i->epoch;
+ iptr->expiry = i->expiry;
+ iptr->next = NULL;
return iptr;
}
@@ -162,8 +162,8 @@ copy_config(invalidate_t *old_list)
iptr_new = new_list;
while (iptr_old) {
iptr_new->next = copy_invalidate_t(iptr_old);
- iptr_new = iptr_new->next;
- iptr_old = iptr_old->next;
+ iptr_new = iptr_new->next;
+ iptr_old = iptr_old->next;
}
}
@@ -180,7 +180,7 @@ prune_config(invalidate_t **i)
now = time(NULL);
if (*i) {
- iptr = *i;
+ iptr = *i;
ilast = NULL;
while (iptr) {
if (difftime(iptr->expiry, now) < 0) {
@@ -197,7 +197,7 @@ prune_config(invalidate_t **i)
pruned = true;
} else {
ilast = iptr;
- iptr = iptr->next;
+ iptr = iptr->next;
}
}
}
@@ -221,7 +221,7 @@ load_config(plugin_state_t *pstate, invalidate_t **ilist)
if (pstate->config_file[0] != '/') {
path_len = strlen(TSConfigDirGet()) + strlen(pstate->config_file) + 2;
- path = alloca(path_len);
+ path = alloca(path_len);
snprintf(path, path_len, "%s/%s", TSConfigDirGet(), pstate->config_file);
} else
path = pstate->config_file;
@@ -244,9 +244,9 @@ load_config(plugin_state_t *pstate, invalidate_t **ilist)
i = (invalidate_t *)TSmalloc(sizeof(invalidate_t));
init_invalidate_t(i);
pcre_get_substring(line, ovector, rc, 1, &i->regex_text);
- i->epoch = now;
+ i->epoch = now;
i->expiry = atoi(line + ovector[4]);
- i->regex = pcre_compile(i->regex_text, 0, &errptr, &erroffset, NULL);
+ i->regex = pcre_compile(i->regex_text, 0, &errptr, &erroffset, NULL);
if (i->expiry <= i->epoch) {
TSDebug(LOG_PREFIX, "Rule is already expired!");
free_invalidate_t(i);
@@ -264,7 +264,7 @@ load_config(plugin_state_t *pstate, invalidate_t **ilist)
if (strcmp(i->regex_text, iptr->regex_text) == 0) {
if (iptr->expiry != i->expiry) {
TSDebug(LOG_PREFIX, "Updating duplicate %s", i->regex_text);
- iptr->epoch = i->epoch;
+ iptr->epoch = i->epoch;
iptr->expiry = i->expiry;
}
free_invalidate_t(i);
@@ -338,7 +338,7 @@ config_handler(TSCont cont, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)
TSDebug(LOG_PREFIX, "In config Handler");
pstate = (plugin_state_t *)TSContDataGet(cont);
- i = copy_config(pstate->invalidate_list);
+ i = copy_config(pstate->invalidate_list);
updated = prune_config(&i);
updated = load_config(pstate, &i) || updated;
@@ -390,7 +390,7 @@ main_handler(TSCont cont, TSEvent event, void *edata)
plugin_state_t *pstate;
time_t date = 0, now = 0;
- char *url = NULL;
+ char *url = NULL;
int url_len = 0;
switch (event) {
@@ -398,11 +398,11 @@ main_handler(TSCont cont, TSEvent event, void *edata)
if (TSHttpTxnCacheLookupStatusGet(txn, &status) == TS_SUCCESS) {
if (status == TS_CACHE_LOOKUP_HIT_FRESH) {
pstate = (plugin_state_t *)TSContDataGet(cont);
- iptr = pstate->invalidate_list;
+ iptr = pstate->invalidate_list;
while (iptr) {
if (!date) {
date = get_date_from_cached_hdr(txn);
- now = time(NULL);
+ now = time(NULL);
}
if ((difftime(iptr->epoch, date) >= 0) && (difftime(iptr->expiry, now) >= 0)) {
if (!url)
@@ -466,7 +466,7 @@ TSPluginInit(int argc, const char *argv[])
init_plugin_state_t(pstate);
int c;
- optind = 1;
+ optind = 1;
static const struct option longopts[] = {
{"config", required_argument, NULL, 'c'}, {"log", required_argument, NULL, 'l'}, {NULL, 0, NULL, 0}};
@@ -499,8 +499,8 @@ TSPluginInit(int argc, const char *argv[])
list_config(pstate, iptr);
}
- info.plugin_name = LOG_PREFIX;
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = LOG_PREFIX;
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -518,7 +518,7 @@ TSPluginInit(int argc, const char *argv[])
}
pcre_malloc = &ts_malloc;
- pcre_free = &ts_free;
+ pcre_free = &ts_free;
main_cont = TSContCreate(main_handler, NULL);
TSContDataSet(main_cont, (void *)pstate);
diff --git a/plugins/experimental/remap_stats/remap_stats.c b/plugins/experimental/remap_stats/remap_stats.c
index 9e9a0b1..d5d3f9a 100644
--- a/plugins/experimental/remap_stats/remap_stats.c
+++ b/plugins/experimental/remap_stats/remap_stats.c
@@ -56,7 +56,7 @@ stat_add(char *name, TSMgmtInt amount, TSStatPersistence persist_type, TSMutex c
TSDebug(DEBUG_TAG, "stat cache hash init");
}
- search.key = name;
+ search.key = name;
search.data = 0;
hsearch_r(search, FIND, &result, &stat_cache);
@@ -75,7 +75,7 @@ stat_add(char *name, TSMgmtInt amount, TSStatPersistence persist_type, TSMutex c
TSMutexUnlock(create_mutex);
if (stat_id >= 0) {
- search.key = TSstrdup(name);
+ search.key = TSstrdup(name);
search.data = (void *)((intptr_t)stat_id);
hsearch_r(search, ENTER, &result, &stat_cache);
TSDebug(DEBUG_TAG, "Cached stat_name: %s stat_id: %d", name, stat_id);
@@ -99,13 +99,13 @@ get_effective_host(TSHttpTxn txn)
TSMLoc url_loc;
effective_url = TSHttpTxnEffectiveUrlStringGet(txn, &len);
- buf = TSMBufferCreate();
+ buf = TSMBufferCreate();
TSUrlCreate(buf, &url_loc);
tmp = effective_url;
TSUrlParse(buf, url_loc, (const char **)(&tmp), (const char *)(effective_url + len));
TSfree(effective_url);
host = TSUrlHostGet(buf, url_loc, &len);
- tmp = TSstrndup(host, len);
+ tmp = TSstrndup(host, len);
TSHandleMLocRelease(buf, TS_NULL_MLOC, url_loc);
TSMBufferDestroy(buf);
return tmp;
@@ -119,7 +119,7 @@ handle_read_req_hdr(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
void *txnd;
config = (config_t *)TSContDataGet(cont);
- txnd = (void *)get_effective_host(txn); // low bit left 0 because we do not know that remap succeeded yet
+ txnd = (void *)get_effective_host(txn); // low bit left 0 because we do not know that remap succeeded yet
TSHttpTxnArgSet(txn, config->txn_slot, txnd);
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
@@ -165,7 +165,7 @@ handle_txn_close(TSCont cont, TSEvent event ATS_UNUSED, void *edata)
char stat_name[MAX_STAT_LENGTH];
config = (config_t *)TSContDataGet(cont);
- txnd = TSHttpTxnArgGet(txn, config->txn_slot);
+ txnd = TSHttpTxnArgGet(txn, config->txn_slot);
hostname = (char *)((uintptr_t)txnd & (~((uintptr_t)0x01))); // Get hostname
@@ -233,8 +233,8 @@ TSPluginInit(int argc, const char *argv[])
TSCont pre_remap_cont, post_remap_cont, global_cont;
config_t *config;
- info.plugin_name = PLUGIN_NAME;
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = PLUGIN_NAME;
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -244,14 +244,14 @@ TSPluginInit(int argc, const char *argv[])
} else
TSDebug(DEBUG_TAG, "Plugin registration succeeded.");
- config = TSmalloc(sizeof(config_t));
- config->post_remap_host = false;
- config->persist_type = TS_STAT_NON_PERSISTENT;
+ config = TSmalloc(sizeof(config_t));
+ config->post_remap_host = false;
+ config->persist_type = TS_STAT_NON_PERSISTENT;
config->stat_creation_mutex = TSMutexCreate();
if (argc > 1) {
int c;
- optind = 1;
+ optind = 1;
static const struct option longopts[] = {
{"post-remap-host", no_argument, NULL, 'P'}, {"persistent", no_argument, NULL, 'p'}, {NULL, 0, NULL, 0}};
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/experimental/s3_auth/s3_auth.cc
index a6b9e3b..48e4df2 100644
--- a/plugins/experimental/s3_auth/s3_auth.cc
+++ b/plugins/experimental/s3_auth/s3_auth.cc
@@ -38,7 +38,7 @@
// Some constants.
//
static const char PLUGIN_NAME[] = "s3_auth";
-static const char DATE_FMT[] = "%a, %d %b %Y %H:%M:%S %z";
+static const char DATE_FMT[] = "%a, %d %b %Y %H:%M:%S %z";
///////////////////////////////////////////////////////////////////////////////
// One configuration setup
@@ -101,14 +101,14 @@ public:
set_secret(const char *s)
{
TSfree(_secret);
- _secret = TSstrdup(s);
+ _secret = TSstrdup(s);
_secret_len = strlen(s);
}
void
set_keyid(const char *s)
{
TSfree(_keyid);
- _keyid = TSstrdup(s);
+ _keyid = TSstrdup(s);
_keyid_len = strlen(s);
}
void
@@ -251,7 +251,7 @@ S3Request::set_header(const char *header, int header_len, const char *val, int v
return false;
}
- bool ret = false;
+ bool ret = false;
TSMLoc field_loc = TSMimeHdrFieldFind(_bufp, _hdr_loc, header, header_len);
if (!field_loc) {
@@ -357,7 +357,7 @@ S3Request::authorize(S3Config *s3)
if (s3->virt_host()) {
host_loc = TSMimeHdrFieldFind(_bufp, _hdr_loc, TS_MIME_FIELD_HOST, TS_MIME_LEN_HOST);
if (host_loc) {
- host = TSMimeHdrFieldValueStringGet(_bufp, _hdr_loc, host_loc, -1, &host_len);
+ host = TSMimeHdrFieldValueStringGet(_bufp, _hdr_loc, host_loc, -1, &host_len);
host_endp = static_cast<const char *>(memchr(host, '.', host_len));
} else {
return TS_HTTP_STATUS_INTERNAL_SERVER_ERROR;
@@ -390,9 +390,9 @@ S3Request::authorize(S3Config *s3)
TSDebug(PLUGIN_NAME, "%.*s", date_len, date);
- const size_t left_size = 1024;
+ const size_t left_size = 1024;
char left[left_size + 1] = "/";
- size_t loff = 1;
+ size_t loff = 1;
// ToDo: What to do with the CanonicalizedAmzHeaders ...
if (host && host_endp) {
diff --git a/plugins/experimental/ssl_cert_loader/domain-tree.cc b/plugins/experimental/ssl_cert_loader/domain-tree.cc
index fc796f5..06ce550 100644
--- a/plugins/experimental/ssl_cert_loader/domain-tree.cc
+++ b/plugins/experimental/ssl_cert_loader/domain-tree.cc
@@ -31,12 +31,12 @@ bool
DomainNameTree::DomainNameNode::compare(std::string key, int &relative)
{
size_t star_loc = key.find("*");
- bool is_wild = false;
+ bool is_wild = false;
if (star_loc != std::string::npos) {
star_loc++;
is_wild = true;
- key = key.substr(star_loc);
+ key = key.substr(star_loc);
}
return this->prunedCompare(key, relative, is_wild);
@@ -88,16 +88,16 @@ DomainNameTree::DomainNameNode *
DomainNameTree::find(std::string key, bool best_match)
{
DomainNameNode *retval = NULL;
- DomainNameNode *first = NULL;
- size_t star_loc = key.find("*");
- bool is_wild = false;
+ DomainNameNode *first = NULL;
+ size_t star_loc = key.find("*");
+ bool is_wild = false;
if (star_loc != std::string::npos) {
- key = key.substr(star_loc + 1);
+ key = key.substr(star_loc + 1);
is_wild = true;
}
- bool set_iter = false;
+ bool set_iter = false;
DomainNameNode *current_node = root;
std::deque<DomainNameNode *>::iterator sibPtr, endPtr;
@@ -114,7 +114,7 @@ DomainNameTree::find(std::string key, bool best_match)
current_node = NULL;
break;
} else if (relative < 0) {
- retval = current_node;
+ retval = current_node;
partial_match = true;
if (NULL == first || retval->order < first->order) {
first = retval;
@@ -123,8 +123,8 @@ DomainNameTree::find(std::string key, bool best_match)
}
if (partial_match) {
// Check out the children, maybe there is something better there
- sibPtr = current_node->children.begin();
- endPtr = current_node->children.end();
+ sibPtr = current_node->children.begin();
+ endPtr = current_node->children.end();
set_iter = true;
if (sibPtr == endPtr) {
break; // We are done
@@ -148,16 +148,16 @@ DomainNameTree::insert(std::string key, void *payload, int order)
{
TSMutexLock(this->tree_mutex);
DomainNameNode *retval = NULL;
- DomainNameNode *node = this->findBestMatch(key);
+ DomainNameNode *node = this->findBestMatch(key);
int relative;
if (node->compare(key, relative)) {
size_t star_loc = key.find("*");
- bool is_wild = false;
+ bool is_wild = false;
if (star_loc != std::string::npos) {
star_loc++;
- key = key.substr(star_loc);
+ key = key.substr(star_loc);
is_wild = true;
}
if (relative < 0) {
@@ -186,10 +186,10 @@ DomainNameTree::insert(std::string key, void *payload, int order)
// Will not replace in the equal case
// Unless this is the root node
if (node->key == "" && node->order == 0x7fffffff) {
- node->key = key;
+ node->key = key;
node->payload = payload;
- node->order = order;
- retval = node;
+ node->order = order;
+ retval = node;
}
}
}
diff --git a/plugins/experimental/ssl_cert_loader/domain-tree.h b/plugins/experimental/ssl_cert_loader/domain-tree.h
index 417a5df..a5697bd 100644
--- a/plugins/experimental/ssl_cert_loader/domain-tree.h
+++ b/plugins/experimental/ssl_cert_loader/domain-tree.h
@@ -63,11 +63,11 @@ public:
DomainNameTree()
{
- root = new DomainNameNode();
- root->key = "";
- root->order = 0x7FFFFFFF;
+ root = new DomainNameNode();
+ root->key = "";
+ root->order = 0x7FFFFFFF;
root->is_wild = true;
- tree_mutex = TSMutexCreate();
+ tree_mutex = TSMutexCreate();
}
~DomainNameTree() { delete root; }
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index 02b572b..f52a2ed 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -90,7 +90,7 @@ Parse_Addr_String(ts::ConstBuffer const &text, IpRange &range)
range.second.load(ts::ConstBuffer(addr2.c_str(), addr2.length()));
} else { // Assume it is a single address
newAddr.load(text);
- range.first = newAddr;
+ range.first = newAddr;
range.second = newAddr;
}
}
@@ -134,7 +134,7 @@ Load_Configuration()
}
Value root = Config.getRoot();
- Value val = root["runtime-table-size"];
+ Value val = root["runtime-table-size"];
if (val.isLiteral()) {
// Not evicting yet
}
@@ -151,12 +151,12 @@ SSL_CTX *
Load_Certificate(SslEntry const *entry, std::deque<std::string> &names)
{
SSL_CTX *retval = SSL_CTX_new(SSLv23_client_method());
- X509 *cert = NULL;
+ X509 *cert = NULL;
if (entry->certFileName.length() > 0) {
// Must load the cert file to fetch the names out later
BIO *cert_bio = BIO_new_file(entry->certFileName.c_str(), "r");
- cert = PEM_read_bio_X509_AUX(cert_bio, NULL, NULL, NULL);
+ cert = PEM_read_bio_X509_AUX(cert_bio, NULL, NULL, NULL);
BIO_free(cert_bio);
if (SSL_CTX_use_certificate(retval, cert) < 1) {
@@ -336,7 +336,7 @@ Load_Certificate_Thread(void *arg)
TSVConn vc = entry->waitingVConns.back();
entry->waitingVConns.pop_back();
TSSslConnection sslobj = TSVConnSSLConnectionGet(vc);
- SSL *ssl = reinterpret_cast<SSL *>(sslobj);
+ SSL *ssl = reinterpret_cast<SSL *>(sslobj);
SSL_set_SSL_CTX(ssl, entry->ctx);
TSVConnReenable(vc);
}
@@ -382,8 +382,8 @@ CB_Pre_Accept(TSCont /*contp*/, TSEvent event, void *edata)
if (Lookup.ipmap.contains(&key_endpoint, &payload)) {
// Set the stored cert on this SSL object
TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc);
- SSL *ssl = reinterpret_cast<SSL *>(sslobj);
- SslEntry *entry = reinterpret_cast<SslEntry *>(payload);
+ SSL *ssl = reinterpret_cast<SSL *>(sslobj);
+ SslEntry *entry = reinterpret_cast<SslEntry *>(payload);
TSMutexLock(entry->mutex);
if (entry->op == TS_SSL_HOOK_OP_TUNNEL || entry->op == TS_SSL_HOOK_OP_TERMINATE) {
// Push everything to blind tunnel, or terminate
@@ -421,9 +421,9 @@ CB_Pre_Accept(TSCont /*contp*/, TSEvent event, void *edata)
int
CB_servername(TSCont /*contp*/, TSEvent /*event*/, void *edata)
{
- TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
+ TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc);
- SSL *ssl = reinterpret_cast<SSL *>(sslobj);
+ SSL *ssl = reinterpret_cast<SSL *>(sslobj);
const char *servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
TSDebug(PN, "SNI callback %s", servername);
@@ -475,14 +475,14 @@ TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
- TSCont cb_pa = 0; // pre-accept callback continuation
- TSCont cb_lc = 0; // life cycle callback continuuation
- TSCont cb_sni = 0; // SNI callback continuuation
+ TSCont cb_pa = 0; // pre-accept callback continuation
+ TSCont cb_lc = 0; // life cycle callback continuuation
+ TSCont cb_sni = 0; // SNI callback continuuation
static const struct option longopt[] = {{const_cast<char *>("config"), required_argument, NULL, 'c'},
{NULL, no_argument, NULL, '\0'}};
- info.plugin_name = const_cast<char *>("SSL Certificate Loader");
- info.vendor_name = const_cast<char *>("Network Geographics");
+ info.plugin_name = const_cast<char *>("SSL Certificate Loader");
+ info.vendor_name = const_cast<char *>("Network Geographics");
info.support_email = const_cast<char *>("shinrich@network-geographics.com");
int opt = 0;
@@ -497,7 +497,7 @@ TSPluginInit(int argc, const char *argv[])
}
if (ConfigPath.length() == 0) {
static char const *const DEFAULT_CONFIG_PATH = "ssl_start.cfg";
- ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
+ ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
TSDebug(PN, "No config path set in arguments, using default: %s", DEFAULT_CONFIG_PATH);
}
diff --git a/plugins/experimental/sslheaders/expand.cc b/plugins/experimental/sslheaders/expand.cc
index 128faf9..870ef75 100644
--- a/plugins/experimental/sslheaders/expand.cc
+++ b/plugins/experimental/sslheaders/expand.cc
@@ -71,8 +71,8 @@ static void
x509_expand_signature(X509 *x509, BIO *bio)
{
ASN1_BIT_STRING *sig = x509->signature;
- const char *ptr = (const char *)sig->data;
- const char *end = ptr + sig->length;
+ const char *ptr = (const char *)sig->data;
+ const char *end = ptr + sig->length;
// The canonical OpenSSL way to format the signature seems to be
// X509_signature_dump(). However that separates each byte with a ':', which is
diff --git a/plugins/experimental/sslheaders/sslheaders.cc b/plugins/experimental/sslheaders/sslheaders.cc
index 196f590..f2c7d56 100644
--- a/plugins/experimental/sslheaders/sslheaders.cc
+++ b/plugins/experimental/sslheaders/sslheaders.cc
@@ -220,8 +220,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
SslHdrInstance *hdr;
- info.plugin_name = (char *)"sslheaders";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"sslheaders";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/sslheaders/test_sslheaders.cc b/plugins/experimental/sslheaders/test_sslheaders.cc
index 6c44b55..99d8881 100644
--- a/plugins/experimental/sslheaders/test_sslheaders.cc
+++ b/plugins/experimental/sslheaders/test_sslheaders.cc
@@ -154,7 +154,7 @@ make_pem_header(const char *pem)
unsigned remain;
hdr = ptr = strdup(pem);
- remain = strlen(hdr);
+ remain = strlen(hdr);
for (char *nl; (nl = (char *)memchr(ptr, '\n', remain)); ptr = nl) {
*nl = ' ';
@@ -204,8 +204,8 @@ REGRESSION_TEST(ParseX509Fields)(RegressionTest *t, int /* atype ATS_UNUSED */,
box = REGRESSION_TEST_PASSED;
- BIO *exp = BIO_new(BIO_s_mem());
- BIO *bio = BIO_new_mem_buf((void *)test_certificate, -1);
+ BIO *exp = BIO_new(BIO_s_mem());
+ BIO *bio = BIO_new_mem_buf((void *)test_certificate, -1);
X509 *x509 = PEM_read_bio_X509(bio, NULL, 0, NULL);
box.check(x509 != NULL, "failed to load the test certificate");
diff --git a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
index 341a710..2e0f9fb 100644
--- a/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
+++ b/plugins/experimental/stale_while_revalidate/stale_while_revalidate.c
@@ -37,8 +37,8 @@
#define PLUGIN_NAME "stale_while_revalidate"
static const char HTTP_VALUE_STALE_WHILE_REVALIDATE[] = "stale-while-revalidate";
-static const char HTTP_VALUE_STALE_IF_ERROR[] = "stale-if-error";
-static const char HTTP_VALUE_STALE_WARNING[] = "110 Response is stale";
+static const char HTTP_VALUE_STALE_IF_ERROR[] = "stale-if-error";
+static const char HTTP_VALUE_STALE_WARNING[] = "110 Response is stale";
typedef struct {
TSTextLogObject object;
@@ -94,10 +94,10 @@ create_response_info(void)
resp_info = (ResponseInfo *)TSmalloc(sizeof(ResponseInfo));
- resp_info->buf = TSMBufferCreate();
+ resp_info->buf = TSMBufferCreate();
resp_info->http_hdr_loc = TSHttpHdrCreate(resp_info->buf);
- resp_info->parser = TSHttpParserCreate();
- resp_info->parsed = false;
+ resp_info->parser = TSHttpParserCreate();
+ resp_info->parsed = false;
return resp_info;
}
@@ -122,7 +122,7 @@ create_request_info(TSHttpTxn txn)
req_info = (RequestInfo *)TSmalloc(sizeof(RequestInfo));
- url = TSHttpTxnEffectiveUrlStringGet(txn, &url_len);
+ url = TSHttpTxnEffectiveUrlStringGet(txn, &url_len);
req_info->effective_url = TSstrndup(url, url_len);
TSfree(url);
@@ -156,11 +156,11 @@ get_cached_header_info(TSHttpTxn txn)
int cr_cache_control_count, val_len, i;
char *value, *ptr;
- chi = (CachedHeaderInfo *)TSmalloc(sizeof(CachedHeaderInfo));
- chi->date = 0;
- chi->max_age = 0;
+ chi = (CachedHeaderInfo *)TSmalloc(sizeof(CachedHeaderInfo));
+ chi->date = 0;
+ chi->max_age = 0;
chi->stale_while_revalidate = 0;
- chi->stale_on_error = 0;
+ chi->stale_on_error = 0;
if (TSHttpTxnCachedRespGet(txn, &cr_buf, &cr_hdr_loc) == TS_SUCCESS) {
cr_date_loc = TSMimeHdrFieldFind(cr_buf, cr_hdr_loc, TS_MIME_FIELD_DATE, TS_MIME_LEN_DATE);
@@ -178,7 +178,7 @@ get_cached_header_info(TSHttpTxn txn)
for (i = 0; i < cr_cache_control_count; i++) {
value = (char *)TSMimeHdrFieldValueStringGet(cr_buf, cr_hdr_loc, cr_cache_control_loc, i, &val_len);
- ptr = value;
+ ptr = value;
if (strncmp(value, TS_HTTP_VALUE_MAX_AGE, TS_HTTP_LEN_MAX_AGE) == 0) {
TSDebug(PLUGIN_NAME, "Found max-age");
@@ -435,9 +435,9 @@ fetch_resource(TSCont cont, TSEvent event ATS_UNUSED, void *edata ATS_UNUSED)
*/
TSDebug(PLUGIN_NAME, "Create Buffers");
- state->req_io_buf = TSIOBufferCreate();
- state->req_io_buf_reader = TSIOBufferReaderAlloc(state->req_io_buf);
- state->resp_io_buf = TSIOBufferCreate();
+ state->req_io_buf = TSIOBufferCreate();
+ state->req_io_buf_reader = TSIOBufferReaderAlloc(state->req_io_buf);
+ state->resp_io_buf = TSIOBufferCreate();
state->resp_io_buf_reader = TSIOBufferReaderAlloc(state->resp_io_buf);
TSHttpHdrPrint(state->req_info->buf, state->req_info->http_hdr_loc, state->req_io_buf);
@@ -476,8 +476,8 @@ main_plugin(TSCont cont, TSEvent event, void *edata)
if (TSHttpTxnIsInternal(txn) != TS_SUCCESS) {
TSDebug(PLUGIN_NAME, "External Request");
- plugin_config = (config_t *)TSContDataGet(cont);
- state = TSmalloc(sizeof(StateInfo));
+ plugin_config = (config_t *)TSContDataGet(cont);
+ state = TSmalloc(sizeof(StateInfo));
state->plugin_config = plugin_config;
time(&state->txn_start);
state->req_info = create_request_info(txn);
@@ -497,7 +497,7 @@ main_plugin(TSCont cont, TSEvent event, void *edata)
break;
case TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE:
plugin_config = (config_t *)TSContDataGet(cont);
- state = (StateInfo *)TSHttpTxnArgGet(txn, plugin_config->txn_slot);
+ state = (StateInfo *)TSHttpTxnArgGet(txn, plugin_config->txn_slot);
TSHttpTxnCacheLookupCountGet(txn, &lookup_count);
if (TSHttpTxnCacheLookupStatusGet(txn, &status) == TS_SUCCESS) {
// Are we stale?
@@ -539,9 +539,9 @@ main_plugin(TSCont cont, TSEvent event, void *edata)
#endif
// lookup sync
state->async_req = false;
- state->txn = txn;
+ state->txn = txn;
state->main_cont = cont; // we need this for the warning header callback. not sure i like it, but it works.
- fetch_cont = TSContCreate(fetch_resource, TSMutexCreate());
+ fetch_cont = TSContCreate(fetch_resource, TSMutexCreate());
TSContDataSet(fetch_cont, (void *)state);
TSContSchedule(fetch_cont, 0, TS_THREAD_POOL_NET);
} else {
@@ -612,8 +612,8 @@ TSPluginInit(int argc, const char *argv[])
TSPluginRegistrationInfo info;
TSCont main_cont;
- info.plugin_name = PLUGIN_NAME;
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = PLUGIN_NAME;
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -626,18 +626,18 @@ TSPluginInit(int argc, const char *argv[])
plugin_config = TSmalloc(sizeof(config_t));
- plugin_config->troot = NULL;
- plugin_config->troot_mutex = TSMutexCreate();
- plugin_config->stale_if_error_override = 0;
- plugin_config->log_info.object = NULL;
- plugin_config->log_info.all = false;
- plugin_config->log_info.stale_if_error = false;
+ plugin_config->troot = NULL;
+ plugin_config->troot_mutex = TSMutexCreate();
+ plugin_config->stale_if_error_override = 0;
+ plugin_config->log_info.object = NULL;
+ plugin_config->log_info.all = false;
+ plugin_config->log_info.stale_if_error = false;
plugin_config->log_info.stale_while_revalidate = false;
- plugin_config->log_info.filename = PLUGIN_NAME;
+ plugin_config->log_info.filename = PLUGIN_NAME;
if (argc > 1) {
int c;
- optind = 1;
+ optind = 1;
static const struct option longopts[] = {{"log-all", no_argument, NULL, 'a'},
{"log-stale-while-revalidate", no_argument, NULL, 'r'},
{"log-stale-if-error", no_argument, NULL, 'e'},
diff --git a/plugins/experimental/stream_editor/stream_editor.cc b/plugins/experimental/stream_editor/stream_editor.cc
index 78d8911..efa4452 100644
--- a/plugins/experimental/stream_editor/stream_editor.cc
+++ b/plugins/experimental/stream_editor/stream_editor.cc
@@ -271,9 +271,9 @@ public:
{
const char *match = icase ? strcasestr(buf, str) : strstr(buf, str);
if (match) {
- found = match - buf;
+ found = match - buf;
found_len = slen;
- repl = to;
+ repl = to;
return (found + slen > len) ? false : true;
} else {
return false;
@@ -307,7 +307,7 @@ public:
if (regexec(&rx, buf, MAX_RX_MATCH, pmatch, REG_NOTEOL) == 0) {
char c;
int n;
- found = pmatch[0].rm_so;
+ found = pmatch[0].rm_so;
found_len = pmatch[0].rm_eo - found;
while (c = *tmpl++, c != '\0') {
switch (c) {
@@ -382,12 +382,12 @@ public:
rule_t(const char *line) : scope(NULL), priority(5), from(NULL), to(NULL), refcount(NULL)
{
const char *scope_spec = strcasestr(line, "scope:");
- const char *from_spec = strcasestr(line, "from:");
- const char *to_spec = strcasestr(line, "to:");
- const char *prio_spec = strcasestr(line, "prio:");
- const char *len_spec = strcasestr(line, "len:");
- bool icase = false;
- bool rx = false;
+ const char *from_spec = strcasestr(line, "from:");
+ const char *to_spec = strcasestr(line, "to:");
+ const char *prio_spec = strcasestr(line, "prio:");
+ const char *len_spec = strcasestr(line, "len:");
+ bool icase = false;
+ bool rx = false;
bool uri;
size_t len, match_len;
char delim;
@@ -443,8 +443,8 @@ public:
if (scope_spec) {
icase = false;
- rx = false;
- uri = true;
+ rx = false;
+ uri = true;
for (scope_spec += 6; *scope_spec != ':'; ++scope_spec) {
switch (*scope_spec) {
case 'i':
@@ -584,20 +584,20 @@ process_block(contdata_t *contdata, TSIOBufferReader reader)
TSIOBufferBlock block;
if (reader == NULL) { // We're just flushing anything we have buffered
- keep = 0;
- buf = contdata->contbuf.c_str();
+ keep = 0;
+ buf = contdata->contbuf.c_str();
buflen = contdata->contbuf.length();
nbytes = 0;
} else {
block = TSIOBufferReaderStart(reader);
- buf = TSIOBufferBlockReadStart(block, reader, &nbytes);
+ buf = TSIOBufferBlockReadStart(block, reader, &nbytes);
if (contdata->contbuf.empty()) {
/* Use the data as-is */
buflen = nbytes;
} else {
contdata->contbuf.append(buf, nbytes);
- buf = contdata->contbuf.c_str();
+ buf = contdata->contbuf.c_str();
buflen = contdata->contbuf.length();
}
keep = contdata->contbuf_sz;
@@ -661,13 +661,13 @@ streamedit_process(TSCont contp)
// Loop over edits, and apply them to the stream
// Retain buffered data at the end
int64_t ntodo, nbytes;
- contdata_t *contdata = (contdata_t *)TSContDataGet(contp);
- TSVIO input_vio = TSVConnWriteVIOGet(contp);
+ contdata_t *contdata = (contdata_t *)TSContDataGet(contp);
+ TSVIO input_vio = TSVConnWriteVIOGet(contp);
TSIOBufferReader input_rd = TSVIOReaderGet(input_vio);
if (contdata->out_buf == NULL) {
contdata->out_buf = TSIOBufferCreate();
- contdata->out_rd = TSIOBufferReaderAlloc(contdata->out_buf);
+ contdata->out_rd = TSIOBufferReaderAlloc(contdata->out_buf);
contdata->out_vio = TSVConnWrite(TSTransformOutputVConnGet(contp), contp, contdata->out_rd, INT64_MAX);
}
@@ -748,8 +748,8 @@ streamedit_filter(TSCont contp, TSEvent event, void *edata)
static int
streamedit_setup(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txn = (TSHttpTxn)edata;
- ruleset_t *rules_in = (ruleset_t *)TSContDataGet(contp);
+ TSHttpTxn txn = (TSHttpTxn)edata;
+ ruleset_t *rules_in = (ruleset_t *)TSContDataGet(contp);
contdata_t *contdata = NULL;
assert((event == TS_EVENT_HTTP_READ_RESPONSE_HDR) || (event == TS_EVENT_HTTP_READ_REQUEST_HDR));
@@ -820,11 +820,11 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
TSCont inputcont, outputcont;
- ruleset_t *rewrites_in = NULL;
+ ruleset_t *rewrites_in = NULL;
ruleset_t *rewrites_out = NULL;
- info.plugin_name = (char *)"stream-editor";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"stream-editor";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"users@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/experimental/ts_lua/ts_lua.c b/plugins/experimental/ts_lua/ts_lua.c
index 8f4de32..c4e3a6a 100644
--- a/plugins/experimental/ts_lua/ts_lua.c
+++ b/plugins/experimental/ts_lua/ts_lua.c
@@ -24,7 +24,7 @@
#define TS_LUA_MAX_STATE_COUNT 256
-static uint64_t ts_lua_http_next_id = 0;
+static uint64_t ts_lua_http_next_id = 0;
static uint64_t ts_lua_g_http_next_id = 0;
static ts_lua_main_ctx *ts_lua_main_ctx_array;
@@ -132,7 +132,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
ts_lua_instance_conf *instance_conf;
instance_conf = (ts_lua_instance_conf *)ih;
- req_id = __sync_fetch_and_add(&ts_lua_http_next_id, 1);
+ req_id = __sync_fetch_and_add(&ts_lua_http_next_id, 1);
main_ctx = &ts_lua_main_ctx_array[req_id % TS_LUA_MAX_STATE_COUNT];
@@ -140,16 +140,16 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
http_ctx = ts_lua_create_http_ctx(main_ctx, instance_conf);
- http_ctx->txnp = rh;
+ http_ctx->txnp = rh;
http_ctx->client_request_bufp = rri->requestBufp;
http_ctx->client_request_hdrp = rri->requestHdrp;
- http_ctx->client_request_url = rri->requestUrl;
- http_ctx->rri = rri;
- http_ctx->remap = 1;
- http_ctx->has_hook = 0;
+ http_ctx->client_request_url = rri->requestUrl;
+ http_ctx->rri = rri;
+ http_ctx->remap = 1;
+ http_ctx->has_hook = 0;
ci = &http_ctx->cinfo;
- L = ci->routine.lua;
+ L = ci->routine.lua;
contp = TSContCreate(ts_lua_http_cont_handler, NULL);
TSContDataSet(contp, http_ctx);
@@ -215,10 +215,10 @@ globalHookHandler(TSCont contp, TSEvent event ATS_UNUSED, void *edata)
TSDebug(TS_LUA_DEBUG_TAG, "[%s] req_id: %" PRId64, __FUNCTION__, req_id);
TSMutexLock(main_ctx->mutexp);
- http_ctx = ts_lua_create_http_ctx(main_ctx, conf);
- http_ctx->txnp = txnp;
- http_ctx->rri = NULL;
- http_ctx->remap = 0;
+ http_ctx = ts_lua_create_http_ctx(main_ctx, conf);
+ http_ctx->txnp = txnp;
+ http_ctx->rri = NULL;
+ http_ctx->remap = 0;
http_ctx->has_hook = 0;
if (!http_ctx->client_request_bufp) {
@@ -243,7 +243,7 @@ globalHookHandler(TSCont contp, TSEvent event ATS_UNUSED, void *edata)
txn_contp = TSContCreate(ts_lua_http_cont_handler, NULL);
TSContDataSet(txn_contp, http_ctx);
- ci = &http_ctx->cinfo;
+ ci = &http_ctx->cinfo;
ci->contp = txn_contp;
ci->mutex = TSContMutexGet((TSCont)txnp);
@@ -348,15 +348,15 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = "ts_lua";
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = "ts_lua";
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
TSError("[ts_lua] Plugin registration failed.");
}
- int ret = 0;
+ int ret = 0;
ts_lua_g_main_ctx_array = TSmalloc(sizeof(ts_lua_main_ctx) * TS_LUA_MAX_STATE_COUNT);
memset(ts_lua_g_main_ctx_array, 0, sizeof(ts_lua_main_ctx) * TS_LUA_MAX_STATE_COUNT);
@@ -410,7 +410,7 @@ TSPluginInit(int argc, const char *argv[])
// adding hook based on whether the lua global function exists.
ts_lua_main_ctx *main_ctx = &ts_lua_g_main_ctx_array[0];
ts_lua_http_ctx *http_ctx = ts_lua_create_http_ctx(main_ctx, conf);
- lua_State *l = http_ctx->cinfo.routine.lua;
+ lua_State *l = http_ctx->cinfo.routine.lua;
lua_getglobal(l, TS_LUA_FUNCTION_G_SEND_REQUEST);
if (lua_type(l, -1) == LUA_TFUNCTION) {
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c b/plugins/experimental/ts_lua/ts_lua_client_request.c
index b829a8c..571dd35 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
@@ -186,7 +186,7 @@ ts_lua_client_request_header_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
remove = 0;
- val = NULL;
+ val = NULL;
/* we skip the first argument that is the table */
key = luaL_checklstring(L, 2, &key_len);
@@ -366,7 +366,7 @@ ts_lua_client_request_get_url_host(lua_State *L)
host = TSUrlHostGet(http_ctx->client_request_bufp, http_ctx->client_request_url, &len);
if (len == 0) {
- char *key = "Host";
+ char *key = "Host";
char *l_key = "host";
int key_len = 4;
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.c b/plugins/experimental/ts_lua/ts_lua_client_response.c
index baae036..185f27d 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.c
@@ -132,7 +132,7 @@ ts_lua_client_response_header_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
remove = 0;
- val = NULL;
+ val = NULL;
/* we skip the first argument that is the table */
key = luaL_checklstring(L, 2, &key_len);
@@ -270,7 +270,7 @@ ts_lua_client_response_set_status(lua_State *L)
status = luaL_checkint(L, 1);
- reason = TSHttpHdrReasonLookup(status);
+ reason = TSHttpHdrReasonLookup(status);
reason_len = strlen(reason);
TSHttpHdrStatusSet(http_ctx->client_response_bufp, http_ctx->client_response_hdrp, status);
@@ -348,7 +348,7 @@ ts_lua_client_response_set_error_resp(lua_State *L)
status = luaL_checkinteger(L, 1);
- reason = TSHttpHdrReasonLookup(status);
+ reason = TSHttpHdrReasonLookup(status);
reason_len = strlen(reason);
TSHttpHdrStatusSet(http_ctx->client_response_bufp, http_ctx->client_response_hdrp, status);
diff --git a/plugins/experimental/ts_lua/ts_lua_coroutine.c b/plugins/experimental/ts_lua/ts_lua_coroutine.c
index 5e6bae9..e1e1198 100644
--- a/plugins/experimental/ts_lua/ts_lua_coroutine.c
+++ b/plugins/experimental/ts_lua/ts_lua_coroutine.c
@@ -22,7 +22,7 @@ static void
ts_lua_async_push_item(ts_lua_async_item **head, ts_lua_async_item *node)
{
node->next = *head;
- *head = node;
+ *head = node;
}
static void
@@ -61,8 +61,8 @@ ts_lua_async_create_item(TSCont cont, async_clean func, void *d, ts_lua_cont_inf
ai->cinfo = ci;
ai->cleanup = func;
- ai->data = d;
- ai->contp = cont;
+ ai->data = d;
+ ai->contp = cont;
ai->deleted = 0;
ts_lua_async_push_item(&ci->async_chain, ai);
@@ -76,7 +76,7 @@ ts_lua_release_cont_info(ts_lua_cont_info *ci)
ts_lua_main_ctx *mctx;
ts_lua_coroutine *crt;
- crt = &ci->routine;
+ crt = &ci->routine;
mctx = crt->mctx;
ts_lua_async_destroy_chain(&ci->async_chain);
diff --git a/plugins/experimental/ts_lua/ts_lua_crypto.c b/plugins/experimental/ts_lua/ts_lua_crypto.c
index d2b578f..a94870d 100644
--- a/plugins/experimental/ts_lua/ts_lua_crypto.c
+++ b/plugins/experimental/ts_lua/ts_lua_crypto.c
@@ -87,7 +87,7 @@ ts_lua_md5(lua_State *L)
}
if (lua_isnil(L, 1)) {
- src = (u_char *)"";
+ src = (u_char *)"";
slen = 0;
} else {
@@ -119,7 +119,7 @@ ts_lua_md5_bin(lua_State *L)
}
if (lua_isnil(L, 1)) {
- src = (u_char *)"";
+ src = (u_char *)"";
slen = 0;
} else {
@@ -150,7 +150,7 @@ ts_lua_sha1(lua_State *L)
}
if (lua_isnil(L, 1)) {
- src = (u_char *)"";
+ src = (u_char *)"";
slen = 0;
} else {
@@ -181,7 +181,7 @@ ts_lua_sha1_bin(lua_State *L)
}
if (lua_isnil(L, 1)) {
- src = (u_char *)"";
+ src = (u_char *)"";
slen = 0;
} else {
@@ -212,14 +212,14 @@ ts_lua_base64_encode(lua_State *L)
}
if (lua_isnil(L, 1)) {
- src = (u_char *)"";
+ src = (u_char *)"";
slen = 0;
} else {
src = (u_char *)luaL_checklstring(L, 1, &slen);
}
dlen = TS_LUA_MAX_STR_LENGTH;
- dst = lua_newuserdata(L, dlen);
+ dst = lua_newuserdata(L, dlen);
if (TS_SUCCESS == TSBase64Encode((const char *)src, slen, (char *)dst, dlen, &length)) {
lua_pushlstring(L, (char *)dst, length);
@@ -244,14 +244,14 @@ ts_lua_base64_decode(lua_State *L)
}
if (lua_isnil(L, 1)) {
- src = (u_char *)"";
+ src = (u_char *)"";
slen = 0;
} else {
src = (u_char *)luaL_checklstring(L, 1, &slen);
}
dlen = TS_LUA_MAX_STR_LENGTH;
- dst = lua_newuserdata(L, dlen);
+ dst = lua_newuserdata(L, dlen);
if (TS_SUCCESS == TSBase64Decode((const char *)src, slen, (unsigned char *)dst, dlen, &length)) {
lua_pushlstring(L, (char *)dst, length);
@@ -283,7 +283,7 @@ ts_lua_escape_uri(lua_State *L)
return 1;
dlen = TS_LUA_MAX_STR_LENGTH;
- dst = lua_newuserdata(L, dlen);
+ dst = lua_newuserdata(L, dlen);
if (TS_SUCCESS == TSStringPercentEncode((const char *)src, len, (char *)dst, dlen, &length, NULL)) {
lua_pushlstring(L, (char *)dst, length);
@@ -316,7 +316,7 @@ ts_lua_unescape_uri(lua_State *L)
/* the unescaped string can only be smaller */
dlen = len;
- dst = lua_newuserdata(L, dlen);
+ dst = lua_newuserdata(L, dlen);
if (TS_SUCCESS == TSStringPercentDecode((const char *)src, len, (char *)dst, dlen, &length)) {
lua_pushlstring(L, (char *)dst, length);
diff --git a/plugins/experimental/ts_lua/ts_lua_fetch.c b/plugins/experimental/ts_lua/ts_lua_fetch.c
index f21a81c..0b5b085 100644
--- a/plugins/experimental/ts_lua/ts_lua_fetch.c
+++ b/plugins/experimental/ts_lua/ts_lua_fetch.c
@@ -88,15 +88,15 @@ ts_lua_fetch(lua_State *L)
contp = TSContCreate(ts_lua_fetch_multi_handler, ci->mutex);
- sz = sizeof(ts_lua_fetch_multi_info) + 1 * sizeof(ts_lua_fetch_info);
+ sz = sizeof(ts_lua_fetch_multi_info) + 1 * sizeof(ts_lua_fetch_info);
fmi = (ts_lua_fetch_multi_info *)TSmalloc(sz);
memset(fmi, 0, sz);
fmi->total = 1;
fmi->contp = contp;
- fi = &fmi->fiv[0];
- fi->fmi = fmi;
+ fi = &fmi->fiv[0];
+ fi->fmi = fmi;
fi->buffer = TSIOBufferCreate();
fi->reader = TSIOBufferReaderAlloc(fi->buffer);
@@ -144,7 +144,7 @@ ts_lua_fetch_multi(lua_State *L)
// Iterate the table
n = lua_objlen(L, 1);
- sz = sizeof(ts_lua_fetch_multi_info) + n * sizeof(ts_lua_fetch_info);
+ sz = sizeof(ts_lua_fetch_multi_info) + n * sizeof(ts_lua_fetch_info);
fmi = (ts_lua_fetch_multi_info *)TSmalloc(sz);
memset(fmi, 0, sz);
@@ -181,8 +181,8 @@ ts_lua_fetch_multi(lua_State *L)
lua_pushinteger(L, 2);
lua_gettable(L, -3);
- fi = &fmi->fiv[i];
- fi->fmi = fmi;
+ fi = &fmi->fiv[i];
+ fi->fmi = fmi;
fi->buffer = TSIOBufferCreate();
fi->reader = TSIOBufferReaderAlloc(fi->buffer);
@@ -222,19 +222,19 @@ ts_lua_fetch_one_item(lua_State *L, const char *url, size_t url_len, ts_lua_fetc
method = luaL_checklstring(L, -1, &method_len);
} else {
- method = "GET";
+ method = "GET";
method_len = sizeof("GET") - 1;
}
lua_pop(L, 1);
} else {
- method = "GET";
+ method = "GET";
method_len = sizeof("GET") - 1;
}
/* body */
- body = NULL;
+ body = NULL;
body_len = 0;
if (tb) {
@@ -251,7 +251,7 @@ ts_lua_fetch_one_item(lua_State *L, const char *url, size_t url_len, ts_lua_fetc
/* cliaddr */
memset(&clientaddr, 0, sizeof(clientaddr));
clientaddr.sin_family = AF_INET;
- rc = 0;
+ rc = 0;
if (tb) {
lua_pushlstring(L, "cliaddr", sizeof("cliaddr") - 1);
@@ -259,7 +259,7 @@ ts_lua_fetch_one_item(lua_State *L, const char *url, size_t url_len, ts_lua_fetc
if (lua_isstring(L, -1)) {
addr = luaL_checklstring(L, -1, &addr_len);
- rc = sscanf(addr, "%15s:%d", ipstr, &port);
+ rc = sscanf(addr, "%15s:%d", ipstr, &port);
if (rc == 2) {
clientaddr.sin_port = htons(port);
inet_aton(ipstr, (struct in_addr *)&clientaddr.sin_addr.s_addr);
@@ -305,7 +305,7 @@ ts_lua_fetch_one_item(lua_State *L, const char *url, size_t url_len, ts_lua_fetc
TSContDataSet(contp, fi);
fi->contp = contp;
- fi->fch = TSFetchCreate(contp, method, url, "HTTP/1.1", (struct sockaddr *)&clientaddr, flags);
+ fi->fch = TSFetchCreate(contp, method, url, "HTTP/1.1", (struct sockaddr *)&clientaddr, flags);
/* header */
cl = ht = ua = 0;
@@ -321,7 +321,7 @@ ts_lua_fetch_one_item(lua_State *L, const char *url, size_t url_len, ts_lua_fetc
while (lua_next(L, -2)) {
lua_pushvalue(L, -2);
- key = luaL_checklstring(L, -1, &key_len);
+ key = luaL_checklstring(L, -1, &key_len);
value = luaL_checklstring(L, -2, &value_len);
if (key_len == TS_MIME_LEN_CONTENT_LENGTH && !strncasecmp(TS_MIME_FIELD_CONTENT_LENGTH, key, key_len)) { // Content-Length
@@ -396,8 +396,8 @@ ts_lua_fetch_handler(TSCont contp, TSEvent ev, void *edata ATS_UNUSED)
ts_lua_fetch_multi_info *fmi;
event = (int)ev;
- fi = TSContDataGet(contp);
- fmi = fi->fmi;
+ fi = TSContDataGet(contp);
+ fmi = fi->fmi;
switch (event) {
case TS_FETCH_EVENT_EXT_HEAD_READY:
@@ -408,9 +408,9 @@ ts_lua_fetch_handler(TSCont contp, TSEvent ev, void *edata ATS_UNUSED)
case TS_FETCH_EVENT_EXT_BODY_DONE:
do {
- blk = TSIOBufferStart(fi->buffer);
+ blk = TSIOBufferStart(fi->buffer);
from = TSIOBufferBlockWriteStart(blk, &wavail);
- n = TSFetchReadData(fi->fch, from, wavail);
+ n = TSFetchReadData(fi->fch, from, wavail);
TSIOBufferProduce(fi->buffer, n);
} while (n == wavail);
@@ -462,7 +462,7 @@ ts_lua_fill_one_result(lua_State *L, ts_lua_fetch_info *fi)
field_loc = TSMimeHdrFieldGet(bufp, hdrp, 0);
while (field_loc) {
- name = TSMimeHdrFieldNameGet(bufp, hdrp, field_loc, &name_len);
+ name = TSMimeHdrFieldNameGet(bufp, hdrp, field_loc, &name_len);
value = TSMimeHdrFieldValueStringGet(bufp, hdrp, field_loc, -1, &value_len);
lua_pushlstring(L, name, name_len);
@@ -518,9 +518,9 @@ ts_lua_fetch_multi_handler(TSCont contp, TSEvent event ATS_UNUSED, void *edata)
ci = ai->cinfo;
fmi = (ts_lua_fetch_multi_info *)ai->data;
- fi = (ts_lua_fetch_info *)edata;
+ fi = (ts_lua_fetch_info *)edata;
- L = ai->cinfo->routine.lua;
+ L = ai->cinfo->routine.lua;
lmutex = ai->cinfo->routine.mctx->mutexp;
fmi->done++;
diff --git a/plugins/experimental/ts_lua/ts_lua_http.c b/plugins/experimental/ts_lua/ts_lua_http.c
index a995a40..5f89c47 100644
--- a/plugins/experimental/ts_lua/ts_lua_http.c
+++ b/plugins/experimental/ts_lua/ts_lua_http.c
@@ -254,7 +254,7 @@ ts_lua_http_get_cache_lookup_url(lua_State *L)
char output[TS_LUA_MAX_URL_LENGTH];
int output_len;
TSMLoc url = TS_NULL_MLOC;
- char *str = NULL;
+ char *str = NULL;
int len;
ts_lua_http_ctx *http_ctx;
@@ -306,7 +306,7 @@ ts_lua_http_set_cache_lookup_url(lua_State *L)
if (url && url_len) {
const char *start = url;
- const char *end = url + url_len;
+ const char *end = url + url_len;
TSMLoc new_url_loc;
if (TSUrlCreate(http_ctx->client_request_bufp, &new_url_loc) == TS_SUCCESS &&
TSUrlParse(http_ctx->client_request_bufp, new_url_loc, &start, end) == TS_PARSE_DONE &&
diff --git a/plugins/experimental/ts_lua/ts_lua_http_cntl.c b/plugins/experimental/ts_lua/ts_lua_http_cntl.c
index 5f9b80e..329bdbb 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_cntl.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_cntl.c
@@ -19,8 +19,8 @@
#include "ts_lua_util.h"
typedef enum {
- TS_LUA_HTTP_CNTL_GET_LOGGING_MODE = TS_HTTP_CNTL_GET_LOGGING_MODE,
- TS_LUA_HTTP_CNTL_SET_LOGGING_MODE = TS_HTTP_CNTL_SET_LOGGING_MODE,
+ TS_LUA_HTTP_CNTL_GET_LOGGING_MODE = TS_HTTP_CNTL_GET_LOGGING_MODE,
+ TS_LUA_HTTP_CNTL_SET_LOGGING_MODE = TS_HTTP_CNTL_SET_LOGGING_MODE,
TS_LUA_HTTP_CNTL_GET_INTERCEPT_RETRY_MODE = TS_HTTP_CNTL_GET_INTERCEPT_RETRY_MODE,
TS_LUA_HTTP_CNTL_SET_INTERCEPT_RETRY_MODE = TS_HTTP_CNTL_SET_INTERCEPT_RETRY_MODE
} TSLuaHttpCntlType;
@@ -67,7 +67,7 @@ ts_lua_http_cntl_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
cntl_type = luaL_checkinteger(L, 1);
- value = luaL_checkinteger(L, 2);
+ value = luaL_checkinteger(L, 2);
TSHttpTxnCntl(http_ctx->txnp, cntl_type, value ? TS_HTTP_CNTL_ON : TS_HTTP_CNTL_OFF);
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.c b/plugins/experimental/ts_lua/ts_lua_http_config.c
index 1755fb3..6b4256b 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.c
@@ -19,113 +19,113 @@
#include "ts_lua_util.h"
typedef enum {
- TS_LUA_CONFIG_URL_REMAP_PRISTINE_HOST_HDR = TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR,
- TS_LUA_CONFIG_HTTP_CHUNKING_ENABLED = TS_CONFIG_HTTP_CHUNKING_ENABLED,
- TS_LUA_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED = TS_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED,
- TS_LUA_CONFIG_HTTP_NEGATIVE_CACHING_LIFETIME = TS_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE,
- TS_LUA_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE = TS_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE,
- TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN = TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN,
- TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT,
- TS_LUA_CONFIG_HTTP_KEEP_ALIVE_POST_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT,
- TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH = TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH,
- TS_LUA_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT = TS_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT,
- TS_LUA_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT = TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT,
- TS_LUA_CONFIG_NET_SOCK_OPTION_FLAG_OUT = TS_CONFIG_NET_SOCK_OPTION_FLAG_OUT,
- TS_LUA_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT = TS_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT,
- TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM,
- TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER,
- TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT,
- TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE,
- TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP,
- TS_LUA_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP = TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP,
- TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_ENABLED = TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED,
- TS_LUA_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR = TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR,
- TS_LUA_CONFIG_HTTP_SERVER_TCP_INIT_CWND = TS_CONFIG_HTTP_SERVER_TCP_INIT_CWND,
- TS_LUA_CONFIG_HTTP_SEND_HTTP11_REQUESTS = TS_CONFIG_HTTP_SEND_HTTP11_REQUESTS,
- TS_LUA_CONFIG_HTTP_CACHE_HTTP = TS_CONFIG_HTTP_CACHE_HTTP,
- TS_LUA_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL = TS_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL,
- TS_LUA_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE = TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE,
- TS_LUA_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE = TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE,
- TS_LUA_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE = TS_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE,
- TS_LUA_CONFIG_HTTP_CACHE_IGNORE_SERVER_NO_CACHE = TS_CONFIG_HTTP_CACHE_IGNORE_SERVER_NO_CACHE,
- TS_LUA_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES = TS_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES,
- TS_LUA_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION = TS_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION,
- TS_LUA_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC = TS_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC,
- TS_LUA_CONFIG_HTTP_CACHE_REQUIRED_HEADERS = TS_CONFIG_HTTP_CACHE_REQUIRED_HEADERS,
- TS_LUA_CONFIG_HTTP_INSERT_REQUEST_VIA_STR = TS_CONFIG_HTTP_INSERT_REQUEST_VIA_STR,
- TS_LUA_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR = TS_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR,
- TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME = TS_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME,
- TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME = TS_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME,
- TS_LUA_CONFIG_HTTP_CACHE_GUARANTEED_MIN_LIFETIME = TS_CONFIG_HTTP_CACHE_GUARANTEED_MIN_LIFETIME,
- TS_LUA_CONFIG_HTTP_CACHE_GUARANTEED_MAX_LIFETIME = TS_CONFIG_HTTP_CACHE_GUARANTEED_MAX_LIFETIME,
- TS_LUA_CONFIG_HTTP_CACHE_MAX_STALE_AGE = TS_CONFIG_HTTP_CACHE_MAX_STALE_AGE,
- TS_LUA_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_IN = TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_IN,
- TS_LUA_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_OUT,
- TS_LUA_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_IN = TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_IN,
- TS_LUA_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_OUT = TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_OUT,
- TS_LUA_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_OUT = TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_OUT,
- TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS = TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS,
- TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES,
+ TS_LUA_CONFIG_URL_REMAP_PRISTINE_HOST_HDR = TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR,
+ TS_LUA_CONFIG_HTTP_CHUNKING_ENABLED = TS_CONFIG_HTTP_CHUNKING_ENABLED,
+ TS_LUA_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED = TS_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED,
+ TS_LUA_CONFIG_HTTP_NEGATIVE_CACHING_LIFETIME = TS_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE,
+ TS_LUA_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE = TS_CONFIG_HTTP_CACHE_WHEN_TO_REVALIDATE,
+ TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN = TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_IN,
+ TS_LUA_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_ENABLED_OUT,
+ TS_LUA_CONFIG_HTTP_KEEP_ALIVE_POST_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_POST_OUT,
+ TS_LUA_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH = TS_CONFIG_HTTP_SERVER_SESSION_SHARING_MATCH,
+ TS_LUA_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT = TS_CONFIG_NET_SOCK_RECV_BUFFER_SIZE_OUT,
+ TS_LUA_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT = TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT,
+ TS_LUA_CONFIG_NET_SOCK_OPTION_FLAG_OUT = TS_CONFIG_NET_SOCK_OPTION_FLAG_OUT,
+ TS_LUA_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT = TS_CONFIG_HTTP_FORWARD_PROXY_AUTH_TO_PARENT,
+ TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_FROM,
+ TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_REFERER,
+ TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_USER_AGENT,
+ TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE,
+ TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP,
+ TS_LUA_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP = TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP,
+ TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_ENABLED = TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED,
+ TS_LUA_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR = TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR,
+ TS_LUA_CONFIG_HTTP_SERVER_TCP_INIT_CWND = TS_CONFIG_HTTP_SERVER_TCP_INIT_CWND,
+ TS_LUA_CONFIG_HTTP_SEND_HTTP11_REQUESTS = TS_CONFIG_HTTP_SEND_HTTP11_REQUESTS,
+ TS_LUA_CONFIG_HTTP_CACHE_HTTP = TS_CONFIG_HTTP_CACHE_HTTP,
+ TS_LUA_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL = TS_CONFIG_HTTP_CACHE_CLUSTER_CACHE_LOCAL,
+ TS_LUA_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE = TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_NO_CACHE,
+ TS_LUA_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE = TS_CONFIG_HTTP_CACHE_IGNORE_CLIENT_CC_MAX_AGE,
+ TS_LUA_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE = TS_CONFIG_HTTP_CACHE_IMS_ON_CLIENT_NO_CACHE,
+ TS_LUA_CONFIG_HTTP_CACHE_IGNORE_SERVER_NO_CACHE = TS_CONFIG_HTTP_CACHE_IGNORE_SERVER_NO_CACHE,
+ TS_LUA_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES = TS_CONFIG_HTTP_CACHE_CACHE_RESPONSES_TO_COOKIES,
+ TS_LUA_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION = TS_CONFIG_HTTP_CACHE_IGNORE_AUTHENTICATION,
+ TS_LUA_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC = TS_CONFIG_HTTP_CACHE_CACHE_URLS_THAT_LOOK_DYNAMIC,
+ TS_LUA_CONFIG_HTTP_CACHE_REQUIRED_HEADERS = TS_CONFIG_HTTP_CACHE_REQUIRED_HEADERS,
+ TS_LUA_CONFIG_HTTP_INSERT_REQUEST_VIA_STR = TS_CONFIG_HTTP_INSERT_REQUEST_VIA_STR,
+ TS_LUA_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR = TS_CONFIG_HTTP_INSERT_RESPONSE_VIA_STR,
+ TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME = TS_CONFIG_HTTP_CACHE_HEURISTIC_MIN_LIFETIME,
+ TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME = TS_CONFIG_HTTP_CACHE_HEURISTIC_MAX_LIFETIME,
+ TS_LUA_CONFIG_HTTP_CACHE_GUARANTEED_MIN_LIFETIME = TS_CONFIG_HTTP_CACHE_GUARANTEED_MIN_LIFETIME,
+ TS_LUA_CONFIG_HTTP_CACHE_GUARANTEED_MAX_LIFETIME = TS_CONFIG_HTTP_CACHE_GUARANTEED_MAX_LIFETIME,
+ TS_LUA_CONFIG_HTTP_CACHE_MAX_STALE_AGE = TS_CONFIG_HTTP_CACHE_MAX_STALE_AGE,
+ TS_LUA_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_IN = TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_IN,
+ TS_LUA_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_OUT = TS_CONFIG_HTTP_KEEP_ALIVE_NO_ACTIVITY_TIMEOUT_OUT,
+ TS_LUA_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_IN = TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_IN,
+ TS_LUA_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_OUT = TS_CONFIG_HTTP_TRANSACTION_NO_ACTIVITY_TIMEOUT_OUT,
+ TS_LUA_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_OUT = TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_OUT,
+ TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS = TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS,
+ TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES,
TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES_DEAD_SERVER = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_MAX_RETRIES_DEAD_SERVER,
- TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES,
- TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT,
- TS_LUA_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT = TS_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT,
- TS_LUA_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME = TS_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME,
- TS_LUA_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD = TS_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD,
- TS_LUA_CONFIG_HTTP_CACHE_FUZZ_TIME = TS_CONFIG_HTTP_CACHE_FUZZ_TIME,
- TS_LUA_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME = TS_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME,
- TS_LUA_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS = TS_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS,
- TS_LUA_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT = TS_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT,
- TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_STR = TS_CONFIG_HTTP_RESPONSE_SERVER_STR,
- TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR = TS_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR,
- TS_LUA_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY = TS_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY,
- TS_LUA_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD = TS_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD,
- TS_LUA_CONFIG_NET_SOCK_PACKET_MARK_OUT = TS_CONFIG_NET_SOCK_PACKET_MARK_OUT,
- TS_LUA_CONFIG_NET_SOCK_PACKET_TOS_OUT = TS_CONFIG_NET_SOCK_PACKET_TOS_OUT,
- TS_LUA_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE = TS_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE,
- TS_LUA_CONFIG_HTTP_CHUNKING_SIZE = TS_CONFIG_HTTP_CHUNKING_SIZE,
- TS_LUA_CONFIG_HTTP_FLOW_CONTROL_ENABLED = TS_CONFIG_HTTP_FLOW_CONTROL_ENABLED,
- TS_LUA_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK = TS_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK,
- TS_LUA_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK = TS_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK,
- TS_LUA_CONFIG_HTTP_CACHE_RANGE_LOOKUP = TS_CONFIG_HTTP_CACHE_RANGE_LOOKUP,
- TS_LUA_CONFIG_HTTP_NORMALIZE_AE_GZIP = TS_CONFIG_HTTP_NORMALIZE_AE_GZIP,
- TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_SIZE = TS_CONFIG_HTTP_DEFAULT_BUFFER_SIZE,
- TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK = TS_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK,
- TS_LUA_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE = TS_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE,
- TS_LUA_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE = TS_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE,
- TS_LUA_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED = TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED,
- TS_LUA_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME = TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME,
- TS_LUA_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED = TS_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED,
- TS_LUA_CONFIG_SSL_HSTS_MAX_AGE = TS_CONFIG_SSL_HSTS_MAX_AGE,
- TS_LUA_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS = TS_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS,
- TS_LUA_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME = TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME,
- TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES = TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES,
- TS_LUA_CONFIG_HTTP_CACHE_RANGE_WRITE = TS_CONFIG_HTTP_CACHE_RANGE_WRITE,
- TS_LUA_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED = TS_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED,
- TS_LUA_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER = TS_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER,
- TS_LUA_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE = TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE,
- TS_LUA_CONFIG_HTTP_SLOW_LOG_THRESHOLD = TS_CONFIG_HTTP_SLOW_LOG_THRESHOLD,
- TS_LUA_CONFIG_HTTP_CACHE_GENERATION = TS_CONFIG_HTTP_CACHE_GENERATION,
- TS_LUA_CONFIG_BODY_FACTORY_TEMPLATE_BASE = TS_CONFIG_BODY_FACTORY_TEMPLATE_BASE,
- TS_LUA_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION = TS_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION,
- TS_LUA_CONFIG_HTTP_ENABLE_REDIRECTION = TS_CONFIG_HTTP_ENABLE_REDIRECTION,
- TS_LUA_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS = TS_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS,
- TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES = TS_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES,
- TS_LUA_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY = TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY,
- TS_LUA_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT = TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT,
- TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE = TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE,
- TS_LUA_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT = TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT,
- TS_LUA_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT = TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT,
- TS_LUA_CONFIG_HTTP_UNCACHEABLE_REQUESTS_BYPASS_PARENT = TS_CONFIG_HTTP_UNCACHEABLE_REQUESTS_BYPASS_PARENT,
- TS_LUA_CONFIG_HTTP_PARENT_PROXY_TOTAL_CONNECT_ATTEMPTS = TS_CONFIG_HTTP_PARENT_PROXY_TOTAL_CONNECT_ATTEMPTS,
- TS_LUA_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_IN = TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_IN,
- TS_LUA_CONFIG_LAST_ENTRY = TS_CONFIG_LAST_ENTRY,
+ TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_RR_RETRIES,
+ TS_LUA_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT,
+ TS_LUA_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT = TS_CONFIG_HTTP_POST_CONNECT_ATTEMPTS_TIMEOUT,
+ TS_LUA_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME = TS_CONFIG_HTTP_DOWN_SERVER_CACHE_TIME,
+ TS_LUA_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD = TS_CONFIG_HTTP_DOWN_SERVER_ABORT_THRESHOLD,
+ TS_LUA_CONFIG_HTTP_CACHE_FUZZ_TIME = TS_CONFIG_HTTP_CACHE_FUZZ_TIME,
+ TS_LUA_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME = TS_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME,
+ TS_LUA_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS = TS_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS,
+ TS_LUA_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT = TS_CONFIG_HTTP_BACKGROUND_FILL_ACTIVE_TIMEOUT,
+ TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_STR = TS_CONFIG_HTTP_RESPONSE_SERVER_STR,
+ TS_LUA_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR = TS_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR,
+ TS_LUA_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY = TS_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY,
+ TS_LUA_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD = TS_CONFIG_HTTP_BACKGROUND_FILL_COMPLETED_THRESHOLD,
+ TS_LUA_CONFIG_NET_SOCK_PACKET_MARK_OUT = TS_CONFIG_NET_SOCK_PACKET_MARK_OUT,
+ TS_LUA_CONFIG_NET_SOCK_PACKET_TOS_OUT = TS_CONFIG_NET_SOCK_PACKET_TOS_OUT,
+ TS_LUA_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE = TS_CONFIG_HTTP_INSERT_AGE_IN_RESPONSE,
+ TS_LUA_CONFIG_HTTP_CHUNKING_SIZE = TS_CONFIG_HTTP_CHUNKING_SIZE,
+ TS_LUA_CONFIG_HTTP_FLOW_CONTROL_ENABLED = TS_CONFIG_HTTP_FLOW_CONTROL_ENABLED,
+ TS_LUA_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK = TS_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER_MARK,
+ TS_LUA_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK = TS_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK,
+ TS_LUA_CONFIG_HTTP_CACHE_RANGE_LOOKUP = TS_CONFIG_HTTP_CACHE_RANGE_LOOKUP,
+ TS_LUA_CONFIG_HTTP_NORMALIZE_AE_GZIP = TS_CONFIG_HTTP_NORMALIZE_AE_GZIP,
+ TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_SIZE = TS_CONFIG_HTTP_DEFAULT_BUFFER_SIZE,
+ TS_LUA_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK = TS_CONFIG_HTTP_DEFAULT_BUFFER_WATER_MARK,
+ TS_LUA_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE = TS_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE,
+ TS_LUA_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE = TS_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE,
+ TS_LUA_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED = TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_ENABLED,
+ TS_LUA_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME = TS_CONFIG_HTTP_NEGATIVE_REVALIDATING_LIFETIME,
+ TS_LUA_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED = TS_CONFIG_HTTP_ACCEPT_ENCODING_FILTER_ENABLED,
+ TS_LUA_CONFIG_SSL_HSTS_MAX_AGE = TS_CONFIG_SSL_HSTS_MAX_AGE,
+ TS_LUA_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS = TS_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS,
+ TS_LUA_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME = TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME,
+ TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES = TS_CONFIG_HTTP_CACHE_MAX_OPEN_READ_RETRIES,
+ TS_LUA_CONFIG_HTTP_CACHE_RANGE_WRITE = TS_CONFIG_HTTP_CACHE_RANGE_WRITE,
+ TS_LUA_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED = TS_CONFIG_HTTP_POST_CHECK_CONTENT_LENGTH_ENABLED,
+ TS_LUA_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER = TS_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER,
+ TS_LUA_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE = TS_CONFIG_HTTP_AUTH_SERVER_SESSION_PRIVATE,
+ TS_LUA_CONFIG_HTTP_SLOW_LOG_THRESHOLD = TS_CONFIG_HTTP_SLOW_LOG_THRESHOLD,
+ TS_LUA_CONFIG_HTTP_CACHE_GENERATION = TS_CONFIG_HTTP_CACHE_GENERATION,
+ TS_LUA_CONFIG_BODY_FACTORY_TEMPLATE_BASE = TS_CONFIG_BODY_FACTORY_TEMPLATE_BASE,
+ TS_LUA_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION = TS_CONFIG_HTTP_CACHE_OPEN_WRITE_FAIL_ACTION,
+ TS_LUA_CONFIG_HTTP_ENABLE_REDIRECTION = TS_CONFIG_HTTP_ENABLE_REDIRECTION,
+ TS_LUA_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS = TS_CONFIG_HTTP_NUMBER_OF_REDIRECTIONS,
+ TS_LUA_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES = TS_CONFIG_HTTP_CACHE_MAX_OPEN_WRITE_RETRIES,
+ TS_LUA_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY = TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY,
+ TS_LUA_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT = TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT,
+ TS_LUA_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE = TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE,
+ TS_LUA_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT = TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT,
+ TS_LUA_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT = TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT,
+ TS_LUA_CONFIG_HTTP_UNCACHEABLE_REQUESTS_BYPASS_PARENT = TS_CONFIG_HTTP_UNCACHEABLE_REQUESTS_BYPASS_PARENT,
+ TS_LUA_CONFIG_HTTP_PARENT_PROXY_TOTAL_CONNECT_ATTEMPTS = TS_CONFIG_HTTP_PARENT_PROXY_TOTAL_CONNECT_ATTEMPTS,
+ TS_LUA_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_IN = TS_CONFIG_HTTP_TRANSACTION_ACTIVE_TIMEOUT_IN,
+ TS_LUA_CONFIG_LAST_ENTRY = TS_CONFIG_LAST_ENTRY,
} TSLuaOverridableConfigKey;
typedef enum {
- TS_LUA_TIMEOUT_ACTIVE = 0,
- TS_LUA_TIMEOUT_CONNECT = 1,
- TS_LUA_TIMEOUT_DNS = 2,
+ TS_LUA_TIMEOUT_ACTIVE = 0,
+ TS_LUA_TIMEOUT_CONNECT = 1,
+ TS_LUA_TIMEOUT_DNS = 2,
TS_LUA_TIMEOUT_NO_ACTIVITY = 3
} TSLuaTimeoutKey;
@@ -336,7 +336,7 @@ ts_lua_http_config_int_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
- conf = luaL_checkinteger(L, 1);
+ conf = luaL_checkinteger(L, 1);
value = luaL_checkinteger(L, 2);
TSHttpTxnConfigIntSet(http_ctx->txnp, conf, value);
@@ -371,7 +371,7 @@ ts_lua_http_config_float_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
- conf = luaL_checkinteger(L, 1);
+ conf = luaL_checkinteger(L, 1);
value = luaL_checknumber(L, 2);
TSHttpTxnConfigFloatSet(http_ctx->txnp, conf, value);
@@ -407,7 +407,7 @@ ts_lua_http_config_string_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
- conf = luaL_checkinteger(L, 1);
+ conf = luaL_checkinteger(L, 1);
value = luaL_checklstring(L, 2, &value_len);
TSHttpTxnConfigStringSet(http_ctx->txnp, conf, value, value_len);
@@ -443,7 +443,7 @@ ts_lua_http_timeout_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
- conf = luaL_checkinteger(L, 1);
+ conf = luaL_checkinteger(L, 1);
value = luaL_checkinteger(L, 2);
switch (conf) {
diff --git a/plugins/experimental/ts_lua/ts_lua_http_intercept.c b/plugins/experimental/ts_lua/ts_lua_http_intercept.c
index b84ab51..564b092 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_intercept.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_intercept.c
@@ -83,7 +83,7 @@ ts_lua_http_intercept(lua_State *L)
return 0;
}
- ictx = ts_lua_create_http_intercept_ctx(L, http_ctx, n);
+ ictx = ts_lua_create_http_intercept_ctx(L, http_ctx, n);
contp = TSContCreate(ts_lua_http_intercept_entry, TSMutexCreate());
TSContDataSet(contp, ictx);
@@ -116,7 +116,7 @@ ts_lua_http_server_intercept(lua_State *L)
return 0;
}
- ictx = ts_lua_create_http_intercept_ctx(L, http_ctx, n);
+ ictx = ts_lua_create_http_intercept_ctx(L, http_ctx, n);
contp = TSContCreate(ts_lua_http_intercept_entry, TSMutexCreate());
TSContDataSet(contp, ictx);
@@ -162,7 +162,7 @@ ts_lua_http_intercept_process(ts_lua_http_intercept_ctx *ictx, TSVConn conn)
TSMutex mtxp;
ts_lua_cont_info *ci;
- ci = &ictx->cinfo;
+ ci = &ictx->cinfo;
mtxp = ictx->cinfo.routine.mctx->mutexp;
contp = TSContCreate(ts_lua_http_intercept_handler, TSMutexCreate());
@@ -196,7 +196,7 @@ ts_lua_http_intercept_setup_read(ts_lua_http_intercept_ctx *ictx)
{
ictx->input.buffer = TSIOBufferCreate();
ictx->input.reader = TSIOBufferReaderAlloc(ictx->input.buffer);
- ictx->input.vio = TSVConnRead(ictx->net_vc, ictx->cinfo.contp, ictx->input.buffer, INT64_MAX);
+ ictx->input.vio = TSVConnRead(ictx->net_vc, ictx->cinfo.contp, ictx->input.buffer, INT64_MAX);
}
static void
@@ -204,7 +204,7 @@ ts_lua_http_intercept_setup_write(ts_lua_http_intercept_ctx *ictx)
{
ictx->output.buffer = TSIOBufferCreate();
ictx->output.reader = TSIOBufferReaderAlloc(ictx->output.buffer);
- ictx->output.vio = TSVConnWrite(ictx->net_vc, ictx->cinfo.contp, ictx->output.reader, INT64_MAX);
+ ictx->output.vio = TSVConnWrite(ictx->net_vc, ictx->cinfo.contp, ictx->output.reader, INT64_MAX);
}
static int
@@ -225,7 +225,7 @@ ts_lua_http_intercept_handler(TSCont contp, TSEvent event, void *edata)
} else {
mtxp = ictx->cinfo.routine.mctx->mutexp;
- n = (intptr_t)edata;
+ n = (intptr_t)edata;
TSMutexLock(mtxp);
ret = ts_lua_http_intercept_run_coroutine(ictx, n);
@@ -249,7 +249,7 @@ ts_lua_http_intercept_run_coroutine(ts_lua_http_intercept_ctx *ictx, int n)
lua_State *L;
ci = &ictx->cinfo;
- L = ci->routine.lua;
+ L = ci->routine.lua;
ts_lua_set_cont_info(L, ci);
ret = lua_resume(L, n);
@@ -257,7 +257,7 @@ ts_lua_http_intercept_run_coroutine(ts_lua_http_intercept_ctx *ictx, int n)
switch (ret) {
case 0: // finished
avail = TSIOBufferReaderAvail(ictx->output.reader);
- done = TSVIONDoneGet(ictx->output.vio);
+ done = TSVIONDoneGet(ictx->output.vio);
TSVIONBytesSet(ictx->output.vio, avail + done);
ictx->all_ready = 1;
@@ -403,7 +403,7 @@ ts_lua_flush_wakeup(ts_lua_http_intercept_ctx *ictx)
ci = &ictx->cinfo;
- contp = TSContCreate(ts_lua_flush_wakeup_handler, ci->mutex);
+ contp = TSContCreate(ts_lua_flush_wakeup_handler, ci->mutex);
action = TSContSchedule(contp, 0, TS_THREAD_POOL_DEFAULT);
ai = ts_lua_async_create_item(contp, ts_lua_flush_cleanup, (void *)action, ci);
diff --git a/plugins/experimental/ts_lua/ts_lua_http_milestone.c b/plugins/experimental/ts_lua/ts_lua_http_milestone.c
index 8930fe2..0c78601 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_milestone.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_milestone.c
@@ -19,28 +19,28 @@
#include "ts_lua_util.h"
typedef enum {
- TS_LUA_MILESTONE_UA_BEGIN = TS_MILESTONE_UA_BEGIN,
- TS_LUA_MILESTONE_UA_FIRST_READ = TS_MILESTONE_UA_FIRST_READ,
- TS_LUA_MILESTONE_UA_READ_HEADER_DONE = TS_MILESTONE_UA_READ_HEADER_DONE,
- TS_LUA_MILESTONE_UA_BEGIN_WRITE = TS_MILESTONE_UA_BEGIN_WRITE,
- TS_LUA_MILESTONE_UA_CLOSE = TS_MILESTONE_UA_CLOSE,
- TS_LUA_MILESTONE_SERVER_FIRST_CONNECT = TS_MILESTONE_SERVER_FIRST_CONNECT,
- TS_LUA_MILESTONE_SERVER_CONNECT = TS_MILESTONE_SERVER_CONNECT,
- TS_LUA_MILESTONE_SERVER_CONNECT_END = TS_MILESTONE_SERVER_CONNECT_END,
- TS_LUA_MILESTONE_SERVER_BEGIN_WRITE = TS_MILESTONE_SERVER_BEGIN_WRITE,
- TS_LUA_MILESTONE_SERVER_FIRST_READ = TS_MILESTONE_SERVER_FIRST_READ,
+ TS_LUA_MILESTONE_UA_BEGIN = TS_MILESTONE_UA_BEGIN,
+ TS_LUA_MILESTONE_UA_FIRST_READ = TS_MILESTONE_UA_FIRST_READ,
+ TS_LUA_MILESTONE_UA_READ_HEADER_DONE = TS_MILESTONE_UA_READ_HEADER_DONE,
+ TS_LUA_MILESTONE_UA_BEGIN_WRITE = TS_MILESTONE_UA_BEGIN_WRITE,
+ TS_LUA_MILESTONE_UA_CLOSE = TS_MILESTONE_UA_CLOSE,
+ TS_LUA_MILESTONE_SERVER_FIRST_CONNECT = TS_MILESTONE_SERVER_FIRST_CONNECT,
+ TS_LUA_MILESTONE_SERVER_CONNECT = TS_MILESTONE_SERVER_CONNECT,
+ TS_LUA_MILESTONE_SERVER_CONNECT_END = TS_MILESTONE_SERVER_CONNECT_END,
+ TS_LUA_MILESTONE_SERVER_BEGIN_WRITE = TS_MILESTONE_SERVER_BEGIN_WRITE,
+ TS_LUA_MILESTONE_SERVER_FIRST_READ = TS_MILESTONE_SERVER_FIRST_READ,
TS_LUA_MILESTONE_SERVER_READ_HEADER_DONE = TS_MILESTONE_SERVER_READ_HEADER_DONE,
- TS_LUA_MILESTONE_SERVER_CLOSE = TS_MILESTONE_SERVER_CLOSE,
- TS_LUA_MILESTONE_CACHE_OPEN_READ_BEGIN = TS_MILESTONE_CACHE_OPEN_READ_BEGIN,
- TS_LUA_MILESTONE_CACHE_OPEN_READ_END = TS_MILESTONE_CACHE_OPEN_READ_END,
- TS_LUA_MILESTONE_CACHE_OPEN_WRITE_BEGIN = TS_MILESTONE_CACHE_OPEN_WRITE_BEGIN,
- TS_LUA_MILESTONE_CACHE_OPEN_WRITE_END = TS_MILESTONE_CACHE_OPEN_WRITE_END,
- TS_LUA_MILESTONE_DNS_LOOKUP_BEGIN = TS_MILESTONE_DNS_LOOKUP_BEGIN,
- TS_LUA_MILESTONE_DNS_LOOKUP_END = TS_MILESTONE_DNS_LOOKUP_END,
- TS_LUA_MILESTONE_SM_START = TS_MILESTONE_SM_START,
- TS_LUA_MILESTONE_SM_FINISH = TS_MILESTONE_SM_FINISH,
- TS_LUA_MILESTONE_PLUGIN_ACTIVE = TS_MILESTONE_PLUGIN_ACTIVE,
- TS_LUA_MILESTONE_PLUGIN_TOTAL = TS_MILESTONE_PLUGIN_TOTAL
+ TS_LUA_MILESTONE_SERVER_CLOSE = TS_MILESTONE_SERVER_CLOSE,
+ TS_LUA_MILESTONE_CACHE_OPEN_READ_BEGIN = TS_MILESTONE_CACHE_OPEN_READ_BEGIN,
+ TS_LUA_MILESTONE_CACHE_OPEN_READ_END = TS_MILESTONE_CACHE_OPEN_READ_END,
+ TS_LUA_MILESTONE_CACHE_OPEN_WRITE_BEGIN = TS_MILESTONE_CACHE_OPEN_WRITE_BEGIN,
+ TS_LUA_MILESTONE_CACHE_OPEN_WRITE_END = TS_MILESTONE_CACHE_OPEN_WRITE_END,
+ TS_LUA_MILESTONE_DNS_LOOKUP_BEGIN = TS_MILESTONE_DNS_LOOKUP_BEGIN,
+ TS_LUA_MILESTONE_DNS_LOOKUP_END = TS_MILESTONE_DNS_LOOKUP_END,
+ TS_LUA_MILESTONE_SM_START = TS_MILESTONE_SM_START,
+ TS_LUA_MILESTONE_SM_FINISH = TS_MILESTONE_SM_FINISH,
+ TS_LUA_MILESTONE_PLUGIN_ACTIVE = TS_MILESTONE_PLUGIN_ACTIVE,
+ TS_LUA_MILESTONE_PLUGIN_TOTAL = TS_MILESTONE_PLUGIN_TOTAL
} TSLuaMilestoneType;
ts_lua_var_item ts_lua_milestone_type_vars[] = {TS_LUA_MAKE_VAR_ITEM(TS_LUA_MILESTONE_UA_BEGIN),
diff --git a/plugins/experimental/ts_lua/ts_lua_io.c b/plugins/experimental/ts_lua/ts_lua_io.c
index f8aed66..08f6c17 100644
--- a/plugins/experimental/ts_lua/ts_lua_io.c
+++ b/plugins/experimental/ts_lua/ts_lua_io.c
@@ -25,12 +25,12 @@ IOBufferReaderCopy(TSIOBufferReader readerp, void *buf, int64_t length)
const char *start;
TSIOBufferBlock blk;
- n = 0;
+ n = 0;
blk = TSIOBufferReaderStart(readerp);
while (blk) {
start = TSIOBufferBlockReadStart(blk, readerp, &avail);
- need = length < avail ? length : avail;
+ need = length < avail ? length : avail;
if (need > 0) {
memcpy((char *)buf + n, start, need);
diff --git a/plugins/experimental/ts_lua/ts_lua_misc.c b/plugins/experimental/ts_lua/ts_lua_misc.c
index 13206cb..e9e5ca8 100644
--- a/plugins/experimental/ts_lua/ts_lua_misc.c
+++ b/plugins/experimental/ts_lua/ts_lua_misc.c
@@ -141,7 +141,7 @@ ts_lua_schedule(lua_State *L)
contp = TSContCreate(ts_lua_schedule_handler, ci->mutex);
TSContDataSet(contp, actx);
- nci = &actx->cinfo;
+ nci = &actx->cinfo;
nci->contp = contp;
nci->mutex = ci->mutex;
@@ -165,11 +165,11 @@ ts_lua_schedule_handler(TSCont contp, TSEvent ev, void *edata)
actx = (ts_lua_http_ctx *)TSContDataGet(contp);
TSDebug(TS_LUA_DEBUG_TAG, "getting http_Ctx");
- ci = &actx->cinfo;
+ ci = &actx->cinfo;
crt = &ci->routine;
main_ctx = crt->mctx;
- L = crt->lua;
+ L = crt->lua;
ret = 0;
@@ -178,11 +178,11 @@ ts_lua_schedule_handler(TSCont contp, TSEvent ev, void *edata)
if (event == TS_LUA_EVENT_COROUTINE_CONT) {
TSDebug(TS_LUA_DEBUG_TAG, "event is coroutine_cont");
- n = (intptr_t)edata;
+ n = (intptr_t)edata;
ret = lua_resume(L, n);
} else {
TSDebug(TS_LUA_DEBUG_TAG, "event is not coroutine_cont");
- n = lua_gettop(L);
+ n = lua_gettop(L);
ret = lua_resume(L, n - 1);
}
@@ -221,7 +221,7 @@ ts_lua_sleep(lua_State *L)
sec = 1;
}
- contp = TSContCreate(ts_lua_sleep_handler, ci->mutex);
+ contp = TSContCreate(ts_lua_sleep_handler, ci->mutex);
action = TSContSchedule(contp, sec * 1000, TS_THREAD_POOL_DEFAULT);
ai = ts_lua_async_create_item(contp, ts_lua_sleep_cleanup, (void *)action, ci);
diff --git a/plugins/experimental/ts_lua/ts_lua_package.c b/plugins/experimental/ts_lua/ts_lua_package.c
index f7c383c..91255bd 100644
--- a/plugins/experimental/ts_lua/ts_lua_package.c
+++ b/plugins/experimental/ts_lua/ts_lua_package.c
@@ -73,10 +73,10 @@ ts_lua_add_package_path(lua_State *L)
}
data = luaL_checklstring(L, 1, &dlen);
- end = data + dlen;
+ end = data + dlen;
ptr = data;
- n = 0;
+ n = 0;
while (ptr < end) {
hit = memchr(ptr, ';', end - ptr);
@@ -102,7 +102,7 @@ ts_lua_add_package_path(lua_State *L)
return luaL_error(L, "extended package path number exceeds %d.", TS_LUA_MAX_PACKAGE_NUM);
pp[n].name = (char *)ptr;
- pp[n].len = item_len;
+ pp[n].len = item_len;
n++;
}
} else {
@@ -118,7 +118,7 @@ ts_lua_add_package_path(lua_State *L)
return luaL_error(L, "extended package path number exceeds %d.", TS_LUA_MAX_PACKAGE_NUM);
pp[n].name = (char *)ptr;
- pp[n].len = item_len;
+ pp[n].len = item_len;
n++;
}
}
@@ -138,7 +138,7 @@ ts_lua_add_package_path(lua_State *L)
}
for (i = 0; i < n; i++) {
- elt->len = pp[i].len;
+ elt->len = pp[i].len;
elt->name = (char *)TSmalloc(pp[i].len);
memcpy(elt->name, pp[i].name, pp[i].len);
elt++;
@@ -218,10 +218,10 @@ ts_lua_add_package_cpath(lua_State *L)
}
data = luaL_checklstring(L, 1, &dlen);
- end = data + dlen;
+ end = data + dlen;
ptr = data;
- n = 0;
+ n = 0;
while (ptr < end) {
hit = memchr(ptr, ';', end - ptr);
@@ -247,7 +247,7 @@ ts_lua_add_package_cpath(lua_State *L)
return luaL_error(L, "extended package cpath number exceeds %d.", TS_LUA_MAX_PACKAGE_NUM);
pp[n].name = (char *)ptr;
- pp[n].len = item_len;
+ pp[n].len = item_len;
n++;
}
} else {
@@ -263,7 +263,7 @@ ts_lua_add_package_cpath(lua_State *L)
return luaL_error(L, "extended package cpath number exceeds %d.", TS_LUA_MAX_PACKAGE_NUM);
pp[n].name = (char *)ptr;
- pp[n].len = item_len;
+ pp[n].len = item_len;
n++;
}
}
@@ -283,7 +283,7 @@ ts_lua_add_package_cpath(lua_State *L)
}
for (i = 0; i < n; i++) {
- elt->len = pp[i].len;
+ elt->len = pp[i].len;
elt->name = (char *)TSmalloc(pp[i].len);
memcpy(elt->name, pp[i].name, pp[i].len);
elt++;
diff --git a/plugins/experimental/ts_lua/ts_lua_remap.c b/plugins/experimental/ts_lua/ts_lua_remap.c
index fd3e66e..61fd88c 100644
--- a/plugins/experimental/ts_lua/ts_lua_remap.c
+++ b/plugins/experimental/ts_lua/ts_lua_remap.c
@@ -20,11 +20,11 @@
#include "ts_lua_remap.h"
typedef enum {
- TS_LUA_REMAP_NO_REMAP = TSREMAP_NO_REMAP,
- TS_LUA_REMAP_DID_REMAP = TSREMAP_DID_REMAP,
- TS_LUA_REMAP_NO_REMAP_STOP = TSREMAP_NO_REMAP_STOP,
+ TS_LUA_REMAP_NO_REMAP = TSREMAP_NO_REMAP,
+ TS_LUA_REMAP_DID_REMAP = TSREMAP_DID_REMAP,
+ TS_LUA_REMAP_NO_REMAP_STOP = TSREMAP_NO_REMAP_STOP,
TS_LUA_REMAP_DID_REMAP_STOP = TSREMAP_DID_REMAP_STOP,
- TS_LUA_REMAP_ERROR = TSREMAP_ERROR
+ TS_LUA_REMAP_ERROR = TSREMAP_ERROR
} TSLuaRemapStatus;
ts_lua_var_item ts_lua_remap_status_vars[] = {
diff --git a/plugins/experimental/ts_lua/ts_lua_server_request.c b/plugins/experimental/ts_lua/ts_lua_server_request.c
index fbbe737..ad11202 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_request.c
@@ -186,7 +186,7 @@ ts_lua_server_request_header_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
remove = 0;
- val = NULL;
+ val = NULL;
/* we skip the first argument that is the table */
key = luaL_checklstring(L, 2, &key_len);
diff --git a/plugins/experimental/ts_lua/ts_lua_server_response.c b/plugins/experimental/ts_lua/ts_lua_server_response.c
index dbf1fbb..c4abd41 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_response.c
@@ -183,7 +183,7 @@ ts_lua_server_response_header_set(lua_State *L)
GET_HTTP_CONTEXT(http_ctx, L);
remove = 0;
- val = NULL;
+ val = NULL;
/* we skip the first argument that is the table */
key = luaL_checklstring(L, 2, &key_len);
@@ -253,7 +253,7 @@ ts_lua_server_response_set_status(lua_State *L)
status = luaL_checkint(L, 1);
- reason = TSHttpHdrReasonLookup(status);
+ reason = TSHttpHdrReasonLookup(status);
reason_len = strlen(reason);
TSHttpHdrStatusSet(http_ctx->server_response_bufp, http_ctx->server_response_hdrp, status);
diff --git a/plugins/experimental/ts_lua/ts_lua_stat.c b/plugins/experimental/ts_lua/ts_lua_stat.c
index d74bf38..0249d7b 100644
--- a/plugins/experimental/ts_lua/ts_lua_stat.c
+++ b/plugins/experimental/ts_lua/ts_lua_stat.c
@@ -19,7 +19,7 @@
#include "ts_lua_util.h"
typedef enum {
- TS_LUA_STAT_PERSISTENT = TS_STAT_PERSISTENT,
+ TS_LUA_STAT_PERSISTENT = TS_STAT_PERSISTENT,
TS_LUA_STAT_NON_PERSISTENT = TS_STAT_NON_PERSISTENT
} TSLuaStatPersistentType;
@@ -27,9 +27,9 @@ ts_lua_var_item ts_lua_stat_persistent_vars[] = {TS_LUA_MAKE_VAR_ITEM(TS_LUA_STA
TS_LUA_MAKE_VAR_ITEM(TS_LUA_STAT_NON_PERSISTENT)};
typedef enum {
- TS_LUA_STAT_SYNC_SUM = TS_STAT_SYNC_SUM,
- TS_LUA_STAT_SYNC_COUNT = TS_STAT_SYNC_COUNT,
- TS_LUA_STAT_SYNC_AVG = TS_STAT_SYNC_AVG,
+ TS_LUA_STAT_SYNC_SUM = TS_STAT_SYNC_SUM,
+ TS_LUA_STAT_SYNC_COUNT = TS_STAT_SYNC_COUNT,
+ TS_LUA_STAT_SYNC_AVG = TS_STAT_SYNC_AVG,
TS_LUA_STAT_SYNC_TIMEAVG = TS_STAT_SYNC_TIMEAVG
} TSLuaStatSyncType;
diff --git a/plugins/experimental/ts_lua/ts_lua_transform.c b/plugins/experimental/ts_lua/ts_lua_transform.c
index 3136155..85e2a3b 100644
--- a/plugins/experimental/ts_lua/ts_lua_transform.c
+++ b/plugins/experimental/ts_lua/ts_lua_transform.c
@@ -27,7 +27,7 @@ ts_lua_transform_entry(TSCont contp, TSEvent ev, void *edata)
TSVIO input_vio;
ts_lua_http_transform_ctx *transform_ctx;
- event = (int)ev;
+ event = (int)ev;
transform_ctx = (ts_lua_http_transform_ctx *)TSContDataGet(contp);
if (TSVConnClosedGet(contp)) {
@@ -77,14 +77,14 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
lua_State *L;
TSMutex mtxp;
- ci = &transform_ctx->cinfo;
+ ci = &transform_ctx->cinfo;
crt = &ci->routine;
mtxp = crt->mctx->mutexp;
- L = crt->lua;
+ L = crt->lua;
output_conn = TSTransformOutputVConnGet(contp);
- input_vio = TSVConnWriteVIOGet(contp);
+ input_vio = TSVConnWriteVIOGet(contp);
if (!TSVIOBufferGet(input_vio)) {
if (transform_ctx->output.vio) {
@@ -103,13 +103,13 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
transform_ctx->reserved.buffer = TSIOBufferCreate();
transform_ctx->reserved.reader = TSIOBufferReaderAlloc(transform_ctx->reserved.buffer);
- transform_ctx->upstream_bytes = TSVIONBytesGet(input_vio);
+ transform_ctx->upstream_bytes = TSVIONBytesGet(input_vio);
transform_ctx->downstream_bytes = INT64_MAX;
}
- input_avail = TSIOBufferReaderAvail(input_reader);
+ input_avail = TSIOBufferReaderAvail(input_reader);
upstream_done = TSVIONDoneGet(input_vio);
- toread = TSVIONTodoGet(input_vio);
+ toread = TSVIONTodoGet(input_vio);
if (toread <= input_avail) { // upstream finished
eos = 1;
@@ -127,7 +127,7 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
}
write_down = 0;
- towrite = TSIOBufferReaderAvail(transform_ctx->reserved.reader);
+ towrite = TSIOBufferReaderAvail(transform_ctx->reserved.reader);
TSMutexLock(mtxp);
ts_lua_set_cont_info(L, ci);
@@ -143,7 +143,7 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
if (towrite == 0)
break;
- blk = TSIOBufferReaderStart(transform_ctx->reserved.reader);
+ blk = TSIOBufferReaderStart(transform_ctx->reserved.reader);
start = TSIOBufferBlockReadStart(blk, transform_ctx->reserved.reader, &blk_len);
lua_pushlightuserdata(L, transform_ctx);
@@ -166,7 +166,7 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
}
launch:
- rc = lua_resume(L, n);
+ rc = lua_resume(L, n);
top = lua_gettop(L);
switch (rc) {
@@ -179,16 +179,16 @@ ts_lua_transform_handler(TSCont contp, ts_lua_http_transform_ctx *transform_ctx,
ret = lua_tointeger(L, -1); /* 0 is not finished, 1 is finished */
res = lua_tolstring(L, -2, &res_len);
} else { // what hells code are you writing ?
- ret = 0;
- res = NULL;
+ ret = 0;
+ res = NULL;
res_len = 0;
}
break;
default: // coroutine failed
TSError("[ts_lua] lua_resume failed: %s", lua_tostring(L, -1));
- ret = 1;
- res = NULL;
+ ret = 1;
+ res = NULL;
res_len = 0;
break;
}
diff --git a/plugins/experimental/ts_lua/ts_lua_util.c b/plugins/experimental/ts_lua/ts_lua_util.c
index a9f33e9..13d2a58 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.c
+++ b/plugins/experimental/ts_lua/ts_lua_util.c
@@ -55,8 +55,8 @@ ts_lua_create_vm(ts_lua_main_ctx *arr, int n)
lua_pushvalue(L, LUA_GLOBALSINDEX);
- arr[i].gref = luaL_ref(L, LUA_REGISTRYINDEX); /* L[REG][gref] = L[GLOBAL] */
- arr[i].lua = L;
+ arr[i].gref = luaL_ref(L, LUA_REGISTRYINDEX); /* L[REG][gref] = L[GLOBAL] */
+ arr[i].lua = L;
arr[i].mutexp = TSMutexCreate();
}
@@ -107,7 +107,7 @@ ts_lua_add_module(ts_lua_instance_conf *conf, ts_lua_main_ctx *arr, int n, int a
for (i = 0; i < n; i++) {
conf->_first = (i == 0) ? 1 : 0;
- conf->_last = (i == n - 1) ? 1 : 0;
+ conf->_last = (i == n - 1) ? 1 : 0;
TSMutexLock(arr[i].mutexp);
@@ -355,10 +355,10 @@ ts_lua_create_async_ctx(lua_State *L, ts_lua_cont_info *hci, int n)
l = lua_newthread(L);
// init the coroutine
- crt = &actx->cinfo.routine;
+ crt = &actx->cinfo.routine;
crt->mctx = hci->routine.mctx;
- crt->lua = l;
- crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
+ crt->lua = l;
+ crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
// replace the param; start with 2 because first two params are not needed
for (i = 2; i < n; i++) {
@@ -418,7 +418,7 @@ ts_lua_create_http_ctx(ts_lua_main_ctx *main_ctx, ts_lua_instance_conf *conf)
// create coroutine for http_ctx
crt = &http_ctx->cinfo.routine;
- l = lua_newthread(L);
+ l = lua_newthread(L);
lua_pushlightuserdata(L, conf);
lua_rawget(L, LUA_REGISTRYINDEX);
@@ -435,8 +435,8 @@ ts_lua_create_http_ctx(ts_lua_main_ctx *main_ctx, ts_lua_instance_conf *conf)
lua_replace(l, LUA_GLOBALSINDEX);
// init coroutine
- crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
- crt->lua = l;
+ crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
+ crt->lua = l;
crt->mctx = main_ctx;
http_ctx->instance_conf = conf;
@@ -528,10 +528,10 @@ ts_lua_create_http_intercept_ctx(lua_State *L, ts_lua_http_ctx *http_ctx, int n)
l = lua_newthread(L);
// init the coroutine
- crt = &ictx->cinfo.routine;
+ crt = &ictx->cinfo.routine;
crt->mctx = hci->routine.mctx;
- crt->lua = l;
- crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
+ crt->lua = l;
+ crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
// Todo: replace the global, context table for crt->lua
@@ -597,7 +597,7 @@ ts_lua_create_http_transform_ctx(ts_lua_http_ctx *http_ctx, TSVConn connp)
ts_lua_http_transform_ctx *transform_ctx;
hci = &http_ctx->cinfo;
- L = hci->routine.lua;
+ L = hci->routine.lua;
transform_ctx = (ts_lua_http_transform_ctx *)TSmalloc(sizeof(ts_lua_http_transform_ctx));
memset(transform_ctx, 0, sizeof(ts_lua_http_transform_ctx));
@@ -605,14 +605,14 @@ ts_lua_create_http_transform_ctx(ts_lua_http_ctx *http_ctx, TSVConn connp)
transform_ctx->hctx = http_ctx;
TSContDataSet(connp, transform_ctx);
- ci = &transform_ctx->cinfo;
+ ci = &transform_ctx->cinfo;
ci->contp = connp;
ci->mutex = TSContMutexGet((TSCont)http_ctx->txnp);
- crt = &ci->routine;
+ crt = &ci->routine;
crt->mctx = hci->routine.mctx;
- crt->lua = lua_newthread(L);
- crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
+ crt->lua = lua_newthread(L);
+ crt->ref = luaL_ref(L, LUA_REGISTRYINDEX);
ts_lua_set_http_transform_ctx(crt->lua, transform_ctx);
lua_pushlightuserdata(L, transform_ctx);
@@ -651,13 +651,13 @@ ts_lua_http_cont_handler(TSCont contp, TSEvent ev, void *edata)
ts_lua_cont_info *ci;
ts_lua_coroutine *crt;
- event = (int)ev;
+ event = (int)ev;
http_ctx = (ts_lua_http_ctx *)TSContDataGet(contp);
- ci = &http_ctx->cinfo;
- crt = &ci->routine;
+ ci = &http_ctx->cinfo;
+ crt = &ci->routine;
main_ctx = crt->mctx;
- L = crt->lua;
+ L = crt->lua;
txnp = http_ctx->txnp;
@@ -783,7 +783,7 @@ ts_lua_http_cont_handler(TSCont contp, TSEvent ev, void *edata)
break;
case TS_LUA_EVENT_COROUTINE_CONT:
- n = (intptr_t)edata;
+ n = (intptr_t)edata;
ret = lua_resume(L, n);
default:
diff --git a/plugins/experimental/url_sig/url_sig.c b/plugins/experimental/url_sig/url_sig.c
index 605f7ef..82171d8 100644
--- a/plugins/experimental/url_sig/url_sig.c
+++ b/plugins/experimental/url_sig/url_sig.c
@@ -128,7 +128,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_s
TSError("[url_sig] Error parsing line %d of file %s (%s).", line_no, config_file, line);
continue;
}
- *pos = '\0';
+ *pos = '\0';
char *value = pos + 1;
while (isspace(*value)) // remove whitespace
value++;
@@ -302,29 +302,29 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
struct config *cfg;
cfg = (struct config *)ih;
- int url_len = 0;
+ int url_len = 0;
time_t expiration = 0;
- int algorithm = -1;
- int keyindex = -1;
+ int algorithm = -1;
+ int keyindex = -1;
int cmp_res;
int rval;
- int i = 0;
- int j = 0;
+ int i = 0;
+ int j = 0;
unsigned int sig_len = 0;
/* all strings are locally allocated except url... about 25k per instance */
char *url;
- char signed_part[8192] = {'\0'}; // this initializes the whole array and is needed
- char urltokstr[8192] = {'\0'};
+ char signed_part[8192] = {'\0'}; // this initializes the whole array and is needed
+ char urltokstr[8192] = {'\0'};
char client_ip[CIP_STRLEN] = {'\0'};
- char ipstr[CIP_STRLEN] = {'\0'};
+ char ipstr[CIP_STRLEN] = {'\0'};
unsigned char sig[MAX_SIG_SIZE + 1];
char sig_string[2 * MAX_SIG_SIZE + 1];
/* these are just pointers into other allocations */
char *signature = NULL;
- char *parts = NULL;
- char *part = NULL;
+ char *parts = NULL;
+ char *part = NULL;
char *p = NULL, *pp = NULL;
char *query = NULL, *app_qry = NULL;
@@ -346,7 +346,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
if (cfg->regex) {
int offset = 0, options = 0;
int ovector[30];
- int len = url_len;
+ int len = url_len;
char *anchor = strstr(url, "#");
if (query && !anchor) {
len -= (query - url);
@@ -447,7 +447,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
if (p != NULL) {
p += strlen(PAR_QSTRING) + 1;
parts = p; // NOTE parts is not NULL terminated it is terminated by "&" of next param
- p = strstr(parts, "&");
+ p = strstr(parts, "&");
TSDebug(PLUGIN_NAME, "Parts: %.*s", (int)(p - parts), parts);
} else {
err_log(url, "PartsSigned query string not found.");
@@ -488,7 +488,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
}
signed_part[strlen(signed_part) - 1] = '?'; // chop off the last /, replace with '?'
- p = strstr(query, SIG_QSTRING "=");
+ p = strstr(query, SIG_QSTRING "=");
strncat(signed_part, query, (p - query) + strlen(SIG_QSTRING) + 1);
TSDebug(PLUGIN_NAME, "Signed string=\"%s\"", signed_part);
@@ -544,7 +544,7 @@ deny:
TSDebug(PLUGIN_NAME, "Redirecting to %s", cfg->err_url);
char *start, *end;
start = cfg->err_url;
- end = start + strlen(cfg->err_url);
+ end = start + strlen(cfg->err_url);
if (TSUrlParse(rri->requestBufp, rri->requestUrl, (const char **)&start, end) != TS_PARSE_DONE) {
err_log("url", "Error inn TSUrlParse!");
}
diff --git a/plugins/experimental/webp_transform/ImageTransform.cc b/plugins/experimental/webp_transform/ImageTransform.cc
index 2a839e2..7ee68d2 100644
--- a/plugins/experimental/webp_transform/ImageTransform.cc
+++ b/plugins/experimental/webp_transform/ImageTransform.cc
@@ -46,7 +46,7 @@ public:
handleReadResponseHeaders(Transaction &transaction)
{
transaction.getServerResponse().getHeaders()["Content-Type"] = "image/webp";
- transaction.getServerResponse().getHeaders()["Vary"] = "Content-Type"; // to have a separate cache entry.
+ transaction.getServerResponse().getHeaders()["Vary"] = "Content-Type"; // to have a separate cache entry.
TS_DEBUG(TAG, "url %s", transaction.getServerRequest().getUrl().getUrlString().c_str());
transaction.resume();
@@ -87,7 +87,7 @@ public:
virtual void
handleReadResponseHeaders(Transaction &transaction)
{
- string ctype = transaction.getServerResponse().getHeaders().values("Content-Type");
+ string ctype = transaction.getServerResponse().getHeaders().values("Content-Type");
string user_agent = transaction.getServerRequest().getHeaders().values("User-Agent");
if (user_agent.find("Chrome") != string::npos && (ctype.find("jpeg") != string::npos || ctype.find("png") != string::npos)) {
TS_DEBUG(TAG, "Content type is either jpeg or png. Converting to webp");
diff --git a/plugins/experimental/xdebug/xdebug.cc b/plugins/experimental/xdebug/xdebug.cc
index 2a0a94b..e0cd61d 100644
--- a/plugins/experimental/xdebug/xdebug.cc
+++ b/plugins/experimental/xdebug/xdebug.cc
@@ -35,7 +35,7 @@ static struct {
#define XHEADER_X_CACHE 0x0010u
#define XHEADER_X_GENERATION 0x0020u
-static int XArgIndex = 0;
+static int XArgIndex = 0;
static TSCont XInjectHeadersCont = NULL;
// Return the length of a string literal.
@@ -222,7 +222,7 @@ InjectMilestonesHeader(TSHttpTxn txn, TSMBuffer buffer, TSMLoc hdr)
TSHttpTxnMilestoneGet(txn, milestones[i].mstype, &time);
if (time > 0) {
double elapsed = (double)(time - epoch) / 1000000000.0;
- int len = (int)snprintf(hdrval, sizeof(hdrval), "%s=%1.9lf", milestones[i].msname, elapsed);
+ int len = (int)snprintf(hdrval, sizeof(hdrval), "%s=%1.9lf", milestones[i].msname, elapsed);
TSReleaseAssert(TSMimeHdrFieldValueStringInsert(buffer, hdr, dst, 0 /* idx */, hdrval, len) == TS_SUCCESS);
}
@@ -237,7 +237,7 @@ done:
static int
XInjectResponseHeaders(TSCont /* contp */, TSEvent event, void *edata)
{
- TSHttpTxn txn = (TSHttpTxn)edata;
+ TSHttpTxn txn = (TSHttpTxn)edata;
intptr_t xheaders = 0;
TSMBuffer buffer;
TSMLoc hdr;
@@ -279,7 +279,7 @@ done:
static int
XScanRequestHeaders(TSCont /* contp */, TSEvent event, void *edata)
{
- TSHttpTxn txn = (TSHttpTxn)edata;
+ TSHttpTxn txn = (TSHttpTxn)edata;
intptr_t xheaders = 0;
TSMLoc field, next;
TSMBuffer buffer;
@@ -361,8 +361,8 @@ TSPluginInit(int argc, const char *argv[])
{NULL, no_argument, NULL, '\0'}};
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"xdebug";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"xdebug";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/gzip/configuration.cc b/plugins/gzip/configuration.cc
index 0048833..3dc9d2e 100644
--- a/plugins/gzip/configuration.cc
+++ b/plugins/gzip/configuration.cc
@@ -167,7 +167,7 @@ HostConfiguration::is_content_type_compressible(const char *content_type, int co
for (StringContainer::iterator it = compressible_content_types_.begin(); it != compressible_content_types_.end(); ++it) {
const char *match_string = it->c_str();
- bool exclude = match_string[0] == '!';
+ bool exclude = match_string[0] == '!';
if (exclude) {
++match_string; // skip '!'
@@ -196,7 +196,7 @@ Configuration::Parse(const char *path)
trim_if(pathstring, isspace);
- Configuration *c = new Configuration();
+ Configuration *c = new Configuration();
HostConfiguration *current_host_configuration = new HostConfiguration("");
c->add_host_configuration(current_host_configuration);
@@ -246,7 +246,7 @@ Configuration::Parse(const char *path)
switch (state) {
case kParseStart:
if ((token[0] == '[') && (token[token.size() - 1] == ']')) {
- std::string current_host = token.substr(1, token.size() - 2);
+ std::string current_host = token.substr(1, token.size() - 2);
current_host_configuration = new HostConfiguration(current_host);
c->add_host_configuration(current_host_configuration);
} else if (token == "compressible-content-type") {
diff --git a/plugins/gzip/gzip.cc b/plugins/gzip/gzip.cc
index 10970c8..e4316fe 100644
--- a/plugins/gzip/gzip.cc
+++ b/plugins/gzip/gzip.cc
@@ -53,7 +53,7 @@ const char *global_hidden_header_name;
const char *dictionary = NULL;
// Current global configuration, and the previous one (for cleanup)
-Configuration *cur_config = NULL;
+Configuration *cur_config = NULL;
Configuration *prev_config = NULL;
static GzipData *
@@ -62,23 +62,23 @@ gzip_data_alloc(int compression_type)
GzipData *data;
int err;
- data = (GzipData *)TSmalloc(sizeof(GzipData));
- data->downstream_vio = NULL;
+ data = (GzipData *)TSmalloc(sizeof(GzipData));
+ data->downstream_vio = NULL;
data->downstream_buffer = NULL;
data->downstream_reader = NULL;
data->downstream_length = 0;
- data->state = transform_state_initialized;
- data->compression_type = compression_type;
- data->zstrm.next_in = Z_NULL;
- data->zstrm.avail_in = 0;
- data->zstrm.total_in = 0;
- data->zstrm.next_out = Z_NULL;
- data->zstrm.avail_out = 0;
- data->zstrm.total_out = 0;
- data->zstrm.zalloc = gzip_alloc;
- data->zstrm.zfree = gzip_free;
- data->zstrm.opaque = (voidpf)0;
- data->zstrm.data_type = Z_ASCII;
+ data->state = transform_state_initialized;
+ data->compression_type = compression_type;
+ data->zstrm.next_in = Z_NULL;
+ data->zstrm.avail_in = 0;
+ data->zstrm.total_in = 0;
+ data->zstrm.next_out = Z_NULL;
+ data->zstrm.avail_out = 0;
+ data->zstrm.total_out = 0;
+ data->zstrm.zalloc = gzip_alloc;
+ data->zstrm.zfree = gzip_free;
+ data->zstrm.opaque = (voidpf)0;
+ data->zstrm.data_type = Z_ASCII;
int window_bits = (compression_type == COMPRESSION_TYPE_GZIP) ? WINDOW_BITS_GZIP : WINDOW_BITS_DEFLATE;
@@ -237,10 +237,10 @@ gzip_transform_init(TSCont contp, GzipData *data)
if (gzip_content_encoding_header(bufp, hdr_loc, data->compression_type) == TS_SUCCESS &&
gzip_vary_header(bufp, hdr_loc) == TS_SUCCESS && gzip_etag_header(bufp, hdr_loc) == TS_SUCCESS) {
- downstream_conn = TSTransformOutputVConnGet(contp);
+ downstream_conn = TSTransformOutputVConnGet(contp);
data->downstream_buffer = TSIOBufferCreate();
data->downstream_reader = TSIOBufferReaderAlloc(data->downstream_buffer);
- data->downstream_vio = TSVConnWrite(downstream_conn, contp, data->downstream_reader, INT64_MAX);
+ data->downstream_vio = TSVConnWrite(downstream_conn, contp, data->downstream_reader, INT64_MAX);
}
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
@@ -272,14 +272,14 @@ gzip_transform_one(GzipData *data, TSIOBufferReader upstream_reader, int amount)
upstream_length = amount;
}
- data->zstrm.next_in = (unsigned char *)upstream_buffer;
+ data->zstrm.next_in = (unsigned char *)upstream_buffer;
data->zstrm.avail_in = upstream_length;
while (data->zstrm.avail_in > 0) {
- downstream_blkp = TSIOBufferStart(data->downstream_buffer);
+ downstream_blkp = TSIOBufferStart(data->downstream_buffer);
downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
- data->zstrm.next_out = (unsigned char *)downstream_buffer;
+ data->zstrm.next_out = (unsigned char *)downstream_buffer;
data->zstrm.avail_out = downstream_length;
if (!data->hc->flush()) {
@@ -324,8 +324,8 @@ gzip_transform_finish(GzipData *data)
for (;;) {
downstream_blkp = TSIOBufferStart(data->downstream_buffer);
- downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
- data->zstrm.next_out = (unsigned char *)downstream_buffer;
+ downstream_buffer = TSIOBufferBlockWriteStart(downstream_blkp, &downstream_length);
+ data->zstrm.next_out = (unsigned char *)downstream_buffer;
data->zstrm.avail_out = downstream_length;
err = deflate(&data->zstrm, Z_FINISH);
@@ -367,7 +367,7 @@ gzip_transform_do(TSCont contp)
gzip_transform_init(contp, data);
}
- upstream_vio = TSVConnWriteVIOGet(contp);
+ upstream_vio = TSVConnWriteVIOGet(contp);
downstream_bytes_written = data->downstream_length;
if (!TSVIOBufferGet(upstream_vio)) {
@@ -504,7 +504,7 @@ gzip_transformable(TSHttpTxn txnp, bool server, HostConfiguration *host_configur
cfield = TSMimeHdrFieldFind(cbuf, chdr, TS_MIME_FIELD_ACCEPT_ENCODING, TS_MIME_LEN_ACCEPT_ENCODING);
if (cfield != TS_NULL_MLOC) {
compression_acceptable = 0;
- nvalues = TSMimeHdrFieldValuesCount(cbuf, chdr, cfield);
+ nvalues = TSMimeHdrFieldValuesCount(cbuf, chdr, cfield);
for (i = 0; i < nvalues; i++) {
value = TSMimeHdrFieldValueStringGet(cbuf, chdr, cfield, i, &len);
if (!value) {
@@ -513,11 +513,11 @@ gzip_transformable(TSHttpTxn txnp, bool server, HostConfiguration *host_configur
if (strncasecmp(value, "deflate", sizeof("deflate") - 1) == 0) {
compression_acceptable = 1;
- *compress_type = COMPRESSION_TYPE_DEFLATE;
+ *compress_type = COMPRESSION_TYPE_DEFLATE;
break;
} else if (strncasecmp(value, "gzip", sizeof("gzip") - 1) == 0) {
compression_acceptable = 1;
- *compress_type = COMPRESSION_TYPE_GZIP;
+ *compress_type = COMPRESSION_TYPE_GZIP;
break;
}
}
@@ -585,10 +585,10 @@ gzip_transform_add(TSHttpTxn txnp, HostConfiguration *hc, int compress_type)
TSHttpTxnTransformedRespCache(txnp, 1);
}
- connp = TSTransformCreate(gzip_transform, txnp);
- data = gzip_data_alloc(compress_type);
+ connp = TSTransformCreate(gzip_transform, txnp);
+ data = gzip_data_alloc(compress_type);
data->txn = txnp;
- data->hc = hc;
+ data->hc = hc;
TSContDataSet(connp, data);
TSHttpTxnHookAdd(txnp, TS_HTTP_RESPONSE_TRANSFORM_HOOK, connp);
@@ -597,8 +597,8 @@ gzip_transform_add(TSHttpTxn txnp, HostConfiguration *hc, int compress_type)
HostConfiguration *
find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc locp, Configuration *config)
{
- TSMLoc fieldp = TSMimeHdrFieldFind(bufp, locp, TS_MIME_FIELD_HOST, TS_MIME_LEN_HOST);
- int strl = 0;
+ TSMLoc fieldp = TSMimeHdrFieldFind(bufp, locp, TS_MIME_FIELD_HOST, TS_MIME_LEN_HOST);
+ int strl = 0;
const char *strv = NULL;
HostConfiguration *host_configuration;
@@ -617,8 +617,8 @@ find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc
static int
transform_plugin(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
- int compress_type = COMPRESSION_TYPE_DEFLATE;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
+ int compress_type = COMPRESSION_TYPE_DEFLATE;
HostConfiguration *hc = (HostConfiguration *)TSContDataGet(contp);
switch (event) {
@@ -766,7 +766,7 @@ transform_global_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edat
static void
load_global_configuration(TSCont contp)
{
- const char *path = (const char *)TSContDataGet(contp);
+ const char *path = (const char *)TSContDataGet(contp);
Configuration *newconfig = Configuration::Parse(path);
Configuration *oldconfig = __sync_lock_test_and_set(&cur_config, newconfig);
@@ -862,7 +862,7 @@ TSRemapNewInstance(int argc, char *argv[], void **instance, char *errbuf, int er
global_hidden_header_name = init_hidden_header_name();
Configuration *config = Configuration::Parse(config_path);
- *instance = config;
+ *instance = config;
free((void *)config_path);
info("Configuration loaded");
diff --git a/plugins/gzip/misc.cc b/plugins/gzip/misc.cc
index e71fdc3..5827c41 100644
--- a/plugins/gzip/misc.cc
+++ b/plugins/gzip/misc.cc
@@ -45,8 +45,8 @@ void
normalize_accept_encoding(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer reqp, TSMLoc hdr_loc)
{
TSMLoc field = TSMimeHdrFieldFind(reqp, hdr_loc, TS_MIME_FIELD_ACCEPT_ENCODING, TS_MIME_LEN_ACCEPT_ENCODING);
- int deflate = 0;
- int gzip = 0;
+ int deflate = 0;
+ int gzip = 0;
// remove the accept encoding field(s),
// while finding out if gzip or deflate is supported.
@@ -131,8 +131,8 @@ init_hidden_header_name()
if (TSMgmtStringGet(var_name, &result) != TS_SUCCESS) {
fatal("failed to get server name");
} else {
- int hidden_header_name_len = strlen("x-accept-encoding-") + strlen(result);
- hidden_header_name = (char *)TSmalloc(hidden_header_name_len + 1);
+ int hidden_header_name_len = strlen("x-accept-encoding-") + strlen(result);
+ hidden_header_name = (char *)TSmalloc(hidden_header_name_len + 1);
hidden_header_name[hidden_header_name_len] = 0;
sprintf(hidden_header_name, "x-accept-encoding-%s", result);
}
@@ -144,8 +144,8 @@ register_plugin()
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"gzip";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"gzip";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/gzip/misc.h b/plugins/gzip/misc.h
index 85ad218..60f5aea 100644
--- a/plugins/gzip/misc.h
+++ b/plugins/gzip/misc.h
@@ -34,13 +34,13 @@
using namespace Gzip;
// zlib stuff, see [deflateInit2] at http://www.zlib.net/manual.html
-static const int ZLIB_MEMLEVEL = 9; // min=1 (optimize for memory),max=9 (optimized for speed)
+static const int ZLIB_MEMLEVEL = 9; // min=1 (optimize for memory),max=9 (optimized for speed)
static const int WINDOW_BITS_DEFLATE = -15;
-static const int WINDOW_BITS_GZIP = 31;
+static const int WINDOW_BITS_GZIP = 31;
// misc
static const int COMPRESSION_TYPE_DEFLATE = 1;
-static const int COMPRESSION_TYPE_GZIP = 2;
+static const int COMPRESSION_TYPE_GZIP = 2;
// this one is used to rename the accept encoding header
// it will be restored later on
diff --git a/plugins/header_rewrite/condition.h b/plugins/header_rewrite/condition.h
index b703930..41a723d 100644
--- a/plugins/header_rewrite/condition.h
+++ b/plugins/header_rewrite/condition.h
@@ -33,13 +33,13 @@
// Condition modifiers
enum CondModifiers {
- COND_NONE = 0,
- COND_OR = 1,
- COND_AND = 2,
- COND_NOT = 4,
+ COND_NONE = 0,
+ COND_OR = 1,
+ COND_AND = 2,
+ COND_NOT = 4,
COND_NOCASE = 8, // Not implemented
- COND_LAST = 16,
- COND_CHAIN = 32 // Not implemented
+ COND_LAST = 16,
+ COND_CHAIN = 32 // Not implemented
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/header_rewrite/conditions.cc b/plugins/header_rewrite/conditions.cc
index 8298d7a..507709a 100644
--- a/plugins/header_rewrite/conditions.cc
+++ b/plugins/header_rewrite/conditions.cc
@@ -99,7 +99,7 @@ ConditionMethod::append_value(std::string &s, const Resources &res)
const char *value;
int len;
- bufp = res.client_bufp;
+ bufp = res.client_bufp;
hdr_loc = res.client_hdr_loc;
if (bufp && hdr_loc) {
@@ -119,7 +119,7 @@ ConditionRandom::initialize(Parser &p)
gettimeofday(&tv, NULL);
_seed = getpid() * tv.tv_usec;
- _max = strtol(_qualifier.c_str(), NULL, 10);
+ _max = strtol(_qualifier.c_str(), NULL, 10);
match->set(static_cast<unsigned int>(strtol(p.get_arg().c_str(), NULL, 10)));
_matcher = match;
@@ -212,10 +212,10 @@ ConditionHeader::append_value(std::string &s, const Resources &res)
int len;
if (_client) {
- bufp = res.client_bufp;
+ bufp = res.client_bufp;
hdr_loc = res.client_hdr_loc;
} else {
- bufp = res.bufp;
+ bufp = res.bufp;
hdr_loc = res.hdr_loc;
}
@@ -226,7 +226,7 @@ ConditionHeader::append_value(std::string &s, const Resources &res)
TSDebug(PLUGIN_NAME, "Getting Header: %s, field_loc: %p", _qualifier.c_str(), field_loc);
while (field_loc) {
- value = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, -1, &len);
+ value = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, -1, &len);
next_field_loc = TSMimeHdrFieldNextDup(bufp, hdr_loc, field_loc);
TSDebug(PLUGIN_NAME, "Appending HEADER(%s) to evaluation value -> %.*s", _qualifier.c_str(), len, value);
s.append(value, len);
@@ -304,7 +304,7 @@ ConditionQuery::initialize(Parser &p)
void
ConditionQuery::append_value(std::string &s, const Resources &res)
{
- int query_len = 0;
+ int query_len = 0;
const char *query = TSUrlHttpQueryGet(res._rri->requestBufp, res._rri->requestUrl, &query_len);
TSDebug(PLUGIN_NAME, "Appending QUERY to evaluation value: %.*s", query_len, query);
@@ -354,7 +354,7 @@ bool
ConditionUrl::eval(const Resources &res)
{
TSDebug(PLUGIN_NAME, "ConditionUrl::eval");
- TSMLoc url = NULL;
+ TSMLoc url = NULL;
TSMBuffer bufp = NULL;
std::string s;
@@ -378,10 +378,10 @@ ConditionUrl::eval(const Resources &res)
} else {
TSMLoc hdr_loc = NULL;
if (_type == CLIENT) {
- bufp = res.client_bufp;
+ bufp = res.client_bufp;
hdr_loc = res.client_hdr_loc;
} else if (_type == URL) {
- bufp = res.bufp;
+ bufp = res.bufp;
hdr_loc = res.hdr_loc;
} else {
TSError("[header_rewrite] Rule not supported at this hook");
@@ -394,7 +394,7 @@ ConditionUrl::eval(const Resources &res)
}
if (_url_qual == URL_QUAL_HOST) {
- int host_len = 0;
+ int host_len = 0;
const char *host = TSUrlHostGet(bufp, url, &host_len);
s.append(host, host_len);
TSDebug(PLUGIN_NAME, " Host to match is: %.*s", host_len, host);
@@ -492,7 +492,7 @@ ConditionCookie::append_value(std::string &s, const Resources &res)
const char *cookies;
const char *cookie_value;
const char *const cookie_name = _qualifier.c_str();
- const int cookie_name_len = _qualifier.length();
+ const int cookie_name_len = _qualifier.length();
// Sanity
if (bufp == NULL || hdr_loc == NULL)
@@ -584,7 +584,7 @@ bool
ConditionIncomingPort::eval(const Resources &res)
{
uint16_t port = getPort(TSHttpTxnIncomingAddrGet(res.txnp));
- bool rval = static_cast<const Matchers<uint16_t> *>(_matcher)->test(port);
+ bool rval = static_cast<const Matchers<uint16_t> *>(_matcher)->test(port);
TSDebug(PLUGIN_NAME, "Evaluating INCOMING-PORT(): %d: rval: %d", port, rval);
return rval;
}
@@ -605,7 +605,7 @@ ConditionTransactCount::initialize(Parser &p)
{
Condition::initialize(p);
- MatcherType *match = new MatcherType(_cond_op);
+ MatcherType *match = new MatcherType(_cond_op);
std::string const &arg = p.get_arg();
match->set(strtol(arg.c_str(), NULL, 10));
@@ -616,10 +616,10 @@ bool
ConditionTransactCount::eval(const Resources &res)
{
TSHttpSsn ssn = TSHttpTxnSsnGet(res.txnp);
- bool rval = false;
+ bool rval = false;
if (ssn) {
int n = TSHttpSsnTransactionCount(ssn);
- rval = static_cast<MatcherType *>(_matcher)->test(n);
+ rval = static_cast<MatcherType *>(_matcher)->test(n);
TSDebug(PLUGIN_NAME, "Evaluating TXN-COUNT(): %d: rval: %s", n, rval ? "true" : "false");
} else {
TSDebug(PLUGIN_NAME, "Evaluation TXN-COUNT(): No session found, returning false");
@@ -634,7 +634,7 @@ ConditionTransactCount::append_value(std::string &s, Resources const &res)
if (ssn) {
char value[32]; // enough for UINT64_MAX
- int count = TSHttpSsnTransactionCount(ssn);
+ int count = TSHttpSsnTransactionCount(ssn);
int length = ink_fast_itoa(count, value, sizeof(value));
if (length > 0) {
TSDebug(PLUGIN_NAME, "Appending TXN-COUNT %s to evaluation value %.*s", _qualifier.c_str(), length, value);
@@ -753,7 +753,7 @@ const char *
ConditionGeo::get_geo_string(const sockaddr *addr) const
{
const char *ret = NULL;
- int v = 4;
+ int v = 4;
switch (_geo_qual) {
// Country database
@@ -770,7 +770,7 @@ ConditionGeo::get_geo_string(const sockaddr *addr) const
if (gGeoIP[GEOIP_COUNTRY_EDITION_V6]) {
geoipv6_t ip = reinterpret_cast<const struct sockaddr_in6 *>(addr)->sin6_addr;
- v = 6;
+ v = 6;
ret = GeoIP_country_code_by_ipnum_v6(gGeoIP[GEOIP_COUNTRY_EDITION_V6], ip);
}
} break;
@@ -794,7 +794,7 @@ ConditionGeo::get_geo_string(const sockaddr *addr) const
if (gGeoIP[GEOIP_ASNUM_EDITION_V6]) {
geoipv6_t ip = reinterpret_cast<const struct sockaddr_in6 *>(addr)->sin6_addr;
- v = 6;
+ v = 6;
ret = GeoIP_name_by_ipnum_v6(gGeoIP[GEOIP_ASNUM_EDITION_V6], ip);
}
} break;
@@ -815,7 +815,7 @@ int64_t
ConditionGeo::get_geo_int(const sockaddr *addr) const
{
int64_t ret = -1;
- int v = 4;
+ int v = 4;
switch (_geo_qual) {
// Country Databse
@@ -832,7 +832,7 @@ ConditionGeo::get_geo_int(const sockaddr *addr) const
if (gGeoIP[GEOIP_COUNTRY_EDITION_V6]) {
geoipv6_t ip = reinterpret_cast<const struct sockaddr_in6 *>(addr)->sin6_addr;
- v = 6;
+ v = 6;
ret = GeoIP_id_by_ipnum_v6(gGeoIP[GEOIP_COUNTRY_EDITION_V6], ip);
}
} break;
@@ -857,7 +857,7 @@ ConditionGeo::get_geo_int(const sockaddr *addr) const
if (gGeoIP[GEOIP_ASNUM_EDITION_V6]) {
geoipv6_t ip = reinterpret_cast<const struct sockaddr_in6 *>(addr)->sin6_addr;
- v = 6;
+ v = 6;
asn_name = GeoIP_name_by_ipnum_v6(gGeoIP[GEOIP_ASNUM_EDITION_V6], ip);
}
break;
diff --git a/plugins/header_rewrite/conditions.h b/plugins/header_rewrite/conditions.h
index 7a04b13..d6a195a 100644
--- a/plugins/header_rewrite/conditions.h
+++ b/plugins/header_rewrite/conditions.h
@@ -177,7 +177,7 @@ private:
return TS_ERROR;
start = buf;
- end = buf + buf_len;
+ end = buf + buf_len;
while (start < end) {
if (strncasecmp(start, name, name_len) != 0)
@@ -196,7 +196,7 @@ private:
;
*value_len = last - start;
- *value = start;
+ *value = start;
return TS_SUCCESS;
skip:
while (start < end) {
diff --git a/plugins/header_rewrite/expander.cc b/plugins/header_rewrite/expander.cc
index 8c33a2c..8c5238d 100644
--- a/plugins/header_rewrite/expander.cc
+++ b/plugins/header_rewrite/expander.cc
@@ -48,7 +48,7 @@ VariableExpander::expand(const Resources &res)
break;
std::string first_part = result.substr(0, start);
- std::string last_part = result.substr(end + 1);
+ std::string last_part = result.substr(end + 1);
// Now evaluate the variable
std::string variable = result.substr(start, end - start + 1);
diff --git a/plugins/header_rewrite/header_rewrite.cc b/plugins/header_rewrite/header_rewrite.cc
index 6b15288..6e817f3 100644
--- a/plugins/header_rewrite/header_rewrite.cc
+++ b/plugins/header_rewrite/header_rewrite.cc
@@ -28,7 +28,7 @@
#include "resources.h"
// Debugs
-const char PLUGIN_NAME[] = "header_rewrite";
+const char PLUGIN_NAME[] = "header_rewrite";
const char PLUGIN_NAME_DBG[] = "dbg_header_rewrite";
// Geo information, currently only Maxmind. These have to be initialized when the plugin loads.
@@ -255,7 +255,7 @@ RulesConfig::parse_config(const std::string fname, TSHttpHookID default_hook)
static int
cont_rewrite_headers(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
TSHttpHookID hook = TS_HTTP_LAST_HOOK;
RulesConfig *conf = static_cast<RulesConfig *>(TSContDataGet(contp));
@@ -316,8 +316,8 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)PLUGIN_NAME;
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)PLUGIN_NAME;
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TS_SUCCESS != TSPluginRegister(&info)) {
@@ -327,7 +327,7 @@ TSPluginInit(int argc, const char *argv[])
// Parse the global config file(s). All rules are just appended
// to the "global" Rules configuration.
RulesConfig *conf = new RulesConfig;
- bool got_config = false;
+ bool got_config = false;
initGeoIP();
conf->hold();
@@ -448,7 +448,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
}
TSRemapStatus rval = TSREMAP_NO_REMAP;
- RulesConfig *conf = static_cast<RulesConfig *>(ih);
+ RulesConfig *conf = static_cast<RulesConfig *>(ih);
// Go through all hooks we support, and setup the txn hook(s) as necessary
for (int i = TS_HTTP_READ_REQUEST_HDR_HOOK; i < TS_HTTP_LAST_HOOK; ++i) {
diff --git a/plugins/header_rewrite/header_rewrite_test.cc b/plugins/header_rewrite/header_rewrite_test.cc
index ed61801..73a3c6a 100644
--- a/plugins/header_rewrite/header_rewrite_test.cc
+++ b/plugins/header_rewrite/header_rewrite_test.cc
@@ -24,7 +24,7 @@
#include <cstdarg>
#include <parser.h>
-const char PLUGIN_NAME[] = "TEST_header_rewrite";
+const char PLUGIN_NAME[] = "TEST_header_rewrite";
const char PLUGIN_NAME_DBG[] = "TEST_dbg_header_rewrite";
extern "C" void
diff --git a/plugins/header_rewrite/operator.h b/plugins/header_rewrite/operator.h
index 846e5a7..d6190a7 100644
--- a/plugins/header_rewrite/operator.h
+++ b/plugins/header_rewrite/operator.h
@@ -35,7 +35,7 @@ enum OperModifiers {
OPER_NONE = 0,
OPER_LAST = 1,
OPER_NEXT = 2,
- OPER_QSA = 4,
+ OPER_QSA = 4,
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/header_rewrite/operators.cc b/plugins/header_rewrite/operators.cc
index b316879..4c6fcd7 100644
--- a/plugins/header_rewrite/operators.cc
+++ b/plugins/header_rewrite/operators.cc
@@ -174,7 +174,7 @@ OperatorSetDestination::exec(const Resources &res) const
TSMBuffer bufp;
TSMLoc url_m_loc;
if (res._rri) {
- bufp = res._rri->requestBufp;
+ bufp = res._rri->requestBufp;
url_m_loc = res._rri->requestUrl;
} else {
bufp = res.bufp;
@@ -215,7 +215,7 @@ OperatorSetDestination::exec(const Resources &res) const
} else {
// 1.6.4--Support for preserving QSA in case of set-destination
if (get_oper_modifiers() & OPER_QSA) {
- int query_len = 0;
+ int query_len = 0;
const char *query = TSUrlHttpQueryGet(bufp, url_m_loc, &query_len);
TSDebug(PLUGIN_NAME, "QSA mode, append original query string: %.*s", query_len, query);
// std::string connector = (value.find("?") == std::string::npos)? "?" : "&";
@@ -243,7 +243,7 @@ OperatorSetDestination::exec(const Resources &res) const
TSDebug(PLUGIN_NAME, "Would set destination URL to an empty value, skipping");
} else {
const char *start = _value.get_value().c_str();
- const char *end = _value.get_value().size() + start;
+ const char *end = _value.get_value().size() + start;
TSMLoc new_url_loc;
if (TSUrlCreate(bufp, &new_url_loc) == TS_SUCCESS && TSUrlParse(bufp, new_url_loc, &start, end) == TS_PARSE_DONE &&
TSHttpHdrUrlSet(bufp, res.hdr_loc, new_url_loc) == TS_SUCCESS) {
@@ -316,7 +316,7 @@ OperatorSetRedirect::exec(const Resources &res) const
TSMLoc url_loc;
if (remap) {
// Handle when called from remap plugin.
- bufp = res._rri->requestBufp;
+ bufp = res._rri->requestBufp;
url_loc = res._rri->requestUrl;
} else {
// Handle when not called from remap plugin.
@@ -330,9 +330,9 @@ OperatorSetRedirect::exec(const Resources &res) const
size_t pos_path = 0;
if ((pos_path = value.find("%{PATH}")) != std::string::npos) {
value.erase(pos_path, 7); // erase %{PATH} from the rewritten to url
- int path_len = 0;
+ int path_len = 0;
const char *path = NULL;
- path = TSUrlPathGet(bufp, url_loc, &path_len);
+ path = TSUrlPathGet(bufp, url_loc, &path_len);
if (path_len > 0) {
TSDebug(PLUGIN_NAME, "Find %%{PATH} in redirect url, replace it with: %.*s", path_len, path);
value.insert(pos_path, path, path_len);
@@ -340,9 +340,9 @@ OperatorSetRedirect::exec(const Resources &res) const
}
// Append the original query string
- int query_len = 0;
+ int query_len = 0;
const char *query = NULL;
- query = TSUrlHttpQueryGet(bufp, url_loc, &query_len);
+ query = TSUrlHttpQueryGet(bufp, url_loc, &query_len);
if ((get_oper_modifiers() & OPER_QSA) && (query_len > 0)) {
TSDebug(PLUGIN_NAME, "QSA mode, append original query string: %.*s", query_len, query);
std::string connector = (value.find("?") == std::string::npos) ? "?" : "&";
@@ -352,14 +352,14 @@ OperatorSetRedirect::exec(const Resources &res) const
// Prepare the destination URL for the redirect.
const char *start = value.c_str();
- const char *end = value.size() + start;
+ const char *end = value.size() + start;
if (remap) {
// Set new location.
TSUrlParse(bufp, url_loc, &start, end);
// Set the new status.
TSHttpTxnSetHttpRetStatus(res.txnp, (TSHttpStatus)_status.get_int_value());
const_cast<Resources &>(res).changed_url = true;
- res._rri->redirect = 1;
+ res._rri->redirect = 1;
} else {
// Set new location.
TSMLoc field_loc;
@@ -374,8 +374,8 @@ OperatorSetRedirect::exec(const Resources &res) const
// Set the new status code and reason.
TSHttpStatus status = (TSHttpStatus)_status.get_int_value();
- const char *reason = TSHttpHdrReasonLookup(status);
- size_t len = strlen(reason);
+ const char *reason = TSHttpHdrReasonLookup(status);
+ size_t len = strlen(reason);
TSHttpHdrStatusSet(res.bufp, res.hdr_loc, status);
TSHttpHdrReasonSet(res.bufp, res.hdr_loc, reason, len);
diff --git a/plugins/header_rewrite/parser.cc b/plugins/header_rewrite/parser.cc
index 609b5be..6069927 100644
--- a/plugins/header_rewrite/parser.cc
+++ b/plugins/header_rewrite/parser.cc
@@ -31,9 +31,9 @@
Parser::Parser(const std::string &line) : _cond(false), _empty(false)
{
TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for Parser");
- bool inquote = false;
- bool extracting_token = false;
- off_t cur_token_start = 0;
+ bool inquote = false;
+ bool extracting_token = false;
+ off_t cur_token_start = 0;
size_t cur_token_length = 0;
for (size_t i = 0; i < line.size(); ++i) {
if (!inquote && (std::isspace(line[i]) || (line[i] == '=' || line[i] == '>' || line[i] == '<'))) {
@@ -52,14 +52,14 @@ Parser::Parser(const std::string &line) : _cond(false), _empty(false)
continue; /* always eat whitespace */
} else if (line[i] == '"') {
if (!inquote && !extracting_token) {
- inquote = true;
+ inquote = true;
extracting_token = true;
- cur_token_start = i + 1; /* eat the leading quote */
+ cur_token_start = i + 1; /* eat the leading quote */
continue;
} else if (inquote && extracting_token) {
cur_token_length = i - cur_token_start;
_tokens.push_back(line.substr(cur_token_start, cur_token_length));
- inquote = false;
+ inquote = false;
extracting_token = false;
} else {
/* malformed */
@@ -82,7 +82,7 @@ Parser::Parser(const std::string &line) : _cond(false), _empty(false)
}
extracting_token = true;
- cur_token_start = i;
+ cur_token_start = i;
}
}
diff --git a/plugins/header_rewrite/regex_helper.cc b/plugins/header_rewrite/regex_helper.cc
index f3bbf60..f399fdf 100644
--- a/plugins/header_rewrite/regex_helper.cc
+++ b/plugins/header_rewrite/regex_helper.cc
@@ -20,12 +20,12 @@
bool
regexHelper::setRegexMatch(const std::string &s)
{
- const char *errorComp = NULL;
+ const char *errorComp = NULL;
const char *errorStudy = NULL;
int erroffset;
regexString = s;
- regex = pcre_compile(regexString.c_str(), 0, &errorComp, &erroffset, NULL);
+ regex = pcre_compile(regexString.c_str(), 0, &errorComp, &erroffset, NULL);
if (regex == NULL) {
return false;
diff --git a/plugins/header_rewrite/resources.cc b/plugins/header_rewrite/resources.cc
index d13d341..6d6321a 100644
--- a/plugins/header_rewrite/resources.cc
+++ b/plugins/header_rewrite/resources.cc
@@ -70,7 +70,7 @@ Resources::gather(const ResourceIDs ids, TSHttpHookID hook)
case TS_HTTP_READ_REQUEST_PRE_REMAP_HOOK:
// Read request from client
if (ids & RSRC_CLIENT_REQUEST_HEADERS) {
- bufp = client_bufp;
+ bufp = client_bufp;
hdr_loc = client_hdr_loc;
}
break;
@@ -94,7 +94,7 @@ Resources::gather(const ResourceIDs ids, TSHttpHookID hook)
// Pseudo-hook for a remap instance
if (client_bufp && client_hdr_loc) {
TSDebug(PLUGIN_NAME, "\tAdding TXN client request header buffers for remap instance");
- bufp = client_bufp;
+ bufp = client_bufp;
hdr_loc = client_hdr_loc;
}
break;
diff --git a/plugins/header_rewrite/resources.h b/plugins/header_rewrite/resources.h
index ca90fb1..2f2f271 100644
--- a/plugins/header_rewrite/resources.h
+++ b/plugins/header_rewrite/resources.h
@@ -37,12 +37,12 @@ extern GeoIP *gGeoIP[NUM_DB_TYPES];
#define TS_REMAP_PSEUDO_HOOK TS_HTTP_LAST_HOOK // Ugly, but use the "last hook" for remap instances.
enum ResourceIDs {
- RSRC_NONE = 0,
+ RSRC_NONE = 0,
RSRC_SERVER_RESPONSE_HEADERS = 1,
- RSRC_SERVER_REQUEST_HEADERS = 2,
- RSRC_CLIENT_REQUEST_HEADERS = 4,
+ RSRC_SERVER_REQUEST_HEADERS = 2,
+ RSRC_CLIENT_REQUEST_HEADERS = 4,
RSRC_CLIENT_RESPONSE_HEADERS = 8,
- RSRC_RESPONSE_STATUS = 16,
+ RSRC_RESPONSE_STATUS = 16,
};
///////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/header_rewrite/ruleset.cc b/plugins/header_rewrite/ruleset.cc
index 378a944..9b258ac 100644
--- a/plugins/header_rewrite/ruleset.cc
+++ b/plugins/header_rewrite/ruleset.cc
@@ -35,7 +35,7 @@ RuleSet::append(RuleSet *rule)
TSReleaseAssert(rule->next == NULL);
while (tmp->next)
- tmp = tmp->next;
+ tmp = tmp->next;
tmp->next = rule;
}
@@ -84,6 +84,6 @@ RuleSet::add_operator(Parser &p)
// Update some ruleset state based on this new operator
_opermods = static_cast<OperModifiers>(_opermods | _oper->get_oper_modifiers());
- _ids = static_cast<ResourceIDs>(_ids | _oper->get_resource_ids());
+ _ids = static_cast<ResourceIDs>(_ids | _oper->get_resource_ids());
}
}
diff --git a/plugins/header_rewrite/statement.cc b/plugins/header_rewrite/statement.cc
index a84d061..59e76ac 100644
--- a/plugins/header_rewrite/statement.cc
+++ b/plugins/header_rewrite/statement.cc
@@ -28,7 +28,7 @@ Statement::append(Statement *stmt)
TSReleaseAssert(stmt->_next == NULL);
while (tmp->_next)
- tmp = tmp->_next;
+ tmp = tmp->_next;
tmp->_next = stmt;
}
@@ -36,10 +36,10 @@ const ResourceIDs
Statement::get_resource_ids() const
{
const Statement *stmt = this;
- ResourceIDs ids = RSRC_NONE;
+ ResourceIDs ids = RSRC_NONE;
while (stmt) {
- ids = static_cast<ResourceIDs>(ids | stmt->_rsrc);
+ ids = static_cast<ResourceIDs>(ids | stmt->_rsrc);
stmt = stmt->_next;
}
diff --git a/plugins/header_rewrite/value.h b/plugins/header_rewrite/value.h
index 59eaaf2..62591c0 100644
--- a/plugins/header_rewrite/value.h
+++ b/plugins/header_rewrite/value.h
@@ -62,7 +62,7 @@ public:
// TODO: This is still not optimal, we should pre-parse the _value string here,
// and perhaps populate a per-Value VariableExpander that holds state.
} else {
- _int_value = strtol(_value.c_str(), NULL, 10);
+ _int_value = strtol(_value.c_str(), NULL, 10);
_float_value = strtod(_value.c_str(), NULL);
}
}
diff --git a/plugins/healthchecks/healthchecks.c b/plugins/healthchecks/healthchecks.c
index b6f262f..8b9ad6e 100644
--- a/plugins/healthchecks/healthchecks.c
+++ b/plugins/healthchecks/healthchecks.c
@@ -37,7 +37,7 @@ limitations under the License.
#include "ts/ink_defs.h"
static const char PLUGIN_NAME[] = "healthchecks";
-static const char SEPARATORS[] = " \t\n";
+static const char SEPARATORS[] = " \t\n";
#define MAX_PATH_LEN 4096
#define MAX_BODY_LEN 16384
@@ -136,7 +136,7 @@ find_direntry(const char *dname, HCDirEntry *dir)
static HCDirEntry *
setup_watchers(int fd)
{
- HCFileInfo *conf = g_config;
+ HCFileInfo *conf = g_config;
HCDirEntry *head_dir = NULL, *last_dir = NULL, *dir;
char fname[MAX_PATH_LEN];
char *dname;
@@ -157,10 +157,10 @@ setup_watchers(int fd)
head_dir = dir;
else
last_dir->_next = dir;
- last_dir = dir;
+ last_dir = dir;
}
conf->dir = dir;
- conf = conf->_next;
+ conf = conf->_next;
}
return head_dir;
@@ -213,7 +213,7 @@ hc_thread(void *data ATS_UNUSED)
break; /* Stop the loop, there's nothing else left to examine */
}
fdata_prev = fdata;
- fdata = fdata->_next;
+ fdata = fdata->_next;
}
if (len >= 0) {
@@ -221,7 +221,7 @@ hc_thread(void *data ATS_UNUSED)
while (i < len) {
struct inotify_event *event = (struct inotify_event *)&buffer[i];
- HCFileInfo *finfo = g_config;
+ HCFileInfo *finfo = g_config;
while (
finfo &&
@@ -249,8 +249,8 @@ hc_thread(void *data ATS_UNUSED)
/* Add the old data to the head of the freelist */
old_data->remove = now.tv_sec + FREELIST_TIMEOUT;
- old_data->_next = fl_head;
- fl_head = old_data;
+ old_data->_next = fl_head;
+ fl_head = old_data;
}
i += sizeof(struct inotify_event) + event->len;
}
@@ -285,7 +285,7 @@ gen_header(char *status_str, char *mime, int *header_len)
status_reason = TSHttpHdrReasonLookup(status);
len += strlen(status_reason);
len += strlen(mime);
- buf = TSmalloc(len);
+ buf = TSmalloc(len);
*header_len = snprintf(buf, len, HEADER_TEMPLATE, status, status_reason, mime);
} else {
*header_len = 0;
@@ -347,7 +347,7 @@ parse_configs(const char *fname)
/* Fill in the info if everything was ok */
if (state > 4) {
TSDebug(PLUGIN_NAME, "Parsed: %s %s %s %s %s", finfo->path, finfo->fname, mime, ok, miss);
- finfo->ok = gen_header(ok, mime, &finfo->o_len);
+ finfo->ok = gen_header(ok, mime, &finfo->o_len);
finfo->miss = gen_header(miss, mime, &finfo->m_len);
finfo->data = TSmalloc(sizeof(HCFileData));
memset(finfo->data, 0, sizeof(HCFileData));
@@ -453,10 +453,10 @@ hc_process_write(TSCont contp, TSEvent event, HCState *my_state)
static void
hc_process_accept(TSCont contp, HCState *my_state)
{
- my_state->req_buffer = TSIOBufferCreate();
+ my_state->req_buffer = TSIOBufferCreate();
my_state->resp_buffer = TSIOBufferCreate();
my_state->resp_reader = TSIOBufferReaderAlloc(my_state->resp_buffer);
- my_state->read_vio = TSVConnRead(my_state->net_vc, contp, my_state->req_buffer, INT64_MAX);
+ my_state->read_vio = TSVConnRead(my_state->net_vc, contp, my_state->req_buffer, INT64_MAX);
}
/* Imlement the server intercept */
@@ -487,11 +487,11 @@ health_check_origin(TSCont contp ATS_UNUSED, TSEvent event ATS_UNUSED, void *eda
TSMLoc hdr_loc = NULL, url_loc = NULL;
TSCont icontp;
HCState *my_state;
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
HCFileInfo *info = g_config;
if ((TS_SUCCESS == TSHttpTxnClientReqGet(txnp, &reqp, &hdr_loc)) && (TS_SUCCESS == TSHttpHdrUrlGet(reqp, hdr_loc, &url_loc))) {
- int path_len = 0;
+ int path_len = 0;
const char *path = TSUrlPathGet(reqp, url_loc, &path_len);
/* Short circuit the / path, common case, and we won't allow healthecks on / */
@@ -512,7 +512,7 @@ health_check_origin(TSCont contp ATS_UNUSED, TSEvent event ATS_UNUSED, void *eda
TSSkipRemappingSet(txnp, 1); /* not strictly necessary, but speed is everything these days */
/* This is us -- register our intercept */
- icontp = TSContCreate(hc_intercept, TSMutexCreate());
+ icontp = TSContCreate(hc_intercept, TSMutexCreate());
my_state = (HCState *)TSmalloc(sizeof(*my_state));
memset(my_state, 0, sizeof(*my_state));
my_state->info = info;
@@ -543,8 +543,8 @@ TSPluginInit(int argc, const char *argv[])
return;
}
- info.plugin_name = "health_checks";
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = "health_checks";
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TS_SUCCESS != TSPluginRegister(&info)) {
diff --git a/plugins/libloader/libloader.c b/plugins/libloader/libloader.c
index fe4fe52..c7e18f2 100644
--- a/plugins/libloader/libloader.c
+++ b/plugins/libloader/libloader.c
@@ -58,8 +58,8 @@ TSPluginInit(int argc, const char *argv[])
int i;
TSPluginRegistrationInfo info;
- info.plugin_name = (char *)"libloader";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"libloader";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
@@ -71,12 +71,12 @@ TSPluginInit(int argc, const char *argv[])
for (i = 1; i < argc; ++i) {
const char *lib = argv[i];
- void *handle = dlopen(lib, RTLD_GLOBAL | RTLD_NOW);
+ void *handle = dlopen(lib, RTLD_GLOBAL | RTLD_NOW);
if (handle) {
link_handle *l = TSmalloc(sizeof(link_handle));
- l->handle = handle;
- l->next = libs;
- libs = l;
+ l->handle = handle;
+ l->next = libs;
+ libs = l;
TSDebug("libloader", " loaded %s\n", lib);
} else {
TSError("[libloader] failed to load %s: %s\n", lib, dlerror());
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index a5960d9..c5b7818 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -51,19 +51,19 @@ static const char *PLUGIN_NAME = "regex_remap";
// Constants
static const int OVECCOUNT = 30; // We support $0 - $9 x2 ints, and this needs to be 1.5x that
-static const int MAX_SUBS = 32; // No more than 32 substitution variables in the subst string
+static const int MAX_SUBS = 32; // No more than 32 substitution variables in the subst string
// Substitutions other than regex matches
enum ExtraSubstitutions {
- SUB_HOST = 11,
- SUB_FROM_HOST = 12,
- SUB_TO_HOST = 13,
- SUB_PORT = 14,
- SUB_SCHEME = 15,
- SUB_PATH = 16,
- SUB_QUERY = 17,
- SUB_MATRIX = 18,
- SUB_CLIENT_IP = 19,
+ SUB_HOST = 11,
+ SUB_FROM_HOST = 12,
+ SUB_TO_HOST = 13,
+ SUB_PORT = 14,
+ SUB_SCHEME = 15,
+ SUB_PATH = 16,
+ SUB_QUERY = 17,
+ SUB_MATRIX = 18,
+ SUB_CLIENT_IP = 19,
SUB_LOWER_PATH = 20,
};
@@ -92,11 +92,11 @@ struct UrlComponents {
populate(TSRemapRequestInfo *rri)
{
scheme = TSUrlSchemeGet(rri->requestBufp, rri->requestUrl, &scheme_len);
- host = TSUrlHostGet(rri->requestBufp, rri->requestUrl, &host_len);
- path = TSUrlPathGet(rri->requestBufp, rri->requestUrl, &path_len);
- query = TSUrlHttpQueryGet(rri->requestBufp, rri->requestUrl, &query_len);
+ host = TSUrlHostGet(rri->requestBufp, rri->requestUrl, &host_len);
+ path = TSUrlPathGet(rri->requestBufp, rri->requestUrl, &path_len);
+ query = TSUrlHttpQueryGet(rri->requestBufp, rri->requestUrl, &query_len);
matrix = TSUrlHttpParamsGet(rri->requestBufp, rri->requestUrl, &matrix_len);
- port = TSUrlPortGet(rri->requestBufp, rri->requestUrl);
+ port = TSUrlPortGet(rri->requestBufp, rri->requestUrl);
url_len = scheme_len + host_len + path_len + query_len + matrix_len + 32;
}
@@ -310,10 +310,10 @@ RemapRegex::initialize(const std::string ®, const std::string &sub, const std
_rex_string = NULL;
if (!sub.empty()) {
- _subst = TSstrdup(sub.c_str());
+ _subst = TSstrdup(sub.c_str());
_subst_len = sub.length();
} else {
- _subst = NULL;
+ _subst = NULL;
_subst_len = 0;
}
@@ -381,7 +381,7 @@ RemapRegex::initialize(const std::string ®, const std::string &sub, const std
break;
case TS_RECORDDATATYPE_STRING:
cur->data.rec_string = TSstrdup(opt_val.c_str());
- cur->data_len = opt_val.size();
+ cur->data_len = opt_val.size();
break;
default:
TSError("[%s] configuration variable '%s' is of an unsupported type", PLUGIN_NAME, opt_name.c_str());
@@ -390,7 +390,7 @@ RemapRegex::initialize(const std::string ®, const std::string &sub, const std
}
if (cur) {
TSDebug(PLUGIN_NAME, "Overridable config %s=%s", opt_name.c_str(), opt_val.c_str());
- cur->key = key;
+ cur->key = key;
cur->type = type;
cur->next = NULL;
if (NULL == last_override) {
@@ -437,7 +437,7 @@ RemapRegex::compile(const char **error, int *erroffset)
}
// Get some info for the string substitutions
- str = _subst;
+ str = _subst;
_num_subs = 0;
while (str && *str) {
@@ -489,7 +489,7 @@ RemapRegex::compile(const char **error, int *erroffset)
return -1; // No substitutions available other than $0
}
- _sub_ix[_num_subs] = ix;
+ _sub_ix[_num_subs] = ix;
_sub_pos[_num_subs] = (str - _subst);
str += 2;
++_num_subs;
@@ -574,7 +574,7 @@ RemapRegex::substitute(char dest[], const char *src, const int ovector[], const
for (int i = 0; i < _num_subs; i++) {
char *start = p1;
- int ix = _sub_ix[i];
+ int ix = _sub_ix[i];
memcpy(p1, p2, _sub_pos[i] - prev);
p1 += (_sub_pos[i] - prev);
@@ -583,7 +583,7 @@ RemapRegex::substitute(char dest[], const char *src, const int ovector[], const
p1 += lengths[ix];
} else {
const char *str = NULL;
- int len = 0;
+ int len = 0;
switch (ix) {
case SUB_HOST:
@@ -697,7 +697,7 @@ void
setup_memory_allocation()
{
pcre_malloc = &ts_malloc;
- pcre_free = &ts_free;
+ pcre_free = &ts_free;
}
///////////////////////////////////////////////////////////////////////////////
@@ -734,7 +734,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
std::ifstream f;
int lineno = 0;
- int count = 0;
+ int count = 0;
*ih = (void *)ri;
if (ri == NULL) {
@@ -811,17 +811,17 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char * /* errbuf ATS_UNUSE
pos2 = line.find_first_of(" \t\n", pos1);
if (pos2 != std::string::npos) {
regex = line.substr(pos1, pos2 - pos1);
- pos1 = line.find_first_not_of(" \t\n#", pos2);
+ pos1 = line.find_first_not_of(" \t\n#", pos2);
if (pos1 != std::string::npos) {
pos2 = line.find_first_of(" \t\n", pos1);
if (pos2 == std::string::npos)
pos2 = line.length();
- subst = line.substr(pos1, pos2 - pos1);
- pos1 = line.find_first_not_of(" \t\n#", pos2);
+ subst = line.substr(pos1, pos2 - pos1);
+ pos1 = line.find_first_not_of(" \t\n#", pos2);
if (pos1 != std::string::npos) {
pos2 = line.find_first_of("\n#", pos1);
if (pos2 == std::string::npos)
- pos2 = line.length();
+ pos2 = line.length();
options = line.substr(pos1, pos2 - pos1);
}
}
@@ -920,7 +920,7 @@ TSRemapDeleteInstance(void *ih)
delete tmp;
}
tmp = re;
- re = re->next();
+ re = re->next();
delete tmp;
}
@@ -947,8 +947,8 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
int lengths[OVECCOUNT / 2 + 1];
int dest_len;
TSRemapStatus retval = TSREMAP_DID_REMAP;
- RemapRegex *re = ri->first;
- int match_len = 0;
+ RemapRegex *re = ri->first;
+ int match_len = 0;
char *match_buf;
match_buf = (char *)alloca(req_url.url_len + 32);
@@ -1051,7 +1051,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
if (new_len > 0) {
char *dest;
- dest = (char *)alloca(new_len + 8);
+ dest = (char *)alloca(new_len + 8);
dest_len = re->substitute(dest, match_buf, ovector, lengths, rri, &req_url, lowercase_substitutions);
TSDebug(PLUGIN_NAME, "New URL is estimated to be %d bytes long, or less", new_len);
diff --git a/plugins/stats_over_http/stats_over_http.c b/plugins/stats_over_http/stats_over_http.c
index bf90a53..48733c2 100644
--- a/plugins/stats_over_http/stats_over_http.c
+++ b/plugins/stats_over_http/stats_over_http.c
@@ -43,7 +43,7 @@ static const char *url_path = "_stats";
static int url_path_len;
static bool integer_counters = false;
-static bool wrap_counters = false;
+static bool wrap_counters = false;
typedef struct stats_state_t {
TSVConn net_vc;
@@ -78,10 +78,10 @@ stats_cleanup(TSCont contp, stats_state *my_state)
static void
stats_process_accept(TSCont contp, stats_state *my_state)
{
- my_state->req_buffer = TSIOBufferCreate();
+ my_state->req_buffer = TSIOBufferCreate();
my_state->resp_buffer = TSIOBufferCreate();
my_state->resp_reader = TSIOBufferReaderAlloc(my_state->resp_buffer);
- my_state->read_vio = TSVConnRead(my_state->net_vc, contp, my_state->req_buffer, INT64_MAX);
+ my_state->read_vio = TSVConnRead(my_state->net_vc, contp, my_state->req_buffer, INT64_MAX);
}
static int
@@ -249,7 +249,7 @@ stats_origin(TSCont contp ATS_UNUSED, TSEvent event ATS_UNUSED, void *edata)
if (TSHttpHdrUrlGet(reqp, hdr_loc, &url_loc) != TS_SUCCESS)
goto cleanup;
- int path_len = 0;
+ int path_len = 0;
const char *path = TSUrlPathGet(reqp, url_loc, &path_len);
TSDebug(PLUGIN_NAME, "Path: %.*s", path_len, path);
@@ -262,7 +262,7 @@ stats_origin(TSCont contp ATS_UNUSED, TSEvent event ATS_UNUSED, void *edata)
/* This is us -- register our intercept */
TSDebug(PLUGIN_NAME, "Intercepting request");
- icontp = TSContCreate(stats_dostuff, TSMutexCreate());
+ icontp = TSContCreate(stats_dostuff, TSMutexCreate());
my_state = (stats_state *)TSmalloc(sizeof(*my_state));
memset(my_state, 0, sizeof(*my_state));
TSContDataSet(icontp, my_state);
@@ -286,13 +286,13 @@ TSPluginInit(int argc, const char *argv[])
{
TSPluginRegistrationInfo info;
- static const char usage[] = PLUGIN_NAME ".so [--integer-counters] [PATH]";
+ static const char usage[] = PLUGIN_NAME ".so [--integer-counters] [PATH]";
static const struct option longopts[] = {{(char *)("integer-counters"), required_argument, NULL, 'i'},
{(char *)("wrap-counters"), required_argument, NULL, 'w'},
{NULL, 0, NULL, 0}};
- info.plugin_name = PLUGIN_NAME;
- info.vendor_name = "Apache Software Foundation";
+ info.plugin_name = PLUGIN_NAME;
+ info.vendor_name = "Apache Software Foundation";
info.support_email = "dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc
index b13093f..2002973 100644
--- a/plugins/tcpinfo/tcpinfo.cc
+++ b/plugins/tcpinfo/tcpinfo.cc
@@ -170,32 +170,32 @@ tcp_info_hook(TSCont contp, TSEvent event, void *edata)
{
TSHttpSsn ssnp = NULL;
TSHttpTxn txnp = NULL;
- int random = 0;
+ int random = 0;
Config *config = (Config *)TSContDataGet(contp);
const char *event_name;
switch (event) {
case TS_EVENT_HTTP_SSN_START:
- ssnp = (TSHttpSsn)edata;
+ ssnp = (TSHttpSsn)edata;
event_name = "ssn_start";
break;
case TS_EVENT_HTTP_TXN_START:
- txnp = (TSHttpTxn)edata;
- ssnp = TSHttpTxnSsnGet(txnp);
+ txnp = (TSHttpTxn)edata;
+ ssnp = TSHttpTxnSsnGet(txnp);
event_name = "txn_start";
break;
case TS_EVENT_HTTP_TXN_CLOSE:
- txnp = (TSHttpTxn)edata;
- ssnp = TSHttpTxnSsnGet(txnp);
+ txnp = (TSHttpTxn)edata;
+ ssnp = TSHttpTxnSsnGet(txnp);
event_name = "txn_close";
break;
case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
- txnp = (TSHttpTxn)edata;
- ssnp = TSHttpTxnSsnGet(txnp);
+ txnp = (TSHttpTxn)edata;
+ ssnp = TSHttpTxnSsnGet(txnp);
event_name = "send_resp_hdr";
break;
case TS_EVENT_HTTP_SSN_CLOSE:
- ssnp = (TSHttpSsn)edata;
+ ssnp = (TSHttpSsn)edata;
event_name = "ssn_close";
break;
default:
@@ -298,7 +298,7 @@ parse_hook_list(const char *hook_list)
void
TSPluginInit(int argc, const char *argv[])
{
- static const char usage[] = "tcpinfo.so [--log-file=PATH] [--log-level=LEVEL] [--hooks=LIST] [--sample-rate=COUNT]";
+ static const char usage[] = "tcpinfo.so [--log-file=PATH] [--log-level=LEVEL] [--hooks=LIST] [--sample-rate=COUNT]";
static const struct option longopts[] = {{const_cast<char *>("sample-rate"), required_argument, NULL, 'r'},
{const_cast<char *>("log-file"), required_argument, NULL, 'f'},
{const_cast<char *>("log-level"), required_argument, NULL, 'l'},
@@ -306,13 +306,13 @@ TSPluginInit(int argc, const char *argv[])
{NULL, 0, NULL, 0}};
TSPluginRegistrationInfo info;
- Config *config = new Config();
+ Config *config = new Config();
const char *filename = "tcpinfo";
TSCont cont;
unsigned hooks = 0;
- info.plugin_name = (char *)"tcpinfo";
- info.vendor_name = (char *)"Apache Software Foundation";
+ info.plugin_name = (char *)"tcpinfo";
+ info.vendor_name = (char *)"Apache Software Foundation";
info.support_email = (char *)"dev@trafficserver.apache.org";
if (TSPluginRegister(&info) != TS_SUCCESS) {
diff --git a/proxy/AbstractBuffer.cc b/proxy/AbstractBuffer.cc
index 6ecb90f..49a31ca 100644
--- a/proxy/AbstractBuffer.cc
+++ b/proxy/AbstractBuffer.cc
@@ -185,13 +185,13 @@ AbstractBuffer::initialize()
if (!unaligned_buffer) {
unaligned_buffer = new char[size + 511];
- buffer = (char *)align_pointer_forward(unaligned_buffer, 512);
+ buffer = (char *)align_pointer_forward(unaligned_buffer, 512);
}
vs_history[AB_STATE_READ_WRITE] = vs;
vs.s.offset = 0;
- vs.s.state = AB_STATE_READ_WRITE;
+ vs.s.state = AB_STATE_READ_WRITE;
}
/*-------------------------------------------------------------------------
@@ -272,7 +272,7 @@ AbstractBuffer::destroy()
vs_history[AB_STATE_UNUSED] = vs;
vs.s.offset = 0;
- vs.s.state = AB_STATE_UNUSED;
+ vs.s.state = AB_STATE_UNUSED;
}
/*-------------------------------------------------------------------------
@@ -290,6 +290,6 @@ AbstractBuffer::clear()
vs.s.writer_count = 0;
vs.s.reader_count = 0;
- vs.s.offset = 0;
- vs.s.state = AB_STATE_UNUSED;
+ vs.s.offset = 0;
+ vs.s.state = AB_STATE_UNUSED;
}
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index d344979..d8f81b4 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -129,7 +129,7 @@ void
initCacheControl()
{
ink_assert(CacheControlTable == NULL);
- reconfig_mutex = new_ProxyMutex();
+ reconfig_mutex = new_ProxyMutex();
CacheControlTable = new CC_table("proxy.config.cache.control.filename", modulePrefix, &http_dest_tags);
REC_RegisterConfigUpdateFunc("proxy.config.cache.control.filename", cacheControlFile_CB, NULL);
}
@@ -262,14 +262,14 @@ CacheControlRecord::Init(matcher_line *line_info)
// First pass for optional tweaks.
for (int i = 0; i < MATCHER_MAX_TOKENS && line_info->num_el; ++i) {
bool used = false;
- label = line_info->line[0][i];
- val = line_info->line[1][i];
+ label = line_info->line[0][i];
+ val = line_info->line[1][i];
if (!label)
continue;
if (strcasecmp(label, TWEAK_CACHE_RESPONSES_TO_COOKIES) == 0) {
char *ptr = 0;
- int v = strtol(val, &ptr, 0);
+ int v = strtol(val, &ptr, 0);
if (!ptr || v < 0 || v > 4) {
return config_parse_error("Value for " TWEAK_CACHE_RESPONSES_TO_COOKIES " must be an integer in the range 0..4");
} else {
@@ -288,7 +288,7 @@ CacheControlRecord::Init(matcher_line *line_info)
// Now look for the directive.
for (int i = 0; i < MATCHER_MAX_TOKENS; i++) {
label = line_info->line[0][i];
- val = line_info->line[1][i];
+ val = line_info->line[1][i];
if (label == NULL) {
continue;
@@ -297,36 +297,36 @@ CacheControlRecord::Init(matcher_line *line_info)
if (strcasecmp(label, "action") == 0) {
if (strcasecmp(val, "never-cache") == 0) {
directive = CC_NEVER_CACHE;
- d_found = true;
+ d_found = true;
} else if (strcasecmp(val, "standard-cache") == 0) {
directive = CC_STANDARD_CACHE;
- d_found = true;
+ d_found = true;
} else if (strcasecmp(val, "ignore-no-cache") == 0) {
directive = CC_IGNORE_NO_CACHE;
- d_found = true;
+ d_found = true;
} else if (strcasecmp(val, "cluster-cache-local") == 0) {
directive = CC_CLUSTER_CACHE_LOCAL;
;
d_found = true;
} else if (strcasecmp(val, "ignore-client-no-cache") == 0) {
directive = CC_IGNORE_CLIENT_NO_CACHE;
- d_found = true;
+ d_found = true;
} else if (strcasecmp(val, "ignore-server-no-cache") == 0) {
directive = CC_IGNORE_SERVER_NO_CACHE;
- d_found = true;
+ d_found = true;
} else {
return config_parse_error("%s Invalid action at line %d in cache.config", modulePrefix, line_num);
}
} else {
if (strcasecmp(label, "revalidate") == 0) {
directive = CC_REVALIDATE_AFTER;
- d_found = true;
+ d_found = true;
} else if (strcasecmp(label, "pin-in-cache") == 0) {
directive = CC_PIN_IN_CACHE;
- d_found = true;
+ d_found = true;
} else if (strcasecmp(label, "ttl-in-cache") == 0) {
directive = CC_TTL_IN_CACHE;
- d_found = true;
+ d_found = true;
}
// Process the time argument for the remaining directives
if (d_found == true) {
@@ -371,30 +371,30 @@ CacheControlRecord::Init(matcher_line *line_info)
void
CacheControlRecord::UpdateMatch(CacheControlResult *result, RequestData *rdata)
{
- bool match = false;
+ bool match = false;
HttpRequestData *h_rdata = (HttpRequestData *)rdata;
switch (this->directive) {
case CC_REVALIDATE_AFTER:
if (this->CheckForMatch(h_rdata, result->reval_line) == true) {
result->revalidate_after = time_arg;
- result->reval_line = this->line_num;
- match = true;
+ result->reval_line = this->line_num;
+ match = true;
}
break;
case CC_NEVER_CACHE:
if (this->CheckForMatch(h_rdata, result->never_line) == true) {
result->never_cache = true;
- result->never_line = this->line_num;
- match = true;
+ result->never_line = this->line_num;
+ match = true;
}
break;
case CC_STANDARD_CACHE:
// Standard cache just overrides never-cache
if (this->CheckForMatch(h_rdata, result->never_line) == true) {
result->never_cache = false;
- result->never_line = this->line_num;
- match = true;
+ result->never_line = this->line_num;
+ match = true;
}
break;
case CC_IGNORE_NO_CACHE:
@@ -403,8 +403,8 @@ CacheControlRecord::UpdateMatch(CacheControlResult *result, RequestData *rdata)
case CC_IGNORE_CLIENT_NO_CACHE:
if (this->CheckForMatch(h_rdata, result->ignore_client_line) == true) {
result->ignore_client_no_cache = true;
- result->ignore_client_line = this->line_num;
- match = true;
+ result->ignore_client_line = this->line_num;
+ match = true;
}
if (this->directive != CC_IGNORE_NO_CACHE) {
break;
@@ -413,32 +413,32 @@ CacheControlRecord::UpdateMatch(CacheControlResult *result, RequestData *rdata)
case CC_IGNORE_SERVER_NO_CACHE:
if (this->CheckForMatch(h_rdata, result->ignore_server_line) == true) {
result->ignore_server_no_cache = true;
- result->ignore_server_line = this->line_num;
- match = true;
+ result->ignore_server_line = this->line_num;
+ match = true;
}
break;
case CC_CLUSTER_CACHE_LOCAL:
if (this->CheckForMatch(h_rdata, result->cluster_cache_local_line) == true) {
- result->cluster_cache_local = true;
+ result->cluster_cache_local = true;
result->cluster_cache_local_line = this->line_num;
- match = true;
+ match = true;
}
break;
case CC_PIN_IN_CACHE:
if (this->CheckForMatch(h_rdata, result->pin_line) == true) {
result->pin_in_cache_for = time_arg;
- result->pin_line = this->line_num;
- match = true;
+ result->pin_line = this->line_num;
+ match = true;
}
break;
case CC_TTL_IN_CACHE:
if (this->CheckForMatch(h_rdata, result->ttl_line) == true) {
result->ttl_in_cache = time_arg;
- result->ttl_line = this->line_num;
+ result->ttl_line = this->line_num;
// ttl-in-cache overrides never-cache
result->never_cache = false;
- result->never_line = this->line_num;
- match = true;
+ result->never_line = this->line_num;
+ match = true;
}
break;
case CC_INVALID:
diff --git a/proxy/ControlBase.cc b/proxy/ControlBase.cc
index a1a7c88..b200c29 100644
--- a/proxy/ControlBase.cc
+++ b/proxy/ControlBase.cc
@@ -141,9 +141,9 @@ TimeMod::make(char *value, char const **error)
const char *
TimeMod::timeOfDayToSeconds(const char *time_str, time_t *seconds)
{
- int hour = 0;
- int min = 0;
- int sec = 0;
+ int hour = 0;
+ int min = 0;
+ int sec = 0;
time_t tmp = 0;
// coverity[secure_coding]
@@ -327,7 +327,7 @@ SrcIPMod::make(char *value, char const **error)
{
SrcIPMod tmp;
SrcIPMod *zret = 0;
- *error = ExtractIpRange(value, &tmp.start_addr.sa, &tmp.end_addr.sa);
+ *error = ExtractIpRange(value, &tmp.start_addr.sa, &tmp.end_addr.sa);
if (!*error)
zret = new SrcIPMod(tmp);
@@ -387,7 +387,7 @@ SchemeMod *
SchemeMod::make(char *value, char const **error)
{
SchemeMod *zret = 0;
- int scheme = hdrtoken_tokenize(value, strlen(value));
+ int scheme = hdrtoken_tokenize(value, strlen(value));
if (scheme < 0) {
*error = "Unknown scheme";
} else {
@@ -534,7 +534,7 @@ PrefixMod::check(HttpRequestData *req) const
{
int path_len;
char const *path = req->hdr->url_get()->path_get(&path_len);
- bool zret = path_len >= static_cast<int>(text.size()) && 0 == memcmp(path, text.data(), text.size());
+ bool zret = path_len >= static_cast<int>(text.size()) && 0 == memcmp(path, text.data(), text.size());
/*
Debug("cache_control", "Prefix check: URL=%0.*s Mod=%0.*s Z=%s",
path_len, path, text.size(), text.data(),
@@ -721,7 +721,7 @@ char const *
ControlBase::getSchemeModText() const
{
char const *zret = 0;
- Modifier *mod = this->findModOfType(Modifier::MOD_SCHEME);
+ Modifier *mod = this->findModOfType(Modifier::MOD_SCHEME);
if (mod)
zret = static_cast<SchemeMod *>(mod)->getWksText();
return zret;
@@ -769,7 +769,7 @@ ControlBase::ProcessModifiers(matcher_line *line_info)
{
// Variables for error processing
const char *errBuf = NULL;
- mod_errors err = ME_UNKNOWN;
+ mod_errors err = ME_UNKNOWN;
int n_elts = line_info->num_el; // Element count for line.
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 50d4020..ddbbecc 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -143,7 +143,7 @@ HostMatcher<Data, Result>::AllocateSpace(int num_entries)
data_array = new Data[num_entries];
array_len = num_entries;
- num_el = 0;
+ num_el = 0;
}
// void HostMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
@@ -290,11 +290,11 @@ UrlMatcher<Data, Result>::AllocateSpace(int num_entries)
ink_assert(array_len == -1);
data_array = new Data[num_entries];
- url_value = new int[num_entries];
- url_str = new char *[num_entries];
+ url_value = new int[num_entries];
+ url_str = new char *[num_entries];
memset(url_str, 0, sizeof(char *) * num_entries);
array_len = num_entries;
- num_el = 0;
+ num_el = 0;
}
//
@@ -333,7 +333,7 @@ UrlMatcher<Data, Result>::NewEntry(matcher_line *line_info)
cur_d = data_array + num_el;
error = cur_d->Init(line_info);
if (error) {
- url_str[num_el] = ats_strdup(pattern);
+ url_str[num_el] = ats_strdup(pattern);
url_value[num_el] = num_el;
ink_hash_table_insert(url_ht, url_str[num_el], (void *)&url_value[num_el]);
num_el++;
@@ -435,7 +435,7 @@ RegexMatcher<Data, Result>::AllocateSpace(int num_entries)
memset(re_str, 0, sizeof(char *) * num_entries);
array_len = num_entries;
- num_el = 0;
+ num_el = 0;
}
//
@@ -614,7 +614,7 @@ IpMatcher<Data, Result>::AllocateSpace(int num_entries)
data_array = new Data[num_entries];
array_len = num_entries;
- num_el = 0;
+ num_el = 0;
}
//
@@ -707,7 +707,7 @@ ControlMatcher<Data, Result>::ControlMatcher(const char *file_var, const char *n
config_tags = tags;
ink_assert(config_tags != NULL);
- matcher_name = name;
+ matcher_name = name;
config_file_path[0] = '\0';
if (!(flags & DONT_BUILD_TABLE)) {
@@ -717,11 +717,11 @@ ControlMatcher<Data, Result>::ControlMatcher(const char *file_var, const char *n
ink_strlcpy(config_file_path, config_path, sizeof(config_file_path));
}
- reMatch = NULL;
- urlMatch = NULL;
+ reMatch = NULL;
+ urlMatch = NULL;
hostMatch = NULL;
- ipMatch = NULL;
- hrMatch = NULL;
+ ipMatch = NULL;
+ hrMatch = NULL;
if (!(flags & DONT_BUILD_TABLE)) {
m_numEntries = this->BuildTable();
@@ -807,17 +807,17 @@ ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
matcher_line *first = NULL;
matcher_line *current;
matcher_line *last = NULL;
- int line_num = 0;
- int second_pass = 0;
- int numEntries = 0;
- bool alarmAlready = false;
+ int line_num = 0;
+ int second_pass = 0;
+ int numEntries = 0;
+ bool alarmAlready = false;
// type counts
int hostDomain = 0;
- int regex = 0;
- int url = 0;
- int ip = 0;
- int hostregex = 0;
+ int regex = 0;
+ int url = 0;
+ int ip = 0;
+ int hostregex = 0;
if (bufTok.Initialize(file_buf, SHARE_TOKS | ALLOW_EMPTY_TOKS) == 0) {
// We have an empty file
@@ -837,7 +837,7 @@ ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
const char *errptr;
current = (matcher_line *)ats_malloc(sizeof(matcher_line));
- errptr = parseConfigLine((char *)tmp, current, config_tags);
+ errptr = parseConfigLine((char *)tmp, current, config_tags);
if (errptr != NULL) {
if (config_tags != &socks_server_tags) {
@@ -878,7 +878,7 @@ ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
first = last = current;
} else {
last->next = current;
- last = current;
+ last = current;
}
}
}
@@ -945,7 +945,7 @@ ControlMatcher<Data, Result>::BuildTableFromString(char *file_buf)
}
// Deallocate the parsing structure
- last = current;
+ last = current;
current = current->next;
ats_free(last);
}
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 4682fb1..8592ec4 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -121,8 +121,8 @@ public:
// depending on how the module user wants to key
// the table
virtual ~RequestData() {}
- virtual char *get_string() = 0;
- virtual const char *get_host() = 0;
+ virtual char *get_string() = 0;
+ virtual const char *get_host() = 0;
virtual sockaddr const *get_ip() = 0;
virtual sockaddr const *get_client_ip() = 0;
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index 3267bb7..c5bb28c 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -94,7 +94,7 @@
#define __p_type p_type // ugly hack? - see resolv.h
#define D(x) x /* for debugging */
intptr_t f1, f2;
-int framepointer = 0;
+int framepointer = 0;
int program_counter = 0;
#endif // linux check
@@ -122,7 +122,7 @@ HTTPHdrImpl *global_http;
HttpSM *last_seen_http_sm = NULL;
char ethread_ptr_str[256] = "";
-char netvc_ptr_str[256] = "";
+char netvc_ptr_str[256] = "";
HdrHeap *swizzle_heap;
char *ptr_data;
@@ -172,36 +172,36 @@ CoreUtils::insert_table(intptr_t vaddr1, intptr_t offset1, intptr_t fsize1)
if (arrayMem.length() == 0) {
arrayMem(0);
- arrayMem[(intptr_t)0].vaddr = vaddr1;
+ arrayMem[(intptr_t)0].vaddr = vaddr1;
arrayMem[(intptr_t)0].offset = offset1;
- arrayMem[(intptr_t)0].fsize = fsize1;
+ arrayMem[(intptr_t)0].fsize = fsize1;
} else {
intptr_t index = find_vaddr(vaddr1, arrayMem.length(), 0);
if (index == arrayMem.length()) {
arrayMem(index);
- arrayMem[index].vaddr = vaddr1;
+ arrayMem[index].vaddr = vaddr1;
arrayMem[index].offset = offset1;
- arrayMem[index].fsize = fsize1;
+ arrayMem[index].fsize = fsize1;
} else if (index == 0) {
arrayMem(arrayMem.length());
for (intptr_t i = 0; i < arrayMem.length(); i++) {
- arrayMem[arrayMem.length() - i - 1].vaddr = arrayMem[arrayMem.length() - i - 2].vaddr;
+ arrayMem[arrayMem.length() - i - 1].vaddr = arrayMem[arrayMem.length() - i - 2].vaddr;
arrayMem[arrayMem.length() - i - 1].offset = arrayMem[arrayMem.length() - i - 2].offset;
- arrayMem[arrayMem.length() - i - 1].fsize = arrayMem[arrayMem.length() - i - 2].fsize;
+ arrayMem[arrayMem.length() - i - 1].fsize = arrayMem[arrayMem.length() - i - 2].fsize;
}
- arrayMem[(intptr_t)0].vaddr = vaddr1;
+ arrayMem[(intptr_t)0].vaddr = vaddr1;
arrayMem[(intptr_t)0].offset = offset1;
- arrayMem[(intptr_t)0].fsize = fsize1;
+ arrayMem[(intptr_t)0].fsize = fsize1;
} else {
arrayMem(arrayMem.length());
for (intptr_t i = 1; i < arrayMem.length() - index; i++) {
- arrayMem[arrayMem.length() - i].vaddr = arrayMem[arrayMem.length() - i - 1].vaddr;
+ arrayMem[arrayMem.length() - i].vaddr = arrayMem[arrayMem.length() - i - 1].vaddr;
arrayMem[arrayMem.length() - i].offset = arrayMem[arrayMem.length() - i - 1].offset;
- arrayMem[arrayMem.length() - i].fsize = arrayMem[arrayMem.length() - i - 1].fsize;
+ arrayMem[arrayMem.length() - i].fsize = arrayMem[arrayMem.length() - i - 1].fsize;
}
- arrayMem[index].vaddr = vaddr1;
+ arrayMem[index].vaddr = vaddr1;
arrayMem[index].offset = offset1;
- arrayMem[index].fsize = fsize1;
+ arrayMem[index].fsize = fsize1;
}
}
}
@@ -211,10 +211,10 @@ CoreUtils::insert_table(intptr_t vaddr1, intptr_t offset1, intptr_t fsize1)
intptr_t
CoreUtils::read_from_core(intptr_t vaddr, intptr_t bytes, char *buf)
{
- intptr_t index = find_vaddr(vaddr, arrayMem.length(), 0);
- intptr_t vadd = arrayMem[index - 1].vaddr;
- intptr_t offset = arrayMem[index - 1].offset;
- intptr_t size = arrayMem[index - 1].fsize;
+ intptr_t index = find_vaddr(vaddr, arrayMem.length(), 0);
+ intptr_t vadd = arrayMem[index - 1].vaddr;
+ intptr_t offset = arrayMem[index - 1].offset;
+ intptr_t size = arrayMem[index - 1].fsize;
intptr_t offset2 = std::abs(vaddr - vadd);
if (bytes > (size - offset2))
@@ -251,11 +251,11 @@ CoreUtils::get_base_frame(intptr_t framep, core_stack_state *coress)
{
// finds vaddress less than framep
intptr_t index = find_vaddr(framep, arrayMem.length(), 0);
- intptr_t vadd = arrayMem[index - 1].vaddr;
- intptr_t off = arrayMem[index - 1].offset;
- intptr_t off2 = std::abs(vadd - framep);
- intptr_t size = arrayMem[index - 1].fsize;
- intptr_t i = 0;
+ intptr_t vadd = arrayMem[index - 1].vaddr;
+ intptr_t off = arrayMem[index - 1].offset;
+ intptr_t off2 = std::abs(vadd - framep);
+ intptr_t size = arrayMem[index - 1].fsize;
+ intptr_t i = 0;
memset(coress, 0, sizeof(*coress));
D(printf("stkbase=%p\n", (void *)(vadd + size)));
@@ -288,14 +288,14 @@ CoreUtils::get_base_frame(intptr_t framep, core_stack_state *coress)
int
CoreUtils::get_next_frame(core_stack_state *coress)
{
- intptr_t i = 0;
+ intptr_t i = 0;
intptr_t framep = coress->framep;
intptr_t index = find_vaddr(framep, arrayMem.length(), 0);
// finds vaddress less than framep
intptr_t vadd = arrayMem[index - 1].vaddr;
- intptr_t off = arrayMem[index - 1].offset;
+ intptr_t off = arrayMem[index - 1].offset;
intptr_t off2 = std::abs(vadd - framep);
// seek to the framep offset
@@ -330,7 +330,7 @@ void
CoreUtils::find_stuff(StuffTest_f f)
{
intptr_t framep = framepointer;
- intptr_t pc = program_counter;
+ intptr_t pc = program_counter;
core_stack_state coress;
intptr_t i;
void *test_val;
@@ -365,7 +365,7 @@ CoreUtils::test_HdrHeap(void *arg)
{
HdrHeap *hheap_test = (HdrHeap *)arg;
uint32_t *magic_ptr = &(hheap_test->m_magic);
- uint32_t magic = 0;
+ uint32_t magic = 0;
if (read_from_core((intptr_t)magic_ptr, sizeof(uint32_t), (char *)&magic) != 0) {
if (magic == HDR_BUF_MAGIC_ALIVE || magic == HDR_BUF_MAGIC_DEAD || magic == HDR_BUF_MAGIC_CORRUPT ||
@@ -384,8 +384,8 @@ CoreUtils::test_HdrHeap(void *arg)
void
CoreUtils::test_HttpSM_from_tunnel(void *arg)
{
- char *tmp = (char *)arg;
- intptr_t offset = (intptr_t) & (((HttpTunnel *)NULL)->sm);
+ char *tmp = (char *)arg;
+ intptr_t offset = (intptr_t) & (((HttpTunnel *)NULL)->sm);
HttpSM **hsm_ptr = (HttpSM **)(tmp + offset);
HttpSM *hsm_test;
@@ -393,7 +393,7 @@ CoreUtils::test_HttpSM_from_tunnel(void *arg)
return;
unsigned int *magic_ptr = &(hsm_test->magic);
- unsigned int magic = 0;
+ unsigned int magic = 0;
if (read_from_core((intptr_t)magic_ptr, sizeof(int), (char *)&magic) != 0) {
if (magic == HTTP_SM_MAGIC_ALIVE || magic == HTTP_SM_MAGIC_DEAD) {
@@ -408,9 +408,9 @@ CoreUtils::test_HttpSM_from_tunnel(void *arg)
void
CoreUtils::test_HttpSM(void *arg)
{
- HttpSM *hsm_test = (HttpSM *)arg;
+ HttpSM *hsm_test = (HttpSM *)arg;
unsigned int *magic_ptr = &(hsm_test->magic);
- unsigned int magic = 0;
+ unsigned int magic = 0;
if (read_from_core((intptr_t)magic_ptr, sizeof(int), (char *)&magic) != 0) {
if (magic == HTTP_SM_MAGIC_ALIVE || magic == HTTP_SM_MAGIC_DEAD) {
@@ -484,15 +484,15 @@ int
CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
{
// Load HdrHeap chain
- HTTPHdr *http_hdr = core_hdr;
- HdrHeap *heap = (HdrHeap *)core_hdr->m_heap;
- HdrHeap *heap_ptr = (HdrHeap *)http_hdr->m_heap;
- char *buf = (char *)ats_malloc(sizeof(char) * sizeof(HdrHeap));
- intptr_t ptr_heaps = 0;
- intptr_t ptr_heap_size = 0;
- intptr_t ptr_xl_size = 2;
- intptr_t str_size = 0;
- intptr_t str_heaps = 0;
+ HTTPHdr *http_hdr = core_hdr;
+ HdrHeap *heap = (HdrHeap *)core_hdr->m_heap;
+ HdrHeap *heap_ptr = (HdrHeap *)http_hdr->m_heap;
+ char *buf = (char *)ats_malloc(sizeof(char) * sizeof(HdrHeap));
+ intptr_t ptr_heaps = 0;
+ intptr_t ptr_heap_size = 0;
+ intptr_t ptr_xl_size = 2;
+ intptr_t str_size = 0;
+ intptr_t str_heaps = 0;
MarshalXlate default_MarshalXlate = {0, 0, 0};
DynArray<struct MarshalXlate> ptr_xlation(&default_MarshalXlate, 2);
// MarshalXlate static_table[2];
@@ -507,15 +507,15 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
printf("Cannot read from core\n");
_exit(0);
}
- heap = (HdrHeap *)buf;
+ heap = (HdrHeap *)buf;
copy_size = (int)(heap->m_free_start - heap->m_data_start);
ptr_heap_size += copy_size;
heap = heap->m_next;
} while (heap && ((intptr_t)heap != 0x1));
- swizzle_heap = (HdrHeap *)ats_malloc(sizeof(HdrHeap));
+ swizzle_heap = (HdrHeap *)ats_malloc(sizeof(HdrHeap));
live_hdr->m_heap = swizzle_heap;
- ptr_data = (char *)ats_malloc(sizeof(char) * ptr_heap_size);
+ ptr_data = (char *)ats_malloc(sizeof(char) * ptr_heap_size);
// heap = (HdrHeap*)http_hdr->m_heap;
// Build Hdr Heap Translation Table
@@ -524,7 +524,7 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
printf("Cannot read from core\n");
_exit(0);
}
- heap_ptr = (HdrHeap *)buf;
+ heap_ptr = (HdrHeap *)buf;
copy_size = (int)(heap_ptr->m_free_start - heap_ptr->m_data_start);
if (read_from_core((intptr_t)heap_ptr->m_data_start, copy_size, ptr_data) == -1) {
@@ -539,10 +539,10 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
char *data, *free, *off;
data = heap_ptr->m_data_start;
free = heap_ptr->m_free_start;
- off = (char *)(heap_ptr->m_data_start - ptr_data);
+ off = (char *)(heap_ptr->m_data_start - ptr_data);
- ptr_xlation[ptr_heaps].start = data;
- ptr_xlation[ptr_heaps].end = free;
+ ptr_xlation[ptr_heaps].start = data;
+ ptr_xlation[ptr_heaps].end = free;
ptr_xlation[ptr_heaps].offset = off;
ptr_data += copy_size;
ptr_heaps++;
@@ -556,20 +556,20 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
}
heap = (HdrHeap *)buf;
// filling in the live_hdr
- swizzle_heap->m_free_start = NULL;
- swizzle_heap->m_data_start = (char *)ptr_data - ptr_heap_size; // offset
- swizzle_heap->m_magic = HDR_BUF_MAGIC_ALIVE;
- swizzle_heap->m_writeable = false;
- swizzle_heap->m_size = ptr_heap_size;
- swizzle_heap->m_next = NULL;
- swizzle_heap->m_free_size = 0;
+ swizzle_heap->m_free_start = NULL;
+ swizzle_heap->m_data_start = (char *)ptr_data - ptr_heap_size; // offset
+ swizzle_heap->m_magic = HDR_BUF_MAGIC_ALIVE;
+ swizzle_heap->m_writeable = false;
+ swizzle_heap->m_size = ptr_heap_size;
+ swizzle_heap->m_next = NULL;
+ swizzle_heap->m_free_size = 0;
swizzle_heap->m_read_write_heap.m_ptr = NULL;
// We'have one read-only string heap after marshalling
- swizzle_heap->m_ronly_heap[0].m_heap_start = (char *)(intptr_t)swizzle_heap->m_size; // offset
+ swizzle_heap->m_ronly_heap[0].m_heap_start = (char *)(intptr_t)swizzle_heap->m_size; // offset
swizzle_heap->m_ronly_heap[0].m_ref_count_ptr.m_ptr = NULL;
- for (int i = 1; i < HDR_BUF_RONLY_HEAPS; i++)
+ for (int i = 1; i < HDR_BUF_RONLY_HEAPS; i++)
swizzle_heap->m_ronly_heap[i].m_heap_start = NULL;
// Next order of business is to copy over string heaps
@@ -580,29 +580,29 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
// Local String Heaps, building translation table
if (heap->m_read_write_heap) {
- HdrStrHeap *hdr = (HdrStrHeap *)heap->m_read_write_heap.m_ptr;
+ HdrStrHeap *hdr = (HdrStrHeap *)heap->m_read_write_heap.m_ptr;
char *copy_start = ((char *)heap->m_read_write_heap.m_ptr) + sizeof(HdrStrHeap);
- char *str_hdr = (char *)ats_malloc(sizeof(char) * sizeof(HdrStrHeap));
+ char *str_hdr = (char *)ats_malloc(sizeof(char) * sizeof(HdrStrHeap));
if (read_from_core((intptr_t)hdr, sizeof(HdrStrHeap), str_hdr) == -1) {
printf("Cannot read from core\n");
_exit(0);
}
char *free_start = (char *)(((HdrStrHeap *)str_hdr)->m_free_start);
- int nto_copy = std::abs((char *)copy_start - free_start);
+ int nto_copy = std::abs((char *)copy_start - free_start);
ats_free(str_hdr);
#if defined(__GNUC__)
char rw_heap[sizeof(char) * nto_copy];
#else
- char *rw_heap = (char *)ats_malloc(sizeof(char) * nto_copy);
+ char *rw_heap = (char *)ats_malloc(sizeof(char) * nto_copy);
#endif
if (read_from_core((intptr_t)copy_start, nto_copy, rw_heap) == -1) {
printf("Cannot read from core\n");
_exit(0);
}
// FIX ME - possible offset overflow issues?
- str_xlation[str_heaps].start = copy_start;
- str_xlation[str_heaps].end = copy_start + nto_copy;
+ str_xlation[str_heaps].start = copy_start;
+ str_xlation[str_heaps].end = copy_start + nto_copy;
str_xlation[str_heaps].offset = (char *)(copy_start - rw_heap);
str_size += nto_copy;
@@ -624,8 +624,8 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
_exit(0);
}
// Add translation table entry for string heaps
- str_xlation[str_heaps].start = heap->m_ronly_heap[i].m_heap_start;
- str_xlation[str_heaps].end = heap->m_ronly_heap[i].m_heap_start + heap->m_ronly_heap[i].m_heap_len;
+ str_xlation[str_heaps].start = heap->m_ronly_heap[i].m_heap_start;
+ str_xlation[str_heaps].end = heap->m_ronly_heap[i].m_heap_start + heap->m_ronly_heap[i].m_heap_len;
str_xlation[str_heaps].offset = (char *)(heap->m_ronly_heap[i].m_heap_start - ro_heap);
ink_assert(str_xlation[str_heaps].start <= str_xlation[str_heaps].end);
@@ -641,7 +641,7 @@ CoreUtils::load_http_hdr(HTTPHdr *core_hdr, HTTPHdr *live_hdr)
// Patch the str heap len
swizzle_heap->m_ronly_heap[0].m_heap_len = str_size;
- char *obj_data = swizzle_heap->m_data_start;
+ char *obj_data = swizzle_heap->m_data_start;
char *mheap_end = swizzle_heap->m_data_start + swizzle_heap->m_size;
while (obj_data < mheap_end) {
@@ -705,8 +705,8 @@ CoreUtils::dump_history(HttpSM *hsm)
// Loop through the history and dump it
for (int i = 0; i < hsm->history_pos; i++) {
- int r = (int)hsm->history[i].reentrancy;
- int e = (int)hsm->history[i].event;
+ int r = (int)hsm->history[i].reentrancy;
+ int e = (int)hsm->history[i].event;
char *fileline = load_string(hsm->history[i].fileline);
fileline = (fileline != NULL) ? fileline : ats_strdup("UNKNOWN");
@@ -872,8 +872,8 @@ process_core(char *fname)
if ((nhdr = (Elf32_Nhdr *)ats_malloc(sizeof(Elf32_Nhdr) * phdr.p_filesz))) {
if (fread(nhdr, phdr.p_filesz, 1, fp) == 1) {
int size = phdr.p_filesz;
- int sum = 0;
- thdr = nhdr;
+ int sum = 0;
+ thdr = nhdr;
while (size) {
int len;
@@ -915,7 +915,7 @@ process_core(char *fname)
printf("stack pointer = %#x\n", (unsigned int)pstat.pr_reg[SP_REGNUM]); // UESP
framep = pstat.pr_reg[FP_REGNUM];
- pc = pstat.pr_reg[PC_REGNUM];
+ pc = pstat.pr_reg[PC_REGNUM];
printf("frame pointer = %#x\n", (unsigned int)pstat.pr_reg[FP_REGNUM]); // EBP
printf("program counter if no save = %#x\n", (unsigned int)pstat.pr_reg[PC_REGNUM]);
//}
@@ -945,7 +945,7 @@ process_core(char *fname)
}
}
}
- framepointer = framep;
+ framepointer = framep;
program_counter = pc;
// Write your actual tests here
diff --git a/proxy/Crash.cc b/proxy/Crash.cc
index 815efe1..8352bbb 100644
--- a/proxy/Crash.cc
+++ b/proxy/Crash.cc
@@ -34,7 +34,7 @@
#endif
static pid_t crash_logger_pid = -1;
-static int crash_logger_fd = NO_FD;
+static int crash_logger_fd = NO_FD;
static char *
create_logger_path()
@@ -53,7 +53,7 @@ create_logger_path()
}
// Otherwise locate it relative to $BINDIR.
- bindir = RecConfigReadBinDir();
+ bindir = RecConfigReadBinDir();
fullpath = Layout::relative_to(bindir, name);
ats_free(name);
@@ -103,7 +103,7 @@ crash_logger_init()
case -1:
Error("failed to fork crash log helper: %s", strerror(errno));
crash_logger_pid = -1;
- crash_logger_fd = NO_FD;
+ crash_logger_fd = NO_FD;
return;
case 0:
@@ -125,7 +125,7 @@ crash_logger_init()
close(pipe[1]);
crash_logger_pid = child;
- crash_logger_fd = pipe[0];
+ crash_logger_fd = pipe[0];
// Wait for the helper to stop
if (waitpid(crash_logger_pid, &status, WUNTRACED) > 0) {
@@ -135,7 +135,7 @@ crash_logger_init()
Warning("crash logger '%s' unexpectedly exited with status %d", (const char *)logger, WEXITSTATUS(status));
close(crash_logger_pid);
crash_logger_pid = -1;
- crash_logger_fd = NO_FD;
+ crash_logger_fd = NO_FD;
}
}
}
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 1a94b39..5bb617c 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -60,8 +60,8 @@ void
FetchSM::httpConnect()
{
PluginIdentity *pi = dynamic_cast<PluginIdentity *>(contp);
- char const *tag = pi ? pi->getPluginTag() : "fetchSM";
- int64_t id = pi ? pi->getPluginId() : 0;
+ char const *tag = pi ? pi->getPluginTag() : "fetchSM";
+ int64_t id = pi ? pi->getPluginId() : 0;
Debug(DEBUG_TAG, "[%s] calling httpconnect write pi=%p tag=%s id=%" PRId64, __FUNCTION__, pi, tag, id);
http_vc = reinterpret_cast<PluginVC *>(TSHttpConnectWithPluginId(&_addr.sa, tag, id));
@@ -78,7 +78,7 @@ FetchSM::httpConnect()
}
}
- read_vio = http_vc->do_io_read(this, INT64_MAX, resp_buffer);
+ read_vio = http_vc->do_io_read(this, INT64_MAX, resp_buffer);
write_vio = http_vc->do_io_write(this, getReqLen() + req_content_length, req_reader);
}
@@ -162,7 +162,7 @@ FetchSM::check_for_field_value(char const *name, size_t name_len, char const *va
bool zret = false; // not found.
StrList slist;
HTTPHdr *hdr = &client_response_hdr;
- int ret = hdr->value_get_comma_list(name, name_len, &slist);
+ int ret = hdr->value_get_comma_list(name, name_len, &slist);
ink_release_assert(header_done);
@@ -183,7 +183,7 @@ bool
FetchSM::check_chunked()
{
static char const CHUNKED_TEXT[] = "chunked";
- static size_t const CHUNKED_LEN = sizeof(CHUNKED_TEXT) - 1;
+ static size_t const CHUNKED_LEN = sizeof(CHUNKED_TEXT) - 1;
if (resp_is_chunked < 0) {
resp_is_chunked = static_cast<int>(
@@ -193,7 +193,7 @@ FetchSM::check_chunked()
ChunkedHandler *ch = &chunked_handler;
ch->init_by_action(resp_reader, ChunkedHandler::ACTION_DECHUNK);
ch->dechunked_reader = ch->dechunked_buffer->alloc_reader();
- ch->state = ChunkedHandler::CHUNK_READ_SIZE;
+ ch->state = ChunkedHandler::CHUNK_READ_SIZE;
resp_reader->dealloc();
}
}
@@ -204,7 +204,7 @@ bool
FetchSM::check_connection_close()
{
static char const CLOSE_TEXT[] = "close";
- static size_t const CLOSE_LEN = sizeof(CLOSE_TEXT) - 1;
+ static size_t const CLOSE_LEN = sizeof(CLOSE_TEXT) - 1;
if (resp_received_close < 0) {
resp_received_close =
@@ -236,7 +236,7 @@ void
FetchSM::InvokePluginExt(int fetch_event)
{
int event;
- EThread *mythread = this_ethread();
+ EThread *mythread = this_ethread();
bool read_complete_event = (fetch_event == TS_EVENT_VCONN_READ_COMPLETE) || (fetch_event == TS_EVENT_VCONN_EOS);
//
@@ -362,7 +362,7 @@ FetchSM::get_info_from_buffer(IOBufferReader *the_reader)
return;
}
- info = (char *)ats_malloc(sizeof(char) * (read_avail + 1));
+ info = (char *)ats_malloc(sizeof(char) * (read_avail + 1));
client_response = info;
// To maintain backwards compatability we don't allow chunking when it's not streaming.
@@ -374,7 +374,7 @@ FetchSM::get_info_from_buffer(IOBufferReader *the_reader)
blk = reader->block;
// This is the equivalent of TSIOBufferBlockReadStart()
- buf = blk->start() + reader->start_offset;
+ buf = blk->start() + reader->start_offset;
read_done = blk->read_avail() - reader->start_offset;
if (read_done > 0) {
@@ -406,7 +406,7 @@ FetchSM::get_info_from_buffer(IOBufferReader *the_reader)
blk = reader->block;
// This is the equivalent of TSIOBufferBlockReadStart()
- buf = blk->start() + reader->start_offset;
+ buf = blk->start() + reader->start_offset;
read_done = blk->read_avail() - reader->start_offset;
if (read_done > 0) {
@@ -538,7 +538,7 @@ FetchSM::ext_init(Continuation *cont, const char *method, const char *url, const
init_comm();
if (flags & TS_FETCH_FLAGS_NEWLOCK) {
- mutex = new_ProxyMutex();
+ mutex = new_ProxyMutex();
cont_mutex = cont->mutex;
} else {
mutex = cont->mutex;
@@ -634,13 +634,13 @@ FetchSM::ext_read_data(char *buf, size_t len)
reader = (TSIOBufferReader)resp_reader;
already = 0;
- blk = TSIOBufferReaderStart(reader);
+ blk = TSIOBufferReaderStart(reader);
while (blk) {
wavail = len - already;
next_blk = TSIOBufferBlockNext(blk);
- start = TSIOBufferBlockReadStart(blk, reader, &blk_len);
+ start = TSIOBufferBlockReadStart(blk, reader, &blk_len);
need = blk_len > wavail ? wavail : blk_len;
diff --git a/proxy/FetchSM.h b/proxy/FetchSM.h
index b51cb21..a228679 100644
--- a/proxy/FetchSM.h
+++ b/proxy/FetchSM.h
@@ -44,22 +44,22 @@ public:
void
init_comm()
{
- is_internal_request = true;
- recursion = 0;
- req_finished = 0;
- is_method_head = 0;
- header_done = 0;
- user_data = NULL;
- has_sent_header = false;
- destroyed = false;
- req_content_length = 0;
- resp_is_chunked = -1;
- resp_content_length = -1;
+ is_internal_request = true;
+ recursion = 0;
+ req_finished = 0;
+ is_method_head = 0;
+ header_done = 0;
+ user_data = NULL;
+ has_sent_header = false;
+ destroyed = false;
+ req_content_length = 0;
+ resp_is_chunked = -1;
+ resp_content_length = -1;
resp_received_body_len = 0;
- resp_received_close = -1;
+ resp_received_close = -1;
cont_mutex.clear();
- req_buffer = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
- req_reader = req_buffer->alloc_reader();
+ req_buffer = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
+ req_reader = req_buffer->alloc_reader();
resp_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_32K);
resp_reader = resp_buffer->alloc_reader();
http_parser_init(&http_parser);
@@ -73,8 +73,8 @@ public:
{
Debug("FetchSM", "[%s] FetchSM initialized for request with headers\n--\n%.*s\n--", __FUNCTION__, length, headers);
init_comm();
- contp = cont;
- callback_events = events;
+ contp = cont;
+ callback_events = events;
callback_options = options;
_addr.assign(addr);
fetch_flags = TS_FETCH_FLAGS_DECHUNK;
diff --git a/proxy/ICP.cc b/proxy/ICP.cc
index 5442331..1646b28 100644
--- a/proxy/ICP.cc
+++ b/proxy/ICP.cc
@@ -202,7 +202,7 @@ ICPHandlerCont::PeriodicEvent(int event, Event * /* e ATS_UNUSED */)
// Setup state machine
///////////////////////////////////////////
ICPPeerReadCont *s = ICPPeerReadContAllocator.alloc();
- int local_lookup = _ICPpr->GetConfig()->globalConfig()->ICPLocalCacheLookup();
+ int local_lookup = _ICPpr->GetConfig()->globalConfig()->ICPLocalCacheLookup();
s->init(_ICPpr, P, local_lookup);
RECORD_ICP_STATE_CHANGE(s, event, ICPPeerReadCont::READ_ACTIVE);
@@ -236,17 +236,17 @@ ICPPeerReadCont::PeerReadData::PeerReadData()
void
ICPPeerReadCont::PeerReadData::init()
{
- _start_time = 0;
- _mycont = 0;
- _peer = 0;
- _next_state = READ_ACTIVE;
+ _start_time = 0;
+ _mycont = 0;
+ _peer = 0;
+ _next_state = READ_ACTIVE;
_cache_lookup_local = 0;
- _buf = 0;
- _rICPmsg = 0;
- _rICPmsg_len = 0;
+ _buf = 0;
+ _rICPmsg = 0;
+ _rICPmsg_len = 0;
_cachelookupURL.clear();
- _queryResult = 0;
- _ICPReqCont = 0;
+ _queryResult = 0;
+ _ICPReqCont = 0;
_bytesReceived = 0;
#ifdef DEBUG_ICP
_nhistory = 0;
@@ -264,10 +264,10 @@ ICPPeerReadCont::PeerReadData::reset(int full_reset)
{
if (full_reset) {
_peer = 0;
- _buf = 0;
+ _buf = 0;
}
if (_rICPmsg) {
- _rICPmsg = 0;
+ _rICPmsg = 0;
_rICPmsg_len = 0;
}
@@ -299,19 +299,19 @@ ICPPeerReadCont::init(ICPProcessor *ICPpr, Peer *p, int lookup_local)
{
PeerReadData *s = PeerReadDataAllocator.alloc();
s->init();
- s->_start_time = Thread::get_hrtime();
- s->_peer = p;
- s->_next_state = READ_ACTIVE;
+ s->_start_time = Thread::get_hrtime();
+ s->_peer = p;
+ s->_next_state = READ_ACTIVE;
s->_cache_lookup_local = lookup_local;
SET_HANDLER((ICPPeerReadContHandler)&ICPPeerReadCont::ICPPeerReadEvent);
- _ICPpr = ICPpr;
- _state = s;
- _recursion_depth = -1;
- _object_vc = NULL;
- _object_read = NULL;
- _cache_req_hdr_heap_handle = NULL;
+ _ICPpr = ICPpr;
+ _state = s;
+ _recursion_depth = -1;
+ _object_vc = NULL;
+ _object_read = NULL;
+ _cache_req_hdr_heap_handle = NULL;
_cache_resp_hdr_heap_handle = NULL;
- mutex = new_ProxyMutex();
+ mutex = new_ProxyMutex();
}
ICPPeerReadCont::~ICPPeerReadCont()
@@ -464,7 +464,7 @@ ICPPeerReadCont::ICPPeerQueryCont(int /* event ATS_UNUSED */, Event * /* e ATS_U
Cache::generate_key(&key, &_state->_cachelookupURL, cfg->ICPCacheGeneration());
_state->_queryResult = ~CACHE_EVENT_LOOKUP_FAILED;
- _start_time = Thread::get_hrtime();
+ _start_time = Thread::get_hrtime();
if (pluginFreshnessCalcFunc && cfg->ICPStaleLookup()) {
//////////////////////////////////////////////////////////////
@@ -558,8 +558,8 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
buf->alloc(ICPHandlerCont::ICPDataBuf_IOBuffer_sizeindex);
s->_peer->fromaddrlen = sizeof(s->_peer->fromaddr);
buf->fill(sizeof(ICPMsg_t)); // reserve space for decoding
- char *be = buf->buf_end() - 1;
- be[0] = 0; // null terminate buffer
+ char *be = buf->buf_end() - 1;
+ be[0] = 0; // null terminate buffer
s->_next_state = READ_DATA_DONE;
RECORD_ICP_STATE_CHANGE(s, 0, READ_DATA_DONE);
ink_assert(s->_peer->readAction == NULL);
@@ -581,7 +581,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
// No data, terminate read loop.
//
ICP_INCREMENT_DYN_STAT(no_data_read_stat);
- s->_peer->buf = NULL; // release reference
+ s->_peer->buf = NULL; // release reference
s->_next_state = READ_NOT_ACTIVE_EXIT;
RECORD_ICP_STATE_CHANGE(s, 0, READ_NOT_ACTIVE_EXIT);
// move to next state
@@ -606,7 +606,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
RECORD_ICP_STATE_CHANGE(s, 0, PROCESS_READ_DATA);
} else {
ICP_INCREMENT_DYN_STAT(no_data_read_stat);
- s->_peer->buf = NULL; // release reference
+ s->_peer->buf = NULL; // release reference
s->_next_state = READ_NOT_ACTIVE_EXIT;
RECORD_ICP_STATE_CHANGE(s, 0, READ_NOT_ACTIVE_EXIT);
}
@@ -623,7 +623,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
ink_release_assert(_recursion_depth == 0);
Ptr<IOBufferBlock> bufblock = s->_peer->buf;
- char *buf = bufblock->start();
+ char *buf = bufblock->start();
if (s->_next_state == PROCESS_READ_DATA) {
ICPRequestCont::NetToHostICPMsg((ICPMsg_t *)(buf + sizeof(ICPMsg_t)), (ICPMsg_t *)buf);
@@ -638,7 +638,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
// Short read, terminate
//
ICP_INCREMENT_DYN_STAT(short_read_stat);
- s->_peer->buf = NULL;
+ s->_peer->buf = NULL;
s->_next_state = READ_NOT_ACTIVE;
RECORD_ICP_STATE_CHANGE(s, 0, READ_NOT_ACTIVE);
break; // move to next_state
@@ -650,7 +650,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
if (!s->_peer->ExtToIntRecvSockAddr(&s->_peer->fromaddr.sa, &from.sa)) {
int status;
ICPConfigData *cfg = _ICPpr->GetConfig()->globalConfig();
- ICPMsg_t *ICPmsg = (ICPMsg_t *)buf;
+ ICPMsg_t *ICPmsg = (ICPMsg_t *)buf;
if ((cfg->ICPconfigured() == ICP_MODE_RECEIVE_ONLY) && cfg->ICPReplyToUnknownPeer() &&
((ICPmsg->h.version == ICP_VERSION_2) || (ICPmsg->h.version == ICP_VERSION_3)) && (ICPmsg->h.opcode == ICP_OP_QUERY)) {
@@ -675,7 +675,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
}
PeerConfigData *Pcfg = new PeerConfigData(PeerConfigData::CTYPE_SIBLING, IpAddr(s->_peer->fromaddr), 0, icp_reply_port);
ParentSiblingPeer *P = new ParentSiblingPeer(PEER_SIBLING, Pcfg, _ICPpr, true);
- status = _ICPpr->AddPeer(P);
+ status = _ICPpr->AddPeer(P);
ink_release_assert(status);
status = _ICPpr->AddPeerToSendList(P);
ink_release_assert(status);
@@ -693,18 +693,18 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
ICP_INCREMENT_DYN_STAT(invalid_sender_stat);
Debug("icp", "Received msg from invalid sender [%s]", ats_ip_nptop(&s->_peer->fromaddr, ipb, sizeof(ipb)));
- s->_peer->buf = NULL;
+ s->_peer->buf = NULL;
s->_next_state = READ_NOT_ACTIVE;
RECORD_ICP_STATE_CHANGE(s, 0, READ_NOT_ACTIVE);
break; // move to next_state
}
}
// we hand off the decoded buffer from the Peer to the PeerReadData
- s->_sender = from;
+ s->_sender = from;
s->_rICPmsg_len = s->_bytesReceived;
ink_assert(s->_buf == NULL);
- s->_buf = s->_peer->buf;
- s->_rICPmsg = (ICPMsg_t *)s->_buf->start();
+ s->_buf = s->_peer->buf;
+ s->_rICPmsg = (ICPMsg_t *)s->_buf->start();
s->_peer->buf = NULL;
//
@@ -715,8 +715,8 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
Debug("icp", "Received (v=%d) !v2 && !v3 msg from sender [%s]", (uint32_t)s->_rICPmsg->h.version,
ats_ip_nptop(&from, ipb, sizeof(ipb)));
- s->_rICPmsg = NULL;
- s->_buf = NULL;
+ s->_rICPmsg = NULL;
+ s->_buf = NULL;
s->_next_state = READ_NOT_ACTIVE;
RECORD_ICP_STATE_CHANGE(s, 0, READ_NOT_ACTIVE);
break; // move to next_state
@@ -748,8 +748,8 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
ink_release_assert(0); // Should never happen
case AWAITING_CACHE_LOOKUP_RESPONSE: {
- int status = 0;
- void *data = s->_rICPmsg->un.query.URL;
+ int status = 0;
+ void *data = s->_rICPmsg->un.query.URL;
int datalen = strlen((const char *)data) + 1;
if (s->_queryResult == CACHE_EVENT_LOOKUP) {
@@ -823,7 +823,7 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
case WRITE_DONE: {
s->_peer->writeAction = NULL;
- int len = completionUtil::getBytesTransferred(e);
+ int len = completionUtil::getBytesTransferred(e);
if (len == (int)ntohs(s->_rICPmsg->h.msglen)) {
ICP_INCREMENT_DYN_STAT(query_response_write_stat);
@@ -899,9 +899,9 @@ ICPPeerReadCont::PeerReadStateMachine(PeerReadData *s, Event *e)
// Process the ICP response for the given ICP request
ICPRequestCont::ICPRequestEventArgs_t args;
- args.rICPmsg = s->_rICPmsg;
+ args.rICPmsg = s->_rICPmsg;
args.rICPmsg_len = s->_rICPmsg_len;
- args.peer = p;
+ args.peer = p;
if (!s->_ICPReqCont->GetActionPtr()->cancelled) {
request_start_time = s->_ICPReqCont->GetRequestStartTime();
Debug("icp", "Passing Reply for ICP Id=%d", s->_rICPmsg->h.requestno);
@@ -982,9 +982,9 @@ ICPRequestCont::ICPRequestCont(ICPProcessor *pr, Continuation *c, URL *u)
_next_state(ICP_START)
{
memset((void *)&_ret_sockaddr, 0, sizeof(_ret_sockaddr));
- _ret_status = ICP_LOOKUP_FAILED;
+ _ret_status = ICP_LOOKUP_FAILED;
_act.cancelled = false;
- _act = c;
+ _act = c;
memset((void *)&_ICPmsg, 0, sizeof(_ICPmsg));
memset((void *)&_sendMsgHdr, 0, sizeof(_sendMsgHdr));
memset((void *)&_sendMsgIOV, 0, sizeof(_sendMsgIOV[MSG_IOVECS]));
@@ -995,7 +995,7 @@ ICPRequestCont::ICPRequestCont(ICPProcessor *pr, Continuation *c, URL *u)
ICPRequestCont::~ICPRequestCont()
{
- _act = NULL;
+ _act = NULL;
this->mutex = NULL;
if (_timeout) {
@@ -1024,7 +1024,7 @@ ICPRequestCont::remove_from_pendingActions(Action *a)
}
for (intptr_t i = 0; i < pendingActions->length(); i++) {
if ((*pendingActions)[i] == a) {
- for (intptr_t j = i; j < pendingActions->length() - 1; j++)
+ for (intptr_t j = i; j < pendingActions->length() - 1; j++)
(*pendingActions)[j] = (*pendingActions)[j + 1];
pendingActions->set_length(pendingActions->length() - 1);
npending_actions--;
@@ -1154,7 +1154,7 @@ ICPRequestCont::ICPStateMachine(int event, void *d)
_ICPpr->Unlock();
// Build the ICP query message
- char *urlstr = _url->string_get(NULL);
+ char *urlstr = _url->string_get(NULL);
int urlstr_len = strlen(urlstr) + 1;
int status = BuildICPMsg(ICP_OP_QUERY, _sequence_number = ICPReqSeqNumber(), 0 /* optflags */, 0 /* optdata */,
@@ -1200,8 +1200,8 @@ ICPRequestCont::ICPStateMachine(int event, void *d)
ink_assert(ret == 0);
// Generate ICP requests to peers
- int bias = _ICPpr->GetStartingSendPeerBias();
- int SendPeers = _ICPpr->GetSendPeers();
+ int bias = _ICPpr->GetStartingSendPeerBias();
+ int SendPeers = _ICPpr->GetSendPeers();
npending_actions = 0;
while (SendPeers > 0) {
Peer *P = _ICPpr->GetNthSendPeer(SendPeers, bias);
@@ -1378,7 +1378,7 @@ ICPRequestCont::ICPResponseMessage(int event, ICPMsg_t *m, Peer *peer)
if (pp && !_expected_replies_list.IsBitSet(pp->GetPeerID()) && pp->isUp()) {
ats_ip_copy(&_ret_sockaddr.sa, pp->GetIP());
_ret_sockaddr.port() = htons(static_cast<ParentSiblingPeer *>(pp)->GetProxyPort());
- _ret_status = ICP_LOOKUP_FOUND;
+ _ret_status = ICP_LOOKUP_FOUND;
Debug("icp", "ICP timeout using parent Id=%d from [%s] return [%s]", _sequence_number,
ats_ip_nptop(pp->GetIP(), ipb, sizeof(ipb)), ats_ip_nptop(&_ret_sockaddr, ipb2, sizeof(ipb2)));
@@ -1408,7 +1408,7 @@ ICPRequestCont::ICPResponseMessage(int event, ICPMsg_t *m, Peer *peer)
++_received_replies;
ats_ip_copy(&_ret_sockaddr, peer->GetIP());
_ret_sockaddr.port() = htons(static_cast<ParentSiblingPeer *>(peer)->GetProxyPort());
- _ret_status = ICP_LOOKUP_FOUND;
+ _ret_status = ICP_LOOKUP_FOUND;
Debug("icp", "ICP Response HIT for Id=%d from [%s] return [%s]", _sequence_number,
ats_ip_nptop(peer->GetIP(), ipb, sizeof(ipb)), ats_ip_nptop(&_ret_sockaddr, ipb2, sizeof(ipb2)));
@@ -1462,7 +1462,7 @@ ICPRequestCont::ICPResponseMessage(int event, ICPMsg_t *m, Peer *peer)
if (p) {
ats_ip_copy(&_ret_sockaddr, p->GetIP());
_ret_sockaddr.port() = htons(static_cast<ParentSiblingPeer *>(p)->GetProxyPort());
- _ret_status = ICP_LOOKUP_FOUND;
+ _ret_status = ICP_LOOKUP_FOUND;
Debug("icp", "ICP ALL MISS(1) for Id=%d return [%s]", _sequence_number, ats_ip_nptop(&_ret_sockaddr, ipb, sizeof(ipb)));
return EVENT_DONE;
@@ -1491,20 +1491,20 @@ ICPRequestCont::ICPResponseMessage(int event, ICPMsg_t *m, Peer *peer)
void
ICPRequestCont::NetToHostICPMsg(ICPMsg_t *in, ICPMsg_t *out)
{
- out->h.opcode = in->h.opcode;
- out->h.version = in->h.version;
- out->h.msglen = ntohs(in->h.msglen);
- out->h.requestno = ntohl(in->h.requestno);
+ out->h.opcode = in->h.opcode;
+ out->h.version = in->h.version;
+ out->h.msglen = ntohs(in->h.msglen);
+ out->h.requestno = ntohl(in->h.requestno);
out->h.optionflags = ntohl(in->h.optionflags);
- out->h.optiondata = ntohl(in->h.optiondata);
- out->h.shostid = ntohl(in->h.shostid);
+ out->h.optiondata = ntohl(in->h.optiondata);
+ out->h.shostid = ntohl(in->h.shostid);
switch (in->h.opcode) {
case ICP_OP_QUERY: {
memcpy((char *)&out->un.query.rhostid, (char *)((char *)(&in->h.shostid) + sizeof(in->h.shostid)),
sizeof(out->un.query.rhostid));
out->un.query.rhostid = ntohl(out->un.query.rhostid);
- out->un.query.URL = (char *)((char *)(&in->h.shostid) + sizeof(in->h.shostid) + sizeof(out->un.query.rhostid));
+ out->un.query.URL = (char *)((char *)(&in->h.shostid) + sizeof(in->h.shostid) + sizeof(out->un.query.rhostid));
break;
}
case ICP_OP_HIT: {
@@ -1522,7 +1522,7 @@ ICPRequestCont::NetToHostICPMsg(ICPMsg_t *in, ICPMsg_t *out)
out->un.hitobj.p_objsize = (char *)(out->un.hitobj.URL + strlen(out->un.hitobj.URL));
memcpy((char *)&out->un.hitobj.objsize, out->un.hitobj.p_objsize, sizeof(out->un.hitobj.objsize));
out->un.hitobj.objsize = ntohs(out->un.hitobj.objsize);
- out->un.hitobj.data = (char *)(out->un.hitobj.p_objsize + sizeof(out->un.hitobj.objsize));
+ out->un.hitobj.data = (char *)(out->un.hitobj.p_objsize + sizeof(out->un.hitobj.objsize));
break;
}
default:
@@ -1537,45 +1537,45 @@ ICPRequestCont::BuildICPMsg(ICPopcode_t op, unsigned int seqno, int optflags, in
// Build ICP message for transmission in network byte order.
if (op == ICP_OP_QUERY) {
icpmsg->un.query.rhostid = htonl(0);
- icpmsg->un.query.URL = (char *)data;
+ icpmsg->un.query.URL = (char *)data;
- mhdr->msg_iov = iov;
+ mhdr->msg_iov = iov;
mhdr->msg_iovlen = 3;
iov[0].iov_base = (caddr_t)icpmsg;
- iov[0].iov_len = sizeof(ICPMsgHdr_t);
+ iov[0].iov_len = sizeof(ICPMsgHdr_t);
iov[1].iov_base = (caddr_t)&icpmsg->un.query.rhostid;
- iov[1].iov_len = sizeof(icpmsg->un.query.rhostid);
+ iov[1].iov_len = sizeof(icpmsg->un.query.rhostid);
- iov[2].iov_base = (caddr_t)data;
- iov[2].iov_len = datalen;
+ iov[2].iov_base = (caddr_t)data;
+ iov[2].iov_len = datalen;
icpmsg->h.msglen = htons(iov[0].iov_len + iov[1].iov_len + iov[2].iov_len);
} else if (op == ICP_OP_HIT) {
icpmsg->un.hit.URL = (char *)data;
- mhdr->msg_iov = iov;
+ mhdr->msg_iov = iov;
mhdr->msg_iovlen = 2;
iov[0].iov_base = (caddr_t)icpmsg;
- iov[0].iov_len = sizeof(ICPMsgHdr_t);
+ iov[0].iov_len = sizeof(ICPMsgHdr_t);
- iov[1].iov_base = (caddr_t)data;
- iov[1].iov_len = datalen;
+ iov[1].iov_base = (caddr_t)data;
+ iov[1].iov_len = datalen;
icpmsg->h.msglen = htons(iov[0].iov_len + iov[1].iov_len);
} else if (op == ICP_OP_MISS) {
icpmsg->un.miss.URL = (char *)data;
- mhdr->msg_iov = iov;
+ mhdr->msg_iov = iov;
mhdr->msg_iovlen = 2;
iov[0].iov_base = (caddr_t)icpmsg;
- iov[0].iov_len = sizeof(ICPMsgHdr_t);
+ iov[0].iov_len = sizeof(ICPMsgHdr_t);
- iov[1].iov_base = (caddr_t)data;
- iov[1].iov_len = datalen;
+ iov[1].iov_base = (caddr_t)data;
+ iov[1].iov_len = datalen;
icpmsg->h.msglen = htons(iov[0].iov_len + iov[1].iov_len);
} else {
@@ -1583,24 +1583,24 @@ ICPRequestCont::BuildICPMsg(ICPopcode_t op, unsigned int seqno, int optflags, in
return 1; // failed
}
- mhdr->msg_name = (caddr_t)0;
+ mhdr->msg_name = (caddr_t)0;
mhdr->msg_namelen = 0;
// TODO: The following is just awkward
#if !defined(linux) && !defined(freebsd) && !defined(darwin) && !defined(solaris) && !defined(openbsd)
- mhdr->msg_accrights = (caddr_t)0;
+ mhdr->msg_accrights = (caddr_t)0;
mhdr->msg_accrightslen = 0;
#elif !defined(solaris)
- mhdr->msg_control = 0;
+ mhdr->msg_control = 0;
mhdr->msg_controllen = 0;
- mhdr->msg_flags = 0;
+ mhdr->msg_flags = 0;
#endif
- icpmsg->h.opcode = op;
- icpmsg->h.version = ICP_VERSION_2;
- icpmsg->h.requestno = htonl(seqno);
+ icpmsg->h.opcode = op;
+ icpmsg->h.version = ICP_VERSION_2;
+ icpmsg->h.requestno = htonl(seqno);
icpmsg->h.optionflags = htonl(optflags);
- icpmsg->h.optiondata = htonl(optdata);
- icpmsg->h.shostid = htonl(shostid);
+ icpmsg->h.optiondata = htonl(optdata);
+ icpmsg->h.shostid = htonl(shostid);
return 0; // Success
}
@@ -1819,8 +1819,8 @@ ICPProcessor::ICPQuery(Continuation *c, URL *url)
//**************************************
// Build continuation to process ICP request
- EThread *thread = this_ethread();
- ProxyMutex *mutex = thread->mutex;
+ EThread *thread = this_ethread();
+ ProxyMutex *mutex = thread->mutex;
ICPRequestCont *rc = new (ICPRequestCont_allocator.alloc()) ICPRequestCont(this, c, url);
ICP_INCREMENT_DYN_STAT(icp_query_requests_stat);
@@ -1890,17 +1890,17 @@ ICPProcessor::BuildPeerList()
} else {
Pcfg->_my_ip_addr = Pcfg->_ip_addr = tmp_ip;
}
- Pcfg->_proxy_port = 0;
- Pcfg->_icp_port = GetConfig()->globalConfig()->ICPport();
- Pcfg->_mc_member = 0;
+ Pcfg->_proxy_port = 0;
+ Pcfg->_icp_port = GetConfig()->globalConfig()->ICPport();
+ Pcfg->_mc_member = 0;
Pcfg->_mc_ip_addr._family = AF_UNSPEC;
- Pcfg->_mc_ttl = 0;
+ Pcfg->_mc_ttl = 0;
//***************************************************
// Descriptor for local host, add to PeerList and
// RecvPeerList
//***************************************************
- P = new ParentSiblingPeer(PEER_LOCAL, Pcfg, this);
+ P = new ParentSiblingPeer(PEER_LOCAL, Pcfg, this);
status = AddPeer(P);
ink_release_assert(status);
status = AddPeerToRecvList(P);
@@ -1926,7 +1926,7 @@ ICPProcessor::BuildPeerList()
//*********************************
// Create multicast peer structure
//*********************************
- mcP = new MultiCastPeer(Pcfg->GetMultiCastIPAddr(), Pcfg->GetICPPort(), Pcfg->GetMultiCastTTL(), this);
+ mcP = new MultiCastPeer(Pcfg->GetMultiCastIPAddr(), Pcfg->GetICPPort(), Pcfg->GetMultiCastTTL(), this);
status = AddPeer(mcP);
ink_assert(status);
status = AddPeerToSendList(mcP);
@@ -1937,7 +1937,7 @@ ICPProcessor::BuildPeerList()
//*****************************
// Add child to MultiCast peer
//*****************************
- P = new ParentSiblingPeer(type, Pcfg, this);
+ P = new ParentSiblingPeer(type, Pcfg, this);
status = AddPeer(P);
ink_assert(status);
status = ((MultiCastPeer *)mcP)->AddMultiCastChild(P);
@@ -1947,7 +1947,7 @@ ICPProcessor::BuildPeerList()
//*****************************
// Add parent/sibling peer
//*****************************
- P = new ParentSiblingPeer(type, Pcfg, this);
+ P = new ParentSiblingPeer(type, Pcfg, this);
status = AddPeer(P);
ink_assert(status);
status = AddPeerToSendList(P);
@@ -1976,15 +1976,15 @@ ICPProcessor::FreePeerList()
}
}
// Reset all control data
- _nPeerList = -1;
- _LocalPeer = (Peer *)0;
- _curSendPeer = 0;
- _nSendPeerList = -1;
- _curRecvPeer = 0;
- _nRecvPeerList = -1;
- _curParentPeer = 0;
- _nParentPeerList = -1;
- _ValidPollData = 0;
+ _nPeerList = -1;
+ _LocalPeer = (Peer *)0;
+ _curSendPeer = 0;
+ _nSendPeerList = -1;
+ _curRecvPeer = 0;
+ _nRecvPeerList = -1;
+ _curParentPeer = 0;
+ _nParentPeerList = -1;
+ _ValidPollData = 0;
_last_recv_peer_bias = 0;
for (index = 0; index < PEER_LIST_SIZE; index++) {
@@ -2082,10 +2082,10 @@ ICPProcessor::SetupListenSockets()
NetVCOptions options;
options.local_ip.assign(pPS->GetIP());
- options.local_port = pPS->GetICPPort();
- options.ip_proto = NetVCOptions::USE_UDP;
+ options.local_port = pPS->GetICPPort();
+ options.ip_proto = NetVCOptions::USE_UDP;
options.addr_binding = NetVCOptions::INTF_ADDR;
- status = pPS->GetChan()->open(options);
+ status = pPS->GetChan()->open(options);
if (status) {
// coverity[uninit_use_in_call] ?
RecSignalWarning(REC_SIGNAL_CONFIG_ERROR, "ICP bind_connect failed, res=%d, ip=%s", status,
@@ -2237,12 +2237,12 @@ ICPProcessor::CancelPendingReads()
ICPRequestCont::BuildICPMsg(ICP_OP_HIT, 0, 0 /* optflags */, 0 /* optdata */, 0 /* shostid */, (void *)0, 0, &r->_sendMsgHdr,
r->_sendMsgIOV, &r->_ICPmsg);
r->_sendMsgHdr.msg_iovlen = 1;
- r->_ICPmsg.h.version = ~r->_ICPmsg.h.version; // bogus message
+ r->_ICPmsg.h.version = ~r->_ICPmsg.h.version; // bogus message
Peer *lp = GetLocalPeer();
IpEndpoint local_endpoint;
ats_ip_copy(&local_endpoint.sa, lp->GetIP());
- r->_sendMsgHdr.msg_name = (caddr_t)&local_endpoint;
+ r->_sendMsgHdr.msg_name = (caddr_t)&local_endpoint;
r->_sendMsgHdr.msg_namelen = sizeof(local_endpoint);
udpNet.sendmsg_re(r, r, lp->GetSendFD(), &r->_sendMsgHdr);
}
diff --git a/proxy/ICP.h b/proxy/ICP.h
index f90e9f8..be7d1b3 100644
--- a/proxy/ICP.h
+++ b/proxy/ICP.h
@@ -185,10 +185,10 @@ class ICPPeerReadCont;
class ICPRequestCont;
typedef enum {
- PEER_NONE = 0,
- PEER_PARENT = 1,
- PEER_SIBLING = 2,
- PEER_LOCAL = 3,
+ PEER_NONE = 0,
+ PEER_PARENT = 1,
+ PEER_SIBLING = 2,
+ PEER_LOCAL = 3,
PEER_MULTICAST = 4,
} PeerType_t;
@@ -219,7 +219,7 @@ public:
private:
enum {
UNLOCKED = 0,
- LOCKED = 1,
+ LOCKED = 1,
};
int32_t _lock_word;
};
@@ -387,10 +387,10 @@ public:
HOSTNAME_SIZE = 256,
};
enum {
- CTYPE_NONE = 0,
- CTYPE_PARENT = 1,
+ CTYPE_NONE = 0,
+ CTYPE_PARENT = 1,
CTYPE_SIBLING = 2,
- CTYPE_LOCAL = 3,
+ CTYPE_LOCAL = 3,
};
private:
@@ -533,12 +533,12 @@ public:
virtual sockaddr *GetIP() = 0;
virtual Action *SendMsg_re(Continuation *, void *, struct msghdr *, struct sockaddr const *to) = 0;
virtual Action *RecvFrom_re(Continuation *, void *, IOBufferBlock *, int, struct sockaddr *, socklen_t *) = 0;
- virtual int GetRecvFD() = 0;
- virtual int GetSendFD() = 0;
+ virtual int GetRecvFD() = 0;
+ virtual int GetSendFD() = 0;
virtual int ExpectedReplies(BitMap *) = 0;
- virtual int ValidSender(sockaddr *) = 0;
+ virtual int ValidSender(sockaddr *) = 0;
virtual void LogSendMsg(ICPMsg_t *, sockaddr const *) = 0;
- virtual int IsOnline() = 0;
+ virtual int IsOnline() = 0;
virtual Connection *GetSendChan() = 0;
virtual Connection *GetRecvChan() = 0;
virtual int ExtToIntRecvSockAddr(sockaddr const *, sockaddr *) = 0;
@@ -770,7 +770,7 @@ public:
private:
enum {
STATIC_BITMAP_BYTE_SIZE = 16,
- BITS_PER_BYTE = 8,
+ BITS_PER_BYTE = 8,
};
char _static_bitmap[STATIC_BITMAP_BYTE_SIZE];
char *_bitmap;
@@ -986,10 +986,10 @@ private:
Event *_ICPHandlerEvent;
enum {
- PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
- SEND_PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
- RECV_PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
- PARENT_PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
+ PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
+ SEND_PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
+ RECV_PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
+ PARENT_PEER_LIST_SIZE = 2 * MAX_DEFINED_PEERS,
PEER_ID_POLL_INDEX_SIZE = 2 * MAX_DEFINED_PEERS
};
@@ -1086,11 +1086,11 @@ public:
int _nhistory;
#define RECORD_ICP_STATE_CHANGE(peerreaddata, event_, newstate_) \
- peerreaddata->_history[peerreaddata->_nhistory].event = event_; \
+ peerreaddata->_history[peerreaddata->_nhistory].event = event_; \
peerreaddata->_history[peerreaddata->_nhistory].newstate = newstate_; \
- peerreaddata->_history[peerreaddata->_nhistory].file = __FILE__; \
- peerreaddata->_history[peerreaddata->_nhistory].line = __LINE__; \
- peerreaddata->_nhistory = (peerreaddata->_nhistory + 1) % MAX_ICP_HISTORY;
+ peerreaddata->_history[peerreaddata->_nhistory].file = __FILE__; \
+ peerreaddata->_history[peerreaddata->_nhistory].line = __LINE__; \
+ peerreaddata->_nhistory = (peerreaddata->_nhistory + 1) % MAX_ICP_HISTORY;
#else
#define RECORD_ICP_STATE_CHANGE(x, y, z)
diff --git a/proxy/ICPConfig.cc b/proxy/ICPConfig.cc
index f668ac7..2ca611f 100644
--- a/proxy/ICPConfig.cc
+++ b/proxy/ICPConfig.cc
@@ -195,13 +195,13 @@ AtomicLock::Unlock()
BitMap::BitMap(int bitmap_maxsize)
{
if (bitmap_maxsize <= (int)(STATIC_BITMAP_BYTE_SIZE * BITS_PER_BYTE)) {
- _bitmap = _static_bitmap;
- _bitmap_size = bitmap_maxsize;
+ _bitmap = _static_bitmap;
+ _bitmap_size = bitmap_maxsize;
_bitmap_byte_size = STATIC_BITMAP_BYTE_SIZE;
} else {
_bitmap_byte_size = (bitmap_maxsize + (BITS_PER_BYTE - 1)) / BITS_PER_BYTE;
- _bitmap = new char[_bitmap_byte_size];
- _bitmap_size = bitmap_maxsize;
+ _bitmap = new char[_bitmap_byte_size];
+ _bitmap_size = bitmap_maxsize;
}
memset((void *)_bitmap, 0, _bitmap_byte_size);
}
@@ -316,7 +316,7 @@ PeerConfigData::GetHostIPByName(char *hostname, IpAddr &rip)
ink_zero(hints);
hints.ai_family = AF_UNSPEC;
- hints.ai_flags = AI_ADDRCONFIG;
+ hints.ai_flags = AI_ADDRCONFIG;
if (0 == getaddrinfo(hostname, 0, &hints, &ai)) {
for (addrinfo *spot = ai; spot; spot = spot->ai_next) {
// If current address is valid, and either we don't have one yet
@@ -380,7 +380,7 @@ ICPConfiguration::ICPConfiguration() : _icp_config_callouts(0)
//*********************************************************
// Allocate working and current ICPConfigData structures
//*********************************************************
- _icp_cdata = new ICPConfigData();
+ _icp_cdata = new ICPConfigData();
_icp_cdata_current = new ICPConfigData();
//********************************************************************
@@ -403,7 +403,7 @@ ICPConfiguration::ICPConfiguration() : _icp_config_callouts(0)
// Allocate working and current PeerConfigData structures
//**********************************************************
for (int n = 0; n <= MAX_DEFINED_PEERS; ++n) {
- _peer_cdata[n] = new PeerConfigData;
+ _peer_cdata[n] = new PeerConfigData;
_peer_cdata_current[n] = new PeerConfigData;
}
@@ -517,13 +517,13 @@ next_field(char *text, char fs)
void *
ICPConfiguration::icp_config_change_callback(void *data, void *value, int startup)
{
- EThread *thread = this_ethread();
+ EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
//
// Cast passed parameters to correct types
//
- char *filename = (char *)value;
+ char *filename = (char *)value;
ICPConfiguration *ICPconfig = (ICPConfiguration *)data;
//
@@ -571,7 +571,7 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
const int colons_per_entry = 8; // expected ':' separators per entry
int error = 0;
- int ln = 0;
+ int ln = 0;
int n_colons;
char line[512];
char *cur;
@@ -619,7 +619,7 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
fs = *last;
n_colons = 0;
- p = cur;
+ p = cur;
while (0 != (p = next_field(p, fs))) {
++p;
++n_colons;
@@ -633,7 +633,7 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//*******************
// Extract hostname
//*******************
- next = next_field(cur, fs);
+ next = next_field(cur, fs);
*next++ = 0;
if (cur != (next - 1)) {
ink_strlcpy(P[n]._hostname, cur, PeerConfigData::HOSTNAME_SIZE);
@@ -643,8 +643,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//*********************
// Extract host_ip_str
//*********************
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
if (0 != P[n]._ip_addr.load(cur)) {
@@ -664,8 +664,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//******************
// Extract ctype
//******************
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
P[n]._ctype = atoi(cur);
@@ -683,8 +683,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//*********************
// Extract proxy_port
//*********************
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
if ((P[n]._proxy_port = atoi(cur)) <= 0) {
@@ -700,8 +700,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//*********************
// Extract icp_port
//*********************
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
if ((P[n]._icp_port = atoi(cur)) <= 0) {
@@ -717,8 +717,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//****************************
// Extract multicast_member
//****************************
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
if ((P[n]._mc_member = atoi(cur)) < 0) {
@@ -739,8 +739,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
//****************************
// Extract multicast_ip_str
//****************************
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
P[n]._mc_ip_addr.load(cur);
@@ -757,8 +757,8 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
// Extract multicast_ttl
//************************
// Note: last entry is always terminated with a ":"
- cur = next;
- next = next_field(next, fs);
+ cur = next;
+ next = next_field(next, fs);
*next++ = 0;
if (cur != (next - 1)) {
P[n]._mc_ttl = atoi(cur);
@@ -777,7 +777,7 @@ ICPConfiguration::icp_config_change_callback(void *data, void *value, int startu
close(fd);
if (!error) {
- for (int i = 0; i <= MAX_DEFINED_PEERS; i++)
+ for (int i = 0; i <= MAX_DEFINED_PEERS; i++)
*ICPconfig->_peer_cdata_current[i] = P[i];
}
delete[] P; // free working buffer
@@ -799,7 +799,7 @@ Peer::Peer(PeerType_t t, ICPProcessor *icpPr, bool dynamic_peer)
memset((void *)&this->_stats, 0, sizeof(this->_stats));
ink_zero(fromaddr);
fromaddrlen = sizeof(fromaddr);
- _id = 0;
+ _id = 0;
}
void
@@ -873,15 +873,15 @@ ParentSiblingPeer::SendMsg_re(Continuation *cont, void *token, struct msghdr *ms
Peer *p = _ICPpr->FindPeer(IpAddr(to), ntohs(ats_ip_port_cast(to)));
ink_assert(p);
- msg->msg_name = &p->GetSendChan()->addr;
+ msg->msg_name = &p->GetSendChan()->addr;
msg->msg_namelen = ats_ip_size(&p->GetSendChan()->addr);
- Action *a = udpNet.sendmsg_re(cont, token, lp->GetSendFD(), msg);
+ Action *a = udpNet.sendmsg_re(cont, token, lp->GetSendFD(), msg);
return a;
} else {
// Send to default host
- msg->msg_name = &_chan.addr;
+ msg->msg_name = &_chan.addr;
msg->msg_namelen = ats_ip_size(&_chan.addr.sa);
- Action *a = udpNet.sendmsg_re(cont, token, lp->GetSendFD(), msg);
+ Action *a = udpNet.sendmsg_re(cont, token, lp->GetSendFD(), msg);
return a;
}
}
@@ -892,7 +892,7 @@ ParentSiblingPeer::RecvFrom_re(Continuation *cont, void *token, IOBufferBlock *b
{
// Note: All receives are funneled through the local peer UDP socket.
- Peer *lp = _ICPpr->GetLocalPeer();
+ Peer *lp = _ICPpr->GetLocalPeer();
Action *a = udpNet.recvfrom_re(cont, token, lp->GetRecvFD(), from, fromlen, bufblock, size, true, 0);
return a;
}
@@ -1017,9 +1017,9 @@ MultiCastPeer::SendMsg_re(Continuation *cont, void *token, struct msghdr *msg, s
a = ((ParentSiblingPeer *)p)->SendMsg_re(cont, token, msg, 0);
} else {
// Send to MultiCast group
- msg->msg_name = (caddr_t)&_send_chan.addr;
+ msg->msg_name = (caddr_t)&_send_chan.addr;
msg->msg_namelen = sizeof(_send_chan.addr);
- a = udpNet.sendmsg_re(cont, token, _send_chan.fd, msg);
+ a = udpNet.sendmsg_re(cont, token, _send_chan.fd, msg);
}
return a;
}
@@ -1050,7 +1050,7 @@ MultiCastPeer::ExpectedReplies(BitMap *expected_replies_list)
// TBD: Expected replies should be calculated as a running average
// from replies returned from a periodic inquiry message.
- int replies = 0;
+ int replies = 0;
ParentSiblingPeer *p = (ParentSiblingPeer *)this->_next;
while (p) {
replies += p->ExpectedReplies(expected_replies_list);
@@ -1171,7 +1171,7 @@ ICPPeriodicCont::ICPPeriodicCont(ICPProcessor *icpP)
int
ICPPeriodicCont::PeriodicEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
{
- int do_reconfig = 0;
+ int do_reconfig = 0;
ICPConfiguration *C = _ICPpr->GetConfig();
if (C->GlobalConfigChange())
@@ -1182,7 +1182,7 @@ ICPPeriodicCont::PeriodicEvent(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
// We have a "icp.config" change callout which we
// have not processed.
_last_icp_config_callouts = configcallouts;
- do_reconfig = 1;
+ do_reconfig = 1;
}
if (do_reconfig) {
@@ -1239,7 +1239,7 @@ ICPPeriodicCont::DoReconfigAction(int event, Event *e)
} else {
// Delay and restart update.
_global_config_changed = 0;
- _peer_config_changed = 0;
+ _peer_config_changed = 0;
C->Unlock();
e->schedule_in(HRTIME_MSECONDS(RETRY_INTERVAL_MSECS));
return EVENT_CONT;
@@ -1399,8 +1399,8 @@ dumpICPstatEntry(int i, const char *name)
int64_t sval, cval;
RecRawStat *p = RecGetGlobalRawStatPtr(icp_rsb, i);
- sval = p->sum;
- cval = p->count;
+ sval = p->sum;
+ cval = p->count;
printf("%-32s %12" PRId64 " %16" PRId64 " %17.4f\n", &name[l > 31 ? l - 31 : 0], cval, sval,
cval ? (((double)sval) / ((double)cval)) : 0.0);
@@ -1431,8 +1431,8 @@ ICPProcessor::DumpICPConfig()
GetConfig()->globalConfig()->ICPReplyToUnknownPeer(), GetConfig()->globalConfig()->ICPDefaultReplyPort());
for (int i = 0; i < (_nPeerList + 1); i++) {
- P = _PeerList[i];
- id = P->GetPeerID();
+ P = _PeerList[i];
+ id = P->GetPeerID();
type = P->GetType();
const char *str_type;
diff --git a/proxy/ICPevents.h b/proxy/ICPevents.h
index 8abdf90..b4667f5 100644
--- a/proxy/ICPevents.h
+++ b/proxy/ICPevents.h
@@ -28,8 +28,8 @@
/** Events specific to ICP. */
typedef enum {
- ICP_LOOKUP_FOUND = ICP_EVENT_EVENTS_START + 0,
- ICP_LOOKUP_FAILED = ICP_EVENT_EVENTS_START + 1,
+ ICP_LOOKUP_FOUND = ICP_EVENT_EVENTS_START + 0,
+ ICP_LOOKUP_FAILED = ICP_EVENT_EVENTS_START + 1,
ICP_RESPONSE_MESSAGE = ICP_EVENT_EVENTS_START + 2,
/////////////////////////////////////////////////////
diff --git a/proxy/IPAllow.cc b/proxy/IPAllow.cc
index 078e9ff..c3f6434 100644
--- a/proxy/IPAllow.cc
+++ b/proxy/IPAllow.cc
@@ -128,8 +128,8 @@ IpAllow::Print()
} else if (0 == mask) {
s << "NONE";
} else {
- bool leader = false; // need leading vbar?
- uint32_t test_mask = 1; // mask for current method.
+ bool leader = false; // need leading vbar?
+ uint32_t test_mask = 1; // mask for current method.
for (int i = 0; i < HTTP_WKSIDX_METHODS_CNT; ++i, test_mask <<= 1) {
if (mask & test_mask) {
if (leader)
@@ -158,12 +158,12 @@ IpAllow::Print()
int
IpAllow::BuildTable()
{
- char *tok_state = NULL;
- char *line = NULL;
+ char *tok_state = NULL;
+ char *line = NULL;
const char *errPtr = NULL;
char errBuf[1024];
char *file_buf = NULL;
- int line_num = 0;
+ int line_num = 0;
IpEndpoint addr1;
IpEndpoint addr2;
matcher_line line_info;
@@ -210,11 +210,11 @@ IpAllow::BuildTable()
uint32_t acl_method_mask = 0;
AclRecord::MethodSet nonstandard_methods;
bool deny_nonstandard_methods = false;
- AclOp op = ACL_OP_DENY; // "shut up", I explained to the compiler.
+ AclOp op = ACL_OP_DENY; // "shut up", I explained to the compiler.
bool op_found = false, method_found = false;
for (int i = 0; i < MATCHER_MAX_TOKENS; i++) {
label = line_info.line[0][i];
- val = line_info.line[1][i];
+ val = line_info.line[1][i];
if (label == NULL) {
continue;
}
@@ -230,7 +230,7 @@ IpAllow::BuildTable()
// Loop again for methods, (in case action= appears after method=)
for (int i = 0; i < MATCHER_MAX_TOKENS; i++) {
label = line_info.line[0][i];
- val = line_info.line[1][i];
+ val = line_info.line[1][i];
if (label == NULL) {
continue;
}
@@ -243,7 +243,7 @@ IpAllow::BuildTable()
break;
} else {
int method_name_len = strlen(method_name);
- int method_idx = hdrtoken_tokenize(method_name, method_name_len);
+ int method_idx = hdrtoken_tokenize(method_name, method_name_len);
if (method_idx < HTTP_WKSIDX_CONNECT || method_idx >= HTTP_WKSIDX_CONNECT + HTTP_WKSIDX_METHODS_CNT) {
nonstandard_methods.insert(method_name);
Debug("ip-allow", "Found nonstandard method [%s] on line %d", method_name, line_num);
@@ -257,14 +257,14 @@ IpAllow::BuildTable()
}
// If method not specified, default to ALL
if (!method_found) {
- method_found = true;
+ method_found = true;
acl_method_mask = AclRecord::ALL_METHOD_MASK;
nonstandard_methods.clear();
}
// When deny, use bitwise complement. (Make the rule 'allow for all
// methods except those specified')
if (op == ACL_OP_DENY) {
- acl_method_mask = AclRecord::ALL_METHOD_MASK & ~acl_method_mask;
+ acl_method_mask = AclRecord::ALL_METHOD_MASK & ~acl_method_mask;
deny_nonstandard_methods = true;
}
}
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 2a464d3..578dcd4 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -355,15 +355,15 @@ tsapi int TS_HTTP_LEN_PUSH;
/* MLoc Constants */
tsapi const TSMLoc TS_NULL_MLOC = (TSMLoc)NULL;
-HttpAPIHooks *http_global_hooks = NULL;
-SslAPIHooks *ssl_hooks = NULL;
-LifecycleAPIHooks *lifecycle_hooks = NULL;
+HttpAPIHooks *http_global_hooks = NULL;
+SslAPIHooks *ssl_hooks = NULL;
+LifecycleAPIHooks *lifecycle_hooks = NULL;
ConfigUpdateCbTable *global_config_cbs = NULL;
static char traffic_server_version[128] = "";
-static int ts_major_version = 0;
-static int ts_minor_version = 0;
-static int ts_patch_version = 0;
+static int ts_major_version = 0;
+static int ts_minor_version = 0;
+static int ts_patch_version = 0;
static ClassAllocator<APIHook> apiHookAllocator("apiHookAllocator");
static ClassAllocator<INKContInternal> INKContAllocator("INKContAllocator");
@@ -709,19 +709,19 @@ FileImpl::fopen(const char *filename, const char *mode)
return 0;
}
m_mode = READ;
- m_fd = open(filename, O_RDONLY);
+ m_fd = open(filename, O_RDONLY);
} else if (mode[0] == 'w') {
if (mode[1] != '\0') {
return 0;
}
m_mode = WRITE;
- m_fd = open(filename, O_WRONLY | O_CREAT, 0644);
+ m_fd = open(filename, O_WRONLY | O_CREAT, 0644);
} else if (mode[0] == 'a') {
if (mode[1] != '\0') {
return 0;
}
m_mode = WRITE;
- m_fd = open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
+ m_fd = open(filename, O_WRONLY | O_CREAT | O_APPEND, 0644);
}
if (m_fd < 0) {
@@ -739,15 +739,15 @@ FileImpl::fclose()
fflush();
close(m_fd);
- m_fd = -1;
+ m_fd = -1;
m_mode = CLOSED;
}
if (m_buf) {
ats_free(m_buf);
- m_buf = NULL;
+ m_buf = NULL;
m_bufsize = 0;
- m_bufpos = 0;
+ m_bufpos = 0;
}
}
@@ -762,9 +762,9 @@ FileImpl::fread(void *buf, int length)
}
if (!m_buf) {
- m_bufpos = 0;
+ m_bufpos = 0;
m_bufsize = 1024;
- m_buf = (char *)ats_malloc(m_bufsize);
+ m_buf = (char *)ats_malloc(m_bufsize);
}
if (m_bufpos < length) {
@@ -815,9 +815,9 @@ FileImpl::fwrite(const void *buf, int length)
}
if (!m_buf) {
- m_bufpos = 0;
+ m_bufpos = 0;
m_bufsize = 1024;
- m_buf = (char *)ats_malloc(m_bufsize);
+ m_buf = (char *)ats_malloc(m_bufsize);
}
p = (const char *)buf;
@@ -906,7 +906,7 @@ FileImpl::fgets(char *buf, int length)
}
}
- pos = fread(buf, length - 1);
+ pos = fread(buf, length - 1);
buf[pos] = '\0';
return buf;
@@ -948,7 +948,7 @@ INKContInternal::init(TSEventFunc funcp, TSMutex mutexp)
{
SET_HANDLER(&INKContInternal::handle_event);
- mutex = (ProxyMutex *)mutexp;
+ mutex = (ProxyMutex *)mutexp;
m_event_func = funcp;
}
@@ -960,7 +960,7 @@ INKContInternal::destroy()
}
m_deleted = 1;
if (m_deletable) {
- this->mutex = NULL;
+ this->mutex = NULL;
m_free_magic = INKCONT_INTERN_MAGIC_DEAD;
INKContAllocator.free(this);
} else {
@@ -995,7 +995,7 @@ INKContInternal::handle_event(int event, void *edata)
handle_event_count(event);
if (m_deleted) {
if (m_deletable) {
- this->mutex = NULL;
+ this->mutex = NULL;
m_free_magic = INKCONT_INTERN_MAGIC_DEAD;
INKContAllocator.free(this);
} else {
@@ -1076,8 +1076,8 @@ INKVConnInternal::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
m_read_vio.buffer.writer_for(buf);
m_read_vio.op = VIO::READ;
m_read_vio.set_continuation(c);
- m_read_vio.nbytes = nbytes;
- m_read_vio.ndone = 0;
+ m_read_vio.nbytes = nbytes;
+ m_read_vio.ndone = 0;
m_read_vio.vc_server = this;
if (ink_atomic_increment((int *)&m_event_count, 1) < 0) {
@@ -1095,8 +1095,8 @@ INKVConnInternal::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *b
m_write_vio.buffer.reader_for(buf);
m_write_vio.op = VIO::WRITE;
m_write_vio.set_continuation(c);
- m_write_vio.nbytes = nbytes;
- m_write_vio.ndone = 0;
+ m_write_vio.nbytes = nbytes;
+ m_write_vio.ndone = 0;
m_write_vio.vc_server = this;
if (m_write_vio.buffer.reader()->read_avail() > 0) {
@@ -1125,7 +1125,7 @@ INKVConnInternal::do_io_close(int error)
INK_WRITE_MEMORY_BARRIER;
if (error != -1) {
- lerrno = error;
+ lerrno = error;
m_closed = TS_VC_CLOSE_ABORT;
} else {
m_closed = TS_VC_CLOSE_NORMAL;
@@ -1242,7 +1242,7 @@ APIHooks::prepend(INKContInternal *cont)
{
APIHook *api_hook;
- api_hook = apiHookAllocator.alloc();
+ api_hook = apiHookAllocator.alloc();
api_hook->m_cont = cont;
m_hooks.push(api_hook);
@@ -1253,7 +1253,7 @@ APIHooks::append(INKContInternal *cont)
{
APIHook *api_hook;
- api_hook = apiHookAllocator.alloc();
+ api_hook = apiHookAllocator.alloc();
api_hook->m_cont = cont;
m_hooks.enqueue(api_hook);
@@ -1353,250 +1353,250 @@ api_init()
init = 0;
/* URL schemes */
- TS_URL_SCHEME_FILE = URL_SCHEME_FILE;
- TS_URL_SCHEME_FTP = URL_SCHEME_FTP;
- TS_URL_SCHEME_GOPHER = URL_SCHEME_GOPHER;
- TS_URL_SCHEME_HTTP = URL_SCHEME_HTTP;
- TS_URL_SCHEME_HTTPS = URL_SCHEME_HTTPS;
- TS_URL_SCHEME_MAILTO = URL_SCHEME_MAILTO;
- TS_URL_SCHEME_NEWS = URL_SCHEME_NEWS;
- TS_URL_SCHEME_NNTP = URL_SCHEME_NNTP;
+ TS_URL_SCHEME_FILE = URL_SCHEME_FILE;
+ TS_URL_SCHEME_FTP = URL_SCHEME_FTP;
+ TS_URL_SCHEME_GOPHER = URL_SCHEME_GOPHER;
+ TS_URL_SCHEME_HTTP = URL_SCHEME_HTTP;
+ TS_URL_SCHEME_HTTPS = URL_SCHEME_HTTPS;
+ TS_URL_SCHEME_MAILTO = URL_SCHEME_MAILTO;
+ TS_URL_SCHEME_NEWS = URL_SCHEME_NEWS;
+ TS_URL_SCHEME_NNTP = URL_SCHEME_NNTP;
TS_URL_SCHEME_PROSPERO = URL_SCHEME_PROSPERO;
- TS_URL_SCHEME_TELNET = URL_SCHEME_TELNET;
- TS_URL_SCHEME_WAIS = URL_SCHEME_WAIS;
-
- TS_URL_LEN_FILE = URL_LEN_FILE;
- TS_URL_LEN_FTP = URL_LEN_FTP;
- TS_URL_LEN_GOPHER = URL_LEN_GOPHER;
- TS_URL_LEN_HTTP = URL_LEN_HTTP;
- TS_URL_LEN_HTTPS = URL_LEN_HTTPS;
- TS_URL_LEN_MAILTO = URL_LEN_MAILTO;
- TS_URL_LEN_NEWS = URL_LEN_NEWS;
- TS_URL_LEN_NNTP = URL_LEN_NNTP;
+ TS_URL_SCHEME_TELNET = URL_SCHEME_TELNET;
+ TS_URL_SCHEME_WAIS = URL_SCHEME_WAIS;
+
+ TS_URL_LEN_FILE = URL_LEN_FILE;
+ TS_URL_LEN_FTP = URL_LEN_FTP;
+ TS_URL_LEN_GOPHER = URL_LEN_GOPHER;
+ TS_URL_LEN_HTTP = URL_LEN_HTTP;
+ TS_URL_LEN_HTTPS = URL_LEN_HTTPS;
+ TS_URL_LEN_MAILTO = URL_LEN_MAILTO;
+ TS_URL_LEN_NEWS = URL_LEN_NEWS;
+ TS_URL_LEN_NNTP = URL_LEN_NNTP;
TS_URL_LEN_PROSPERO = URL_LEN_PROSPERO;
- TS_URL_LEN_TELNET = URL_LEN_TELNET;
- TS_URL_LEN_WAIS = URL_LEN_WAIS;
+ TS_URL_LEN_TELNET = URL_LEN_TELNET;
+ TS_URL_LEN_WAIS = URL_LEN_WAIS;
/* MIME fields */
- TS_MIME_FIELD_ACCEPT = MIME_FIELD_ACCEPT;
- TS_MIME_FIELD_ACCEPT_CHARSET = MIME_FIELD_ACCEPT_CHARSET;
- TS_MIME_FIELD_ACCEPT_ENCODING = MIME_FIELD_ACCEPT_ENCODING;
- TS_MIME_FIELD_ACCEPT_LANGUAGE = MIME_FIELD_ACCEPT_LANGUAGE;
- TS_MIME_FIELD_ACCEPT_RANGES = MIME_FIELD_ACCEPT_RANGES;
- TS_MIME_FIELD_AGE = MIME_FIELD_AGE;
- TS_MIME_FIELD_ALLOW = MIME_FIELD_ALLOW;
- TS_MIME_FIELD_APPROVED = MIME_FIELD_APPROVED;
- TS_MIME_FIELD_AUTHORIZATION = MIME_FIELD_AUTHORIZATION;
- TS_MIME_FIELD_BYTES = MIME_FIELD_BYTES;
- TS_MIME_FIELD_CACHE_CONTROL = MIME_FIELD_CACHE_CONTROL;
- TS_MIME_FIELD_CLIENT_IP = MIME_FIELD_CLIENT_IP;
- TS_MIME_FIELD_CONNECTION = MIME_FIELD_CONNECTION;
- TS_MIME_FIELD_CONTENT_BASE = MIME_FIELD_CONTENT_BASE;
- TS_MIME_FIELD_CONTENT_ENCODING = MIME_FIELD_CONTENT_ENCODING;
- TS_MIME_FIELD_CONTENT_LANGUAGE = MIME_FIELD_CONTENT_LANGUAGE;
- TS_MIME_FIELD_CONTENT_LENGTH = MIME_FIELD_CONTENT_LENGTH;
- TS_MIME_FIELD_CONTENT_LOCATION = MIME_FIELD_CONTENT_LOCATION;
- TS_MIME_FIELD_CONTENT_MD5 = MIME_FIELD_CONTENT_MD5;
- TS_MIME_FIELD_CONTENT_RANGE = MIME_FIELD_CONTENT_RANGE;
- TS_MIME_FIELD_CONTENT_TYPE = MIME_FIELD_CONTENT_TYPE;
- TS_MIME_FIELD_CONTROL = MIME_FIELD_CONTROL;
- TS_MIME_FIELD_COOKIE = MIME_FIELD_COOKIE;
- TS_MIME_FIELD_DATE = MIME_FIELD_DATE;
- TS_MIME_FIELD_DISTRIBUTION = MIME_FIELD_DISTRIBUTION;
- TS_MIME_FIELD_ETAG = MIME_FIELD_ETAG;
- TS_MIME_FIELD_EXPECT = MIME_FIELD_EXPECT;
- TS_MIME_FIELD_EXPIRES = MIME_FIELD_EXPIRES;
- TS_MIME_FIELD_FOLLOWUP_TO = MIME_FIELD_FOLLOWUP_TO;
- TS_MIME_FIELD_FROM = MIME_FIELD_FROM;
- TS_MIME_FIELD_HOST = MIME_FIELD_HOST;
- TS_MIME_FIELD_IF_MATCH = MIME_FIELD_IF_MATCH;
- TS_MIME_FIELD_IF_MODIFIED_SINCE = MIME_FIELD_IF_MODIFIED_SINCE;
- TS_MIME_FIELD_IF_NONE_MATCH = MIME_FIELD_IF_NONE_MATCH;
- TS_MIME_FIELD_IF_RANGE = MIME_FIELD_IF_RANGE;
- TS_MIME_FIELD_IF_UNMODIFIED_SINCE = MIME_FIELD_IF_UNMODIFIED_SINCE;
- TS_MIME_FIELD_KEEP_ALIVE = MIME_FIELD_KEEP_ALIVE;
- TS_MIME_FIELD_KEYWORDS = MIME_FIELD_KEYWORDS;
- TS_MIME_FIELD_LAST_MODIFIED = MIME_FIELD_LAST_MODIFIED;
- TS_MIME_FIELD_LINES = MIME_FIELD_LINES;
- TS_MIME_FIELD_LOCATION = MIME_FIELD_LOCATION;
- TS_MIME_FIELD_MAX_FORWARDS = MIME_FIELD_MAX_FORWARDS;
- TS_MIME_FIELD_MESSAGE_ID = MIME_FIELD_MESSAGE_ID;
- TS_MIME_FIELD_NEWSGROUPS = MIME_FIELD_NEWSGROUPS;
- TS_MIME_FIELD_ORGANIZATION = MIME_FIELD_ORGANIZATION;
- TS_MIME_FIELD_PATH = MIME_FIELD_PATH;
- TS_MIME_FIELD_PRAGMA = MIME_FIELD_PRAGMA;
- TS_MIME_FIELD_PROXY_AUTHENTICATE = MIME_FIELD_PROXY_AUTHENTICATE;
- TS_MIME_FIELD_PROXY_AUTHORIZATION = MIME_FIELD_PROXY_AUTHORIZATION;
- TS_MIME_FIELD_PROXY_CONNECTION = MIME_FIELD_PROXY_CONNECTION;
- TS_MIME_FIELD_PUBLIC = MIME_FIELD_PUBLIC;
- TS_MIME_FIELD_RANGE = MIME_FIELD_RANGE;
- TS_MIME_FIELD_REFERENCES = MIME_FIELD_REFERENCES;
- TS_MIME_FIELD_REFERER = MIME_FIELD_REFERER;
- TS_MIME_FIELD_REPLY_TO = MIME_FIELD_REPLY_TO;
- TS_MIME_FIELD_RETRY_AFTER = MIME_FIELD_RETRY_AFTER;
- TS_MIME_FIELD_SENDER = MIME_FIELD_SENDER;
- TS_MIME_FIELD_SERVER = MIME_FIELD_SERVER;
- TS_MIME_FIELD_SET_COOKIE = MIME_FIELD_SET_COOKIE;
+ TS_MIME_FIELD_ACCEPT = MIME_FIELD_ACCEPT;
+ TS_MIME_FIELD_ACCEPT_CHARSET = MIME_FIELD_ACCEPT_CHARSET;
+ TS_MIME_FIELD_ACCEPT_ENCODING = MIME_FIELD_ACCEPT_ENCODING;
+ TS_MIME_FIELD_ACCEPT_LANGUAGE = MIME_FIELD_ACCEPT_LANGUAGE;
+ TS_MIME_FIELD_ACCEPT_RANGES = MIME_FIELD_ACCEPT_RANGES;
+ TS_MIME_FIELD_AGE = MIME_FIELD_AGE;
+ TS_MIME_FIELD_ALLOW = MIME_FIELD_ALLOW;
+ TS_MIME_FIELD_APPROVED = MIME_FIELD_APPROVED;
+ TS_MIME_FIELD_AUTHORIZATION = MIME_FIELD_AUTHORIZATION;
+ TS_MIME_FIELD_BYTES = MIME_FIELD_BYTES;
+ TS_MIME_FIELD_CACHE_CONTROL = MIME_FIELD_CACHE_CONTROL;
+ TS_MIME_FIELD_CLIENT_IP = MIME_FIELD_CLIENT_IP;
+ TS_MIME_FIELD_CONNECTION = MIME_FIELD_CONNECTION;
+ TS_MIME_FIELD_CONTENT_BASE = MIME_FIELD_CONTENT_BASE;
+ TS_MIME_FIELD_CONTENT_ENCODING = MIME_FIELD_CONTENT_ENCODING;
+ TS_MIME_FIELD_CONTENT_LANGUAGE = MIME_FIELD_CONTENT_LANGUAGE;
+ TS_MIME_FIELD_CONTENT_LENGTH = MIME_FIELD_CONTENT_LENGTH;
+ TS_MIME_FIELD_CONTENT_LOCATION = MIME_FIELD_CONTENT_LOCATION;
+ TS_MIME_FIELD_CONTENT_MD5 = MIME_FIELD_CONTENT_MD5;
+ TS_MIME_FIELD_CONTENT_RANGE = MIME_FIELD_CONTENT_RANGE;
+ TS_MIME_FIELD_CONTENT_TYPE = MIME_FIELD_CONTENT_TYPE;
+ TS_MIME_FIELD_CONTROL = MIME_FIELD_CONTROL;
+ TS_MIME_FIELD_COOKIE = MIME_FIELD_COOKIE;
+ TS_MIME_FIELD_DATE = MIME_FIELD_DATE;
+ TS_MIME_FIELD_DISTRIBUTION = MIME_FIELD_DISTRIBUTION;
+ TS_MIME_FIELD_ETAG = MIME_FIELD_ETAG;
+ TS_MIME_FIELD_EXPECT = MIME_FIELD_EXPECT;
+ TS_MIME_FIELD_EXPIRES = MIME_FIELD_EXPIRES;
+ TS_MIME_FIELD_FOLLOWUP_TO = MIME_FIELD_FOLLOWUP_TO;
+ TS_MIME_FIELD_FROM = MIME_FIELD_FROM;
+ TS_MIME_FIELD_HOST = MIME_FIELD_HOST;
+ TS_MIME_FIELD_IF_MATCH = MIME_FIELD_IF_MATCH;
+ TS_MIME_FIELD_IF_MODIFIED_SINCE = MIME_FIELD_IF_MODIFIED_SINCE;
+ TS_MIME_FIELD_IF_NONE_MATCH = MIME_FIELD_IF_NONE_MATCH;
+ TS_MIME_FIELD_IF_RANGE = MIME_FIELD_IF_RANGE;
+ TS_MIME_FIELD_IF_UNMODIFIED_SINCE = MIME_FIELD_IF_UNMODIFIED_SINCE;
+ TS_MIME_FIELD_KEEP_ALIVE = MIME_FIELD_KEEP_ALIVE;
+ TS_MIME_FIELD_KEYWORDS = MIME_FIELD_KEYWORDS;
+ TS_MIME_FIELD_LAST_MODIFIED = MIME_FIELD_LAST_MODIFIED;
+ TS_MIME_FIELD_LINES = MIME_FIELD_LINES;
+ TS_MIME_FIELD_LOCATION = MIME_FIELD_LOCATION;
+ TS_MIME_FIELD_MAX_FORWARDS = MIME_FIELD_MAX_FORWARDS;
+ TS_MIME_FIELD_MESSAGE_ID = MIME_FIELD_MESSAGE_ID;
+ TS_MIME_FIELD_NEWSGROUPS = MIME_FIELD_NEWSGROUPS;
+ TS_MIME_FIELD_ORGANIZATION = MIME_FIELD_ORGANIZATION;
+ TS_MIME_FIELD_PATH = MIME_FIELD_PATH;
+ TS_MIME_FIELD_PRAGMA = MIME_FIELD_PRAGMA;
+ TS_MIME_FIELD_PROXY_AUTHENTICATE = MIME_FIELD_PROXY_AUTHENTICATE;
+ TS_MIME_FIELD_PROXY_AUTHORIZATION = MIME_FIELD_PROXY_AUTHORIZATION;
+ TS_MIME_FIELD_PROXY_CONNECTION = MIME_FIELD_PROXY_CONNECTION;
+ TS_MIME_FIELD_PUBLIC = MIME_FIELD_PUBLIC;
+ TS_MIME_FIELD_RANGE = MIME_FIELD_RANGE;
+ TS_MIME_FIELD_REFERENCES = MIME_FIELD_REFERENCES;
+ TS_MIME_FIELD_REFERER = MIME_FIELD_REFERER;
+ TS_MIME_FIELD_REPLY_TO = MIME_FIELD_REPLY_TO;
+ TS_MIME_FIELD_RETRY_AFTER = MIME_FIELD_RETRY_AFTER;
+ TS_MIME_FIELD_SENDER = MIME_FIELD_SENDER;
+ TS_MIME_FIELD_SERVER = MIME_FIELD_SERVER;
+ TS_MIME_FIELD_SET_COOKIE = MIME_FIELD_SET_COOKIE;
TS_MIME_FIELD_STRICT_TRANSPORT_SECURITY = MIME_FIELD_STRICT_TRANSPORT_SECURITY;
- TS_MIME_FIELD_SUBJECT = MIME_FIELD_SUBJECT;
- TS_MIME_FIELD_SUMMARY = MIME_FIELD_SUMMARY;
- TS_MIME_FIELD_TE = MIME_FIELD_TE;
- TS_MIME_FIELD_TRANSFER_ENCODING = MIME_FIELD_TRANSFER_ENCODING;
- TS_MIME_FIELD_UPGRADE = MIME_FIELD_UPGRADE;
- TS_MIME_FIELD_USER_AGENT = MIME_FIELD_USER_AGENT;
- TS_MIME_FIELD_VARY = MIME_FIELD_VARY;
- TS_MIME_FIELD_VIA = MIME_FIELD_VIA;
- TS_MIME_FIELD_WARNING = MIME_FIELD_WARNING;
- TS_MIME_FIELD_WWW_AUTHENTICATE = MIME_FIELD_WWW_AUTHENTICATE;
- TS_MIME_FIELD_XREF = MIME_FIELD_XREF;
- TS_MIME_FIELD_X_FORWARDED_FOR = MIME_FIELD_X_FORWARDED_FOR;
-
- TS_MIME_LEN_ACCEPT = MIME_LEN_ACCEPT;
- TS_MIME_LEN_ACCEPT_CHARSET = MIME_LEN_ACCEPT_CHARSET;
- TS_MIME_LEN_ACCEPT_ENCODING = MIME_LEN_ACCEPT_ENCODING;
- TS_MIME_LEN_ACCEPT_LANGUAGE = MIME_LEN_ACCEPT_LANGUAGE;
- TS_MIME_LEN_ACCEPT_RANGES = MIME_LEN_ACCEPT_RANGES;
- TS_MIME_LEN_AGE = MIME_LEN_AGE;
- TS_MIME_LEN_ALLOW = MIME_LEN_ALLOW;
- TS_MIME_LEN_APPROVED = MIME_LEN_APPROVED;
- TS_MIME_LEN_AUTHORIZATION = MIME_LEN_AUTHORIZATION;
- TS_MIME_LEN_BYTES = MIME_LEN_BYTES;
- TS_MIME_LEN_CACHE_CONTROL = MIME_LEN_CACHE_CONTROL;
- TS_MIME_LEN_CLIENT_IP = MIME_LEN_CLIENT_IP;
- TS_MIME_LEN_CONNECTION = MIME_LEN_CONNECTION;
- TS_MIME_LEN_CONTENT_BASE = MIME_LEN_CONTENT_BASE;
- TS_MIME_LEN_CONTENT_ENCODING = MIME_LEN_CONTENT_ENCODING;
- TS_MIME_LEN_CONTENT_LANGUAGE = MIME_LEN_CONTENT_LANGUAGE;
- TS_MIME_LEN_CONTENT_LENGTH = MIME_LEN_CONTENT_LENGTH;
- TS_MIME_LEN_CONTENT_LOCATION = MIME_LEN_CONTENT_LOCATION;
- TS_MIME_LEN_CONTENT_MD5 = MIME_LEN_CONTENT_MD5;
- TS_MIME_LEN_CONTENT_RANGE = MIME_LEN_CONTENT_RANGE;
- TS_MIME_LEN_CONTENT_TYPE = MIME_LEN_CONTENT_TYPE;
- TS_MIME_LEN_CONTROL = MIME_LEN_CONTROL;
- TS_MIME_LEN_COOKIE = MIME_LEN_COOKIE;
- TS_MIME_LEN_DATE = MIME_LEN_DATE;
- TS_MIME_LEN_DISTRIBUTION = MIME_LEN_DISTRIBUTION;
- TS_MIME_LEN_ETAG = MIME_LEN_ETAG;
- TS_MIME_LEN_EXPECT = MIME_LEN_EXPECT;
- TS_MIME_LEN_EXPIRES = MIME_LEN_EXPIRES;
- TS_MIME_LEN_FOLLOWUP_TO = MIME_LEN_FOLLOWUP_TO;
- TS_MIME_LEN_FROM = MIME_LEN_FROM;
- TS_MIME_LEN_HOST = MIME_LEN_HOST;
- TS_MIME_LEN_IF_MATCH = MIME_LEN_IF_MATCH;
- TS_MIME_LEN_IF_MODIFIED_SINCE = MIME_LEN_IF_MODIFIED_SINCE;
- TS_MIME_LEN_IF_NONE_MATCH = MIME_LEN_IF_NONE_MATCH;
- TS_MIME_LEN_IF_RANGE = MIME_LEN_IF_RANGE;
- TS_MIME_LEN_IF_UNMODIFIED_SINCE = MIME_LEN_IF_UNMODIFIED_SINCE;
- TS_MIME_LEN_KEEP_ALIVE = MIME_LEN_KEEP_ALIVE;
- TS_MIME_LEN_KEYWORDS = MIME_LEN_KEYWORDS;
- TS_MIME_LEN_LAST_MODIFIED = MIME_LEN_LAST_MODIFIED;
- TS_MIME_LEN_LINES = MIME_LEN_LINES;
- TS_MIME_LEN_LOCATION = MIME_LEN_LOCATION;
- TS_MIME_LEN_MAX_FORWARDS = MIME_LEN_MAX_FORWARDS;
- TS_MIME_LEN_MESSAGE_ID = MIME_LEN_MESSAGE_ID;
- TS_MIME_LEN_NEWSGROUPS = MIME_LEN_NEWSGROUPS;
- TS_MIME_LEN_ORGANIZATION = MIME_LEN_ORGANIZATION;
- TS_MIME_LEN_PATH = MIME_LEN_PATH;
- TS_MIME_LEN_PRAGMA = MIME_LEN_PRAGMA;
- TS_MIME_LEN_PROXY_AUTHENTICATE = MIME_LEN_PROXY_AUTHENTICATE;
- TS_MIME_LEN_PROXY_AUTHORIZATION = MIME_LEN_PROXY_AUTHORIZATION;
- TS_MIME_LEN_PROXY_CONNECTION = MIME_LEN_PROXY_CONNECTION;
- TS_MIME_LEN_PUBLIC = MIME_LEN_PUBLIC;
- TS_MIME_LEN_RANGE = MIME_LEN_RANGE;
- TS_MIME_LEN_REFERENCES = MIME_LEN_REFERENCES;
- TS_MIME_LEN_REFERER = MIME_LEN_REFERER;
- TS_MIME_LEN_REPLY_TO = MIME_LEN_REPLY_TO;
- TS_MIME_LEN_RETRY_AFTER = MIME_LEN_RETRY_AFTER;
- TS_MIME_LEN_SENDER = MIME_LEN_SENDER;
- TS_MIME_LEN_SERVER = MIME_LEN_SERVER;
- TS_MIME_LEN_SET_COOKIE = MIME_LEN_SET_COOKIE;
+ TS_MIME_FIELD_SUBJECT = MIME_FIELD_SUBJECT;
+ TS_MIME_FIELD_SUMMARY = MIME_FIELD_SUMMARY;
+ TS_MIME_FIELD_TE = MIME_FIELD_TE;
+ TS_MIME_FIELD_TRANSFER_ENCODING = MIME_FIELD_TRANSFER_ENCODING;
+ TS_MIME_FIELD_UPGRADE = MIME_FIELD_UPGRADE;
+ TS_MIME_FIELD_USER_AGENT = MIME_FIELD_USER_AGENT;
+ TS_MIME_FIELD_VARY = MIME_FIELD_VARY;
+ TS_MIME_FIELD_VIA = MIME_FIELD_VIA;
+ TS_MIME_FIELD_WARNING = MIME_FIELD_WARNING;
+ TS_MIME_FIELD_WWW_AUTHENTICATE = MIME_FIELD_WWW_AUTHENTICATE;
+ TS_MIME_FIELD_XREF = MIME_FIELD_XREF;
+ TS_MIME_FIELD_X_FORWARDED_FOR = MIME_FIELD_X_FORWARDED_FOR;
+
+ TS_MIME_LEN_ACCEPT = MIME_LEN_ACCEPT;
+ TS_MIME_LEN_ACCEPT_CHARSET = MIME_LEN_ACCEPT_CHARSET;
+ TS_MIME_LEN_ACCEPT_ENCODING = MIME_LEN_ACCEPT_ENCODING;
+ TS_MIME_LEN_ACCEPT_LANGUAGE = MIME_LEN_ACCEPT_LANGUAGE;
+ TS_MIME_LEN_ACCEPT_RANGES = MIME_LEN_ACCEPT_RANGES;
+ TS_MIME_LEN_AGE = MIME_LEN_AGE;
+ TS_MIME_LEN_ALLOW = MIME_LEN_ALLOW;
+ TS_MIME_LEN_APPROVED = MIME_LEN_APPROVED;
+ TS_MIME_LEN_AUTHORIZATION = MIME_LEN_AUTHORIZATION;
+ TS_MIME_LEN_BYTES = MIME_LEN_BYTES;
+ TS_MIME_LEN_CACHE_CONTROL = MIME_LEN_CACHE_CONTROL;
+ TS_MIME_LEN_CLIENT_IP = MIME_LEN_CLIENT_IP;
+ TS_MIME_LEN_CONNECTION = MIME_LEN_CONNECTION;
+ TS_MIME_LEN_CONTENT_BASE = MIME_LEN_CONTENT_BASE;
+ TS_MIME_LEN_CONTENT_ENCODING = MIME_LEN_CONTENT_ENCODING;
+ TS_MIME_LEN_CONTENT_LANGUAGE = MIME_LEN_CONTENT_LANGUAGE;
+ TS_MIME_LEN_CONTENT_LENGTH = MIME_LEN_CONTENT_LENGTH;
+ TS_MIME_LEN_CONTENT_LOCATION = MIME_LEN_CONTENT_LOCATION;
+ TS_MIME_LEN_CONTENT_MD5 = MIME_LEN_CONTENT_MD5;
+ TS_MIME_LEN_CONTENT_RANGE = MIME_LEN_CONTENT_RANGE;
+ TS_MIME_LEN_CONTENT_TYPE = MIME_LEN_CONTENT_TYPE;
+ TS_MIME_LEN_CONTROL = MIME_LEN_CONTROL;
+ TS_MIME_LEN_COOKIE = MIME_LEN_COOKIE;
+ TS_MIME_LEN_DATE = MIME_LEN_DATE;
+ TS_MIME_LEN_DISTRIBUTION = MIME_LEN_DISTRIBUTION;
+ TS_MIME_LEN_ETAG = MIME_LEN_ETAG;
+ TS_MIME_LEN_EXPECT = MIME_LEN_EXPECT;
+ TS_MIME_LEN_EXPIRES = MIME_LEN_EXPIRES;
+ TS_MIME_LEN_FOLLOWUP_TO = MIME_LEN_FOLLOWUP_TO;
+ TS_MIME_LEN_FROM = MIME_LEN_FROM;
+ TS_MIME_LEN_HOST = MIME_LEN_HOST;
+ TS_MIME_LEN_IF_MATCH = MIME_LEN_IF_MATCH;
+ TS_MIME_LEN_IF_MODIFIED_SINCE = MIME_LEN_IF_MODIFIED_SINCE;
+ TS_MIME_LEN_IF_NONE_MATCH = MIME_LEN_IF_NONE_MATCH;
+ TS_MIME_LEN_IF_RANGE = MIME_LEN_IF_RANGE;
+ TS_MIME_LEN_IF_UNMODIFIED_SINCE = MIME_LEN_IF_UNMODIFIED_SINCE;
+ TS_MIME_LEN_KEEP_ALIVE = MIME_LEN_KEEP_ALIVE;
+ TS_MIME_LEN_KEYWORDS = MIME_LEN_KEYWORDS;
+ TS_MIME_LEN_LAST_MODIFIED = MIME_LEN_LAST_MODIFIED;
+ TS_MIME_LEN_LINES = MIME_LEN_LINES;
+ TS_MIME_LEN_LOCATION = MIME_LEN_LOCATION;
+ TS_MIME_LEN_MAX_FORWARDS = MIME_LEN_MAX_FORWARDS;
+ TS_MIME_LEN_MESSAGE_ID = MIME_LEN_MESSAGE_ID;
+ TS_MIME_LEN_NEWSGROUPS = MIME_LEN_NEWSGROUPS;
+ TS_MIME_LEN_ORGANIZATION = MIME_LEN_ORGANIZATION;
+ TS_MIME_LEN_PATH = MIME_LEN_PATH;
+ TS_MIME_LEN_PRAGMA = MIME_LEN_PRAGMA;
+ TS_MIME_LEN_PROXY_AUTHENTICATE = MIME_LEN_PROXY_AUTHENTICATE;
+ TS_MIME_LEN_PROXY_AUTHORIZATION = MIME_LEN_PROXY_AUTHORIZATION;
+ TS_MIME_LEN_PROXY_CONNECTION = MIME_LEN_PROXY_CONNECTION;
+ TS_MIME_LEN_PUBLIC = MIME_LEN_PUBLIC;
+ TS_MIME_LEN_RANGE = MIME_LEN_RANGE;
+ TS_MIME_LEN_REFERENCES = MIME_LEN_REFERENCES;
+ TS_MIME_LEN_REFERER = MIME_LEN_REFERER;
+ TS_MIME_LEN_REPLY_TO = MIME_LEN_REPLY_TO;
+ TS_MIME_LEN_RETRY_AFTER = MIME_LEN_RETRY_AFTER;
+ TS_MIME_LEN_SENDER = MIME_LEN_SENDER;
+ TS_MIME_LEN_SERVER = MIME_LEN_SERVER;
+ TS_MIME_LEN_SET_COOKIE = MIME_LEN_SET_COOKIE;
TS_MIME_LEN_STRICT_TRANSPORT_SECURITY = MIME_LEN_STRICT_TRANSPORT_SECURITY;
- TS_MIME_LEN_SUBJECT = MIME_LEN_SUBJECT;
- TS_MIME_LEN_SUMMARY = MIME_LEN_SUMMARY;
- TS_MIME_LEN_TE = MIME_LEN_TE;
- TS_MIME_LEN_TRANSFER_ENCODING = MIME_LEN_TRANSFER_ENCODING;
- TS_MIME_LEN_UPGRADE = MIME_LEN_UPGRADE;
- TS_MIME_LEN_USER_AGENT = MIME_LEN_USER_AGENT;
- TS_MIME_LEN_VARY = MIME_LEN_VARY;
- TS_MIME_LEN_VIA = MIME_LEN_VIA;
- TS_MIME_LEN_WARNING = MIME_LEN_WARNING;
- TS_MIME_LEN_WWW_AUTHENTICATE = MIME_LEN_WWW_AUTHENTICATE;
- TS_MIME_LEN_XREF = MIME_LEN_XREF;
- TS_MIME_LEN_X_FORWARDED_FOR = MIME_LEN_X_FORWARDED_FOR;
+ TS_MIME_LEN_SUBJECT = MIME_LEN_SUBJECT;
+ TS_MIME_LEN_SUMMARY = MIME_LEN_SUMMARY;
+ TS_MIME_LEN_TE = MIME_LEN_TE;
+ TS_MIME_LEN_TRANSFER_ENCODING = MIME_LEN_TRANSFER_ENCODING;
+ TS_MIME_LEN_UPGRADE = MIME_LEN_UPGRADE;
+ TS_MIME_LEN_USER_AGENT = MIME_LEN_USER_AGENT;
+ TS_MIME_LEN_VARY = MIME_LEN_VARY;
+ TS_MIME_LEN_VIA = MIME_LEN_VIA;
+ TS_MIME_LEN_WARNING = MIME_LEN_WARNING;
+ TS_MIME_LEN_WWW_AUTHENTICATE = MIME_LEN_WWW_AUTHENTICATE;
+ TS_MIME_LEN_XREF = MIME_LEN_XREF;
+ TS_MIME_LEN_X_FORWARDED_FOR = MIME_LEN_X_FORWARDED_FOR;
/* HTTP methods */
- TS_HTTP_METHOD_CONNECT = HTTP_METHOD_CONNECT;
- TS_HTTP_METHOD_DELETE = HTTP_METHOD_DELETE;
- TS_HTTP_METHOD_GET = HTTP_METHOD_GET;
- TS_HTTP_METHOD_HEAD = HTTP_METHOD_HEAD;
+ TS_HTTP_METHOD_CONNECT = HTTP_METHOD_CONNECT;
+ TS_HTTP_METHOD_DELETE = HTTP_METHOD_DELETE;
+ TS_HTTP_METHOD_GET = HTTP_METHOD_GET;
+ TS_HTTP_METHOD_HEAD = HTTP_METHOD_HEAD;
TS_HTTP_METHOD_ICP_QUERY = HTTP_METHOD_ICP_QUERY;
- TS_HTTP_METHOD_OPTIONS = HTTP_METHOD_OPTIONS;
- TS_HTTP_METHOD_POST = HTTP_METHOD_POST;
- TS_HTTP_METHOD_PURGE = HTTP_METHOD_PURGE;
- TS_HTTP_METHOD_PUT = HTTP_METHOD_PUT;
- TS_HTTP_METHOD_TRACE = HTTP_METHOD_TRACE;
- TS_HTTP_METHOD_PUSH = HTTP_METHOD_PUSH;
-
- TS_HTTP_LEN_CONNECT = HTTP_LEN_CONNECT;
- TS_HTTP_LEN_DELETE = HTTP_LEN_DELETE;
- TS_HTTP_LEN_GET = HTTP_LEN_GET;
- TS_HTTP_LEN_HEAD = HTTP_LEN_HEAD;
+ TS_HTTP_METHOD_OPTIONS = HTTP_METHOD_OPTIONS;
+ TS_HTTP_METHOD_POST = HTTP_METHOD_POST;
+ TS_HTTP_METHOD_PURGE = HTTP_METHOD_PURGE;
+ TS_HTTP_METHOD_PUT = HTTP_METHOD_PUT;
+ TS_HTTP_METHOD_TRACE = HTTP_METHOD_TRACE;
+ TS_HTTP_METHOD_PUSH = HTTP_METHOD_PUSH;
+
+ TS_HTTP_LEN_CONNECT = HTTP_LEN_CONNECT;
+ TS_HTTP_LEN_DELETE = HTTP_LEN_DELETE;
+ TS_HTTP_LEN_GET = HTTP_LEN_GET;
+ TS_HTTP_LEN_HEAD = HTTP_LEN_HEAD;
TS_HTTP_LEN_ICP_QUERY = HTTP_LEN_ICP_QUERY;
- TS_HTTP_LEN_OPTIONS = HTTP_LEN_OPTIONS;
- TS_HTTP_LEN_POST = HTTP_LEN_POST;
- TS_HTTP_LEN_PURGE = HTTP_LEN_PURGE;
- TS_HTTP_LEN_PUT = HTTP_LEN_PUT;
- TS_HTTP_LEN_TRACE = HTTP_LEN_TRACE;
- TS_HTTP_LEN_PUSH = HTTP_LEN_PUSH;
+ TS_HTTP_LEN_OPTIONS = HTTP_LEN_OPTIONS;
+ TS_HTTP_LEN_POST = HTTP_LEN_POST;
+ TS_HTTP_LEN_PURGE = HTTP_LEN_PURGE;
+ TS_HTTP_LEN_PUT = HTTP_LEN_PUT;
+ TS_HTTP_LEN_TRACE = HTTP_LEN_TRACE;
+ TS_HTTP_LEN_PUSH = HTTP_LEN_PUSH;
/* HTTP miscellaneous values */
- TS_HTTP_VALUE_BYTES = HTTP_VALUE_BYTES;
- TS_HTTP_VALUE_CHUNKED = HTTP_VALUE_CHUNKED;
- TS_HTTP_VALUE_CLOSE = HTTP_VALUE_CLOSE;
- TS_HTTP_VALUE_COMPRESS = HTTP_VALUE_COMPRESS;
- TS_HTTP_VALUE_DEFLATE = HTTP_VALUE_DEFLATE;
- TS_HTTP_VALUE_GZIP = HTTP_VALUE_GZIP;
- TS_HTTP_VALUE_IDENTITY = HTTP_VALUE_IDENTITY;
- TS_HTTP_VALUE_KEEP_ALIVE = HTTP_VALUE_KEEP_ALIVE;
- TS_HTTP_VALUE_MAX_AGE = HTTP_VALUE_MAX_AGE;
- TS_HTTP_VALUE_MAX_STALE = HTTP_VALUE_MAX_STALE;
- TS_HTTP_VALUE_MIN_FRESH = HTTP_VALUE_MIN_FRESH;
- TS_HTTP_VALUE_MUST_REVALIDATE = HTTP_VALUE_MUST_REVALIDATE;
- TS_HTTP_VALUE_NONE = HTTP_VALUE_NONE;
- TS_HTTP_VALUE_NO_CACHE = HTTP_VALUE_NO_CACHE;
- TS_HTTP_VALUE_NO_STORE = HTTP_VALUE_NO_STORE;
- TS_HTTP_VALUE_NO_TRANSFORM = HTTP_VALUE_NO_TRANSFORM;
- TS_HTTP_VALUE_ONLY_IF_CACHED = HTTP_VALUE_ONLY_IF_CACHED;
- TS_HTTP_VALUE_PRIVATE = HTTP_VALUE_PRIVATE;
+ TS_HTTP_VALUE_BYTES = HTTP_VALUE_BYTES;
+ TS_HTTP_VALUE_CHUNKED = HTTP_VALUE_CHUNKED;
+ TS_HTTP_VALUE_CLOSE = HTTP_VALUE_CLOSE;
+ TS_HTTP_VALUE_COMPRESS = HTTP_VALUE_COMPRESS;
+ TS_HTTP_VALUE_DEFLATE = HTTP_VALUE_DEFLATE;
+ TS_HTTP_VALUE_GZIP = HTTP_VALUE_GZIP;
+ TS_HTTP_VALUE_IDENTITY = HTTP_VALUE_IDENTITY;
+ TS_HTTP_VALUE_KEEP_ALIVE = HTTP_VALUE_KEEP_ALIVE;
+ TS_HTTP_VALUE_MAX_AGE = HTTP_VALUE_MAX_AGE;
+ TS_HTTP_VALUE_MAX_STALE = HTTP_VALUE_MAX_STALE;
+ TS_HTTP_VALUE_MIN_FRESH = HTTP_VALUE_MIN_FRESH;
+ TS_HTTP_VALUE_MUST_REVALIDATE = HTTP_VALUE_MUST_REVALIDATE;
+ TS_HTTP_VALUE_NONE = HTTP_VALUE_NONE;
+ TS_HTTP_VALUE_NO_CACHE = HTTP_VALUE_NO_CACHE;
+ TS_HTTP_VALUE_NO_STORE = HTTP_VALUE_NO_STORE;
+ TS_HTTP_VALUE_NO_TRANSFORM = HTTP_VALUE_NO_TRANSFORM;
+ TS_HTTP_VALUE_ONLY_IF_CACHED = HTTP_VALUE_ONLY_IF_CACHED;
+ TS_HTTP_VALUE_PRIVATE = HTTP_VALUE_PRIVATE;
TS_HTTP_VALUE_PROXY_REVALIDATE = HTTP_VALUE_PROXY_REVALIDATE;
- TS_HTTP_VALUE_PUBLIC = HTTP_VALUE_PUBLIC;
- TS_HTTP_VALUE_S_MAXAGE = HTTP_VALUE_S_MAXAGE;
-
- TS_HTTP_LEN_BYTES = HTTP_LEN_BYTES;
- TS_HTTP_LEN_CHUNKED = HTTP_LEN_CHUNKED;
- TS_HTTP_LEN_CLOSE = HTTP_LEN_CLOSE;
- TS_HTTP_LEN_COMPRESS = HTTP_LEN_COMPRESS;
- TS_HTTP_LEN_DEFLATE = HTTP_LEN_DEFLATE;
- TS_HTTP_LEN_GZIP = HTTP_LEN_GZIP;
- TS_HTTP_LEN_IDENTITY = HTTP_LEN_IDENTITY;
- TS_HTTP_LEN_KEEP_ALIVE = HTTP_LEN_KEEP_ALIVE;
- TS_HTTP_LEN_MAX_AGE = HTTP_LEN_MAX_AGE;
- TS_HTTP_LEN_MAX_STALE = HTTP_LEN_MAX_STALE;
- TS_HTTP_LEN_MIN_FRESH = HTTP_LEN_MIN_FRESH;
- TS_HTTP_LEN_MUST_REVALIDATE = HTTP_LEN_MUST_REVALIDATE;
- TS_HTTP_LEN_NONE = HTTP_LEN_NONE;
- TS_HTTP_LEN_NO_CACHE = HTTP_LEN_NO_CACHE;
- TS_HTTP_LEN_NO_STORE = HTTP_LEN_NO_STORE;
- TS_HTTP_LEN_NO_TRANSFORM = HTTP_LEN_NO_TRANSFORM;
- TS_HTTP_LEN_ONLY_IF_CACHED = HTTP_LEN_ONLY_IF_CACHED;
- TS_HTTP_LEN_PRIVATE = HTTP_LEN_PRIVATE;
+ TS_HTTP_VALUE_PUBLIC = HTTP_VALUE_PUBLIC;
+ TS_HTTP_VALUE_S_MAXAGE = HTTP_VALUE_S_MAXAGE;
+
+ TS_HTTP_LEN_BYTES = HTTP_LEN_BYTES;
+ TS_HTTP_LEN_CHUNKED = HTTP_LEN_CHUNKED;
+ TS_HTTP_LEN_CLOSE = HTTP_LEN_CLOSE;
+ TS_HTTP_LEN_COMPRESS = HTTP_LEN_COMPRESS;
+ TS_HTTP_LEN_DEFLATE = HTTP_LEN_DEFLATE;
+ TS_HTTP_LEN_GZIP = HTTP_LEN_GZIP;
+ TS_HTTP_LEN_IDENTITY = HTTP_LEN_IDENTITY;
+ TS_HTTP_LEN_KEEP_ALIVE = HTTP_LEN_KEEP_ALIVE;
+ TS_HTTP_LEN_MAX_AGE = HTTP_LEN_MAX_AGE;
+ TS_HTTP_LEN_MAX_STALE = HTTP_LEN_MAX_STALE;
+ TS_HTTP_LEN_MIN_FRESH = HTTP_LEN_MIN_FRESH;
+ TS_HTTP_LEN_MUST_REVALIDATE = HTTP_LEN_MUST_REVALIDATE;
+ TS_HTTP_LEN_NONE = HTTP_LEN_NONE;
+ TS_HTTP_LEN_NO_CACHE = HTTP_LEN_NO_CACHE;
+ TS_HTTP_LEN_NO_STORE = HTTP_LEN_NO_STORE;
+ TS_HTTP_LEN_NO_TRANSFORM = HTTP_LEN_NO_TRANSFORM;
+ TS_HTTP_LEN_ONLY_IF_CACHED = HTTP_LEN_ONLY_IF_CACHED;
+ TS_HTTP_LEN_PRIVATE = HTTP_LEN_PRIVATE;
TS_HTTP_LEN_PROXY_REVALIDATE = HTTP_LEN_PROXY_REVALIDATE;
- TS_HTTP_LEN_PUBLIC = HTTP_LEN_PUBLIC;
- TS_HTTP_LEN_S_MAXAGE = HTTP_LEN_S_MAXAGE;
+ TS_HTTP_LEN_PUBLIC = HTTP_LEN_PUBLIC;
+ TS_HTTP_LEN_S_MAXAGE = HTTP_LEN_S_MAXAGE;
http_global_hooks = new HttpAPIHooks;
- ssl_hooks = new SslAPIHooks;
- lifecycle_hooks = new LifecycleAPIHooks;
+ ssl_hooks = new SslAPIHooks;
+ lifecycle_hooks = new LifecycleAPIHooks;
global_config_cbs = new ConfigUpdateCbTable;
if (TS_MAX_API_STATS > 0) {
@@ -1913,7 +1913,7 @@ TSMBufferCreate(void)
HdrHeapSDKHandle *new_heap = new HdrHeapSDKHandle;
new_heap->m_heap = new_HdrHeap();
- bufp = (TSMBuffer)new_heap;
+ bufp = (TSMBuffer)new_heap;
// TODO: Should remove this when memory allocation is guaranteed to fail.
sdk_assert(sdk_sanity_check_mbuffer(bufp) == TS_SUCCESS);
return bufp;
@@ -1952,7 +1952,7 @@ TSUrlCreate(TSMBuffer bufp, TSMLoc *locp)
if (isWriteable(bufp)) {
HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
- *locp = (TSMLoc)url_create(heap);
+ *locp = (TSMLoc)url_create(heap);
return TS_SUCCESS;
}
return TS_ERROR;
@@ -1979,7 +1979,7 @@ TSUrlClone(TSMBuffer dest_bufp, TSMBuffer src_bufp, TSMLoc src_url, TSMLoc *locp
s_heap = ((HdrHeapSDKHandle *)src_bufp)->m_heap;
d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
- s_url = (URLImpl *)src_url;
+ s_url = (URLImpl *)src_url;
d_url = url_copy(s_url, s_heap, d_heap, (s_heap != d_heap));
*locp = (TSMLoc)d_url;
@@ -2002,8 +2002,8 @@ TSUrlCopy(TSMBuffer dest_bufp, TSMLoc dest_obj, TSMBuffer src_bufp, TSMLoc src_o
s_heap = ((HdrHeapSDKHandle *)src_bufp)->m_heap;
d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
- s_url = (URLImpl *)src_obj;
- d_url = (URLImpl *)dest_obj;
+ s_url = (URLImpl *)src_obj;
+ d_url = (URLImpl *)dest_obj;
url_copy_onto(s_url, s_heap, d_url, d_heap, (s_heap != d_heap));
return TS_SUCCESS;
@@ -2023,9 +2023,9 @@ TSUrlPrint(TSMBuffer bufp, TSMLoc obj, TSIOBuffer iobufp)
int done;
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
- dumpoffset = 0;
+ dumpoffset = 0;
do {
blk = b->get_current_block();
@@ -2035,7 +2035,7 @@ TSUrlPrint(TSMBuffer bufp, TSMLoc obj, TSIOBuffer iobufp)
}
bufindex = 0;
- tmp = dumpoffset;
+ tmp = dumpoffset;
done = u.print(blk->end(), blk->write_avail(), &bufindex, &tmp);
@@ -2057,7 +2057,7 @@ TSUrlParse(TSMBuffer bufp, TSMLoc obj, const char **start, const char *end)
return TS_PARSE_ERROR;
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
url_clear(u.m_url_impl);
return (TSParseResult)u.parse(start, end);
@@ -2096,7 +2096,7 @@ URLPartGet(TSMBuffer bufp, TSMLoc obj, int *length, URLPartGetF url_f)
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
return (u.*url_f)(length);
@@ -2112,7 +2112,7 @@ URLPartSet(TSMBuffer bufp, TSMLoc obj, const char *value, int length, URLPartSet
return TS_ERROR;
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
if (!value)
@@ -2181,7 +2181,7 @@ TSUrlPortGet(TSMBuffer bufp, TSMLoc obj)
sdk_assert(sdk_sanity_check_url_handle(obj) == TS_SUCCESS);
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
return u.port_get();
@@ -2198,7 +2198,7 @@ TSUrlPortSet(TSMBuffer bufp, TSMLoc obj, int port)
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
u.port_set(port);
return TS_SUCCESS;
@@ -2227,7 +2227,7 @@ TSUrlFtpTypeGet(TSMBuffer bufp, TSMLoc obj)
sdk_assert(sdk_sanity_check_url_handle(obj) == TS_SUCCESS);
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
return u.type_get();
}
@@ -2243,7 +2243,7 @@ TSUrlFtpTypeSet(TSMBuffer bufp, TSMLoc obj, int type)
if ((type == 0 || type == 'A' || type == 'E' || type == 'I' || type == 'a' || type == 'i' || type == 'e') && isWriteable(bufp)) {
URL u;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
u.type_set(type);
return TS_SUCCESS;
@@ -2327,9 +2327,9 @@ TSStringPercentDecode(const char *str, size_t str_len, char *dst, size_t dst_siz
str_len = strlen(str);
// return unescapifyStr(str);
- char *buffer = dst;
+ char *buffer = dst;
const char *src = str;
- int s = 0; // State, which we don't really use
+ int s = 0; // State, which we don't really use
// TODO: We should check for "failures" here?
unescape_str(buffer, buffer + dst_size, src, src + str_len, s);
@@ -2457,9 +2457,9 @@ TSMimeHdrClone(TSMBuffer dest_bufp, TSMBuffer src_bufp, TSMLoc src_hdr, TSMLoc *
s_heap = ((HdrHeapSDKHandle *)src_bufp)->m_heap;
d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
- s_mh = _hdr_mloc_to_mime_hdr_impl(src_hdr);
+ s_mh = _hdr_mloc_to_mime_hdr_impl(src_hdr);
- d_mh = mime_hdr_clone(s_mh, s_heap, d_heap, (s_heap != d_heap));
+ d_mh = mime_hdr_clone(s_mh, s_heap, d_heap, (s_heap != d_heap));
*locp = (TSMLoc)d_mh;
return TS_SUCCESS;
@@ -2487,8 +2487,8 @@ TSMimeHdrCopy(TSMBuffer dest_bufp, TSMLoc dest_obj, TSMBuffer src_bufp, TSMLoc s
s_heap = ((HdrHeapSDKHandle *)src_bufp)->m_heap;
d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
- s_mh = _hdr_mloc_to_mime_hdr_impl(src_obj);
- d_mh = _hdr_mloc_to_mime_hdr_impl(dest_obj);
+ s_mh = _hdr_mloc_to_mime_hdr_impl(src_obj);
+ d_mh = _hdr_mloc_to_mime_hdr_impl(dest_obj);
mime_hdr_fields_clear(d_heap, d_mh);
mime_hdr_copy_onto(s_mh, s_heap, d_mh, d_heap, (s_heap != d_heap));
@@ -2502,9 +2502,9 @@ TSMimeHdrPrint(TSMBuffer bufp, TSMLoc obj, TSIOBuffer iobufp)
sdk_assert((sdk_sanity_check_mime_hdr_handle(obj) == TS_SUCCESS) || (sdk_sanity_check_http_hdr_handle(obj) == TS_SUCCESS));
sdk_assert(sdk_sanity_check_iocore_structure(iobufp) == TS_SUCCESS);
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(obj);
- MIOBuffer *b = (MIOBuffer *)iobufp;
+ MIOBuffer *b = (MIOBuffer *)iobufp;
IOBufferBlock *blk;
int bufindex;
int tmp, dumpoffset = 0;
@@ -2518,8 +2518,8 @@ TSMimeHdrPrint(TSMBuffer bufp, TSMLoc obj, TSIOBuffer iobufp)
}
bufindex = 0;
- tmp = dumpoffset;
- done = mime_hdr_print(heap, mh, blk->end(), blk->write_avail(), &bufindex, &tmp);
+ tmp = dumpoffset;
+ done = mime_hdr_print(heap, mh, blk->end(), blk->write_avail(), &bufindex, &tmp);
dumpoffset += bufindex;
b->fill(bufindex);
@@ -2596,7 +2596,7 @@ void
TSMimeFieldValueSet(TSMBuffer bufp, TSMLoc field_obj, int idx, const char *value, int length)
{
MIMEFieldSDKHandle *handle = (MIMEFieldSDKHandle *)field_obj;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
if (length == -1)
length = strlen(value);
@@ -2611,7 +2611,7 @@ void
TSMimeFieldValueInsert(TSMBuffer bufp, TSMLoc field_obj, const char *value, int length, int idx)
{
MIMEFieldSDKHandle *handle = (MIMEFieldSDKHandle *)field_obj;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
if (length == -1)
length = strlen(value);
@@ -2650,7 +2650,7 @@ TSMimeHdrFieldGet(TSMBuffer bufp, TSMLoc hdr_obj, int idx)
sdk_assert(idx >= 0);
MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(hdr_obj);
- MIMEField *f = mime_hdr_field_get(mh, idx);
+ MIMEField *f = mime_hdr_field_get(mh, idx);
if (f == NULL)
return TS_NULL_MLOC;
@@ -2673,7 +2673,7 @@ TSMimeHdrFieldFind(TSMBuffer bufp, TSMLoc hdr_obj, const char *name, int length)
length = strlen(name);
MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(hdr_obj);
- MIMEField *f = mime_hdr_field_find(mh, name, length);
+ MIMEField *f = mime_hdr_field_find(mh, name, length);
if (f == NULL)
return TS_NULL_MLOC;
@@ -2700,7 +2700,7 @@ TSMimeHdrFieldAppend(TSMBuffer bufp, TSMLoc mh_mloc, TSMLoc field_mloc)
return TS_ERROR;
MIMEField *mh_field;
- MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
+ MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
MIMEFieldSDKHandle *field_handle = (MIMEFieldSDKHandle *)field_mloc;
//////////////////////////////////////////////////////////////////////
@@ -2723,7 +2723,7 @@ TSMimeHdrFieldAppend(TSMBuffer bufp, TSMLoc mh_mloc, TSMLoc field_mloc)
memcpy(mh_field, field_handle->field_ptr, sizeof(MIMEField));
// now set up the forwarding ptr from standalone field to hdr field
- field_handle->mh = mh;
+ field_handle->mh = mh;
field_handle->field_ptr = mh_field;
}
@@ -2781,7 +2781,7 @@ TSMimeHdrFieldDestroy(TSMBuffer bufp, TSMLoc mh_mloc, TSMLoc field_mloc)
ink_release_assert(!"Failed MH");
} else {
MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
- HdrHeap *heap = (HdrHeap *)(((HdrHeapSDKHandle *)bufp)->m_heap);
+ HdrHeap *heap = (HdrHeap *)(((HdrHeapSDKHandle *)bufp)->m_heap);
ink_assert(mh == field_handle->mh);
if (sdk_sanity_check_field_handle(field_mloc, mh_mloc) != TS_SUCCESS)
@@ -2809,12 +2809,12 @@ TSMimeHdrFieldCreate(TSMBuffer bufp, TSMLoc mh_mloc, TSMLoc *locp)
if (!isWriteable(bufp))
return TS_ERROR;
- MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
- HdrHeap *heap = (HdrHeap *)(((HdrHeapSDKHandle *)bufp)->m_heap);
+ MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
+ HdrHeap *heap = (HdrHeap *)(((HdrHeapSDKHandle *)bufp)->m_heap);
MIMEFieldSDKHandle *h = sdk_alloc_field_handle(bufp, mh);
h->field_ptr = mime_field_create(heap, mh);
- *locp = reinterpret_cast<TSMLoc>(h);
+ *locp = reinterpret_cast<TSMLoc>(h);
return TS_SUCCESS;
}
@@ -2833,11 +2833,11 @@ TSMimeHdrFieldCreateNamed(TSMBuffer bufp, TSMLoc mh_mloc, const char *name, int
if (name_len == -1)
name_len = strlen(name);
- MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
- HdrHeap *heap = (HdrHeap *)(((HdrHeapSDKHandle *)bufp)->m_heap);
+ MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(mh_mloc);
+ HdrHeap *heap = (HdrHeap *)(((HdrHeapSDKHandle *)bufp)->m_heap);
MIMEFieldSDKHandle *h = sdk_alloc_field_handle(bufp, mh);
- h->field_ptr = mime_field_create_named(heap, mh, name, name_len);
- *locp = reinterpret_cast<TSMLoc>(h);
+ h->field_ptr = mime_field_create_named(heap, mh, name, name_len);
+ *locp = reinterpret_cast<TSMLoc>(h);
return TS_SUCCESS;
}
@@ -2863,7 +2863,7 @@ TSMimeHdrFieldCopy(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMLoc dest_field, TSMB
bool dest_attached;
MIMEFieldSDKHandle *s_handle = (MIMEFieldSDKHandle *)src_field;
MIMEFieldSDKHandle *d_handle = (MIMEFieldSDKHandle *)dest_field;
- HdrHeap *d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
+ HdrHeap *d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
// FIX: This tortuous detach/change/attach algorithm is due to the
// fact that we can't change the name of an attached header (assertion)
@@ -2934,7 +2934,7 @@ TSMimeHdrFieldCopyValues(TSMBuffer dest_bufp, TSMLoc dest_hdr, TSMLoc dest_field
MIMEFieldSDKHandle *s_handle = (MIMEFieldSDKHandle *)src_field;
MIMEFieldSDKHandle *d_handle = (MIMEFieldSDKHandle *)dest_field;
- HdrHeap *d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
+ HdrHeap *d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
MIMEField *s_field, *d_field;
s_field = s_handle->field_ptr;
@@ -2986,14 +2986,14 @@ TSMimeHdrFieldNextDup(TSMBuffer bufp, TSMLoc hdr, TSMLoc field)
sdk_assert((sdk_sanity_check_mime_hdr_handle(hdr) == TS_SUCCESS) || (sdk_sanity_check_http_hdr_handle(hdr) == TS_SUCCESS));
sdk_assert(sdk_sanity_check_field_handle(field, hdr) == TS_SUCCESS);
- MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(hdr);
+ MIMEHdrImpl *mh = _hdr_mloc_to_mime_hdr_impl(hdr);
MIMEFieldSDKHandle *field_handle = (MIMEFieldSDKHandle *)field;
- MIMEField *next = field_handle->field_ptr->m_next_dup;
+ MIMEField *next = field_handle->field_ptr->m_next_dup;
if (next == NULL)
return TS_NULL_MLOC;
MIMEFieldSDKHandle *next_handle = sdk_alloc_field_handle(bufp, mh);
- next_handle->field_ptr = next;
+ next_handle->field_ptr = next;
return (TSMLoc)next_handle;
}
@@ -3039,7 +3039,7 @@ TSMimeHdrFieldNameSet(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, const char *name
length = strlen(name);
MIMEFieldSDKHandle *handle = (MIMEFieldSDKHandle *)field;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
int attached = (handle->mh && handle->field_ptr->is_live());
@@ -3068,7 +3068,7 @@ TSMimeHdrFieldValuesClear(TSMBuffer bufp, TSMLoc hdr, TSMLoc field)
return TS_ERROR;
MIMEFieldSDKHandle *handle = (MIMEFieldSDKHandle *)field;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
/**
* Modified the string value passed from an empty string ("") to NULL.
@@ -3290,7 +3290,7 @@ TSMimeHdrFieldValueAppend(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx, con
return TS_ERROR;
MIMEFieldSDKHandle *handle = (MIMEFieldSDKHandle *)field;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
if (length == -1)
length = strlen(value);
@@ -3398,7 +3398,7 @@ TSMimeHdrFieldValueDelete(TSMBuffer bufp, TSMLoc hdr, TSMLoc field, int idx)
return TS_ERROR;
MIMEFieldSDKHandle *handle = (MIMEFieldSDKHandle *)field;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
mime_field_value_delete_comma_val(heap, handle->mh, handle->field_ptr, idx);
return TS_SUCCESS;
@@ -3476,14 +3476,14 @@ TSHttpHdrClone(TSMBuffer dest_bufp, TSMBuffer src_bufp, TSMLoc src_hdr, TSMLoc *
s_heap = ((HdrHeapSDKHandle *)src_bufp)->m_heap;
d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
- s_hh = (HTTPHdrImpl *)src_hdr;
+ s_hh = (HTTPHdrImpl *)src_hdr;
if (s_hh->m_type != HDR_HEAP_OBJ_HTTP_HEADER)
return TS_ERROR;
// TODO: This is never used
// inherit_strs = (s_heap != d_heap ? true : false);
- d_hh = http_hdr_clone(s_hh, s_heap, d_heap);
+ d_hh = http_hdr_clone(s_hh, s_heap, d_heap);
*locp = (TSMLoc)d_hh;
return TS_SUCCESS;
@@ -3510,8 +3510,8 @@ TSHttpHdrCopy(TSMBuffer dest_bufp, TSMLoc dest_obj, TSMBuffer src_bufp, TSMLoc s
s_heap = ((HdrHeapSDKHandle *)src_bufp)->m_heap;
d_heap = ((HdrHeapSDKHandle *)dest_bufp)->m_heap;
- s_hh = (HTTPHdrImpl *)src_obj;
- d_hh = (HTTPHdrImpl *)dest_obj;
+ s_hh = (HTTPHdrImpl *)src_obj;
+ d_hh = (HTTPHdrImpl *)dest_obj;
if ((s_hh->m_type != HDR_HEAP_OBJ_HTTP_HEADER) || (d_hh->m_type != HDR_HEAP_OBJ_HTTP_HEADER))
return TS_ERROR;
@@ -3548,7 +3548,7 @@ TSHttpHdrPrint(TSMBuffer bufp, TSMLoc obj, TSIOBuffer iobufp)
}
bufindex = 0;
- tmp = dumpoffset;
+ tmp = dumpoffset;
done = h.print(blk->end(), blk->write_avail(), &bufindex, &tmp);
@@ -3654,7 +3654,7 @@ TSHttpHdrTypeSet(TSMBuffer bufp, TSMLoc obj, TSHttpType type)
if (h.m_http->m_polarity == HTTP_TYPE_UNKNOWN) {
if (type == (TSHttpType)HTTP_TYPE_REQUEST) {
h.m_http->u.req.m_url_impl = url_create(h.m_heap);
- h.m_http->m_polarity = (HTTPType)type;
+ h.m_http->m_polarity = (HTTPType)type;
} else if (type == (TSHttpType)HTTP_TYPE_RESPONSE) {
h.m_http->m_polarity = (HTTPType)type;
}
@@ -3777,7 +3777,7 @@ TSHttpHdrUrlSet(TSMBuffer bufp, TSMLoc obj, TSMLoc url)
if (!isWriteable(bufp))
return TS_ERROR;
- HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ HdrHeap *heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
HTTPHdrImpl *hh = (HTTPHdrImpl *)obj;
if (hh->m_type != HDR_HEAP_OBJ_HTTP_HEADER)
@@ -3969,7 +3969,7 @@ TSCacheKeyPinnedSet(TSCacheKey key, time_t pin_in_cache)
if (((CacheInfo *)key)->magic != CACHE_INFO_MAGIC_ALIVE)
return TS_ERROR;
- CacheInfo *i = (CacheInfo *)key;
+ CacheInfo *i = (CacheInfo *)key;
i->pin_in_cache = pin_in_cache;
return TS_SUCCESS;
}
@@ -4005,7 +4005,7 @@ TSCacheHttpInfoReqGet(TSCacheHttpInfo infop, TSMBuffer *bufp, TSMLoc *obj)
CacheHTTPInfo *info = (CacheHTTPInfo *)infop;
*(reinterpret_cast<HTTPHdr **>(bufp)) = info->request_get();
- *obj = reinterpret_cast<TSMLoc>(info->request_get()->m_http);
+ *obj = reinterpret_cast<TSMLoc>(info->request_get()->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
}
@@ -4015,7 +4015,7 @@ TSCacheHttpInfoRespGet(TSCacheHttpInfo infop, TSMBuffer *bufp, TSMLoc *obj)
CacheHTTPInfo *info = (CacheHTTPInfo *)infop;
*(reinterpret_cast<HTTPHdr **>(bufp)) = info->response_get();
- *obj = reinterpret_cast<TSMLoc>(info->response_get()->m_http);
+ *obj = reinterpret_cast<TSMLoc>(info->response_get()->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
}
@@ -4103,8 +4103,8 @@ TSCacheHttpInfoCreate(void)
unsigned int
TSConfigSet(unsigned int id, void *data, TSConfigDestroyFunc funcp)
{
- INKConfigImpl *config = new INKConfigImpl;
- config->mdata = data;
+ INKConfigImpl *config = new INKConfigImpl;
+ config->mdata = data;
config->m_destroy_func = funcp;
return configProcessor.set(id, config);
}
@@ -4327,7 +4327,7 @@ TSHttpSchedule(TSCont contp, TSHttpTxn txnp, ink_hrtime timeout)
TSAction action;
Continuation *cont = (Continuation *)contp;
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->set_http_schedule(cont);
@@ -4447,7 +4447,7 @@ TSHttpSsnReenable(TSHttpSsn ssnp, TSEvent event)
sdk_assert(sdk_sanity_check_http_ssn(ssnp) == TS_SUCCESS);
ProxyClientSession *cs = reinterpret_cast<ProxyClientSession *>(ssnp);
- EThread *eth = this_ethread();
+ EThread *eth = this_ethread();
// If this function is being executed on a thread created by the API
// which is DEDICATED, the continuation needs to be called back on a
@@ -4481,7 +4481,7 @@ TSHttpTxnHookAdd(TSHttpTxn txnp, TSHttpHookID id, TSCont contp)
TSReturnCode
TSHttpTxnHookRegisteredFor(TSHttpTxn txnp, TSHttpHookID id, TSEventFunc funcp)
{
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
APIHook *hook = sm->txn_hook_get(id);
while (hook != NULL) {
@@ -4507,7 +4507,7 @@ TSHttpTxnSsnGet(TSHttpTxn txnp)
void
TSHttpTxnClientKeepaliveSet(TSHttpTxn txnp, int set)
{
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
s->hdr_info.trust_response_cl = (set != 0);
@@ -4520,12 +4520,12 @@ TSHttpTxnClientReqGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPHdr *hptr = &(sm->t_state.hdr_info.client_request);
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
if (sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS) {
hptr->mark_target_dirty();
return TS_SUCCESS;
@@ -4543,12 +4543,12 @@ TSHttpTxnPristineUrlGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *url_loc)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)url_loc) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPHdr *hptr = &(sm->t_state.hdr_info.client_request);
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *url_loc = (TSMLoc)sm->t_state.pristine_url.m_url_impl;
+ *url_loc = (TSMLoc)sm->t_state.pristine_url.m_url_impl;
if (sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS) {
if (*url_loc == NULL) {
@@ -4580,12 +4580,12 @@ TSHttpTxnClientRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPHdr *hptr = &(sm->t_state.hdr_info.client_response);
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
return TS_SUCCESS;
}
@@ -4600,12 +4600,12 @@ TSHttpTxnServerReqGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPHdr *hptr = &(sm->t_state.hdr_info.server_request);
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
return TS_SUCCESS;
}
@@ -4620,12 +4620,12 @@ TSHttpTxnServerRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPHdr *hptr = &(sm->t_state.hdr_info.server_response);
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
return TS_SUCCESS;
}
@@ -4640,7 +4640,7 @@ TSHttpTxnCachedReqGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPInfo *cached_obj = sm->t_state.cache_info.object_read;
// The following check is need to prevent the HttpSM handle copy from going bad
@@ -4660,12 +4660,12 @@ TSHttpTxnCachedReqGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
HdrHeapSDKHandle **handle = &(sm->t_state.cache_req_hdr_heap_handle);
if (*handle == NULL) {
- *handle = (HdrHeapSDKHandle *)sm->t_state.arena.alloc(sizeof(HdrHeapSDKHandle));
+ *handle = (HdrHeapSDKHandle *)sm->t_state.arena.alloc(sizeof(HdrHeapSDKHandle));
(*handle)->m_heap = cached_hdr->m_heap;
}
*(reinterpret_cast<HdrHeapSDKHandle **>(bufp)) = *handle;
- *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
return TS_SUCCESS;
@@ -4678,7 +4678,7 @@ TSHttpTxnCachedRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPInfo *cached_obj = sm->t_state.cache_info.object_read;
// The following check is need to prevent the HttpSM handle copy from going bad
@@ -4698,12 +4698,12 @@ TSHttpTxnCachedRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
HdrHeapSDKHandle **handle = &(sm->t_state.cache_resp_hdr_heap_handle);
if (*handle == NULL) {
- *handle = (HdrHeapSDKHandle *)sm->t_state.arena.alloc(sizeof(HdrHeapSDKHandle));
+ *handle = (HdrHeapSDKHandle *)sm->t_state.arena.alloc(sizeof(HdrHeapSDKHandle));
(*handle)->m_heap = cached_hdr->m_heap;
}
*(reinterpret_cast<HdrHeapSDKHandle **>(bufp)) = *handle;
- *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
return TS_SUCCESS;
@@ -4716,10 +4716,10 @@ TSHttpTxnCachedRespModifiableGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
sdk_assert(sdk_sanity_check_null_ptr((void *)bufp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)obj) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
- HttpTransact::State *s = &(sm->t_state);
- HTTPHdr *c_resp = NULL;
- HTTPInfo *cached_obj = sm->t_state.cache_info.object_read;
+ HttpSM *sm = (HttpSM *)txnp;
+ HttpTransact::State *s = &(sm->t_state);
+ HTTPHdr *c_resp = NULL;
+ HTTPInfo *cached_obj = sm->t_state.cache_info.object_read;
HTTPInfo *cached_obj_store = &(sm->t_state.cache_info.object_store);
if ((!cached_obj) || (!cached_obj->valid()))
@@ -4731,12 +4731,12 @@ TSHttpTxnCachedRespModifiableGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
c_resp = cached_obj_store->response_get();
if (c_resp == NULL || !c_resp->valid())
cached_obj_store->response_set(cached_obj->response_get());
- c_resp = cached_obj_store->response_get();
+ c_resp = cached_obj_store->response_get();
s->api_modifiable_cached_resp = true;
ink_assert(c_resp != NULL && c_resp->valid());
*(reinterpret_cast<HTTPHdr **>(bufp)) = c_resp;
- *obj = reinterpret_cast<TSMLoc>(c_resp->m_http);
+ *obj = reinterpret_cast<TSMLoc>(c_resp->m_http);
sdk_assert(sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS);
return TS_SUCCESS;
@@ -4778,7 +4778,7 @@ TSHttpTxnCacheLookupCountGet(TSHttpTxn txnp, int *lookup_count)
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)lookup_count) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
*lookup_count = sm->t_state.cache_info.lookup_count;
return TS_SUCCESS;
}
@@ -4792,7 +4792,7 @@ TSHttpTxnCacheLookupStatusSet(TSHttpTxn txnp, int cachelookup)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::CacheLookupResult_t *sm_status = &(sm->t_state.cache_lookup_result);
// converting from a miss to a hit is not allowed
@@ -4829,7 +4829,7 @@ TSHttpTxnInfoIntGet(TSHttpTxn txnp, TSHttpTxnInfoKey key, TSMgmtInt *value)
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void *)value) == TS_SUCCESS);
- HttpSM *s = reinterpret_cast<HttpSM *>(txnp);
+ HttpSM *s = reinterpret_cast<HttpSM *>(txnp);
HttpCacheSM *c_sm = &(s->get_cache_sm());
switch (key) {
@@ -4868,7 +4868,7 @@ TSHttpTxnCacheLookupUrlGet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj)
HttpSM *sm = (HttpSM *)txnp;
URL u, *l_url;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
if (!u.valid())
return TS_ERROR;
@@ -4892,7 +4892,7 @@ TSHttpTxnCacheLookupUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj)
HttpSM *sm = (HttpSM *)txnp;
URL u, *l_url;
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)obj;
if (!u.valid()) {
return TS_ERROR;
@@ -4902,7 +4902,7 @@ TSHttpTxnCacheLookupUrlSet(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc obj)
if (!l_url) {
sm->t_state.cache_info.lookup_url_storage.create(NULL);
sm->t_state.cache_info.lookup_url = &(sm->t_state.cache_info.lookup_url_storage);
- l_url = sm->t_state.cache_info.lookup_url;
+ l_url = sm->t_state.cache_info.lookup_url;
}
if (!l_url || !l_url->valid()) {
@@ -4925,12 +4925,12 @@ TSHttpTxnNewCacheLookupDo(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
URL new_url, *client_url, *l_url, *o_url;
INK_MD5 md51, md52;
- new_url.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ new_url.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
new_url.m_url_impl = (URLImpl *)url_loc;
if (!new_url.valid())
return TS_ERROR;
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
client_url = s->hdr_info.client_request.url_get();
@@ -4943,7 +4943,7 @@ TSHttpTxnNewCacheLookupDo(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
if (!l_url || !l_url->valid()) {
s->cache_info.lookup_url_storage.create(NULL);
s->cache_info.lookup_url = &(s->cache_info.lookup_url_storage);
- l_url = s->cache_info.lookup_url;
+ l_url = s->cache_info.lookup_url;
} else {
l_url->hash_get(&md51);
new_url.hash_get(&md52);
@@ -4961,7 +4961,7 @@ TSHttpTxnNewCacheLookupDo(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
// bypass HttpTransact::HandleFiltering
s->transact_return_point = HttpTransact::DecideCacheLookup;
- s->cache_info.action = HttpTransact::CACHE_DO_LOOKUP;
+ s->cache_info.action = HttpTransact::CACHE_DO_LOOKUP;
sm->add_cache_sm();
s->api_cleanup_cache_read = true;
@@ -4974,7 +4974,7 @@ TSHttpTxnSecondUrlTryLock(TSHttpTxn txnp)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
// TSHttpTxnNewCacheLookupDo didn't continue
if (!s->cache_info.original_url.valid())
@@ -4998,10 +4998,10 @@ TSHttpTxnRedirectRequest(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
sdk_assert(sdk_sanity_check_url_handle(url_loc) == TS_SUCCESS);
URL u, *o_url, *r_url, *client_url;
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
- u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
+ u.m_heap = ((HdrHeapSDKHandle *)bufp)->m_heap;
u.m_url_impl = (URLImpl *)url_loc;
if (!u.valid())
return TS_ERROR;
@@ -5011,7 +5011,7 @@ TSHttpTxnRedirectRequest(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
return TS_ERROR;
s->redirect_info.redirect_in_process = true;
- o_url = &(s->redirect_info.original_url);
+ o_url = &(s->redirect_info.original_url);
if (!o_url->valid()) {
o_url->create(NULL);
o_url->copy(client_url);
@@ -5025,10 +5025,10 @@ TSHttpTxnRedirectRequest(TSHttpTxn txnp, TSMBuffer bufp, TSMLoc url_loc)
s->hdr_info.server_request.destroy();
- s->request_sent_time = 0;
- s->response_received_time = 0;
+ s->request_sent_time = 0;
+ s->response_received_time = 0;
s->cache_info.write_lock_state = HttpTransact::CACHE_WL_INIT;
- s->next_action = HttpTransact::SM_ACTION_REDIRECT_READ;
+ s->next_action = HttpTransact::SM_ACTION_REDIRECT_READ;
return TS_SUCCESS;
}
@@ -5042,7 +5042,7 @@ TSHttpTxnActiveTimeoutSet(TSHttpTxn txnp, int timeout)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
+ HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
s->api_txn_active_timeout_value = timeout;
}
@@ -5055,7 +5055,7 @@ TSHttpTxnConnectTimeoutSet(TSHttpTxn txnp, int timeout)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
+ HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
s->api_txn_connect_timeout_value = timeout;
}
@@ -5082,7 +5082,7 @@ TSHttpTxnNoActivityTimeoutSet(TSHttpTxn txnp, int timeout)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
+ HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
s->api_txn_no_activity_timeout_value = timeout;
}
@@ -5091,7 +5091,7 @@ TSHttpTxnServerRespNoStoreSet(TSHttpTxn txnp, int flag)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
+ HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
s->api_server_response_no_store = (flag != 0);
return TS_SUCCESS;
@@ -5103,7 +5103,7 @@ TSHttpTxnServerRespIgnore(TSHttpTxn txnp)
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
- HTTPInfo *cached_obj = s->cache_info.object_read;
+ HTTPInfo *cached_obj = s->cache_info.object_read;
HTTPHdr *cached_resp;
if (cached_obj == NULL || !cached_obj->valid())
@@ -5126,7 +5126,7 @@ TSHttpTxnShutDown(TSHttpTxn txnp, TSEvent event)
if (event == TS_EVENT_HTTP_TXN_CLOSE)
return TS_ERROR;
- HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
+ HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
s->api_http_sm_shutdown = true;
return TS_SUCCESS;
@@ -5160,7 +5160,7 @@ TSHttpTxnReqCacheableSet(TSHttpTxn txnp, int flag)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.api_req_cacheable = (flag != 0);
}
@@ -5169,7 +5169,7 @@ TSHttpTxnRespCacheableSet(TSHttpTxn txnp, int flag)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.api_resp_cacheable = (flag != 0);
}
@@ -5187,7 +5187,7 @@ TSHttpTxnOverwriteExpireTime(TSHttpTxn txnp, time_t expire_time)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
+ HttpTransact::State *s = &(((HttpSM *)txnp)->t_state);
s->plugin_set_expire_time = expire_time;
}
@@ -5196,10 +5196,10 @@ TSHttpTxnUpdateCachedObject(TSHttpTxn txnp)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
- HttpTransact::State *s = &(sm->t_state);
+ HttpSM *sm = (HttpSM *)txnp;
+ HttpTransact::State *s = &(sm->t_state);
HTTPInfo *cached_obj_store = &(sm->t_state.cache_info.object_store);
- HTTPHdr *client_request = &(sm->t_state.hdr_info.client_request);
+ HTTPHdr *client_request = &(sm->t_state.hdr_info.client_request);
if (!cached_obj_store->valid() || !cached_obj_store->response_get())
return TS_ERROR;
@@ -5219,12 +5219,12 @@ TSHttpTxnTransformRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPHdr *hptr = &(sm->t_state.hdr_info.transform_response);
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -5343,7 +5343,7 @@ TSHttpTxnClientIncomingPortSet(TSHttpTxn txnp, int port)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
+ HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
sm->t_state.client_info.dst_addr.port() = htons(port);
}
@@ -5523,15 +5523,15 @@ TSHttpTxnErrorBodySet(TSHttpTxn txnp, char *buf, size_t buflength, char *mimetyp
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
// Cleanup anything already set.
s->free_internal_msg_buffer();
ats_free(s->internal_msg_buffer_type);
- s->internal_msg_buffer = buf;
- s->internal_msg_buffer_size = buf ? buflength : 0;
+ s->internal_msg_buffer = buf;
+ s->internal_msg_buffer_size = buf ? buflength : 0;
s->internal_msg_buffer_fast_allocator_size = -1;
s->internal_msg_buffer_type = mimetype;
@@ -5542,7 +5542,7 @@ TSHttpTxnServerRequestBodySet(TSHttpTxn txnp, char *buf, int64_t buflength)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
// Cleanup anything already set.
@@ -5550,12 +5550,12 @@ TSHttpTxnServerRequestBodySet(TSHttpTxn txnp, char *buf, int64_t buflength)
if (buf) {
s->api_server_request_body_set = true;
- s->internal_msg_buffer = buf;
- s->internal_msg_buffer_size = buflength;
+ s->internal_msg_buffer = buf;
+ s->internal_msg_buffer_size = buflength;
} else {
s->api_server_request_body_set = false;
- s->internal_msg_buffer = NULL;
- s->internal_msg_buffer_size = 0;
+ s->internal_msg_buffer = NULL;
+ s->internal_msg_buffer_size = 0;
}
s->internal_msg_buffer_fast_allocator_size = -1;
}
@@ -5568,7 +5568,7 @@ TSHttpTxnParentProxyGet(TSHttpTxn txnp, const char **hostname, int *port)
HttpSM *sm = (HttpSM *)txnp;
*hostname = sm->t_state.api_info.parent_proxy_name;
- *port = sm->t_state.api_info.parent_proxy_port;
+ *port = sm->t_state.api_info.parent_proxy_port;
return TS_SUCCESS;
}
@@ -5591,7 +5591,7 @@ TSHttpTxnUntransformedRespCache(TSHttpTxn txnp, int on)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.api_info.cache_untransformed = (on ? true : false);
}
@@ -5600,7 +5600,7 @@ TSHttpTxnTransformedRespCache(TSHttpTxn txnp, int on)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.api_info.cache_transformed = (on ? true : false);
}
@@ -5631,7 +5631,7 @@ TSHttpTxnReenable(TSHttpTxn txnp, TSEvent event)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
EThread *eth = this_ethread();
// TS-2271: If this function is being executed on a thread which was not
@@ -5661,11 +5661,11 @@ TSHttpArgIndexReserve(const char *name, const char *description, int *arg_idx)
int ix = ink_atomic_increment(&next_argv_index, 1);
if (ix < HTTP_SSN_TXN_MAX_USER_ARG) {
- state_arg_table[ix].name = ats_strdup(name);
+ state_arg_table[ix].name = ats_strdup(name);
state_arg_table[ix].name_len = strlen(state_arg_table[ix].name);
if (description)
state_arg_table[ix].description = ats_strdup(description);
- *arg_idx = ix;
+ *arg_idx = ix;
return TS_SUCCESS;
}
@@ -5698,7 +5698,7 @@ TSHttpArgIndexNameLookup(const char *name, int *arg_idx, const char **descriptio
if ((len == state_arg_table[ix].name_len) && (0 == strcmp(name, state_arg_table[ix].name))) {
if (description)
*description = state_arg_table[ix].description;
- *arg_idx = ix;
+ *arg_idx = ix;
return TS_SUCCESS;
}
}
@@ -5711,7 +5711,7 @@ TSHttpTxnArgSet(TSHttpTxn txnp, int arg_idx, void *arg)
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(arg_idx >= 0 && arg_idx < HTTP_SSN_TXN_MAX_USER_ARG);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.user_args[arg_idx] = arg;
}
@@ -5751,7 +5751,7 @@ TSHttpTxnSetHttpRetStatus(TSHttpTxn txnp, TSHttpStatus http_retstatus)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.http_return_code = (HTTPStatus)http_retstatus;
}
@@ -5954,12 +5954,12 @@ TSHttpTxnMilestoneGet(TSHttpTxn txnp, TSMilestonesType milestone, ink_hrtime *ti
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr(time) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
TSReturnCode ret = TS_SUCCESS;
if ((milestone < TS_MILESTONE_UA_BEGIN) || (milestone >= TS_MILESTONE_LAST_ENTRY)) {
*time = -1;
- ret = TS_ERROR;
+ ret = TS_ERROR;
} else {
*time = sm->milestones[milestone];
}
@@ -5972,7 +5972,7 @@ TSHttpTxnCachedRespTimeGet(TSHttpTxn txnp, time_t *resp_time)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HTTPInfo *cached_obj = sm->t_state.cache_info.object_read;
if (cached_obj == NULL || !cached_obj->valid())
@@ -5987,7 +5987,7 @@ TSHttpTxnLookingUpTypeGet(TSHttpTxn txnp)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
HttpTransact::State *s = &(sm->t_state);
return (int)(s->current.request_to);
@@ -6014,7 +6014,7 @@ TSHttpCurrentActiveClientConnectionsGet(void)
int
TSHttpCurrentIdleClientConnectionsGet(void)
{
- int64_t total = 0;
+ int64_t total = 0;
int64_t active = 0;
HTTP_READ_DYN_SUM(http_current_client_connections_stat, total);
@@ -6053,7 +6053,7 @@ TSHttpAltInfoClientReqGet(TSHttpAltInfo infop, TSMBuffer *bufp, TSMLoc *obj)
HttpAltInfo *info = (HttpAltInfo *)infop;
*(reinterpret_cast<HTTPHdr **>(bufp)) = &info->m_client_req;
- *obj = reinterpret_cast<TSMLoc>(info->m_client_req.m_http);
+ *obj = reinterpret_cast<TSMLoc>(info->m_client_req.m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -6066,7 +6066,7 @@ TSHttpAltInfoCachedReqGet(TSHttpAltInfo infop, TSMBuffer *bufp, TSMLoc *obj)
HttpAltInfo *info = (HttpAltInfo *)infop;
*(reinterpret_cast<HTTPHdr **>(bufp)) = &info->m_cached_req;
- *obj = reinterpret_cast<TSMLoc>(info->m_cached_req.m_http);
+ *obj = reinterpret_cast<TSMLoc>(info->m_cached_req.m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -6079,7 +6079,7 @@ TSHttpAltInfoCachedRespGet(TSHttpAltInfo infop, TSMBuffer *bufp, TSMLoc *obj)
HttpAltInfo *info = (HttpAltInfo *)infop;
*(reinterpret_cast<HTTPHdr **>(bufp)) = &info->m_cached_resp;
- *obj = reinterpret_cast<TSMLoc>(info->m_cached_resp.m_http);
+ *obj = reinterpret_cast<TSMLoc>(info->m_cached_resp.m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -6090,7 +6090,7 @@ TSHttpAltInfoQualitySet(TSHttpAltInfo infop, float quality)
sdk_assert(sdk_sanity_check_alt_info(infop) == TS_SUCCESS);
HttpAltInfo *info = (HttpAltInfo *)infop;
- info->m_qvalue = quality;
+ info->m_qvalue = quality;
}
extern HttpSessionAccept *plugin_http_accept;
@@ -6248,7 +6248,7 @@ TSVConnFdCreate(int fd)
// complex.
vc->action_ = &a;
- vc->id = net_next_connection_number();
+ vc->id = net_next_connection_number();
vc->submit_time = Thread::get_hrtime();
vc->set_is_transparent(false);
vc->mutex = new_ProxyMutex();
@@ -6298,8 +6298,8 @@ TSVConnClosedGet(TSVConn connp)
sdk_assert(sdk_sanity_check_iocore_structure(connp) == TS_SUCCESS);
VConnection *vc = (VConnection *)connp;
- int data = 0;
- bool f = vc->get_data(TS_API_DATA_CLOSED, &data);
+ int data = 0;
+ bool f = vc->get_data(TS_API_DATA_CLOSED, &data);
ink_assert(f); // This can fail in some cases, we need to track those down.
return data;
}
@@ -6414,14 +6414,14 @@ TSHttpTxnServerIntercept(TSCont contp, TSHttpTxn txnp)
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
- HttpSM *http_sm = (HttpSM *)txnp;
+ HttpSM *http_sm = (HttpSM *)txnp;
INKContInternal *i = (INKContInternal *)contp;
// Must have a mutex
sdk_assert(sdk_sanity_check_null_ptr((void *)i->mutex) == TS_SUCCESS);
http_sm->plugin_tunnel_type = HTTP_PLUGIN_AS_SERVER;
- http_sm->plugin_tunnel = PluginVCCore::alloc();
+ http_sm->plugin_tunnel = PluginVCCore::alloc();
http_sm->plugin_tunnel->set_accept_cont(i);
}
@@ -6431,14 +6431,14 @@ TSHttpTxnIntercept(TSCont contp, TSHttpTxn txnp)
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
- HttpSM *http_sm = (HttpSM *)txnp;
+ HttpSM *http_sm = (HttpSM *)txnp;
INKContInternal *i = (INKContInternal *)contp;
// Must have a mutex
sdk_assert(sdk_sanity_check_null_ptr((void *)i->mutex) == TS_SUCCESS);
http_sm->plugin_tunnel_type = HTTP_PLUGIN_AS_INTERCEPT;
- http_sm->plugin_tunnel = PluginVCCore::alloc();
+ http_sm->plugin_tunnel = PluginVCCore::alloc();
http_sm->plugin_tunnel->set_accept_cont(i);
}
@@ -6550,9 +6550,9 @@ TSNetAccept(TSCont contp, int port, int domain, int accept_threads)
FORCE_PLUGIN_SCOPED_MUTEX(contp);
// If it's not IPv6, force to IPv4.
- opt.ip_family = domain == AF_INET6 ? AF_INET6 : AF_INET;
- opt.accept_threads = accept_threads;
- opt.local_port = port;
+ opt.ip_family = domain == AF_INET6 ? AF_INET6 : AF_INET;
+ opt.accept_threads = accept_threads;
+ opt.local_port = port;
opt.frequent_accept = false;
REC_ReadConfigInteger(opt.recv_bufsize, "proxy.config.net.sock_recv_buffer_size_in");
@@ -6689,7 +6689,7 @@ TSCacheRemove(TSCont contp, TSCacheKey key)
FORCE_PLUGIN_SCOPED_MUTEX(contp);
- CacheInfo *info = (CacheInfo *)key;
+ CacheInfo *info = (CacheInfo *)key;
INKContInternal *i = (INKContInternal *)contp;
return (TSAction)cacheProcessor.remove(i, &info->cache_key, true, info->frag_type, info->hostname, info->len);
@@ -6716,7 +6716,7 @@ TSCacheScan(TSCont contp, TSCacheKey key, int KB_per_second)
int
TSStatCreate(const char *the_name, TSRecordDataType the_type, TSStatPersistence persist, TSStatSync sync)
{
- int id = ink_atomic_increment(&api_rsb_index, 1);
+ int id = ink_atomic_increment(&api_rsb_index, 1);
RecRawStatSyncCb syncer = RecRawStatSyncCount;
// TODO: This only supports "int" data types at this point, since the "Raw" stats
@@ -6972,7 +6972,7 @@ TSHttpSsnClientFdGet(TSHttpSsn ssnp, int *fdp)
{
sdk_assert(sdk_sanity_check_null_ptr((void *)fdp) == TS_SUCCESS);
- VConnection *basecs = reinterpret_cast<VConnection *>(ssnp);
+ VConnection *basecs = reinterpret_cast<VConnection *>(ssnp);
ProxyClientSession *cs = dynamic_cast<ProxyClientSession *>(basecs);
if (cs == NULL)
@@ -7002,7 +7002,7 @@ TSHttpTxnServerFdGet(TSHttpTxn txnp, int *fdp)
sdk_assert(sdk_sanity_check_null_ptr((void *)fdp) == TS_SUCCESS);
HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
- *fdp = -1;
+ *fdp = -1;
HttpServerSession *ss = sm->get_server_session();
if (ss == NULL) {
@@ -7136,12 +7136,12 @@ TSICPCachedReqGet(TSCont contp, TSMBuffer *bufp, TSMLoc *obj)
HdrHeapSDKHandle **handle = &(sm->_cache_req_hdr_heap_handle);
if (*handle == NULL) {
- *handle = (HdrHeapSDKHandle *)ats_malloc(sizeof(HdrHeapSDKHandle));
+ *handle = (HdrHeapSDKHandle *)ats_malloc(sizeof(HdrHeapSDKHandle));
(*handle)->m_heap = cached_hdr->m_heap;
}
*(reinterpret_cast<HdrHeapSDKHandle **>(bufp)) = *handle;
- *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -7169,12 +7169,12 @@ TSICPCachedRespGet(TSCont contp, TSMBuffer *bufp, TSMLoc *obj)
HdrHeapSDKHandle **handle = &(sm->_cache_resp_hdr_heap_handle);
if (*handle == NULL) {
- *handle = (HdrHeapSDKHandle *)ats_malloc(sizeof(HdrHeapSDKHandle));
+ *handle = (HdrHeapSDKHandle *)ats_malloc(sizeof(HdrHeapSDKHandle));
(*handle)->m_heap = cached_hdr->m_heap;
}
*(reinterpret_cast<HdrHeapSDKHandle **>(bufp)) = *handle;
- *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(cached_hdr->m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -7207,7 +7207,7 @@ TSCacheHttpInfoKeySet(TSCacheHttpInfo infop, TSCacheKey keyp)
{
// TODO: Check input ?
CacheHTTPInfo *info = (CacheHTTPInfo *)infop;
- INK_MD5 *key = (INK_MD5 *)keyp;
+ INK_MD5 *key = (INK_MD5 *)keyp;
info->object_key_set(*key);
}
@@ -7246,12 +7246,12 @@ TSHttpTxnRedirectUrlSet(TSHttpTxn txnp, const char *url, const int url_len)
if (sm->redirect_url != NULL) {
ats_free(sm->redirect_url);
- sm->redirect_url = NULL;
+ sm->redirect_url = NULL;
sm->redirect_url_len = 0;
}
- sm->redirect_url = (char *)url;
- sm->redirect_url_len = url_len;
+ sm->redirect_url = (char *)url;
+ sm->redirect_url_len = url_len;
sm->enable_redirection = true;
}
@@ -7266,7 +7266,7 @@ TSRedirectUrlSet(TSHttpTxn txnp, const char *url, const int url_len)
if (sm->redirect_url != NULL) {
ats_free(sm->redirect_url);
- sm->redirect_url = NULL;
+ sm->redirect_url = NULL;
sm->redirect_url_len = 0;
}
@@ -7328,7 +7328,7 @@ TSFetchPageRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
if (hptr->valid()) {
*(reinterpret_cast<HTTPHdr **>(bufp)) = hptr;
- *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
+ *obj = reinterpret_cast<TSMLoc>(hptr->m_http);
return sdk_sanity_check_mbuffer(*bufp);
}
@@ -7345,7 +7345,7 @@ TSFetchPages(TSFetchUrlParams_t *params)
while (myparams != NULL) {
FetchSM *fetch_sm = FetchSMAllocator.alloc();
- sockaddr *addr = ats_ip_sa_cast(&myparams->ip);
+ sockaddr *addr = ats_ip_sa_cast(&myparams->ip);
fetch_sm->init((Continuation *)myparams->contp, myparams->options, myparams->events, myparams->request, myparams->request_len,
addr);
@@ -7525,7 +7525,7 @@ TSAIORead(int fd, off_t offset, char *buf, size_t buffSize, TSCont contp)
sdk_assert(sdk_sanity_check_iocore_structure(contp) == TS_SUCCESS);
Continuation *pCont = (Continuation *)contp;
- AIOCallback *pAIO = new_AIOCallback();
+ AIOCallback *pAIO = new_AIOCallback();
if (pAIO == NULL)
return TS_ERROR;
@@ -7535,8 +7535,8 @@ TSAIORead(int fd, off_t offset, char *buf, size_t buffSize, TSCont contp)
pAIO->aiocb.aio_nbytes = buffSize;
pAIO->aiocb.aio_buf = buf;
- pAIO->action = pCont;
- pAIO->thread = ((ProxyMutex *)pCont->mutex)->thread_holding;
+ pAIO->action = pCont;
+ pAIO->thread = ((ProxyMutex *)pCont->mutex)->thread_holding;
if (ink_aio_read(pAIO, 1) == 1)
return TS_SUCCESS;
@@ -7564,17 +7564,17 @@ TSAIOWrite(int fd, off_t offset, char *buf, const size_t bufSize, TSCont contp)
sdk_assert(sdk_sanity_check_iocore_structure(contp) == TS_SUCCESS);
Continuation *pCont = (Continuation *)contp;
- AIOCallback *pAIO = new_AIOCallback();
+ AIOCallback *pAIO = new_AIOCallback();
// TODO: Might be able to remove this when allocations can never fail.
sdk_assert(sdk_sanity_check_null_ptr((void *)pAIO) == TS_SUCCESS);
pAIO->aiocb.aio_fildes = fd;
pAIO->aiocb.aio_offset = offset;
- pAIO->aiocb.aio_buf = buf;
+ pAIO->aiocb.aio_buf = buf;
pAIO->aiocb.aio_nbytes = bufSize;
- pAIO->action = pCont;
- pAIO->thread = ((ProxyMutex *)pCont->mutex)->thread_holding;
+ pAIO->action = pCont;
+ pAIO->thread = ((ProxyMutex *)pCont->mutex)->thread_holding;
if (ink_aio_write(pAIO, 1) == 1)
return TS_SUCCESS;
@@ -7610,7 +7610,7 @@ TSSkipRemappingSet(TSHttpTxn txnp, int flag)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- HttpSM *sm = (HttpSM *)txnp;
+ HttpSM *sm = (HttpSM *)txnp;
sm->t_state.api_skip_all_remapping = (flag != 0);
}
@@ -7620,7 +7620,7 @@ _conf_to_memberp(TSOverridableConfigKey conf, OverridableHttpConfigParams *overr
{
// The default is "Byte", make sure to override that for those configs which are "Int".
OverridableDataType typ = OVERRIDABLE_TYPE_BYTE;
- void *ret = NULL;
+ void *ret = NULL;
switch (conf) {
case TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR:
@@ -8108,28 +8108,28 @@ TSHttpTxnConfigStringSet(TSHttpTxn txnp, TSOverridableConfigKey conf, const char
switch (conf) {
case TS_CONFIG_HTTP_RESPONSE_SERVER_STR:
if (value && length > 0) {
- s->t_state.txn_conf->proxy_response_server_string = const_cast<char *>(value); // The "core" likes non-const char*
+ s->t_state.txn_conf->proxy_response_server_string = const_cast<char *>(value); // The "core" likes non-const char*
s->t_state.txn_conf->proxy_response_server_string_len = length;
} else {
- s->t_state.txn_conf->proxy_response_server_string = NULL;
+ s->t_state.txn_conf->proxy_response_server_string = NULL;
s->t_state.txn_conf->proxy_response_server_string_len = 0;
}
break;
case TS_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER:
if (value && length > 0) {
- s->t_state.txn_conf->global_user_agent_header = const_cast<char *>(value); // The "core" likes non-const char*
+ s->t_state.txn_conf->global_user_agent_header = const_cast<char *>(value); // The "core" likes non-const char*
s->t_state.txn_conf->global_user_agent_header_size = length;
} else {
- s->t_state.txn_conf->global_user_agent_header = NULL;
+ s->t_state.txn_conf->global_user_agent_header = NULL;
s->t_state.txn_conf->global_user_agent_header_size = 0;
}
break;
case TS_CONFIG_BODY_FACTORY_TEMPLATE_BASE:
if (value && length > 0) {
- s->t_state.txn_conf->body_factory_template_base = const_cast<char *>(value);
+ s->t_state.txn_conf->body_factory_template_base = const_cast<char *>(value);
s->t_state.txn_conf->body_factory_template_base_len = length;
} else {
- s->t_state.txn_conf->body_factory_template_base = NULL;
+ s->t_state.txn_conf->body_factory_template_base = NULL;
s->t_state.txn_conf->body_factory_template_base_len = 0;
}
break;
@@ -8152,15 +8152,15 @@ TSHttpTxnConfigStringGet(TSHttpTxn txnp, TSOverridableConfigKey conf, const char
switch (conf) {
case TS_CONFIG_HTTP_RESPONSE_SERVER_STR:
- *value = sm->t_state.txn_conf->proxy_response_server_string;
+ *value = sm->t_state.txn_conf->proxy_response_server_string;
*length = sm->t_state.txn_conf->proxy_response_server_string_len;
break;
case TS_CONFIG_HTTP_GLOBAL_USER_AGENT_HEADER:
- *value = sm->t_state.txn_conf->global_user_agent_header;
+ *value = sm->t_state.txn_conf->global_user_agent_header;
*length = sm->t_state.txn_conf->global_user_agent_header_size;
break;
case TS_CONFIG_BODY_FACTORY_TEMPLATE_BASE:
- *value = sm->t_state.txn_conf->body_factory_template_base;
+ *value = sm->t_state.txn_conf->body_factory_template_base;
*length = sm->t_state.txn_conf->body_factory_template_base_len;
break;
default:
@@ -8179,7 +8179,7 @@ TSHttpTxnConfigFind(const char *name, int length, TSOverridableConfigKey *conf,
sdk_assert(sdk_sanity_check_null_ptr((void *)conf) == TS_SUCCESS);
TSOverridableConfigKey cnf = TS_CONFIG_NULL;
- TSRecordDataType typ = TS_RECORDDATATYPE_INT;
+ TSRecordDataType typ = TS_RECORDDATATYPE_INT;
if (length == -1)
length = strlen(name);
@@ -8725,7 +8725,7 @@ TSPortDescriptorParse(const char *descriptor)
TSReturnCode
TSPortDescriptorAccept(TSPortDescriptor descp, TSCont contp)
{
- Action *action = NULL;
+ Action *action = NULL;
HttpProxyPort *port = (HttpProxyPort *)descp;
NetProcessor::AcceptOptions net(make_net_accept_options(*port, 0 /* nthreads */));
@@ -8829,9 +8829,9 @@ private:
TSReturnCode
TSVConnTunnel(TSVConn sslp)
{
- NetVConnection *vc = reinterpret_cast<NetVConnection *>(sslp);
+ NetVConnection *vc = reinterpret_cast<NetVConnection *>(sslp);
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(vc);
- TSReturnCode zret = TS_SUCCESS;
+ TSReturnCode zret = TS_SUCCESS;
if (0 != ssl_vc) {
ssl_vc->hookOpRequested = TS_SSL_HOOK_OP_TUNNEL;
} else {
@@ -8843,8 +8843,8 @@ TSVConnTunnel(TSVConn sslp)
TSSslConnection
TSVConnSSLConnectionGet(TSVConn sslp)
{
- TSSslConnection ssl = NULL;
- NetVConnection *vc = reinterpret_cast<NetVConnection *>(sslp);
+ TSSslConnection ssl = NULL;
+ NetVConnection *vc = reinterpret_cast<NetVConnection *>(sslp);
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(vc);
if (ssl_vc != NULL) {
ssl = reinterpret_cast<TSSslConnection>(ssl_vc->ssl);
@@ -8855,7 +8855,7 @@ TSVConnSSLConnectionGet(TSVConn sslp)
tsapi TSSslContext
TSSslContextFindByName(const char *name)
{
- TSSslContext ret = NULL;
+ TSSslContext ret = NULL;
SSLCertLookup *lookup = SSLCertificateConfig::acquire();
if (lookup != NULL) {
SSLCertContext *cc = lookup->find(name);
@@ -8869,7 +8869,7 @@ TSSslContextFindByName(const char *name)
tsapi TSSslContext
TSSslContextFindByAddr(struct sockaddr const *addr)
{
- TSSslContext ret = NULL;
+ TSSslContext ret = NULL;
SSLCertLookup *lookup = SSLCertificateConfig::acquire();
if (lookup != NULL) {
IpEndpoint ip;
@@ -8886,7 +8886,7 @@ TSSslContextFindByAddr(struct sockaddr const *addr)
tsapi int
TSVConnIsSsl(TSVConn sslp)
{
- NetVConnection *vc = reinterpret_cast<NetVConnection *>(sslp);
+ NetVConnection *vc = reinterpret_cast<NetVConnection *>(sslp);
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(vc);
return ssl_vc != NULL;
}
@@ -8894,11 +8894,11 @@ TSVConnIsSsl(TSVConn sslp)
void
TSVConnReenable(TSVConn vconn)
{
- NetVConnection *vc = reinterpret_cast<NetVConnection *>(vconn);
+ NetVConnection *vc = reinterpret_cast<NetVConnection *>(vconn);
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(vc);
// We really only deal with a SSLNetVConnection at the moment
if (ssl_vc != NULL) {
- EThread *eth = this_ethread();
+ EThread *eth = this_ethread();
bool reschedule = eth != ssl_vc->thread;
if (!reschedule) {
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index 9c42436..f463105 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -54,7 +54,7 @@ typedef int8_t TSMgmtByte; // Not for external use
// For memory corruption detection
enum CacheInfoMagic {
CACHE_INFO_MAGIC_ALIVE = 0xfeedbabe,
- CACHE_INFO_MAGIC_DEAD = 0xdeadbeef,
+ CACHE_INFO_MAGIC_DEAD = 0xdeadbeef,
};
struct CacheInfo {
@@ -67,11 +67,11 @@ struct CacheInfo {
CacheInfo()
{
- frag_type = CACHE_FRAG_TYPE_NONE;
- hostname = NULL;
- len = 0;
+ frag_type = CACHE_FRAG_TYPE_NONE;
+ hostname = NULL;
+ len = 0;
pin_in_cache = 0;
- magic = CACHE_INFO_MAGIC_ALIVE;
+ magic = CACHE_INFO_MAGIC_ALIVE;
}
};
@@ -79,8 +79,8 @@ class FileImpl
{
enum {
CLOSED = 0,
- READ = 1,
- WRITE = 2,
+ READ = 1,
+ WRITE = 2,
};
public:
diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc
index 8d3ba09..d156403 100644
--- a/proxy/InkAPITest.cc
+++ b/proxy/InkAPITest.cc
@@ -177,7 +177,7 @@ REGRESSION_TEST(SDK_API_TSPluginDirGet)(RegressionTest *test, int /* atype ATS_U
{
*pstatus = REGRESSION_TEST_INPROGRESS;
- const char *plugin_dir = TSPluginDirGet();
+ const char *plugin_dir = TSPluginDirGet();
const char *install_dir = TSInstallDirGet();
if (!plugin_dir) {
@@ -236,15 +236,15 @@ config_destroy_func(void *data)
REGRESSION_TEST(SDK_API_TSConfig)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
ConfigData *config = (ConfigData *)TSmalloc(sizeof(ConfigData));
- config->a = "unit";
- config->b = "test";
+ config->a = "unit";
+ config->b = "test";
my_config_id = TSConfigSet(0, config, config_destroy_func);
TSConfig test_config = NULL;
- test_config = TSConfigGet(my_config_id);
+ test_config = TSConfigGet(my_config_id);
if (!test_config) {
SDK_RPRINT(test, "TSConfigSet", "TestCase1", TC_FAIL, "can't correctly set global config structure");
@@ -317,7 +317,7 @@ server_handler(TSCont contp, TSEvent event, void *data)
// Kick off a read so that we can receive an EOS event.
SDK_RPRINT(params->test, params->api, "ServerEvent NET_ACCEPT", TC_PASS, "ok");
params->buffer = TSIOBufferCreate();
- params->vc = (TSVConn)data;
+ params->vc = (TSVConn)data;
TSVConnRead((TSVConn)data, contp, params->buffer, 100);
} else if (event == TS_EVENT_VCONN_EOS) {
// The server end of the test passes if it receives an EOF event. This means that it must have
@@ -354,7 +354,7 @@ client_handler(TSCont contp, TSEvent event, void *data)
TSContDestroy(contp);
return 1;
} else if (TS_EVENT_NET_CONNECT == event) {
- sockaddr const *addr = TSNetVConnRemoteAddrGet(static_cast<TSVConn>(data));
+ sockaddr const *addr = TSNetVConnRemoteAddrGet(static_cast<TSVConn>(data));
uint16_t input_server_port = ats_ip_port_host_order(addr);
// If DEFER_ACCEPT is enabled in the OS then the user space accept() doesn't
@@ -433,8 +433,8 @@ REGRESSION_TEST(SDK_API_TSPortDescriptor)(RegressionTest *test, int /* atype ATS
TSPortDescriptor port;
char desc[64];
SDK_NetVConn_Params *params = new SDK_NetVConn_Params("TSPortDescriptorAccept", test, pstatus);
- TSCont server_cont = TSContCreate(server_handler, TSMutexCreate());
- TSCont client_cont = TSContCreate(client_handler, TSMutexCreate());
+ TSCont server_cont = TSContCreate(server_handler, TSMutexCreate());
+ TSCont client_cont = TSContCreate(client_handler, TSMutexCreate());
params->port = 54321;
@@ -544,18 +544,18 @@ cache_handler(TSCont contp, TSEvent event, void *data)
cache_vconn->write_vconnp = (TSVConn)data;
// Create buffers/readers to write and read data into the cache
- cache_vconn->bufp = TSIOBufferCreate();
- cache_vconn->readerp = TSIOBufferReaderAlloc(cache_vconn->bufp);
- cache_vconn->out_bufp = TSIOBufferCreate();
+ cache_vconn->bufp = TSIOBufferCreate();
+ cache_vconn->readerp = TSIOBufferReaderAlloc(cache_vconn->bufp);
+ cache_vconn->out_bufp = TSIOBufferCreate();
cache_vconn->out_readerp = TSIOBufferReaderAlloc(cache_vconn->out_bufp);
// Write content into upstream IOBuffer
ntodo = OBJECT_SIZE;
ndone = 0;
while (ntodo > 0) {
- blockp = TSIOBufferStart(cache_vconn->bufp);
+ blockp = TSIOBufferStart(cache_vconn->bufp);
ptr_block = TSIOBufferBlockWriteStart(blockp, &avail);
- towrite = ((ntodo < avail) ? ntodo : avail);
+ towrite = ((ntodo < avail) ? ntodo : avail);
memcpy(ptr_block, content + ndone, towrite);
TSIOBufferProduce(cache_vconn->bufp, towrite);
ntodo -= towrite;
@@ -588,7 +588,7 @@ cache_handler(TSCont contp, TSEvent event, void *data)
SDK_RPRINT(SDK_Cache_test, "TSCacheRead", "TestCase1", TC_PASS, "ok");
cache_vconn->read_vconnp = (TSVConn)data;
- content_length = TSVConnCacheObjectSizeGet(cache_vconn->read_vconnp);
+ content_length = TSVConnCacheObjectSizeGet(cache_vconn->read_vconnp);
Debug(UTDBG_TAG "_cache_read", "In cache open read [Content-Length: %" PRId64 "]", content_length);
if (content_length != OBJECT_SIZE) {
SDK_RPRINT(SDK_Cache_test, "TSVConnCacheObjectSizeGet", "TestCase1", TC_FAIL, "cached data size is incorrect");
@@ -638,8 +638,8 @@ cache_handler(TSCont contp, TSEvent event, void *data)
// VConn/VIO APIs
nbytes = TSVIONBytesGet(cache_vconn->write_vio);
- ndone = TSVIONDoneGet(cache_vconn->write_vio);
- ntodo = TSVIONTodoGet(cache_vconn->write_vio);
+ ndone = TSVIONDoneGet(cache_vconn->write_vio);
+ ntodo = TSVIONTodoGet(cache_vconn->write_vio);
Debug(UTDBG_TAG "_cache_write", "Nbytes=%" PRId64 " Ndone=%" PRId64 " Ntodo=%" PRId64 "", nbytes, ndone, ntodo);
if (ndone == (OBJECT_SIZE / 2)) {
@@ -738,8 +738,8 @@ cache_handler(TSCont contp, TSEvent event, void *data)
}
nbytes = TSVIONBytesGet(cache_vconn->write_vio);
- ndone = TSVIONDoneGet(cache_vconn->write_vio);
- ntodo = TSVIONTodoGet(cache_vconn->write_vio);
+ ndone = TSVIONDoneGet(cache_vconn->write_vio);
+ ntodo = TSVIONTodoGet(cache_vconn->write_vio);
Debug(UTDBG_TAG "_cache_write", "Nbytes=%" PRId64 " Ndone=%" PRId64 " Ntodo=%" PRId64 "", nbytes, ndone, ntodo);
TSVIOReenable(cache_vconn->write_vio);
@@ -756,8 +756,8 @@ cache_handler(TSCont contp, TSEvent event, void *data)
}
nbytes = TSVIONBytesGet(cache_vconn->read_vio);
- ntodo = TSVIONTodoGet(cache_vconn->read_vio);
- ndone = TSVIONDoneGet(cache_vconn->read_vio);
+ ntodo = TSVIONTodoGet(cache_vconn->read_vio);
+ ndone = TSVIONDoneGet(cache_vconn->read_vio);
Debug(UTDBG_TAG "_cache_read", "Nbytes=%" PRId64 " Ndone=%" PRId64 " Ntodo=%" PRId64 "", nbytes, ndone, ntodo);
if (nbytes != (ndone + ntodo)) {
@@ -803,8 +803,8 @@ cache_handler(TSCont contp, TSEvent event, void *data)
}
nbytes = TSVIONBytesGet(cache_vconn->read_vio);
- ntodo = TSVIONTodoGet(cache_vconn->read_vio);
- ndone = TSVIONDoneGet(cache_vconn->read_vio);
+ ntodo = TSVIONTodoGet(cache_vconn->read_vio);
+ ndone = TSVIONDoneGet(cache_vconn->read_vio);
Debug(UTDBG_TAG "_cache_read", "Nbytes=%" PRId64 " Ndone=%" PRId64 " Ntodo=%" PRId64 "", nbytes, ndone, ntodo);
if (nbytes != (ndone + ntodo)) {
@@ -855,10 +855,10 @@ cache_handler(TSCont contp, TSEvent event, void *data)
REGRESSION_TEST(SDK_API_TSCache)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- *pstatus = REGRESSION_TEST_INPROGRESS;
- SDK_Cache_test = test;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
+ SDK_Cache_test = test;
SDK_Cache_pstatus = pstatus;
- int is_ready = 0;
+ int is_ready = 0;
// Check if Cache is ready
TSCacheReady(&is_ready);
@@ -873,8 +873,8 @@ REGRESSION_TEST(SDK_API_TSCache)(RegressionTest *test, int /* atype ATS_UNUSED *
}
// Create CacheKey
- char key_name[] = "key_for_regression_test";
- TSCacheKey key = TSCacheKeyCreate();
+ char key_name[] = "key_for_regression_test";
+ TSCacheKey key = TSCacheKeyCreate();
TSCacheKey key_cmp = TSCacheKeyCreate();
SDK_RPRINT(test, "TSCacheKeyCreate", "TestCase1", TC_PASS, "ok");
TSCacheKeyDigestSet(key, key_name, strlen(key_name));
@@ -904,9 +904,9 @@ REGRESSION_TEST(SDK_API_TSCache)(RegressionTest *test, int /* atype ATS_UNUSED *
content[OBJECT_SIZE - 1] = '\0';
// Write data to cache.
- TSCont contp = TSContCreate(cache_handler, TSMutexCreate());
+ TSCont contp = TSContCreate(cache_handler, TSMutexCreate());
CacheVConnStruct *cache_vconn = (CacheVConnStruct *)TSmalloc(sizeof(CacheVConnStruct));
- cache_vconn->key = key;
+ cache_vconn->key = key;
TSContDataSet(contp, cache_vconn);
TSCacheWrite(contp, key);
@@ -942,7 +942,7 @@ REGRESSION_TEST(SDK_API_TSfopen)(RegressionTest *test, int /* atype ATS_UNUSED *
struct stat stat_buffer_pre, stat_buffer_post, stat_buffer_input;
char *ret_val;
int read = 0, wrote = 0;
- int64_t read_amount = 0;
+ int64_t read_amount = 0;
char INPUT_TEXT_FILE[] = "plugin.config";
char input_file_full_path[BUFSIZ];
@@ -1205,8 +1205,8 @@ thread_create_handler(void * /* arg ATS_UNUSED */)
REGRESSION_TEST(SDK_API_TSThread)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- *pstatus = REGRESSION_TEST_INPROGRESS;
- SDK_Thread_test = test;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
+ SDK_Thread_test = test;
SDK_Thread_pstatus = pstatus;
TSThread curr_thread = 0;
@@ -1273,8 +1273,8 @@ pthread_start_func(void * /* arg ATS_UNUSED */)
REGRESSION_TEST(SDK_API_TSThreadInit)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- *pstatus = REGRESSION_TEST_INPROGRESS;
- SDK_ThreadInit_test = test;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
+ SDK_ThreadInit_test = test;
SDK_ThreadInit_pstatus = pstatus;
pthread_t curr_tid, new_tid;
@@ -1283,7 +1283,7 @@ REGRESSION_TEST(SDK_API_TSThreadInit)(RegressionTest *test, int /* atype ATS_UNU
int ret;
errno = 0;
- ret = pthread_create(&new_tid, NULL, pthread_start_func, (void *)(intptr_t)curr_tid);
+ ret = pthread_create(&new_tid, NULL, pthread_start_func, (void *)(intptr_t)curr_tid);
if (ret != 0) {
thread_init_err_count++;
SDK_RPRINT(test, "TSThreadInit", "TestCase1", TC_FAIL, "can't create pthread");
@@ -1324,12 +1324,12 @@ REGRESSION_TEST(SDK_API_TSActionCancel)(RegressionTest *test, int /* atype ATS_U
{
*pstatus = REGRESSION_TEST_INPROGRESS;
- SDK_ActionCancel_test = test;
+ SDK_ActionCancel_test = test;
SDK_ActionCancel_pstatus = pstatus;
TSMutex cont_mutex = TSMutexCreate();
- TSCont contp = TSContCreate(action_cancel_handler, cont_mutex);
- TSAction actionp = TSContSchedule(contp, 10000, TS_THREAD_POOL_DEFAULT);
+ TSCont contp = TSContCreate(action_cancel_handler, cont_mutex);
+ TSAction actionp = TSContSchedule(contp, 10000, TS_THREAD_POOL_DEFAULT);
TSMutexLock(cont_mutex);
if (TSActionDone(actionp)) {
@@ -1385,11 +1385,11 @@ REGRESSION_TEST(SDK_API_TSContCreate)(RegressionTest *test, int /* atype ATS_UNU
*pstatus = REGRESSION_TEST_INPROGRESS;
// For asynchronous APIs, use static vars to store test and pstatus
- SDK_ContCreate_test = test;
+ SDK_ContCreate_test = test;
SDK_ContCreate_pstatus = pstatus;
TSMutex mutexp = TSMutexCreate();
- TSCont contp = TSContCreate(cont_handler, mutexp);
+ TSCont contp = TSContCreate(cont_handler, mutexp);
if (TS_SUCCESS == TSMutexLockTry(mutexp)) { // Mutex is grabbed successfully
TSContCall(contp, (TSEvent)0, NULL);
@@ -1449,14 +1449,14 @@ REGRESSION_TEST(SDK_API_TSContDataGet)(RegressionTest *test, int /* atype ATS_UN
*pstatus = REGRESSION_TEST_INPROGRESS;
// For asynchronous APIs, use static vars to store test and pstatus
- SDK_ContData_test = test;
+ SDK_ContData_test = test;
SDK_ContData_pstatus = pstatus;
TSCont contp = TSContCreate(cont_data_handler, TSMutexCreate());
MyData *my_data = (MyData *)TSmalloc(sizeof(MyData));
- my_data->data1 = 1;
- my_data->data2 = 2;
+ my_data->data1 = 1;
+ my_data->data2 = 2;
TSContDataSet(contp, (void *)my_data);
@@ -1472,14 +1472,14 @@ REGRESSION_TEST(SDK_API_TSContDataGet)(RegressionTest *test, int /* atype ATS_UN
REGRESSION_TEST(SDK_API_TSContMutexGet)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
TSMutex mutexp_input;
TSMutex mutexp_output;
TSCont contp;
mutexp_input = TSMutexCreate();
- contp = TSContCreate(cont_handler, mutexp_input);
+ contp = TSContCreate(cont_handler, mutexp_input);
mutexp_output = TSContMutexGet(contp);
@@ -1558,7 +1558,7 @@ cont_schedule_handler(TSCont contp, TSEvent event, void * /* edata ATS_UNUSED */
REGRESSION_TEST(SDK_API_TSMutexCreate)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
TSMutex mutexp = TSMutexCreate();
@@ -1604,7 +1604,7 @@ REGRESSION_TEST(SDK_API_TSMutexCreate)(RegressionTest *test, int /* atype ATS_UN
REGRESSION_TEST(SDK_API_TSIOBufferCreate)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
int64_t watermark = 1000;
@@ -1643,7 +1643,7 @@ REGRESSION_TEST(SDK_API_TSIOBufferCreate)(RegressionTest *test, int /* atype ATS
REGRESSION_TEST(SDK_API_TSIOBufferProduce)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K); // size is 4096
@@ -1677,7 +1677,7 @@ REGRESSION_TEST(SDK_API_TSIOBufferProduce)(RegressionTest *test, int /* atype AT
REGRESSION_TEST(SDK_API_TSIOBufferReaderConsume)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
@@ -1708,9 +1708,9 @@ REGRESSION_TEST(SDK_API_TSIOBufferReaderConsume)(RegressionTest *test, int /* at
REGRESSION_TEST(SDK_API_TSIOBufferReaderClone)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
- TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
+ TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
TSIOBufferReader readerp = TSIOBufferReaderAlloc(bufp);
TSIOBufferProduce(bufp, 10);
@@ -1741,7 +1741,7 @@ REGRESSION_TEST(SDK_API_TSIOBufferReaderClone)(RegressionTest *test, int /* atyp
REGRESSION_TEST(SDK_API_TSIOBufferStart)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
@@ -1772,11 +1772,11 @@ REGRESSION_TEST(SDK_API_TSIOBufferStart)(RegressionTest *test, int /* atype ATS_
REGRESSION_TEST(SDK_API_TSIOBufferCopy)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
char input_buf[] = "This is the test for TSIOBufferCopy, TSIOBufferWrite, TSIOBufferReaderCopy";
char output_buf[1024];
- TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
+ TSIOBuffer bufp = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
TSIOBuffer bufp2 = TSIOBufferSizedCreate(TS_IOBUFFER_SIZE_INDEX_4K);
TSIOBufferReader readerp = TSIOBufferReaderAlloc(bufp);
@@ -1812,9 +1812,9 @@ REGRESSION_TEST(SDK_API_TSIOBufferBlockReadAvail)(RegressionTest *test, int /* a
{
bool test_passed_1 = false;
bool test_passed_2 = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
- int i = 10000;
+ int i = 10000;
TSIOBuffer bufp = TSIOBufferCreate();
TSIOBufferWrite(bufp, (char *)&i, sizeof(int));
TSIOBufferReader readerp = TSIOBufferReaderAlloc(bufp);
@@ -1860,14 +1860,14 @@ REGRESSION_TEST(SDK_API_TSIOBufferBlockReadAvail)(RegressionTest *test, int /* a
REGRESSION_TEST(SDK_API_TSIOBufferBlockNext)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
bool test_passed = false;
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
- int i = 10000;
+ int i = 10000;
TSIOBuffer bufp = TSIOBufferCreate();
TSIOBufferWrite(bufp, (char *)&i, sizeof(int));
TSIOBufferReader readerp = TSIOBufferReaderAlloc(bufp);
- TSIOBufferBlock blockp = TSIOBufferReaderStart(readerp);
+ TSIOBufferBlock blockp = TSIOBufferReaderStart(readerp);
// TODO: This is probaby not the best of regression tests right now ...
// Note that this assumes block size is > sizeof(int) bytes.
@@ -1892,10 +1892,10 @@ REGRESSION_TEST(SDK_API_TSContSchedule)(RegressionTest *test, int /* atype ATS_U
*pstatus = REGRESSION_TEST_INPROGRESS;
// For asynchronous APIs, use static vars to store test and pstatus
- SDK_ContSchedule_test = test;
+ SDK_ContSchedule_test = test;
SDK_ContSchedule_pstatus = pstatus;
- TSCont contp = TSContCreate(cont_schedule_handler, TSMutexCreate());
+ TSCont contp = TSContCreate(cont_schedule_handler, TSMutexCreate());
TSCont contp2 = TSContCreate(cont_schedule_handler, TSMutexCreate());
// Test Case 1: schedule immediate
@@ -1948,7 +1948,7 @@ checkHttpTxnClientIPGet(SocketTest *test, void *data)
{
sockaddr const *ptr;
in_addr_t ip;
- TSHttpTxn txnp = (TSHttpTxn)data;
+ TSHttpTxn txnp = (TSHttpTxn)data;
in_addr_t actual_ip = htonl(INADDR_LOOPBACK); /* 127.0.0.1 is expected because the client is on the same machine */
ptr = TSHttpTxnClientAddrGet(txnp);
@@ -1974,7 +1974,7 @@ checkHttpTxnClientIPGet(SocketTest *test, void *data)
static int
checkHttpTxnNextHopIPGet(SocketTest *test, void *data)
{
- TSHttpTxn txnp = (TSHttpTxn)data;
+ TSHttpTxn txnp = (TSHttpTxn)data;
in_addr_t actual_ip = htonl(INADDR_LOOPBACK); /* 127.0.0.1 is expected because the client is on the same machine */
sockaddr const *ptr;
in_addr_t nexthopip;
@@ -2005,7 +2005,7 @@ checkHttpTxnServerIPGet(SocketTest *test, void *data)
{
sockaddr const *ptr;
in_addr_t ip;
- TSHttpTxn txnp = (TSHttpTxn)data;
+ TSHttpTxn txnp = (TSHttpTxn)data;
in_addr_t actual_ip = htonl(INADDR_LOOPBACK); /* 127.0.0.1 is expected because the client is on the same machine */
ptr = TSHttpTxnServerAddrGet(txnp);
@@ -2033,8 +2033,8 @@ checkHttpTxnIncomingAddrGet(SocketTest *test, void *data)
{
uint16_t port;
HttpProxyPort *proxy_port = HttpProxyPort::findHttp(AF_INET);
- TSHttpTxn txnp = (TSHttpTxn)data;
- sockaddr const *ptr = TSHttpTxnIncomingAddrGet(txnp);
+ TSHttpTxn txnp = (TSHttpTxn)data;
+ sockaddr const *ptr = TSHttpTxnIncomingAddrGet(txnp);
if (0 == proxy_port) {
SDK_RPRINT(test->regtest, "TSHttpTxnIncomingPortGet", "TestCase1", TC_FAIL,
@@ -2068,7 +2068,7 @@ checkHttpTxnClientAddrGet(SocketTest *test, void *data)
{
uint16_t port;
uint16_t browser_port;
- TSHttpTxn txnp = (TSHttpTxn)data;
+ TSHttpTxn txnp = (TSHttpTxn)data;
sockaddr const *ptr = TSHttpTxnClientAddrGet(txnp);
browser_port = test->browser->local_port;
@@ -2357,22 +2357,22 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpHookAdd)(RegressionTest *test, int /* atyp
{
*pstatus = REGRESSION_TEST_INPROGRESS;
- TSCont cont = TSContCreate(mytest_handler, TSMutexCreate());
+ TSCont cont = TSContCreate(mytest_handler, TSMutexCreate());
SocketTest *socktest = (SocketTest *)TSmalloc(sizeof(SocketTest));
- socktest->regtest = test;
- socktest->pstatus = pstatus;
- socktest->hook_mask = 0;
- socktest->reenable_mask = 0;
- socktest->test_client_ip_get = false;
+ socktest->regtest = test;
+ socktest->pstatus = pstatus;
+ socktest->hook_mask = 0;
+ socktest->reenable_mask = 0;
+ socktest->test_client_ip_get = false;
socktest->test_client_incoming_port_get = false;
- socktest->test_client_req_get = false;
- socktest->test_client_resp_get = false;
- socktest->test_server_ip_get = false;
- socktest->test_server_req_get = false;
- socktest->test_server_resp_get = false;
- socktest->test_next_hop_ip_get = false;
- socktest->magic = MAGIC_ALIVE;
+ socktest->test_client_req_get = false;
+ socktest->test_client_resp_get = false;
+ socktest->test_server_ip_get = false;
+ socktest->test_server_req_get = false;
+ socktest->test_server_resp_get = false;
+ socktest->test_next_hop_ip_get = false;
+ socktest->magic = MAGIC_ALIVE;
TSContDataSet(cont, socktest);
/* Register to HTTP hooks that are called in case of a cache MISS */
@@ -2391,7 +2391,7 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpHookAdd)(RegressionTest *test, int /* atyp
/* Create a client transaction */
socktest->browser = synclient_txn_create();
- char *request = generate_request(HTTP_HOOK_TEST_REQUEST_ID); // this request has a no-cache that prevents caching
+ char *request = generate_request(HTTP_HOOK_TEST_REQUEST_ID); // this request has a no-cache that prevents caching
synclient_txn_send_request(socktest->browser, request);
TSfree(request);
@@ -2469,7 +2469,7 @@ test_url_print(TSMBuffer bufp, TSMLoc hdr_loc)
/* Allocate the string with an extra byte for the string
terminator */
output_string = (char *)TSmalloc(total_avail + 1);
- output_len = 0;
+ output_len = 0;
/* We need to loop over all the buffer blocks to make
sure we get the complete header since the header can
@@ -2527,7 +2527,7 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test, int /* atype ATS_UNUSED */,
const char *host_get;
int port = 2021;
char port_char[10];
- int port_get = 80;
+ int port_get = 80;
const char *path = "about/overview.html";
const char *path_get;
const char *params = "abcdef";
@@ -2537,9 +2537,9 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test, int /* atype ATS_UNUSED */,
const char *fragment = "yyy";
const char *fragment_get;
char *url_expected_string;
- char *url_string_from_1 = (char *)NULL;
- char *url_string_from_2 = (char *)NULL;
- char *url_string_from_3 = (char *)NULL;
+ char *url_string_from_1 = (char *)NULL;
+ char *url_string_from_2 = (char *)NULL;
+ char *url_string_from_3 = (char *)NULL;
char *url_string_from_print = (char *)NULL;
int url_expected_length;
int url_length_from_1;
@@ -2548,24 +2548,24 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test, int /* atype ATS_UNUSED */,
int type_get;
int tmp_len;
- bool test_passed_create = false;
- bool test_passed_scheme = false;
- bool test_passed_user = false;
+ bool test_passed_create = false;
+ bool test_passed_scheme = false;
+ bool test_passed_user = false;
bool test_passed_password = false;
- bool test_passed_host = false;
- bool test_passed_port = false;
- bool test_passed_path = false;
- bool test_passed_params = false;
- bool test_passed_query = false;
+ bool test_passed_host = false;
+ bool test_passed_port = false;
+ bool test_passed_path = false;
+ bool test_passed_params = false;
+ bool test_passed_query = false;
bool test_passed_fragment = false;
- bool test_passed_copy = false;
- bool test_passed_clone = false;
- bool test_passed_string1 = false;
- bool test_passed_string2 = false;
- bool test_passed_print = false;
- bool test_passed_length1 = false;
- bool test_passed_length2 = false;
- bool test_passed_type = false;
+ bool test_passed_copy = false;
+ bool test_passed_clone = false;
+ bool test_passed_string1 = false;
+ bool test_passed_string2 = false;
+ bool test_passed_print = false;
+ bool test_passed_length1 = false;
+ bool test_passed_length2 = false;
+ bool test_passed_type = false;
int length;
@@ -2584,7 +2584,7 @@ REGRESSION_TEST(SDK_API_TSUrl)(RegressionTest *test, int /* atype ATS_UNUSED */,
((query == NULL) ? 0 : strlen("?") + strlen(query)) +
((fragment == NULL) ? 0 : strlen("#") + strlen(fragment));
- size_t len = url_expected_length + 1;
+ size_t len = url_expected_length + 1;
url_expected_string = (char *)TSmalloc(len * sizeof(char));
memset(url_expected_string, 0, url_expected_length + 1);
snprintf(url_expected_string, len, "%s://%s%s%s%s%s%s%s/%s%s%s%s%s%s%s", scheme, ((user == NULL) ? "" : user),
@@ -2916,7 +2916,7 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
TSMLoc url_loc;
TSMLoc url_loc_Get;
const char *url_host = "www.example.com";
- int url_port = 2345;
+ int url_port = 2345;
const char *url_path = "abcd/efg/hij.htm";
const char *response_reason = "aefa";
@@ -2943,21 +2943,21 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
const char *expected_iobuf = "GET http://www.example.com:2345/abcd/efg/hij.htm HTTP/2.1\r\n\r\n";
int actual_length;
int expected_length;
- bool test_passed_Http_Hdr_Create = false;
- bool test_passed_Http_Hdr_Type = false;
- bool test_passed_Http_Hdr_Method = false;
- bool test_passed_Http_Hdr_Url = false;
- bool test_passed_Http_Hdr_Status = false;
- bool test_passed_Http_Hdr_Reason = false;
+ bool test_passed_Http_Hdr_Create = false;
+ bool test_passed_Http_Hdr_Type = false;
+ bool test_passed_Http_Hdr_Method = false;
+ bool test_passed_Http_Hdr_Url = false;
+ bool test_passed_Http_Hdr_Status = false;
+ bool test_passed_Http_Hdr_Reason = false;
bool test_passed_Http_Hdr_Reason_Lookup = false;
- bool test_passed_Http_Hdr_Version = false;
- bool test_passed_Http_Hdr_Copy = false;
- bool test_passed_Http_Hdr_Clone = false;
- bool test_passed_Http_Hdr_Length = false;
- bool test_passed_Http_Hdr_Print = false;
- bool test_passed_Http_Hdr_Destroy = false;
- bool try_print_function = true;
- bool test_buffer_created = true;
+ bool test_passed_Http_Hdr_Version = false;
+ bool test_passed_Http_Hdr_Copy = false;
+ bool test_passed_Http_Hdr_Clone = false;
+ bool test_passed_Http_Hdr_Length = false;
+ bool test_passed_Http_Hdr_Print = false;
+ bool test_passed_Http_Hdr_Destroy = false;
+ bool try_print_function = true;
+ bool test_buffer_created = true;
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -3385,7 +3385,7 @@ REGRESSION_TEST(SDK_API_TSHttpHdr)(RegressionTest *test, int /* atype ATS_UNUSED
// LengthGet
if (test_passed_Http_Hdr_Create == true) {
- actual_length = TSHttpHdrLengthGet(bufp1, hdr_loc1);
+ actual_length = TSHttpHdrLengthGet(bufp1, hdr_loc1);
TSIOBuffer iobuf = TSIOBufferCreate();
TSHttpHdrPrint(bufp1, hdr_loc1, iobuf);
TSIOBufferReader iobufreader = TSIOBufferReaderAlloc(iobuf);
@@ -3603,11 +3603,11 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
int actualNumberOfFields;
int numberOfFields;
- const char *field1Value1 = "field1Value1";
- const char *field1Value2 = "field1Value2";
- const char *field1Value3 = "field1Value3";
- const char *field1Value4 = "field1Value4";
- const char *field1Value5 = "field1Value5";
+ const char *field1Value1 = "field1Value1";
+ const char *field1Value2 = "field1Value2";
+ const char *field1Value3 = "field1Value3";
+ const char *field1Value4 = "field1Value4";
+ const char *field1Value5 = "field1Value5";
const char *field1ValueNew = "newfieldValue";
const char *field1Value1Get;
@@ -3631,11 +3631,11 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
time_t field2ValueNew;
time_t field2ValueNewGet;
- int field3Value1 = 31;
- int field3Value2 = 32;
- int field3Value3 = 33;
- int field3Value4 = 34;
- int field3Value5 = 35;
+ int field3Value1 = 31;
+ int field3Value2 = 32;
+ int field3Value3 = 33;
+ int field3Value4 = 34;
+ int field3Value5 = 35;
int field3ValueNew = 30;
int field3Value1Get;
@@ -3645,11 +3645,11 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
int field3Value5Get;
int field3ValueNewGet;
- unsigned int field4Value1 = 41;
- unsigned int field4Value2 = 42;
- unsigned int field4Value3 = 43;
- unsigned int field4Value4 = 44;
- unsigned int field4Value5 = 45;
+ unsigned int field4Value1 = 41;
+ unsigned int field4Value2 = 42;
+ unsigned int field4Value3 = 43;
+ unsigned int field4Value4 = 44;
+ unsigned int field4Value5 = 45;
unsigned int field4ValueNew = 40;
unsigned int field4Value1Get;
@@ -3659,11 +3659,11 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
unsigned int field4Value5Get;
unsigned int field4ValueNewGet;
- const char *field5Value1 = "field5Value1";
+ const char *field5Value1 = "field5Value1";
const char *field5Value1Append = "AppendedValue";
const char *fieldValueAppendGet;
int lengthFieldValueAppended;
- int field5Value2 = 52;
+ int field5Value2 = 52;
const char *field5Value3 = "DeleteValue";
const char *fieldValueDeleteGet;
int lengthFieldValueDeleteGet;
@@ -3672,35 +3672,35 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
TSMLoc field_loc;
- bool test_passed_MBuffer_Create = false;
- bool test_passed_Mime_Hdr_Create = false;
- bool test_passed_Mime_Hdr_Field_Create = false;
- bool test_passed_Mime_Hdr_Field_Name = false;
- bool test_passed_Mime_Hdr_Field_Append = false;
- bool test_passed_Mime_Hdr_Field_Get = false;
- bool test_passed_Mime_Hdr_Field_Next = false;
- bool test_passed_Mime_Hdr_Fields_Count = false;
+ bool test_passed_MBuffer_Create = false;
+ bool test_passed_Mime_Hdr_Create = false;
+ bool test_passed_Mime_Hdr_Field_Create = false;
+ bool test_passed_Mime_Hdr_Field_Name = false;
+ bool test_passed_Mime_Hdr_Field_Append = false;
+ bool test_passed_Mime_Hdr_Field_Get = false;
+ bool test_passed_Mime_Hdr_Field_Next = false;
+ bool test_passed_Mime_Hdr_Fields_Count = false;
bool test_passed_Mime_Hdr_Field_Value_String_Insert = false;
- bool test_passed_Mime_Hdr_Field_Value_String_Get = false;
- bool test_passed_Mime_Hdr_Field_Value_String_Set = false;
- bool test_passed_Mime_Hdr_Field_Value_Date_Insert = false;
- bool test_passed_Mime_Hdr_Field_Value_Date_Get = false;
- bool test_passed_Mime_Hdr_Field_Value_Date_Set = false;
- bool test_passed_Mime_Hdr_Field_Value_Int_Insert = false;
- bool test_passed_Mime_Hdr_Field_Value_Int_Get = false;
- bool test_passed_Mime_Hdr_Field_Value_Int_Set = false;
- bool test_passed_Mime_Hdr_Field_Value_Uint_Insert = false;
- bool test_passed_Mime_Hdr_Field_Value_Uint_Get = false;
- bool test_passed_Mime_Hdr_Field_Value_Uint_Set = false;
- bool test_passed_Mime_Hdr_Field_Value_Append = false;
- bool test_passed_Mime_Hdr_Field_Value_Delete = false;
- bool test_passed_Mime_Hdr_Field_Values_Clear = false;
- bool test_passed_Mime_Hdr_Field_Values_Count = false;
- bool test_passed_Mime_Hdr_Field_Destroy = false;
- bool test_passed_Mime_Hdr_Fields_Clear = false;
- bool test_passed_Mime_Hdr_Destroy = false;
- bool test_passed_MBuffer_Destroy = false;
- bool test_passed_Mime_Hdr_Field_Length_Get = false;
+ bool test_passed_Mime_Hdr_Field_Value_String_Get = false;
+ bool test_passed_Mime_Hdr_Field_Value_String_Set = false;
+ bool test_passed_Mime_Hdr_Field_Value_Date_Insert = false;
+ bool test_passed_Mime_Hdr_Field_Value_Date_Get = false;
+ bool test_passed_Mime_Hdr_Field_Value_Date_Set = false;
+ bool test_passed_Mime_Hdr_Field_Value_Int_Insert = false;
+ bool test_passed_Mime_Hdr_Field_Value_Int_Get = false;
+ bool test_passed_Mime_Hdr_Field_Value_Int_Set = false;
+ bool test_passed_Mime_Hdr_Field_Value_Uint_Insert = false;
+ bool test_passed_Mime_Hdr_Field_Value_Uint_Get = false;
+ bool test_passed_Mime_Hdr_Field_Value_Uint_Set = false;
+ bool test_passed_Mime_Hdr_Field_Value_Append = false;
+ bool test_passed_Mime_Hdr_Field_Value_Delete = false;
+ bool test_passed_Mime_Hdr_Field_Values_Clear = false;
+ bool test_passed_Mime_Hdr_Field_Values_Count = false;
+ bool test_passed_Mime_Hdr_Field_Destroy = false;
+ bool test_passed_Mime_Hdr_Fields_Clear = false;
+ bool test_passed_Mime_Hdr_Destroy = false;
+ bool test_passed_MBuffer_Destroy = false;
+ bool test_passed_Mime_Hdr_Field_Length_Get = false;
*pstatus = REGRESSION_TEST_INPROGRESS;
@@ -3790,7 +3790,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldAppend", "TestCase1", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldGet", "TestCase1", TC_PASS, "ok");
test_passed_Mime_Hdr_Field_Append = true;
- test_passed_Mime_Hdr_Field_Get = true;
+ test_passed_Mime_Hdr_Field_Get = true;
}
}
@@ -3801,8 +3801,8 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase2", TC_PASS, "Values Don't match");
SDK_RPRINT(test, "TSMimeHdrFieldGet", "TestCase2", TC_PASS, "Values Don't match");
test_passed_Mime_Hdr_Field_Append = false;
- test_passed_Mime_Hdr_Field_Next = false;
- test_passed_Mime_Hdr_Field_Get = false;
+ test_passed_Mime_Hdr_Field_Next = false;
+ test_passed_Mime_Hdr_Field_Get = false;
} else {
SDK_RPRINT(test, "TSMimeHdrFieldAppend", "TestCase2", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase2", TC_PASS, "ok");
@@ -3818,8 +3818,8 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase3", TC_FAIL, "Values Don't match");
SDK_RPRINT(test, "TSMimeHdrFieldGet", "TestCase3", TC_FAIL, "Values Don't match");
test_passed_Mime_Hdr_Field_Append = false;
- test_passed_Mime_Hdr_Field_Next = false;
- test_passed_Mime_Hdr_Field_Get = false;
+ test_passed_Mime_Hdr_Field_Next = false;
+ test_passed_Mime_Hdr_Field_Get = false;
} else {
SDK_RPRINT(test, "TSMimeHdrFieldAppend", "TestCase3", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase3", TC_PASS, "ok");
@@ -3834,8 +3834,8 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase4", TC_FAIL, "Values Don't match");
SDK_RPRINT(test, "TSMimeHdrFieldGet", "TestCase4", TC_FAIL, "Values Don't match");
test_passed_Mime_Hdr_Field_Append = false;
- test_passed_Mime_Hdr_Field_Next = false;
- test_passed_Mime_Hdr_Field_Get = false;
+ test_passed_Mime_Hdr_Field_Next = false;
+ test_passed_Mime_Hdr_Field_Get = false;
} else {
SDK_RPRINT(test, "TSMimeHdrFieldAppend", "TestCase4", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase4", TC_PASS, "ok");
@@ -3849,8 +3849,8 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldAppend", "TestCase5", TC_FAIL, "Values Don't match");
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase5", TC_FAIL, "Values Don't match");
test_passed_Mime_Hdr_Field_Append = false;
- test_passed_Mime_Hdr_Field_Next = false;
- test_passed_Mime_Hdr_Field_Get = false;
+ test_passed_Mime_Hdr_Field_Next = false;
+ test_passed_Mime_Hdr_Field_Get = false;
} else {
SDK_RPRINT(test, "TSMimeHdrFieldAppend", "TestCase5", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldNext", "TestCase5", TC_PASS, "ok");
@@ -3888,7 +3888,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
if (TSHandleMLocRelease(bufp1, mime_loc1, field_loc) == TS_ERROR) {
SDK_RPRINT(test, "TSMimeHdrFieldsCount", "TestCase1", TC_FAIL, "Unable to release handle using TSHandleMLocRelease");
}
- field_loc = next_field_loc;
+ field_loc = next_field_loc;
next_field_loc = NULL;
}
if (actualNumberOfFields == numberOfFields) {
@@ -3917,11 +3917,11 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldValueStringSet", "TestCase1", TC_FAIL,
"Cannot run Test as TSMimeHdrFieldValueStringInsert returns TS_ERROR");
} else {
- field1Value1Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 0, &lengthField1Value1);
- field1Value2Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 1, &lengthField1Value2);
- field1Value3Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 2, &lengthField1Value3);
- field1Value4Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 3, &lengthField1Value4);
- field1Value5Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 4, &lengthField1Value5);
+ field1Value1Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 0, &lengthField1Value1);
+ field1Value2Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 1, &lengthField1Value2);
+ field1Value3Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 2, &lengthField1Value3);
+ field1Value4Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 3, &lengthField1Value4);
+ field1Value5Get = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, 4, &lengthField1Value5);
field1ValueAllGet = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc11, -1, &lengthField1ValueAll);
if (((strncmp(field1Value1Get, field1Value1, lengthField1Value1) == 0) && lengthField1Value1 == (int)strlen(field1Value1)) &&
((strncmp(field1Value2Get, field1Value2, lengthField1Value2) == 0) && lengthField1Value2 == (int)strlen(field1Value2)) &&
@@ -3937,7 +3937,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldValueStringGet", "TestCase1&2&3&4&5", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldValueStringGet with IDX=-1", "TestCase1&2&3&4&5", TC_PASS, "ok");
test_passed_Mime_Hdr_Field_Value_String_Insert = true;
- test_passed_Mime_Hdr_Field_Value_String_Get = true;
+ test_passed_Mime_Hdr_Field_Value_String_Get = true;
if ((TSMimeHdrFieldValueStringSet(bufp1, mime_loc1, field_loc11, 3, field1ValueNew, -1)) == TS_ERROR) {
SDK_RPRINT(test, "TSMimeHdrFieldValueStringSet", "TestCase1", TC_FAIL, "TSMimeHdrFieldValueStringSet returns TS_ERROR");
@@ -3976,8 +3976,8 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldValueDateInsert", "TestCase1", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldValueDateGet", "TestCase1", TC_PASS, "ok");
test_passed_Mime_Hdr_Field_Value_Date_Insert = true;
- test_passed_Mime_Hdr_Field_Value_Date_Get = true;
- field2ValueNew = time(NULL);
+ test_passed_Mime_Hdr_Field_Value_Date_Get = true;
+ field2ValueNew = time(NULL);
if ((TSMimeHdrFieldValueDateSet(bufp1, mime_loc1, field_loc12, field2ValueNew)) == TS_ERROR) {
SDK_RPRINT(test, "TSMimeHdrFieldValueDateSet", "TestCase1", TC_FAIL, "TSMimeHdrFieldValueDateSet returns TS_ERROR");
} else {
@@ -4025,7 +4025,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldValueIntInsert", "TestCase1&2&3&4&5", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldValueIntGet", "TestCase1&2&3&4&5", TC_PASS, "ok");
test_passed_Mime_Hdr_Field_Value_Int_Insert = true;
- test_passed_Mime_Hdr_Field_Value_Int_Get = true;
+ test_passed_Mime_Hdr_Field_Value_Int_Get = true;
if ((TSMimeHdrFieldValueIntSet(bufp1, mime_loc1, field_loc13, 3, field3ValueNew)) == TS_ERROR) {
SDK_RPRINT(test, "TSMimeHdrFieldValueIntSet", "TestCase1", TC_FAIL, "TSMimeHdrFieldValueIntSet returns TS_ERROR");
} else {
@@ -4072,7 +4072,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrFieldValueUintInsert", "TestCase1&2&3&4&5", TC_PASS, "ok");
SDK_RPRINT(test, "TSMimeHdrFieldValueUintGet", "TestCase1&2&3&4&5", TC_PASS, "ok");
test_passed_Mime_Hdr_Field_Value_Uint_Insert = true;
- test_passed_Mime_Hdr_Field_Value_Uint_Get = true;
+ test_passed_Mime_Hdr_Field_Value_Uint_Get = true;
if ((TSMimeHdrFieldValueUintSet(bufp1, mime_loc1, field_loc14, 3, field4ValueNew)) == TS_ERROR) {
SDK_RPRINT(test, "TSMimeHdrFieldValueUintSet", "TestCase1", TC_FAIL, "TSMimeHdrFieldValueUintSet returns TS_ERROR");
} else {
@@ -4129,7 +4129,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrField)(RegressionTest *test, int /* atype ATS_U
} else {
fieldValueAppendGet = TSMimeHdrFieldValueStringGet(bufp1, mime_loc1, field_loc15, 0, &lengthFieldValueAppended);
char *expected_value;
- size_t len = strlen(field5Value1) + strlen(field5Value1Append) + 1;
+ size_t len = strlen(field5Value1) + strlen(field5Value1Append) + 1;
expected_value = (char *)TSmalloc(len);
memset(expected_value, 0, len);
ink_strlcpy(expected_value, field5Value1, len);
@@ -4330,7 +4330,7 @@ convert_http_hdr_to_string(TSMBuffer bufp, TSMLoc hdr_loc)
/* Allocate the string with an extra byte for the string
terminator */
output_string = (char *)TSmalloc(total_avail + 1);
- output_len = 0;
+ output_len = 0;
/* We need to loop over all the buffer blocks to make
sure we get the complete header since the header can
@@ -4384,14 +4384,14 @@ REGRESSION_TEST(SDK_API_TSHttpHdrParse)(RegressionTest *test, int /* atype ATS_U
TSMBuffer reqbufp;
TSMBuffer respbufp = (TSMBuffer)NULL;
- TSMLoc req_hdr_loc = (TSMLoc)NULL;
+ TSMLoc req_hdr_loc = (TSMLoc)NULL;
TSMLoc resp_hdr_loc = (TSMLoc)NULL;
TSHttpParser parser;
- bool test_passed_parse_req = false;
- bool test_passed_parse_resp = false;
- bool test_passed_parser_clear = false;
+ bool test_passed_parse_req = false;
+ bool test_passed_parse_resp = false;
+ bool test_passed_parser_clear = false;
bool test_passed_parser_destroy = false;
// Create Parser
@@ -4399,10 +4399,10 @@ REGRESSION_TEST(SDK_API_TSHttpHdrParse)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSHttpParserCreate", "TestCase1", TC_PASS, "ok");
// Request
- reqbufp = TSMBufferCreate();
+ reqbufp = TSMBufferCreate();
req_hdr_loc = TSHttpHdrCreate(reqbufp);
- start = req;
- end = req + strlen(req) + 1;
+ start = req;
+ end = req + strlen(req) + 1;
if ((retval = TSHttpHdrParseReq(parser, reqbufp, req_hdr_loc, &start, end)) == TS_PARSE_ERROR) {
SDK_RPRINT(test, "TSHttpHdrParseReq", "TestCase1", TC_FAIL, "TSHttpHdrParseReq returns TS_PARSE_ERROR");
} else {
@@ -4419,10 +4419,10 @@ REGRESSION_TEST(SDK_API_TSHttpHdrParse)(RegressionTest *test, int /* atype ATS_U
// Response
if (test_passed_parser_clear == true) {
- respbufp = TSMBufferCreate();
+ respbufp = TSMBufferCreate();
resp_hdr_loc = TSHttpHdrCreate(respbufp);
- start = resp;
- end = resp + strlen(resp) + 1;
+ start = resp;
+ end = resp + strlen(resp) + 1;
if ((retval = TSHttpHdrParseResp(parser, respbufp, resp_hdr_loc, &start, end)) == TS_PARSE_ERROR) {
SDK_RPRINT(test, "TSHttpHdrParseResp", "TestCase1", TC_FAIL, "TSHttpHdrParseResp returns TS_PARSE_ERROR.");
} else {
@@ -4537,7 +4537,7 @@ convert_mime_hdr_to_string(TSMBuffer bufp, TSMLoc hdr_loc)
/* Allocate the string with an extra byte for the string
terminator */
output_string = (char *)TSmalloc(total_avail + 1);
- output_len = 0;
+ output_len = 0;
/* We need to loop over all the buffer blocks to make
sure we get the complete header since the header can
@@ -4615,7 +4615,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
const char *parse_string =
"field1:field1Value1,field1Value2\r\nfield2:10,-34,45\r\nfield3:field3Value1,23\r\nfield2: 2345, field2Value2\r\n\r\n";
const char *DUPLICATE_FIELD_NAME = "field2";
- const char *REMOVE_FIELD_NAME = "field3";
+ const char *REMOVE_FIELD_NAME = "field3";
TSMimeParser parser;
@@ -4637,20 +4637,20 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
TSParseResult retval;
int hdrLength;
- bool test_passed_parser_create = false;
- bool test_passed_parse = false;
- bool test_passed_parser_clear = false;
- bool test_passed_parser_destroy = false;
- bool test_passed_mime_hdr_print = false;
- bool test_passed_mime_hdr_length_get = false;
- bool test_passed_mime_hdr_field_next_dup = false;
- bool test_passed_mime_hdr_copy = false;
- bool test_passed_mime_hdr_clone = false;
- bool test_passed_mime_hdr_field_remove = false;
- bool test_passed_mime_hdr_field_copy = false;
+ bool test_passed_parser_create = false;
+ bool test_passed_parse = false;
+ bool test_passed_parser_clear = false;
+ bool test_passed_parser_destroy = false;
+ bool test_passed_mime_hdr_print = false;
+ bool test_passed_mime_hdr_length_get = false;
+ bool test_passed_mime_hdr_field_next_dup = false;
+ bool test_passed_mime_hdr_copy = false;
+ bool test_passed_mime_hdr_clone = false;
+ bool test_passed_mime_hdr_field_remove = false;
+ bool test_passed_mime_hdr_field_copy = false;
bool test_passed_mime_hdr_field_copy_values = false;
- bool test_passed_handle_mloc_release = false;
- bool test_passed_mime_hdr_field_find = false;
+ bool test_passed_handle_mloc_release = false;
+ bool test_passed_mime_hdr_field_find = false;
// Create Parser
parser = TSMimeParserCreate();
@@ -4670,7 +4670,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
}
} else {
start = parse_string;
- end = parse_string + strlen(parse_string) + 1;
+ end = parse_string + strlen(parse_string) + 1;
if ((retval = TSMimeHdrParse(parser, bufp1, mime_hdr_loc1, &start, end)) == TS_PARSE_ERROR) {
SDK_RPRINT(test, "TSMimeHdrParse", "TestCase1", TC_FAIL, "TSMimeHdrParse returns TS_PARSE_ERROR");
SDK_RPRINT(test, "TSMimeHdrPrint", "TestCase1", TC_FAIL, "Cannot run test as TSMimeHdrParse returned Error.");
@@ -4691,7 +4691,7 @@ REGRESSION_TEST(SDK_API_TSMimeHdrParse)(RegressionTest *test, int /* atype ATS_U
SDK_RPRINT(test, "TSMimeHdrLengthGet", "TestCase1", TC_FAIL, "Value's Mismatch");
}
- test_passed_parse = true;
+ test_passed_parse = true;
test_passed_mime_hdr_print = true;
} else {
SDK_RPRINT(test, "TSMimeHdrParse|TSMimeHdrPrint", "TestCase1", TC_FAIL, "Incorrect parsing or incorrect Printing");
@@ -5042,7 +5042,7 @@ REGRESSION_TEST(SDK_API_TSUrlParse)(RegressionTest *test, int /* atype ATS_UNUSE
"http://a.b.com/xx.jpg?newpath=http://b.c.com" // https://issues.apache.org/jira/browse/TS-1635
};
- static int const num_urls = sizeof(urls) / sizeof(urls[0]);
+ static int const num_urls = sizeof(urls) / sizeof(urls[0]);
bool test_passed[num_urls] = {false};
const char *start;
@@ -5069,7 +5069,7 @@ REGRESSION_TEST(SDK_API_TSUrlParse)(RegressionTest *test, int /* atype ATS_UNUSE
}
} else {
start = url;
- end = url + strlen(url);
+ end = url + strlen(url);
if ((retval = TSUrlParse(bufp, url_loc, &start, end)) == TS_PARSE_ERROR) {
SDK_RPRINT(test, "TSUrlParse", url, TC_FAIL, "TSUrlParse returns TS_PARSE_ERROR");
} else {
@@ -5245,13 +5245,13 @@ REGRESSION_TEST(SDK_API_TSTextLog)(RegressionTest *test, int /* atype ATS_UNUSED
TSTextLogObjectFlush(log);
SDK_RPRINT(test, "TSTextLogObjectFlush", "TestCase1", TC_PASS, "ok");
- TSCont log_test_cont = TSContCreate(log_test_handler, TSMutexCreate());
- LogTestData *data = (LogTestData *)TSmalloc(sizeof(LogTestData));
- data->test = test;
- data->pstatus = pstatus;
+ TSCont log_test_cont = TSContCreate(log_test_handler, TSMutexCreate());
+ LogTestData *data = (LogTestData *)TSmalloc(sizeof(LogTestData));
+ data->test = test;
+ data->pstatus = pstatus;
data->fullpath_logname = TSstrdup(fullpath_logname);
- data->magic = MAGIC_ALIVE;
- data->log = log;
+ data->magic = MAGIC_ALIVE;
+ data->log = log;
TSContDataSet(log_test_cont, data);
TSContSchedule(log_test_cont, 6000, TS_THREAD_POOL_DEFAULT);
@@ -5270,24 +5270,24 @@ REGRESSION_TEST(SDK_API_TSTextLog)(RegressionTest *test, int /* atype ATS_UNUSED
REGRESSION_TEST(SDK_API_TSMgmtGet)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
const char *CONFIG_PARAM_COUNTER_NAME = "proxy.process.ssl.total_tickets_renewed";
- int CONFIG_PARAM_COUNTER_VALUE = 0;
+ int CONFIG_PARAM_COUNTER_VALUE = 0;
const char *CONFIG_PARAM_FLOAT_NAME = "proxy.config.http.background_fill_completed_threshold";
- float CONFIG_PARAM_FLOAT_VALUE = 0.0;
+ float CONFIG_PARAM_FLOAT_VALUE = 0.0;
const char *CONFIG_PARAM_INT_NAME = "proxy.config.http.cache.http";
- int CONFIG_PARAM_INT_VALUE = 1;
+ int CONFIG_PARAM_INT_VALUE = 1;
- const char *CONFIG_PARAM_STRING_NAME = "proxy.config.product_name";
+ const char *CONFIG_PARAM_STRING_NAME = "proxy.config.product_name";
const char *CONFIG_PARAM_STRING_VALUE = "Traffic Server";
*pstatus = REGRESSION_TEST_INPROGRESS;
- int err = 0;
+ int err = 0;
TSMgmtCounter cvalue = 0;
- TSMgmtFloat fvalue = 0.0;
- TSMgmtInt ivalue = -1;
- TSMgmtString svalue = NULL;
+ TSMgmtFloat fvalue = 0.0;
+ TSMgmtInt ivalue = -1;
+ TSMgmtString svalue = NULL;
if (TS_SUCCESS != TSMgmtCounterGet(CONFIG_PARAM_COUNTER_NAME, &cvalue)) {
SDK_RPRINT(test, "TSMgmtCounterGet", "TestCase1.1", TC_FAIL, "can not get value of param %s", CONFIG_PARAM_COUNTER_NAME);
@@ -5353,9 +5353,9 @@ REGRESSION_TEST(SDK_API_TSMgmtGet)(RegressionTest *test, int /* atype ATS_UNUSED
typedef enum {
ORIG_TS_PARSE_ERROR = -1,
- ORIG_TS_PARSE_DONE = 0,
- ORIG_TS_PARSE_OK = 1,
- ORIG_TS_PARSE_CONT = 2,
+ ORIG_TS_PARSE_DONE = 0,
+ ORIG_TS_PARSE_OK = 1,
+ ORIG_TS_PARSE_CONT = 2,
} ORIG_TSParseResult;
typedef enum {
@@ -5367,46 +5367,46 @@ typedef enum {
typedef enum {
ORIG_TS_HTTP_STATUS_NONE = 0,
- ORIG_TS_HTTP_STATUS_CONTINUE = 100,
+ ORIG_TS_HTTP_STATUS_CONTINUE = 100,
ORIG_TS_HTTP_STATUS_SWITCHING_PROTOCOL = 101,
- ORIG_TS_HTTP_STATUS_OK = 200,
- ORIG_TS_HTTP_STATUS_CREATED = 201,
- ORIG_TS_HTTP_STATUS_ACCEPTED = 202,
+ ORIG_TS_HTTP_STATUS_OK = 200,
+ ORIG_TS_HTTP_STATUS_CREATED = 201,
+ ORIG_TS_HTTP_STATUS_ACCEPTED = 202,
ORIG_TS_HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
- ORIG_TS_HTTP_STATUS_NO_CONTENT = 204,
- ORIG_TS_HTTP_STATUS_RESET_CONTENT = 205,
- ORIG_TS_HTTP_STATUS_PARTIAL_CONTENT = 206,
+ ORIG_TS_HTTP_STATUS_NO_CONTENT = 204,
+ ORIG_TS_HTTP_STATUS_RESET_CONTENT = 205,
+ ORIG_TS_HTTP_STATUS_PARTIAL_CONTENT = 206,
- ORIG_TS_HTTP_STATUS_MULTIPLE_CHOICES = 300,
+ ORIG_TS_HTTP_STATUS_MULTIPLE_CHOICES = 300,
ORIG_TS_HTTP_STATUS_MOVED_PERMANENTLY = 301,
ORIG_TS_HTTP_STATUS_MOVED_TEMPORARILY = 302,
- ORIG_TS_HTTP_STATUS_SEE_OTHER = 303,
- ORIG_TS_HTTP_STATUS_NOT_MODIFIED = 304,
- ORIG_TS_HTTP_STATUS_USE_PROXY = 305,
-
- ORIG_TS_HTTP_STATUS_BAD_REQUEST = 400,
- ORIG_TS_HTTP_STATUS_UNAUTHORIZED = 401,
- ORIG_TS_HTTP_STATUS_PAYMENT_REQUIRED = 402,
- ORIG_TS_HTTP_STATUS_FORBIDDEN = 403,
- ORIG_TS_HTTP_STATUS_NOT_FOUND = 404,
- ORIG_TS_HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
- ORIG_TS_HTTP_STATUS_NOT_ACCEPTABLE = 406,
+ ORIG_TS_HTTP_STATUS_SEE_OTHER = 303,
+ ORIG_TS_HTTP_STATUS_NOT_MODIFIED = 304,
+ ORIG_TS_HTTP_STATUS_USE_PROXY = 305,
+
+ ORIG_TS_HTTP_STATUS_BAD_REQUEST = 400,
+ ORIG_TS_HTTP_STATUS_UNAUTHORIZED = 401,
+ ORIG_TS_HTTP_STATUS_PAYMENT_REQUIRED = 402,
+ ORIG_TS_HTTP_STATUS_FORBIDDEN = 403,
+ ORIG_TS_HTTP_STATUS_NOT_FOUND = 404,
+ ORIG_TS_HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
+ ORIG_TS_HTTP_STATUS_NOT_ACCEPTABLE = 406,
ORIG_TS_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
- ORIG_TS_HTTP_STATUS_REQUEST_TIMEOUT = 408,
- ORIG_TS_HTTP_STATUS_CONFLICT = 409,
- ORIG_TS_HTTP_STATUS_GONE = 410,
- ORIG_TS_HTTP_STATUS_LENGTH_REQUIRED = 411,
- ORIG_TS_HTTP_STATUS_PRECONDITION_FAILED = 412,
- ORIG_TS_HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
- ORIG_TS_HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
- ORIG_TS_HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
+ ORIG_TS_HTTP_STATUS_REQUEST_TIMEOUT = 408,
+ ORIG_TS_HTTP_STATUS_CONFLICT = 409,
+ ORIG_TS_HTTP_STATUS_GONE = 410,
+ ORIG_TS_HTTP_STATUS_LENGTH_REQUIRED = 411,
+ ORIG_TS_HTTP_STATUS_PRECONDITION_FAILED = 412,
+ ORIG_TS_HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
+ ORIG_TS_HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
+ ORIG_TS_HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
ORIG_TS_HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
- ORIG_TS_HTTP_STATUS_NOT_IMPLEMENTED = 501,
- ORIG_TS_HTTP_STATUS_BAD_GATEWAY = 502,
- ORIG_TS_HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
- ORIG_TS_HTTP_STATUS_GATEWAY_TIMEOUT = 504,
+ ORIG_TS_HTTP_STATUS_NOT_IMPLEMENTED = 501,
+ ORIG_TS_HTTP_STATUS_BAD_GATEWAY = 502,
+ ORIG_TS_HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
+ ORIG_TS_HTTP_STATUS_GATEWAY_TIMEOUT = 504,
ORIG_TS_HTTP_STATUS_HTTPVER_NOT_SUPPORTED = 505
} ORIG_TSHttpStatus;
@@ -5436,53 +5436,53 @@ typedef enum {
} ORIG_TSHttpHookID;
typedef enum {
- ORIG_TS_EVENT_NONE = 0,
+ ORIG_TS_EVENT_NONE = 0,
ORIG_TS_EVENT_IMMEDIATE = 1,
- ORIG_TS_EVENT_TIMEOUT = 2,
- ORIG_TS_EVENT_ERROR = 3,
- ORIG_TS_EVENT_CONTINUE = 4,
+ ORIG_TS_EVENT_TIMEOUT = 2,
+ ORIG_TS_EVENT_ERROR = 3,
+ ORIG_TS_EVENT_CONTINUE = 4,
- ORIG_TS_EVENT_VCONN_READ_READY = 100,
- ORIG_TS_EVENT_VCONN_WRITE_READY = 101,
- ORIG_TS_EVENT_VCONN_READ_COMPLETE = 102,
+ ORIG_TS_EVENT_VCONN_READ_READY = 100,
+ ORIG_TS_EVENT_VCONN_WRITE_READY = 101,
+ ORIG_TS_EVENT_VCONN_READ_COMPLETE = 102,
ORIG_TS_EVENT_VCONN_WRITE_COMPLETE = 103,
- ORIG_TS_EVENT_VCONN_EOS = 104,
+ ORIG_TS_EVENT_VCONN_EOS = 104,
- ORIG_TS_EVENT_NET_CONNECT = 200,
+ ORIG_TS_EVENT_NET_CONNECT = 200,
ORIG_TS_EVENT_NET_CONNECT_FAILED = 201,
- ORIG_TS_EVENT_NET_ACCEPT = 202,
- ORIG_TS_EVENT_NET_ACCEPT_FAILED = 204,
+ ORIG_TS_EVENT_NET_ACCEPT = 202,
+ ORIG_TS_EVENT_NET_ACCEPT_FAILED = 204,
ORIG_TS_EVENT_HOST_LOOKUP = 500,
- ORIG_TS_EVENT_CACHE_OPEN_READ = 1102,
- ORIG_TS_EVENT_CACHE_OPEN_READ_FAILED = 1103,
- ORIG_TS_EVENT_CACHE_OPEN_WRITE = 1108,
- ORIG_TS_EVENT_CACHE_OPEN_WRITE_FAILED = 1109,
- ORIG_TS_EVENT_CACHE_REMOVE = 1112,
- ORIG_TS_EVENT_CACHE_REMOVE_FAILED = 1113,
- ORIG_TS_EVENT_CACHE_SCAN = 1120,
- ORIG_TS_EVENT_CACHE_SCAN_FAILED = 1121,
- ORIG_TS_EVENT_CACHE_SCAN_OBJECT = 1122,
+ ORIG_TS_EVENT_CACHE_OPEN_READ = 1102,
+ ORIG_TS_EVENT_CACHE_OPEN_READ_FAILED = 1103,
+ ORIG_TS_EVENT_CACHE_OPEN_WRITE = 1108,
+ ORIG_TS_EVENT_CACHE_OPEN_WRITE_FAILED = 1109,
+ ORIG_TS_EVENT_CACHE_REMOVE = 1112,
+ ORIG_TS_EVENT_CACHE_REMOVE_FAILED = 1113,
+ ORIG_TS_EVENT_CACHE_SCAN = 1120,
+ ORIG_TS_EVENT_CACHE_SCAN_FAILED = 1121,
+ ORIG_TS_EVENT_CACHE_SCAN_OBJECT = 1122,
ORIG_TS_EVENT_CACHE_SCAN_OPERATION_BLOCKED = 1123,
- ORIG_TS_EVENT_CACHE_SCAN_OPERATION_FAILED = 1124,
- ORIG_TS_EVENT_CACHE_SCAN_DONE = 1125,
-
- ORIG_TS_EVENT_HTTP_CONTINUE = 60000,
- ORIG_TS_EVENT_HTTP_ERROR = 60001,
- ORIG_TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
- ORIG_TS_EVENT_HTTP_OS_DNS = 60003,
- ORIG_TS_EVENT_HTTP_SEND_REQUEST_HDR = 60004,
- ORIG_TS_EVENT_HTTP_READ_CACHE_HDR = 60005,
- ORIG_TS_EVENT_HTTP_READ_RESPONSE_HDR = 60006,
- ORIG_TS_EVENT_HTTP_SEND_RESPONSE_HDR = 60007,
- ORIG_TS_EVENT_HTTP_REQUEST_TRANSFORM = 60008,
- ORIG_TS_EVENT_HTTP_RESPONSE_TRANSFORM = 60009,
- ORIG_TS_EVENT_HTTP_SELECT_ALT = 60010,
- ORIG_TS_EVENT_HTTP_TXN_START = 60011,
- ORIG_TS_EVENT_HTTP_TXN_CLOSE = 60012,
- ORIG_TS_EVENT_HTTP_SSN_START = 60013,
- ORIG_TS_EVENT_HTTP_SSN_CLOSE = 60014,
+ ORIG_TS_EVENT_CACHE_SCAN_OPERATION_FAILED = 1124,
+ ORIG_TS_EVENT_CACHE_SCAN_DONE = 1125,
+
+ ORIG_TS_EVENT_HTTP_CONTINUE = 60000,
+ ORIG_TS_EVENT_HTTP_ERROR = 60001,
+ ORIG_TS_EVENT_HTTP_READ_REQUEST_HDR = 60002,
+ ORIG_TS_EVENT_HTTP_OS_DNS = 60003,
+ ORIG_TS_EVENT_HTTP_SEND_REQUEST_HDR = 60004,
+ ORIG_TS_EVENT_HTTP_READ_CACHE_HDR = 60005,
+ ORIG_TS_EVENT_HTTP_READ_RESPONSE_HDR = 60006,
+ ORIG_TS_EVENT_HTTP_SEND_RESPONSE_HDR = 60007,
+ ORIG_TS_EVENT_HTTP_REQUEST_TRANSFORM = 60008,
+ ORIG_TS_EVENT_HTTP_RESPONSE_TRANSFORM = 60009,
+ ORIG_TS_EVENT_HTTP_SELECT_ALT = 60010,
+ ORIG_TS_EVENT_HTTP_TXN_START = 60011,
+ ORIG_TS_EVENT_HTTP_TXN_CLOSE = 60012,
+ ORIG_TS_EVENT_HTTP_SSN_START = 60013,
+ ORIG_TS_EVENT_HTTP_SSN_CLOSE = 60014,
ORIG_TS_EVENT_HTTP_CACHE_LOOKUP_COMPLETE = 60015,
ORIG_TS_EVENT_MGMT_UPDATE = 60100
@@ -5501,33 +5501,33 @@ typedef enum {
} ORIG_TSCacheDataType;
typedef enum {
- ORIG_TS_CACHE_ERROR_NO_DOC = -20400,
- ORIG_TS_CACHE_ERROR_DOC_BUSY = -20401,
+ ORIG_TS_CACHE_ERROR_NO_DOC = -20400,
+ ORIG_TS_CACHE_ERROR_DOC_BUSY = -20401,
ORIG_TS_CACHE_ERROR_NOT_READY = -20407
} ORIG_TSCacheError;
typedef enum {
- ORIG_TS_CACHE_SCAN_RESULT_DONE = 0,
+ ORIG_TS_CACHE_SCAN_RESULT_DONE = 0,
ORIG_TS_CACHE_SCAN_RESULT_CONTINUE = 1,
- ORIG_TS_CACHE_SCAN_RESULT_DELETE = 10,
+ ORIG_TS_CACHE_SCAN_RESULT_DELETE = 10,
ORIG_TS_CACHE_SCAN_RESULT_DELETE_ALL_ALTERNATES,
ORIG_TS_CACHE_SCAN_RESULT_UPDATE,
ORIG_TS_CACHE_SCAN_RESULT_RETRY
} ORIG_TSCacheScanResult;
typedef enum {
- ORIG_TS_VC_CLOSE_ABORT = -1,
+ ORIG_TS_VC_CLOSE_ABORT = -1,
ORIG_TS_VC_CLOSE_NORMAL = 1,
} ORIG_TSVConnCloseFlags;
typedef enum {
- ORIG_TS_ERROR = -1,
+ ORIG_TS_ERROR = -1,
ORIG_TS_SUCCESS = 0,
} ORIG_TSReturnCode;
REGRESSION_TEST(SDK_API_TSConstant)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
bool test_passed = true;
PRINT_DIFF(TS_PARSE_ERROR);
@@ -5700,10 +5700,10 @@ typedef struct {
static int
checkHttpTxnParentProxy(ContData *data, TSHttpTxn txnp)
{
- const char *hostname = "txnpp.example.com";
- int port = 10180;
+ const char *hostname = "txnpp.example.com";
+ int port = 10180;
const char *hostnameget = NULL;
- int portget = 0;
+ int portget = 0;
TSHttpTxnParentProxySet(txnp, (char *)hostname, port);
if (TSHttpTxnParentProxyGet(txnp, &hostnameget, &portget) != TS_SUCCESS) {
@@ -5729,7 +5729,7 @@ ssn_handler(TSCont contp, TSEvent event, void *edata)
{
TSHttpTxn txnp = NULL;
ContData *data = NULL;
- data = (ContData *)TSContDataGet(contp);
+ data = (ContData *)TSContDataGet(contp);
if (data == NULL) {
switch (event) {
case TS_EVENT_HTTP_SSN_START:
@@ -5758,7 +5758,7 @@ ssn_handler(TSCont contp, TSEvent event, void *edata)
SDK_RPRINT(data->test, "TSHttpSsnReenable", "TestCase", TC_PASS, "ok");
data->test_passed_ssn_reenable++;
{
- txnp = (TSHttpTxn)edata;
+ txnp = (TSHttpTxn)edata;
TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp);
if (ssnp != data->ssnp) {
SDK_RPRINT(data->test, "TSHttpSsnHookAdd", "TestCase", TC_FAIL, "Value's mismatch");
@@ -5808,7 +5808,7 @@ ssn_handler(TSCont contp, TSEvent event, void *edata)
else {
/* Check if browser response body is the one we expected */
char *temp = data->browser->response;
- temp = strstr(temp, "\r\n\r\n");
+ temp = strstr(temp, "\r\n\r\n");
if (temp != NULL) {
temp += strlen("\r\n\r\n");
if ((temp[0] == '\0') || (strncmp(temp, "\r\n\r\n", 4) == 0)) {
@@ -5838,7 +5838,7 @@ ssn_handler(TSCont contp, TSEvent event, void *edata)
/* Don't need it as didn't initialize the server
synserver_delete(data->os);
*/
- data->os = NULL;
+ data->os = NULL;
data->magic = MAGIC_DEAD;
TSfree(data);
TSContDataSet(contp, NULL);
@@ -5864,16 +5864,16 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpSsn)(RegressionTest *test, int /* atype AT
return;
}
- ContData *socktest = (ContData *)TSmalloc(sizeof(ContData));
- socktest->test = test;
- socktest->pstatus = pstatus;
- socktest->test_passed_ssn_hook_add = 0;
- socktest->test_passed_ssn_reenable = 0;
- socktest->test_passed_txn_ssn_get = 0;
- socktest->test_passed_txn_hook_add = 0;
+ ContData *socktest = (ContData *)TSmalloc(sizeof(ContData));
+ socktest->test = test;
+ socktest->pstatus = pstatus;
+ socktest->test_passed_ssn_hook_add = 0;
+ socktest->test_passed_ssn_reenable = 0;
+ socktest->test_passed_txn_ssn_get = 0;
+ socktest->test_passed_txn_hook_add = 0;
socktest->test_passed_txn_error_body_set = 0;
- socktest->test_passed_Parent_Proxy = false;
- socktest->magic = MAGIC_ALIVE;
+ socktest->test_passed_Parent_Proxy = false;
+ socktest->magic = MAGIC_ALIVE;
TSContDataSet(cont, socktest);
/* Register to HTTP hooks that are called in case of a cache MISS */
@@ -5881,7 +5881,7 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpSsn)(RegressionTest *test, int /* atype AT
/* Create a client transaction */
socktest->browser = synclient_txn_create();
- char *request = generate_request(3); // response is expected to be error case
+ char *request = generate_request(3); // response is expected to be error case
synclient_txn_send_request(socktest->browser, request);
TSfree(request);
@@ -5897,11 +5897,11 @@ struct ParentTest {
ParentTest(RegressionTest *test, int *pstatus)
{
ink_zero(*this);
- this->regtest = test;
- this->pstatus = pstatus;
- this->magic = MAGIC_ALIVE;
+ this->regtest = test;
+ this->pstatus = pstatus;
+ this->magic = MAGIC_ALIVE;
this->configured = false;
- this->browser = synclient_txn_create();
+ this->browser = synclient_txn_create();
/* If parent proxy routing is not enabled, enable it for the life of the test. */
RecGetRecordBool("proxy.config.http.parent_proxy_routing_enable", &this->parent_proxy_routing_enable);
@@ -5919,7 +5919,7 @@ struct ParentTest {
synclient_txn_close(this->browser);
synclient_txn_delete(this->browser);
synserver_delete(this->os);
- this->os = NULL;
+ this->os = NULL;
this->magic = MAGIC_DEAD;
}
@@ -5929,7 +5929,7 @@ struct ParentTest {
RecBool enabled = false;
ParentConfigParams *params = ParentConfig::acquire();
- enabled = params->policy.ParentEnable;
+ enabled = params->policy.ParentEnable;
ParentConfig::release(params);
return enabled;
@@ -5952,7 +5952,7 @@ static int
parent_proxy_success(TSCont contp, TSEvent event, void *edata)
{
ParentTest *ptest = (ParentTest *)TSContDataGet(contp);
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
int expected;
int received;
@@ -5984,7 +5984,7 @@ static int
parent_proxy_fail(TSCont contp, TSEvent event, void *edata)
{
ParentTest *ptest = (ParentTest *)TSContDataGet(contp);
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
TSMBuffer mbuf;
TSMLoc hdr;
@@ -6117,7 +6117,7 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpParentProxySet_Fail)(RegressionTest *test,
ParentTest *ptest = new ParentTest(test, pstatus);
ptest->testcase = "FailCase";
- ptest->handler = parent_proxy_fail;
+ ptest->handler = parent_proxy_fail;
TSContDataSet(cont, ptest);
/* Hook read request headers, since that is the earliest reasonable place to set the parent proxy. */
@@ -6144,7 +6144,7 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpParentProxySet_Success)(RegressionTest *te
ParentTest *ptest = new ParentTest(test, pstatus);
ptest->testcase = "SuccessCase";
- ptest->handler = parent_proxy_success;
+ ptest->handler = parent_proxy_success;
TSContDataSet(cont, ptest);
/* Hook read request headers, since that is the earliest reasonable place to set the parent proxy. */
@@ -6182,7 +6182,7 @@ typedef struct {
static int
cache_hook_handler(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = NULL;
+ TSHttpTxn txnp = NULL;
CacheTestData *data = NULL;
CHECK_SPURIOUS_EVENT(contp, event, edata);
@@ -6344,13 +6344,13 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTxnCache)(RegressionTest *test, int /* aty
return;
}
- CacheTestData *socktest = (CacheTestData *)TSmalloc(sizeof(CacheTestData));
- socktest->test = test;
- socktest->pstatus = pstatus;
- socktest->test_passed_txn_cached_req_get = false;
+ CacheTestData *socktest = (CacheTestData *)TSmalloc(sizeof(CacheTestData));
+ socktest->test = test;
+ socktest->pstatus = pstatus;
+ socktest->test_passed_txn_cached_req_get = false;
socktest->test_passed_txn_cached_resp_get = false;
- socktest->first_time = true;
- socktest->magic = MAGIC_ALIVE;
+ socktest->first_time = true;
+ socktest->magic = MAGIC_ALIVE;
TSContDataSet(cont, socktest);
TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, cont);
@@ -6365,7 +6365,7 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTxnCache)(RegressionTest *test, int /* aty
/* Create a client transaction */
socktest->browser1 = synclient_txn_create();
socktest->browser2 = synclient_txn_create();
- socktest->request = generate_request(2);
+ socktest->request = generate_request(2);
synclient_txn_send_request(socktest->browser1, socktest->request);
/* Wait until transaction is done */
@@ -6421,8 +6421,8 @@ my_data_alloc()
{
MyTransformData *data;
- data = (MyTransformData *)TSmalloc(sizeof(MyTransformData));
- data->output_vio = NULL;
+ data = (MyTransformData *)TSmalloc(sizeof(MyTransformData));
+ data->output_vio = NULL;
data->output_buffer = NULL;
data->output_reader = NULL;
data->append_needed = 1;
@@ -6465,17 +6465,17 @@ handle_transform(TSCont contp)
private data structure pointer is NULL, then we'll create it
and initialize its internals. */
contData = (TransformTestData *)TSContDataGet(contp);
- data = contData->transformData;
+ data = contData->transformData;
if (!data) {
towrite = TSVIONBytesGet(write_vio);
if (towrite != INT64_MAX) {
towrite += append_buffer_length;
}
contData->transformData = my_data_alloc();
- data = contData->transformData;
- data->output_buffer = TSIOBufferCreate();
- data->output_reader = TSIOBufferReaderAlloc(data->output_buffer);
- data->output_vio = TSVConnWrite(output_conn, contp, data->output_reader, towrite);
+ data = contData->transformData;
+ data->output_buffer = TSIOBufferCreate();
+ data->output_reader = TSIOBufferReaderAlloc(data->output_buffer);
+ data->output_vio = TSVConnWrite(output_conn, contp, data->output_reader, towrite);
// Don't need this as the structure is encapsulated in another structure
// which is set to be Continuation's Data.
// TSContDataSet (contp, data);
@@ -6657,11 +6657,11 @@ load(const char *append_string)
char *p;
int64_t avail;
- append_buffer = TSIOBufferCreate();
+ append_buffer = TSIOBufferCreate();
append_buffer_reader = TSIOBufferReaderAlloc(append_buffer);
blk = TSIOBufferStart(append_buffer);
- p = TSIOBufferBlockWriteStart(blk, &avail);
+ p = TSIOBufferBlockWriteStart(blk, &avail);
ink_strlcpy(p, append_string, avail);
if (append_string != NULL) {
@@ -6678,7 +6678,7 @@ load(const char *append_string)
static int
transform_hook_handler(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = NULL;
+ TSHttpTxn txnp = NULL;
TransformTestData *data = NULL;
CHECK_SPURIOUS_EVENT(contp, event, edata);
@@ -6898,16 +6898,16 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpTxnTransform)(RegressionTest *test, int /*
return;
}
- TransformTestData *socktest = (TransformTestData *)TSmalloc(sizeof(TransformTestData));
- socktest->test = test;
- socktest->pstatus = pstatus;
- socktest->test_passed_txn_transform_resp_get = true;
+ TransformTestData *socktest = (TransformTestData *)TSmalloc(sizeof(TransformTestData));
+ socktest->test = test;
+ socktest->pstatus = pstatus;
+ socktest->test_passed_txn_transform_resp_get = true;
socktest->test_passed_txn_transformed_resp_cache = false;
socktest->test_passed_txn_transformed_resp_cache = false;
- socktest->test_passed_transform_create = false;
- socktest->transformData = NULL;
- socktest->req_no = 1;
- socktest->magic = MAGIC_ALIVE;
+ socktest->test_passed_transform_create = false;
+ socktest->transformData = NULL;
+ socktest->req_no = 1;
+ socktest->magic = MAGIC_ALIVE;
TSContDataSet(cont, socktest);
/* Prepare the buffer to be appended to responses */
@@ -6969,7 +6969,7 @@ static int
altinfo_hook_handler(TSCont contp, TSEvent event, void *edata)
{
AltInfoTestData *data = NULL;
- TSHttpTxn txnp = NULL;
+ TSHttpTxn txnp = NULL;
CHECK_SPURIOUS_EVENT(contp, event, edata);
data = (AltInfoTestData *)TSContDataGet(contp);
@@ -7123,16 +7123,16 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_HttpAltInfo)(RegressionTest *test, int /* atyp
TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, cont); // so we can skip remapping
- AltInfoTestData *socktest = (AltInfoTestData *)TSmalloc(sizeof(AltInfoTestData));
- socktest->test = test;
- socktest->pstatus = pstatus;
- socktest->test_passed_txn_alt_info_client_req_get = true;
- socktest->test_passed_txn_alt_info_cached_req_get = true;
+ AltInfoTestData *socktest = (AltInfoTestData *)TSmalloc(sizeof(AltInfoTestData));
+ socktest->test = test;
+ socktest->pstatus = pstatus;
+ socktest->test_passed_txn_alt_info_client_req_get = true;
+ socktest->test_passed_txn_alt_info_cached_req_get = true;
socktest->test_passed_txn_alt_info_cached_resp_get = true;
- socktest->test_passed_txn_alt_info_quality_set = true;
- socktest->run_at_least_once = false;
- socktest->first_time = true;
- socktest->magic = MAGIC_ALIVE;
+ socktest->test_passed_txn_alt_info_quality_set = true;
+ socktest->run_at_least_once = false;
+ socktest->first_time = true;
+ socktest->magic = MAGIC_ALIVE;
TSContDataSet(cont, socktest);
/* Create a new synthetic server */
@@ -7195,9 +7195,9 @@ typedef struct {
static int
cont_test_handler(TSCont contp, TSEvent event, void *edata)
{
- TSHttpTxn txnp = (TSHttpTxn)edata;
+ TSHttpTxn txnp = (TSHttpTxn)edata;
ConnectTestData *data = NULL;
- int request_id = -1;
+ int request_id = -1;
CHECK_SPURIOUS_EVENT(contp, event, edata);
data = (ConnectTestData *)TSContDataGet(contp);
@@ -7277,7 +7277,7 @@ cont_test_handler(TSCont contp, TSEvent event, void *edata)
// transaction is over. clean it up.
synclient_txn_delete(data->browser);
synserver_delete(data->os);
- data->os = NULL;
+ data->os = NULL;
data->magic = MAGIC_DEAD;
TSfree(data);
TSContDataSet(contp, NULL);
@@ -7300,13 +7300,13 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectIntercept)(RegressionTest *test,
TSDebug(UTDBG_TAG, "Starting test TSHttpConnectIntercept");
- TSCont cont_test = TSContCreate(cont_test_handler, TSMutexCreate());
+ TSCont cont_test = TSContCreate(cont_test_handler, TSMutexCreate());
ConnectTestData *data = (ConnectTestData *)TSmalloc(sizeof(ConnectTestData));
TSContDataSet(cont_test, data);
- data->test = test;
- data->pstatus = pstatus;
- data->magic = MAGIC_ALIVE;
+ data->test = test;
+ data->pstatus = pstatus;
+ data->magic = MAGIC_ALIVE;
data->test_case = TEST_CASE_CONNECT_ID1;
/* Register to hook READ_REQUEST */
@@ -7341,13 +7341,13 @@ EXCLUSIVE_REGRESSION_TEST(SDK_API_TSHttpConnectServerIntercept)(RegressionTest *
TSDebug(UTDBG_TAG, "Starting test TSHttpConnectServerintercept");
- TSCont cont_test = TSContCreate(cont_test_handler, TSMutexCreate());
+ TSCont cont_test = TSContCreate(cont_test_handler, TSMutexCreate());
ConnectTestData *data = (ConnectTestData *)TSmalloc(sizeof(ConnectTestData));
TSContDataSet(cont_test, data);
- data->test = test;
- data->pstatus = pstatus;
- data->magic = MAGIC_ALIVE;
+ data->test = test;
+ data->pstatus = pstatus;
+ data->magic = MAGIC_ALIVE;
data->test_case = TEST_CASE_CONNECT_ID2;
/* Register to hook READ_REQUEST */
@@ -7495,8 +7495,8 @@ REGRESSION_TEST(SDK_API_OVERRIDABLE_CONFIGS)(RegressionTest *test, int /* atype
const char *conf;
TSOverridableConfigKey key;
TSRecordDataType type;
- HttpSM *s = HttpSM::allocate();
- bool success = true;
+ HttpSM *s = HttpSM::allocate();
+ bool success = true;
TSHttpTxn txnp = reinterpret_cast<TSHttpTxn>(s);
InkRand generator(17);
TSMgmtInt ival_read, ival_rand;
@@ -7584,14 +7584,14 @@ REGRESSION_TEST(SDK_API_OVERRIDABLE_CONFIGS)(RegressionTest *test, int /* atype
REGRESSION_TEST(SDK_API_TXN_HTTP_INFO_GET)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- HttpSM *s = HttpSM::allocate();
- bool success = true;
+ HttpSM *s = HttpSM::allocate();
+ bool success = true;
TSHttpTxn txnp = reinterpret_cast<TSHttpTxn>(s);
TSMgmtInt ival_read;
s->init();
- *pstatus = REGRESSION_TEST_INPROGRESS;
+ *pstatus = REGRESSION_TEST_INPROGRESS;
HttpCacheSM *c_sm = &(s->get_cache_sm());
c_sm->set_readwhilewrite_inprogress(true);
c_sm->set_open_read_tries(5);
@@ -7736,9 +7736,9 @@ REGRESSION_TEST(SDK_API_ENCODING)(RegressionTest *test, int /* atype ATS_UNUSED
REGRESSION_TEST(SDK_API_DEBUG_NAME_LOOKUPS)(RegressionTest *test, int /* atype ATS_UNUSED */, int *pstatus)
{
- bool success = true;
+ bool success = true;
const char state_name[] = "INACTIVE_TIMEOUT";
- const char hook_name[] = "TS_HTTP_READ_RESPONSE_HDR_HOOK";
+ const char hook_name[] = "TS_HTTP_READ_RESPONSE_HDR_HOOK";
const char event_name[] = "VC_EVENT_IMMEDIATE";
const char *str;
diff --git a/proxy/InkAPITestTool.cc b/proxy/InkAPITestTool.cc
index 3e508bb..50f6b54 100644
--- a/proxy/InkAPITestTool.cc
+++ b/proxy/InkAPITestTool.cc
@@ -490,16 +490,16 @@ synclient_txn_create(void)
else
txn->connect_port = proxy_port->m_port;
- txn->local_port = (int)0;
- txn->connect_ip = IP(127, 0, 0, 1);
- txn->status = REQUEST_INPROGRESS;
- txn->request = NULL;
- txn->vconn = NULL;
- txn->req_buffer = NULL;
- txn->req_reader = NULL;
- txn->resp_buffer = NULL;
- txn->resp_reader = NULL;
- txn->magic = MAGIC_ALIVE;
+ txn->local_port = (int)0;
+ txn->connect_ip = IP(127, 0, 0, 1);
+ txn->status = REQUEST_INPROGRESS;
+ txn->request = NULL;
+ txn->vconn = NULL;
+ txn->req_buffer = NULL;
+ txn->req_reader = NULL;
+ txn->resp_buffer = NULL;
+ txn->resp_reader = NULL;
+ txn->magic = MAGIC_ALIVE;
txn->connect_action = NULL;
TSDebug(CDBG_TAG, "Connecting to proxy 127.0.0.1 on port %d", txn->connect_port);
@@ -670,9 +670,9 @@ synclient_txn_write_request(TSCont contp)
ndone = 0;
ntodo = len;
while (ntodo > 0) {
- block = TSIOBufferStart(txn->req_buffer);
+ block = TSIOBufferStart(txn->req_buffer);
ptr_block = TSIOBufferBlockWriteStart(block, &avail);
- towrite = MIN(ntodo, avail);
+ towrite = MIN(ntodo, avail);
memcpy(ptr_block, txn->request + ndone, towrite);
TSIOBufferProduce(txn->req_buffer, towrite);
ntodo -= towrite;
@@ -740,19 +740,19 @@ synclient_txn_connect_handler(TSCont contp, TSEvent event, void *data)
if (event == TS_EVENT_NET_CONNECT) {
TSDebug(CDBG_TAG, "NET_CONNECT");
- txn->req_buffer = TSIOBufferCreate();
- txn->req_reader = TSIOBufferReaderAlloc(txn->req_buffer);
+ txn->req_buffer = TSIOBufferCreate();
+ txn->req_reader = TSIOBufferReaderAlloc(txn->req_buffer);
txn->resp_buffer = TSIOBufferCreate();
txn->resp_reader = TSIOBufferReaderAlloc(txn->resp_buffer);
- txn->response[0] = '\0';
+ txn->response[0] = '\0';
txn->response_len = 0;
- txn->vconn = (TSVConn)data;
+ txn->vconn = (TSVConn)data;
txn->local_port = (int)((NetVConnection *)data)->get_local_port();
txn->write_vio = NULL;
- txn->read_vio = NULL;
+ txn->read_vio = NULL;
/* start writing */
SET_TEST_HANDLER(txn->current_handler, synclient_txn_write_request_handler);
@@ -791,11 +791,11 @@ synserver_create(int port, TSCont cont)
TSAssert(port < INT16_MAX);
}
- SocketServer *s = (SocketServer *)TSmalloc(sizeof(SocketServer));
- s->magic = MAGIC_ALIVE;
- s->accept_port = port;
+ SocketServer *s = (SocketServer *)TSmalloc(sizeof(SocketServer));
+ s->magic = MAGIC_ALIVE;
+ s->accept_port = port;
s->accept_action = NULL;
- s->accept_cont = cont;
+ s->accept_cont = cont;
TSContDataSet(s->accept_cont, s);
return s;
}
@@ -896,7 +896,7 @@ synserver_vc_accept(TSCont contp, TSEvent event, void *data)
/* Create a new transaction */
ServerTxn *txn = (ServerTxn *)TSmalloc(sizeof(ServerTxn));
- txn->magic = MAGIC_ALIVE;
+ txn->magic = MAGIC_ALIVE;
SET_TEST_HANDLER(txn->current_handler, synserver_txn_read_request_handler);
@@ -909,7 +909,7 @@ synserver_vc_accept(TSCont contp, TSEvent event, void *data)
txn->resp_buffer = TSIOBufferCreate();
txn->resp_reader = TSIOBufferReaderAlloc(txn->resp_buffer);
- txn->request[0] = '\0';
+ txn->request[0] = '\0';
txn->request_len = 0;
txn->vconn = (TSVConn)data;
@@ -960,14 +960,14 @@ synserver_txn_write_response(TSCont contp)
char *response;
response = generate_response(txn->request);
- len = strlen(response);
+ len = strlen(response);
ndone = 0;
ntodo = len;
while (ntodo > 0) {
- block = TSIOBufferStart(txn->resp_buffer);
+ block = TSIOBufferStart(txn->resp_buffer);
ptr_block = TSIOBufferBlockWriteStart(block, &avail);
- towrite = MIN(ntodo, avail);
+ towrite = MIN(ntodo, avail);
memcpy(ptr_block, response + ndone, towrite);
TSIOBufferProduce(txn->resp_buffer, towrite);
ntodo -= towrite;
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index d8b462f..e5c28a8 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -282,7 +282,7 @@ TSVIONBytesSet(TSVIO viop, int64_t nbytes)
sdk_assert(sdk_sanity_check_iocore_structure(viop) == TS_SUCCESS);
sdk_assert(nbytes >= 0);
- VIO *vio = (VIO *)viop;
+ VIO *vio = (VIO *)viop;
vio->nbytes = nbytes;
}
@@ -301,7 +301,7 @@ TSVIONDoneSet(TSVIO viop, int64_t ndone)
sdk_assert(sdk_sanity_check_iocore_structure(viop) == TS_SUCCESS);
sdk_assert(ndone >= 0);
- VIO *vio = (VIO *)viop;
+ VIO *vio = (VIO *)viop;
vio->ndone = ndone;
}
@@ -371,7 +371,7 @@ INKUDPSendTo(TSCont contp, INKUDPConn udp, unsigned int ip, int port, char *data
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
FORCE_PLUGIN_SCOPED_MUTEX(contp);
- UDPPacket *packet = new_UDPPacket();
+ UDPPacket *packet = new_UDPPacket();
UDPConnection *conn = (UDPConnection *)udp;
ats_ip4_set(&packet->to, ip, htons(port));
@@ -517,7 +517,7 @@ TSIOBufferStart(TSIOBuffer bufp)
{
sdk_assert(sdk_sanity_check_iocore_structure(bufp) == TS_SUCCESS);
- MIOBuffer *b = (MIOBuffer *)bufp;
+ MIOBuffer *b = (MIOBuffer *)bufp;
IOBufferBlock *blk = b->get_current_block();
if (!blk || (blk->write_avail() == 0))
@@ -537,7 +537,7 @@ TSIOBufferCopy(TSIOBuffer bufp, TSIOBufferReader readerp, int64_t length, int64_
sdk_assert(sdk_sanity_check_iocore_structure(readerp) == TS_SUCCESS);
sdk_assert((length >= 0) && (offset >= 0));
- MIOBuffer *b = (MIOBuffer *)bufp;
+ MIOBuffer *b = (MIOBuffer *)bufp;
IOBufferReader *r = (IOBufferReader *)readerp;
return b->write(r, length, offset);
@@ -607,7 +607,7 @@ TSIOBufferBlockReadStart(TSIOBufferBlock blockp, TSIOBufferReader readerp, int64
sdk_assert(sdk_sanity_check_iocore_structure(blockp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_iocore_structure(readerp) == TS_SUCCESS);
- IOBufferBlock *blk = (IOBufferBlock *)blockp;
+ IOBufferBlock *blk = (IOBufferBlock *)blockp;
IOBufferReader *reader = (IOBufferReader *)readerp;
char *p;
@@ -634,7 +634,7 @@ TSIOBufferBlockReadAvail(TSIOBufferBlock blockp, TSIOBufferReader readerp)
sdk_assert(sdk_sanity_check_iocore_structure(blockp) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_iocore_structure(readerp) == TS_SUCCESS);
- IOBufferBlock *blk = (IOBufferBlock *)blockp;
+ IOBufferBlock *blk = (IOBufferBlock *)blockp;
IOBufferReader *reader = (IOBufferReader *)readerp;
int64_t avail;
@@ -686,7 +686,7 @@ TSIOBufferWaterMarkSet(TSIOBuffer bufp, int64_t water_mark)
sdk_assert(sdk_sanity_check_iocore_structure(bufp) == TS_SUCCESS);
sdk_assert(water_mark >= 0);
- MIOBuffer *b = (MIOBuffer *)bufp;
+ MIOBuffer *b = (MIOBuffer *)bufp;
b->water_mark = water_mark;
}
@@ -695,7 +695,7 @@ TSIOBufferReaderAlloc(TSIOBuffer bufp)
{
sdk_assert(sdk_sanity_check_iocore_structure(bufp) == TS_SUCCESS);
- MIOBuffer *b = (MIOBuffer *)bufp;
+ MIOBuffer *b = (MIOBuffer *)bufp;
TSIOBufferReader readerp = (TSIOBufferReader)b->alloc_reader();
// TODO: Should remove this when memory allocation can't fail.
diff --git a/proxy/Main.cc b/proxy/Main.cc
index e8be91f..5f8afae 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -128,17 +128,17 @@ static void load_ssl_file_callback(const char *ssl_file, unsigned int options);
static int num_of_net_threads = ink_number_of_processors();
static int num_of_udp_threads = 0;
static int num_accept_threads = 0;
-static int num_task_threads = 0;
+static int num_task_threads = 0;
extern int num_of_cluster_threads;
static char *http_accept_port_descriptor;
int http_accept_file_descriptor = NO_FD;
-static char core_file[255] = "";
-static bool enable_core_file_p = false; // Enable core file dump?
-int command_flag = DEFAULT_COMMAND_FLAG;
-int command_index = -1;
-bool command_valid = false;
+static char core_file[255] = "";
+static bool enable_core_file_p = false; // Enable core file dump?
+int command_flag = DEFAULT_COMMAND_FLAG;
+int command_index = -1;
+bool command_valid = false;
// Commands that have special processing / requirements.
static char const *CMD_VERIFY_CONFIG = "verify_config";
#if TS_HAS_TESTS
@@ -152,21 +152,21 @@ char cluster_host[MAXDNAME + 1] = DEFAULT_CLUSTER_HOST;
// = DEFAULT_CLUSTER_PORT_NUMBER;
static char command_string[512] = "";
-static char conf_dir[512] = "";
-int remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
-static char bind_stdout[512] = DEFAULT_BIND_STDOUT;
-static char bind_stderr[512] = DEFAULT_BIND_STDERR;
-
-static char error_tags[1024] = "";
-static char action_tags[1024] = "";
-static int show_statistics = 0;
+static char conf_dir[512] = "";
+int remote_management_flag = DEFAULT_REMOTE_MANAGEMENT_FLAG;
+static char bind_stdout[512] = DEFAULT_BIND_STDOUT;
+static char bind_stderr[512] = DEFAULT_BIND_STDERR;
+
+static char error_tags[1024] = "";
+static char action_tags[1024] = "";
+static int show_statistics = 0;
static inkcoreapi DiagsConfig *diagsConfig = NULL;
-HttpBodyFactory *body_factory = NULL;
+HttpBodyFactory *body_factory = NULL;
-static int accept_mss = 0;
-static int cmd_line_dprintf_level = 0; // default debug output level from ink_dprintf function
-static int poll_timeout = -1; // No value set.
-static int cmd_disable_freelist = 0;
+static int accept_mss = 0;
+static int cmd_line_dprintf_level = 0; // default debug output level from ink_dprintf function
+static int poll_timeout = -1; // No value set.
+static int cmd_disable_freelist = 0;
static volatile bool sigusr1_received = false;
static volatile bool sigusr2_received = false;
@@ -240,7 +240,7 @@ public:
if (!end)
end = (char *)sbrk(0);
if (!snap)
- snap = (char *)sbrk(0);
+ snap = (char *)sbrk(0);
char *now = (char *)sbrk(0);
// TODO: Use logging instead directly writing to stderr
// This is not error condition at the first place
@@ -327,8 +327,8 @@ public:
// to send a notification from TS to TM, informing TM that outputlog has
// been rolled. It is much easier sending a notification (in the form
// of SIGUSR2) from TM -> TS.
- int diags_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_interval_sec");
- int diags_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_size_mb");
+ int diags_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_interval_sec");
+ int diags_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_size_mb");
int diags_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_enabled");
diags->config_roll_diagslog((RollingEnabledValues)diags_log_roll_enable, diags_log_roll_int, diags_log_roll_size);
@@ -863,8 +863,8 @@ find_cmd_index(char const *p)
while (l) {
char const *s = strchr(l, '/');
char const *e = strpbrk(p, " \t\n");
- int len = s ? s - l : strlen(l);
- int lenp = e ? e - p : strlen(p);
+ int len = s ? s - l : strlen(l);
+ int lenp = e ? e - p : strlen(p);
if ((len == lenp) && !strncasecmp(p, l, len))
return c;
l = s ? s + 1 : 0;
@@ -1199,8 +1199,8 @@ struct ShowStats : public Continuation {
static void
syslog_log_configure()
{
- bool found = false;
- char sys_var[] = "proxy.config.syslog_facility";
+ bool found = false;
+ char sys_var[] = "proxy.config.syslog_facility";
char *facility_str = REC_readString(sys_var, &found);
if (found) {
@@ -1344,7 +1344,7 @@ static int
adjust_num_of_net_threads(int nthreads)
{
float autoconfig_scale = 1.0;
- int nth_auto_config = 1;
+ int nth_auto_config = 1;
int num_of_threads_tmp = 1;
REC_ReadConfigInteger(nth_auto_config, "proxy.config.exec_thread.autoconfig");
@@ -1486,7 +1486,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
#endif
pcre_malloc = ats_malloc;
- pcre_free = ats_free;
+ pcre_free = ats_free;
// Verify system dependent 'constants'
check_system_constants();
@@ -1499,7 +1499,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
chdir_root(); // change directory to the install root of traffic server.
process_args(&appVersionInfo, argument_descriptions, countof(argument_descriptions), argv);
- command_flag = command_flag || *command_string;
+ command_flag = command_flag || *command_string;
command_index = find_cmd_index(command_string);
command_valid = command_flag && command_index >= 0;
@@ -1527,8 +1527,8 @@ main(int /* argc ATS_UNUSED */, const char **argv)
// re-start it again, TS will crash.
// This is also needed for log rotation - setting up the file can cause privilege
// related errors and if diagsConfig isn't get up yet that will crash on a NULL pointer.
- diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, error_tags, action_tags, false);
- diags = diagsConfig->diags;
+ diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, error_tags, action_tags, false);
+ diags = diagsConfig->diags;
diags->prefix_str = "Server ";
diags->set_stdout_output(bind_stdout);
diags->set_stderr_output(bind_stderr);
@@ -1581,7 +1581,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
ats_scoped_str user(MAX_LOGIN + 1);
- *user = '\0';
+ *user = '\0';
admin_user_p = ((REC_ERR_OKAY == REC_ReadConfigString(user, "proxy.config.admin.user_id", MAX_LOGIN)) && (*user != '\0') &&
(0 != strcmp(user, "#-1")));
@@ -1614,7 +1614,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
delete (diagsConfig);
}
diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, error_tags, action_tags, true);
- diags = diagsConfig->diags;
+ diags = diagsConfig->diags;
RecSetDiags(diags);
diags->prefix_str = "Server ";
diags->set_stdout_output(bind_stdout);
@@ -1799,7 +1799,7 @@ main(int /* argc ATS_UNUSED */, const char **argv)
// Init plugins as soon as logging is ready.
(void)plugin_init(); // plugin.config
- SSLConfigParams::init_ssl_ctx_cb = init_ssl_ctx_callback;
+ SSLConfigParams::init_ssl_ctx_cb = init_ssl_ctx_callback;
SSLConfigParams::load_ssl_file_cb = load_ssl_file_callback;
sslNetProcessor.start(getNumSSLThreads(), stacksize);
diff --git a/proxy/ParentConsistentHash.cc b/proxy/ParentConsistentHash.cc
index 8ee81f9..f0050a5 100644
--- a/proxy/ParentConsistentHash.cc
+++ b/proxy/ParentConsistentHash.cc
@@ -27,9 +27,9 @@ ParentConsistentHash::ParentConsistentHash(ParentRecord *parent_record)
int i;
ink_assert(parent_record->num_parents > 0);
- parents[PRIMARY] = parent_record->parents;
+ parents[PRIMARY] = parent_record->parents;
parents[SECONDARY] = parent_record->secondary_parents;
- ignore_query = parent_record->ignore_query;
+ ignore_query = parent_record->ignore_query;
ink_zero(foundParents);
chash[PRIMARY] = new ATSConsistentHash();
@@ -92,10 +92,10 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
ATSHash64Sip24 hash;
ATSConsistentHash *fhash;
HttpRequestData *request_info = static_cast<HttpRequestData *>(rdata);
- bool firstCall = first_call;
- bool parentRetry = false;
- bool wrap_around[2] = {false, false};
- uint64_t path_hash = 0;
+ bool firstCall = first_call;
+ bool parentRetry = false;
+ bool wrap_around[2] = {false, false};
+ uint64_t path_hash = 0;
uint32_t last_lookup;
pRecord *prtmp = NULL, *pRec = NULL;
@@ -110,15 +110,15 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
result->result = PARENT_FAIL;
}
result->hostname = NULL;
- result->port = 0;
+ result->port = 0;
return;
}
// findParent() call if firstCall.
if (firstCall) {
last_lookup = PRIMARY;
- path_hash = getPathHash(request_info, (ATSHash64 *)&hash);
- fhash = chash[PRIMARY];
+ path_hash = getPathHash(request_info, (ATSHash64 *)&hash);
+ fhash = chash[PRIMARY];
if (path_hash) {
prtmp = (pRecord *)fhash->lookup_by_hashval(path_hash, &result->chashIter[last_lookup], &wrap_around[last_lookup]);
if (prtmp)
@@ -128,14 +128,14 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
} else {
if (chash[SECONDARY] != NULL) {
last_lookup = SECONDARY;
- fhash = chash[SECONDARY];
- path_hash = getPathHash(request_info, (ATSHash64 *)&hash);
- prtmp = (pRecord *)fhash->lookup_by_hashval(path_hash, &result->chashIter[last_lookup], &wrap_around[last_lookup]);
+ fhash = chash[SECONDARY];
+ path_hash = getPathHash(request_info, (ATSHash64 *)&hash);
+ prtmp = (pRecord *)fhash->lookup_by_hashval(path_hash, &result->chashIter[last_lookup], &wrap_around[last_lookup]);
if (prtmp)
pRec = (parents[last_lookup] + prtmp->idx);
} else {
last_lookup = PRIMARY;
- fhash = chash[PRIMARY];
+ fhash = chash[PRIMARY];
do { // search until we've selected a different parent.
prtmp = (pRecord *)fhash->lookup(NULL, &result->chashIter[last_lookup], &wrap_around[last_lookup], &hash);
if (prtmp)
@@ -155,8 +155,8 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
// make sure that the proper state is recorded in the result structure
result->last_parent = pRec->idx;
result->last_lookup = last_lookup;
- result->retry = parentRetry;
- result->result = PARENT_SPECIFIED;
+ result->retry = parentRetry;
+ result->result = PARENT_SPECIFIED;
Debug("parent_select", "Down parent %s is now retryable, marked it available.", pRec->hostname);
break;
}
@@ -165,14 +165,14 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
if (!wrap_around[PRIMARY] || (chash[SECONDARY] != NULL)) {
Debug("parent_select", "Selected parent %s is not available, looking up another parent.", pRec->hostname);
if (chash[SECONDARY] != NULL && !wrap_around[SECONDARY]) {
- fhash = chash[SECONDARY];
+ fhash = chash[SECONDARY];
last_lookup = SECONDARY;
} else {
- fhash = chash[PRIMARY];
+ fhash = chash[PRIMARY];
last_lookup = PRIMARY;
}
if (firstCall) {
- prtmp = (pRecord *)fhash->lookup_by_hashval(path_hash, &result->chashIter[last_lookup], &wrap_around[last_lookup]);
+ prtmp = (pRecord *)fhash->lookup_by_hashval(path_hash, &result->chashIter[last_lookup], &wrap_around[last_lookup]);
firstCall = false;
} else {
prtmp = (pRecord *)fhash->lookup(NULL, &result->chashIter[last_lookup], &wrap_around[last_lookup], &hash);
@@ -196,12 +196,12 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
// use the available or marked for retry parent.
if (pRec && (pRec->available || result->retry)) {
- result->result = PARENT_SPECIFIED;
- result->hostname = pRec->hostname;
- result->port = pRec->port;
+ result->result = PARENT_SPECIFIED;
+ result->hostname = pRec->hostname;
+ result->port = pRec->port;
result->last_parent = pRec->idx;
result->last_lookup = last_lookup;
- result->retry = parentRetry;
+ result->retry = parentRetry;
ink_assert(result->hostname != NULL);
ink_assert(result->port != 0);
Debug("parent_select", "Chosen parent: %s.%d", result->hostname, result->port);
@@ -212,8 +212,8 @@ ParentConsistentHash::selectParent(const ParentSelectionPolicy *policy, bool fir
result->result = PARENT_FAIL;
}
result->hostname = NULL;
- result->port = 0;
- result->retry = false;
+ result->port = 0;
+ result->retry = false;
}
return;
diff --git a/proxy/ParentConsistentHash.h b/proxy/ParentConsistentHash.h
index 443af78..23b9c54 100644
--- a/proxy/ParentConsistentHash.h
+++ b/proxy/ParentConsistentHash.h
@@ -48,7 +48,7 @@ class ParentConsistentHash : public ParentSelectionStrategy
bool ignore_query;
public:
- static const int PRIMARY = 0;
+ static const int PRIMARY = 0;
static const int SECONDARY = 1;
ParentConsistentHash(ParentRecord *_parent_record);
~ParentConsistentHash();
diff --git a/proxy/ParentRoundRobin.cc b/proxy/ParentRoundRobin.cc
index c3ecf6d..6f117fe 100644
--- a/proxy/ParentRoundRobin.cc
+++ b/proxy/ParentRoundRobin.cc
@@ -53,10 +53,10 @@ void
ParentRoundRobin::selectParent(const ParentSelectionPolicy *policy, bool first_call, ParentResult *result, RequestData *rdata)
{
Debug("parent_select", "In ParentRoundRobin::selectParent(): Using a round robin parent selection strategy.");
- int cur_index = 0;
- bool parentUp = false;
+ int cur_index = 0;
+ bool parentUp = false;
bool parentRetry = false;
- bool bypass_ok = (result->rec->go_direct == true && policy->DNS_ParentOnly == 0);
+ bool bypass_ok = (result->rec->go_direct == true && policy->DNS_ParentOnly == 0);
HttpRequestData *request_info = static_cast<HttpRequestData *>(rdata);
@@ -75,7 +75,7 @@ ParentRoundRobin::selectParent(const ParentSelectionPolicy *policy, bool first_c
}
result->hostname = NULL;
- result->port = 0;
+ result->port = 0;
return;
} else {
switch (round_robin_type) {
@@ -117,7 +117,7 @@ ParentRoundRobin::selectParent(const ParentSelectionPolicy *policy, bool first_c
result->result = PARENT_FAIL;
}
result->hostname = NULL;
- result->port = 0;
+ result->port = 0;
return;
} else {
// Bypass disabled so keep trying, ignoring whether we think
@@ -143,7 +143,7 @@ ParentRoundRobin::selectParent(const ParentSelectionPolicy *policy, bool first_c
(unsigned)result->rec->parents[cur_index].failedAt, policy->ParentRetryTime, (int64_t)request_info->xact_start,
result->wrap_around);
// Reuse the parent
- parentUp = true;
+ parentUp = true;
parentRetry = true;
Debug("parent_select", "Parent marked for retry %s:%d", result->rec->parents[cur_index].hostname,
result->rec->parents[cur_index].port);
@@ -153,11 +153,11 @@ ParentRoundRobin::selectParent(const ParentSelectionPolicy *policy, bool first_c
}
if (parentUp == true) {
- result->result = PARENT_SPECIFIED;
- result->hostname = result->rec->parents[cur_index].hostname;
- result->port = result->rec->parents[cur_index].port;
+ result->result = PARENT_SPECIFIED;
+ result->hostname = result->rec->parents[cur_index].hostname;
+ result->port = result->rec->parents[cur_index].port;
result->last_parent = cur_index;
- result->retry = parentRetry;
+ result->retry = parentRetry;
ink_assert(result->hostname != NULL);
ink_assert(result->port != 0);
Debug("parent_select", "Chosen parent = %s.%d", result->hostname, result->port);
@@ -173,7 +173,7 @@ ParentRoundRobin::selectParent(const ParentSelectionPolicy *policy, bool first_c
}
result->hostname = NULL;
- result->port = 0;
+ result->port = 0;
}
uint32_t
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index d6626c8..9b1d658 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -41,15 +41,15 @@
typedef ControlMatcher<ParentRecord, ParentResult> P_table;
// Global Vars for Parent Selection
-static const char modulePrefix[] = "[ParentSelection]";
+static const char modulePrefix[] = "[ParentSelection]";
static ConfigUpdateHandler<ParentConfig> *parentConfigUpdate = NULL;
// Config var names
-static const char *file_var = "proxy.config.http.parent_proxy.file";
-static const char *default_var = "proxy.config.http.parent_proxies";
-static const char *retry_var = "proxy.config.http.parent_proxy.retry_time";
-static const char *enable_var = "proxy.config.http.parent_proxy_routing_enable";
-static const char *threshold_var = "proxy.config.http.parent_proxy.fail_threshold";
+static const char *file_var = "proxy.config.http.parent_proxy.file";
+static const char *default_var = "proxy.config.http.parent_proxies";
+static const char *retry_var = "proxy.config.http.parent_proxy.retry_time";
+static const char *enable_var = "proxy.config.http.parent_proxy_routing_enable";
+static const char *threshold_var = "proxy.config.http.parent_proxy.fail_threshold";
static const char *dns_parent_only_var = "proxy.config.http.no_dns_just_forward_to_parent";
static const char *ParentResultStr[] = {"PARENT_UNDEFINED", "PARENT_DIRECT", "PARENT_SPECIFIED", "PARENT_AGENT", "PARENT_FAIL"};
@@ -68,9 +68,9 @@ enum ParentCB_t {
ParentSelectionPolicy::ParentSelectionPolicy()
{
- bool enable = false;
- int32_t retry_time = 0;
- int32_t fail_threshold = 0;
+ bool enable = false;
+ int32_t retry_time = 0;
+ int32_t fail_threshold = 0;
int32_t dns_parent_only = 0;
// Handle parent timeout
@@ -109,7 +109,7 @@ ParentConfigParams::apiParentExists(HttpRequestData *rdata)
void
ParentConfigParams::findParent(HttpRequestData *rdata, ParentResult *result)
{
- P_table *tablePtr = parent_table;
+ P_table *tablePtr = parent_table;
ParentRecord *defaultPtr = DefaultParent;
ParentRecord *rec;
@@ -128,13 +128,13 @@ ParentConfigParams::findParent(HttpRequestData *rdata, ParentResult *result)
// Check to see if the parent was set through the
// api
if (apiParentExists(rdata)) {
- result->result = PARENT_SPECIFIED;
- result->hostname = rdata->api_info->parent_proxy_name;
- result->port = rdata->api_info->parent_proxy_port;
- result->rec = extApiRecord;
- result->epoch = NULL;
+ result->result = PARENT_SPECIFIED;
+ result->hostname = rdata->api_info->parent_proxy_name;
+ result->port = rdata->api_info->parent_proxy_port;
+ result->rec = extApiRecord;
+ result->epoch = NULL;
result->start_parent = 0;
- result->last_parent = 0;
+ result->last_parent = 0;
Debug("parent_select", "Result for %s was API set parent %s:%d", rdata->get_host(), result->hostname, result->port);
}
@@ -363,12 +363,12 @@ const char *
ParentRecord::ProcessParents(char *val, bool isPrimary)
{
Tokenizer pTok(",; \t\r");
- int numTok = 0;
+ int numTok = 0;
const char *current = NULL;
- int port = 0;
+ int port = 0;
char *tmp = NULL, *tmp2 = NULL;
const char *errPtr = NULL;
- float weight = 1.0;
+ float weight = 1.0;
if (parents != NULL && isPrimary == true) {
return "Can not specify more than one set of parents";
@@ -447,23 +447,23 @@ ParentRecord::ProcessParents(char *val, bool isPrimary)
if (isPrimary) {
memcpy(this->parents[i].hostname, current, tmp - current);
this->parents[i].hostname[tmp - current] = '\0';
- this->parents[i].port = port;
- this->parents[i].failedAt = 0;
- this->parents[i].scheme = scheme;
- this->parents[i].idx = i;
- this->parents[i].name = this->parents[i].hostname;
- this->parents[i].available = true;
- this->parents[i].weight = weight;
+ this->parents[i].port = port;
+ this->parents[i].failedAt = 0;
+ this->parents[i].scheme = scheme;
+ this->parents[i].idx = i;
+ this->parents[i].name = this->parents[i].hostname;
+ this->parents[i].available = true;
+ this->parents[i].weight = weight;
} else {
memcpy(this->secondary_parents[i].hostname, current, tmp - current);
this->secondary_parents[i].hostname[tmp - current] = '\0';
- this->secondary_parents[i].port = port;
- this->secondary_parents[i].failedAt = 0;
- this->secondary_parents[i].scheme = scheme;
- this->secondary_parents[i].idx = i;
- this->secondary_parents[i].name = this->secondary_parents[i].hostname;
- this->secondary_parents[i].available = true;
- this->secondary_parents[i].weight = weight;
+ this->secondary_parents[i].port = port;
+ this->secondary_parents[i].failedAt = 0;
+ this->secondary_parents[i].scheme = scheme;
+ this->secondary_parents[i].idx = i;
+ this->secondary_parents[i].name = this->secondary_parents[i].hostname;
+ this->secondary_parents[i].available = true;
+ this->secondary_parents[i].weight = weight;
}
}
@@ -499,11 +499,11 @@ ParentRecord::DefaultInit(char *val)
char *errBuf;
bool alarmAlready = false;
- this->go_direct = true;
- this->ignore_query = false;
- this->scheme = NULL;
+ this->go_direct = true;
+ this->ignore_query = false;
+ this->scheme = NULL;
this->parent_is_proxy = true;
- errPtr = ProcessParents(val, true);
+ errPtr = ProcessParents(val, true);
if (errPtr != NULL) {
errBuf = (char *)ats_malloc(1024);
@@ -532,17 +532,17 @@ ParentRecord::Init(matcher_line *line_info)
const char *tmp;
char *label;
char *val;
- bool used = false;
+ bool used = false;
ParentRR_t round_robin = P_NO_ROUND_ROBIN;
char buf[128];
this->line_num = line_info->line_num;
- this->scheme = NULL;
+ this->scheme = NULL;
for (int i = 0; i < MATCHER_MAX_TOKENS; i++) {
- used = false;
+ used = false;
label = line_info->line[0][i];
- val = line_info->line[1][i];
+ val = line_info->line[1][i];
if (label == NULL) {
continue;
@@ -559,15 +559,15 @@ ParentRecord::Init(matcher_line *line_info)
round_robin = P_CONSISTENT_HASH;
} else {
round_robin = P_NO_ROUND_ROBIN;
- errPtr = "invalid argument to round_robin directive";
+ errPtr = "invalid argument to round_robin directive";
}
used = true;
} else if (strcasecmp(label, "parent") == 0 || strcasecmp(label, "primary_parent") == 0) {
errPtr = ProcessParents(val, true);
- used = true;
+ used = true;
} else if (strcasecmp(label, "secondary_parent") == 0) {
errPtr = ProcessParents(val, false);
- used = true;
+ used = true;
} else if (strcasecmp(label, "go_direct") == 0) {
if (strcasecmp(val, "false") == 0) {
go_direct = false;
@@ -607,12 +607,12 @@ ParentRecord::Init(matcher_line *line_info)
used = true;
} else if (strcasecmp(label, "unavailable_server_retry_responses") == 0 && unavailable_server_retry_responses == NULL) {
unavailable_server_retry_responses = new UnavailableServerResponseCodes(val);
- used = true;
+ used = true;
} else if (strcasecmp(label, "max_simple_retries") == 0) {
int v = atoi(val);
if (v >= 1 && v < MAX_SIMPLE_RETRIES) {
max_simple_retries = v;
- used = true;
+ used = true;
} else {
snprintf(buf, sizeof(buf), "invalid argument to max_simple_retries. Argument must be between 1 and %d.",
MAX_SIMPLE_RETRIES);
@@ -622,7 +622,7 @@ ParentRecord::Init(matcher_line *line_info)
int v = atoi(val);
if (v >= 1 && v < MAX_UNAVAILABLE_SERVER_RETRIES) {
max_unavailable_server_retries = v;
- used = true;
+ used = true;
} else {
snprintf(buf, sizeof(buf), "invalid argument to max_unavailable_server_retries. Argument must be between 1 and %d.",
MAX_UNAVAILABLE_SERVER_RETRIES);
@@ -718,7 +718,7 @@ void
ParentRecord::UpdateMatch(ParentResult *result, RequestData *rdata)
{
if (this->CheckForMatch((HttpRequestData *)rdata, result->line_number) == true) {
- result->rec = this;
+ result->rec = this;
result->line_number = this->line_num;
Debug("parent_select", "Matched with %p parent node from line %d", this, this->line_num);
@@ -793,7 +793,7 @@ setup_socks_servers(ParentRecord *rec_arr, int len)
for (int j = 0; j < len; j++) {
rec_arr[j].go_direct = false;
- pRecord *pr = rec_arr[j].parents;
+ pRecord *pr = rec_arr[j].parents;
int n_parents = rec_arr[j].num_parents;
for (int i = 0; i < n_parents; i++) {
@@ -817,7 +817,7 @@ void
SocksServerConfig::reconfigure()
{
char *default_val = NULL;
- int retry_time = 30;
+ int retry_time = 30;
int fail_threshold;
ParentConfigParams *params = NULL;
@@ -915,13 +915,13 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTION)(RegressionTest * /* t ATS_UNUSED */,
// first, set everything up
*pstatus = REGRESSION_TEST_INPROGRESS;
ParentConfig config;
- P_table *ParentTable = NULL;
+ P_table *ParentTable = NULL;
ParentConfigParams *params = NULL;
passes = fails = 0;
config.startup();
char tbl[2048];
HttpRequestData *request = NULL;
- ParentResult *result = NULL;
+ ParentResult *result = NULL;
#define T(x) \
do { \
@@ -935,9 +935,9 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTION)(RegressionTest * /* t ATS_UNUSED */,
ParentTable = new P_table("", "ParentSelection Unit Test Table", &http_dest_tags, \
ALLOW_HOST_TABLE | ALLOW_REGEX_TABLE | ALLOW_URL_TABLE | ALLOW_IP_TABLE | DONT_BUILD_TABLE); \
ParentTable->BuildTableFromString(tbl); \
- params = new ParentConfigParams(ParentTable); \
- params->policy.FailThreshold = 1; \
- params->policy.ParentEnable = true; \
+ params = new ParentConfigParams(ParentTable); \
+ params->policy.FailThreshold = 1; \
+ params->policy.ParentEnable = true; \
params->policy.ParentRetryTime = 5; \
} while (0)
@@ -951,7 +951,7 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTION)(RegressionTest * /* t ATS_UNUSED */,
delete request; \
delete result; \
request = new HttpRequestData(); \
- result = new ParentResult(); \
+ result = new ParentResult(); \
if (!result || !request) { \
(void)printf("Allocation failed\n"); \
return; \
@@ -1322,12 +1322,12 @@ br(HttpRequestData *h, const char *os_hostname, sockaddr const *dest_ip)
h->hdr = new HTTPHdr();
h->hdr->create(HTTP_TYPE_REQUEST);
h->hostname_str = (char *)ats_strdup(os_hostname);
- h->xact_start = time(NULL);
+ h->xact_start = time(NULL);
ink_zero(h->src_ip);
ink_zero(h->dest_ip);
ats_ip_copy(&h->dest_ip.sa, dest_ip);
h->incoming_port = 80;
- h->api_info = new HttpApiInfo();
+ h->api_info = new HttpApiInfo();
}
// show_result prints out the ParentResult information
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index 51623ec..c6aee10 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -67,8 +67,8 @@ enum ParentRR_t {
};
enum ParentRetry_t {
- PARENT_RETRY_NONE = 0,
- PARENT_RETRY_SIMPLE = 1,
+ PARENT_RETRY_NONE = 0,
+ PARENT_RETRY_SIMPLE = 1,
PARENT_RETRY_UNAVAILABLE_SERVER = 2,
// both simple and unavailable server retry
PARENT_RETRY_BOTH = 3
@@ -180,7 +180,7 @@ struct ParentResult {
{
ink_zero(*this);
line_number = -1;
- result = PARENT_UNDEFINED;
+ result = PARENT_UNDEFINED;
}
bool
diff --git a/proxy/Plugin.cc b/proxy/Plugin.cc
index 2f94e2a..f434fa2 100644
--- a/proxy/Plugin.cc
+++ b/proxy/Plugin.cc
@@ -84,7 +84,7 @@ plugin_load(int argc, char *argv[], bool validateOnly)
Note("loading plugin '%s'", path);
for (PluginRegInfo *plugin_reg_temp = plugin_reg_list.head; plugin_reg_temp != NULL;
- plugin_reg_temp = (plugin_reg_temp->link).next) {
+ plugin_reg_temp = (plugin_reg_temp->link).next) {
if (strcmp(plugin_reg_temp->plugin_path, path) == 0) {
Warning("multiple loading of plugin %s", path);
break;
@@ -109,9 +109,9 @@ plugin_load(int argc, char *argv[], bool validateOnly)
// Allocate a new registration structure for the
// plugin we're starting up
ink_assert(plugin_reg_current == NULL);
- plugin_reg_current = new PluginRegInfo;
+ plugin_reg_current = new PluginRegInfo;
plugin_reg_current->plugin_path = ats_strdup(path);
- plugin_reg_current->dlh = handle;
+ plugin_reg_current->dlh = handle;
init = (init_func_t)dlsym(plugin_reg_current->dlh, "TSPluginInit");
if (!init) {
@@ -213,18 +213,18 @@ plugin_init(bool validateOnly)
int argc;
int fd;
int i;
- bool retVal = true;
+ bool retVal = true;
static bool INIT_ONCE = true;
if (INIT_ONCE) {
api_init();
TSConfigDirGet();
plugin_dir = TSPluginDirGet();
- INIT_ONCE = false;
+ INIT_ONCE = false;
}
path = RecConfigReadConfigPath(NULL, "plugin.config");
- fd = open(path, O_RDONLY);
+ fd = open(path, O_RDONLY);
if (fd < 0) {
Warning("unable to open plugin config file '%s': %d, %s", (const char *)path, errno, strerror(errno));
return false;
@@ -232,7 +232,7 @@ plugin_init(bool validateOnly)
while (ink_file_fd_readline(fd, sizeof(line) - 1, line) > 0) {
argc = 0;
- p = line;
+ p = line;
// strip leading white space and test for comment or blank line
while (*p && ParseRules::is_wslfcr(*p))
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index a0ec05d..edcbb74 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -127,13 +127,13 @@ PluginVC::main_handler(int event, void *data)
ink_assert(!deletable);
ink_assert(data != NULL);
- Event *call_event = (Event *)data;
+ Event *call_event = (Event *)data;
EThread *my_ethread = mutex->thread_holding;
ink_release_assert(my_ethread != NULL);
- bool read_mutex_held = false;
- bool write_mutex_held = false;
- Ptr<ProxyMutex> read_side_mutex = read_state.vio.mutex;
+ bool read_mutex_held = false;
+ bool write_mutex_held = false;
+ Ptr<ProxyMutex> read_side_mutex = read_state.vio.mutex;
Ptr<ProxyMutex> write_side_mutex = write_state.vio.mutex;
if (read_side_mutex) {
@@ -256,12 +256,12 @@ PluginVC::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
// Note: we set vio.op last because process_read_side looks at it to
// tell if the VConnection is active.
- read_state.vio.mutex = c->mutex;
- read_state.vio._cont = c;
- read_state.vio.nbytes = nbytes;
- read_state.vio.ndone = 0;
+ read_state.vio.mutex = c->mutex;
+ read_state.vio._cont = c;
+ read_state.vio.nbytes = nbytes;
+ read_state.vio.ndone = 0;
read_state.vio.vc_server = (VConnection *)this;
- read_state.vio.op = VIO::READ;
+ read_state.vio.op = VIO::READ;
Debug("pvc", "[%u] %s: do_io_read for %" PRId64 " bytes", core_obj->id, PVC_TYPE, nbytes);
@@ -288,12 +288,12 @@ PluginVC::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *abuffer,
// Note: we set vio.op last because process_write_side looks at it to
// tell if the VConnection is active.
- write_state.vio.mutex = c ? c->mutex : this->mutex;
- write_state.vio._cont = c;
- write_state.vio.nbytes = nbytes;
- write_state.vio.ndone = 0;
+ write_state.vio.mutex = c ? c->mutex : this->mutex;
+ write_state.vio._cont = c;
+ write_state.vio.nbytes = nbytes;
+ write_state.vio.ndone = 0;
write_state.vio.vc_server = (VConnection *)this;
- write_state.vio.op = VIO::WRITE;
+ write_state.vio.op = VIO::WRITE;
Debug("pvc", "[%u] %s: do_io_write for %" PRId64 " bytes", core_obj->id, PVC_TYPE, nbytes);
@@ -394,7 +394,7 @@ PluginVC::do_io_shutdown(ShutdownHowTo_t howto)
write_state.shutdown = true;
break;
case IO_SHUTDOWN_READWRITE:
- read_state.shutdown = true;
+ read_state.shutdown = true;
write_state.shutdown = true;
break;
}
@@ -425,8 +425,8 @@ PluginVC::transfer_bytes(MIOBuffer *transfer_to, IOBufferReader *transfer_from,
while (act_on > 0) {
int64_t block_read_avail = transfer_from->block_read_avail();
- int64_t to_move = MIN(act_on, block_read_avail);
- int64_t moved = 0;
+ int64_t to_move = MIN(act_on, block_read_avail);
+ int64_t moved = 0;
if (to_move <= 0) {
break;
@@ -499,8 +499,8 @@ PluginVC::process_write_side(bool other_side_call)
}
IOBufferReader *reader = write_state.vio.get_reader();
- int64_t bytes_avail = reader->read_avail();
- int64_t act_on = MIN(bytes_avail, ntodo);
+ int64_t bytes_avail = reader->read_avail();
+ int64_t act_on = MIN(bytes_avail, ntodo);
Debug("pvc", "[%u] %s: process_write_side; act_on %" PRId64 "", core_obj->id, PVC_TYPE, act_on);
@@ -618,7 +618,7 @@ PluginVC::process_read_side(bool other_side_call)
}
int64_t bytes_avail = core_reader->read_avail();
- int64_t act_on = MIN(bytes_avail, ntodo);
+ int64_t act_on = MIN(bytes_avail, ntodo);
Debug("pvc", "[%u] %s: process_read_side; act_on %" PRId64 "", core_obj->id, PVC_TYPE, act_on);
@@ -634,8 +634,8 @@ PluginVC::process_read_side(bool other_side_call)
MIOBuffer *output_buffer = read_state.vio.get_writer();
int64_t water_mark = output_buffer->water_mark;
- water_mark = MAX(water_mark, PVC_DEFAULT_MAX_BYTES);
- int64_t buf_space = water_mark - output_buffer->max_read_avail();
+ water_mark = MAX(water_mark, PVC_DEFAULT_MAX_BYTES);
+ int64_t buf_space = water_mark - output_buffer->max_read_avail();
if (buf_space <= 0) {
Debug("pvc", "[%u] %s: process_read_side no buffer space", core_obj->id, PVC_TYPE);
return;
@@ -709,7 +709,7 @@ PluginVC::process_close()
if (inactive_event) {
inactive_event->cancel();
- inactive_event = NULL;
+ inactive_event = NULL;
inactive_timeout_at = 0;
}
// If the other side of the PluginVC is not closed
@@ -718,7 +718,7 @@ PluginVC::process_close()
// the close
if (!other_side->closed && core_obj->connected) {
other_side->need_write_process = true;
- other_side->need_read_process = true;
+ other_side->need_read_process = true;
other_side->setup_event_cb(0, &other_side->core_lock_retry_event);
}
@@ -1008,17 +1008,17 @@ PluginVCCore::init()
{
mutex = new_ProxyMutex();
- active_vc.vc_type = PLUGIN_VC_ACTIVE;
+ active_vc.vc_type = PLUGIN_VC_ACTIVE;
active_vc.other_side = &passive_vc;
- active_vc.core_obj = this;
- active_vc.mutex = mutex;
- active_vc.thread = this_ethread();
+ active_vc.core_obj = this;
+ active_vc.mutex = mutex;
+ active_vc.thread = this_ethread();
- passive_vc.vc_type = PLUGIN_VC_PASSIVE;
+ passive_vc.vc_type = PLUGIN_VC_PASSIVE;
passive_vc.other_side = &active_vc;
- passive_vc.core_obj = this;
- passive_vc.mutex = mutex;
- passive_vc.thread = active_vc.thread;
+ passive_vc.core_obj = this;
+ passive_vc.mutex = mutex;
+ passive_vc.thread = active_vc.thread;
p_to_a_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_32K);
p_to_a_reader = p_to_a_buffer->alloc_reader();
@@ -1258,7 +1258,7 @@ PVCTestDriver::start_tests(RegressionTest *r_arg, int *pstatus_arg)
mutex = new_ProxyMutex();
MUTEX_TRY_LOCK(lock, mutex, this_ethread());
- r = r_arg;
+ r = r_arg;
pstatus = pstatus_arg;
run_next_test();
@@ -1287,8 +1287,8 @@ PVCTestDriver::run_next_test()
Debug("pvc_test", "Starting test %s", netvc_tests_def[a_index].test_name);
- NetVCTest *p = new NetVCTest;
- NetVCTest *a = new NetVCTest;
+ NetVCTest *p = new NetVCTest;
+ NetVCTest *a = new NetVCTest;
PluginVCCore *core = PluginVCCore::alloc();
core->set_accept_cont(p);
diff --git a/proxy/PluginVC.h b/proxy/PluginVC.h
index a9d6aca..daa9c03 100644
--- a/proxy/PluginVC.h
+++ b/proxy/PluginVC.h
@@ -66,7 +66,7 @@ enum {
enum {
PLUGIN_VC_MAGIC_ALIVE = 0xaabbccdd,
- PLUGIN_VC_MAGIC_DEAD = 0xaabbdead,
+ PLUGIN_VC_MAGIC_DEAD = 0xaabbdead,
};
class PluginVC : public NetVConnection, public PluginIdentity
diff --git a/proxy/Prefetch.cc b/proxy/Prefetch.cc
index ce2213a..11cbe55 100644
--- a/proxy/Prefetch.cc
+++ b/proxy/Prefetch.cc
@@ -103,18 +103,18 @@ static inline void
setup_udp_header(char *header, uint32_t seq_no, uint32_t pkt_no, bool last_pkt)
{
uint32_t *hdr = (uint32_t *)header;
- hdr[0] = 0;
- hdr[1] = htonl(seq_no);
- hdr[2] = htonl((last_pkt ? PRELOAD_UDP_LAST_PKT_FLAG : 0) | (pkt_no & PRELOAD_UDP_PKT_NUM_MASK));
+ hdr[0] = 0;
+ hdr[1] = htonl(seq_no);
+ hdr[2] = htonl((last_pkt ? PRELOAD_UDP_LAST_PKT_FLAG : 0) | (pkt_no & PRELOAD_UDP_PKT_NUM_MASK));
}
static inline void
setup_object_header(char *header, int64_t size, bool url_promise)
{
uint32_t *hdr = (uint32_t *)header;
- hdr[0] = htonl(size);
- hdr[1] = 0; // we are not pinning
- hdr[2] = (url_promise) ? htonl(PRELOAD_HDR_URL_PROMISE_FLAG) : 0;
+ hdr[0] = htonl(size);
+ hdr[1] = 0; // we are not pinning
+ hdr[2] = (url_promise) ? htonl(PRELOAD_HDR_URL_PROMISE_FLAG) : 0;
}
// Raghu's info about domain extraction
@@ -130,9 +130,9 @@ findDomainFromHost(const char *host, int host_len, bool &no_dot)
// convert to lower case
char c3 = *(h_cur + 1);
char c1 = (c3 >= 'A' && c3 <= 'Z') ? (c3 + 'a' - 'A') : c3;
- c3 = *(h_cur + 2);
+ c3 = *(h_cur + 2);
char c2 = (c3 >= 'A' && c3 <= 'Z') ? (c3 + 'a' - 'A') : c3;
- c3 = *(h_cur + 3);
+ c3 = *(h_cur + 3);
if (c3 >= 'A' && c3 <= 'Z')
c3 += 'a' - 'A';
@@ -214,7 +214,7 @@ normalize_url(char *url, int *len)
case SLASH: // "//" => "/"
if (p[0]) {
modified = 1;
- p[0] = 0;
+ p[0] = 0;
}
break;
@@ -358,7 +358,7 @@ PrefetchTransform::PrefetchTransform(HttpSM *sm, HTTPHdr *resp)
refcount_inc();
HTTPHdr *request = &sm->t_state.hdr_info.client_request;
- url = request->url_get()->string_get(NULL, NULL);
+ url = request->url_get()->string_get(NULL, NULL);
html_parser.Init(url, prefetch_config->html_tags_table, prefetch_config->html_attrs_table);
@@ -381,7 +381,7 @@ PrefetchTransform::PrefetchTransform(HttpSM *sm, HTTPHdr *resp)
no_dot_in_host = false;
if (host_start && host_len) {
- domain_end = host_start + (host_len - 1);
+ domain_end = host_start + (host_len - 1);
domain_start = findDomainFromHost(host_start, host_len, no_dot_in_host);
} else
domain_start = 0;
@@ -451,9 +451,9 @@ PrefetchTransform::handle_event(int event, void *edata)
case VC_EVENT_WRITE_READY:
default: {
if (!m_output_vio) {
- m_output_buf = new_empty_MIOBuffer();
+ m_output_buf = new_empty_MIOBuffer();
m_output_reader = m_output_buf->alloc_reader();
- m_output_vio = m_output_vc->do_io_write(this, INT64_MAX, m_output_reader);
+ m_output_vio = m_output_vc->do_io_write(this, INT64_MAX, m_output_reader);
}
// If the write vio is null, it means it doesn't want
// to get anymore event (WRITE_READY or WRITE_COMPLETE)
@@ -480,7 +480,7 @@ PrefetchTransform::handle_event(int event, void *edata)
if (towrite > 0) {
IOBufferReader *buf_reader = m_write_vio.get_reader();
- int64_t avail = buf_reader->read_avail();
+ int64_t avail = buf_reader->read_avail();
if (towrite > avail) {
towrite = avail;
@@ -523,10 +523,10 @@ PrefetchTransform::handle_event(int event, void *edata)
int
PrefetchTransform::redirect(HTTPHdr *resp)
{
- HTTPHdr *req = NULL;
+ HTTPHdr *req = NULL;
int response_status = 0;
- char *req_url = NULL;
- char *redirect_url = NULL;
+ char *req_url = NULL;
+ char *redirect_url = NULL;
/* Check for responses validity. If the response is valid, determine the status of the response.
We need to find out if there was a redirection (301, 302, 303, 307).
@@ -541,7 +541,7 @@ PrefetchTransform::redirect(HTTPHdr *resp)
*/
if (resp->presence(MIME_PRESENCE_LOCATION)) {
int redirect_url_len = 0;
- const char *tmp_url = resp->value_get(MIME_FIELD_LOCATION, MIME_LEN_LOCATION, &redirect_url_len);
+ const char *tmp_url = resp->value_get(MIME_FIELD_LOCATION, MIME_LEN_LOCATION, &redirect_url_len);
redirect_url = (char *)alloca(redirect_url_len + 1);
ink_strlcpy(redirect_url, tmp_url, redirect_url_len + 1);
@@ -555,7 +555,7 @@ PrefetchTransform::redirect(HTTPHdr *resp)
if (IS_STATUS_REDIRECT(response_status)) {
if (redirect_url) {
- req = &m_sm->t_state.hdr_info.client_request;
+ req = &m_sm->t_state.hdr_info.client_request;
req_url = req->url_get()->string_get(NULL, NULL);
Debug("PrefetchTransform", "Received response status = %d\n", response_status);
@@ -614,7 +614,7 @@ PrefetchUrlEntry *
PrefetchTransform::hash_add(char *s)
{
uint32_t index = 0;
- int str_len = strlen(s);
+ int str_len = strlen(s);
if (normalize_url(s, &str_len) > 0)
Debug("PrefetchParserURLs", "Normalized URL: %s\n", s);
@@ -648,7 +648,7 @@ check_n_attach_prefetch_transform(HttpSM *sm, HTTPHdr *resp, bool from_cache)
Debug("PrefetchParser", "Checking response for request from %s\n", ats_ip_ntop(&client_ip, client_ipb, sizeof(client_ipb)));
unsigned int rec_depth = 0;
- HTTPHdr *request = &sm->t_state.hdr_info.client_request;
+ HTTPHdr *request = &sm->t_state.hdr_info.client_request;
if (IS_RECURSIVE_PREFETCH(client_ip)) {
rec_depth = request->value_get_int(PREFETCH_FIELD_RECURSION, PREFETCH_FIELD_LEN_RECURSION);
@@ -696,19 +696,19 @@ check_n_attach_prefetch_transform(HttpSM *sm, HTTPHdr *resp, bool from_cache)
if (prefetch_config->pre_parse_hook) {
TSPrefetchInfo info;
- HTTPHdr *req = &sm->t_state.hdr_info.client_request;
- info.request_buf = reinterpret_cast<TSMBuffer>(req);
- info.request_loc = reinterpret_cast<TSMLoc>(req->m_http);
+ HTTPHdr *req = &sm->t_state.hdr_info.client_request;
+ info.request_buf = reinterpret_cast<TSMBuffer>(req);
+ info.request_loc = reinterpret_cast<TSMLoc>(req->m_http);
info.response_buf = reinterpret_cast<TSMBuffer>(resp);
info.response_loc = reinterpret_cast<TSMLoc>(resp->m_http);
ats_ip_copy(ats_ip_sa_cast(&info.client_ip), &client_ip);
- info.embedded_url = 0;
+ info.embedded_url = 0;
info.present_in_cache = from_cache;
ink_zero(info.url_blast);
ink_zero(info.url_response_blast);
- info.object_buf = 0;
+ info.object_buf = 0;
info.object_buf_reader = 0;
info.object_buf_status = TS_PREFETCH_OBJ_BUF_NOT_NEEDED;
@@ -731,8 +731,8 @@ check_n_attach_prefetch_transform(HttpSM *sm, HTTPHdr *resp, bool from_cache)
static int
PrefetchPlugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
- HttpSM *sm = (HttpSM *)edata;
- HTTPHdr *resp = 0;
+ HttpSM *sm = (HttpSM *)edata;
+ HTTPHdr *resp = 0;
bool from_cache = false;
switch (event) {
@@ -745,7 +745,7 @@ PrefetchPlugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
if (status == TS_CACHE_LOOKUP_HIT_FRESH) {
Debug("PrefetchPlugin", "Cached object is fresh\n");
- resp = sm->t_state.cache_info.object_read->response_get();
+ resp = sm->t_state.cache_info.object_read->response_get();
from_cache = true;
} else {
Debug("PrefetchPlugin", "Cache lookup did not succeed\n");
@@ -782,7 +782,7 @@ PrefetchProcessor::start()
// we need to create the config and register all config callbacks
// first.
prefetch_reconfig_mutex = new_ProxyMutex();
- prefetch_config = new PrefetchConfiguration;
+ prefetch_config = new PrefetchConfiguration;
RecRegisterConfigUpdateCb("proxy.config.prefetch.prefetch_enabled", prefetch_config_cb, NULL);
RecRegisterConfigUpdateCb("proxy.config.http.server_port", prefetch_config_cb, NULL);
RecRegisterConfigUpdateCb("proxy.config.prefetch.child_port", prefetch_config_cb, NULL);
@@ -800,7 +800,7 @@ PrefetchProcessor::start()
prefetch_config->readConfiguration();
if (prefetch_config->prefetch_enabled) {
- PREFETCH_FIELD_RECURSION = "@InkPrefetch";
+ PREFETCH_FIELD_RECURSION = "@InkPrefetch";
PREFETCH_FIELD_LEN_RECURSION = strlen(PREFETCH_FIELD_RECURSION);
// hdrtoken_wks_to_length(PREFETCH_FIELD_RECURSION);
@@ -863,7 +863,7 @@ BlasterUrlList::handleEvent(int event, void *data)
}
entry->blaster_link = list_head; // will be reversed before sending
- list_head = entry;
+ list_head = entry;
cur_len += entry->len;
if (cur_len >= mtu || timeout == 0) {
@@ -913,8 +913,8 @@ PrefetchUrlBlaster::writeBuffer(MIOBuffer *buf)
PrefetchUrlEntry *next = url_head->blaster_link;
url_head->blaster_link = entry;
- entry = url_head;
- url_head = next;
+ entry = url_head;
+ url_head = next;
}
url_head = entry;
@@ -936,7 +936,7 @@ PrefetchUrlBlaster::udpUrlBlaster(int event, void *data)
case SIMPLE_EVENT_EVENTS_START: {
SET_HANDLER((EventHandler)(&PrefetchUrlBlaster::udpUrlBlaster));
- MIOBuffer *buf = new_MIOBuffer();
+ MIOBuffer *buf = new_MIOBuffer();
IOBufferReader *reader = buf->alloc_reader();
int udp_hdr_len = (TS_PREFETCH_TCP_BLAST == blast.type) ? 0 : PRELOAD_UDP_HEADER_LEN;
@@ -1035,7 +1035,7 @@ PrefetchBlaster::init(PrefetchUrlEntry *entry, HTTPHdr *req_hdr, PrefetchTransfo
delete_auth = true;
else {
const char *host_end = host_start + host_len - 1;
- int cmp_len = p_trans->domain_end - p_trans->domain_start + 1;
+ int cmp_len = p_trans->domain_end - p_trans->domain_start + 1;
if (cmp_len <= 0 || host_len < cmp_len ||
(host_len > cmp_len && host_start[host_len - cmp_len - 1] != '.') || // nbc.com != cnbc.com
@@ -1067,10 +1067,10 @@ PrefetchBlaster::init(PrefetchUrlEntry *entry, HTTPHdr *req_hdr, PrefetchTransfo
DUMP_HEADER("PrefetchBlasterHdrs", request, (int64_t)0, "Request Header from Prefetch Blaster");
- url_ent = entry->assign(); // refcount
+ url_ent = entry->assign(); // refcount
transform = p_trans->assign();
- buf = new_MIOBuffer();
+ buf = new_MIOBuffer();
reader = buf->alloc_reader();
SET_HANDLER((EventHandler)(&PrefetchBlaster::handleEvent));
@@ -1120,7 +1120,7 @@ isCookieUnique(HTTPHdr *req, const char *move_cookie, int move_cookie_len)
if ((a_raw = (const char *)memchr(move_cookie, '=', move_cookie_len)) != NULL) {
int tmp_len = (int)(a_raw - move_cookie) + 1;
if (tmp_len < move_cookie_len) {
- equalsign = true;
+ equalsign = true;
move_cookie_len = tmp_len;
}
}
@@ -1133,7 +1133,7 @@ isCookieUnique(HTTPHdr *req, const char *move_cookie, int move_cookie_len)
HttpCompat::parse_tok_list(&a_param_list, 0, a_raw, a_raw_len, ';');
for (a_param = a_param_list.head; a_param; a_param = a_param->next) {
- iter_cookie = a_param->str;
+ iter_cookie = a_param->str;
iter_cookie_len = a_param->len;
if (equalsign) {
@@ -1171,8 +1171,8 @@ void
PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const char *domain_start, const char *domain_end,
const char *thost_start, int thost_len, bool no_dot)
{
- bool add_cookies = true;
- bool existing_req_cookies = request->valid() && request->presence(MIME_PRESENCE_COOKIE);
+ bool add_cookies = true;
+ bool existing_req_cookies = request->valid() && request->presence(MIME_PRESENCE_COOKIE);
bool existing_resp_cookies = resp_hdr->valid() && resp_hdr->presence(MIME_PRESENCE_SET_COOKIE);
bool default_domain_match;
const char *host_start;
@@ -1234,7 +1234,7 @@ PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const
// the value for one Set-Cookie header
s_cookie = resp_hdr->field_find(MIME_FIELD_SET_COOKIE, MIME_LEN_SET_COOKIE);
for (; s_cookie; s_cookie = s_cookie->m_next_dup) {
- a_raw = s_cookie->value_get(&a_raw_len);
+ a_raw = s_cookie->value_get(&a_raw_len);
MIMEField *new_cookie = NULL;
StrList a_param_list;
Str *a_param;
@@ -1246,7 +1246,7 @@ PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const
domain_match = default_domain_match;
HttpCompat::parse_tok_list(&a_param_list, 0, a_raw, a_raw_len, ';');
for (a_param = a_param_list.head; a_param; a_param = a_param->next) {
- move_cookie = a_param->str;
+ move_cookie = a_param->str;
move_cookie_len = a_param->len;
cookie_debug("Field", move_cookie, move_cookie_len);
@@ -1260,8 +1260,8 @@ PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const
if (move_cookie_len > 7 && strncasecmp(move_cookie, "domain=", 7) == 0) {
// the Set-cookie header specify the domain name
const char *cookie_domain_start = move_cookie + 7;
- int cookie_domain_len = move_cookie_len - 7;
- const char *cookie_domain_end = (const char *)(move_cookie + move_cookie_len - 1);
+ int cookie_domain_len = move_cookie_len - 7;
+ const char *cookie_domain_end = (const char *)(move_cookie + move_cookie_len - 1);
if (*cookie_domain_start == '"') {
// domain=".amazon.com" style
@@ -1302,8 +1302,8 @@ PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const
continue;
} else if (move_cookie_len > 5 && strncasecmp(move_cookie, "path=", 5) == 0) {
const char *cookie_path_start = move_cookie + 5;
- int cookie_path_len = move_cookie_len - 5;
- const char *cookie_path_end = (const char *)(move_cookie + move_cookie_len - 1);
+ int cookie_path_len = move_cookie_len - 5;
+ const char *cookie_path_end = (const char *)(move_cookie + move_cookie_len - 1);
if (cookie_path_len <= 0)
goto Lnotmatch;
@@ -1382,7 +1382,7 @@ PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const
for (; o_cookie; o_cookie = o_cookie->m_next_dup) {
MIMEField *n_cookie = NULL;
- a_raw = o_cookie->value_get(&a_raw_len);
+ a_raw = o_cookie->value_get(&a_raw_len);
if (a_raw != NULL && a_raw_len > 0) {
StrList a_param_list;
Str *a_param;
@@ -1390,14 +1390,14 @@ PrefetchBlaster::handleCookieHeaders(HTTPHdr *req_hdr, HTTPHdr *resp_hdr, const
HttpCompat::parse_tok_list(&a_param_list, 0, a_raw, a_raw_len, ';');
for (a_param = a_param_list.head; a_param; a_param = a_param->next) {
- iter_cookie = a_param->str;
+ iter_cookie = a_param->str;
iter_cookie_len = a_param->len;
if (isCookieUnique(request, iter_cookie, iter_cookie_len)) {
// this is a unique cookie attribute, ready to add
if (n_cookie == NULL) {
n_cookie = request->field_create();
- f_move = true;
+ f_move = true;
} else
f_move = false;
@@ -1514,7 +1514,7 @@ static int
copy_header(MIOBuffer *buf, HTTPHdr *hdr, const char *hdr_tail)
{
// copy the http header into to the buffer
- int64_t done = 0;
+ int64_t done = 0;
int64_t offset = 0;
while (!done) {
@@ -1673,10 +1673,10 @@ PrefetchBlaster::blastObject(int event, void *data)
TSPrefetchInfo info;
memset(&info, 0, sizeof(info));
- info.embedded_url = url_ent->url;
+ info.embedded_url = url_ent->url;
info.object_buf_status = url_ent->object_buf_status;
- info.object_buf = TSIOBufferCreate();
+ info.object_buf = TSIOBufferCreate();
info.object_buf_reader = TSIOBufferReaderAlloc(info.object_buf);
((MIOBuffer *)info.object_buf)->write(reader);
@@ -1755,29 +1755,29 @@ PrefetchBlaster::invokeBlaster()
int ret = (cache_http_info && !prefetch_config->push_cached_objects) ? TS_PREFETCH_DISCONTINUE : TS_PREFETCH_CONTINUE;
TSPrefetchBlastData url_blast = prefetch_config->default_url_blast;
- data_blast = prefetch_config->default_data_blast;
+ data_blast = prefetch_config->default_data_blast;
if (prefetch_config->embedded_url_hook) {
TSPrefetchInfo info;
- info.request_buf = reinterpret_cast<TSMBuffer>(request);
- info.request_loc = reinterpret_cast<TSMLoc>(request->m_http);
+ info.request_buf = reinterpret_cast<TSMBuffer>(request);
+ info.request_loc = reinterpret_cast<TSMLoc>(request->m_http);
info.response_buf = 0;
info.response_loc = 0;
- info.object_buf = 0;
+ info.object_buf = 0;
info.object_buf_reader = 0;
info.object_buf_status = TS_PREFETCH_OBJ_BUF_NOT_NEEDED;
ats_ip_copy(ats_ip_sa_cast(&info.client_ip), &url_ent->child_ip);
- info.embedded_url = url_ent->url;
- info.present_in_cache = (cache_http_info != NULL);
- info.url_blast = url_blast;
+ info.embedded_url = url_ent->url;
+ info.present_in_cache = (cache_http_info != NULL);
+ info.url_blast = url_blast;
info.url_response_blast = data_blast;
ret = (*prefetch_config->embedded_url_hook)(TS_PREFETCH_EMBEDDED_URL_HOOK, &info);
- url_blast = info.url_blast;
+ url_blast = info.url_blast;
data_blast = info.url_response_blast;
url_ent->object_buf_status = info.object_buf_status;
@@ -1799,7 +1799,7 @@ PrefetchBlaster::invokeBlaster()
// objects
if (prefetch_config->max_recursion > 0 && serverVC) {
serverVC->do_io_close();
- serverVC = NULL;
+ serverVC = NULL;
cache_http_info = 0;
}
@@ -1820,12 +1820,12 @@ PrefetchBlaster::initCacheLookupConfig()
{
// The look up parameters are intialized in the same as it is done
// in HttpSM::init(). Any changes there should come in here.
- HttpConfigParams *http_config_params = HttpConfig::acquire();
- cache_lookup_config.cache_global_user_agent_header = http_config_params->oride.global_user_agent_header ? true : false;
+ HttpConfigParams *http_config_params = HttpConfig::acquire();
+ cache_lookup_config.cache_global_user_agent_header = http_config_params->oride.global_user_agent_header ? true : false;
cache_lookup_config.cache_enable_default_vary_headers = http_config_params->cache_enable_default_vary_headers ? true : false;
- cache_lookup_config.cache_vary_default_text = http_config_params->cache_vary_default_text;
- cache_lookup_config.cache_vary_default_images = http_config_params->cache_vary_default_images;
- cache_lookup_config.cache_vary_default_other = http_config_params->cache_vary_default_other;
+ cache_lookup_config.cache_vary_default_text = http_config_params->cache_vary_default_text;
+ cache_lookup_config.cache_vary_default_images = http_config_params->cache_vary_default_images;
+ cache_lookup_config.cache_vary_default_other = http_config_params->cache_vary_default_other;
HttpConfig::release(http_config_params);
}
@@ -1865,7 +1865,7 @@ PrefetchConfiguration::readConfiguration()
int fd = -1;
local_http_server_port = stuffer_port = 0;
- prefetch_enabled = REC_ConfigReadInteger("proxy.config.prefetch.prefetch_enabled");
+ prefetch_enabled = REC_ConfigReadInteger("proxy.config.prefetch.prefetch_enabled");
if (prefetch_enabled <= 0) {
prefetch_enabled = 0;
return 0;
@@ -1953,7 +1953,7 @@ PrefetchConfiguration::readHtmlTags(int fd, html_tag **ptags, html_tag **pattrs)
while (((ret = read(fd, &c, 1)) == 1) && (c != '\n'))
if (len < 511)
buf[len++] = c;
- buf[len] = 0;
+ buf[len] = 0;
if (ret <= 0)
end_of_file = 1;
@@ -1961,11 +1961,11 @@ PrefetchConfiguration::readHtmlTags(int fd, html_tag **ptags, html_tag **pattrs)
// coverity[secure_coding]
if ((num = sscanf(buf, " html_tag %63s %63s %63s %63s", tag, attr, attr_tag, attr_attr)) >= 2) {
Debug("Prefetch", "Read html_tag: %s %s\n", tag, attr);
- tags[ntags].tag = ats_strdup(tag);
+ tags[ntags].tag = ats_strdup(tag);
tags[ntags].attr = ats_strdup(attr);
if (num >= 4) {
if (!attrs_exist)
- attrs_exist = true;
+ attrs_exist = true;
attrs[ntags].tag = ats_strdup(attr_tag);
attrs[ntags].tag = ats_strdup(attr_attr);
}
@@ -1978,9 +1978,9 @@ PrefetchConfiguration::readHtmlTags(int fd, html_tag **ptags, html_tag **pattrs)
memcpy(xtags, &tags[0], ntags * sizeof(tags[0]));
// the following two are always added
- xtags[ntags].tag = "base";
- xtags[ntags].attr = "href";
- xtags[ntags + 1].tag = "meta";
+ xtags[ntags].tag = "base";
+ xtags[ntags].attr = "href";
+ xtags[ntags + 1].tag = "meta";
xtags[ntags + 1].attr = "content";
xtags[ntags + 2].tag = xtags[ntags + 2].attr = NULL;
@@ -1994,7 +1994,7 @@ PrefetchConfiguration::readHtmlTags(int fd, html_tag **ptags, html_tag **pattrs)
return;
}
- *ptags = NULL;
+ *ptags = NULL;
*pattrs = NULL;
}
@@ -2026,7 +2026,7 @@ KeepAliveConnTable::init()
arr = new conn_elem[CONN_ARR_SIZE];
for (int i = 0; i < CONN_ARR_SIZE; i++) {
- arr[i].conn = 0;
+ arr[i].conn = 0;
arr[i].mutex = new_ProxyMutex();
}
@@ -2085,13 +2085,13 @@ KeepAliveConn::init(IpEndpoint const &xip, MIOBuffer *xbuf, IOBufferReader *xrea
{
mutex = g_conn_table->arr[KeepAliveConnTable::ip_hash(xip)].mutex;
- ip = xip;
- buf = xbuf;
+ ip = xip;
+ buf = xbuf;
reader = xreader;
childVC = 0;
- vio = 0;
- next = 0;
+ vio = 0;
+ next = 0;
read_buf = new_MIOBuffer(); // we should give minimum size possible
@@ -2116,7 +2116,7 @@ KeepAliveConn::free()
if (read_buf)
free_MIOBuffer(read_buf);
- KeepAliveConn *prev = 0;
+ KeepAliveConn *prev = 0;
KeepAliveConn **head = &g_conn_table->arr[KeepAliveConnTable::ip_hash(ip)].conn;
KeepAliveConn *conn = *head;
diff --git a/proxy/Prefetch.h b/proxy/Prefetch.h
index 5eb136c..91d9b06 100644
--- a/proxy/Prefetch.h
+++ b/proxy/Prefetch.h
@@ -219,10 +219,10 @@ public:
init(TSPrefetchBlastData const &bdata = UDP_BLAST_DATA, int tout = 0, int xmtu = INT_MAX)
{
SET_HANDLER((int (BlasterUrlList::*)(int, void *))(&BlasterUrlList::handleEvent));
- mutex = new_ProxyMutex();
- blast = bdata;
+ mutex = new_ProxyMutex();
+ blast = bdata;
timeout = tout;
- mtu = xmtu;
+ mtu = xmtu;
}
void free();
@@ -270,7 +270,7 @@ PrefetchUrlBlaster::init(PrefetchUrlEntry *list_head, TSPrefetchBlastData const
mutex = new_ProxyMutex();
url_head = list_head;
- blast = u_bd;
+ blast = u_bd;
SCOPED_MUTEX_LOCK(lock, mutex, this_ethread());
@@ -283,7 +283,7 @@ BlasterUrlList::invokeUrlBlaster()
PrefetchUrlBlaster *u_blaster = prefetchUrlBlasterAllocator.alloc();
u_blaster->init(list_head, blast);
list_head = NULL;
- cur_len = 0;
+ cur_len = 0;
}
class PrefetchBlaster : public Continuation
@@ -411,7 +411,7 @@ public:
mutex = g_conn_table->arr[KeepAliveConnTable::ip_hash(xip)].mutex;
ats_ip_copy(&ip, &xip);
- buf = xbuf;
+ buf = xbuf;
reader = xreader;
SET_HANDLER(&KeepAliveLockHandler::handleEvent);
diff --git a/proxy/ProtocolProbeSessionAccept.cc b/proxy/ProtocolProbeSessionAccept.cc
index f73a051..c6a35f5 100644
--- a/proxy/ProtocolProbeSessionAccept.cc
+++ b/proxy/ProtocolProbeSessionAccept.cc
@@ -42,7 +42,7 @@ proto_is_http2(IOBufferReader *reader)
char *end;
ptrdiff_t nbytes;
- end = reader->memcpy(buf, sizeof(buf), 0 /* offset */);
+ end = reader->memcpy(buf, sizeof(buf), 0 /* offset */);
nbytes = end - buf;
// Client must send at least 4 bytes to get a reasonable match.
@@ -55,7 +55,7 @@ proto_is_http2(IOBufferReader *reader)
}
struct ProtocolProbeTrampoline : public Continuation, public ProtocolProbeSessionAcceptEnums {
- static const size_t minimum_read_size = 1;
+ static const size_t minimum_read_size = 1;
static const unsigned buffer_size_index = CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX;
IOBufferReader *reader;
@@ -63,7 +63,7 @@ struct ProtocolProbeTrampoline : public Continuation, public ProtocolProbeSessio
IOBufferReader *reader)
: Continuation(mutex), probeParent(probe)
{
- this->iobuf = buffer ? buffer : new_MIOBuffer(buffer_size_index);
+ this->iobuf = buffer ? buffer : new_MIOBuffer(buffer_size_index);
this->reader = reader ? reader : iobuf->alloc_reader(); // reader must be allocated only on a new MIOBuffer.
SET_HANDLER(&ProtocolProbeTrampoline::ioCompletionEvent);
}
@@ -75,7 +75,7 @@ struct ProtocolProbeTrampoline : public Continuation, public ProtocolProbeSessio
NetVConnection *netvc;
ProtoGroupKey key = N_PROTO_GROUPS; // use this as an invalid value.
- vio = static_cast<VIO *>(edata);
+ vio = static_cast<VIO *>(edata);
netvc = static_cast<NetVConnection *>(vio->vc_server);
switch (event) {
@@ -142,7 +142,7 @@ ProtocolProbeSessionAccept::mainEvent(int event, void *data)
ink_assert(data);
VIO *vio;
- NetVConnection *netvc = (NetVConnection *)data;
+ NetVConnection *netvc = (NetVConnection *)data;
ProtocolProbeTrampoline *probe = new ProtocolProbeTrampoline(this, netvc->mutex, NULL, NULL);
// XXX we need to apply accept inactivity timeout here ...
diff --git a/proxy/ProxyClientSession.cc b/proxy/ProxyClientSession.cc
index 57bd5ff..a19d80d 100644
--- a/proxy/ProxyClientSession.cc
+++ b/proxy/ProxyClientSession.cc
@@ -83,22 +83,22 @@ ProxyClientSession::state_api_callout(int event, void * /* data ATS_UNUSED */)
if (likely(is_valid_hook(this->api_hookid))) {
if (this->api_current == NULL && this->api_scope == API_HOOK_SCOPE_GLOBAL) {
this->api_current = http_global_hooks->get(this->api_hookid);
- this->api_scope = API_HOOK_SCOPE_LOCAL;
+ this->api_scope = API_HOOK_SCOPE_LOCAL;
}
if (this->api_current == NULL && this->api_scope == API_HOOK_SCOPE_LOCAL) {
this->api_current = ssn_hook_get(this->api_hookid);
- this->api_scope = API_HOOK_SCOPE_NONE;
+ this->api_scope = API_HOOK_SCOPE_NONE;
}
if (this->api_current) {
bool plugin_lock = false;
- APIHook *hook = this->api_current;
+ APIHook *hook = this->api_current;
Ptr<ProxyMutex> plugin_mutex;
if (hook->m_cont->mutex) {
plugin_mutex = hook->m_cont->mutex;
- plugin_lock = MUTEX_TAKE_TRY_LOCK(hook->m_cont->mutex, mutex->thread_holding);
+ plugin_lock = MUTEX_TAKE_TRY_LOCK(hook->m_cont->mutex, mutex->thread_holding);
if (!plugin_lock) {
SET_HANDLER(&ProxyClientSession::state_api_callout);
mutex->thread_holding->schedule_in(this, HRTIME_MSECONDS(10));
@@ -137,8 +137,8 @@ ProxyClientSession::do_api_callout(TSHttpHookID id)
{
ink_assert(id == TS_HTTP_SSN_START_HOOK || id == TS_HTTP_SSN_CLOSE_HOOK);
- this->api_hookid = id;
- this->api_scope = API_HOOK_SCOPE_GLOBAL;
+ this->api_hookid = id;
+ this->api_scope = API_HOOK_SCOPE_GLOBAL;
this->api_current = NULL;
if (this->hooks_on && this->has_hooks()) {
@@ -156,8 +156,8 @@ ProxyClientSession::handle_api_return(int event)
SET_HANDLER(&ProxyClientSession::state_api_callout);
- this->api_hookid = TS_HTTP_LAST_HOOK;
- this->api_scope = API_HOOK_SCOPE_NONE;
+ this->api_hookid = TS_HTTP_LAST_HOOK;
+ this->api_scope = API_HOOK_SCOPE_NONE;
this->api_current = NULL;
switch (hookid) {
diff --git a/proxy/ProxyClientSession.h b/proxy/ProxyClientSession.h
index 2deae04..efa2da1 100644
--- a/proxy/ProxyClientSession.h
+++ b/proxy/ProxyClientSession.h
@@ -61,7 +61,7 @@ public:
}
virtual NetVConnection *get_netvc() const = 0;
- virtual void release_netvc() = 0;
+ virtual void release_netvc() = 0;
APIHook *
ssn_hook_get(TSHttpHookID id) const
diff --git a/proxy/ProxyClientTransaction.cc b/proxy/ProxyClientTransaction.cc
index f33f712..15857f7 100644
--- a/proxy/ProxyClientTransaction.cc
+++ b/proxy/ProxyClientTransaction.cc
@@ -50,7 +50,7 @@ ProxyClientTransaction::new_transaction()
PluginIdentity *pi = dynamic_cast<PluginIdentity *>(this->get_netvc());
if (pi) {
current_reader->plugin_tag = pi->getPluginTag();
- current_reader->plugin_id = pi->getPluginId();
+ current_reader->plugin_id = pi->getPluginId();
} else {
const char *protocol_str = this->get_protocol_string();
// We don't set the plugin_tag for http, though in future we should probably log http as protocol
@@ -88,7 +88,7 @@ ProxyClientTransaction::attach_server_session(HttpServerSession *ssession, bool
Action *
ProxyClientTransaction::adjust_thread(Continuation *cont, int event, void *data)
{
- NetVConnection *vc = this->get_netvc();
+ NetVConnection *vc = this->get_netvc();
EThread *this_thread = this_ethread();
if (vc && vc->thread != this_thread) {
if (vc->thread->is_event_type(ET_NET) || vc->thread->is_event_type(SSLNetProcessor::ET_SSL)) {
diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyClientTransaction.h
index f2bbcb9..f692f59 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyClientTransaction.h
@@ -43,9 +43,9 @@ public:
return (parent) ? parent->get_netvc() : NULL;
}
- virtual void set_active_timeout(ink_hrtime timeout_in) = 0;
+ virtual void set_active_timeout(ink_hrtime timeout_in) = 0;
virtual void set_inactivity_timeout(ink_hrtime timeout_in) = 0;
- virtual void cancel_inactivity_timeout() = 0;
+ virtual void cancel_inactivity_timeout() = 0;
virtual void attach_server_session(HttpServerSession *ssession, bool transaction_done = true);
@@ -189,7 +189,7 @@ public:
virtual void
set_parent(ProxyClientSession *new_parent)
{
- parent = new_parent;
+ parent = new_parent;
host_res_style = parent->host_res_style;
}
virtual void
diff --git a/proxy/RegressionSM.cc b/proxy/RegressionSM.cc
index 2c2d5a5..f273bc5 100644
--- a/proxy/RegressionSM.cc
+++ b/proxy/RegressionSM.cc
@@ -117,14 +117,14 @@ r_sequential(RegressionTest *t, RegressionSM *sm, ...)
RegressionSM *new_sm = new RegressionSM(t);
va_list ap;
va_start(ap, sm);
- new_sm->par = false;
- new_sm->rep = false;
- new_sm->ichild = 0;
+ new_sm->par = false;
+ new_sm->rep = false;
+ new_sm->ichild = 0;
new_sm->nchildren = 0;
- new_sm->nwaiting = 0;
+ new_sm->nwaiting = 0;
while (0 != sm) {
new_sm->children(new_sm->nchildren++) = sm;
- sm = va_arg(ap, RegressionSM *);
+ sm = va_arg(ap, RegressionSM *);
}
new_sm->n = new_sm->nchildren;
va_end(ap);
@@ -135,13 +135,13 @@ RegressionSM *
r_sequential(RegressionTest *t, int an, RegressionSM *sm)
{
RegressionSM *new_sm = new RegressionSM(t);
- new_sm->par = false;
- new_sm->rep = true;
- new_sm->ichild = 0;
- new_sm->nchildren = 1;
- new_sm->children(0) = sm;
- new_sm->nwaiting = 0;
- new_sm->n = an;
+ new_sm->par = false;
+ new_sm->rep = true;
+ new_sm->ichild = 0;
+ new_sm->nchildren = 1;
+ new_sm->children(0) = sm;
+ new_sm->nwaiting = 0;
+ new_sm->n = an;
return new_sm;
}
@@ -151,14 +151,14 @@ r_parallel(RegressionTest *t, RegressionSM *sm, ...)
RegressionSM *new_sm = new RegressionSM(t);
va_list ap;
va_start(ap, sm);
- new_sm->par = true;
- new_sm->rep = false;
- new_sm->ichild = 0;
+ new_sm->par = true;
+ new_sm->rep = false;
+ new_sm->ichild = 0;
new_sm->nchildren = 0;
- new_sm->nwaiting = 0;
+ new_sm->nwaiting = 0;
while (sm) {
new_sm->children(new_sm->nchildren++) = sm;
- sm = va_arg(ap, RegressionSM *);
+ sm = va_arg(ap, RegressionSM *);
}
new_sm->n = new_sm->nchildren;
va_end(ap);
@@ -169,13 +169,13 @@ RegressionSM *
r_parallel(RegressionTest *t, int an, RegressionSM *sm)
{
RegressionSM *new_sm = new RegressionSM(t);
- new_sm->par = true;
- new_sm->rep = true;
- new_sm->ichild = 0;
- new_sm->nchildren = 1;
- new_sm->children(0) = sm;
- new_sm->nwaiting = 0;
- new_sm->n = an;
+ new_sm->par = true;
+ new_sm->rep = true;
+ new_sm->ichild = 0;
+ new_sm->nchildren = 1;
+ new_sm->children(0) = sm;
+ new_sm->nwaiting = 0;
+ new_sm->n = an;
return new_sm;
}
@@ -219,19 +219,19 @@ Lretry:
RegressionSM::RegressionSM(const RegressionSM &ao)
{
RegressionSM &o = *(RegressionSM *)&ao;
- t = o.t;
- status = o.status;
- pstatus = o.pstatus;
- parent = &o;
- nwaiting = o.nwaiting;
- nchildren = o.nchildren;
+ t = o.t;
+ status = o.status;
+ pstatus = o.pstatus;
+ parent = &o;
+ nwaiting = o.nwaiting;
+ nchildren = o.nchildren;
for (intptr_t i = 0; i < nchildren; i++)
- children(i) = o.children[i]->clone();
- n = o.n;
- ichild = o.ichild;
- par = o.par;
- rep = o.rep;
- pending_action = o.pending_action;
+ children(i) = o.children[i]->clone();
+ n = o.n;
+ ichild = o.ichild;
+ par = o.par;
+ rep = o.rep;
+ pending_action = o.pending_action;
ink_assert(status == REGRESSION_TEST_INPROGRESS);
ink_assert(nwaiting == 0);
ink_assert(ichild == 0);
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index 43af4ed..181a4fc 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -71,7 +71,7 @@ init_reverse_proxy()
{
ink_assert(rewrite_table == NULL);
reconfig_mutex = new_ProxyMutex();
- rewrite_table = new UrlRewrite();
+ rewrite_table = new UrlRewrite();
if (!rewrite_table->is_valid()) {
Warning("Can not load the remap table, exiting out!");
diff --git a/proxy/Show.h b/proxy/Show.h
index af3f298..1cc12eb 100644
--- a/proxy/Show.h
+++ b/proxy/Show.h
@@ -59,14 +59,14 @@ public:
if (needed >= avail) {
ptrdiff_t bufsz = ebuf - start;
- ptrdiff_t used = buf - start;
+ ptrdiff_t used = buf - start;
Debug("cache_inspector", "needed %d bytes, reallocating to %d bytes", (int)needed, (int)bufsz + (int)needed);
bufsz += ROUNDUP(needed, ats_pagesize());
start = (char *)ats_realloc(start, bufsz);
- ebuf = start + bufsz;
- buf = start + used;
+ ebuf = start + bufsz;
+ buf = start + used;
avail = ebuf - buf;
needed = vsnprintf(buf, avail, s, aap);
@@ -149,11 +149,11 @@ public:
{
size_t sz = ats_pagesize();
- mutex = c->mutex;
+ mutex = c->mutex;
action = c;
- buf = (char *)ats_malloc(sz);
- start = buf;
- ebuf = buf + sz;
+ buf = (char *)ats_malloc(sz);
+ start = buf;
+ ebuf = buf + sz;
}
~ShowCont()
diff --git a/proxy/SocksProxy.cc b/proxy/SocksProxy.cc
index 091c1cd..b6f41c8 100644
--- a/proxy/SocksProxy.cc
+++ b/proxy/SocksProxy.cc
@@ -102,8 +102,8 @@ ClassAllocator<SocksProxy> socksProxyAllocator("socksProxyAllocator");
void
SocksProxy::init(NetVConnection *netVC)
{
- mutex = new_ProxyMutex();
- buf = new_MIOBuffer();
+ mutex = new_ProxyMutex();
+ buf = new_MIOBuffer();
reader = buf->alloc_reader();
SCOPED_MUTEX_LOCK(lock, mutex, this_ethread());
@@ -205,7 +205,7 @@ SocksProxy::mainEvent(int event, void *data)
i++;
if (p[i] == 0) {
- port_ptr = &p[2];
+ port_ptr = &p[2];
clientVC->socks_addr.type = SOCKS_ATYPE_IPV4;
reader->consume(i + 1);
// n_consume = i+1;
@@ -219,7 +219,7 @@ SocksProxy::mainEvent(int event, void *data)
if (state == SOCKS_ACCEPT) {
if (n_read_avail >= 2 + p[1]) {
auth_handler = &socks5ServerAuthHandler;
- ret = EVENT_DONE;
+ ret = EVENT_DONE;
}
} else {
ink_assert(state == AUTH_DONE);
@@ -243,9 +243,9 @@ SocksProxy::mainEvent(int event, void *data)
}
if (n_read_avail >= req_len) {
- port_ptr = &p[req_len - 2];
+ port_ptr = &p[req_len - 2];
clientVC->socks_addr.type = p[3];
- auth_handler = NULL;
+ auth_handler = NULL;
reader->consume(req_len);
ret = EVENT_DONE;
}
@@ -287,7 +287,7 @@ SocksProxy::mainEvent(int event, void *data)
} else {
int port = port_ptr[0] * 256 + port_ptr[1];
- version = p[0];
+ version = p[0];
if (port == netProcessor.socks_conf_stuff->http_port && p[1] == SOCKS_CONNECT) {
/* disable further reads */
@@ -314,7 +314,7 @@ SocksProxy::mainEvent(int event, void *data)
memcpy(&ip, &p[4], 4);
ats_ip4_set(&addr, ip, htons(port));
- state = SERVER_TUNNEL;
+ state = SERVER_TUNNEL;
clientVIO = vio; // used in the tunnel
// tunnel the connection.
@@ -351,7 +351,7 @@ SocksProxy::mainEvent(int event, void *data)
OneWayTunnel::SetupTwoWayTunnel(c_to_s, s_to_c);
- buf = 0; // do not free buf. Tunnel will do that.
+ buf = 0; // do not free buf. Tunnel will do that.
state = ALL_DONE;
break;
}
@@ -422,8 +422,8 @@ SocksProxy::sendResp(bool granted)
unsigned char *p = (unsigned char *)buf->start();
if (version == SOCKS4_VERSION) {
- p[0] = 0;
- p[1] = (granted) ? SOCKS4_REQ_GRANTED : SOCKS4_CONN_FAILED;
+ p[0] = 0;
+ p[1] = (granted) ? SOCKS4_REQ_GRANTED : SOCKS4_CONN_FAILED;
n_bytes = 8;
} else {
p[0] = SOCKS5_VERSION;
@@ -431,7 +431,7 @@ SocksProxy::sendResp(bool granted)
p[2] = 0;
p[3] = SOCKS_ATYPE_IPV4;
p[4] = p[5] = p[6] = p[7] = p[8] = p[9] = 0;
- n_bytes = 10;
+ n_bytes = 10;
}
buf->fill(n_bytes);
@@ -468,7 +468,7 @@ SocksProxy::setupHttpRequest(unsigned char *p)
// memcpy(a->addr.buf, &p[4], 16);
// dont think we will use "proper" IPv6 addr anytime soon.
// just use the last 4 octets as IPv4 addr:
- a->type = SOCKS_ATYPE_IPV4;
+ a->type = SOCKS_ATYPE_IPV4;
a->addr.ipv4[0] = p[16];
a->addr.ipv4[1] = p[17];
a->addr.ipv4[2] = p[18];
@@ -544,7 +544,7 @@ socks5ServerAuthHandler(int event, unsigned char *p, void (**h_ptr)(void))
Debug("SocksProxy", "No authentication is required\n");
p[0] = SOCKS5_VERSION;
p[1] = 0; // no authentication necessary
- ret = 2;
+ ret = 2;
// FALLTHROUGH
case SOCKS_AUTH_WRITE_COMPLETE:
// nothing to do
diff --git a/proxy/StatPages.cc b/proxy/StatPages.cc
index 5cd8c7c..83737c3 100644
--- a/proxy/StatPages.cc
+++ b/proxy/StatPages.cc
@@ -79,7 +79,7 @@ StatPagesManager::handle_http(Continuation *cont, HTTPHdr *header)
host_len = MAXDNAME;
memcpy(host, h, host_len);
host[host_len] = '\0';
- host_len = unescapifyStr(host);
+ host_len = unescapifyStr(host);
for (i = 0; i < n_stat_pages; i++) {
if (ptr_len_cmp(host, host_len, stat_pages[i].module) == 0) {
@@ -108,7 +108,7 @@ StatPagesManager::is_stat_page(URL *url)
memcpy(host, h, length);
host[length] = '\0';
- length = unescapifyStr(host);
+ length = unescapifyStr(host);
if ((host[0] == '{') && (host[length - 1] == '}'))
return true;
@@ -128,7 +128,7 @@ StatPagesManager::is_cache_inspector_page(URL *url)
memcpy(host, h, length);
host[length] = '\0';
- length = unescapifyStr(host);
+ length = unescapifyStr(host);
if (strncmp(host, "{cache}", length) == 0)
return true;
@@ -140,8 +140,8 @@ void
BaseStatPagesHandler::resp_clear()
{
ats_free(response);
- response = NULL;
- response_size = 0;
+ response = NULL;
+ response_size = 0;
response_length = 0;
}
diff --git a/proxy/StufferUdpReceiver.cc b/proxy/StufferUdpReceiver.cc
index b059106..0945f47 100644
--- a/proxy/StufferUdpReceiver.cc
+++ b/proxy/StufferUdpReceiver.cc
@@ -65,10 +65,10 @@ struct prefetch_udp_header {
#define PACKET_HDR_SIZE 20
/* statistics */
-static int number_of_packets_received = 0;
-static int number_of_packets_dropped = 0;
+static int number_of_packets_received = 0;
+static int number_of_packets_dropped = 0;
static int number_of_connections_to_ts = 0;
-static int number_of_timeouts = 0;
+static int number_of_timeouts = 0;
/* TODO: this functions should be a signal handler ... */
int
@@ -99,7 +99,7 @@ class StreamHashTable
public:
StreamHashTable(int sz)
{
- size = sz;
+ size = sz;
array = new Stream *[size];
memset(array, 0, size * sizeof(Stream *));
}
@@ -169,7 +169,7 @@ StreamHashTable::deleteStaleStreams(time_t now)
number_of_timeouts++;
Stream *temp = e;
- e = e->next;
+ e = e->next;
delete temp;
nremoved++;
} else
@@ -190,7 +190,7 @@ openTSConn()
struct sockaddr_in saddr;
saddr.sin_family = AF_INET;
- saddr.sin_port = htons(TSPORT);
+ saddr.sin_port = htons(TSPORT);
//#define INADDR_LOOPBACK ((209<<24)|(131<<16)|(52<<8)|48)
saddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
@@ -208,10 +208,10 @@ int
processPacket(const char *packet, int pkt_sz)
{
prefetch_udp_header *hdr = (prefetch_udp_header *)packet;
- uint32_t flags = ntohl(hdr->pkt);
+ uint32_t flags = ntohl(hdr->pkt);
int close_socket = 1;
- int sock_fd = -1;
+ int sock_fd = -1;
number_of_packets_received++;
@@ -221,7 +221,7 @@ processPacket(const char *packet, int pkt_sz)
(flags & RESPONSE_FLAG) ? flags & PKT_NUM_MASK : 0, ntohl(hdr->pkt)));
if (flags & RESPONSE_FLAG) {
- Stream *s = stream_hash_table->lookup(hdr);
+ Stream *s = stream_hash_table->lookup(hdr);
uint32_t pkt_no = flags & PKT_NUM_MASK;
if (pkt_no == 0 && !(flags & LAST_PKT_FLAG)) {
@@ -229,11 +229,11 @@ processPacket(const char *packet, int pkt_sz)
number_of_packets_dropped++;
return -1;
}
- s->hdr = *hdr;
- s->hdr.pkt = pkt_no;
+ s->hdr = *hdr;
+ s->hdr.pkt = pkt_no;
s->last_activity_time = time(NULL);
- s->next = 0;
- s->fd = openTSConn();
+ s->next = 0;
+ s->fd = openTSConn();
if (s->fd < 0) {
delete s;
return -1;
@@ -248,7 +248,7 @@ processPacket(const char *packet, int pkt_sz)
return -1;
s->last_activity_time = time(0);
- sock_fd = s->fd;
+ sock_fd = s->fd;
s->hdr.pkt++;
@@ -304,11 +304,11 @@ main(int argc, char *argv[])
stream_hash_table = new StreamHashTable(257);
char *pkt_buf = (char *)ats_malloc(UDP_BUF_SIZE);
- int fd = socket(PF_INET, SOCK_DGRAM, 0);
+ int fd = socket(PF_INET, SOCK_DGRAM, 0);
struct sockaddr_in saddr;
- saddr.sin_family = AF_INET;
- saddr.sin_port = htons(port);
+ saddr.sin_family = AF_INET;
+ saddr.sin_port = htons(port);
saddr.sin_addr.s_addr = INADDR_ANY;
if ((bind(fd, (struct sockaddr *)&saddr, sizeof(saddr))) < 0) {
diff --git a/proxy/TestClock.cc b/proxy/TestClock.cc
index 0df6a0b..fc3de2e 100644
--- a/proxy/TestClock.cc
+++ b/proxy/TestClock.cc
@@ -28,7 +28,7 @@ void
test()
{
ink_hrtime t = ink_get_hrtime();
- int i = 1000000;
+ int i = 1000000;
timespec ts;
while (i--) {
clock_gettime(CLOCK_REALTIME, &ts);
diff --git a/proxy/TestClusterHash.cc b/proxy/TestClusterHash.cc
index 8dd71c3..12cb9ac 100644
--- a/proxy/TestClusterHash.cc
+++ b/proxy/TestClusterHash.cc
@@ -49,15 +49,15 @@ test()
// the select the version
//
machineClusterHash = !!(version & 1);
- boundClusterHash = !!(version & 2);
- randClusterHash = !!(version & 4);
+ boundClusterHash = !!(version & 2);
+ randClusterHash = !!(version & 4);
// fabricate fake cluster
clusterProcessor.this_cluster = new Cluster;
- ClusterConfiguration *cc = new ClusterConfiguration;
- cc->n_machines = 1;
- cc->machines[0] = this_cluster_machine();
+ ClusterConfiguration *cc = new ClusterConfiguration;
+ cc->n_machines = 1;
+ cc->machines[0] = this_cluster_machine();
memset(cc->hash_table, 0, CLUSTER_HASH_TABLE_SIZE);
clusterProcessor.this_cluster->configurations.push(cc);
@@ -71,7 +71,7 @@ test()
for (i = 1; i < 32; i++) {
m = new ClusterMachine(*this_cluster_machine());
m->ip += i;
- t = ink_get_hrtime();
+ t = ink_get_hrtime();
cc = configuration_add_machine(c, m);
t2 = ink_get_hrtime();
@@ -79,7 +79,7 @@ test()
// Compute new distribution
//
high = 0;
- low = CLUSTER_HASH_TABLE_SIZE + 1;
+ low = CLUSTER_HASH_TABLE_SIZE + 1;
for (j = 0; j < cc->n_machines; j++)
n[j] = 0;
for (j = 0; j < CLUSTER_HASH_TABLE_SIZE; j++) {
diff --git a/proxy/TestDNS.cc b/proxy/TestDNS.cc
index 4313f7e..7dd9e39 100644
--- a/proxy/TestDNS.cc
+++ b/proxy/TestDNS.cc
@@ -49,10 +49,10 @@ class TestDnsStateMachine;
//
//////////////////////////////////////////////////////////////////////////////
-unsigned g_host_ip = 0;
-char *in_file_name = "test_dns.in";
-char *out_file_name = "test_dns.out";
-char *rate_file_name = "rates.out";
+unsigned g_host_ip = 0;
+char *in_file_name = "test_dns.in";
+char *out_file_name = "test_dns.out";
+char *rate_file_name = "rates.out";
char *rate_misc_file_name = "rates.misc.out";
ofstream fout;
ofstream fout_rate, fout_rate_misc;
@@ -145,7 +145,7 @@ TestDnsStateMachine::processEvent(int event, void *data)
ink_assert(!"Error - host has no value\n");
if (data) {
HostEnt *ent = (HostEnt *)data;
- g_host_ip = ((struct in_addr *)ent->h_addr_list[0])->s_addr;
+ g_host_ip = ((struct in_addr *)ent->h_addr_list[0])->s_addr;
// cout << " dns lookup is done <" << g_host_ip << ">" << endl;
// cout << "<" << host << "> <" << g_host_ip << ">\n";
fout << "<" << host << "> <" << g_host_ip << ">\n";
@@ -155,7 +155,7 @@ TestDnsStateMachine::processEvent(int event, void *data)
fout << "<" << host << "> <>\n";
}
fout.flush();
- rvalue = VC_EVENT_DONE;
+ rvalue = VC_EVENT_DONE;
m_state = 99; // Some Undefined state value
complete();
delete this;
@@ -179,9 +179,9 @@ complete()
ink_hrtime now;
state_machines_finished++;
if (!(state_machines_finished % measurement_interval)) {
- now = Thread::get_hrtime();
- cumul_throughput = state_machines_finished * 1.0 * HRTIME_SECOND / (now - start_time);
- throughput = measurement_interval * 1.0 * HRTIME_SECOND / (now - last_measurement_time);
+ now = Thread::get_hrtime();
+ cumul_throughput = state_machines_finished * 1.0 * HRTIME_SECOND / (now - start_time);
+ throughput = measurement_interval * 1.0 * HRTIME_SECOND / (now - last_measurement_time);
last_measurement_time = now;
// cout << state_machines_finished << ": " <<
// "Cumul. Thrput " << cumul_throughput <<
@@ -234,12 +234,12 @@ test()
fout.open(out_file_name);
fout_rate.open(rate_file_name);
fout_rate_misc.open(rate_misc_file_name);
- i = 0;
- state_machines_created = N_STATE_MACHINES;
+ i = 0;
+ state_machines_created = N_STATE_MACHINES;
state_machines_finished = 0;
- measurement_interval = MEASUREMENT_INTERVAL;
- start_time = Thread::get_hrtime();
- last_measurement_time = Thread::get_hrtime();
+ measurement_interval = MEASUREMENT_INTERVAL;
+ start_time = Thread::get_hrtime();
+ last_measurement_time = Thread::get_hrtime();
while ((fscanf(fin, "%s", host) != EOF) && (i < state_machines_created)) {
test_dns_state_machine = new TestDnsStateMachine(host, sizeof(host));
test_dns_state_machine->handleEvent();
diff --git a/proxy/TestPreProc.cc b/proxy/TestPreProc.cc
index c2de406..c956ab0 100644
--- a/proxy/TestPreProc.cc
+++ b/proxy/TestPreProc.cc
@@ -36,7 +36,7 @@ void dumpMessage(const HttpMessage &msg);
void testPreProc();
/* some global requests */
-char *request1 = "GET http://trafficserver.apache.org HTTP/1.1\r\n\
+char *request1 = "GET http://trafficserver.apache.org HTTP/1.1\r\n\
Accept: text/*, text/html, text/html; level=1\r\n\
Accept-Charset: iso-8859-5, unicode-1-1;q=0.8\r\n\r\n";
char *response1 = "HTTP/1.1 200\r\n\r\n";
@@ -46,7 +46,7 @@ char *response1 = "HTTP/1.1 200\r\n\r\n";
RequestInput::RequestInput(const char *str, IOBuffer *cb) : m_sp(0), m_len(0), m_cb(cb)
{
m_len = strlen(str);
- m_sp = request1;
+ m_sp = request1;
return;
}
@@ -67,7 +67,7 @@ RequestInput::run()
{
unsigned maxBytes = 0;
- char *buff = m_cb->getWrite(&maxBytes);
+ char *buff = m_cb->getWrite(&maxBytes);
unsigned writeBytes = (m_len < maxBytes) ? m_len : maxBytes;
writeBytes = ink_strlcpy(buff, m_sp, maxBytes);
diff --git a/proxy/TestProxy.cc b/proxy/TestProxy.cc
index a8bce9e..bff558a 100644
--- a/proxy/TestProxy.cc
+++ b/proxy/TestProxy.cc
@@ -112,9 +112,9 @@ struct TestProxy : Continuation {
printf("TestProxy startEvent error %d %X\n", event, (unsigned int)vio->vc_server);
return done();
}
- inVIO = vio;
- vc = (NetVConnection *)vio->vc_server;
- int res = 0;
+ inVIO = vio;
+ vc = (NetVConnection *)vio->vc_server;
+ int res = 0;
char *thost = NULL;
if ((res = gets(vio))) {
if (res < 0) {
@@ -127,28 +127,28 @@ struct TestProxy : Continuation {
s[res - 1] = 0;
// printf("got [%s]\n",s);
if (s[4] == '/') {
- url = s + 5;
- url_end = strchr(url, ' ');
+ url = s + 5;
+ url_end = strchr(url, ' ');
*url_end = 0;
SET_HANDLER(fileEvent);
diskProcessor.open_vc(this, url, O_RDONLY);
return EVENT_DONE;
} else
- thost = s + 11; // GET http
- url = strchr(thost, '/'); // done before portStr stompage */
- temp = strchr(thost, ' ');
+ thost = s + 11; // GET http
+ url = strchr(thost, '/'); // done before portStr stompage */
+ temp = strchr(thost, ' ');
ink_assert(temp - thost < 1024);
ink_strlcpy(url_str, thost, sizeof(url_str));
if (!url)
return done();
char *portStr = strchr(thost, ':');
- *url = 0;
+ *url = 0;
if (portStr == NULL) {
port = 80;
ink_strlcpy(host, thost, sizeof(host));
} else {
*portStr = '\0'; /* close off the hostname */
- port = atoi(portStr + 1);
+ port = atoi(portStr + 1);
ink_strlcpy(host, thost, sizeof(host));
*portStr = ':';
}
@@ -169,7 +169,7 @@ struct TestProxy : Continuation {
if (event == CLUSTER_EVENT_OPEN) {
if (!data)
return done();
- remote = (VConnection *)data;
+ remote = (VConnection *)data;
clusterOutVIO = remote->do_io(VIO::WRITE, this, INT64_MAX, inbuf);
ink_assert(clusterOutVIO);
SET_HANDLER(tunnelEvent);
@@ -238,10 +238,10 @@ struct TestProxy : Continuation {
} else if (event == CACHE_EVENT_LOOKUP_FAILED) {
cout << "Getting the object from origin server\n";
SET_HANDLER(cacheCreateCacheFileEvent);
- objinfo = new CacheObjInfo;
- request_header = new HttpHeader;
+ objinfo = new CacheObjInfo;
+ request_header = new HttpHeader;
request_header->m_url = *url_struct;
- objinfo->request = *request_header;
+ objinfo->request = *request_header;
cacheProcessor.open_write(this, objinfo, false, CACHE_UNKNOWN_SIZE);
return EVENT_DONE;
} else {
@@ -306,7 +306,7 @@ struct TestProxy : Continuation {
vconnection_vector[0] = vc;
vconnection_vector[1] = cachefile;
{
- int n = cachefile ? 2 : 1;
+ int n = cachefile ? 2 : 1;
cachefile = 0;
new OneWayMultiTunnel(remote, vconnection_vector, n, this, TUNNEL_TILL_DONE, true, true, true);
}
@@ -363,7 +363,7 @@ struct TestProxy : Continuation {
return EVENT_CONT;
}
remote = 0;
- vc = 0;
+ vc = 0;
if (event != VC_EVENT_EOS) {
printf("TestProxy sendEvent error %d\n", event);
return done();
@@ -412,7 +412,7 @@ redirect_test(Machine *m, void *data, int len)
(void)m;
(void)len;
MIOBuffer *buf = new_MIOBuffer();
- TestProxy *c = new TestProxy(buf);
+ TestProxy *c = new TestProxy(buf);
SET_CONTINUATION_HANDLER(c, clusterEvent);
clusterProcessor.connect(c, *(ClusterVCToken *)data);
}
diff --git a/proxy/TestSimpleProxy.cc b/proxy/TestSimpleProxy.cc
index 412df16..cc73a00 100644
--- a/proxy/TestSimpleProxy.cc
+++ b/proxy/TestSimpleProxy.cc
@@ -59,10 +59,10 @@ struct TestProxy : Continuation {
return done();
}
if (vio->buffer.mbuf->gets(s, 255)) {
- host = s + 11;
- url = strchr(host, '/');
+ host = s + 11;
+ url = strchr(host, '/');
url_end = strchr(url, ' ');
- *url = 0;
+ *url = 0;
dnsProcessor.gethostbyname(host, this);
*url = '/';
SET_HANDLER(dnsEvent);
@@ -126,7 +126,7 @@ struct TestProxy : Continuation {
return done();
}
remote = 0;
- vc = 0;
+ vc = 0;
printf("sucessful proxy of %s\n", url);
return done();
}
diff --git a/proxy/TimeTrace.h b/proxy/TimeTrace.h
index e6445c2..40bc064 100644
--- a/proxy/TimeTrace.h
+++ b/proxy/TimeTrace.h
@@ -68,7 +68,7 @@ extern int cluster_send_events;
#ifdef ENABLE_TIME_TRACE
#define LOG_EVENT_TIME(_start_time, _time_dist, _time_cnt) \
do { \
- ink_hrtime now = ink_get_hrtime(); \
+ ink_hrtime now = ink_get_hrtime(); \
unsigned int bucket = (now - _start_time) / HRTIME_MSECONDS(10); \
if (bucket > TIME_DIST_BUCKETS) \
bucket = TIME_DIST_BUCKETS; \
diff --git a/proxy/Transform.cc b/proxy/Transform.cc
index 86dcb18..b258626 100644
--- a/proxy/Transform.cc
+++ b/proxy/Transform.cc
@@ -277,8 +277,8 @@ TransformTerminus::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
m_read_vio.buffer.writer_for(buf);
m_read_vio.op = VIO::READ;
m_read_vio.set_continuation(c);
- m_read_vio.nbytes = nbytes;
- m_read_vio.ndone = 0;
+ m_read_vio.nbytes = nbytes;
+ m_read_vio.ndone = 0;
m_read_vio.vc_server = this;
if (ink_atomic_increment((int *)&m_event_count, 1) < 0) {
@@ -302,8 +302,8 @@ TransformTerminus::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *
m_write_vio.buffer.reader_for(buf);
m_write_vio.op = VIO::WRITE;
m_write_vio.set_continuation(c);
- m_write_vio.nbytes = nbytes;
- m_write_vio.ndone = 0;
+ m_write_vio.nbytes = nbytes;
+ m_write_vio.ndone = 0;
m_write_vio.vc_server = this;
if (ink_atomic_increment((int *)&m_event_count, 1) < 0) {
@@ -329,7 +329,7 @@ TransformTerminus::do_io_close(int error)
INK_WRITE_MEMORY_BARRIER;
if (error != -1) {
- lerrno = error;
+ lerrno = error;
m_closed = TS_VC_CLOSE_ABORT;
} else {
m_closed = TS_VC_CLOSE_NORMAL;
@@ -415,7 +415,7 @@ TransformVConnection::~TransformVConnection()
m_terminus.m_read_vio.set_continuation(NULL);
m_terminus.m_write_vio.set_continuation(NULL);
m_terminus.mutex = NULL;
- this->mutex = NULL;
+ this->mutex = NULL;
}
/*-------------------------------------------------------------------------
@@ -495,7 +495,7 @@ TransformVConnection::reenable(VIO * /* vio ATS_UNUSED */)
uint64_t
TransformVConnection::backlog(uint64_t limit)
{
- uint64_t b = 0; // backlog
+ uint64_t b = 0; // backlog
VConnection *raw_vc = m_transform;
MIOBuffer *w;
while (raw_vc && raw_vc != &m_terminus) {
@@ -546,8 +546,8 @@ TransformControl::handle_event(int event, void * /* edata ATS_UNUSED */)
ink_assert(m_tvc != NULL);
m_write_buf = new_MIOBuffer();
- s = m_write_buf->end();
- e = m_write_buf->buf_end();
+ s = m_write_buf->end();
+ e = m_write_buf->buf_end();
memset(s, 'a', e - s);
m_write_buf->fill(e - s);
@@ -645,9 +645,9 @@ NullTransform::handle_event(int event, void *edata)
ink_assert(m_output_vc != NULL);
if (!m_output_vio) {
- m_output_buf = new_empty_MIOBuffer();
+ m_output_buf = new_empty_MIOBuffer();
m_output_reader = m_output_buf->alloc_reader();
- m_output_vio = m_output_vc->do_io_write(this, m_write_vio.nbytes, m_output_reader);
+ m_output_vio = m_output_vc->do_io_write(this, m_write_vio.nbytes, m_output_reader);
}
MUTEX_TRY_LOCK(trylock, m_write_vio.mutex, this_ethread());
@@ -789,9 +789,9 @@ RangeTransform::handle_event(int event, void *edata)
ink_assert(m_output_vc != NULL);
if (!m_output_vio) {
- m_output_buf = new_empty_MIOBuffer();
+ m_output_buf = new_empty_MIOBuffer();
m_output_reader = m_output_buf->alloc_reader();
- m_output_vio = m_output_vc->do_io_write(this, m_output_cl, m_output_reader);
+ m_output_vio = m_output_vc->do_io_write(this, m_output_cl, m_output_reader);
change_response_header();
@@ -837,10 +837,10 @@ RangeTransform::transform_to_range()
int64_t prev_end = 0;
int64_t *done_byte;
- end = &m_ranges[m_current_range]._end;
+ end = &m_ranges[m_current_range]._end;
done_byte = &m_ranges[m_current_range]._done_byte;
- start = &m_ranges[m_current_range]._start;
- avail = reader->read_avail();
+ start = &m_ranges[m_current_range]._start;
+ avail = reader->read_avail();
while (true) {
if (*done_byte < (*start - 1)) {
@@ -895,9 +895,9 @@ RangeTransform::transform_to_range()
return;
}
- end = &m_ranges[m_current_range]._end;
+ end = &m_ranges[m_current_range]._end;
done_byte = &m_ranges[m_current_range]._done_byte;
- start = &m_ranges[m_current_range]._start;
+ start = &m_ranges[m_current_range]._start;
// if this is a good Range
if (*end != -1) {
@@ -936,9 +936,9 @@ RangeTransform::transform_to_range()
* these two need be changed at the same time
*/
-static char bound[] = "RANGE_SEPARATOR";
+static char bound[] = "RANGE_SEPARATOR";
static char range_type[] = "multipart/byteranges; boundary=RANGE_SEPARATOR";
-static char cont_type[] = "Content-type: ";
+static char cont_type[] = "Content-type: ";
static char cont_range[] = "Content-range: bytes ";
void
diff --git a/proxy/UDPAPIClientTest.cc b/proxy/UDPAPIClientTest.cc
index ff41f21..3c6e556 100644
--- a/proxy/UDPAPIClientTest.cc
+++ b/proxy/UDPAPIClientTest.cc
@@ -39,10 +39,10 @@ UDPClientTestInit()
unsigned long ip;
TSMutex readMutexp;
- ip = inet_addr("209.131.48.79");
+ ip = inet_addr("209.131.48.79");
readMutexp = TSMutexCreate();
- cont = TSContCreate(&UDPClient_handle_callbacks, readMutexp);
- fp = fopen("UDPAPI.dbg", "a+");
+ cont = TSContCreate(&UDPClient_handle_callbacks, readMutexp);
+ fp = fopen("UDPAPI.dbg", "a+");
fprintf(fp, "UDPClient Init called\n");
fclose(fp);
INKUDPBind(cont, ip, 9999);
@@ -55,7 +55,7 @@ UDPClient_handle_callbacks(TSCont cont, TSEvent event, void *e)
INKUDPPacket packet;
TSIOBufferBlock recvBuffBlock;
unsigned int destIp = inet_addr("209.131.48.79");
- int destPort = 1813;
+ int destPort = 1813;
INKUDPConn UDPConn;
TSIOBufferReader reader;
TSIOBuffer iobuffer;
@@ -81,7 +81,7 @@ UDPClient_handle_callbacks(TSCont cont, TSEvent event, void *e)
recvBuffBlock = INKUDPPacketBufferBlockGet(packet);
iobuffer = TSIOBufferCreate();
- reader = TSIOBufferReaderAlloc(iobuffer);
+ reader = TSIOBufferReaderAlloc(iobuffer);
TSIOBufferAppend(iobuffer, recvBuffBlock);
buf = TSIOBufferBlockReadStart(recvBuffBlock, reader, &avail);
diff --git a/proxy/UDPAPITest.cc b/proxy/UDPAPITest.cc
index 53818b9..6c2bc3f 100644
--- a/proxy/UDPAPITest.cc
+++ b/proxy/UDPAPITest.cc
@@ -38,9 +38,9 @@ UDPTestInit()
TSMutex readMutexp;
unsigned long ip;
- ip = inet_addr("209.131.48.79");
+ ip = inet_addr("209.131.48.79");
readMutexp = TSMutexCreate();
- cont = TSContCreate(&handle_callbacks, readMutexp);
+ cont = TSContCreate(&handle_callbacks, readMutexp);
// INKUDPBind(cont, INADDR_ANY,1813);
INKUDPBind(cont, ip, 1813);
}
@@ -84,11 +84,11 @@ handle_callbacks(TSCont cont, TSEvent event, void *e)
case TS_NET_EVENT_DATAGRAM_READ_READY:
fprintf(fp, "read ready event called\n");
packetQueue = (INKUDPacketQueue)e;
- total_len = 0;
+ total_len = 0;
while ((packet = INKUDPPacketGet(packetQueue)) != NULL) {
recvBuffBlock = INKUDPPacketBufferBlockGet(packet);
- iobuffer = TSIOBufferCreate();
- reader = TSIOBufferReaderAlloc(iobuffer);
+ iobuffer = TSIOBufferCreate();
+ reader = TSIOBufferReaderAlloc(iobuffer);
TSIOBufferAppend(iobuffer, recvBuffBlock);
buf = TSIOBufferBlockReadStart(recvBuffBlock, reader, &avail);
@@ -101,7 +101,7 @@ handle_callbacks(TSCont cont, TSEvent event, void *e)
total_len += avail;
}
- ip = INKUDPPacketFromAddressGet(packet);
+ ip = INKUDPPacketFromAddressGet(packet);
port = INKUDPPacketFromPortGet(packet);
fprintf(fp, "port = %d\n", port);
diff --git a/proxy/UnixCompletionUtil.h b/proxy/UnixCompletionUtil.h
index d805128..6990262 100644
--- a/proxy/UnixCompletionUtil.h
+++ b/proxy/UnixCompletionUtil.h
@@ -45,13 +45,13 @@ inline void
completionUtil::setThread(Event *e, EThread *t)
{
UDPIOEvent *u = (UDPIOEvent *)e;
- u->ethread = t;
+ u->ethread = t;
}
inline void
completionUtil::setContinuation(Event *e, Continuation *c)
{
UDPIOEvent *u = (UDPIOEvent *)e;
- *(Action *)u = c;
+ *(Action *)u = c;
}
inline void *
completionUtil::getHandle(Event *e)
diff --git a/proxy/api/ts/InkAPIPrivateIOCore.h b/proxy/api/ts/InkAPIPrivateIOCore.h
index 2eea5ee..24dff1f 100644
--- a/proxy/api/ts/InkAPIPrivateIOCore.h
+++ b/proxy/api/ts/InkAPIPrivateIOCore.h
@@ -36,7 +36,7 @@
enum INKContInternalMagic_t {
INKCONT_INTERN_MAGIC_ALIVE = 0x00009631,
- INKCONT_INTERN_MAGIC_DEAD = 0xDEAD9631,
+ INKCONT_INTERN_MAGIC_DEAD = 0xDEAD9631,
};
class INKContInternal : public DummyVConnection
diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h
index 360bed7..851d118 100644
--- a/proxy/api/ts/experimental.h
+++ b/proxy/api/ts/experimental.h
@@ -38,17 +38,17 @@ extern "C" {
typedef enum {
TS_FETCH_EVENT_EXT_HEAD_READY = -1,
- TS_FETCH_EVENT_EXT_HEAD_DONE = -2,
+ TS_FETCH_EVENT_EXT_HEAD_DONE = -2,
TS_FETCH_EVENT_EXT_BODY_READY = -3,
- TS_FETCH_EVENT_EXT_BODY_DONE = -4,
+ TS_FETCH_EVENT_EXT_BODY_DONE = -4,
} TSFetchEventExt;
typedef enum {
- TS_FETCH_FLAGS_NONE = 0, // do nothing
- TS_FETCH_FLAGS_STREAM = 1 << 1, // enable stream IO
- TS_FETCH_FLAGS_DECHUNK = 1 << 2, // dechunk body content
- TS_FETCH_FLAGS_NEWLOCK = 1 << 3, // allocate new lock for fetch sm
- TS_FETCH_FLAGS_NOT_INTERNAL_REQUEST = 1 << 4 // Allow this fetch to be created as a non-internal request.
+ TS_FETCH_FLAGS_NONE = 0, // do nothing
+ TS_FETCH_FLAGS_STREAM = 1 << 1, // enable stream IO
+ TS_FETCH_FLAGS_DECHUNK = 1 << 2, // dechunk body content
+ TS_FETCH_FLAGS_NEWLOCK = 1 << 3, // allocate new lock for fetch sm
+ TS_FETCH_FLAGS_NOT_INTERNAL_REQUEST = 1 << 4 // Allow this fetch to be created as a non-internal request.
} TSFetchFlags;
typedef struct tsapi_fetchsm *TSFetchSM;
diff --git a/proxy/api/ts/remap.h b/proxy/api/ts/remap.h
index 22531ed..2ad2cc2 100644
--- a/proxy/api/ts/remap.h
+++ b/proxy/api/ts/remap.h
@@ -62,9 +62,9 @@ typedef struct _tm_remap_request_info {
/* This is the type returned by the TSRemapDoRemap() callback */
typedef enum {
- TSREMAP_NO_REMAP = 0, /* No remaping was done, continue with next in chain */
- TSREMAP_DID_REMAP = 1, /* Remapping was done, continue with next in chain */
- TSREMAP_NO_REMAP_STOP = 2, /* No remapping was done, and stop plugin chain evaluation */
+ TSREMAP_NO_REMAP = 0, /* No remaping was done, continue with next in chain */
+ TSREMAP_DID_REMAP = 1, /* Remapping was done, continue with next in chain */
+ TSREMAP_NO_REMAP_STOP = 2, /* No remapping was done, and stop plugin chain evaluation */
TSREMAP_DID_REMAP_STOP = 3, /* Remapping was done, but stop plugin chain evaluation */
/* In the future, the following error codes can also be used:
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index a55408a..4084dee 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -2033,7 +2033,7 @@ extern int diags_on_for_plugins;
enum {
TS_LOG_MODE_ADD_TIMESTAMP = 1,
TS_LOG_MODE_DO_NOT_RENAME = 2,
- TS_LOG_MODE_INVALID_FLAG = 4,
+ TS_LOG_MODE_INVALID_FLAG = 4,
};
/**
diff --git a/proxy/congest/Congestion.cc b/proxy/congest/Congestion.cc
index a40f6a0..28dc13f 100644
--- a/proxy/congest/Congestion.cc
+++ b/proxy/congest/Congestion.cc
@@ -44,19 +44,19 @@ static const matcher_tags congest_dest_tags = {"dest_host", "dest_domain", "dest
/* default congestion control values */
-char *DEFAULT_error_page = NULL;
+char *DEFAULT_error_page = NULL;
int DEFAULT_max_connection_failures = 5;
-int DEFAULT_fail_window = 120;
-int DEFAULT_proxy_retry_interval = 10;
-int DEFAULT_client_wait_interval = 300;
-int DEFAULT_wait_interval_alpha = 30;
-int DEFAULT_live_os_conn_timeout = 60;
-int DEFAULT_live_os_conn_retries = 2;
-int DEFAULT_dead_os_conn_timeout = 15;
-int DEFAULT_dead_os_conn_retries = 1;
-int DEFAULT_max_connection = -1;
+int DEFAULT_fail_window = 120;
+int DEFAULT_proxy_retry_interval = 10;
+int DEFAULT_client_wait_interval = 300;
+int DEFAULT_wait_interval_alpha = 30;
+int DEFAULT_live_os_conn_timeout = 60;
+int DEFAULT_live_os_conn_retries = 2;
+int DEFAULT_dead_os_conn_timeout = 15;
+int DEFAULT_dead_os_conn_retries = 1;
+int DEFAULT_max_connection = -1;
char *DEFAULT_congestion_scheme_str = NULL;
-int DEFAULT_congestion_scheme = PER_IP;
+int DEFAULT_congestion_scheme = PER_IP;
/* congestion control limits */
#define CONG_RULE_MAX_max_connection_failures (1 << (sizeof(cong_hist_t) * 8))
@@ -79,50 +79,50 @@ int CongestionMatcherTable::configid = 0;
static CongestionMatcherTable *CongestionMatcher = NULL;
static ConfigUpdateHandler<CongestionMatcherTable> *CongestionControlUpdate;
-int congestionControlEnabled = 0;
+int congestionControlEnabled = 0;
int congestionControlLocalTime = 0;
CongestionControlRecord::CongestionControlRecord(const CongestionControlRecord &rec)
{
- prefix = ats_strdup(rec.prefix);
- prefix_len = rec.prefix_len;
- port = rec.port;
- congestion_scheme = rec.congestion_scheme;
- error_page = ats_strdup(rec.error_page);
+ prefix = ats_strdup(rec.prefix);
+ prefix_len = rec.prefix_len;
+ port = rec.port;
+ congestion_scheme = rec.congestion_scheme;
+ error_page = ats_strdup(rec.error_page);
max_connection_failures = rec.max_connection_failures;
- fail_window = rec.fail_window;
- proxy_retry_interval = rec.proxy_retry_interval;
- client_wait_interval = rec.client_wait_interval;
- wait_interval_alpha = rec.wait_interval_alpha;
- live_os_conn_timeout = rec.live_os_conn_timeout;
- live_os_conn_retries = rec.live_os_conn_retries;
- dead_os_conn_timeout = rec.dead_os_conn_timeout;
- dead_os_conn_retries = rec.dead_os_conn_retries;
- max_connection = rec.max_connection;
- pRecord = NULL;
- ref_count = 1;
- line_num = rec.line_num;
- rank = 0;
+ fail_window = rec.fail_window;
+ proxy_retry_interval = rec.proxy_retry_interval;
+ client_wait_interval = rec.client_wait_interval;
+ wait_interval_alpha = rec.wait_interval_alpha;
+ live_os_conn_timeout = rec.live_os_conn_timeout;
+ live_os_conn_retries = rec.live_os_conn_retries;
+ dead_os_conn_timeout = rec.dead_os_conn_timeout;
+ dead_os_conn_retries = rec.dead_os_conn_retries;
+ max_connection = rec.max_connection;
+ pRecord = NULL;
+ ref_count = 1;
+ line_num = rec.line_num;
+ rank = 0;
}
void
CongestionControlRecord::setdefault()
{
cleanup();
- congestion_scheme = DEFAULT_congestion_scheme;
- port = 0;
- prefix_len = 0;
- rank = 0;
+ congestion_scheme = DEFAULT_congestion_scheme;
+ port = 0;
+ prefix_len = 0;
+ rank = 0;
max_connection_failures = DEFAULT_max_connection_failures;
- fail_window = DEFAULT_fail_window;
- proxy_retry_interval = DEFAULT_proxy_retry_interval;
- client_wait_interval = DEFAULT_client_wait_interval;
- wait_interval_alpha = DEFAULT_wait_interval_alpha;
- live_os_conn_timeout = DEFAULT_live_os_conn_timeout;
- live_os_conn_retries = DEFAULT_live_os_conn_retries;
- dead_os_conn_timeout = DEFAULT_dead_os_conn_timeout;
- dead_os_conn_retries = DEFAULT_dead_os_conn_retries;
- max_connection = DEFAULT_max_connection;
+ fail_window = DEFAULT_fail_window;
+ proxy_retry_interval = DEFAULT_proxy_retry_interval;
+ client_wait_interval = DEFAULT_client_wait_interval;
+ wait_interval_alpha = DEFAULT_wait_interval_alpha;
+ live_os_conn_timeout = DEFAULT_live_os_conn_timeout;
+ live_os_conn_retries = DEFAULT_live_os_conn_retries;
+ dead_os_conn_timeout = DEFAULT_dead_os_conn_timeout;
+ dead_os_conn_retries = DEFAULT_dead_os_conn_retries;
+ max_connection = DEFAULT_max_connection;
}
config_parse_error
@@ -175,7 +175,7 @@ CongestionControlRecord::Init(matcher_line *line_info)
for (int i = 0; i < MATCHER_MAX_TOKENS; i++) {
label = line_info->line[0][i];
- val = line_info->line[1][i];
+ val = line_info->line[1][i];
if (label == NULL) {
continue;
@@ -211,7 +211,7 @@ CongestionControlRecord::Init(matcher_line *line_info)
} else if (strcasecmp(label, "error_page") == 0) {
error_page = ats_strdup(val);
} else if (strcasecmp(label, "prefix") == 0) {
- prefix = ats_strdup(val);
+ prefix = ats_strdup(val);
prefix_len = strlen(prefix);
rank += 1;
// prefix will be used in the ControlBase
@@ -435,7 +435,7 @@ make_key(char *hostname, int len, sockaddr const *ip, CongestionControlRecord *r
ink_code_incr_md5_update(&ctx, reinterpret_cast<char const *>(ats_ip_addr8_cast(ip)), ats_ip_addr_size(ip));
if (record->port != 0) {
unsigned short p = record->port;
- p = htons(p);
+ p = htons(p);
ink_code_incr_md5_update(&ctx, (char *)&p, 2);
}
if (record->prefix != NULL) {
@@ -459,7 +459,7 @@ make_key(char *hostname, int len, sockaddr const *ip, char *prefix, int prelen,
ink_code_incr_md5_update(&ctx, reinterpret_cast<char const *>(ats_ip_addr8_cast(ip)), ats_ip_addr_size(ip));
if (port != 0) {
unsigned short p = port;
- p = htons(p);
+ p = htons(p);
ink_code_incr_md5_update(&ctx, (char *)&p, 2);
}
if (prefix != NULL) {
@@ -479,23 +479,23 @@ FailHistory::init(int window)
bin_len = (window + CONG_HIST_ENTRIES) / CONG_HIST_ENTRIES;
if (bin_len <= 0)
bin_len = 1;
- length = bin_len * CONG_HIST_ENTRIES;
+ length = bin_len * CONG_HIST_ENTRIES;
for (int i = 0; i < CONG_HIST_ENTRIES; i++) {
bins[i] = 0;
}
last_event = 0;
- cur_index = 0;
- events = 0;
- start = 0;
+ cur_index = 0;
+ events = 0;
+ start = 0;
}
void
FailHistory::init_event(long t, int n)
{
last_event = t;
- cur_index = 0;
- events = n;
- bins[0] = n;
+ cur_index = 0;
+ events = n;
+ bins[0] = n;
for (int i = 1; i < CONG_HIST_ENTRIES; i++) {
bins[i] = 0;
}
@@ -625,15 +625,15 @@ CongestionEntry::sprint(char *buf, int buflen, int format)
{
char str_time[100] = " ";
char addrbuf[INET6_ADDRSTRLEN];
- int len = 0;
+ int len = 0;
ink_hrtime timestamp = 0;
char state;
if (pRecord->max_connection >= 0 && m_num_connections >= pRecord->max_connection) {
timestamp = ink_hrtime_to_sec(Thread::get_hrtime());
- state = 'M';
+ state = 'M';
} else {
timestamp = m_last_congested;
- state = (m_congested ? 'F' : ' ');
+ state = (m_congested ? 'F' : ' ');
}
len += snprintf(buf + len, buflen - len, "%" PRId64 "|%d|%s|%s", timestamp, pRecord->line_num, (m_hostname ? m_hostname : " "),
(ats_is_ip(&m_ip) ? ats_ip_ntop(&m_ip.sa, addrbuf, sizeof(addrbuf)) : " "));
diff --git a/proxy/congest/Congestion.h b/proxy/congest/Congestion.h
index 5bff72e..3507d10 100644
--- a/proxy/congest/Congestion.h
+++ b/proxy/congest/Congestion.h
@@ -158,7 +158,7 @@ CongestionControlRecord::cleanup()
pRecord->put();
pRecord = NULL;
}
- ats_free(prefix), prefix = NULL;
+ ats_free(prefix), prefix = NULL;
ats_free(error_page), error_page = NULL;
}
diff --git a/proxy/congest/CongestionDB.cc b/proxy/congest/CongestionDB.cc
index 62356d5..4abe1d2 100644
--- a/proxy/congest/CongestionDB.cc
+++ b/proxy/congest/CongestionDB.cc
@@ -98,7 +98,7 @@ inline void
Free_CongestionDBCont(CongestionDBCont *cont)
{
cont->m_action = NULL;
- cont->mutex = NULL;
+ cont->mutex = NULL;
CongestionDBContAllocator.free(cont);
}
@@ -173,9 +173,9 @@ CongestionDB::addRecord(uint64_t key, CongestionEntry *pEntry)
tmp->put();
} else {
CongestRequestParam *param = CongestRequestParamAllocator.alloc();
- param->m_op = CongestRequestParam::ADD_RECORD;
- param->m_key = key;
- param->m_pEntry = pEntry;
+ param->m_op = CongestRequestParam::ADD_RECORD;
+ param->m_key = key;
+ param->m_pEntry = pEntry;
ink_atomiclist_push(&todo_lists[part_num(key)], param);
}
}
@@ -198,8 +198,8 @@ CongestionDB::removeAllRecords()
}
} else {
CongestRequestParam *param = CongestRequestParamAllocator.alloc();
- param->m_op = CongestRequestParam::REMOVE_ALL_RECORDS;
- param->m_key = part;
+ param->m_op = CongestRequestParam::REMOVE_ALL_RECORDS;
+ param->m_key = part;
ink_atomiclist_push(&todo_lists[part], param);
}
}
@@ -218,8 +218,8 @@ CongestionDB::removeRecord(uint64_t key)
tmp->put();
} else {
CongestRequestParam *param = CongestRequestParamAllocator.alloc();
- param->m_op = CongestRequestParam::REMOVE_RECORD;
- param->m_key = key;
+ param->m_op = CongestRequestParam::REMOVE_RECORD;
+ param->m_key = key;
ink_atomiclist_push(&todo_lists[part_num(key)], param);
}
}
@@ -269,11 +269,11 @@ CongestionDB::RunTodoList(int buckId)
param->link.prev = NULL;
while (param->link.next) {
param->link.next->link.prev = param;
- param = param->link.next;
+ param = param->link.next;
};
while (param) {
process(buckId, param);
- cur = param;
+ cur = param;
param = param->link.prev;
Free_CongestRequestParam(cur);
}
@@ -285,7 +285,7 @@ CongestionDB::revalidateBucket(int buckId)
{
Iter it;
CongestionEntry *cur = NULL;
- cur = first_entry(buckId, &it);
+ cur = first_entry(buckId, &it);
while (cur != NULL) {
if (!cur->validate()) {
remove_entry(buckId, &it);
@@ -314,7 +314,7 @@ CongestionDBCont::GC(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
MUTEX_TRY_LOCK(lock, bucket_mutex, this_ethread());
if (lock.is_locked()) {
ink_hrtime now = Thread::get_hrtime();
- now = ink_hrtime_to_sec(now);
+ now = ink_hrtime_to_sec(now);
theCongestionDB->RunTodoList(CDBC_pid);
Iter it;
CongestionEntry *pEntry = theCongestionDB->first_entry(CDBC_pid, &it);
@@ -443,7 +443,7 @@ revalidateCongestionDB()
theCongestionDB->revalidateBucket(i);
} else {
CongestRequestParam *param = CongestRequestParamAllocator.alloc();
- param->m_op = CongestRequestParam::REVALIDATE_BUCKET;
+ param->m_op = CongestRequestParam::REVALIDATE_BUCKET;
ink_atomiclist_push(&theCongestionDB->todo_lists[i], param);
}
}
@@ -489,14 +489,14 @@ get_congest_entry(Continuation *cont, HttpRequestData *data, CongestionEntry **p
} else {
Debug("congestion_control", "get_congest_entry, trylock failed, schedule cont");
CongestionDBCont *Ccont = CongestionDBContAllocator.alloc();
- Ccont->m_action = cont;
- Ccont->mutex = cont->mutex;
- Ccont->CDBC_key = key;
- Ccont->CDBC_host = (char *)data->get_host();
+ Ccont->m_action = cont;
+ Ccont->mutex = cont->mutex;
+ Ccont->CDBC_key = key;
+ Ccont->CDBC_host = (char *)data->get_host();
ats_ip_copy(&Ccont->CDBC_ip.sa, data->get_ip());
p->get();
Ccont->CDBC_rule = p;
- Ccont->CDBC_ppE = ppEntry;
+ Ccont->CDBC_ppE = ppEntry;
SET_CONTINUATION_HANDLER(Ccont, &CongestionDBCont::get_congest_entry);
eventProcessor.schedule_in(Ccont, SCHEDULE_CONGEST_CONT_INTERVAL, ET_NET);
@@ -529,11 +529,11 @@ get_congest_list(Continuation *cont, MIOBuffer *buffer, int format)
} else {
/* we did not get the lock, schedule it */
CongestionDBCont *CCcont = CongestionDBContAllocator.alloc();
- CCcont->CDBC_pid = i;
- CCcont->CDBC_buf = buffer;
- CCcont->m_action = cont;
- CCcont->mutex = cont->mutex;
- CCcont->CDBC_lf = format;
+ CCcont->CDBC_pid = i;
+ CCcont->CDBC_buf = buffer;
+ CCcont->m_action = cont;
+ CCcont->mutex = cont->mutex;
+ CCcont->CDBC_lf = format;
SET_CONTINUATION_HANDLER(CCcont, &CongestionDBCont::get_congest_list);
eventProcessor.schedule_in(CCcont, SCHEDULE_CONGEST_CONT_INTERVAL, ET_NET);
return &CCcont->m_action;
@@ -589,9 +589,9 @@ remove_congested_entry(char *buf, MIOBuffer *out_buffer)
remove_congested_entry(key);
len = snprintf(msg, MSG_LEN, "key %" PRIu64 " removed\n", key);
} else if (strncasecmp(buf, "host=", 5) == 0) {
- char *p = buf + 5;
+ char *p = buf + 5;
char *prefix = strchr(p, '/');
- int prelen = 0;
+ int prelen = 0;
if (prefix) {
*prefix = '\0';
prefix++;
@@ -604,9 +604,9 @@ remove_congested_entry(char *buf, MIOBuffer *out_buffer)
IpEndpoint ip;
memset(&ip, 0, sizeof(ip));
- char *p = buf + 3;
+ char *p = buf + 3;
char *prefix = strchr(p, '/');
- int prelen = 0;
+ int prelen = 0;
if (prefix) {
*prefix = '\0';
prefix++;
diff --git a/proxy/congest/CongestionTest.cc b/proxy/congest/CongestionTest.cc
index 5c530ef..1ed6df9 100644
--- a/proxy/congest/CongestionTest.cc
+++ b/proxy/congest/CongestionTest.cc
@@ -204,11 +204,11 @@ struct CCFailHistoryTestCont : public Continuation {
pending_action(NULL)
{
SET_HANDLER(&CCFailHistoryTestCont::mainEvent);
- rule = new CongestionControlRecord;
- rule->fail_window = FAIL_WINDOW;
+ rule = new CongestionControlRecord;
+ rule->fail_window = FAIL_WINDOW;
rule->max_connection_failures = 10;
- rule->pRecord = new CongestionControlRecord(*rule);
- entry = new CongestionEntry("dummy_host", 0, rule->pRecord, 0);
+ rule->pRecord = new CongestionControlRecord(*rule);
+ entry = new CongestionEntry("dummy_host", 0, rule->pRecord, 0);
}
~CCFailHistoryTestCont()
@@ -408,10 +408,10 @@ CCCongestionDBTestCont::gen_CongestionEntry(sockaddr const *ip, int congested)
char hostname[INET6_ADDRSTRLEN];
uint64_t key;
ats_ip_ntop(ip, hostname, sizeof(hostname));
- key = make_key(hostname, strlen(hostname), ip, rule->pRecord);
+ key = make_key(hostname, strlen(hostname), ip, rule->pRecord);
CongestionEntry *ret = new CongestionEntry(hostname, ip, rule->pRecord, key);
- ret->m_congested = congested;
- ret->m_ref_count = 0;
+ ret->m_congested = congested;
+ ret->m_ref_count = 0;
return ret;
}
@@ -424,10 +424,10 @@ CCCongestionDBTestCont::init()
else
db->removeAllRecords();
if (!rule) {
- rule = new CongestionControlRecord;
- rule->fail_window = 300;
+ rule = new CongestionControlRecord;
+ rule->fail_window = 300;
rule->max_connection_failures = 10;
- rule->pRecord = new CongestionControlRecord(*rule);
+ rule->pRecord = new CongestionControlRecord(*rule);
}
}
diff --git a/proxy/congest/MT_hashtable.h b/proxy/congest/MT_hashtable.h
index 12cebb9..cee485b 100644
--- a/proxy/congest/MT_hashtable.h
+++ b/proxy/congest/MT_hashtable.h
@@ -81,11 +81,11 @@ template <class key_t, class data_t> class IMTHashTable
public:
IMTHashTable(int size, bool (*gc_func)(data_t) = NULL, void (*pre_gc_func)(void) = NULL)
{
- m_gc_func = gc_func;
+ m_gc_func = gc_func;
m_pre_gc_func = pre_gc_func;
- bucket_num = size;
- cur_size = 0;
- buckets = new HashTableEntry<key_t, data_t> *[bucket_num];
+ bucket_num = size;
+ cur_size = 0;
+ buckets = new HashTableEntry<key_t, data_t> *[bucket_num];
memset(buckets, 0, bucket_num * sizeof(HashTableEntry<key_t, data_t> *));
}
~IMTHashTable() { reset(); }
@@ -145,7 +145,7 @@ public:
if (m_pre_gc_func)
m_pre_gc_func();
for (int i = 0; i < bucket_num; i++) {
- HashTableEntry<key_t, data_t> *cur = buckets[i];
+ HashTableEntry<key_t, data_t> *cur = buckets[i];
HashTableEntry<key_t, data_t> *prev = NULL;
HashTableEntry<key_t, data_t> *next = NULL;
while (cur != NULL) {
@@ -173,19 +173,19 @@ public:
memset(new_buckets, 0, new_bucket_num * sizeof(HashTableEntry<key_t, data_t> *));
for (int i = 0; i < bucket_num; i++) {
- HashTableEntry<key_t, data_t> *cur = buckets[i];
+ HashTableEntry<key_t, data_t> *cur = buckets[i];
HashTableEntry<key_t, data_t> *next = NULL;
while (cur != NULL) {
- next = cur->next;
- int new_id = bucket_id(cur->key, new_bucket_num);
- cur->next = new_buckets[new_id];
+ next = cur->next;
+ int new_id = bucket_id(cur->key, new_bucket_num);
+ cur->next = new_buckets[new_id];
new_buckets[new_id] = cur;
- cur = next;
+ cur = next;
}
buckets[i] = NULL;
}
delete[] buckets;
- buckets = new_buckets;
+ buckets = new_buckets;
bucket_num = new_bucket_num;
}
@@ -219,17 +219,17 @@ IMTHashTable<key_t, data_t>::insert_entry(key_t key, data_t data)
return (data_t)0;
else {
data_t tmp = cur->data;
- cur->data = data;
+ cur->data = data;
// potential memory leak, need to check the return value by the caller
return tmp;
}
}
HashTableEntry<key_t, data_t> *newEntry = HashTableEntry<key_t, data_t>::alloc();
- newEntry->key = key;
+ newEntry->key = key;
newEntry->data = data;
newEntry->next = buckets[id];
- buckets[id] = newEntry;
+ buckets[id] = newEntry;
cur_size++;
if (cur_size / bucket_num > MT_HASHTABLE_MAX_CHAIN_AVG_LEN) {
GC();
@@ -243,20 +243,20 @@ template <class key_t, class data_t>
inline data_t
IMTHashTable<key_t, data_t>::remove_entry(key_t key)
{
- int id = bucket_id(key);
+ int id = bucket_id(key);
data_t ret = (data_t)0;
- HashTableEntry<key_t, data_t> *cur = buckets[id];
+ HashTableEntry<key_t, data_t> *cur = buckets[id];
HashTableEntry<key_t, data_t> *prev = NULL;
while (cur != NULL && cur->key != key) {
prev = cur;
- cur = cur->next;
+ cur = cur->next;
}
if (cur != NULL) {
if (prev != NULL)
prev->next = cur->next;
else
buckets[id] = cur->next;
- ret = cur->data;
+ ret = cur->data;
HashTableEntry<key_t, data_t>::free(cur);
cur_size--;
}
@@ -268,7 +268,7 @@ template <class key_t, class data_t>
inline data_t
IMTHashTable<key_t, data_t>::lookup_entry(key_t key)
{
- int id = bucket_id(key);
+ int id = bucket_id(key);
data_t ret = (data_t)0;
HashTableEntry<key_t, data_t> *cur = buckets[id];
while (cur != NULL && cur->key != key) {
@@ -285,7 +285,7 @@ inline data_t
IMTHashTable<key_t, data_t>::first_entry(int bucket_id, HashTableIteratorState<key_t, data_t> *s)
{
s->cur_buck = bucket_id;
- s->ppcur = &(buckets[bucket_id]);
+ s->ppcur = &(buckets[bucket_id]);
if (*(s->ppcur) != NULL)
return (*(s->ppcur))->data;
return (data_t)0;
@@ -319,7 +319,7 @@ IMTHashTable<key_t, data_t>::remove_entry(HashTableIteratorState<key_t, data_t>
data_t data = (data_t)0;
HashTableEntry<key_t, data_t> *pEntry = *(s->ppcur);
if (pEntry != NULL) {
- data = pEntry->data;
+ data = pEntry->data;
(*(s->ppcur)) = pEntry->next;
HashTableEntry<key_t, data_t>::free(pEntry);
cur_size--;
@@ -333,7 +333,7 @@ public:
MTHashTable(int size, bool (*gc_func)(data_t) = NULL, void (*pre_gc_func)(void) = NULL)
{
for (int i = 0; i < MT_HASHTABLE_PARTITIONS; i++) {
- locks[i] = new_ProxyMutex();
+ locks[i] = new_ProxyMutex();
hashTables[i] = new IMTHashTable<key_t, data_t>(size, gc_func, pre_gc_func);
// INIT_CHAIN_HEAD(&chain_heads[i]);
// last_GC_time[i] = 0;
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index 2a5d12a..2968b8b 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -187,17 +187,17 @@ http_init()
mime_init();
url_init();
- HTTP_METHOD_CONNECT = hdrtoken_string_to_wks("CONNECT");
- HTTP_METHOD_DELETE = hdrtoken_string_to_wks("DELETE");
- HTTP_METHOD_GET = hdrtoken_string_to_wks("GET");
- HTTP_METHOD_HEAD = hdrtoken_string_to_wks("HEAD");
+ HTTP_METHOD_CONNECT = hdrtoken_string_to_wks("CONNECT");
+ HTTP_METHOD_DELETE = hdrtoken_string_to_wks("DELETE");
+ HTTP_METHOD_GET = hdrtoken_string_to_wks("GET");
+ HTTP_METHOD_HEAD = hdrtoken_string_to_wks("HEAD");
HTTP_METHOD_ICP_QUERY = hdrtoken_string_to_wks("ICP_QUERY");
- HTTP_METHOD_OPTIONS = hdrtoken_string_to_wks("OPTIONS");
- HTTP_METHOD_POST = hdrtoken_string_to_wks("POST");
- HTTP_METHOD_PURGE = hdrtoken_string_to_wks("PURGE");
- HTTP_METHOD_PUT = hdrtoken_string_to_wks("PUT");
- HTTP_METHOD_TRACE = hdrtoken_string_to_wks("TRACE");
- HTTP_METHOD_PUSH = hdrtoken_string_to_wks("PUSH");
+ HTTP_METHOD_OPTIONS = hdrtoken_string_to_wks("OPTIONS");
+ HTTP_METHOD_POST = hdrtoken_string_to_wks("POST");
+ HTTP_METHOD_PURGE = hdrtoken_string_to_wks("PURGE");
+ HTTP_METHOD_PUT = hdrtoken_string_to_wks("PUT");
+ HTTP_METHOD_TRACE = hdrtoken_string_to_wks("TRACE");
+ HTTP_METHOD_PUSH = hdrtoken_string_to_wks("PUSH");
// HTTP methods index calculation. Don't forget to count them!
// Don't change the order of calculation! Each index has related bitmask (see http quick filter)
@@ -224,65 +224,65 @@ http_init()
HTTP_WKSIDX_PUSH = hdrtoken_wks_to_index(HTTP_METHOD_PUSH);
HTTP_WKSIDX_METHODS_CNT++;
- HTTP_LEN_CONNECT = hdrtoken_wks_to_length(HTTP_METHOD_CONNECT);
- HTTP_LEN_DELETE = hdrtoken_wks_to_length(HTTP_METHOD_DELETE);
- HTTP_LEN_GET = hdrtoken_wks_to_length(HTTP_METHOD_GET);
- HTTP_LEN_HEAD = hdrtoken_wks_to_length(HTTP_METHOD_HEAD);
+ HTTP_LEN_CONNECT = hdrtoken_wks_to_length(HTTP_METHOD_CONNECT);
+ HTTP_LEN_DELETE = hdrtoken_wks_to_length(HTTP_METHOD_DELETE);
+ HTTP_LEN_GET = hdrtoken_wks_to_length(HTTP_METHOD_GET);
+ HTTP_LEN_HEAD = hdrtoken_wks_to_length(HTTP_METHOD_HEAD);
HTTP_LEN_ICP_QUERY = hdrtoken_wks_to_length(HTTP_METHOD_ICP_QUERY);
- HTTP_LEN_OPTIONS = hdrtoken_wks_to_length(HTTP_METHOD_OPTIONS);
- HTTP_LEN_POST = hdrtoken_wks_to_length(HTTP_METHOD_POST);
- HTTP_LEN_PURGE = hdrtoken_wks_to_length(HTTP_METHOD_PURGE);
- HTTP_LEN_PUT = hdrtoken_wks_to_length(HTTP_METHOD_PUT);
- HTTP_LEN_TRACE = hdrtoken_wks_to_length(HTTP_METHOD_TRACE);
- HTTP_LEN_PUSH = hdrtoken_wks_to_length(HTTP_METHOD_PUSH);
-
- HTTP_VALUE_BYTES = hdrtoken_string_to_wks("bytes");
- HTTP_VALUE_CHUNKED = hdrtoken_string_to_wks("chunked");
- HTTP_VALUE_CLOSE = hdrtoken_string_to_wks("close");
- HTTP_VALUE_COMPRESS = hdrtoken_string_to_wks("compress");
- HTTP_VALUE_DEFLATE = hdrtoken_string_to_wks("deflate");
- HTTP_VALUE_GZIP = hdrtoken_string_to_wks("gzip");
- HTTP_VALUE_IDENTITY = hdrtoken_string_to_wks("identity");
- HTTP_VALUE_KEEP_ALIVE = hdrtoken_string_to_wks("keep-alive");
- HTTP_VALUE_MAX_AGE = hdrtoken_string_to_wks("max-age");
- HTTP_VALUE_MAX_STALE = hdrtoken_string_to_wks("max-stale");
- HTTP_VALUE_MIN_FRESH = hdrtoken_string_to_wks("min-fresh");
- HTTP_VALUE_MUST_REVALIDATE = hdrtoken_string_to_wks("must-revalidate");
- HTTP_VALUE_NONE = hdrtoken_string_to_wks("none");
- HTTP_VALUE_NO_CACHE = hdrtoken_string_to_wks("no-cache");
- HTTP_VALUE_NO_STORE = hdrtoken_string_to_wks("no-store");
- HTTP_VALUE_NO_TRANSFORM = hdrtoken_string_to_wks("no-transform");
- HTTP_VALUE_ONLY_IF_CACHED = hdrtoken_string_to_wks("only-if-cached");
- HTTP_VALUE_PRIVATE = hdrtoken_string_to_wks("private");
- HTTP_VALUE_PROXY_REVALIDATE = hdrtoken_string_to_wks("proxy-revalidate");
- HTTP_VALUE_PUBLIC = hdrtoken_string_to_wks("public");
- HTTP_VALUE_S_MAXAGE = hdrtoken_string_to_wks("s-maxage");
+ HTTP_LEN_OPTIONS = hdrtoken_wks_to_length(HTTP_METHOD_OPTIONS);
+ HTTP_LEN_POST = hdrtoken_wks_to_length(HTTP_METHOD_POST);
+ HTTP_LEN_PURGE = hdrtoken_wks_to_length(HTTP_METHOD_PURGE);
+ HTTP_LEN_PUT = hdrtoken_wks_to_length(HTTP_METHOD_PUT);
+ HTTP_LEN_TRACE = hdrtoken_wks_to_length(HTTP_METHOD_TRACE);
+ HTTP_LEN_PUSH = hdrtoken_wks_to_length(HTTP_METHOD_PUSH);
+
+ HTTP_VALUE_BYTES = hdrtoken_string_to_wks("bytes");
+ HTTP_VALUE_CHUNKED = hdrtoken_string_to_wks("chunked");
+ HTTP_VALUE_CLOSE = hdrtoken_string_to_wks("close");
+ HTTP_VALUE_COMPRESS = hdrtoken_string_to_wks("compress");
+ HTTP_VALUE_DEFLATE = hdrtoken_string_to_wks("deflate");
+ HTTP_VALUE_GZIP = hdrtoken_string_to_wks("gzip");
+ HTTP_VALUE_IDENTITY = hdrtoken_string_to_wks("identity");
+ HTTP_VALUE_KEEP_ALIVE = hdrtoken_string_to_wks("keep-alive");
+ HTTP_VALUE_MAX_AGE = hdrtoken_string_to_wks("max-age");
+ HTTP_VALUE_MAX_STALE = hdrtoken_string_to_wks("max-stale");
+ HTTP_VALUE_MIN_FRESH = hdrtoken_string_to_wks("min-fresh");
+ HTTP_VALUE_MUST_REVALIDATE = hdrtoken_string_to_wks("must-revalidate");
+ HTTP_VALUE_NONE = hdrtoken_string_to_wks("none");
+ HTTP_VALUE_NO_CACHE = hdrtoken_string_to_wks("no-cache");
+ HTTP_VALUE_NO_STORE = hdrtoken_string_to_wks("no-store");
+ HTTP_VALUE_NO_TRANSFORM = hdrtoken_string_to_wks("no-transform");
+ HTTP_VALUE_ONLY_IF_CACHED = hdrtoken_string_to_wks("only-if-cached");
+ HTTP_VALUE_PRIVATE = hdrtoken_string_to_wks("private");
+ HTTP_VALUE_PROXY_REVALIDATE = hdrtoken_string_to_wks("proxy-revalidate");
+ HTTP_VALUE_PUBLIC = hdrtoken_string_to_wks("public");
+ HTTP_VALUE_S_MAXAGE = hdrtoken_string_to_wks("s-maxage");
HTTP_VALUE_NEED_REVALIDATE_ONCE = hdrtoken_string_to_wks("need-revalidate-once");
- HTTP_VALUE_100_CONTINUE = hdrtoken_string_to_wks("100-continue");
-
- HTTP_LEN_BYTES = hdrtoken_wks_to_length(HTTP_VALUE_BYTES);
- HTTP_LEN_CHUNKED = hdrtoken_wks_to_length(HTTP_VALUE_CHUNKED);
- HTTP_LEN_CLOSE = hdrtoken_wks_to_length(HTTP_VALUE_CLOSE);
- HTTP_LEN_COMPRESS = hdrtoken_wks_to_length(HTTP_VALUE_COMPRESS);
- HTTP_LEN_DEFLATE = hdrtoken_wks_to_length(HTTP_VALUE_DEFLATE);
- HTTP_LEN_GZIP = hdrtoken_wks_to_length(HTTP_VALUE_GZIP);
- HTTP_LEN_IDENTITY = hdrtoken_wks_to_length(HTTP_VALUE_IDENTITY);
- HTTP_LEN_KEEP_ALIVE = hdrtoken_wks_to_length(HTTP_VALUE_KEEP_ALIVE);
- HTTP_LEN_MAX_AGE = hdrtoken_wks_to_length(HTTP_VALUE_MAX_AGE);
- HTTP_LEN_MAX_STALE = hdrtoken_wks_to_length(HTTP_VALUE_MAX_STALE);
- HTTP_LEN_MIN_FRESH = hdrtoken_wks_to_length(HTTP_VALUE_MIN_FRESH);
- HTTP_LEN_MUST_REVALIDATE = hdrtoken_wks_to_length(HTTP_VALUE_MUST_REVALIDATE);
- HTTP_LEN_NONE = hdrtoken_wks_to_length(HTTP_VALUE_NONE);
- HTTP_LEN_NO_CACHE = hdrtoken_wks_to_length(HTTP_VALUE_NO_CACHE);
- HTTP_LEN_NO_STORE = hdrtoken_wks_to_length(HTTP_VALUE_NO_STORE);
- HTTP_LEN_NO_TRANSFORM = hdrtoken_wks_to_length(HTTP_VALUE_NO_TRANSFORM);
- HTTP_LEN_ONLY_IF_CACHED = hdrtoken_wks_to_length(HTTP_VALUE_ONLY_IF_CACHED);
- HTTP_LEN_PRIVATE = hdrtoken_wks_to_length(HTTP_VALUE_PRIVATE);
- HTTP_LEN_PROXY_REVALIDATE = hdrtoken_wks_to_length(HTTP_VALUE_PROXY_REVALIDATE);
- HTTP_LEN_PUBLIC = hdrtoken_wks_to_length(HTTP_VALUE_PUBLIC);
- HTTP_LEN_S_MAXAGE = hdrtoken_wks_to_length(HTTP_VALUE_S_MAXAGE);
+ HTTP_VALUE_100_CONTINUE = hdrtoken_string_to_wks("100-continue");
+
+ HTTP_LEN_BYTES = hdrtoken_wks_to_length(HTTP_VALUE_BYTES);
+ HTTP_LEN_CHUNKED = hdrtoken_wks_to_length(HTTP_VALUE_CHUNKED);
+ HTTP_LEN_CLOSE = hdrtoken_wks_to_length(HTTP_VALUE_CLOSE);
+ HTTP_LEN_COMPRESS = hdrtoken_wks_to_length(HTTP_VALUE_COMPRESS);
+ HTTP_LEN_DEFLATE = hdrtoken_wks_to_length(HTTP_VALUE_DEFLATE);
+ HTTP_LEN_GZIP = hdrtoken_wks_to_length(HTTP_VALUE_GZIP);
+ HTTP_LEN_IDENTITY = hdrtoken_wks_to_length(HTTP_VALUE_IDENTITY);
+ HTTP_LEN_KEEP_ALIVE = hdrtoken_wks_to_length(HTTP_VALUE_KEEP_ALIVE);
+ HTTP_LEN_MAX_AGE = hdrtoken_wks_to_length(HTTP_VALUE_MAX_AGE);
+ HTTP_LEN_MAX_STALE = hdrtoken_wks_to_length(HTTP_VALUE_MAX_STALE);
+ HTTP_LEN_MIN_FRESH = hdrtoken_wks_to_length(HTTP_VALUE_MIN_FRESH);
+ HTTP_LEN_MUST_REVALIDATE = hdrtoken_wks_to_length(HTTP_VALUE_MUST_REVALIDATE);
+ HTTP_LEN_NONE = hdrtoken_wks_to_length(HTTP_VALUE_NONE);
+ HTTP_LEN_NO_CACHE = hdrtoken_wks_to_length(HTTP_VALUE_NO_CACHE);
+ HTTP_LEN_NO_STORE = hdrtoken_wks_to_length(HTTP_VALUE_NO_STORE);
+ HTTP_LEN_NO_TRANSFORM = hdrtoken_wks_to_length(HTTP_VALUE_NO_TRANSFORM);
+ HTTP_LEN_ONLY_IF_CACHED = hdrtoken_wks_to_length(HTTP_VALUE_ONLY_IF_CACHED);
+ HTTP_LEN_PRIVATE = hdrtoken_wks_to_length(HTTP_VALUE_PRIVATE);
+ HTTP_LEN_PROXY_REVALIDATE = hdrtoken_wks_to_length(HTTP_VALUE_PROXY_REVALIDATE);
+ HTTP_LEN_PUBLIC = hdrtoken_wks_to_length(HTTP_VALUE_PUBLIC);
+ 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);
+ 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
@@ -313,11 +313,11 @@ void
http_hdr_init(HdrHeap *heap, HTTPHdrImpl *hh, HTTPType polarity)
{
memset(&(hh->u), 0, sizeof(hh->u));
- hh->m_polarity = polarity;
- hh->m_version = HTTP_VERSION(1, 0);
+ hh->m_polarity = polarity;
+ hh->m_version = HTTP_VERSION(1, 0);
hh->m_fields_impl = mime_hdr_create(heap);
if (polarity == HTTP_TYPE_REQUEST) {
- hh->u.req.m_url_impl = url_create(heap);
+ hh->u.req.m_url_impl = url_create(heap);
hh->u.req.m_method_wks_idx = -1;
}
}
@@ -332,10 +332,10 @@ http_hdr_copy_onto(HTTPHdrImpl *s_hh, HdrHeap *s_heap, HTTPHdrImpl *d_hh, HdrHea
URLImpl *s_url, *d_url;
HTTPType d_polarity;
- s_mh = s_hh->m_fields_impl;
- s_url = s_hh->u.req.m_url_impl;
- d_mh = d_hh->m_fields_impl;
- d_url = d_hh->u.req.m_url_impl;
+ s_mh = s_hh->m_fields_impl;
+ s_url = s_hh->u.req.m_url_impl;
+ d_mh = d_hh->m_fields_impl;
+ d_url = d_hh->u.req.m_url_impl;
d_polarity = d_hh->m_polarity;
ink_assert(s_hh->m_polarity != HTTP_TYPE_UNKNOWN);
@@ -453,7 +453,7 @@ http_hdr_print(HdrHeap *heap, HTTPHdrImpl *hdr, char *buf, int bufsize, int *buf
if (hdr->u.req.m_method_wks_idx == HTTP_WKSIDX_CONNECT) {
*bufindex -= 1; // remove trailing slash for CONNECT request
}
- p = buf + *bufindex;
+ p = buf + *bufindex;
*p++ = ' ';
*bufindex += 1;
} else {
@@ -469,7 +469,7 @@ http_hdr_print(HdrHeap *heap, HTTPHdrImpl *hdr, char *buf, int bufsize, int *buf
}
if (bufsize - *bufindex >= 2) {
- p = buf + *bufindex;
+ p = buf + *bufindex;
*p++ = '\r';
*p++ = '\n';
*bufindex += 2;
@@ -508,9 +508,9 @@ http_hdr_print(HdrHeap *heap, HTTPHdrImpl *hdr, char *buf, int bufsize, int *buf
hdrstat = http_hdr_status_get(hdr);
if (hdrstat == 200) {
- *p++ = '2';
- *p++ = '0';
- *p++ = '0';
+ *p++ = '2';
+ *p++ = '0';
+ *p++ = '0';
tmplen = 3;
} else {
tmplen = mime_format_int(p, hdrstat, (bufsize - (p - buf)));
@@ -525,7 +525,7 @@ http_hdr_print(HdrHeap *heap, HTTPHdrImpl *hdr, char *buf, int bufsize, int *buf
}
if (bufsize - *bufindex >= 2) {
- p = buf + *bufindex;
+ p = buf + *bufindex;
*p++ = '\r';
*p++ = '\n';
*bufindex += 2;
@@ -668,10 +668,10 @@ http_hdr_method_get(HTTPHdrImpl *hh, int *length)
ink_assert(hh->m_polarity == HTTP_TYPE_REQUEST);
if (hh->u.req.m_method_wks_idx >= 0) {
- str = hdrtoken_index_to_wks(hh->u.req.m_method_wks_idx);
+ str = hdrtoken_index_to_wks(hh->u.req.m_method_wks_idx);
*length = hdrtoken_index_to_length(hh->u.req.m_method_wks_idx);
} else {
- str = hh->u.req.m_ptr_method;
+ str = hh->u.req.m_ptr_method;
*length = hh->u.req.m_len_method;
}
@@ -937,14 +937,14 @@ http_parser_parse_req(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
http_hdr_method_set(heap, hh, &(cur[0]), hdrtoken_wks_to_index(HTTP_METHOD_GET), 3, must_copy_strings);
ink_assert(hh->u.req.m_url_impl != NULL);
- url = hh->u.req.m_url_impl;
+ url = hh->u.req.m_url_impl;
url_start = &(cur[4]);
- err = ::url_parse(heap, url, &url_start, &(end[-11]), must_copy_strings);
+ err = ::url_parse(heap, url, &url_start, &(end[-11]), must_copy_strings);
if (err < 0)
return err;
http_hdr_version_set(hh, version);
- end = real_end;
+ end = real_end;
parser->m_parsing_http = false;
if (version == HTTP_VERSION(0, 9))
return PARSE_ERROR;
@@ -958,13 +958,13 @@ http_parser_parse_req(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
slow_case:
- method_start = NULL;
- method_end = NULL;
- url_start = NULL;
- url_end = NULL;
+ method_start = NULL;
+ method_end = NULL;
+ url_start = NULL;
+ url_end = NULL;
version_start = NULL;
- version_end = NULL;
- url = NULL;
+ version_end = NULL;
+ url = NULL;
if (ParseRules::is_cr(*cur))
GETNEXT(done);
@@ -1091,7 +1091,7 @@ http_parser_parse_req(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
http_hdr_version_set(hh, version);
- end = real_end;
+ end = real_end;
parser->m_parsing_http = false;
MIMEParseResult ret = mime_parser_parse(&parser->m_mime_parser, heap, hh->m_fields_impl, start, end, must_copy_strings, eof);
@@ -1106,13 +1106,13 @@ http_parser_parse_req(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
MIMEParseResult
validate_hdr_host(HTTPHdrImpl *hh)
{
- MIMEParseResult ret = PARSE_DONE;
+ MIMEParseResult ret = PARSE_DONE;
MIMEField *host_field = mime_hdr_field_find(hh->m_fields_impl, MIME_FIELD_HOST, MIME_LEN_HOST);
if (host_field) {
if (host_field->has_dups()) {
ret = PARSE_ERROR; // can't have more than 1 host field.
} else {
- int host_len = 0;
+ int host_len = 0;
char const *host_val = host_field->value_get(&host_len);
ts::ConstBuffer addr, port, rest, host(host_val, host_len);
if (0 == ats_ip_parse(host, &addr, &port, &rest)) {
@@ -1161,7 +1161,7 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
const char *reason_end;
const char *old_start;
- real_end = end;
+ real_end = end;
old_start = *start;
hh->m_polarity = HTTP_TYPE_RESPONSE;
@@ -1193,18 +1193,18 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
}
reason_start = &(cur[13]);
- reason_end = end - 1;
+ reason_end = end - 1;
while ((reason_end > reason_start + 1) && (ParseRules::is_space(reason_end[-1])))
--reason_end;
- int32_t version = HTTP_VERSION(cur[5] - '0', cur[7] - '0');
+ int32_t version = HTTP_VERSION(cur[5] - '0', cur[7] - '0');
HTTPStatus status = (HTTPStatus)((cur[9] - '0') * 100 + (cur[10] - '0') * 10 + (cur[11] - '0'));
http_hdr_version_set(hh, version);
http_hdr_status_set(hh, status);
http_hdr_reason_set(heap, hh, reason_start, (int)(reason_end - reason_start), must_copy_strings);
- end = real_end;
+ end = real_end;
parser->m_parsing_http = false;
return mime_parser_parse(&parser->m_mime_parser, heap, hh->m_fields_impl, start, end, must_copy_strings, eof);
}
@@ -1212,11 +1212,11 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
slow_case:
version_start = NULL;
- version_end = NULL;
- status_start = NULL;
- status_end = NULL;
- reason_start = NULL;
- reason_end = NULL;
+ version_end = NULL;
+ status_start = NULL;
+ status_end = NULL;
+ reason_start = NULL;
+ reason_end = NULL;
version_start = cur = line_start;
if ((*cur != 'H') && (*cur != 'h')) {
@@ -1285,7 +1285,7 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
goto parse_reason1;
}
reason_start = cur;
- reason_end = end - 1;
+ reason_end = end - 1;
while ((reason_end >= line_start) && (ParseRules::is_cr(*reason_end) || ParseRules::is_lf(*reason_end))) {
reason_end -= 1;
}
@@ -1320,7 +1320,7 @@ http_parser_parse_resp(HTTPParser *parser, HdrHeap *heap, HTTPHdrImpl *hh, const
http_hdr_reason_set(heap, hh, reason_start, (int)(reason_end - reason_start), must_copy_strings);
}
- end = real_end;
+ end = real_end;
parser->m_parsing_http = false;
}
@@ -1506,9 +1506,9 @@ http_parse_te(const char *buf, int len, Arena *arena)
len -= 1;
}
- val = (HTTPValTE *)arena->alloc(sizeof(HTTPValTE));
+ val = (HTTPValTE *)arena->alloc(sizeof(HTTPValTE));
val->encoding = http_str_store(arena, s, (int)(buf - s));
- val->qvalue = http_parse_qvalue(buf, len);
+ val->qvalue = http_parse_qvalue(buf, len);
return val;
}
@@ -1519,15 +1519,15 @@ HTTPHdr::_fill_target_cache() const
URL *url = this->url_get();
char const *port_ptr;
- m_target_in_url = false;
+ m_target_in_url = false;
m_port_in_header = false;
- m_host_mime = NULL;
+ m_host_mime = NULL;
// Check in the URL first, then the HOST field.
if (0 != url->host_get(&m_host_length)) {
- m_target_in_url = true;
- m_port = url->port_get();
+ m_target_in_url = true;
+ m_port = url->port_get();
m_port_in_header = 0 != url->port_get_raw();
- m_host_mime = NULL;
+ m_host_mime = NULL;
} else if (0 != (m_host_mime = const_cast<HTTPHdr *>(this)->get_host_port_values(0, &m_host_length, &port_ptr, 0))) {
m_port = 0;
if (port_ptr) {
@@ -1535,7 +1535,7 @@ HTTPHdr::_fill_target_cache() const
m_port = m_port * 10 + *port_ptr - '0';
}
m_port_in_header = (0 != m_port);
- m_port = url_canonicalize_port(url->m_url_impl->m_url_type, m_port);
+ m_port = url_canonicalize_port(url->m_url_impl->m_url_type, m_port);
}
m_target_cached = true;
@@ -1556,9 +1556,9 @@ HTTPHdr::set_url_target_from_host_field(URL *url)
m_target_in_url = true; // it's there now.
}
} else {
- int host_len = 0;
+ int host_len = 0;
char const *host = NULL;
- host = host_get(&host_len);
+ host = host_get(&host_len);
url->host_set(host, host_len);
if (m_port_in_header)
url->port_set(m_port);
@@ -1594,8 +1594,8 @@ class UrlPrintHack
*/
if (!hdr->m_target_in_url && hdr->m_host_length && hdr->m_host_mime) {
ink_assert(0 == ui->m_ptr_host); // shouldn't be non-zero if not in URL.
- ui->m_ptr_host = hdr->m_host_mime->m_ptr_value;
- ui->m_len_host = hdr->m_host_length;
+ ui->m_ptr_host = hdr->m_host_mime->m_ptr_value;
+ ui->m_len_host = hdr->m_host_length;
m_host_modified_p = true;
} else {
m_host_modified_p = false;
@@ -1603,8 +1603,8 @@ class UrlPrintHack
if (0 == hdr->m_url_cached.port_get_raw() && hdr->m_port_in_header) {
ink_assert(0 == ui->m_ptr_port); // shouldn't be set if not in URL.
- ui->m_ptr_port = m_port_buff;
- ui->m_len_port = snprintf(m_port_buff, sizeof(m_port_buff), "%d", hdr->m_port);
+ ui->m_ptr_port = m_port_buff;
+ ui->m_len_port = snprintf(m_port_buff, sizeof(m_port_buff), "%d", hdr->m_port);
m_port_modified_p = true;
} else {
m_port_modified_p = false;
@@ -1792,10 +1792,10 @@ HTTPCacheAlt::HTTPCacheAlt()
m_frag_offsets(0),
m_ext_buffer(NULL)
{
- m_object_key[0] = 0;
- m_object_key[1] = 0;
- m_object_key[2] = 0;
- m_object_key[3] = 0;
+ m_object_key[0] = 0;
+ m_object_key[1] = 0;
+ m_object_key[2] = 0;
+ m_object_key[3] = 0;
m_object_size[0] = 0;
m_object_size[1] = 0;
}
@@ -1805,7 +1805,7 @@ HTTPCacheAlt::destroy()
{
ink_assert(m_magic == CACHE_ALT_MAGIC_ALIVE);
ink_assert(m_writeable);
- m_magic = CACHE_ALT_MAGIC_DEAD;
+ m_magic = CACHE_ALT_MAGIC_DEAD;
m_writeable = 0;
m_request_hdr.destroy();
m_response_hdr.destroy();
@@ -1822,13 +1822,13 @@ HTTPCacheAlt::copy(HTTPCacheAlt *to_copy)
{
m_magic = to_copy->m_magic;
// m_writeable = to_copy->m_writeable;
- m_unmarshal_len = to_copy->m_unmarshal_len;
- m_id = to_copy->m_id;
- m_rid = to_copy->m_rid;
- m_object_key[0] = to_copy->m_object_key[0];
- m_object_key[1] = to_copy->m_object_key[1];
- m_object_key[2] = to_copy->m_object_key[2];
- m_object_key[3] = to_copy->m_object_key[3];
+ m_unmarshal_len = to_copy->m_unmarshal_len;
+ m_id = to_copy->m_id;
+ m_rid = to_copy->m_rid;
+ m_object_key[0] = to_copy->m_object_key[0];
+ m_object_key[1] = to_copy->m_object_key[1];
+ m_object_key[2] = to_copy->m_object_key[2];
+ m_object_key[3] = to_copy->m_object_key[3];
m_object_size[0] = to_copy->m_object_size[0];
m_object_size[1] = to_copy->m_object_size[1];
@@ -1840,7 +1840,7 @@ HTTPCacheAlt::copy(HTTPCacheAlt *to_copy)
m_response_hdr.copy(&to_copy->m_response_hdr);
}
- m_request_sent_time = to_copy->m_request_sent_time;
+ m_request_sent_time = to_copy->m_request_sent_time;
m_response_received_time = to_copy->m_response_received_time;
this->copy_frag_offsets_from(to_copy);
}
@@ -1918,7 +1918,7 @@ int
HTTPInfo::marshal(char *buf, int len)
{
int tmp;
- int used = 0;
+ int used = 0;
HTTPCacheAlt *marshal_alt = (HTTPCacheAlt *)buf;
// non-zero only if the offsets are external. Otherwise they get
// marshalled along with the alt struct.
@@ -1944,10 +1944,10 @@ HTTPInfo::marshal(char *buf, int len)
// extra bytes now but will save copying any
// bytes on the way out of the cache
memcpy(buf, m_alt, sizeof(HTTPCacheAlt));
- marshal_alt->m_magic = CACHE_ALT_MAGIC_MARSHALED;
- marshal_alt->m_writeable = 0;
+ marshal_alt->m_magic = CACHE_ALT_MAGIC_MARSHALED;
+ marshal_alt->m_writeable = 0;
marshal_alt->m_unmarshal_len = -1;
- marshal_alt->m_ext_buffer = NULL;
+ marshal_alt->m_ext_buffer = NULL;
buf += HTTP_ALT_MARSHAL_SIZE;
used += HTTP_ALT_MARSHAL_SIZE;
@@ -1964,7 +1964,7 @@ HTTPInfo::marshal(char *buf, int len)
// to zero based offsets from the start of the buffer we're
// marshalling in to
if (m_alt->m_request_hdr.valid()) {
- tmp = m_alt->m_request_hdr.m_heap->marshal(buf, len - used);
+ tmp = m_alt->m_request_hdr.m_heap->marshal(buf, len - used);
marshal_alt->m_request_hdr.m_heap = (HdrHeap *)(intptr_t)used;
ink_assert(((intptr_t)marshal_alt->m_request_hdr.m_heap) < len);
buf += tmp;
@@ -1974,7 +1974,7 @@ HTTPInfo::marshal(char *buf, int len)
}
if (m_alt->m_response_hdr.valid()) {
- tmp = m_alt->m_response_hdr.m_heap->marshal(buf, len - used);
+ tmp = m_alt->m_response_hdr.m_heap->marshal(buf, len - used);
marshal_alt->m_response_hdr.m_heap = (HdrHeap *)(intptr_t)used;
ink_assert(((intptr_t)marshal_alt->m_response_hdr.m_heap) < len);
used += tmp;
@@ -1995,7 +1995,7 @@ int
HTTPInfo::unmarshal(char *buf, int len, RefCountObj *block_ref)
{
HTTPCacheAlt *alt = (HTTPCacheAlt *)buf;
- int orig_len = len;
+ int orig_len = len;
if (alt->m_magic == CACHE_ALT_MAGIC_ALIVE) {
// Already unmarshaled, must be a ram cache
@@ -2015,7 +2015,7 @@ HTTPInfo::unmarshal(char *buf, int len, RefCountObj *block_ref)
if (alt->m_frag_offset_count > HTTPCacheAlt::N_INTEGRAL_FRAG_OFFSETS) {
// stuff that didn't fit in the integral slots.
- int extra = sizeof(FragOffset) * alt->m_frag_offset_count - sizeof(alt->m_integral_frag_offsets);
+ int extra = sizeof(FragOffset) * alt->m_frag_offset_count - sizeof(alt->m_integral_frag_offsets);
char *extra_src = buf + reinterpret_cast<intptr_t>(alt->m_frag_offsets);
// Actual buffer size, which must be a power of two.
// Well, technically not, because we never modify an unmarshalled fragment
@@ -2036,7 +2036,7 @@ HTTPInfo::unmarshal(char *buf, int len, RefCountObj *block_ref)
alt->m_frag_offsets = 0; // should really already be zero.
}
- HdrHeap *heap = (HdrHeap *)(alt->m_request_hdr.m_heap ? (buf + (intptr_t)alt->m_request_hdr.m_heap) : 0);
+ HdrHeap *heap = (HdrHeap *)(alt->m_request_hdr.m_heap ? (buf + (intptr_t)alt->m_request_hdr.m_heap) : 0);
HTTPHdrImpl *hh = NULL;
int tmp;
if (heap != NULL) {
@@ -2046,9 +2046,9 @@ HTTPInfo::unmarshal(char *buf, int len, RefCountObj *block_ref)
return -1;
}
len -= tmp;
- alt->m_request_hdr.m_heap = heap;
- alt->m_request_hdr.m_http = hh;
- alt->m_request_hdr.m_mime = hh->m_fields_impl;
+ alt->m_request_hdr.m_heap = heap;
+ alt->m_request_hdr.m_http = hh;
+ alt->m_request_hdr.m_mime = hh->m_fields_impl;
alt->m_request_hdr.m_url_cached.m_heap = heap;
}
diff --git a/proxy/hdrs/HTTP.h b/proxy/hdrs/HTTP.h
index ae20b48..c230743 100644
--- a/proxy/hdrs/HTTP.h
+++ b/proxy/hdrs/HTTP.h
@@ -41,48 +41,48 @@ class Http2HeaderTable;
enum HTTPStatus {
HTTP_STATUS_NONE = 0,
- HTTP_STATUS_CONTINUE = 100,
+ HTTP_STATUS_CONTINUE = 100,
HTTP_STATUS_SWITCHING_PROTOCOL = 101,
- HTTP_STATUS_OK = 200,
- HTTP_STATUS_CREATED = 201,
- HTTP_STATUS_ACCEPTED = 202,
+ HTTP_STATUS_OK = 200,
+ HTTP_STATUS_CREATED = 201,
+ HTTP_STATUS_ACCEPTED = 202,
HTTP_STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
- HTTP_STATUS_NO_CONTENT = 204,
- HTTP_STATUS_RESET_CONTENT = 205,
- HTTP_STATUS_PARTIAL_CONTENT = 206,
-
- HTTP_STATUS_MULTIPLE_CHOICES = 300,
- HTTP_STATUS_MOVED_PERMANENTLY = 301,
- HTTP_STATUS_MOVED_TEMPORARILY = 302,
- HTTP_STATUS_SEE_OTHER = 303,
- HTTP_STATUS_NOT_MODIFIED = 304,
- HTTP_STATUS_USE_PROXY = 305,
+ HTTP_STATUS_NO_CONTENT = 204,
+ HTTP_STATUS_RESET_CONTENT = 205,
+ HTTP_STATUS_PARTIAL_CONTENT = 206,
+
+ HTTP_STATUS_MULTIPLE_CHOICES = 300,
+ HTTP_STATUS_MOVED_PERMANENTLY = 301,
+ HTTP_STATUS_MOVED_TEMPORARILY = 302,
+ HTTP_STATUS_SEE_OTHER = 303,
+ HTTP_STATUS_NOT_MODIFIED = 304,
+ HTTP_STATUS_USE_PROXY = 305,
HTTP_STATUS_TEMPORARY_REDIRECT = 307,
- HTTP_STATUS_BAD_REQUEST = 400,
- HTTP_STATUS_UNAUTHORIZED = 401,
- HTTP_STATUS_PAYMENT_REQUIRED = 402,
- HTTP_STATUS_FORBIDDEN = 403,
- HTTP_STATUS_NOT_FOUND = 404,
- HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
- HTTP_STATUS_NOT_ACCEPTABLE = 406,
+ HTTP_STATUS_BAD_REQUEST = 400,
+ HTTP_STATUS_UNAUTHORIZED = 401,
+ HTTP_STATUS_PAYMENT_REQUIRED = 402,
+ HTTP_STATUS_FORBIDDEN = 403,
+ HTTP_STATUS_NOT_FOUND = 404,
+ HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
+ HTTP_STATUS_NOT_ACCEPTABLE = 406,
HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
- HTTP_STATUS_REQUEST_TIMEOUT = 408,
- HTTP_STATUS_CONFLICT = 409,
- HTTP_STATUS_GONE = 410,
- HTTP_STATUS_LENGTH_REQUIRED = 411,
- HTTP_STATUS_PRECONDITION_FAILED = 412,
- HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
- HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
- HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
- HTTP_STATUS_RANGE_NOT_SATISFIABLE = 416,
+ HTTP_STATUS_REQUEST_TIMEOUT = 408,
+ HTTP_STATUS_CONFLICT = 409,
+ HTTP_STATUS_GONE = 410,
+ HTTP_STATUS_LENGTH_REQUIRED = 411,
+ HTTP_STATUS_PRECONDITION_FAILED = 412,
+ HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
+ HTTP_STATUS_REQUEST_URI_TOO_LONG = 414,
+ HTTP_STATUS_UNSUPPORTED_MEDIA_TYPE = 415,
+ HTTP_STATUS_RANGE_NOT_SATISFIABLE = 416,
HTTP_STATUS_INTERNAL_SERVER_ERROR = 500,
- HTTP_STATUS_NOT_IMPLEMENTED = 501,
- HTTP_STATUS_BAD_GATEWAY = 502,
- HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
- HTTP_STATUS_GATEWAY_TIMEOUT = 504,
+ HTTP_STATUS_NOT_IMPLEMENTED = 501,
+ HTTP_STATUS_BAD_GATEWAY = 502,
+ HTTP_STATUS_SERVICE_UNAVAILABLE = 503,
+ HTTP_STATUS_GATEWAY_TIMEOUT = 504,
HTTP_STATUS_HTTPVER_NOT_SUPPORTED = 505
};
@@ -95,139 +95,139 @@ enum HTTPKeepAlive {
enum HTTPWarningCode {
HTTP_WARNING_CODE_NONE = 0,
- HTTP_WARNING_CODE_RESPONSE_STALE = 110,
- HTTP_WARNING_CODE_REVALIDATION_FAILED = 111,
+ HTTP_WARNING_CODE_RESPONSE_STALE = 110,
+ HTTP_WARNING_CODE_REVALIDATION_FAILED = 111,
HTTP_WARNING_CODE_DISCONNECTED_OPERATION = 112,
- HTTP_WARNING_CODE_HERUISTIC_EXPIRATION = 113,
+ HTTP_WARNING_CODE_HERUISTIC_EXPIRATION = 113,
HTTP_WARNING_CODE_TRANSFORMATION_APPLIED = 114,
- HTTP_WARNING_CODE_MISC_WARNING = 199
+ HTTP_WARNING_CODE_MISC_WARNING = 199
};
/* squild log codes */
enum SquidLogCode {
- SQUID_LOG_EMPTY = '0',
- SQUID_LOG_TCP_HIT = '1',
- SQUID_LOG_TCP_DISK_HIT = '2',
- SQUID_LOG_TCP_MEM_HIT = '.', // Don't want to change others codes
- SQUID_LOG_TCP_MISS = '3',
- SQUID_LOG_TCP_EXPIRED_MISS = '4',
- SQUID_LOG_TCP_REFRESH_HIT = '5',
- SQUID_LOG_TCP_REF_FAIL_HIT = '6',
- SQUID_LOG_TCP_REFRESH_MISS = '7',
- SQUID_LOG_TCP_CLIENT_REFRESH = '8',
- SQUID_LOG_TCP_IMS_HIT = '9',
- SQUID_LOG_TCP_IMS_MISS = 'a',
- SQUID_LOG_TCP_SWAPFAIL = 'b',
- SQUID_LOG_TCP_DENIED = 'c',
- SQUID_LOG_TCP_WEBFETCH_MISS = 'd',
- SQUID_LOG_TCP_FUTURE_2 = 'f',
- SQUID_LOG_TCP_HIT_REDIRECT = '[', // standard redirect
- SQUID_LOG_TCP_MISS_REDIRECT = ']', // standard redirect
- SQUID_LOG_TCP_HIT_X_REDIRECT = '<', // extended redirect
- SQUID_LOG_TCP_MISS_X_REDIRECT = '>', // extended redirect
- SQUID_LOG_UDP_HIT = 'g',
- SQUID_LOG_UDP_WEAK_HIT = 'h',
- SQUID_LOG_UDP_HIT_OBJ = 'i',
- SQUID_LOG_UDP_MISS = 'j',
- SQUID_LOG_UDP_DENIED = 'k',
- SQUID_LOG_UDP_INVALID = 'l',
- SQUID_LOG_UDP_RELOADING = 'm',
- SQUID_LOG_UDP_FUTURE_1 = 'n',
- SQUID_LOG_UDP_FUTURE_2 = 'o',
- SQUID_LOG_ERR_READ_TIMEOUT = 'p',
- SQUID_LOG_ERR_LIFETIME_EXP = 'q',
+ SQUID_LOG_EMPTY = '0',
+ SQUID_LOG_TCP_HIT = '1',
+ SQUID_LOG_TCP_DISK_HIT = '2',
+ SQUID_LOG_TCP_MEM_HIT = '.', // Don't want to change others codes
+ SQUID_LOG_TCP_MISS = '3',
+ SQUID_LOG_TCP_EXPIRED_MISS = '4',
+ SQUID_LOG_TCP_REFRESH_HIT = '5',
+ SQUID_LOG_TCP_REF_FAIL_HIT = '6',
+ SQUID_LOG_TCP_REFRESH_MISS = '7',
+ SQUID_LOG_TCP_CLIENT_REFRESH = '8',
+ SQUID_LOG_TCP_IMS_HIT = '9',
+ SQUID_LOG_TCP_IMS_MISS = 'a',
+ SQUID_LOG_TCP_SWAPFAIL = 'b',
+ SQUID_LOG_TCP_DENIED = 'c',
+ SQUID_LOG_TCP_WEBFETCH_MISS = 'd',
+ SQUID_LOG_TCP_FUTURE_2 = 'f',
+ SQUID_LOG_TCP_HIT_REDIRECT = '[', // standard redirect
+ SQUID_LOG_TCP_MISS_REDIRECT = ']', // standard redirect
+ SQUID_LOG_TCP_HIT_X_REDIRECT = '<', // extended redirect
+ SQUID_LOG_TCP_MISS_X_REDIRECT = '>', // extended redirect
+ SQUID_LOG_UDP_HIT = 'g',
+ SQUID_LOG_UDP_WEAK_HIT = 'h',
+ SQUID_LOG_UDP_HIT_OBJ = 'i',
+ SQUID_LOG_UDP_MISS = 'j',
+ SQUID_LOG_UDP_DENIED = 'k',
+ SQUID_LOG_UDP_INVALID = 'l',
+ SQUID_LOG_UDP_RELOADING = 'm',
+ SQUID_LOG_UDP_FUTURE_1 = 'n',
+ SQUID_LOG_UDP_FUTURE_2 = 'o',
+ SQUID_LOG_ERR_READ_TIMEOUT = 'p',
+ SQUID_LOG_ERR_LIFETIME_EXP = 'q',
SQUID_LOG_ERR_POST_ENTITY_TOO_LARGE = 'L',
- SQUID_LOG_ERR_NO_CLIENTS_BIG_OBJ = 'r',
- SQUID_LOG_ERR_READ_ERROR = 's',
- SQUID_LOG_ERR_CLIENT_ABORT = 't',
- SQUID_LOG_ERR_CONNECT_FAIL = 'u',
- SQUID_LOG_ERR_INVALID_REQ = 'v',
- SQUID_LOG_ERR_UNSUP_REQ = 'w',
- SQUID_LOG_ERR_INVALID_URL = 'x',
- SQUID_LOG_ERR_NO_FDS = 'y',
- SQUID_LOG_ERR_DNS_FAIL = 'z',
- SQUID_LOG_ERR_NOT_IMPLEMENTED = 'A',
- SQUID_LOG_ERR_CANNOT_FETCH = 'B',
- SQUID_LOG_ERR_NO_RELAY = 'C',
- SQUID_LOG_ERR_DISK_IO = 'D',
- SQUID_LOG_ERR_ZERO_SIZE_OBJECT = 'E',
- SQUID_LOG_ERR_PROXY_DENIED = 'G',
- SQUID_LOG_ERR_WEBFETCH_DETECTED = 'H',
- SQUID_LOG_ERR_FUTURE_1 = 'I',
- SQUID_LOG_ERR_UNKNOWN = 'Z'
+ SQUID_LOG_ERR_NO_CLIENTS_BIG_OBJ = 'r',
+ SQUID_LOG_ERR_READ_ERROR = 's',
+ SQUID_LOG_ERR_CLIENT_ABORT = 't',
+ SQUID_LOG_ERR_CONNECT_FAIL = 'u',
+ SQUID_LOG_ERR_INVALID_REQ = 'v',
+ SQUID_LOG_ERR_UNSUP_REQ = 'w',
+ SQUID_LOG_ERR_INVALID_URL = 'x',
+ SQUID_LOG_ERR_NO_FDS = 'y',
+ SQUID_LOG_ERR_DNS_FAIL = 'z',
+ SQUID_LOG_ERR_NOT_IMPLEMENTED = 'A',
+ SQUID_LOG_ERR_CANNOT_FETCH = 'B',
+ SQUID_LOG_ERR_NO_RELAY = 'C',
+ SQUID_LOG_ERR_DISK_IO = 'D',
+ SQUID_LOG_ERR_ZERO_SIZE_OBJECT = 'E',
+ SQUID_LOG_ERR_PROXY_DENIED = 'G',
+ SQUID_LOG_ERR_WEBFETCH_DETECTED = 'H',
+ SQUID_LOG_ERR_FUTURE_1 = 'I',
+ SQUID_LOG_ERR_UNKNOWN = 'Z'
};
/* squid hieratchy codes */
enum SquidHierarchyCode {
- SQUID_HIER_EMPTY = '0',
- SQUID_HIER_NONE = '1',
- SQUID_HIER_DIRECT = '2',
- SQUID_HIER_SIBLING_HIT = '3',
- SQUID_HIER_PARENT_HIT = '4',
- SQUID_HIER_DEFAULT_PARENT = '5',
- SQUID_HIER_SINGLE_PARENT = '6',
- SQUID_HIER_FIRST_UP_PARENT = '7',
- SQUID_HIER_NO_PARENT_DIRECT = '8',
- SQUID_HIER_FIRST_PARENT_MISS = '9',
- SQUID_HIER_LOCAL_IP_DIRECT = 'a',
- SQUID_HIER_FIREWALL_IP_DIRECT = 'b',
- SQUID_HIER_NO_DIRECT_FAIL = 'c',
- SQUID_HIER_SOURCE_FASTEST = 'd',
- SQUID_HIER_SIBLING_UDP_HIT_OBJ = 'e',
- SQUID_HIER_PARENT_UDP_HIT_OBJ = 'f',
- SQUID_HIER_PASSTHROUGH_PARENT = 'g',
- SQUID_HIER_SSL_PARENT_MISS = 'h',
- SQUID_HIER_INVALID_CODE = 'i',
- SQUID_HIER_TIMEOUT_DIRECT = 'j',
- SQUID_HIER_TIMEOUT_SIBLING_HIT = 'k',
- SQUID_HIER_TIMEOUT_PARENT_HIT = 'l',
- SQUID_HIER_TIMEOUT_DEFAULT_PARENT = 'm',
- SQUID_HIER_TIMEOUT_SINGLE_PARENT = 'n',
- SQUID_HIER_TIMEOUT_FIRST_UP_PARENT = 'o',
- SQUID_HIER_TIMEOUT_NO_PARENT_DIRECT = 'p',
- SQUID_HIER_TIMEOUT_FIRST_PARENT_MISS = 'q',
- SQUID_HIER_TIMEOUT_LOCAL_IP_DIRECT = 'r',
- SQUID_HIER_TIMEOUT_FIREWALL_IP_DIRECT = 's',
- SQUID_HIER_TIMEOUT_NO_DIRECT_FAIL = 't',
- SQUID_HIER_TIMEOUT_SOURCE_FASTEST = 'u',
- SQUID_HIER_TIMEOUT_SIBLING_UDP_HIT_OBJ = 'v',
- SQUID_HIER_TIMEOUT_PARENT_UDP_HIT_OBJ = 'w',
- SQUID_HIER_TIMEOUT_PASSTHROUGH_PARENT = 'x',
+ SQUID_HIER_EMPTY = '0',
+ SQUID_HIER_NONE = '1',
+ SQUID_HIER_DIRECT = '2',
+ SQUID_HIER_SIBLING_HIT = '3',
+ SQUID_HIER_PARENT_HIT = '4',
+ SQUID_HIER_DEFAULT_PARENT = '5',
+ SQUID_HIER_SINGLE_PARENT = '6',
+ SQUID_HIER_FIRST_UP_PARENT = '7',
+ SQUID_HIER_NO_PARENT_DIRECT = '8',
+ SQUID_HIER_FIRST_PARENT_MISS = '9',
+ SQUID_HIER_LOCAL_IP_DIRECT = 'a',
+ SQUID_HIER_FIREWALL_IP_DIRECT = 'b',
+ SQUID_HIER_NO_DIRECT_FAIL = 'c',
+ SQUID_HIER_SOURCE_FASTEST = 'd',
+ SQUID_HIER_SIBLING_UDP_HIT_OBJ = 'e',
+ SQUID_HIER_PARENT_UDP_HIT_OBJ = 'f',
+ SQUID_HIER_PASSTHROUGH_PARENT = 'g',
+ SQUID_HIER_SSL_PARENT_MISS = 'h',
+ SQUID_HIER_INVALID_CODE = 'i',
+ SQUID_HIER_TIMEOUT_DIRECT = 'j',
+ SQUID_HIER_TIMEOUT_SIBLING_HIT = 'k',
+ SQUID_HIER_TIMEOUT_PARENT_HIT = 'l',
+ SQUID_HIER_TIMEOUT_DEFAULT_PARENT = 'm',
+ SQUID_HIER_TIMEOUT_SINGLE_PARENT = 'n',
+ SQUID_HIER_TIMEOUT_FIRST_UP_PARENT = 'o',
+ SQUID_HIER_TIMEOUT_NO_PARENT_DIRECT = 'p',
+ SQUID_HIER_TIMEOUT_FIRST_PARENT_MISS = 'q',
+ SQUID_HIER_TIMEOUT_LOCAL_IP_DIRECT = 'r',
+ SQUID_HIER_TIMEOUT_FIREWALL_IP_DIRECT = 's',
+ SQUID_HIER_TIMEOUT_NO_DIRECT_FAIL = 't',
+ SQUID_HIER_TIMEOUT_SOURCE_FASTEST = 'u',
+ SQUID_HIER_TIMEOUT_SIBLING_UDP_HIT_OBJ = 'v',
+ SQUID_HIER_TIMEOUT_PARENT_UDP_HIT_OBJ = 'w',
+ SQUID_HIER_TIMEOUT_PASSTHROUGH_PARENT = 'x',
SQUID_HIER_TIMEOUT_TIMEOUT_SSL_PARENT_MISS = 'y',
- SQUID_HIER_INVALID_ASSIGNED_CODE = 'z'
+ SQUID_HIER_INVALID_ASSIGNED_CODE = 'z'
};
/* squid hit/miss codes */
enum SquidHitMissCode {
- SQUID_HIT_RESERVED = '0', // Kinda wonky that this is '0', so skipping 'A' for now
- SQUID_HIT_LEVEL_1 = 'B',
- SQUID_HIT_LEVEL_2 = 'C',
- SQUID_HIT_LEVEL_3 = 'D',
- SQUID_HIT_LEVEL_4 = 'E',
- SQUID_HIT_LEVEL_5 = 'F',
- SQUID_HIT_LEVEL_6 = 'G',
- SQUID_HIT_LEVEL_7 = 'H',
- SQUID_HIT_LEVEL_8 = 'I',
- SQUID_HIT_LEVEl_9 = 'J',
- SQUID_MISS_NONE = '1',
- SQUID_MISS_ICP_AUTH = '2',
- SQUID_MISS_HTTP_NON_CACHE = '3',
- SQUID_MISS_ICP_STOPLIST = '4',
- SQUID_MISS_HTTP_NO_DLE = '5',
- SQUID_MISS_HTTP_NO_LE = '6',
- SQUID_MISS_HTTP_CONTENT = '7',
- SQUID_MISS_PRAGMA_NOCACHE = '8',
- SQUID_MISS_PASS = '9',
- SQUID_MISS_PRE_EXPIRED = 'a',
- SQUID_MISS_ERROR = 'b',
- SQUID_MISS_CACHE_BYPASS = 'c',
+ SQUID_HIT_RESERVED = '0', // Kinda wonky that this is '0', so skipping 'A' for now
+ SQUID_HIT_LEVEL_1 = 'B',
+ SQUID_HIT_LEVEL_2 = 'C',
+ SQUID_HIT_LEVEL_3 = 'D',
+ SQUID_HIT_LEVEL_4 = 'E',
+ SQUID_HIT_LEVEL_5 = 'F',
+ SQUID_HIT_LEVEL_6 = 'G',
+ SQUID_HIT_LEVEL_7 = 'H',
+ SQUID_HIT_LEVEL_8 = 'I',
+ SQUID_HIT_LEVEl_9 = 'J',
+ SQUID_MISS_NONE = '1',
+ SQUID_MISS_ICP_AUTH = '2',
+ SQUID_MISS_HTTP_NON_CACHE = '3',
+ SQUID_MISS_ICP_STOPLIST = '4',
+ SQUID_MISS_HTTP_NO_DLE = '5',
+ SQUID_MISS_HTTP_NO_LE = '6',
+ SQUID_MISS_HTTP_CONTENT = '7',
+ SQUID_MISS_PRAGMA_NOCACHE = '8',
+ SQUID_MISS_PASS = '9',
+ SQUID_MISS_PRE_EXPIRED = 'a',
+ SQUID_MISS_ERROR = 'b',
+ SQUID_MISS_CACHE_BYPASS = 'c',
SQUID_HIT_MISS_INVALID_ASSIGNED_CODE = 'z',
// These are pre-allocated with special semantics, added here for convenience
- SQUID_HIT_RAM = SQUID_HIT_LEVEL_1,
- SQUID_HIT_SSD = SQUID_HIT_LEVEL_2,
- SQUID_HIT_DISK = SQUID_HIT_LEVEL_3,
+ SQUID_HIT_RAM = SQUID_HIT_LEVEL_1,
+ SQUID_HIT_SSD = SQUID_HIT_LEVEL_2,
+ SQUID_HIT_DISK = SQUID_HIT_LEVEL_3,
SQUID_HIT_CLUSTER = SQUID_HIT_LEVEL_4,
- SQUID_HIT_NET = SQUID_HIT_LEVEL_5
+ SQUID_HIT_NET = SQUID_HIT_LEVEL_5
};
enum HTTPType {
@@ -540,7 +540,7 @@ public:
field and not explicitly in the URL.
*/
char *url_string_get(Arena *arena = 0, ///< Arena to use, or @c malloc if NULL.
- int *length = 0 ///< Store string length here.
+ int *length = 0 ///< Store string length here.
);
/** Get a string with the effective URL in it.
This is automatically allocated if needed in the request heap.
@@ -986,7 +986,7 @@ is_header_keep_alive(const HTTPVersion &http_version, const MIMEField *con_hdr)
CON_TOKEN_CLOSE,
};
- int con_token = CON_TOKEN_NONE;
+ int con_token = CON_TOKEN_NONE;
HTTPKeepAlive keep_alive = HTTP_NO_KEEPALIVE;
// *unknown_tokens = false;
@@ -1017,12 +1017,12 @@ inline HTTPKeepAlive
HTTPHdr::keep_alive_get() const
{
HTTPKeepAlive retval = HTTP_NO_KEEPALIVE;
- const MIMEField *pc = this->field_find(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION);
+ const MIMEField *pc = this->field_find(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION);
if (pc != NULL) {
retval = is_header_keep_alive(this->version_get(), pc);
} else {
const MIMEField *c = this->field_find(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION);
- retval = is_header_keep_alive(this->version_get(), c);
+ retval = is_header_keep_alive(this->version_get(), c);
}
return retval;
}
@@ -1304,9 +1304,9 @@ HTTPHdr::scheme_get(int *length)
-------------------------------------------------------------------------*/
enum {
- CACHE_ALT_MAGIC_ALIVE = 0xabcddeed,
+ CACHE_ALT_MAGIC_ALIVE = 0xabcddeed,
CACHE_ALT_MAGIC_MARSHALED = 0xdcbadeed,
- CACHE_ALT_MAGIC_DEAD = 0xdeadeed,
+ CACHE_ALT_MAGIC_DEAD = 0xdeadeed,
};
// struct HTTPCacheAlt
@@ -1549,10 +1549,10 @@ inline void
HTTPInfo::object_key_get(INK_MD5 *md5)
{
int32_t *pi = reinterpret_cast<int32_t *>(md5);
- pi[0] = m_alt->m_object_key[0];
- pi[1] = m_alt->m_object_key[1];
- pi[2] = m_alt->m_object_key[2];
- pi[3] = m_alt->m_object_key[3];
+ pi[0] = m_alt->m_object_key[0];
+ pi[1] = m_alt->m_object_key[1];
+ pi[2] = m_alt->m_object_key[2];
+ pi[3] = m_alt->m_object_key[3];
}
inline bool
@@ -1577,7 +1577,7 @@ HTTPInfo::object_size_get()
inline void
HTTPInfo::object_key_set(INK_MD5 &md5)
{
- int32_t *pi = reinterpret_cast<int32_t *>(&md5);
+ int32_t *pi = reinterpret_cast<int32_t *>(&md5);
m_alt->m_object_key[0] = pi[0];
m_alt->m_object_key[1] = pi[1];
m_alt->m_object_key[2] = pi[2];
@@ -1587,7 +1587,7 @@ HTTPInfo::object_key_set(INK_MD5 &md5)
inline void
HTTPInfo::object_size_set(int64_t size)
{
- int32_t *pi = reinterpret_cast<int32_t *>(&size);
+ int32_t *pi = reinterpret_cast<int32_t *>(&size);
m_alt->m_object_size[0] = pi[0];
m_alt->m_object_size[1] = pi[1];
}
diff --git a/proxy/hdrs/HdrHeap.cc b/proxy/hdrs/HdrHeap.cc
index 4fe3c69..994fcde 100644
--- a/proxy/hdrs/HdrHeap.cc
+++ b/proxy/hdrs/HdrHeap.cc
@@ -90,10 +90,10 @@ inline void
HdrHeap::init()
{
m_data_start = m_free_start = ((char *)this) + HDR_HEAP_HDR_SIZE;
- m_magic = HDR_BUF_MAGIC_ALIVE;
- m_writeable = true;
+ m_magic = HDR_BUF_MAGIC_ALIVE;
+ m_writeable = true;
- m_next = NULL;
+ m_next = NULL;
m_free_size = m_size - HDR_HEAP_HDR_SIZE;
// We need to clear m_ptr directly since it's garbage and
@@ -102,10 +102,10 @@ HdrHeap::init()
m_read_write_heap.m_ptr = NULL;
for (int i = 0; i < HDR_BUF_RONLY_HEAPS; i++) {
- m_ronly_heap[i].m_heap_start = NULL;
+ m_ronly_heap[i].m_heap_start = NULL;
m_ronly_heap[i].m_ref_count_ptr.m_ptr = NULL;
- m_ronly_heap[i].m_locked = false;
- m_ronly_heap[i].m_heap_len = 0;
+ m_ronly_heap[i].m_locked = false;
+ m_ronly_heap[i].m_heap_len = 0;
}
m_lost_string_space = 0;
@@ -118,7 +118,7 @@ new_HdrHeap(int size)
HdrHeap *h;
if (size <= HDR_HEAP_DEFAULT_SIZE) {
size = HDR_HEAP_DEFAULT_SIZE;
- h = (HdrHeap *)(THREAD_ALLOC(hdrHeapAllocator, this_ethread()));
+ h = (HdrHeap *)(THREAD_ALLOC(hdrHeapAllocator, this_ethread()));
} else {
h = (HdrHeap *)ats_malloc(size);
}
@@ -147,10 +147,10 @@ new_HdrStrHeap(int requested_size)
HdrStrHeap *sh;
if (alloc_size <= HDR_STR_HEAP_DEFAULT_SIZE) {
alloc_size = HDR_STR_HEAP_DEFAULT_SIZE;
- sh = (HdrStrHeap *)(THREAD_ALLOC(strHeapAllocator, this_ethread()));
+ sh = (HdrStrHeap *)(THREAD_ALLOC(strHeapAllocator, this_ethread()));
} else {
alloc_size = ROUND(alloc_size, HDR_STR_HEAP_DEFAULT_SIZE * 2);
- sh = (HdrStrHeap *)ats_malloc(alloc_size);
+ sh = (HdrStrHeap *)ats_malloc(alloc_size);
}
// Debug("hdrs", "Allocated string heap in size %d", alloc_size);
@@ -158,10 +158,10 @@ new_HdrStrHeap(int requested_size)
// Patch virtual function table ptr
*((void **)sh) = *((void **)&str_proto_heap);
- sh->m_heap_size = alloc_size;
- sh->m_free_size = alloc_size - STR_HEAP_HDR_SIZE;
+ sh->m_heap_size = alloc_size;
+ sh->m_free_size = alloc_size - STR_HEAP_HDR_SIZE;
sh->m_free_start = ((char *)sh) + STR_HEAP_HDR_SIZE;
- sh->m_refcount = 0;
+ sh->m_refcount = 0;
ink_assert(sh->m_free_size > 0);
@@ -176,7 +176,7 @@ HdrHeap::destroy()
}
m_read_write_heap = NULL;
- for (int i = 0; i < HDR_BUF_RONLY_HEAPS; i++)
+ for (int i = 0; i < HDR_BUF_RONLY_HEAPS; i++)
m_ronly_heap[i].m_ref_count_ptr = NULL;
if (m_size == HDR_HEAP_DEFAULT_SIZE) {
@@ -238,7 +238,7 @@ HdrHeap::deallocate_obj(HdrHeapObjImpl *obj)
char *
HdrHeap::allocate_str(int nbytes)
{
- int last_size = 0;
+ int last_size = 0;
char *new_space = NULL;
ink_assert(m_writeable);
@@ -258,8 +258,8 @@ RETRY:
// First check to see if we have a read/write
// string heap
if (!m_read_write_heap) {
- int next_size = (last_size * 2) - STR_HEAP_HDR_SIZE;
- next_size = next_size > nbytes ? next_size : nbytes;
+ int next_size = (last_size * 2) - STR_HEAP_HDR_SIZE;
+ next_size = next_size > nbytes ? next_size : nbytes;
m_read_write_heap = new_HdrStrHeap(next_size);
}
// Try to allocate of our read/write string heap
@@ -332,8 +332,8 @@ HdrHeap::demote_rw_str_heap()
if (m_ronly_heap[i].m_heap_start == NULL) {
// We've found a slot
m_ronly_heap[i].m_ref_count_ptr = m_read_write_heap;
- m_ronly_heap[i].m_heap_start = (char *)m_read_write_heap.m_ptr;
- m_ronly_heap[i].m_heap_len = m_read_write_heap->m_heap_size - m_read_write_heap->m_free_size;
+ m_ronly_heap[i].m_heap_start = (char *)m_read_write_heap.m_ptr;
+ m_ronly_heap[i].m_heap_len = m_read_write_heap->m_heap_size - m_read_write_heap->m_free_size;
// Debug("hdrs", "Demoted rw heap of %d size", m_read_write_heap->m_heap_size);
m_read_write_heap = NULL;
@@ -377,8 +377,8 @@ HdrHeap::coalesce_str_heaps(int incoming_size)
for (int j = 0; j < HDR_BUF_RONLY_HEAPS; j++) {
if (m_ronly_heap[j].m_heap_start != NULL && m_ronly_heap[j].m_locked == false) {
m_ronly_heap[j].m_ref_count_ptr = NULL;
- m_ronly_heap[j].m_heap_start = NULL;
- m_ronly_heap[j].m_heap_len = 0;
+ m_ronly_heap[j].m_heap_start = NULL;
+ m_ronly_heap[j].m_heap_len = 0;
heaps_removed++;
}
}
@@ -489,7 +489,7 @@ HdrHeap::sanity_check_strs()
for (int i = 0; i < HDR_BUF_RONLY_HEAPS; i++) {
if (m_ronly_heap[i].m_heap_start != NULL) {
heaps[num_heaps].start = m_ronly_heap[i].m_heap_start;
- heaps[num_heaps].end = m_ronly_heap[i].m_heap_start + m_ronly_heap[i].m_heap_len;
+ heaps[num_heaps].end = m_ronly_heap[i].m_heap_start + m_ronly_heap[i].m_heap_len;
num_heaps++;
}
}
@@ -545,7 +545,7 @@ HdrHeap::marshal_length()
// If there is more than one HdrHeap block, we'll
// coalesce the HdrHeap blocks together so we
// only need one block header
- len = HDR_HEAP_HDR_SIZE;
+ len = HDR_HEAP_HDR_SIZE;
HdrHeap *h = this;
while (h) {
@@ -608,7 +608,7 @@ HdrHeap::marshal(char *buf, int len)
ink_assert((((uintptr_t)buf) & HDR_PTR_ALIGNMENT_MASK) == 0);
HdrHeap *marshal_hdr = (HdrHeap *)buf;
- char *b = buf + HDR_HEAP_HDR_SIZE;
+ char *b = buf + HDR_HEAP_HDR_SIZE;
// Variables for the ptr translation table
int ptr_xl_size = 2;
@@ -619,9 +619,9 @@ HdrHeap::marshal(char *buf, int len)
// and copying the pointer blocks to marshalled
// buffer
int ptr_heap_size = 0;
- int str_size = 0;
- int ptr_heaps = 0;
- int str_heaps = 0;
+ int str_size = 0;
+ int ptr_heaps = 0;
+ int str_heaps = 0;
// Variables used later on. Sunpro doesn't like
// bypassing initializations with gotos
@@ -647,8 +647,8 @@ HdrHeap::marshal(char *buf, int len)
}
// Add translation table entry for pointer heaps
// FIX ME - possible offset overflow issues?
- ptr_xlation[ptr_heaps].start = unmarshal_hdr->m_data_start;
- ptr_xlation[ptr_heaps].end = unmarshal_hdr->m_free_start;
+ ptr_xlation[ptr_heaps].start = unmarshal_hdr->m_data_start;
+ ptr_xlation[ptr_heaps].end = unmarshal_hdr->m_free_start;
ptr_xlation[ptr_heaps].offset = unmarshal_hdr->m_data_start - (b - buf);
ptr_heap_size += copy_size;
@@ -661,21 +661,21 @@ HdrHeap::marshal(char *buf, int len)
// Now that we've got the pointer blocks marshaled
// we can fill in the header on marshalled block
- marshal_hdr->m_free_start = NULL;
- marshal_hdr->m_data_start = (char *)HDR_HEAP_HDR_SIZE; // offset
- marshal_hdr->m_magic = HDR_BUF_MAGIC_MARSHALED;
- marshal_hdr->m_writeable = false;
- marshal_hdr->m_size = ptr_heap_size + HDR_HEAP_HDR_SIZE;
- marshal_hdr->m_next = NULL;
- marshal_hdr->m_free_size = 0;
+ marshal_hdr->m_free_start = NULL;
+ marshal_hdr->m_data_start = (char *)HDR_HEAP_HDR_SIZE; // offset
+ marshal_hdr->m_magic = HDR_BUF_MAGIC_MARSHALED;
+ marshal_hdr->m_writeable = false;
+ marshal_hdr->m_size = ptr_heap_size + HDR_HEAP_HDR_SIZE;
+ marshal_hdr->m_next = NULL;
+ marshal_hdr->m_free_size = 0;
marshal_hdr->m_read_write_heap.m_ptr = NULL;
- marshal_hdr->m_lost_string_space = this->m_lost_string_space;
+ marshal_hdr->m_lost_string_space = this->m_lost_string_space;
// We'have one read-only string heap after marshalling
- marshal_hdr->m_ronly_heap[0].m_heap_start = (char *)(intptr_t)marshal_hdr->m_size; // offset
+ marshal_hdr->m_ronly_heap[0].m_heap_start = (char *)(intptr_t)marshal_hdr->m_size; // offset
marshal_hdr->m_ronly_heap[0].m_ref_count_ptr.m_ptr = NULL;
- for (int i = 1; i < HDR_BUF_RONLY_HEAPS; i++)
+ for (int i = 1; i < HDR_BUF_RONLY_HEAPS; i++)
marshal_hdr->m_ronly_heap[i].m_heap_start = NULL;
// Next order of business is to copy over string heaps
@@ -691,7 +691,7 @@ HdrHeap::marshal(char *buf, int len)
if (m_read_write_heap) {
char *copy_start = ((char *)m_read_write_heap.m_ptr) + sizeof(HdrStrHeap);
- int nto_copy = m_read_write_heap->m_heap_size - (sizeof(HdrStrHeap) + m_read_write_heap->m_free_size);
+ int nto_copy = m_read_write_heap->m_heap_size - (sizeof(HdrStrHeap) + m_read_write_heap->m_free_size);
if (nto_copy > len) {
goto Failed;
@@ -700,8 +700,8 @@ HdrHeap::marshal(char *buf, int len)
memcpy(b, copy_start, nto_copy);
// FIX ME - possible offset overflow issues?
- str_xlation[str_heaps].start = copy_start;
- str_xlation[str_heaps].end = copy_start + nto_copy;
+ str_xlation[str_heaps].start = copy_start;
+ str_xlation[str_heaps].end = copy_start + nto_copy;
str_xlation[str_heaps].offset = copy_start - (b - buf);
b += nto_copy;
@@ -720,8 +720,8 @@ HdrHeap::marshal(char *buf, int len)
// Add translation table entry for string heaps
// FIX ME - possible offset overflow issues?
- str_xlation[str_heaps].start = m_ronly_heap[i].m_heap_start;
- str_xlation[str_heaps].end = m_ronly_heap[i].m_heap_start + m_ronly_heap[i].m_heap_len;
+ str_xlation[str_heaps].start = m_ronly_heap[i].m_heap_start;
+ str_xlation[str_heaps].end = m_ronly_heap[i].m_heap_start + m_ronly_heap[i].m_heap_len;
str_xlation[str_heaps].offset = str_xlation[str_heaps].start - (b - buf);
ink_assert(str_xlation[str_heaps].start <= str_xlation[str_heaps].end);
@@ -739,7 +739,7 @@ HdrHeap::marshal(char *buf, int len)
// and call the object marshal function to patch live
// strings pointers & live object pointers to offsets
{
- char *obj_data = ((char *)marshal_hdr) + HDR_HEAP_HDR_SIZE;
+ char *obj_data = ((char *)marshal_hdr) + HDR_HEAP_HDR_SIZE;
char *mheap_end = ((char *)marshal_hdr) + marshal_hdr->m_size;
while (obj_data < mheap_end) {
@@ -791,7 +791,7 @@ HdrHeap::marshal(char *buf, int len)
#ifdef HDR_HEAP_CHECKSUMS
{
- uint32_t chksum = compute_checksum(buf, used);
+ uint32_t chksum = compute_checksum(buf, used);
marshal_hdr->m_free_start = (char *)chksum;
}
#endif
@@ -874,9 +874,9 @@ HdrHeap::unmarshal(int buf_length, int obj_type, HdrHeapObjImpl **found_obj, Ref
#ifdef HDR_HEAP_CHECKSUMS
if (m_free_start != NULL) {
uint32_t stored_sum = (uint32_t)m_free_start;
- m_free_start = NULL;
- int sum_len = ROUND(unmarshal_size, HDR_PTR_SIZE);
- uint32_t new_sum = compute_checksum((void *)this, sum_len);
+ m_free_start = NULL;
+ int sum_len = ROUND(unmarshal_size, HDR_PTR_SIZE);
+ uint32_t new_sum = compute_checksum((void *)this, sum_len);
if (stored_sum != new_sum) {
fprintf(stderr, "WARNING: Unmarshal checksum comparison failed\n");
@@ -899,8 +899,8 @@ HdrHeap::unmarshal(int buf_length, int obj_type, HdrHeapObjImpl **found_obj, Ref
ink_assert(m_free_start == NULL);
// Convert Heap offsets to pointers
- m_data_start = ((char *)this) + (intptr_t)m_data_start;
- m_free_start = ((char *)this) + m_size;
+ m_data_start = ((char *)this) + (intptr_t)m_data_start;
+ m_free_start = ((char *)this) + m_size;
m_ronly_heap[0].m_heap_start = ((char *)this) + (intptr_t)m_ronly_heap[0].m_heap_start;
// Crazy Invarient - If we are sitting in a ref counted block,
@@ -918,7 +918,7 @@ HdrHeap::unmarshal(int buf_length, int obj_type, HdrHeapObjImpl **found_obj, Ref
}
// Loop over objects and swizzle there pointer to
// live offsets
- char *obj_data = m_data_start;
+ char *obj_data = m_data_start;
intptr_t offset = (intptr_t)this;
while (obj_data < m_free_start) {
@@ -984,10 +984,10 @@ HdrHeap::attach_str_heap(char *h_start, int h_len, RefCountObj *h_ref_obj, int *
}
m_ronly_heap[*index].m_ref_count_ptr = h_ref_obj;
- m_ronly_heap[*index].m_heap_start = h_start;
- m_ronly_heap[*index].m_heap_len = h_len;
- m_ronly_heap[*index].m_locked = false;
- *index = *index + 1;
+ m_ronly_heap[*index].m_heap_start = h_start;
+ m_ronly_heap[*index].m_heap_len = h_len;
+ m_ronly_heap[*index].m_locked = false;
+ *index = *index + 1;
return 1;
}
@@ -1005,8 +1005,8 @@ HdrHeap::inherit_string_heaps(const HdrHeap *inherit_from)
return;
int index, result;
- int first_free = HDR_BUF_RONLY_HEAPS; // default is out of array bounds
- int free_slots = 0;
+ int first_free = HDR_BUF_RONLY_HEAPS; // default is out of array bounds
+ int free_slots = 0;
int inherit_str_size = 0;
ink_assert(m_writeable);
@@ -1169,8 +1169,8 @@ HdrStrHeap::expand(char *ptr, int old_size, int new_size)
StrHeapDesc::StrHeapDesc()
{
m_heap_start = NULL;
- m_heap_len = 0;
- m_locked = false;
+ m_heap_len = 0;
+ m_locked = false;
}
struct StrTest {
@@ -1189,7 +1189,7 @@ REGRESSION_TEST(HdrHeap_Coalesce)(RegressionTest *t, int /* atype ATS_UNUSED */,
*/
// The amount of space we will need to overflow the StrHdrHeap is HDR_STR_HEAP_DEFAULT_SIZE - STR_HEAP_HDR_SIZE
- size_t next_rw_heap_size = HDR_STR_HEAP_DEFAULT_SIZE;
+ size_t next_rw_heap_size = HDR_STR_HEAP_DEFAULT_SIZE;
size_t next_required_overflow_size = next_rw_heap_size - STR_HEAP_HDR_SIZE;
char buf[next_required_overflow_size];
for (unsigned int i = 0; i < sizeof(buf); ++i) {
@@ -1198,7 +1198,7 @@ REGRESSION_TEST(HdrHeap_Coalesce)(RegressionTest *t, int /* atype ATS_UNUSED */,
TestBox tb(t, pstatus);
HdrHeap *heap = new_HdrHeap();
- URLImpl *url = url_create(heap);
+ URLImpl *url = url_create(heap);
tb.check(heap->m_read_write_heap.m_ptr == NULL, "Checking that we have no rw heap.");
url_path_set(heap, url, buf, next_required_overflow_size, true);
@@ -1210,7 +1210,7 @@ REGRESSION_TEST(HdrHeap_Coalesce)(RegressionTest *t, int /* atype ATS_UNUSED */,
// Now we have no ronly heaps in use and a completely full rwheap, so we will test that
// we demote to ronly heaps HDR_BUF_RONLY_HEAPS times.
for (int ronly_heap = 0; ronly_heap < HDR_BUF_RONLY_HEAPS; ++ronly_heap) {
- next_rw_heap_size = 2 * heap->m_read_write_heap->m_heap_size;
+ next_rw_heap_size = 2 * heap->m_read_write_heap->m_heap_size;
next_required_overflow_size = next_rw_heap_size - STR_HEAP_HDR_SIZE;
char buf2[next_required_overflow_size];
for (unsigned int i = 0; i < sizeof(buf2); ++i) {
diff --git a/proxy/hdrs/HdrHeap.h b/proxy/hdrs/HdrHeap.h
index cf206cd..8ab32d4 100644
--- a/proxy/hdrs/HdrHeap.h
+++ b/proxy/hdrs/HdrHeap.h
@@ -61,12 +61,12 @@
#define STR_HEAP_HDR_SIZE sizeof(HdrStrHeap)
enum {
- HDR_HEAP_OBJ_EMPTY = 0,
- HDR_HEAP_OBJ_RAW = 1,
- HDR_HEAP_OBJ_URL = 2,
- HDR_HEAP_OBJ_HTTP_HEADER = 3,
- HDR_HEAP_OBJ_MIME_HEADER = 4,
- HDR_HEAP_OBJ_FIELD_BLOCK = 5,
+ HDR_HEAP_OBJ_EMPTY = 0,
+ HDR_HEAP_OBJ_RAW = 1,
+ HDR_HEAP_OBJ_URL = 2,
+ HDR_HEAP_OBJ_HTTP_HEADER = 3,
+ HDR_HEAP_OBJ_MIME_HEADER = 4,
+ HDR_HEAP_OBJ_FIELD_BLOCK = 5,
HDR_HEAP_OBJ_FIELD_STANDALONE = 6, // not a type that lives in HdrHeaps
HDR_HEAP_OBJ_FIELD_SDK_HANDLE = 7, // not a type that lives in HdrHeaps
@@ -93,7 +93,7 @@ obj_is_aligned(HdrHeapObjImpl *obj)
inline void
obj_clear_data(HdrHeapObjImpl *obj)
{
- char *ptr = (char *)obj;
+ char *ptr = (char *)obj;
int hdr_length = sizeof(HdrHeapObjImpl);
memset(ptr + hdr_length, '\0', obj->m_length - hdr_length);
}
@@ -106,8 +106,8 @@ obj_copy_data(HdrHeapObjImpl *s_obj, HdrHeapObjImpl *d_obj)
ink_assert((s_obj->m_length == d_obj->m_length) && (s_obj->m_type == d_obj->m_type));
int hdr_length = sizeof(HdrHeapObjImpl);
- src = (char *)s_obj + hdr_length;
- dst = (char *)d_obj + hdr_length;
+ src = (char *)s_obj + hdr_length;
+ dst = (char *)d_obj + hdr_length;
memcpy(dst, src, d_obj->m_length - hdr_length);
}
@@ -120,8 +120,8 @@ obj_copy(HdrHeapObjImpl *s_obj, char *d_addr)
inline void
obj_init_header(HdrHeapObjImpl *obj, uint32_t type, uint32_t nbytes, uint32_t obj_flags)
{
- obj->m_type = type;
- obj->m_length = nbytes;
+ obj->m_type = type;
+ obj->m_length = nbytes;
obj->m_obj_flags = obj_flags;
}
@@ -129,10 +129,10 @@ obj_init_header(HdrHeapObjImpl *obj, uint32_t type, uint32_t nbytes, uint32_t ob
-------------------------------------------------------------------------*/
enum {
- HDR_BUF_MAGIC_ALIVE = 0xabcdfeed,
+ HDR_BUF_MAGIC_ALIVE = 0xabcdfeed,
HDR_BUF_MAGIC_MARSHALED = 0xdcbafeed,
- HDR_BUF_MAGIC_DEAD = 0xabcddead,
- HDR_BUF_MAGIC_CORRUPT = 0xbadbadcc
+ HDR_BUF_MAGIC_DEAD = 0xabcddead,
+ HDR_BUF_MAGIC_CORRUPT = 0xbadbadcc
};
struct StrHeapDesc {
@@ -224,13 +224,13 @@ public:
if (m_ronly_heap[j].m_heap_start == NULL) {
// move slot i to slot j
m_ronly_heap[j].m_ref_count_ptr = m_ronly_heap[i].m_ref_count_ptr;
- m_ronly_heap[j].m_heap_start = m_ronly_heap[i].m_heap_start;
- m_ronly_heap[j].m_heap_len = m_ronly_heap[i].m_heap_len;
- m_ronly_heap[j].m_locked = m_ronly_heap[i].m_locked;
+ m_ronly_heap[j].m_heap_start = m_ronly_heap[i].m_heap_start;
+ m_ronly_heap[j].m_heap_len = m_ronly_heap[i].m_heap_len;
+ m_ronly_heap[j].m_locked = m_ronly_heap[i].m_locked;
m_ronly_heap[i].m_ref_count_ptr = NULL;
- m_ronly_heap[i].m_heap_start = NULL;
- m_ronly_heap[i].m_heap_len = 0;
- m_ronly_heap[i].m_locked = false;
+ m_ronly_heap[i].m_heap_start = NULL;
+ m_ronly_heap[i].m_heap_len = 0;
+ m_ronly_heap[i].m_locked = false;
}
}
};
@@ -329,15 +329,29 @@ struct HeapCheck {
};
// Nasty macro to do string marshalling
-#define HDR_MARSHAL_STR(ptr, table, nentries) \
+#define HDR_MARSHAL_STR(ptr, table, nentries) \
+ if (ptr) { \
+ int found = 0; \
+ for (int i = 0; i < nentries; i++) { \
+ if (ptr >= table[i].start && ptr <= table[i].end) { \
+ ptr = (((char *)ptr) - (uintptr_t)table[i].offset); \
+ found = 1; \
+ break; \
+ } \
+ } \
+ ink_assert(found); \
+ if (found == 0) { \
+ return -1; \
+ } \
+ }
+
+// Nasty macro to do string marshalling
+#define HDR_MARSHAL_STR_1(ptr, table) \
if (ptr) { \
int found = 0; \
- for (int i = 0; i < nentries; i++) { \
- if (ptr >= table[i].start && ptr <= table[i].end) { \
- ptr = (((char *)ptr) - (uintptr_t)table[i].offset); \
- found = 1; \
- break; \
- } \
+ if (ptr >= table[0].start && ptr <= table[0].end) { \
+ ptr = (((char *)ptr) - (uintptr_t)table[0].offset); \
+ found = 1; \
} \
ink_assert(found); \
if (found == 0) { \
@@ -345,26 +359,12 @@ struct HeapCheck {
} \
}
-// Nasty macro to do string marshalling
-#define HDR_MARSHAL_STR_1(ptr, table) \
- if (ptr) { \
- int found = 0; \
- if (ptr >= table[0].start && ptr <= table[0].end) { \
- ptr = (((char *)ptr) - (uintptr_t)table[0].offset); \
- found = 1; \
- } \
- ink_assert(found); \
- if (found == 0) { \
- return -1; \
- } \
- }
-
#define HDR_MARSHAL_PTR(ptr, type, table, nentries) \
if (ptr) { \
int found = 0; \
for (int i = 0; i < nentries; i++) { \
if ((char *)ptr >= table[i].start && (char *)ptr <= table[i].end) { \
- ptr = (type *)(((char *)ptr) - (uintptr_t)table[i].offset); \
+ ptr = (type *)(((char *)ptr) - (uintptr_t)table[i].offset); \
found = 1; \
break; \
} \
@@ -379,7 +379,7 @@ struct HeapCheck {
if (ptr) { \
int found = 0; \
if ((char *)ptr >= table[0].start && (char *)ptr <= table[0].end) { \
- ptr = (type *)(((char *)ptr) - (uintptr_t)table[0].offset); \
+ ptr = (type *)(((char *)ptr) - (uintptr_t)table[0].offset); \
found = 1; \
} \
ink_assert(found); \
diff --git a/proxy/hdrs/HdrTSOnly.cc b/proxy/hdrs/HdrTSOnly.cc
index c6aef49..2055c92 100644
--- a/proxy/hdrs/HdrTSOnly.cc
+++ b/proxy/hdrs/HdrTSOnly.cc
@@ -56,7 +56,7 @@ HTTPHdr::parse_req(HTTPParser *parser, IOBufferReader *r, int *bytes_used, bool
ink_assert(m_http->m_polarity == HTTP_TYPE_REQUEST);
MIMEParseResult state = PARSE_CONT;
- *bytes_used = 0;
+ *bytes_used = 0;
do {
int64_t b_avail = r->block_read_avail();
@@ -66,7 +66,7 @@ HTTPHdr::parse_req(HTTPParser *parser, IOBufferReader *r, int *bytes_used, bool
}
tmp = start = r->start();
- end = start + b_avail;
+ end = start + b_avail;
int heap_slot = m_heap->attach_block(r->get_current_block(), start);
@@ -96,7 +96,7 @@ HTTPHdr::parse_resp(HTTPParser *parser, IOBufferReader *r, int *bytes_used, bool
ink_assert(m_http->m_polarity == HTTP_TYPE_RESPONSE);
MIMEParseResult state = PARSE_CONT;
- *bytes_used = 0;
+ *bytes_used = 0;
do {
int64_t b_avail = r->block_read_avail();
@@ -106,7 +106,7 @@ HTTPHdr::parse_resp(HTTPParser *parser, IOBufferReader *r, int *bytes_used, bool
}
tmp = start = r->start();
- end = start + b_avail;
+ end = start + b_avail;
int heap_slot = m_heap->attach_block(r->get_current_block(), start);
@@ -169,8 +169,8 @@ RETRY:
for (int i = 0; i < HDR_BUF_RONLY_HEAPS; i++) {
if (m_ronly_heap[i].m_heap_start == NULL) {
// Add block to heap in this slot
- m_ronly_heap[i].m_heap_start = (char *)use_start;
- m_ronly_heap[i].m_heap_len = (int)(b->end() - b->start());
+ m_ronly_heap[i].m_heap_start = (char *)use_start;
+ m_ronly_heap[i].m_heap_len = (int)(b->end() - b->start());
m_ronly_heap[i].m_ref_count_ptr = b->data;
// printf("Attaching block at %X for %d in slot %d\n",
// m_ronly_heap[i].m_heap_start,
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index 5ec020c..9a75b33 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -53,7 +53,7 @@ int
HdrTest::go(RegressionTest *t, int /* atype ATS_UNUSED */)
{
HdrTest::rtest = t;
- int status = 1;
+ int status = 1;
hdrtoken_init();
url_init();
@@ -137,7 +137,7 @@ HdrTest::test_error_page_selection()
int i;
int failures = 0;
- int nsets = sizeof(sets) / sizeof(sets[0]);
+ int nsets = sizeof(sets) / sizeof(sets[0]);
int ntests = sizeof(tests) / sizeof(tests[0]);
// (1) build fake hash table of sets
@@ -147,12 +147,12 @@ HdrTest::test_error_page_selection()
for (i = 0; i < nsets; i++) {
HttpBodySetRawData *body_set;
- body_set = (HttpBodySetRawData *)ats_malloc(sizeof(HttpBodySetRawData));
- body_set->magic = 0;
- body_set->set_name = (char *)(sets[i].set_name);
+ body_set = (HttpBodySetRawData *)ats_malloc(sizeof(HttpBodySetRawData));
+ body_set->magic = 0;
+ body_set->set_name = (char *)(sets[i].set_name);
body_set->content_language = (char *)(sets[i].content_language);
- body_set->content_charset = (char *)(sets[i].content_charset);
- body_set->table_of_pages = (RawHashTable *)1; // hack --- can't be NULL
+ body_set->content_charset = (char *)(sets[i].content_charset);
+ body_set->table_of_pages = (RawHashTable *)1; // hack --- can't be NULL
table_of_sets->setValue((RawHashTable_Key)(body_set->set_name), (RawHashTable_Value)body_set);
}
@@ -260,7 +260,7 @@ HdrTest::test_format_date()
time_t t, t2, t3;
char buffer[128], buffer2[128];
static const char *envstr = "TZ=GMT0";
- int failures = 0;
+ int failures = 0;
// shift into GMT timezone for cftime conversions
putenv((char *)envstr);
@@ -383,8 +383,8 @@ HdrTest::test_url()
failed = 0;
for (unsigned i = 0; i < countof(strs); i++) {
old_length = (int)strlen(strs[i]);
- start = strs[i];
- end = start + old_length;
+ start = strs[i];
+ end = start + old_length;
url.create(NULL);
err = url.parse(&start, end);
@@ -495,7 +495,7 @@ HdrTest::test_mime()
printf(" <<< MUST BE HAND-VERIFIED FOR FULL-BENEFIT>>>\n\n");
start = mime;
- end = start + strlen(start);
+ end = start + strlen(start);
mime_parser_init(&parser);
@@ -640,14 +640,14 @@ HdrTest::test_http_parser_eos_boundary_cases()
HTTPHdr req_hdr;
start = tests[i].msg;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
req_hdr.create(HTTP_TYPE_REQUEST);
http_parser_clear(&parser);
- orig_start = start;
- ret = req_hdr.parse_req(&parser, &start, end, true);
+ orig_start = start;
+ ret = req_hdr.parse_req(&parser, &start, end, true);
bytes_consumed = (int)(start - orig_start);
printf("======== test %d (length=%d, consumed=%d)\n", i, (int)strlen(tests[i].msg), bytes_consumed);
@@ -687,7 +687,7 @@ HdrTest::test_http_aux(const char *request, const char *response)
/*** (1) parse the request string into req_hdr ***/
start = request;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
http_parser_init(&parser);
@@ -730,7 +730,7 @@ HdrTest::test_http_aux(const char *request, const char *response)
/*** (3) parse the response string into rsp_hdr ***/
start = response;
- end = start + strlen(start);
+ end = start + strlen(start);
http_parser_clear(&parser);
http_parser_init(&parser);
@@ -770,9 +770,9 @@ HdrTest::test_http_aux(const char *request, const char *response)
do {
last_bufindex = bufindex;
- tmp = bufindex;
- buf[0] = '#'; // make it obvious if hdr.print doesn't print anything
- err = rsp_hdr.print(buf, NNN, &bufindex, &tmp);
+ tmp = bufindex;
+ buf[0] = '#'; // make it obvious if hdr.print doesn't print anything
+ err = rsp_hdr.print(buf, NNN, &bufindex, &tmp);
// printf("test_header: tmp = %d err = %d bufindex = %d\n", tmp, err, bufindex);
putchar('{');
@@ -986,7 +986,7 @@ comp_http_hdr(HTTPHdr *h1, HTTPHdr *h2)
h2_pbuf = (char *)ats_malloc(h2_len + 1);
p_index = p_dumpoffset = 0;
- rval = h1->print(h1_pbuf, h1_len, &p_index, &p_dumpoffset);
+ rval = h1->print(h1_pbuf, h1_len, &p_index, &p_dumpoffset);
if (rval != 1) {
ats_free(h1_pbuf);
ats_free(h2_pbuf);
@@ -994,7 +994,7 @@ comp_http_hdr(HTTPHdr *h1, HTTPHdr *h2)
}
p_index = p_dumpoffset = 0;
- rval = h2->print(h2_pbuf, h2_len, &p_index, &p_dumpoffset);
+ rval = h2->print(h2_pbuf, h2_len, &p_index, &p_dumpoffset);
if (rval != 1) {
ats_free(h1_pbuf);
ats_free(h2_pbuf);
@@ -1034,7 +1034,7 @@ HdrTest::test_http_hdr_copy_over_aux(int testnum, const char *request, const cha
req_hdr.create(HTTP_TYPE_REQUEST);
start = request;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
http_parser_init(&parser);
@@ -1055,7 +1055,7 @@ HdrTest::test_http_hdr_copy_over_aux(int testnum, const char *request, const cha
resp_hdr.create(HTTP_TYPE_RESPONSE);
start = response;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
http_parser_init(&parser);
@@ -1151,7 +1151,7 @@ HdrTest::test_http_hdr_null_char(int testnum, const char *request, const char *
strcpy(cpy_buf, start);
// Put a null character somewhere in the header
- int length = strlen(start);
+ int length = strlen(start);
cpy_buf[length / 2] = '\0';
http_parser_init(&parser);
@@ -1230,7 +1230,7 @@ HdrTest::test_http_hdr_print_and_copy_aux(int testnum, const char *request, cons
int cpy_bufsize = sizeof(cpy_buf);
int cpy_bufindex, cpy_dumpoffset, cpy_ret;
- char *marshal_buf = (char *)ats_malloc(2048);
+ char *marshal_buf = (char *)ats_malloc(2048);
int marshal_bufsize = sizeof(cpy_buf);
/*** (1) parse the request string into hdr ***/
@@ -1238,7 +1238,7 @@ HdrTest::test_http_hdr_print_and_copy_aux(int testnum, const char *request, cons
hdr.create(HTTP_TYPE_REQUEST);
start = request;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
http_parser_init(&parser);
@@ -1257,7 +1257,7 @@ HdrTest::test_http_hdr_print_and_copy_aux(int testnum, const char *request, cons
/*** (2) copy the request header ***/
HTTPHdr new_hdr, marshal_hdr;
RefCountObj ref;
- ref.m_refcount = 100;
+ ref.m_refcount = 100;
int marshal_len = hdr.m_heap->marshal(marshal_buf, marshal_bufsize);
marshal_hdr.create(HTTP_TYPE_REQUEST);
marshal_hdr.unmarshal(marshal_buf, marshal_len, &ref);
@@ -1267,10 +1267,10 @@ HdrTest::test_http_hdr_print_and_copy_aux(int testnum, const char *request, cons
/*** (3) print the request header and copy to buffers ***/
prt_bufindex = prt_dumpoffset = 0;
- prt_ret = hdr.print(prt_buf, prt_bufsize, &prt_bufindex, &prt_dumpoffset);
+ prt_ret = hdr.print(prt_buf, prt_bufsize, &prt_bufindex, &prt_dumpoffset);
cpy_bufindex = cpy_dumpoffset = 0;
- cpy_ret = new_hdr.print(cpy_buf, cpy_bufsize, &cpy_bufindex, &cpy_dumpoffset);
+ cpy_ret = new_hdr.print(cpy_buf, cpy_bufsize, &cpy_bufindex, &cpy_dumpoffset);
ats_free(marshal_buf);
@@ -1308,7 +1308,7 @@ HdrTest::test_http_hdr_print_and_copy_aux(int testnum, const char *request, cons
hdr.create(HTTP_TYPE_RESPONSE);
start = response;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
http_parser_init(&parser);
@@ -1331,10 +1331,10 @@ HdrTest::test_http_hdr_print_and_copy_aux(int testnum, const char *request, cons
/*** (3) print the response header and copy to buffers ***/
prt_bufindex = prt_dumpoffset = 0;
- prt_ret = hdr.print(prt_buf, prt_bufsize, &prt_bufindex, &prt_dumpoffset);
+ prt_ret = hdr.print(prt_buf, prt_bufsize, &prt_bufindex, &prt_dumpoffset);
cpy_bufindex = cpy_dumpoffset = 0;
- cpy_ret = new_hdr.print(cpy_buf, cpy_bufsize, &cpy_bufindex, &cpy_dumpoffset);
+ cpy_ret = new_hdr.print(cpy_buf, cpy_bufsize, &cpy_bufindex, &cpy_dumpoffset);
if ((prt_ret != 1) || (cpy_ret != 1)) {
printf("FAILED: (test #%d) couldn't print rsp hdr or copy --- prt_ret=%d, cpy_ret=%d\n", testnum, prt_ret, cpy_ret);
@@ -1565,7 +1565,7 @@ HdrTest::test_http_mutation()
/*** (1) parse the response string into req_hdr ***/
start = base_resp;
- end = start + strlen(start);
+ end = start + strlen(start);
http_parser_init(&parser);
@@ -1636,7 +1636,7 @@ HdrTest::test_http_mutation()
int
HdrTest::test_arena_aux(Arena *arena, int len)
{
- char *str = arena->str_alloc(len);
+ char *str = arena->str_alloc(len);
int verify_len = (int)arena->str_length(str);
if (len != verify_len) {
@@ -1856,7 +1856,7 @@ HdrTest::test_comma_vals()
int i, j, len, failures, ntests, ncommavals;
failures = 0;
- ntests = sizeof(tests) / sizeof(tests[0]);
+ ntests = sizeof(tests) / sizeof(tests[0]);
hdr.create(HTTP_TYPE_REQUEST);
@@ -1883,7 +1883,7 @@ HdrTest::test_comma_vals()
for (j = 0; j < tests[i].value_count; j++) {
const char *val = mime_field_value_get_comma_val(f, &len, j);
- int offset = ((val == NULL) ? -1 : (val - f->m_ptr_value));
+ int offset = ((val == NULL) ? -1 : (val - f->m_ptr_value));
if ((offset != tests[i].pieces[j].offset) || (len != tests[i].pieces[j].len)) {
++failures;
@@ -1955,7 +1955,7 @@ HdrTest::test_set_comma_vals()
int i, failures, ntests;
failures = 0;
- ntests = sizeof(tests) / sizeof(tests[0]);
+ ntests = sizeof(tests) / sizeof(tests[0]);
hdr.create(HTTP_TYPE_REQUEST);
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 78fd909..d2792af 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -377,7 +377,7 @@ hdrtoken_hash_init()
hdrtoken_hash_table[slot].wks);
++num_collisions;
}
- hdrtoken_hash_table[slot].wks = (const char *)wks;
+ hdrtoken_hash_table[slot].wks = (const char *)wks;
hdrtoken_hash_table[slot].hash = hash;
}
@@ -425,8 +425,8 @@ hdrtoken_init()
int heap_size = 0;
for (i = 0; i < (int)SIZEOF(_hdrtoken_strs); i++) {
- hdrtoken_str_lengths[i] = (int)strlen(_hdrtoken_strs[i]);
- int sstr_len = snap_up_to_multiple(hdrtoken_str_lengths[i] + 1, sizeof(HdrTokenHeapPrefix));
+ hdrtoken_str_lengths[i] = (int)strlen(_hdrtoken_strs[i]);
+ int sstr_len = snap_up_to_multiple(hdrtoken_str_lengths[i] + 1, sizeof(HdrTokenHeapPrefix));
int packed_prefix_str_len = sizeof(HdrTokenHeapPrefix) + sstr_len;
heap_size += packed_prefix_str_len;
}
@@ -441,13 +441,13 @@ hdrtoken_init()
memset(&prefix, 0, sizeof(HdrTokenHeapPrefix));
- prefix.wks_idx = i;
- prefix.wks_length = hdrtoken_str_lengths[i];
- prefix.wks_token_type = HDRTOKEN_TYPE_OTHER; // default, can override later
- prefix.wks_info.name = NULL; // default, can override later
- prefix.wks_info.slotid = MIME_SLOTID_NONE; // default, can override later
- prefix.wks_info.mask = TOK_64_CONST(0); // default, can override later
- prefix.wks_info.flags = MIME_FLAGS_MULTVALS; // default, can override later
+ prefix.wks_idx = i;
+ prefix.wks_length = hdrtoken_str_lengths[i];
+ prefix.wks_token_type = HDRTOKEN_TYPE_OTHER; // default, can override later
+ prefix.wks_info.name = NULL; // default, can override later
+ prefix.wks_info.slotid = MIME_SLOTID_NONE; // default, can override later
+ prefix.wks_info.mask = TOK_64_CONST(0); // default, can override later
+ prefix.wks_info.flags = MIME_FLAGS_MULTVALS; // default, can override later
int sstr_len = snap_up_to_multiple(hdrtoken_str_lengths[i] + 1, sizeof(HdrTokenHeapPrefix));
@@ -470,7 +470,7 @@ hdrtoken_init()
ink_assert((wks_idx >= 0) && (wks_idx < (int)SIZEOF(hdrtoken_strs)));
// coverity[negative_returns]
- prefix = hdrtoken_index_to_prefix(wks_idx);
+ prefix = hdrtoken_index_to_prefix(wks_idx);
prefix->wks_token_type = _hdrtoken_strs_type_initializers[i].type;
}
@@ -483,19 +483,19 @@ hdrtoken_init()
hdrtoken_tokenize_dfa(_hdrtoken_strs_field_initializers[i].name, (int)strlen(_hdrtoken_strs_field_initializers[i].name));
ink_assert((wks_idx >= 0) && (wks_idx < (int)SIZEOF(hdrtoken_strs)));
- prefix = hdrtoken_index_to_prefix(wks_idx);
+ prefix = hdrtoken_index_to_prefix(wks_idx);
prefix->wks_info.slotid = _hdrtoken_strs_field_initializers[i].slotid;
- prefix->wks_info.flags = _hdrtoken_strs_field_initializers[i].flags;
- prefix->wks_info.mask = _hdrtoken_strs_field_initializers[i].mask;
+ prefix->wks_info.flags = _hdrtoken_strs_field_initializers[i].flags;
+ prefix->wks_info.mask = _hdrtoken_strs_field_initializers[i].mask;
}
for (i = 0; i < (int)SIZEOF(_hdrtoken_strs); i++) {
- HdrTokenHeapPrefix *prefix = hdrtoken_index_to_prefix(i);
- prefix->wks_info.name = hdrtoken_strs[i];
- hdrtoken_str_token_types[i] = prefix->wks_token_type; // parallel array for speed
- hdrtoken_str_slotids[i] = prefix->wks_info.slotid; // parallel array for speed
- hdrtoken_str_masks[i] = prefix->wks_info.mask; // parallel array for speed
- hdrtoken_str_flags[i] = prefix->wks_info.flags; // parallel array for speed
+ HdrTokenHeapPrefix *prefix = hdrtoken_index_to_prefix(i);
+ prefix->wks_info.name = hdrtoken_strs[i];
+ hdrtoken_str_token_types[i] = prefix->wks_token_type; // parallel array for speed
+ hdrtoken_str_slotids[i] = prefix->wks_info.slotid; // parallel array for speed
+ hdrtoken_str_masks[i] = prefix->wks_info.mask; // parallel array for speed
+ hdrtoken_str_flags[i] = prefix->wks_info.flags; // parallel array for speed
}
hdrtoken_hash_init();
diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h
index 5e20670..e0b4dce 100644
--- a/proxy/hdrs/HdrToken.h
+++ b/proxy/hdrs/HdrToken.h
@@ -43,10 +43,10 @@
#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
enum HdrTokenType {
- HDRTOKEN_TYPE_OTHER = 0,
- HDRTOKEN_TYPE_FIELD = 1,
- HDRTOKEN_TYPE_METHOD = 2,
- HDRTOKEN_TYPE_SCHEME = 3,
+ HDRTOKEN_TYPE_OTHER = 0,
+ HDRTOKEN_TYPE_FIELD = 1,
+ HDRTOKEN_TYPE_METHOD = 2,
+ HDRTOKEN_TYPE_SCHEME = 3,
HDRTOKEN_TYPE_CACHE_CONTROL = 4
};
@@ -79,10 +79,10 @@ struct HdrTokenHeapPrefix {
};
enum HdrTokenInfoFlags {
- HTIF_NONE = 0,
- HTIF_COMMAS = 1 << 0,
- HTIF_MULTVALS = 1 << 1,
- HTIF_HOPBYHOP = 1 << 2,
+ HTIF_NONE = 0,
+ HTIF_COMMAS = 1 << 0,
+ HTIF_MULTVALS = 1 << 1,
+ HTIF_HOPBYHOP = 1 << 2,
HTIF_PROXYAUTH = 1 << 3
};
diff --git a/proxy/hdrs/HdrUtils.cc b/proxy/hdrs/HdrUtils.cc
index 5528fe9..4dc70d5 100644
--- a/proxy/hdrs/HdrUtils.cc
+++ b/proxy/hdrs/HdrUtils.cc
@@ -49,8 +49,8 @@ HdrCsvIter::find_csv()
RETRY:
- cur = m_csv_start;
- end = m_value_start + m_value_len;
+ cur = m_csv_start;
+ end = m_value_start + m_value_len;
last_data = NULL;
csv_start = NULL;
@@ -98,7 +98,7 @@ parse_value_quote:
GETNEXT();
goto parse_value_quote;
done:
- m_csv_end = cur;
+ m_csv_end = cur;
m_csv_start = csv_start;
if (last_data) {
@@ -140,7 +140,7 @@ HdrCsvIter::count_values(MIMEField *field, bool follow_dups)
int count, l;
count = 0;
- s = get_first(field, &l, follow_dups); // get index 0
+ s = get_first(field, &l, follow_dups); // get index 0
while (s) {
s = get_next(&l);
++count;
diff --git a/proxy/hdrs/HdrUtils.h b/proxy/hdrs/HdrUtils.h
index b588c43..dd720a2 100644
--- a/proxy/hdrs/HdrUtils.h
+++ b/proxy/hdrs/HdrUtils.h
@@ -103,10 +103,10 @@ private:
inline void
HdrCsvIter::field_init(const MIMEField *m)
{
- m_cur_field = m;
+ m_cur_field = m;
m_value_start = m->m_ptr_value;
- m_value_len = m->m_len_value;
- m_csv_start = m_value_start;
+ m_value_len = m->m_len_value;
+ m_csv_start = m_value_start;
}
inline const char *
@@ -117,7 +117,7 @@ HdrCsvIter::get_first(const MIMEField *m, int *len, bool follow_dups)
m_follow_dups = follow_dups;
m_bytes_consumed = 0;
- m_csv_index = -1;
+ m_csv_index = -1;
if (m_csv_start) {
find_csv();
diff --git a/proxy/hdrs/HttpCompat.cc b/proxy/hdrs/HttpCompat.cc
index b2b4173..83061e6 100644
--- a/proxy/hdrs/HttpCompat.cc
+++ b/proxy/hdrs/HttpCompat.cc
@@ -59,11 +59,11 @@ HttpCompat::parse_tok_list(StrList *list, int trim_quotes, const char *string, i
if ((string == NULL) || (list == NULL) || (sep == NUL))
return;
- s = string;
- l = s + len - 1;
+ s = string;
+ l = s + len - 1;
index = 0;
- hit_sep = 0;
+ hit_sep = 0;
s_before_skipping_ws = s;
while (s <= l) {
@@ -85,8 +85,8 @@ HttpCompat::parse_tok_list(StrList *list, int trim_quotes, const char *string, i
list->append_string(s_before_skipping_ws, 0);
++index;
s_before_skipping_ws = s + 1;
- s = s_before_skipping_ws;
- hit_sep = 1;
+ s = s_before_skipping_ws;
+ hit_sep = 1;
continue;
}
//////////////////////////////////////////////////////////////////
@@ -110,12 +110,12 @@ HttpCompat::parse_tok_list(StrList *list, int trim_quotes, const char *string, i
if (*s == quot) {
in_quote = 1;
- e = s + 1; // start after quote
+ e = s + 1; // start after quote
if (trim_quotes)
++s; // trim starting quote
} else {
in_quote = 0;
- e = s;
+ e = s;
}
while ((e <= l) && !is_unquoted_separator(*e)) {
@@ -232,7 +232,7 @@ HttpCompat::lookup_param_in_strlist(StrList *param_list, const char *param_name,
while (*s && ParseRules::is_ws(*s))
s++; // skip white
- for (cnt = 0; *s && (cnt < param_val_length - 1); s++, cnt++)
+ for (cnt = 0; *s && (cnt < param_val_length - 1); s++, cnt++)
param_val[cnt] = *s;
if (cnt < param_val_length)
param_val[cnt++] = '\0';
@@ -343,7 +343,7 @@ HttpCompat::parse_mime_type_with_len(const char *mime_string, int mime_string_le
char *d;
*type = *subtype = '\0';
- s_toofar = mime_string + mime_string_len;
+ s_toofar = mime_string + mime_string_len;
/////////////////////
// skip whitespace //
@@ -513,17 +513,17 @@ HttpCompat::match_accept_language(const char *lang_str, int lang_len, StrList *a
float Q, Q_wild;
Str *a_value;
- Q = -1; // will never be returned as -1
- Q_wild = -1; // will never be returned as -1
- int match_count = 0;
- int wild_match_count = 0;
+ Q = -1; // will never be returned as -1
+ Q_wild = -1; // will never be returned as -1
+ int match_count = 0;
+ int wild_match_count = 0;
int longest_match_len = 0;
- int index = 0;
- int Q_index = 0;
+ int index = 0;
+ int Q_index = 0;
int Q_wild_index = 0;
- *matching_index = 0;
+ *matching_index = 0;
*matching_length = 0;
///////////////////////////////////////////////////////
@@ -557,7 +557,7 @@ HttpCompat::match_accept_language(const char *lang_str, int lang_len, StrList *a
// was specified, this document matches all accept headers. //
/////////////////////////////////////////////////////////////////////
const char *atag_str = a_param_list.head->str;
- int atag_len = (int)a_param_list.head->len;
+ int atag_len = (int)a_param_list.head->len;
float tq = HttpCompat::find_Q_param_in_strlist(&a_param_list);
@@ -565,19 +565,19 @@ HttpCompat::match_accept_language(const char *lang_str, int lang_len, StrList *a
{
++wild_match_count;
if (tq > Q_wild) {
- Q_wild = tq;
+ Q_wild = tq;
Q_wild_index = index;
}
} else if (does_language_range_match(atag_str, atag_len, lang_str, lang_len)) {
++match_count;
if (atag_len > longest_match_len) {
longest_match_len = atag_len;
- Q = tq;
- Q_index = index;
+ Q = tq;
+ Q_index = index;
} else if (atag_len == longest_match_len) // if tie, pick higher Q
{
if (tq > Q) {
- Q = tq;
+ Q = tq;
Q_index = index;
}
}
@@ -585,17 +585,17 @@ HttpCompat::match_accept_language(const char *lang_str, int lang_len, StrList *a
}
if ((ignore_wildcards == false) && wild_match_count && !match_count) {
- *matching_index = Q_wild_index;
+ *matching_index = Q_wild_index;
*matching_length = 1;
return (Q_wild);
} else if (match_count > 0) // real match
{
- *matching_index = Q_index;
+ *matching_index = Q_index;
*matching_length = longest_match_len;
return (Q);
} else // no match
{
- *matching_index = 0;
+ *matching_index = 0;
*matching_length = 0;
return (0.0);
}
@@ -628,13 +628,13 @@ HttpCompat::match_accept_charset(const char *charset_str, int charset_len, StrLi
float Q, Q_wild;
Str *a_value;
- Q = -1; // will never be returned as -1
- Q_wild = -1; // will never be returned as -1
- int match_count = 0;
+ Q = -1; // will never be returned as -1
+ Q_wild = -1; // will never be returned as -1
+ int match_count = 0;
int wild_match_count = 0;
- int index = 0;
- int Q_index = 0;
+ int index = 0;
+ int Q_index = 0;
int Q_wild_index = 0;
*matching_index = 0;
@@ -665,20 +665,20 @@ HttpCompat::match_accept_charset(const char *charset_str, int charset_len, StrLi
// see if the Accept-Charset tag matches the current charset //
///////////////////////////////////////////////////////////////
const char *atag_str = a_param_list.head->str;
- int atag_len = (int)a_param_list.head->len;
- float tq = HttpCompat::find_Q_param_in_strlist(&a_param_list);
+ int atag_len = (int)a_param_list.head->len;
+ float tq = HttpCompat::find_Q_param_in_strlist(&a_param_list);
if ((atag_len == 1) && (atag_str[0] == '*')) // wildcard
{
++wild_match_count;
if (tq > Q_wild) {
- Q_wild = tq;
+ Q_wild = tq;
Q_wild_index = index;
}
} else if ((atag_len == charset_len) && (strncasecmp(atag_str, charset_str, charset_len) == 0)) {
++match_count;
if (tq > Q) {
- Q = tq;
+ Q = tq;
Q_index = index;
}
}
@@ -716,10 +716,10 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
HttpBodySetRawData *body_set;
set_best = "default";
- Q_best = 0.00001;
- La_best = 0;
- Lc_best = INT_MAX;
- I_best = INT_MAX;
+ Q_best = 0.00001;
+ La_best = 0;
+ Lc_best = INT_MAX;
+ I_best = INT_MAX;
Debug("body_factory_determine_set", " INITIAL: [ set_best='%s', Q=%g, La=%d, Lc=%d, I=%d ]", set_best, Q_best, La_best, Lc_best,
I_best);
@@ -740,11 +740,11 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
///////////////////////////////////////////
for (b1 = table_of_sets->firstBinding(&i1); b1 != NULL; b1 = table_of_sets->nextBinding(&i1)) {
- k1 = table_of_sets->getKeyFromBinding(b1);
- v1 = table_of_sets->getValueFromBinding(b1);
+ k1 = table_of_sets->getKeyFromBinding(b1);
+ v1 = table_of_sets->getValueFromBinding(b1);
const char *set_name = (const char *)k1;
- body_set = (HttpBodySetRawData *)v1;
+ body_set = (HttpBodySetRawData *)v1;
table_of_pages = body_set->table_of_pages;
if ((set_name == NULL) || (table_of_pages == NULL))
@@ -775,7 +775,7 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
Ql = (is_the_default_set ? 1.0001 : 1.000);
La = 0;
Lc = INT_MAX;
- I = 1;
+ I = 1;
Debug("body_factory_determine_set", " SET: [%-8s] A-L not present => [ Ql=%g, La=%d, Lc=%d, I=%d ]", set_name, Ql, La,
Lc, I);
} else {
@@ -802,7 +802,7 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
// if no Accept-Charset hdr at all, treat as a wildcard that
// slightly prefers "default".
if (acpt_charset_list->count == 0) {
- Qc = (is_the_default_set ? 1.0001 : 1.000);
+ Qc = (is_the_default_set ? 1.0001 : 1.000);
Idummy = 1;
Debug("body_factory_determine_set", " SET: [%-8s] A-C not present => [ Qc=%g ]", set_name, Qc);
} else {
@@ -840,10 +840,10 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
if (((Q > Q_best)) || ((Q == Q_best) && (La > La_best)) || ((Q == Q_best) && (La == La_best) && (Lc < Lc_best)) ||
((Q == Q_best) && (La == La_best) && (Lc == Lc_best) && (I < I_best))) {
- Q_best = Q;
- La_best = La;
- Lc_best = Lc;
- I_best = I;
+ Q_best = Q;
+ La_best = La;
+ Lc_best = Lc;
+ I_best = I;
set_best = set_name;
Debug("body_factory_determine_set", " WINNER: [ set_best='%s', Q=%g, La=%d, Lc=%d, I=%d ]", set_best, Q_best, La_best,
@@ -857,9 +857,9 @@ HttpCompat::determine_set_by_language(RawHashTable *table_of_sets, StrList *acpt
done:
- *Q_best_ptr = Q_best;
+ *Q_best_ptr = Q_best;
*La_best_ptr = La_best;
*Lc_best_ptr = Lc_best;
- *I_best_ptr = I_best;
+ *I_best_ptr = I_best;
return (set_best);
}
diff --git a/proxy/hdrs/MIME.cc b/proxy/hdrs/MIME.cc
index bc59907..b4d4e36 100644
--- a/proxy/hdrs/MIME.cc
+++ b/proxy/hdrs/MIME.cc
@@ -48,7 +48,7 @@
* C O N S T A N T S *
* *
***********************************************************************/
-static DFA *day_names_dfa = NULL;
+static DFA *day_names_dfa = NULL;
static DFA *month_names_dfa = NULL;
static const char *day_names[] = {
@@ -431,7 +431,7 @@ mime_hdr_presence_unset(MIMEHdrImpl *h, int well_known_str_index)
inline void
mime_hdr_init_accelerators_and_presence_bits(MIMEHdrImpl *mh)
{
- mh->m_presence_bits = 0;
+ mh->m_presence_bits = 0;
mh->m_slot_accelerators[0] = 0xFFFFFFFF;
mh->m_slot_accelerators[1] = 0xFFFFFFFF;
mh->m_slot_accelerators[2] = 0xFFFFFFFF;
@@ -443,10 +443,10 @@ mime_hdr_get_accelerator_slotnum(MIMEHdrImpl *mh, int32_t slot_id)
{
ink_assert((slot_id != MIME_SLOTID_NONE) && (slot_id < 32));
- uint32_t word_index = slot_id / 8; // 4 words of 8 slots
- uint32_t word = mh->m_slot_accelerators[word_index]; // 8 slots of 4 bits each
- uint32_t nybble = slot_id % 8; // which of the 8 nybbles?
- uint32_t slot = ((word >> (nybble * 4)) & 15); // grab the 4 bit slotnum
+ uint32_t word_index = slot_id / 8; // 4 words of 8 slots
+ uint32_t word = mh->m_slot_accelerators[word_index]; // 8 slots of 4 bits each
+ uint32_t nybble = slot_id % 8; // which of the 8 nybbles?
+ uint32_t slot = ((word >> (nybble * 4)) & 15); // grab the 4 bit slotnum
return slot;
}
@@ -456,13 +456,13 @@ mime_hdr_set_accelerator_slotnum(MIMEHdrImpl *mh, int32_t slot_id, uint32_t slot
ink_assert((slot_id != MIME_SLOTID_NONE) && (slot_id < 32));
ink_assert(slot_num < 16);
- uint32_t word_index = slot_id / 8; // 4 words of 8 slots
- uint32_t word = mh->m_slot_accelerators[word_index]; // 8 slots of 4 bits each
- uint32_t nybble = slot_id % 8; // which of the 8 nybbles?
- uint32_t shift = nybble * 4; // shift in chunks of 4 bits
- uint32_t mask = ~(MIME_FIELD_SLOTNUM_MASK << shift); // mask to zero out old slot
- uint32_t graft = (slot_num << shift); // plug to insert into slot
- uint32_t new_word = (word & mask) | graft; // new value
+ uint32_t word_index = slot_id / 8; // 4 words of 8 slots
+ uint32_t word = mh->m_slot_accelerators[word_index]; // 8 slots of 4 bits each
+ uint32_t nybble = slot_id % 8; // which of the 8 nybbles?
+ uint32_t shift = nybble * 4; // shift in chunks of 4 bits
+ uint32_t mask = ~(MIME_FIELD_SLOTNUM_MASK << shift); // mask to zero out old slot
+ uint32_t graft = (slot_num << shift); // plug to insert into slot
+ uint32_t new_word = (word & mask) | graft; // new value
mh->m_slot_accelerators[word_index] = new_word;
}
@@ -547,8 +547,8 @@ mime_hdr_sanity_check(MIMEHdrImpl *mh)
uint32_t slot_index, index;
uint64_t masksum;
- masksum = 0;
- slot_index = 0;
+ masksum = 0;
+ slot_index = 0;
last_fblock = NULL;
for (fblock = &(mh->m_first_fblock); fblock != NULL; fblock = fblock->m_next) {
@@ -582,7 +582,7 @@ mime_hdr_sanity_check(MIMEHdrImpl *mh)
// if this is a well known string, check presence bits & slot accelerators
if (field->m_wks_idx >= 0) {
const char *wks = hdrtoken_index_to_wks(field->m_wks_idx);
- int len = hdrtoken_index_to_length(field->m_wks_idx);
+ int len = hdrtoken_index_to_length(field->m_wks_idx);
if (field->m_len_name != len || strncasecmp(field->m_ptr_name, wks, field->m_len_name) != 0)
Warning("Encountered WKS hash collision on '%.*s'", field->m_len_name, field->m_ptr_name);
@@ -648,267 +648,267 @@ mime_init()
month_names_dfa = new DFA;
month_names_dfa->compile(month_names, SIZEOF(month_names), RE_CASE_INSENSITIVE);
- MIME_FIELD_ACCEPT = hdrtoken_string_to_wks("Accept");
- MIME_FIELD_ACCEPT_CHARSET = hdrtoken_string_to_wks("Accept-Charset");
- MIME_FIELD_ACCEPT_ENCODING = hdrtoken_string_to_wks("Accept-Encoding");
- MIME_FIELD_ACCEPT_LANGUAGE = hdrtoken_string_to_wks("Accept-Language");
- MIME_FIELD_ACCEPT_RANGES = hdrtoken_string_to_wks("Accept-Ranges");
- MIME_FIELD_AGE = hdrtoken_string_to_wks("Age");
- MIME_FIELD_ALLOW = hdrtoken_string_to_wks("Allow");
- MIME_FIELD_APPROVED = hdrtoken_string_to_wks("Approved");
- MIME_FIELD_AUTHORIZATION = hdrtoken_string_to_wks("Authorization");
- MIME_FIELD_BYTES = hdrtoken_string_to_wks("Bytes");
- MIME_FIELD_CACHE_CONTROL = hdrtoken_string_to_wks("Cache-Control");
- MIME_FIELD_CLIENT_IP = hdrtoken_string_to_wks("Client-ip");
- MIME_FIELD_CONNECTION = hdrtoken_string_to_wks("Connection");
- MIME_FIELD_CONTENT_BASE = hdrtoken_string_to_wks("Content-Base");
- MIME_FIELD_CONTENT_ENCODING = hdrtoken_string_to_wks("Content-Encoding");
- MIME_FIELD_CONTENT_LANGUAGE = hdrtoken_string_to_wks("Content-Language");
- MIME_FIELD_CONTENT_LENGTH = hdrtoken_string_to_wks("Content-Length");
- MIME_FIELD_CONTENT_LOCATION = hdrtoken_string_to_wks("Content-Location");
- MIME_FIELD_CONTENT_MD5 = hdrtoken_string_to_wks("Content-MD5");
- MIME_FIELD_CONTENT_RANGE = hdrtoken_string_to_wks("Content-Range");
- MIME_FIELD_CONTENT_TYPE = hdrtoken_string_to_wks("Content-Type");
- MIME_FIELD_CONTROL = hdrtoken_string_to_wks("Control");
- MIME_FIELD_COOKIE = hdrtoken_string_to_wks("Cookie");
- MIME_FIELD_DATE = hdrtoken_string_to_wks("Date");
- MIME_FIELD_DISTRIBUTION = hdrtoken_string_to_wks("Distribution");
- MIME_FIELD_ETAG = hdrtoken_string_to_wks("Etag");
- MIME_FIELD_EXPECT = hdrtoken_string_to_wks("Expect");
- MIME_FIELD_EXPIRES = hdrtoken_string_to_wks("Expires");
- MIME_FIELD_FOLLOWUP_TO = hdrtoken_string_to_wks("Followup-To");
- MIME_FIELD_FROM = hdrtoken_string_to_wks("From");
- MIME_FIELD_HOST = hdrtoken_string_to_wks("Host");
- MIME_FIELD_IF_MATCH = hdrtoken_string_to_wks("If-Match");
- MIME_FIELD_IF_MODIFIED_SINCE = hdrtoken_string_to_wks("If-Modified-Since");
- MIME_FIELD_IF_NONE_MATCH = hdrtoken_string_to_wks("If-None-Match");
- MIME_FIELD_IF_RANGE = hdrtoken_string_to_wks("If-Range");
- MIME_FIELD_IF_UNMODIFIED_SINCE = hdrtoken_string_to_wks("If-Unmodified-Since");
- MIME_FIELD_KEEP_ALIVE = hdrtoken_string_to_wks("Keep-Alive");
- MIME_FIELD_KEYWORDS = hdrtoken_string_to_wks("Keywords");
- MIME_FIELD_LAST_MODIFIED = hdrtoken_string_to_wks("Last-Modified");
- MIME_FIELD_LINES = hdrtoken_string_to_wks("Lines");
- MIME_FIELD_LOCATION = hdrtoken_string_to_wks("Location");
- MIME_FIELD_MAX_FORWARDS = hdrtoken_string_to_wks("Max-Forwards");
- MIME_FIELD_MESSAGE_ID = hdrtoken_string_to_wks("Message-ID");
- MIME_FIELD_NEWSGROUPS = hdrtoken_string_to_wks("Newsgroups");
- MIME_FIELD_ORGANIZATION = hdrtoken_string_to_wks("Organization");
- MIME_FIELD_PATH = hdrtoken_string_to_wks("Path");
- MIME_FIELD_PRAGMA = hdrtoken_string_to_wks("Pragma");
- MIME_FIELD_PROXY_AUTHENTICATE = hdrtoken_string_to_wks("Proxy-Authenticate");
- MIME_FIELD_PROXY_AUTHORIZATION = hdrtoken_string_to_wks("Proxy-Authorization");
- MIME_FIELD_PROXY_CONNECTION = hdrtoken_string_to_wks("Proxy-Connection");
- MIME_FIELD_PUBLIC = hdrtoken_string_to_wks("Public");
- MIME_FIELD_RANGE = hdrtoken_string_to_wks("Range");
- MIME_FIELD_REFERENCES = hdrtoken_string_to_wks("References");
- MIME_FIELD_REFERER = hdrtoken_string_to_wks("Referer");
- MIME_FIELD_REPLY_TO = hdrtoken_string_to_wks("Reply-To");
- MIME_FIELD_RETRY_AFTER = hdrtoken_string_to_wks("Retry-After");
- MIME_FIELD_SENDER = hdrtoken_string_to_wks("Sender");
- MIME_FIELD_SERVER = hdrtoken_string_to_wks("Server");
- MIME_FIELD_SET_COOKIE = hdrtoken_string_to_wks("Set-Cookie");
+ MIME_FIELD_ACCEPT = hdrtoken_string_to_wks("Accept");
+ MIME_FIELD_ACCEPT_CHARSET = hdrtoken_string_to_wks("Accept-Charset");
+ MIME_FIELD_ACCEPT_ENCODING = hdrtoken_string_to_wks("Accept-Encoding");
+ MIME_FIELD_ACCEPT_LANGUAGE = hdrtoken_string_to_wks("Accept-Language");
+ MIME_FIELD_ACCEPT_RANGES = hdrtoken_string_to_wks("Accept-Ranges");
+ MIME_FIELD_AGE = hdrtoken_string_to_wks("Age");
+ MIME_FIELD_ALLOW = hdrtoken_string_to_wks("Allow");
+ MIME_FIELD_APPROVED = hdrtoken_string_to_wks("Approved");
+ MIME_FIELD_AUTHORIZATION = hdrtoken_string_to_wks("Authorization");
+ MIME_FIELD_BYTES = hdrtoken_string_to_wks("Bytes");
+ MIME_FIELD_CACHE_CONTROL = hdrtoken_string_to_wks("Cache-Control");
+ MIME_FIELD_CLIENT_IP = hdrtoken_string_to_wks("Client-ip");
+ MIME_FIELD_CONNECTION = hdrtoken_string_to_wks("Connection");
+ MIME_FIELD_CONTENT_BASE = hdrtoken_string_to_wks("Content-Base");
+ MIME_FIELD_CONTENT_ENCODING = hdrtoken_string_to_wks("Content-Encoding");
+ MIME_FIELD_CONTENT_LANGUAGE = hdrtoken_string_to_wks("Content-Language");
+ MIME_FIELD_CONTENT_LENGTH = hdrtoken_string_to_wks("Content-Length");
+ MIME_FIELD_CONTENT_LOCATION = hdrtoken_string_to_wks("Content-Location");
+ MIME_FIELD_CONTENT_MD5 = hdrtoken_string_to_wks("Content-MD5");
+ MIME_FIELD_CONTENT_RANGE = hdrtoken_string_to_wks("Content-Range");
+ MIME_FIELD_CONTENT_TYPE = hdrtoken_string_to_wks("Content-Type");
+ MIME_FIELD_CONTROL = hdrtoken_string_to_wks("Control");
+ MIME_FIELD_COOKIE = hdrtoken_string_to_wks("Cookie");
+ MIME_FIELD_DATE = hdrtoken_string_to_wks("Date");
+ MIME_FIELD_DISTRIBUTION = hdrtoken_string_to_wks("Distribution");
+ MIME_FIELD_ETAG = hdrtoken_string_to_wks("Etag");
+ MIME_FIELD_EXPECT = hdrtoken_string_to_wks("Expect");
+ MIME_FIELD_EXPIRES = hdrtoken_string_to_wks("Expires");
+ MIME_FIELD_FOLLOWUP_TO = hdrtoken_string_to_wks("Followup-To");
+ MIME_FIELD_FROM = hdrtoken_string_to_wks("From");
+ MIME_FIELD_HOST = hdrtoken_string_to_wks("Host");
+ MIME_FIELD_IF_MATCH = hdrtoken_string_to_wks("If-Match");
+ MIME_FIELD_IF_MODIFIED_SINCE = hdrtoken_string_to_wks("If-Modified-Since");
+ MIME_FIELD_IF_NONE_MATCH = hdrtoken_string_to_wks("If-None-Match");
+ MIME_FIELD_IF_RANGE = hdrtoken_string_to_wks("If-Range");
+ MIME_FIELD_IF_UNMODIFIED_SINCE = hdrtoken_string_to_wks("If-Unmodified-Since");
+ MIME_FIELD_KEEP_ALIVE = hdrtoken_string_to_wks("Keep-Alive");
+ MIME_FIELD_KEYWORDS = hdrtoken_string_to_wks("Keywords");
+ MIME_FIELD_LAST_MODIFIED = hdrtoken_string_to_wks("Last-Modified");
+ MIME_FIELD_LINES = hdrtoken_string_to_wks("Lines");
+ MIME_FIELD_LOCATION = hdrtoken_string_to_wks("Location");
+ MIME_FIELD_MAX_FORWARDS = hdrtoken_string_to_wks("Max-Forwards");
+ MIME_FIELD_MESSAGE_ID = hdrtoken_string_to_wks("Message-ID");
+ MIME_FIELD_NEWSGROUPS = hdrtoken_string_to_wks("Newsgroups");
+ MIME_FIELD_ORGANIZATION = hdrtoken_string_to_wks("Organization");
+ MIME_FIELD_PATH = hdrtoken_string_to_wks("Path");
+ MIME_FIELD_PRAGMA = hdrtoken_string_to_wks("Pragma");
+ MIME_FIELD_PROXY_AUTHENTICATE = hdrtoken_string_to_wks("Proxy-Authenticate");
+ MIME_FIELD_PROXY_AUTHORIZATION = hdrtoken_string_to_wks("Proxy-Authorization");
+ MIME_FIELD_PROXY_CONNECTION = hdrtoken_string_to_wks("Proxy-Connection");
+ MIME_FIELD_PUBLIC = hdrtoken_string_to_wks("Public");
+ MIME_FIELD_RANGE = hdrtoken_string_to_wks("Range");
+ MIME_FIELD_REFERENCES = hdrtoken_string_to_wks("References");
+ MIME_FIELD_REFERER = hdrtoken_string_to_wks("Referer");
+ MIME_FIELD_REPLY_TO = hdrtoken_string_to_wks("Reply-To");
+ MIME_FIELD_RETRY_AFTER = hdrtoken_string_to_wks("Retry-After");
+ MIME_FIELD_SENDER = hdrtoken_string_to_wks("Sender");
+ MIME_FIELD_SERVER = hdrtoken_string_to_wks("Server");
+ MIME_FIELD_SET_COOKIE = hdrtoken_string_to_wks("Set-Cookie");
MIME_FIELD_STRICT_TRANSPORT_SECURITY = hdrtoken_string_to_wks("Strict-Transport-Security");
- MIME_FIELD_SUBJECT = hdrtoken_string_to_wks("Subject");
- MIME_FIELD_SUMMARY = hdrtoken_string_to_wks("Summary");
- MIME_FIELD_TE = hdrtoken_string_to_wks("TE");
- MIME_FIELD_TRANSFER_ENCODING = hdrtoken_string_to_wks("Transfer-Encoding");
- MIME_FIELD_UPGRADE = hdrtoken_string_to_wks("Upgrade");
- MIME_FIELD_USER_AGENT = hdrtoken_string_to_wks("User-Agent");
- MIME_FIELD_VARY = hdrtoken_string_to_wks("Vary");
- MIME_FIELD_VIA = hdrtoken_string_to_wks("Via");
- MIME_FIELD_WARNING = hdrtoken_string_to_wks("Warning");
- MIME_FIELD_WWW_AUTHENTICATE = hdrtoken_string_to_wks("Www-Authenticate");
- MIME_FIELD_XREF = hdrtoken_string_to_wks("Xref");
- MIME_FIELD_ATS_INTERNAL = hdrtoken_string_to_wks("@Ats-Internal");
- MIME_FIELD_X_ID = hdrtoken_string_to_wks("X-ID");
- MIME_FIELD_X_FORWARDED_FOR = hdrtoken_string_to_wks("X-Forwarded-For");
-
- MIME_FIELD_SEC_WEBSOCKET_KEY = hdrtoken_string_to_wks("Sec-WebSocket-Key");
+ MIME_FIELD_SUBJECT = hdrtoken_string_to_wks("Subject");
+ MIME_FIELD_SUMMARY = hdrtoken_string_to_wks("Summary");
+ MIME_FIELD_TE = hdrtoken_string_to_wks("TE");
+ MIME_FIELD_TRANSFER_ENCODING = hdrtoken_string_to_wks("Transfer-Encoding");
+ MIME_FIELD_UPGRADE = hdrtoken_string_to_wks("Upgrade");
+ MIME_FIELD_USER_AGENT = hdrtoken_string_to_wks("User-Agent");
+ MIME_FIELD_VARY = hdrtoken_string_to_wks("Vary");
+ MIME_FIELD_VIA = hdrtoken_string_to_wks("Via");
+ MIME_FIELD_WARNING = hdrtoken_string_to_wks("Warning");
+ MIME_FIELD_WWW_AUTHENTICATE = hdrtoken_string_to_wks("Www-Authenticate");
+ MIME_FIELD_XREF = hdrtoken_string_to_wks("Xref");
+ MIME_FIELD_ATS_INTERNAL = hdrtoken_string_to_wks("@Ats-Internal");
+ MIME_FIELD_X_ID = hdrtoken_string_to_wks("X-ID");
+ MIME_FIELD_X_FORWARDED_FOR = hdrtoken_string_to_wks("X-Forwarded-For");
+
+ MIME_FIELD_SEC_WEBSOCKET_KEY = hdrtoken_string_to_wks("Sec-WebSocket-Key");
MIME_FIELD_SEC_WEBSOCKET_VERSION = hdrtoken_string_to_wks("Sec-WebSocket-Version");
MIME_FIELD_HTTP2_SETTINGS = hdrtoken_string_to_wks("HTTP2-Settings");
- MIME_LEN_ACCEPT = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT);
- MIME_LEN_ACCEPT_CHARSET = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_CHARSET);
- MIME_LEN_ACCEPT_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_ENCODING);
- MIME_LEN_ACCEPT_LANGUAGE = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_LANGUAGE);
- MIME_LEN_ACCEPT_RANGES = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_RANGES);
- MIME_LEN_AGE = hdrtoken_wks_to_length(MIME_FIELD_AGE);
- MIME_LEN_ALLOW = hdrtoken_wks_to_length(MIME_FIELD_ALLOW);
- MIME_LEN_APPROVED = hdrtoken_wks_to_length(MIME_FIELD_APPROVED);
- MIME_LEN_AUTHORIZATION = hdrtoken_wks_to_length(MIME_FIELD_AUTHORIZATION);
- MIME_LEN_BYTES = hdrtoken_wks_to_length(MIME_FIELD_BYTES);
- MIME_LEN_CACHE_CONTROL = hdrtoken_wks_to_length(MIME_FIELD_CACHE_CONTROL);
- MIME_LEN_CLIENT_IP = hdrtoken_wks_to_length(MIME_FIELD_CLIENT_IP);
- MIME_LEN_CONNECTION = hdrtoken_wks_to_length(MIME_FIELD_CONNECTION);
- MIME_LEN_CONTENT_BASE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_BASE);
- MIME_LEN_CONTENT_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_ENCODING);
- MIME_LEN_CONTENT_LANGUAGE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_LANGUAGE);
- MIME_LEN_CONTENT_LENGTH = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_LENGTH);
- MIME_LEN_CONTENT_LOCATION = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_LOCATION);
- MIME_LEN_CONTENT_MD5 = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_MD5);
- MIME_LEN_CONTENT_RANGE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_RANGE);
- MIME_LEN_CONTENT_TYPE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_TYPE);
- MIME_LEN_CONTROL = hdrtoken_wks_to_length(MIME_FIELD_CONTROL);
- MIME_LEN_COOKIE = hdrtoken_wks_to_length(MIME_FIELD_COOKIE);
- MIME_LEN_DATE = hdrtoken_wks_to_length(MIME_FIELD_DATE);
- MIME_LEN_DISTRIBUTION = hdrtoken_wks_to_length(MIME_FIELD_DISTRIBUTION);
- MIME_LEN_ETAG = hdrtoken_wks_to_length(MIME_FIELD_ETAG);
- MIME_LEN_EXPECT = hdrtoken_wks_to_length(MIME_FIELD_EXPECT);
- MIME_LEN_EXPIRES = hdrtoken_wks_to_length(MIME_FIELD_EXPIRES);
- MIME_LEN_FOLLOWUP_TO = hdrtoken_wks_to_length(MIME_FIELD_FOLLOWUP_TO);
- MIME_LEN_FROM = hdrtoken_wks_to_length(MIME_FIELD_FROM);
- MIME_LEN_HOST = hdrtoken_wks_to_length(MIME_FIELD_HOST);
- MIME_LEN_IF_MATCH = hdrtoken_wks_to_length(MIME_FIELD_IF_MATCH);
- MIME_LEN_IF_MODIFIED_SINCE = hdrtoken_wks_to_length(MIME_FIELD_IF_MODIFIED_SINCE);
- MIME_LEN_IF_NONE_MATCH = hdrtoken_wks_to_length(MIME_FIELD_IF_NONE_MATCH);
- MIME_LEN_IF_RANGE = hdrtoken_wks_to_length(MIME_FIELD_IF_RANGE);
- MIME_LEN_IF_UNMODIFIED_SINCE = hdrtoken_wks_to_length(MIME_FIELD_IF_UNMODIFIED_SINCE);
- MIME_LEN_KEEP_ALIVE = hdrtoken_wks_to_length(MIME_FIELD_KEEP_ALIVE);
- MIME_LEN_KEYWORDS = hdrtoken_wks_to_length(MIME_FIELD_KEYWORDS);
- MIME_LEN_LAST_MODIFIED = hdrtoken_wks_to_length(MIME_FIELD_LAST_MODIFIED);
- MIME_LEN_LINES = hdrtoken_wks_to_length(MIME_FIELD_LINES);
- MIME_LEN_LOCATION = hdrtoken_wks_to_length(MIME_FIELD_LOCATION);
- MIME_LEN_MAX_FORWARDS = hdrtoken_wks_to_length(MIME_FIELD_MAX_FORWARDS);
- MIME_LEN_MESSAGE_ID = hdrtoken_wks_to_length(MIME_FIELD_MESSAGE_ID);
- MIME_LEN_NEWSGROUPS = hdrtoken_wks_to_length(MIME_FIELD_NEWSGROUPS);
- MIME_LEN_ORGANIZATION = hdrtoken_wks_to_length(MIME_FIELD_ORGANIZATION);
- MIME_LEN_PATH = hdrtoken_wks_to_length(MIME_FIELD_PATH);
- MIME_LEN_PRAGMA = hdrtoken_wks_to_length(MIME_FIELD_PRAGMA);
- MIME_LEN_PROXY_AUTHENTICATE = hdrtoken_wks_to_length(MIME_FIELD_PROXY_AUTHENTICATE);
- MIME_LEN_PROXY_AUTHORIZATION = hdrtoken_wks_to_length(MIME_FIELD_PROXY_AUTHORIZATION);
- MIME_LEN_PROXY_CONNECTION = hdrtoken_wks_to_length(MIME_FIELD_PROXY_CONNECTION);
- MIME_LEN_PUBLIC = hdrtoken_wks_to_length(MIME_FIELD_PUBLIC);
- MIME_LEN_RANGE = hdrtoken_wks_to_length(MIME_FIELD_RANGE);
- MIME_LEN_REFERENCES = hdrtoken_wks_to_length(MIME_FIELD_REFERENCES);
- MIME_LEN_REFERER = hdrtoken_wks_to_length(MIME_FIELD_REFERER);
- MIME_LEN_REPLY_TO = hdrtoken_wks_to_length(MIME_FIELD_REPLY_TO);
- MIME_LEN_RETRY_AFTER = hdrtoken_wks_to_length(MIME_FIELD_RETRY_AFTER);
- MIME_LEN_SENDER = hdrtoken_wks_to_length(MIME_FIELD_SENDER);
- MIME_LEN_SERVER = hdrtoken_wks_to_length(MIME_FIELD_SERVER);
- MIME_LEN_SET_COOKIE = hdrtoken_wks_to_length(MIME_FIELD_SET_COOKIE);
+ MIME_LEN_ACCEPT = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT);
+ MIME_LEN_ACCEPT_CHARSET = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_CHARSET);
+ MIME_LEN_ACCEPT_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_ENCODING);
+ MIME_LEN_ACCEPT_LANGUAGE = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_LANGUAGE);
+ MIME_LEN_ACCEPT_RANGES = hdrtoken_wks_to_length(MIME_FIELD_ACCEPT_RANGES);
+ MIME_LEN_AGE = hdrtoken_wks_to_length(MIME_FIELD_AGE);
+ MIME_LEN_ALLOW = hdrtoken_wks_to_length(MIME_FIELD_ALLOW);
+ MIME_LEN_APPROVED = hdrtoken_wks_to_length(MIME_FIELD_APPROVED);
+ MIME_LEN_AUTHORIZATION = hdrtoken_wks_to_length(MIME_FIELD_AUTHORIZATION);
+ MIME_LEN_BYTES = hdrtoken_wks_to_length(MIME_FIELD_BYTES);
+ MIME_LEN_CACHE_CONTROL = hdrtoken_wks_to_length(MIME_FIELD_CACHE_CONTROL);
+ MIME_LEN_CLIENT_IP = hdrtoken_wks_to_length(MIME_FIELD_CLIENT_IP);
+ MIME_LEN_CONNECTION = hdrtoken_wks_to_length(MIME_FIELD_CONNECTION);
+ MIME_LEN_CONTENT_BASE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_BASE);
+ MIME_LEN_CONTENT_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_ENCODING);
+ MIME_LEN_CONTENT_LANGUAGE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_LANGUAGE);
+ MIME_LEN_CONTENT_LENGTH = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_LENGTH);
+ MIME_LEN_CONTENT_LOCATION = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_LOCATION);
+ MIME_LEN_CONTENT_MD5 = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_MD5);
+ MIME_LEN_CONTENT_RANGE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_RANGE);
+ MIME_LEN_CONTENT_TYPE = hdrtoken_wks_to_length(MIME_FIELD_CONTENT_TYPE);
+ MIME_LEN_CONTROL = hdrtoken_wks_to_length(MIME_FIELD_CONTROL);
+ MIME_LEN_COOKIE = hdrtoken_wks_to_length(MIME_FIELD_COOKIE);
+ MIME_LEN_DATE = hdrtoken_wks_to_length(MIME_FIELD_DATE);
+ MIME_LEN_DISTRIBUTION = hdrtoken_wks_to_length(MIME_FIELD_DISTRIBUTION);
+ MIME_LEN_ETAG = hdrtoken_wks_to_length(MIME_FIELD_ETAG);
+ MIME_LEN_EXPECT = hdrtoken_wks_to_length(MIME_FIELD_EXPECT);
+ MIME_LEN_EXPIRES = hdrtoken_wks_to_length(MIME_FIELD_EXPIRES);
+ MIME_LEN_FOLLOWUP_TO = hdrtoken_wks_to_length(MIME_FIELD_FOLLOWUP_TO);
+ MIME_LEN_FROM = hdrtoken_wks_to_length(MIME_FIELD_FROM);
+ MIME_LEN_HOST = hdrtoken_wks_to_length(MIME_FIELD_HOST);
+ MIME_LEN_IF_MATCH = hdrtoken_wks_to_length(MIME_FIELD_IF_MATCH);
+ MIME_LEN_IF_MODIFIED_SINCE = hdrtoken_wks_to_length(MIME_FIELD_IF_MODIFIED_SINCE);
+ MIME_LEN_IF_NONE_MATCH = hdrtoken_wks_to_length(MIME_FIELD_IF_NONE_MATCH);
+ MIME_LEN_IF_RANGE = hdrtoken_wks_to_length(MIME_FIELD_IF_RANGE);
+ MIME_LEN_IF_UNMODIFIED_SINCE = hdrtoken_wks_to_length(MIME_FIELD_IF_UNMODIFIED_SINCE);
+ MIME_LEN_KEEP_ALIVE = hdrtoken_wks_to_length(MIME_FIELD_KEEP_ALIVE);
+ MIME_LEN_KEYWORDS = hdrtoken_wks_to_length(MIME_FIELD_KEYWORDS);
+ MIME_LEN_LAST_MODIFIED = hdrtoken_wks_to_length(MIME_FIELD_LAST_MODIFIED);
+ MIME_LEN_LINES = hdrtoken_wks_to_length(MIME_FIELD_LINES);
+ MIME_LEN_LOCATION = hdrtoken_wks_to_length(MIME_FIELD_LOCATION);
+ MIME_LEN_MAX_FORWARDS = hdrtoken_wks_to_length(MIME_FIELD_MAX_FORWARDS);
+ MIME_LEN_MESSAGE_ID = hdrtoken_wks_to_length(MIME_FIELD_MESSAGE_ID);
+ MIME_LEN_NEWSGROUPS = hdrtoken_wks_to_length(MIME_FIELD_NEWSGROUPS);
+ MIME_LEN_ORGANIZATION = hdrtoken_wks_to_length(MIME_FIELD_ORGANIZATION);
+ MIME_LEN_PATH = hdrtoken_wks_to_length(MIME_FIELD_PATH);
+ MIME_LEN_PRAGMA = hdrtoken_wks_to_length(MIME_FIELD_PRAGMA);
+ MIME_LEN_PROXY_AUTHENTICATE = hdrtoken_wks_to_length(MIME_FIELD_PROXY_AUTHENTICATE);
+ MIME_LEN_PROXY_AUTHORIZATION = hdrtoken_wks_to_length(MIME_FIELD_PROXY_AUTHORIZATION);
+ MIME_LEN_PROXY_CONNECTION = hdrtoken_wks_to_length(MIME_FIELD_PROXY_CONNECTION);
+ MIME_LEN_PUBLIC = hdrtoken_wks_to_length(MIME_FIELD_PUBLIC);
+ MIME_LEN_RANGE = hdrtoken_wks_to_length(MIME_FIELD_RANGE);
+ MIME_LEN_REFERENCES = hdrtoken_wks_to_length(MIME_FIELD_REFERENCES);
+ MIME_LEN_REFERER = hdrtoken_wks_to_length(MIME_FIELD_REFERER);
+ MIME_LEN_REPLY_TO = hdrtoken_wks_to_length(MIME_FIELD_REPLY_TO);
+ MIME_LEN_RETRY_AFTER = hdrtoken_wks_to_length(MIME_FIELD_RETRY_AFTER);
+ MIME_LEN_SENDER = hdrtoken_wks_to_length(MIME_FIELD_SENDER);
+ MIME_LEN_SERVER = hdrtoken_wks_to_length(MIME_FIELD_SERVER);
+ MIME_LEN_SET_COOKIE = hdrtoken_wks_to_length(MIME_FIELD_SET_COOKIE);
MIME_LEN_STRICT_TRANSPORT_SECURITY = hdrtoken_wks_to_length(MIME_FIELD_STRICT_TRANSPORT_SECURITY);
- MIME_LEN_SUBJECT = hdrtoken_wks_to_length(MIME_FIELD_SUBJECT);
- MIME_LEN_SUMMARY = hdrtoken_wks_to_length(MIME_FIELD_SUMMARY);
- MIME_LEN_TE = hdrtoken_wks_to_length(MIME_FIELD_TE);
- MIME_LEN_TRANSFER_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_TRANSFER_ENCODING);
- MIME_LEN_UPGRADE = hdrtoken_wks_to_length(MIME_FIELD_UPGRADE);
- MIME_LEN_USER_AGENT = hdrtoken_wks_to_length(MIME_FIELD_USER_AGENT);
- MIME_LEN_VARY = hdrtoken_wks_to_length(MIME_FIELD_VARY);
- MIME_LEN_VIA = hdrtoken_wks_to_length(MIME_FIELD_VIA);
- MIME_LEN_WARNING = hdrtoken_wks_to_length(MIME_FIELD_WARNING);
- MIME_LEN_WWW_AUTHENTICATE = hdrtoken_wks_to_length(MIME_FIELD_WWW_AUTHENTICATE);
- MIME_LEN_XREF = hdrtoken_wks_to_length(MIME_FIELD_XREF);
- MIME_LEN_ATS_INTERNAL = hdrtoken_wks_to_length(MIME_FIELD_ATS_INTERNAL);
- MIME_LEN_X_ID = hdrtoken_wks_to_length(MIME_FIELD_X_ID);
- MIME_LEN_X_FORWARDED_FOR = hdrtoken_wks_to_length(MIME_FIELD_X_FORWARDED_FOR);
-
- MIME_LEN_SEC_WEBSOCKET_KEY = hdrtoken_wks_to_length(MIME_FIELD_SEC_WEBSOCKET_KEY);
+ MIME_LEN_SUBJECT = hdrtoken_wks_to_length(MIME_FIELD_SUBJECT);
+ MIME_LEN_SUMMARY = hdrtoken_wks_to_length(MIME_FIELD_SUMMARY);
+ MIME_LEN_TE = hdrtoken_wks_to_length(MIME_FIELD_TE);
+ MIME_LEN_TRANSFER_ENCODING = hdrtoken_wks_to_length(MIME_FIELD_TRANSFER_ENCODING);
+ MIME_LEN_UPGRADE = hdrtoken_wks_to_length(MIME_FIELD_UPGRADE);
+ MIME_LEN_USER_AGENT = hdrtoken_wks_to_length(MIME_FIELD_USER_AGENT);
+ MIME_LEN_VARY = hdrtoken_wks_to_length(MIME_FIELD_VARY);
+ MIME_LEN_VIA = hdrtoken_wks_to_length(MIME_FIELD_VIA);
+ MIME_LEN_WARNING = hdrtoken_wks_to_length(MIME_FIELD_WARNING);
+ MIME_LEN_WWW_AUTHENTICATE = hdrtoken_wks_to_length(MIME_FIELD_WWW_AUTHENTICATE);
+ MIME_LEN_XREF = hdrtoken_wks_to_length(MIME_FIELD_XREF);
+ MIME_LEN_ATS_INTERNAL = hdrtoken_wks_to_length(MIME_FIELD_ATS_INTERNAL);
+ MIME_LEN_X_ID = hdrtoken_wks_to_length(MIME_FIELD_X_ID);
+ MIME_LEN_X_FORWARDED_FOR = hdrtoken_wks_to_length(MIME_FIELD_X_FORWARDED_FOR);
+
+ MIME_LEN_SEC_WEBSOCKET_KEY = hdrtoken_wks_to_length(MIME_FIELD_SEC_WEBSOCKET_KEY);
MIME_LEN_SEC_WEBSOCKET_VERSION = hdrtoken_wks_to_length(MIME_FIELD_SEC_WEBSOCKET_VERSION);
MIME_LEN_HTTP2_SETTINGS = hdrtoken_wks_to_length(MIME_FIELD_HTTP2_SETTINGS);
- MIME_WKSIDX_ACCEPT = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT);
- MIME_WKSIDX_ACCEPT_CHARSET = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_CHARSET);
- MIME_WKSIDX_ACCEPT_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_ENCODING);
- MIME_WKSIDX_ACCEPT_LANGUAGE = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_LANGUAGE);
- MIME_WKSIDX_ACCEPT_RANGES = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_RANGES);
- MIME_WKSIDX_AGE = hdrtoken_wks_to_index(MIME_FIELD_AGE);
- MIME_WKSIDX_ALLOW = hdrtoken_wks_to_index(MIME_FIELD_ALLOW);
- MIME_WKSIDX_APPROVED = hdrtoken_wks_to_index(MIME_FIELD_APPROVED);
- MIME_WKSIDX_AUTHORIZATION = hdrtoken_wks_to_index(MIME_FIELD_AUTHORIZATION);
- MIME_WKSIDX_BYTES = hdrtoken_wks_to_index(MIME_FIELD_BYTES);
- MIME_WKSIDX_CACHE_CONTROL = hdrtoken_wks_to_index(MIME_FIELD_CACHE_CONTROL);
- MIME_WKSIDX_CLIENT_IP = hdrtoken_wks_to_index(MIME_FIELD_CLIENT_IP);
- MIME_WKSIDX_CONNECTION = hdrtoken_wks_to_index(MIME_FIELD_CONNECTION);
- MIME_WKSIDX_CONTENT_BASE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_BASE);
- MIME_WKSIDX_CONTENT_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_ENCODING);
- MIME_WKSIDX_CONTENT_LANGUAGE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_LANGUAGE);
- MIME_WKSIDX_CONTENT_LENGTH = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_LENGTH);
- MIME_WKSIDX_CONTENT_LOCATION = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_LOCATION);
- MIME_WKSIDX_CONTENT_MD5 = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_MD5);
- MIME_WKSIDX_CONTENT_RANGE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_RANGE);
- MIME_WKSIDX_CONTENT_TYPE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_TYPE);
- MIME_WKSIDX_CONTROL = hdrtoken_wks_to_index(MIME_FIELD_CONTROL);
- MIME_WKSIDX_COOKIE = hdrtoken_wks_to_index(MIME_FIELD_COOKIE);
- MIME_WKSIDX_DATE = hdrtoken_wks_to_index(MIME_FIELD_DATE);
- MIME_WKSIDX_DISTRIBUTION = hdrtoken_wks_to_index(MIME_FIELD_DISTRIBUTION);
- MIME_WKSIDX_ETAG = hdrtoken_wks_to_index(MIME_FIELD_ETAG);
- MIME_WKSIDX_EXPECT = hdrtoken_wks_to_index(MIME_FIELD_EXPECT);
- MIME_WKSIDX_EXPIRES = hdrtoken_wks_to_index(MIME_FIELD_EXPIRES);
- MIME_WKSIDX_FOLLOWUP_TO = hdrtoken_wks_to_index(MIME_FIELD_FOLLOWUP_TO);
- MIME_WKSIDX_FROM = hdrtoken_wks_to_index(MIME_FIELD_FROM);
- MIME_WKSIDX_HOST = hdrtoken_wks_to_index(MIME_FIELD_HOST);
- MIME_WKSIDX_IF_MATCH = hdrtoken_wks_to_index(MIME_FIELD_IF_MATCH);
- MIME_WKSIDX_IF_MODIFIED_SINCE = hdrtoken_wks_to_index(MIME_FIELD_IF_MODIFIED_SINCE);
- MIME_WKSIDX_IF_NONE_MATCH = hdrtoken_wks_to_index(MIME_FIELD_IF_NONE_MATCH);
- MIME_WKSIDX_IF_RANGE = hdrtoken_wks_to_index(MIME_FIELD_IF_RANGE);
- MIME_WKSIDX_IF_UNMODIFIED_SINCE = hdrtoken_wks_to_index(MIME_FIELD_IF_UNMODIFIED_SINCE);
- MIME_WKSIDX_KEEP_ALIVE = hdrtoken_wks_to_index(MIME_FIELD_KEEP_ALIVE);
- MIME_WKSIDX_KEYWORDS = hdrtoken_wks_to_index(MIME_FIELD_KEYWORDS);
- MIME_WKSIDX_LAST_MODIFIED = hdrtoken_wks_to_index(MIME_FIELD_LAST_MODIFIED);
- MIME_WKSIDX_LINES = hdrtoken_wks_to_index(MIME_FIELD_LINES);
- MIME_WKSIDX_LOCATION = hdrtoken_wks_to_index(MIME_FIELD_LOCATION);
- MIME_WKSIDX_MAX_FORWARDS = hdrtoken_wks_to_index(MIME_FIELD_MAX_FORWARDS);
- MIME_WKSIDX_MESSAGE_ID = hdrtoken_wks_to_index(MIME_FIELD_MESSAGE_ID);
- MIME_WKSIDX_NEWSGROUPS = hdrtoken_wks_to_index(MIME_FIELD_NEWSGROUPS);
- MIME_WKSIDX_ORGANIZATION = hdrtoken_wks_to_index(MIME_FIELD_ORGANIZATION);
- MIME_WKSIDX_PATH = hdrtoken_wks_to_index(MIME_FIELD_PATH);
- MIME_WKSIDX_PRAGMA = hdrtoken_wks_to_index(MIME_FIELD_PRAGMA);
- MIME_WKSIDX_PROXY_AUTHENTICATE = hdrtoken_wks_to_index(MIME_FIELD_PROXY_AUTHENTICATE);
- MIME_WKSIDX_PROXY_AUTHORIZATION = hdrtoken_wks_to_index(MIME_FIELD_PROXY_AUTHORIZATION);
- MIME_WKSIDX_PROXY_CONNECTION = hdrtoken_wks_to_index(MIME_FIELD_PROXY_CONNECTION);
- MIME_WKSIDX_PUBLIC = hdrtoken_wks_to_index(MIME_FIELD_PUBLIC);
- MIME_WKSIDX_RANGE = hdrtoken_wks_to_index(MIME_FIELD_RANGE);
- MIME_WKSIDX_REFERENCES = hdrtoken_wks_to_index(MIME_FIELD_REFERENCES);
- MIME_WKSIDX_REFERER = hdrtoken_wks_to_index(MIME_FIELD_REFERER);
- MIME_WKSIDX_REPLY_TO = hdrtoken_wks_to_index(MIME_FIELD_REPLY_TO);
- MIME_WKSIDX_RETRY_AFTER = hdrtoken_wks_to_index(MIME_FIELD_RETRY_AFTER);
- MIME_WKSIDX_SENDER = hdrtoken_wks_to_index(MIME_FIELD_SENDER);
- MIME_WKSIDX_SERVER = hdrtoken_wks_to_index(MIME_FIELD_SERVER);
- MIME_WKSIDX_SET_COOKIE = hdrtoken_wks_to_index(MIME_FIELD_SET_COOKIE);
+ MIME_WKSIDX_ACCEPT = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT);
+ MIME_WKSIDX_ACCEPT_CHARSET = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_CHARSET);
+ MIME_WKSIDX_ACCEPT_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_ENCODING);
+ MIME_WKSIDX_ACCEPT_LANGUAGE = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_LANGUAGE);
+ MIME_WKSIDX_ACCEPT_RANGES = hdrtoken_wks_to_index(MIME_FIELD_ACCEPT_RANGES);
+ MIME_WKSIDX_AGE = hdrtoken_wks_to_index(MIME_FIELD_AGE);
+ MIME_WKSIDX_ALLOW = hdrtoken_wks_to_index(MIME_FIELD_ALLOW);
+ MIME_WKSIDX_APPROVED = hdrtoken_wks_to_index(MIME_FIELD_APPROVED);
+ MIME_WKSIDX_AUTHORIZATION = hdrtoken_wks_to_index(MIME_FIELD_AUTHORIZATION);
+ MIME_WKSIDX_BYTES = hdrtoken_wks_to_index(MIME_FIELD_BYTES);
+ MIME_WKSIDX_CACHE_CONTROL = hdrtoken_wks_to_index(MIME_FIELD_CACHE_CONTROL);
+ MIME_WKSIDX_CLIENT_IP = hdrtoken_wks_to_index(MIME_FIELD_CLIENT_IP);
+ MIME_WKSIDX_CONNECTION = hdrtoken_wks_to_index(MIME_FIELD_CONNECTION);
+ MIME_WKSIDX_CONTENT_BASE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_BASE);
+ MIME_WKSIDX_CONTENT_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_ENCODING);
+ MIME_WKSIDX_CONTENT_LANGUAGE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_LANGUAGE);
+ MIME_WKSIDX_CONTENT_LENGTH = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_LENGTH);
+ MIME_WKSIDX_CONTENT_LOCATION = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_LOCATION);
+ MIME_WKSIDX_CONTENT_MD5 = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_MD5);
+ MIME_WKSIDX_CONTENT_RANGE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_RANGE);
+ MIME_WKSIDX_CONTENT_TYPE = hdrtoken_wks_to_index(MIME_FIELD_CONTENT_TYPE);
+ MIME_WKSIDX_CONTROL = hdrtoken_wks_to_index(MIME_FIELD_CONTROL);
+ MIME_WKSIDX_COOKIE = hdrtoken_wks_to_index(MIME_FIELD_COOKIE);
+ MIME_WKSIDX_DATE = hdrtoken_wks_to_index(MIME_FIELD_DATE);
+ MIME_WKSIDX_DISTRIBUTION = hdrtoken_wks_to_index(MIME_FIELD_DISTRIBUTION);
+ MIME_WKSIDX_ETAG = hdrtoken_wks_to_index(MIME_FIELD_ETAG);
+ MIME_WKSIDX_EXPECT = hdrtoken_wks_to_index(MIME_FIELD_EXPECT);
+ MIME_WKSIDX_EXPIRES = hdrtoken_wks_to_index(MIME_FIELD_EXPIRES);
+ MIME_WKSIDX_FOLLOWUP_TO = hdrtoken_wks_to_index(MIME_FIELD_FOLLOWUP_TO);
+ MIME_WKSIDX_FROM = hdrtoken_wks_to_index(MIME_FIELD_FROM);
+ MIME_WKSIDX_HOST = hdrtoken_wks_to_index(MIME_FIELD_HOST);
+ MIME_WKSIDX_IF_MATCH = hdrtoken_wks_to_index(MIME_FIELD_IF_MATCH);
+ MIME_WKSIDX_IF_MODIFIED_SINCE = hdrtoken_wks_to_index(MIME_FIELD_IF_MODIFIED_SINCE);
+ MIME_WKSIDX_IF_NONE_MATCH = hdrtoken_wks_to_index(MIME_FIELD_IF_NONE_MATCH);
+ MIME_WKSIDX_IF_RANGE = hdrtoken_wks_to_index(MIME_FIELD_IF_RANGE);
+ MIME_WKSIDX_IF_UNMODIFIED_SINCE = hdrtoken_wks_to_index(MIME_FIELD_IF_UNMODIFIED_SINCE);
+ MIME_WKSIDX_KEEP_ALIVE = hdrtoken_wks_to_index(MIME_FIELD_KEEP_ALIVE);
+ MIME_WKSIDX_KEYWORDS = hdrtoken_wks_to_index(MIME_FIELD_KEYWORDS);
+ MIME_WKSIDX_LAST_MODIFIED = hdrtoken_wks_to_index(MIME_FIELD_LAST_MODIFIED);
+ MIME_WKSIDX_LINES = hdrtoken_wks_to_index(MIME_FIELD_LINES);
+ MIME_WKSIDX_LOCATION = hdrtoken_wks_to_index(MIME_FIELD_LOCATION);
+ MIME_WKSIDX_MAX_FORWARDS = hdrtoken_wks_to_index(MIME_FIELD_MAX_FORWARDS);
+ MIME_WKSIDX_MESSAGE_ID = hdrtoken_wks_to_index(MIME_FIELD_MESSAGE_ID);
+ MIME_WKSIDX_NEWSGROUPS = hdrtoken_wks_to_index(MIME_FIELD_NEWSGROUPS);
+ MIME_WKSIDX_ORGANIZATION = hdrtoken_wks_to_index(MIME_FIELD_ORGANIZATION);
+ MIME_WKSIDX_PATH = hdrtoken_wks_to_index(MIME_FIELD_PATH);
+ MIME_WKSIDX_PRAGMA = hdrtoken_wks_to_index(MIME_FIELD_PRAGMA);
+ MIME_WKSIDX_PROXY_AUTHENTICATE = hdrtoken_wks_to_index(MIME_FIELD_PROXY_AUTHENTICATE);
+ MIME_WKSIDX_PROXY_AUTHORIZATION = hdrtoken_wks_to_index(MIME_FIELD_PROXY_AUTHORIZATION);
+ MIME_WKSIDX_PROXY_CONNECTION = hdrtoken_wks_to_index(MIME_FIELD_PROXY_CONNECTION);
+ MIME_WKSIDX_PUBLIC = hdrtoken_wks_to_index(MIME_FIELD_PUBLIC);
+ MIME_WKSIDX_RANGE = hdrtoken_wks_to_index(MIME_FIELD_RANGE);
+ MIME_WKSIDX_REFERENCES = hdrtoken_wks_to_index(MIME_FIELD_REFERENCES);
+ MIME_WKSIDX_REFERER = hdrtoken_wks_to_index(MIME_FIELD_REFERER);
+ MIME_WKSIDX_REPLY_TO = hdrtoken_wks_to_index(MIME_FIELD_REPLY_TO);
+ MIME_WKSIDX_RETRY_AFTER = hdrtoken_wks_to_index(MIME_FIELD_RETRY_AFTER);
+ MIME_WKSIDX_SENDER = hdrtoken_wks_to_index(MIME_FIELD_SENDER);
+ MIME_WKSIDX_SERVER = hdrtoken_wks_to_index(MIME_FIELD_SERVER);
+ MIME_WKSIDX_SET_COOKIE = hdrtoken_wks_to_index(MIME_FIELD_SET_COOKIE);
MIME_WKSIDX_STRICT_TRANSPORT_SECURITY = hdrtoken_wks_to_index(MIME_FIELD_STRICT_TRANSPORT_SECURITY);
- MIME_WKSIDX_SUBJECT = hdrtoken_wks_to_index(MIME_FIELD_SUBJECT);
- MIME_WKSIDX_SUMMARY = hdrtoken_wks_to_index(MIME_FIELD_SUMMARY);
- MIME_WKSIDX_TE = hdrtoken_wks_to_index(MIME_FIELD_TE);
- MIME_WKSIDX_TRANSFER_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_TRANSFER_ENCODING);
- MIME_WKSIDX_UPGRADE = hdrtoken_wks_to_index(MIME_FIELD_UPGRADE);
- MIME_WKSIDX_USER_AGENT = hdrtoken_wks_to_index(MIME_FIELD_USER_AGENT);
- MIME_WKSIDX_VARY = hdrtoken_wks_to_index(MIME_FIELD_VARY);
- MIME_WKSIDX_VIA = hdrtoken_wks_to_index(MIME_FIELD_VIA);
- MIME_WKSIDX_WARNING = hdrtoken_wks_to_index(MIME_FIELD_WARNING);
- MIME_WKSIDX_WWW_AUTHENTICATE = hdrtoken_wks_to_index(MIME_FIELD_WWW_AUTHENTICATE);
- MIME_WKSIDX_XREF = hdrtoken_wks_to_index(MIME_FIELD_XREF);
- MIME_WKSIDX_X_ID = hdrtoken_wks_to_index(MIME_FIELD_X_ID);
- MIME_WKSIDX_X_FORWARDED_FOR = hdrtoken_wks_to_index(MIME_FIELD_X_FORWARDED_FOR);
- MIME_WKSIDX_SEC_WEBSOCKET_KEY = hdrtoken_wks_to_index(MIME_FIELD_SEC_WEBSOCKET_KEY);
- MIME_WKSIDX_SEC_WEBSOCKET_VERSION = hdrtoken_wks_to_index(MIME_FIELD_SEC_WEBSOCKET_VERSION);
- MIME_WKSIDX_HTTP2_SETTINGS = hdrtoken_wks_to_index(MIME_FIELD_HTTP2_SETTINGS);
-
- MIME_VALUE_BYTES = hdrtoken_string_to_wks("bytes");
- MIME_VALUE_CHUNKED = hdrtoken_string_to_wks("chunked");
- MIME_VALUE_CLOSE = hdrtoken_string_to_wks("close");
- MIME_VALUE_COMPRESS = hdrtoken_string_to_wks("compress");
- MIME_VALUE_DEFLATE = hdrtoken_string_to_wks("deflate");
- MIME_VALUE_GZIP = hdrtoken_string_to_wks("gzip");
- MIME_VALUE_IDENTITY = hdrtoken_string_to_wks("identity");
- MIME_VALUE_KEEP_ALIVE = hdrtoken_string_to_wks("keep-alive");
- MIME_VALUE_MAX_AGE = hdrtoken_string_to_wks("max-age");
- MIME_VALUE_MAX_STALE = hdrtoken_string_to_wks("max-stale");
- MIME_VALUE_MIN_FRESH = hdrtoken_string_to_wks("min-fresh");
- MIME_VALUE_MUST_REVALIDATE = hdrtoken_string_to_wks("must-revalidate");
- MIME_VALUE_NONE = hdrtoken_string_to_wks("none");
- MIME_VALUE_NO_CACHE = hdrtoken_string_to_wks("no-cache");
- MIME_VALUE_NO_STORE = hdrtoken_string_to_wks("no-store");
- MIME_VALUE_NO_TRANSFORM = hdrtoken_string_to_wks("no-transform");
- MIME_VALUE_ONLY_IF_CACHED = hdrtoken_string_to_wks("only-if-cached");
- MIME_VALUE_PRIVATE = hdrtoken_string_to_wks("private");
- MIME_VALUE_PROXY_REVALIDATE = hdrtoken_string_to_wks("proxy-revalidate");
- MIME_VALUE_PUBLIC = hdrtoken_string_to_wks("public");
- MIME_VALUE_S_MAXAGE = hdrtoken_string_to_wks("s-maxage");
+ MIME_WKSIDX_SUBJECT = hdrtoken_wks_to_index(MIME_FIELD_SUBJECT);
+ MIME_WKSIDX_SUMMARY = hdrtoken_wks_to_index(MIME_FIELD_SUMMARY);
+ MIME_WKSIDX_TE = hdrtoken_wks_to_index(MIME_FIELD_TE);
+ MIME_WKSIDX_TRANSFER_ENCODING = hdrtoken_wks_to_index(MIME_FIELD_TRANSFER_ENCODING);
+ MIME_WKSIDX_UPGRADE = hdrtoken_wks_to_index(MIME_FIELD_UPGRADE);
+ MIME_WKSIDX_USER_AGENT = hdrtoken_wks_to_index(MIME_FIELD_USER_AGENT);
+ MIME_WKSIDX_VARY = hdrtoken_wks_to_index(MIME_FIELD_VARY);
+ MIME_WKSIDX_VIA = hdrtoken_wks_to_index(MIME_FIELD_VIA);
+ MIME_WKSIDX_WARNING = hdrtoken_wks_to_index(MIME_FIELD_WARNING);
+ MIME_WKSIDX_WWW_AUTHENTICATE = hdrtoken_wks_to_index(MIME_FIELD_WWW_AUTHENTICATE);
+ MIME_WKSIDX_XREF = hdrtoken_wks_to_index(MIME_FIELD_XREF);
+ MIME_WKSIDX_X_ID = hdrtoken_wks_to_index(MIME_FIELD_X_ID);
+ MIME_WKSIDX_X_FORWARDED_FOR = hdrtoken_wks_to_index(MIME_FIELD_X_FORWARDED_FOR);
+ MIME_WKSIDX_SEC_WEBSOCKET_KEY = hdrtoken_wks_to_index(MIME_FIELD_SEC_WEBSOCKET_KEY);
+ MIME_WKSIDX_SEC_WEBSOCKET_VERSION = hdrtoken_wks_to_index(MIME_FIELD_SEC_WEBSOCKET_VERSION);
+ MIME_WKSIDX_HTTP2_SETTINGS = hdrtoken_wks_to_index(MIME_FIELD_HTTP2_SETTINGS);
+
+ MIME_VALUE_BYTES = hdrtoken_string_to_wks("bytes");
+ MIME_VALUE_CHUNKED = hdrtoken_string_to_wks("chunked");
+ MIME_VALUE_CLOSE = hdrtoken_string_to_wks("close");
+ MIME_VALUE_COMPRESS = hdrtoken_string_to_wks("compress");
+ MIME_VALUE_DEFLATE = hdrtoken_string_to_wks("deflate");
+ MIME_VALUE_GZIP = hdrtoken_string_to_wks("gzip");
+ MIME_VALUE_IDENTITY = hdrtoken_string_to_wks("identity");
+ MIME_VALUE_KEEP_ALIVE = hdrtoken_string_to_wks("keep-alive");
+ MIME_VALUE_MAX_AGE = hdrtoken_string_to_wks("max-age");
+ MIME_VALUE_MAX_STALE = hdrtoken_string_to_wks("max-stale");
+ MIME_VALUE_MIN_FRESH = hdrtoken_string_to_wks("min-fresh");
+ MIME_VALUE_MUST_REVALIDATE = hdrtoken_string_to_wks("must-revalidate");
+ MIME_VALUE_NONE = hdrtoken_string_to_wks("none");
+ MIME_VALUE_NO_CACHE = hdrtoken_string_to_wks("no-cache");
+ MIME_VALUE_NO_STORE = hdrtoken_string_to_wks("no-store");
+ MIME_VALUE_NO_TRANSFORM = hdrtoken_string_to_wks("no-transform");
+ MIME_VALUE_ONLY_IF_CACHED = hdrtoken_string_to_wks("only-if-cached");
+ MIME_VALUE_PRIVATE = hdrtoken_string_to_wks("private");
+ MIME_VALUE_PROXY_REVALIDATE = hdrtoken_string_to_wks("proxy-revalidate");
+ MIME_VALUE_PUBLIC = hdrtoken_string_to_wks("public");
+ MIME_VALUE_S_MAXAGE = hdrtoken_string_to_wks("s-maxage");
MIME_VALUE_NEED_REVALIDATE_ONCE = hdrtoken_string_to_wks("need-revalidate-once");
- MIME_VALUE_WEBSOCKET = hdrtoken_string_to_wks("websocket");
- MIME_VALUE_H2C = hdrtoken_string_to_wks(MIME_UPGRADE_H2C_TOKEN);
+ MIME_VALUE_WEBSOCKET = hdrtoken_string_to_wks("websocket");
+ MIME_VALUE_H2C = hdrtoken_string_to_wks(MIME_UPGRADE_H2C_TOKEN);
mime_init_date_format_table();
mime_init_cache_control_cooking_masks();
@@ -937,8 +937,8 @@ mime_init_cache_control_cooking_masks()
{NULL, 0}};
for (int i = 0; cc_mask_table[i].name != NULL; i++) {
- const char *wks = hdrtoken_string_to_wks(cc_mask_table[i].name);
- HdrTokenHeapPrefix *p = hdrtoken_wks_to_prefix(wks);
+ const char *wks = hdrtoken_string_to_wks(cc_mask_table[i].name);
+ HdrTokenHeapPrefix *p = hdrtoken_wks_to_prefix(wks);
p->wks_type_specific.u.cache_control.cc_mask = cc_mask_table[i].mask;
}
}
@@ -958,14 +958,14 @@ mime_init_date_format_table()
int m = 0, d = 0, y = 0;
time(&now_secs);
- now_days = (int)(now_secs / (60 * 60 * 24));
+ now_days = (int)(now_secs / (60 * 60 * 24));
first_days = now_days - 366;
- last_days = now_days + 366;
- num_days = last_days - first_days + 1;
+ last_days = now_days + 366;
+ num_days = last_days - first_days + 1;
- _days_to_mdy_fast_lookup_table = (MDY *)ats_malloc(num_days * sizeof(MDY));
+ _days_to_mdy_fast_lookup_table = (MDY *)ats_malloc(num_days * sizeof(MDY));
_days_to_mdy_fast_lookup_table_first_day = first_days;
- _days_to_mdy_fast_lookup_table_last_day = last_days;
+ _days_to_mdy_fast_lookup_table_last_day = last_days;
for (i = 0; i < num_days; i++) {
mime_days_since_epoch_to_mdy_slowcase(first_days + i, &m, &d, &y);
@@ -989,7 +989,7 @@ void
_mime_hdr_field_block_init(MIMEFieldBlockImpl *fblock)
{
fblock->m_freetop = 0;
- fblock->m_next = NULL;
+ fblock->m_next = NULL;
#ifdef BLOCK_INIT_PARANOIA
int i;
@@ -1000,7 +1000,7 @@ _mime_hdr_field_block_init(MIMEFieldBlockImpl *fblock)
// the cost of initializing all slots in a block.
for (i = 0; i < MIME_FIELD_BLOCK_SLOTS; i++) {
- MIMEField *field = &(fblock->m_field_slots[i]);
+ MIMEField *field = &(fblock->m_field_slots[i]);
field->m_readiness = MIME_FIELD_SLOT_READINESS_EMPTY;
}
#endif
@@ -1011,9 +1011,9 @@ mime_hdr_cooked_stuff_init(MIMEHdrImpl *mh, MIMEField *changing_field_or_null)
{
// to be safe, reinitialize unless you know this call is for other cooked field
if ((changing_field_or_null == NULL) || (changing_field_or_null->m_wks_idx != MIME_WKSIDX_PRAGMA)) {
- mh->m_cooked_stuff.m_cache_control.m_mask = 0;
- mh->m_cooked_stuff.m_cache_control.m_secs_max_age = 0;
- mh->m_cooked_stuff.m_cache_control.m_secs_s_maxage = 0;
+ mh->m_cooked_stuff.m_cache_control.m_mask = 0;
+ mh->m_cooked_stuff.m_cache_control.m_secs_max_age = 0;
+ mh->m_cooked_stuff.m_cache_control.m_secs_s_maxage = 0;
mh->m_cooked_stuff.m_cache_control.m_secs_max_stale = 0;
mh->m_cooked_stuff.m_cache_control.m_secs_min_fresh = 0;
}
@@ -1094,8 +1094,8 @@ mime_hdr_copy_onto(MIMEHdrImpl *s_mh, HdrHeap *s_heap, MIMEHdrImpl *d_mh, HdrHea
ink_assert(((char *)&(s_mh->m_first_fblock.m_field_slots[MIME_FIELD_BLOCK_SLOTS]) - (char *)s_mh) == sizeof(struct MIMEHdrImpl));
- int top = s_mh->m_first_fblock.m_freetop;
- char *end = (char *)&(s_mh->m_first_fblock.m_field_slots[top]);
+ int top = s_mh->m_first_fblock.m_freetop;
+ char *end = (char *)&(s_mh->m_first_fblock.m_field_slots[top]);
int bytes_below_top = end - (char *)s_mh;
// copies useful part of enclosed first block too
@@ -1104,16 +1104,16 @@ mime_hdr_copy_onto(MIMEHdrImpl *s_mh, HdrHeap *s_heap, MIMEHdrImpl *d_mh, HdrHea
if (d_mh->m_first_fblock.m_next == NULL) // common case: no other block
{
d_mh->m_fblock_list_tail = &(d_mh->m_first_fblock);
- block_count = 1;
+ block_count = 1;
} else // uncommon case: block list exists
{
prev_d_fblock = &(d_mh->m_first_fblock);
- block_count = 1;
+ block_count = 1;
for (s_fblock = s_mh->m_first_fblock.m_next; s_fblock != NULL; s_fblock = s_fblock->m_next) {
++block_count;
- d_fblock = _mime_field_block_copy(s_fblock, s_heap, d_heap);
+ d_fblock = _mime_field_block_copy(s_fblock, s_heap, d_heap);
prev_d_fblock->m_next = d_fblock;
- prev_d_fblock = d_fblock;
+ prev_d_fblock = d_fblock;
}
d_mh->m_fblock_list_tail = prev_d_fblock;
}
@@ -1256,7 +1256,7 @@ _mime_hdr_field_list_search_by_slotnum(MIMEHdrImpl *mh, int slotnum)
MIMEFieldBlockImpl *fblock;
if (slotnum < MIME_FIELD_BLOCK_SLOTS) {
- fblock = &(mh->m_first_fblock);
+ fblock = &(mh->m_first_fblock);
block_index = slotnum;
if (block_index >= fblock->m_freetop) {
return NULL;
@@ -1264,7 +1264,7 @@ _mime_hdr_field_list_search_by_slotnum(MIMEHdrImpl *mh, int slotnum)
return &(fblock->m_field_slots[block_index]);
}
} else {
- block_num = slotnum / MIME_FIELD_BLOCK_SLOTS;
+ block_num = slotnum / MIME_FIELD_BLOCK_SLOTS;
block_index = slotnum % MIME_FIELD_BLOCK_SLOTS;
fblock = &(mh->m_first_fblock);
@@ -1400,7 +1400,7 @@ mime_field_init(MIMEField *field)
{
memset(field, 0, sizeof(MIMEField));
field->m_readiness = MIME_FIELD_SLOT_READINESS_DETACHED;
- field->m_wks_idx = -1;
+ field->m_wks_idx = -1;
}
MIMEField *
@@ -1413,8 +1413,8 @@ mime_field_create(HdrHeap *heap, MIMEHdrImpl *mh)
if (tail_fblock->m_freetop >= MIME_FIELD_BLOCK_SLOTS) {
new_fblock = (MIMEFieldBlockImpl *)heap->allocate_obj(sizeof(MIMEFieldBlockImpl), HDR_HEAP_OBJ_FIELD_BLOCK);
_mime_hdr_field_block_init(new_fblock);
- tail_fblock->m_next = new_fblock;
- tail_fblock = new_fblock;
+ tail_fblock->m_next = new_fblock;
+ tail_fblock = new_fblock;
mh->m_fblock_list_tail = new_fblock;
}
@@ -1429,7 +1429,7 @@ mime_field_create(HdrHeap *heap, MIMEHdrImpl *mh)
MIMEField *
mime_field_create_named(HdrHeap *heap, MIMEHdrImpl *mh, const char *name, int length)
{
- MIMEField *field = mime_field_create(heap, mh);
+ MIMEField *field = mime_field_create(heap, mh);
int field_name_wks_idx = hdrtoken_tokenize(name, length);
mime_field_name_set(heap, mh, field, field_name_wks_idx, name, length, 1);
return field;
@@ -1454,7 +1454,7 @@ mime_hdr_field_attach(MIMEHdrImpl *mh, MIMEField *field, int check_for_dups, MIM
if (check_for_dups || (prev_dup && (!prev_dup->is_dup_head()))) {
int length;
const char *name = mime_field_name_get(field, &length);
- prev_dup = mime_hdr_field_find(mh, name, length);
+ prev_dup = mime_hdr_field_find(mh, name, length);
ink_assert((prev_dup == NULL) || (prev_dup->is_dup_head()));
}
@@ -1478,9 +1478,9 @@ mime_hdr_field_attach(MIMEHdrImpl *mh, MIMEField *field, int check_for_dups, MIM
/////////////////////////////////////////////////////////////////
field_slotnum = mime_hdr_field_slotnum(mh, field);
- prev_slotnum = mime_hdr_field_slotnum(mh, prev_dup);
- next_dup = prev_dup->m_next_dup;
- next_slotnum = (next_dup ? mime_hdr_field_slotnum(mh, next_dup) : -1);
+ prev_slotnum = mime_hdr_field_slotnum(mh, prev_dup);
+ next_dup = prev_dup->m_next_dup;
+ next_slotnum = (next_dup ? mime_hdr_field_slotnum(mh, next_dup) : -1);
ink_assert(field_slotnum != prev_slotnum);
@@ -1490,9 +1490,9 @@ mime_hdr_field_attach(MIMEHdrImpl *mh, MIMEField *field, int check_for_dups, MIM
break; // no next dup, we're done
if (next_slotnum > field_slotnum)
break; // next dup is after us, we're done
- prev_dup = next_dup;
+ prev_dup = next_dup;
prev_slotnum = next_slotnum;
- next_dup = prev_dup->m_next_dup;
+ next_dup = prev_dup->m_next_dup;
}
/////////////////////////////////////////////////////
@@ -1509,7 +1509,7 @@ mime_hdr_field_attach(MIMEHdrImpl *mh, MIMEField *field, int check_for_dups, MIM
// of a misnomer, it is actually, the NEXT field! //
/////////////////////////////////////////////////////////////
- field->m_flags = (field->m_flags | MIME_FIELD_SLOT_FLAGS_DUP_HEAD);
+ field->m_flags = (field->m_flags | MIME_FIELD_SLOT_FLAGS_DUP_HEAD);
field->m_next_dup = prev_dup;
prev_dup->m_flags = (prev_dup->m_flags & ~MIME_FIELD_SLOT_FLAGS_DUP_HEAD);
mime_hdr_set_accelerators_and_presence_bits(mh, field);
@@ -1520,7 +1520,7 @@ mime_hdr_field_attach(MIMEHdrImpl *mh, MIMEField *field, int check_for_dups, MIM
field->m_flags = (field->m_flags & ~MIME_FIELD_SLOT_FLAGS_DUP_HEAD);
ink_assert((next_dup == NULL) || next_dup->is_live());
prev_dup->m_next_dup = field;
- field->m_next_dup = next_dup;
+ field->m_next_dup = next_dup;
}
} else {
field->m_flags = (field->m_flags | MIME_FIELD_SLOT_FLAGS_DUP_HEAD);
@@ -1570,7 +1570,7 @@ mime_hdr_field_detach(MIMEHdrImpl *mh, MIMEField *field, bool detach_all_dups)
{
int name_length;
const char *name = mime_field_name_get(field, &name_length);
- MIMEField *prev = mime_hdr_field_find(mh, name, name_length);
+ MIMEField *prev = mime_hdr_field_find(mh, name, name_length);
while (prev && (prev->m_next_dup != field))
prev = prev->m_next_dup;
@@ -1582,7 +1582,7 @@ mime_hdr_field_detach(MIMEHdrImpl *mh, MIMEField *field, bool detach_all_dups)
// Field is now detached and alone
field->m_readiness = MIME_FIELD_SLOT_READINESS_DETACHED;
- field->m_next_dup = NULL;
+ field->m_next_dup = NULL;
// Because we changed the values through detaching,update the cooked cache
if (field->is_cooked())
@@ -1643,7 +1643,7 @@ mime_hdr_field_slotnum(MIMEHdrImpl *mh, MIMEField *field)
slots_so_far = 0;
for (fblock = &(mh->m_first_fblock); fblock != NULL; fblock = fblock->m_next) {
if (fblock->contains(field)) {
- MIMEField *first = &(fblock->m_field_slots[0]);
+ MIMEField *first = &(fblock->m_field_slots[0]);
ptrdiff_t block_slot = field - first; // in units of MIMEField
return slots_so_far + block_slot;
}
@@ -1673,7 +1673,7 @@ mime_hdr_prepare_for_value_set(HdrHeap *heap, MIMEHdrImpl *mh, const char *name,
if (field == NULL) // no fields of this name
{
wks_idx = hdrtoken_tokenize(name, name_length);
- field = mime_field_create(heap, mh);
+ field = mime_field_create(heap, mh);
mime_field_name_set(heap, mh, field, wks_idx, name, name_length, 1);
mime_hdr_field_attach(mh, field, 0, NULL);
@@ -1732,7 +1732,7 @@ MIMEField::value_get_index(char const *value, int length) const
} else {
HdrCsvIter iter;
int tok_len;
- int index = 0;
+ int index = 0;
const char *tok = iter.get_first(this, &tok_len);
while (tok) {
@@ -2079,7 +2079,7 @@ mime_field_value_set(HdrHeap *heap, MIMEHdrImpl *mh, MIMEField *field, const cha
else
field->m_ptr_value = value;
- field->m_len_value = length;
+ field->m_len_value = length;
field->m_n_v_raw_printable = 0;
// Now keep the cooked cache consistent
@@ -2132,13 +2132,13 @@ mime_field_name_value_set(HdrHeap *heap, MIMEHdrImpl *mh, MIMEField *field, int1
mime_field_name_set(heap, mh, field, name_wks_idx_or_neg1, name, name_length, 1);
mime_field_value_set(heap, mh, field, value, value_length, 1);
} else {
- field->m_wks_idx = name_wks_idx_or_neg1;
- field->m_ptr_name = name;
+ field->m_wks_idx = name_wks_idx_or_neg1;
+ field->m_ptr_name = name;
field->m_ptr_value = value;
- field->m_len_name = name_length;
+ field->m_len_name = name_length;
field->m_len_value = value_length;
if (n_v_raw_printable && (n_v_raw_pad <= 7)) {
- field->m_n_v_raw_printable = n_v_raw_printable;
+ field->m_n_v_raw_printable = n_v_raw_printable;
field->m_n_v_raw_printable_pad = n_v_raw_pad;
} else {
field->m_n_v_raw_printable = 0;
@@ -2178,8 +2178,8 @@ mime_field_value_append(HdrHeap *heap, MIMEHdrImpl *mh, MIMEField *field, const
memcpy(ptr, value, length);
- field->m_ptr_value = new_str;
- field->m_len_value = new_length;
+ field->m_ptr_value = new_str;
+ field->m_len_value = new_length;
field->m_n_v_raw_printable = 0;
// Now keep the cooked cache consistent
@@ -2255,10 +2255,10 @@ MIMEHdr::get_host_port_values(char const **host_ptr, ///< Pointer to host.
void
_mime_scanner_init(MIMEScanner *scanner)
{
- scanner->m_line = NULL;
- scanner->m_line_size = 0;
+ scanner->m_line = NULL;
+ scanner->m_line_size = 0;
scanner->m_line_length = 0;
- scanner->m_state = MIME_PARSE_BEFORE;
+ scanner->m_state = MIME_PARSE_BEFORE;
}
//////////////////////////////////////////////////////
@@ -2367,7 +2367,7 @@ mime_scanner_get(MIMEScanner *S, const char **raw_input_s, const char *raw_input
if (lf_ptr) {
raw_input_c = lf_ptr + 1;
if (MIME_SCANNER_TYPE_LINE == raw_input_scan_type) {
- zret = PARSE_OK;
+ zret = PARSE_OK;
S->m_state = MIME_PARSE_BEFORE;
} else {
S->m_state = MIME_PARSE_AFTER;
@@ -2382,7 +2382,7 @@ mime_scanner_get(MIMEScanner *S, const char **raw_input_s, const char *raw_input
S->m_state = MIME_PARSE_INSIDE; // back inside the field.
} else {
S->m_state = MIME_PARSE_BEFORE; // field terminated.
- zret = PARSE_OK;
+ zret = PARSE_OK;
}
break;
}
@@ -2401,7 +2401,7 @@ mime_scanner_get(MIMEScanner *S, const char **raw_input_s, const char *raw_input
// all input previously consumed. If we're between fields, that's cool.
if (MIME_PARSE_INSIDE != S->m_state) {
S->m_state = MIME_PARSE_BEFORE; // probably not needed...
- zret = PARSE_DONE;
+ zret = PARSE_DONE;
} else {
zret = PARSE_ERROR; // unterminated field.
}
@@ -2411,7 +2411,7 @@ mime_scanner_get(MIMEScanner *S, const char **raw_input_s, const char *raw_input
// absolute end of input because otherwise this might be
// a multiline field where we haven't seen the next leading space.
S->m_state = MIME_PARSE_BEFORE;
- zret = PARSE_OK;
+ zret = PARSE_OK;
} else {
// Partial input, no field / line CR LF
zret = PARSE_ERROR; // Unterminated field.
@@ -2433,8 +2433,8 @@ mime_scanner_get(MIMEScanner *S, const char **raw_input_s, const char *raw_input
// adjust out arguments.
if (PARSE_CONT != zret) {
if (0 != S->m_line_length) {
- *output_s = S->m_line;
- *output_e = *output_s + S->m_line_length;
+ *output_s = S->m_line;
+ *output_e = *output_s + S->m_line_length;
S->m_line_length = 0;
} else {
*output_s = *raw_input_s;
@@ -2453,9 +2453,9 @@ mime_scanner_get(MIMEScanner *S, const char **raw_input_s, const char *raw_input
void
_mime_parser_init(MIMEParser *parser)
{
- parser->m_field = 0;
+ parser->m_field = 0;
parser->m_field_flags = 0;
- parser->m_value = -1;
+ parser->m_value = -1;
}
//////////////////////////////////////////////////////
// init first time structure setup //
@@ -2521,7 +2521,7 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char
/////////////////////////////////////////////
field_line_first = line_c;
- field_line_last = line_e - 1;
+ field_line_last = line_e - 1;
// find name first
field_name_first = line_c;
@@ -2552,7 +2552,7 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char
while ((field_value_last >= field_value_first) && ParseRules::is_wslfcr(*field_value_last))
--field_value_last;
- field_name_length = (int)(field_name_last - field_name_first + 1);
+ field_name_length = (int)(field_name_last - field_name_first + 1);
field_value_length = (int)(field_value_last - field_value_first + 1);
// Make sure the name or value is not longer than 64K
@@ -2566,8 +2566,8 @@ mime_parser_parse(MIMEParser *parser, HdrHeap *heap, MIMEHdrImpl *mh, const char
//////////////////////////////////////////////////////////////////////
if (must_copy_strings || (!line_is_real)) {
- int length = total_line_length;
- char *dup = heap->duplicate_str(field_name_first, length);
+ int length = total_line_length;
+ char *dup = heap->duplicate_str(field_name_first, length);
intptr_t delta = dup - field_name_first;
field_name_first += delta;
@@ -2669,7 +2669,7 @@ mime_hdr_print(HdrHeap * /* heap ATS_UNUSED */, MIMEHdrImpl *mh, char *buf_start
const char *contig_start = NULL;
int this_length, contig_length = 0;
for (index = 0; index < fblock->m_freetop; index++) {
- field = &(fblock->m_field_slots[index]);
+ field = &(fblock->m_field_slots[index]);
this_length = field->m_len_name + field->m_len_value + field->m_n_v_raw_printable_pad;
if (field->is_live()) {
if ((field->m_ptr_name == contig_start + contig_length) && field->m_n_v_raw_printable &&
@@ -2680,7 +2680,7 @@ mime_hdr_print(HdrHeap * /* heap ATS_UNUSED */, MIMEHdrImpl *mh, char *buf_start
if (!mime_mem_print(contig_start, contig_length, buf_start, buf_length, buf_index_inout, buf_chars_to_skip_inout))
return 0;
}
- contig_start = field->m_ptr_name;
+ contig_start = field->m_ptr_name;
contig_length = this_length;
}
}
@@ -2911,7 +2911,7 @@ mime_days_since_epoch_to_mdy(unsigned int days_since_jan_1_1970, int *m_return,
// of dates that are +/- one year from today. //
////////////////////////////////////////////////////////////////
- int i = days_since_jan_1_1970 - _days_to_mdy_fast_lookup_table_first_day;
+ int i = days_since_jan_1_1970 - _days_to_mdy_fast_lookup_table_first_day;
*m_return = _days_to_mdy_fast_lookup_table[i].m;
*d_return = _days_to_mdy_fast_lookup_table[i].d;
*y_return = _days_to_mdy_fast_lookup_table[i].y;
@@ -2971,9 +2971,9 @@ mime_format_date(char *buffer, time_t value)
/* the day string */
const char *three_char_day = daystrs[wday];
- buf[0] = three_char_day[0];
- buf[1] = three_char_day[1];
- buf[2] = three_char_day[2];
+ buf[0] = three_char_day[0];
+ buf[1] = three_char_day[1];
+ buf[2] = three_char_day[2];
buf += 3;
buf[0] = ',';
@@ -2988,9 +2988,9 @@ mime_format_date(char *buffer, time_t value)
/* the month string */
const char *three_char_month = monthstrs[month];
- buf[0] = three_char_month[0];
- buf[1] = three_char_month[1];
- buf[2] = three_char_month[2];
+ buf[0] = three_char_month[0];
+ buf[1] = three_char_month[1];
+ buf[2] = three_char_month[2];
buf += 3;
/* the year */
@@ -3062,7 +3062,7 @@ mime_parse_int(const char *buf, const char *end)
num = (num * 10) + (*buf++ - '0');
return num;
} else {
- num = 0;
+ num = 0;
negative = false;
while ((buf != end) && ParseRules::is_space(*buf))
@@ -3124,7 +3124,7 @@ mime_parse_int64(const char *buf, const char *end)
num = (num * 10) + (*buf++ - '0');
return num;
} else {
- num = 0;
+ num = 0;
negative = false;
while ((buf != end) && ParseRules::is_space(*buf))
@@ -3192,7 +3192,7 @@ mime_parse_rfc822_date_fastcase(const char *buf, int length, struct tm *tp)
////////////////////////////
// binary search for wday //
////////////////////////////
- tp->tm_wday = -1;
+ tp->tm_wday = -1;
three_char_wday = (buf[0] << 16) | (buf[1] << 8) | buf[2];
if (three_char_wday <= 0x53756E) {
if (three_char_wday == 0x467269)
@@ -3224,7 +3224,7 @@ mime_parse_rfc822_date_fastcase(const char *buf, int length, struct tm *tp)
/////////////////////////////
// binary search for month //
/////////////////////////////
- tp->tm_mon = -1;
+ tp->tm_mon = -1;
three_char_mon = (buf[8] << 16) | (buf[9] << 8) | buf[10];
if (three_char_mon <= 0x4A756C) {
if (three_char_mon <= 0x446563) {
@@ -3273,8 +3273,8 @@ mime_parse_rfc822_date_fastcase(const char *buf, int length, struct tm *tp)
// extract time //
//////////////////
tp->tm_hour = (buf[17] - '0') * 10 + (buf[18] - '0');
- tp->tm_min = (buf[20] - '0') * 10 + (buf[21] - '0');
- tp->tm_sec = (buf[23] - '0') * 10 + (buf[24] - '0');
+ tp->tm_min = (buf[20] - '0') * 10 + (buf[21] - '0');
+ tp->tm_sec = (buf[23] - '0') * 10 + (buf[24] - '0');
if ((buf[19] != ':') || (buf[22] != ':'))
return 0;
return 1;
@@ -3290,7 +3290,7 @@ time_t
mime_parse_date(const char *buf, const char *end)
{
static const int DAYS_OFFSET = 25508;
- static const int days[12] = {305, 336, -1, 30, 60, 91, 121, 152, 183, 213, 244, 274};
+ static const int days[12] = {305, 336, -1, 30, 60, 91, 121, 152, 183, 213, 244, 274};
struct tm tp;
time_t t;
@@ -3361,9 +3361,9 @@ mime_parse_date(const char *buf, const char *end)
}
}
- year = tp.tm_year;
+ year = tp.tm_year;
month = tp.tm_mon;
- mday = tp.tm_mday;
+ mday = tp.tm_mday;
// what should we do?
if (year > 137) {
@@ -3617,7 +3617,7 @@ bool
MIMEFieldBlockImpl::contains(const MIMEField *field)
{
MIMEField *first = &(m_field_slots[0]);
- MIMEField *last = &(m_field_slots[MIME_FIELD_BLOCK_SLOTS - 1]);
+ MIMEField *last = &(m_field_slots[MIME_FIELD_BLOCK_SLOTS - 1]);
return (field >= first) && (field <= last);
}
@@ -3739,7 +3739,7 @@ MIMEHdrImpl::recompute_cooked_stuff(MIMEField *changing_field_or_null)
#endif
HdrTokenHeapPrefix *p = hdrtoken_wks_to_prefix(token_wks);
- mask = p->wks_type_specific.u.cache_control.cc_mask;
+ mask = p->wks_type_specific.u.cache_control.cc_mask;
m_cooked_stuff.m_cache_control.m_mask |= mask;
#if TRACK_COOKING
diff --git a/proxy/hdrs/MIME.h b/proxy/hdrs/MIME.h
index 99cc33f..f2c8d39 100644
--- a/proxy/hdrs/MIME.h
+++ b/proxy/hdrs/MIME.h
@@ -41,9 +41,9 @@
enum MIMEParseResult {
PARSE_ERROR = -1,
- PARSE_DONE = 0,
- PARSE_OK = 1,
- PARSE_CONT = 2,
+ PARSE_DONE = 0,
+ PARSE_OK = 1,
+ PARSE_CONT = 2,
};
enum {
@@ -207,20 +207,20 @@ struct MIMEFieldBlockImpl : public HdrHeapObjImpl {
***********************************************************************/
enum MIMECookedMask {
- MIME_COOKED_MASK_CC_MAX_AGE = (1 << 0),
- MIME_COOKED_MASK_CC_NO_CACHE = (1 << 1),
- MIME_COOKED_MASK_CC_NO_STORE = (1 << 2),
- MIME_COOKED_MASK_CC_NO_TRANSFORM = (1 << 3),
- MIME_COOKED_MASK_CC_MAX_STALE = (1 << 4),
- MIME_COOKED_MASK_CC_MIN_FRESH = (1 << 5),
- MIME_COOKED_MASK_CC_ONLY_IF_CACHED = (1 << 6),
- MIME_COOKED_MASK_CC_PUBLIC = (1 << 7),
- MIME_COOKED_MASK_CC_PRIVATE = (1 << 8),
- MIME_COOKED_MASK_CC_MUST_REVALIDATE = (1 << 9),
- MIME_COOKED_MASK_CC_PROXY_REVALIDATE = (1 << 10),
- MIME_COOKED_MASK_CC_S_MAXAGE = (1 << 11),
+ MIME_COOKED_MASK_CC_MAX_AGE = (1 << 0),
+ MIME_COOKED_MASK_CC_NO_CACHE = (1 << 1),
+ MIME_COOKED_MASK_CC_NO_STORE = (1 << 2),
+ MIME_COOKED_MASK_CC_NO_TRANSFORM = (1 << 3),
+ MIME_COOKED_MASK_CC_MAX_STALE = (1 << 4),
+ MIME_COOKED_MASK_CC_MIN_FRESH = (1 << 5),
+ MIME_COOKED_MASK_CC_ONLY_IF_CACHED = (1 << 6),
+ MIME_COOKED_MASK_CC_PUBLIC = (1 << 7),
+ MIME_COOKED_MASK_CC_PRIVATE = (1 << 8),
+ MIME_COOKED_MASK_CC_MUST_REVALIDATE = (1 << 9),
+ MIME_COOKED_MASK_CC_PROXY_REVALIDATE = (1 << 10),
+ MIME_COOKED_MASK_CC_S_MAXAGE = (1 << 11),
MIME_COOKED_MASK_CC_NEED_REVALIDATE_ONCE = (1 << 12),
- MIME_COOKED_MASK_CC_EXTENSION = (1 << 13)
+ MIME_COOKED_MASK_CC_EXTENSION = (1 << 13)
};
struct MIMECookedCacheControl {
@@ -1180,7 +1180,7 @@ inline MIMEField *
MIMEHdr::iter_get_first(MIMEFieldIter *iter)
{
iter->m_block = &m_mime->m_first_fblock;
- iter->m_slot = 0;
+ iter->m_slot = 0;
return iter_get(iter);
}
@@ -1196,12 +1196,12 @@ MIMEHdr::iter_get(MIMEFieldIter *iter)
for (; slot < (int)b->m_freetop; slot++) {
f = &(b->m_field_slots[slot]);
if (f->is_live()) {
- iter->m_slot = slot;
+ iter->m_slot = slot;
iter->m_block = b;
return f;
}
}
- b = b->m_next;
+ b = b->m_next;
slot = 0;
}
@@ -1379,7 +1379,7 @@ MIMEHdr::field_combine_dups(MIMEField *field, bool prepend_comma, const char sep
MIMEField *current = field->m_next_dup;
while (current) {
- int value_len = 0;
+ int value_len = 0;
const char *value_str = current->value_get(&value_len);
if (value_len > 0) {
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index c343b42..3025dca 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -148,73 +148,73 @@ url_init()
hdrtoken_init();
- URL_SCHEME_FILE = hdrtoken_string_to_wks("file");
- URL_SCHEME_FTP = hdrtoken_string_to_wks("ftp");
- URL_SCHEME_GOPHER = hdrtoken_string_to_wks("gopher");
- URL_SCHEME_HTTP = hdrtoken_string_to_wks("http");
- URL_SCHEME_HTTPS = hdrtoken_string_to_wks("https");
- URL_SCHEME_WSS = hdrtoken_string_to_wks("wss");
- URL_SCHEME_WS = hdrtoken_string_to_wks("ws");
- URL_SCHEME_MAILTO = hdrtoken_string_to_wks("mailto");
- URL_SCHEME_NEWS = hdrtoken_string_to_wks("news");
- URL_SCHEME_NNTP = hdrtoken_string_to_wks("nntp");
+ URL_SCHEME_FILE = hdrtoken_string_to_wks("file");
+ URL_SCHEME_FTP = hdrtoken_string_to_wks("ftp");
+ URL_SCHEME_GOPHER = hdrtoken_string_to_wks("gopher");
+ URL_SCHEME_HTTP = hdrtoken_string_to_wks("http");
+ URL_SCHEME_HTTPS = hdrtoken_string_to_wks("https");
+ URL_SCHEME_WSS = hdrtoken_string_to_wks("wss");
+ URL_SCHEME_WS = hdrtoken_string_to_wks("ws");
+ URL_SCHEME_MAILTO = hdrtoken_string_to_wks("mailto");
+ URL_SCHEME_NEWS = hdrtoken_string_to_wks("news");
+ URL_SCHEME_NNTP = hdrtoken_string_to_wks("nntp");
URL_SCHEME_PROSPERO = hdrtoken_string_to_wks("prospero");
- URL_SCHEME_TELNET = hdrtoken_string_to_wks("telnet");
- URL_SCHEME_TUNNEL = hdrtoken_string_to_wks("tunnel");
- URL_SCHEME_WAIS = hdrtoken_string_to_wks("wais");
- URL_SCHEME_PNM = hdrtoken_string_to_wks("pnm");
- URL_SCHEME_RTSP = hdrtoken_string_to_wks("rtsp");
- URL_SCHEME_RTSPU = hdrtoken_string_to_wks("rtspu");
- URL_SCHEME_MMS = hdrtoken_string_to_wks("mms");
- URL_SCHEME_MMSU = hdrtoken_string_to_wks("mmsu");
- URL_SCHEME_MMST = hdrtoken_string_to_wks("mmst");
+ URL_SCHEME_TELNET = hdrtoken_string_to_wks("telnet");
+ URL_SCHEME_TUNNEL = hdrtoken_string_to_wks("tunnel");
+ URL_SCHEME_WAIS = hdrtoken_string_to_wks("wais");
+ URL_SCHEME_PNM = hdrtoken_string_to_wks("pnm");
+ URL_SCHEME_RTSP = hdrtoken_string_to_wks("rtsp");
+ URL_SCHEME_RTSPU = hdrtoken_string_to_wks("rtspu");
+ URL_SCHEME_MMS = hdrtoken_string_to_wks("mms");
+ URL_SCHEME_MMSU = hdrtoken_string_to_wks("mmsu");
+ URL_SCHEME_MMST = hdrtoken_string_to_wks("mmst");
ink_assert(URL_SCHEME_FILE && URL_SCHEME_FTP && URL_SCHEME_GOPHER && URL_SCHEME_HTTP && URL_SCHEME_HTTPS && URL_SCHEME_WS &&
URL_SCHEME_WSS && URL_SCHEME_MAILTO && URL_SCHEME_NEWS && URL_SCHEME_NNTP && URL_SCHEME_PROSPERO &&
URL_SCHEME_TELNET && URL_SCHEME_TUNNEL && URL_SCHEME_WAIS && URL_SCHEME_PNM && URL_SCHEME_RTSP && URL_SCHEME_RTSPU &&
URL_SCHEME_MMS && URL_SCHEME_MMSU && URL_SCHEME_MMST);
- URL_WKSIDX_FILE = hdrtoken_wks_to_index(URL_SCHEME_FILE);
- URL_WKSIDX_FTP = hdrtoken_wks_to_index(URL_SCHEME_FTP);
- URL_WKSIDX_GOPHER = hdrtoken_wks_to_index(URL_SCHEME_GOPHER);
- URL_WKSIDX_HTTP = hdrtoken_wks_to_index(URL_SCHEME_HTTP);
- URL_WKSIDX_HTTPS = hdrtoken_wks_to_index(URL_SCHEME_HTTPS);
- URL_WKSIDX_WS = hdrtoken_wks_to_index(URL_SCHEME_WS);
- URL_WKSIDX_WSS = hdrtoken_wks_to_index(URL_SCHEME_WSS);
- URL_WKSIDX_MAILTO = hdrtoken_wks_to_index(URL_SCHEME_MAILTO);
- URL_WKSIDX_NEWS = hdrtoken_wks_to_index(URL_SCHEME_NEWS);
- URL_WKSIDX_NNTP = hdrtoken_wks_to_index(URL_SCHEME_NNTP);
+ URL_WKSIDX_FILE = hdrtoken_wks_to_index(URL_SCHEME_FILE);
+ URL_WKSIDX_FTP = hdrtoken_wks_to_index(URL_SCHEME_FTP);
+ URL_WKSIDX_GOPHER = hdrtoken_wks_to_index(URL_SCHEME_GOPHER);
+ URL_WKSIDX_HTTP = hdrtoken_wks_to_index(URL_SCHEME_HTTP);
+ URL_WKSIDX_HTTPS = hdrtoken_wks_to_index(URL_SCHEME_HTTPS);
+ URL_WKSIDX_WS = hdrtoken_wks_to_index(URL_SCHEME_WS);
+ URL_WKSIDX_WSS = hdrtoken_wks_to_index(URL_SCHEME_WSS);
+ URL_WKSIDX_MAILTO = hdrtoken_wks_to_index(URL_SCHEME_MAILTO);
+ URL_WKSIDX_NEWS = hdrtoken_wks_to_index(URL_SCHEME_NEWS);
+ URL_WKSIDX_NNTP = hdrtoken_wks_to_index(URL_SCHEME_NNTP);
URL_WKSIDX_PROSPERO = hdrtoken_wks_to_index(URL_SCHEME_PROSPERO);
- URL_WKSIDX_TELNET = hdrtoken_wks_to_index(URL_SCHEME_TELNET);
- URL_WKSIDX_TUNNEL = hdrtoken_wks_to_index(URL_SCHEME_TUNNEL);
- URL_WKSIDX_WAIS = hdrtoken_wks_to_index(URL_SCHEME_WAIS);
- URL_WKSIDX_PNM = hdrtoken_wks_to_index(URL_SCHEME_PNM);
- URL_WKSIDX_RTSP = hdrtoken_wks_to_index(URL_SCHEME_RTSP);
- URL_WKSIDX_RTSPU = hdrtoken_wks_to_index(URL_SCHEME_RTSPU);
- URL_WKSIDX_MMS = hdrtoken_wks_to_index(URL_SCHEME_MMS);
- URL_WKSIDX_MMSU = hdrtoken_wks_to_index(URL_SCHEME_MMSU);
- URL_WKSIDX_MMST = hdrtoken_wks_to_index(URL_SCHEME_MMST);
-
- URL_LEN_FILE = hdrtoken_wks_to_length(URL_SCHEME_FILE);
- URL_LEN_FTP = hdrtoken_wks_to_length(URL_SCHEME_FTP);
- URL_LEN_GOPHER = hdrtoken_wks_to_length(URL_SCHEME_GOPHER);
- URL_LEN_HTTP = hdrtoken_wks_to_length(URL_SCHEME_HTTP);
- URL_LEN_HTTPS = hdrtoken_wks_to_length(URL_SCHEME_HTTPS);
- URL_LEN_WS = hdrtoken_wks_to_length(URL_SCHEME_WS);
- URL_LEN_WSS = hdrtoken_wks_to_length(URL_SCHEME_WSS);
- URL_LEN_MAILTO = hdrtoken_wks_to_length(URL_SCHEME_MAILTO);
- URL_LEN_NEWS = hdrtoken_wks_to_length(URL_SCHEME_NEWS);
- URL_LEN_NNTP = hdrtoken_wks_to_length(URL_SCHEME_NNTP);
+ URL_WKSIDX_TELNET = hdrtoken_wks_to_index(URL_SCHEME_TELNET);
+ URL_WKSIDX_TUNNEL = hdrtoken_wks_to_index(URL_SCHEME_TUNNEL);
+ URL_WKSIDX_WAIS = hdrtoken_wks_to_index(URL_SCHEME_WAIS);
+ URL_WKSIDX_PNM = hdrtoken_wks_to_index(URL_SCHEME_PNM);
+ URL_WKSIDX_RTSP = hdrtoken_wks_to_index(URL_SCHEME_RTSP);
+ URL_WKSIDX_RTSPU = hdrtoken_wks_to_index(URL_SCHEME_RTSPU);
+ URL_WKSIDX_MMS = hdrtoken_wks_to_index(URL_SCHEME_MMS);
+ URL_WKSIDX_MMSU = hdrtoken_wks_to_index(URL_SCHEME_MMSU);
+ URL_WKSIDX_MMST = hdrtoken_wks_to_index(URL_SCHEME_MMST);
+
+ URL_LEN_FILE = hdrtoken_wks_to_length(URL_SCHEME_FILE);
+ URL_LEN_FTP = hdrtoken_wks_to_length(URL_SCHEME_FTP);
+ URL_LEN_GOPHER = hdrtoken_wks_to_length(URL_SCHEME_GOPHER);
+ URL_LEN_HTTP = hdrtoken_wks_to_length(URL_SCHEME_HTTP);
+ URL_LEN_HTTPS = hdrtoken_wks_to_length(URL_SCHEME_HTTPS);
+ URL_LEN_WS = hdrtoken_wks_to_length(URL_SCHEME_WS);
+ URL_LEN_WSS = hdrtoken_wks_to_length(URL_SCHEME_WSS);
+ URL_LEN_MAILTO = hdrtoken_wks_to_length(URL_SCHEME_MAILTO);
+ URL_LEN_NEWS = hdrtoken_wks_to_length(URL_SCHEME_NEWS);
+ URL_LEN_NNTP = hdrtoken_wks_to_length(URL_SCHEME_NNTP);
URL_LEN_PROSPERO = hdrtoken_wks_to_length(URL_SCHEME_PROSPERO);
- URL_LEN_TELNET = hdrtoken_wks_to_length(URL_SCHEME_TELNET);
- URL_LEN_TUNNEL = hdrtoken_wks_to_length(URL_SCHEME_TUNNEL);
- URL_LEN_WAIS = hdrtoken_wks_to_length(URL_SCHEME_WAIS);
- URL_LEN_PNM = hdrtoken_wks_to_length(URL_SCHEME_PNM);
- URL_LEN_RTSP = hdrtoken_wks_to_length(URL_SCHEME_RTSP);
- URL_LEN_RTSPU = hdrtoken_wks_to_length(URL_SCHEME_RTSPU);
- URL_LEN_MMS = hdrtoken_wks_to_length(URL_SCHEME_MMS);
- URL_LEN_MMSU = hdrtoken_wks_to_length(URL_SCHEME_MMSU);
- URL_LEN_MMST = hdrtoken_wks_to_length(URL_SCHEME_MMST);
+ URL_LEN_TELNET = hdrtoken_wks_to_length(URL_SCHEME_TELNET);
+ URL_LEN_TUNNEL = hdrtoken_wks_to_length(URL_SCHEME_TUNNEL);
+ URL_LEN_WAIS = hdrtoken_wks_to_length(URL_SCHEME_WAIS);
+ URL_LEN_PNM = hdrtoken_wks_to_length(URL_SCHEME_PNM);
+ URL_LEN_RTSP = hdrtoken_wks_to_length(URL_SCHEME_RTSP);
+ URL_LEN_RTSPU = hdrtoken_wks_to_length(URL_SCHEME_RTSPU);
+ URL_LEN_MMS = hdrtoken_wks_to_length(URL_SCHEME_MMS);
+ URL_LEN_MMSU = hdrtoken_wks_to_length(URL_SCHEME_MMSU);
+ URL_LEN_MMST = hdrtoken_wks_to_length(URL_SCHEME_MMST);
ink_assert(URLHashContext::OBJ_SIZE >= sizeof(MD5Context));
ink_assert(URLHashContext::OBJ_SIZE >= sizeof(MMHContext));
@@ -237,7 +237,7 @@ url_create(HdrHeap *heap)
url = (URLImpl *)heap->allocate_obj(sizeof(URLImpl), HDR_HEAP_OBJ_URL);
obj_clear_data((HdrHeapObjImpl *)url);
- url->m_url_type = URL_TYPE_NONE;
+ url->m_url_type = URL_TYPE_NONE;
url->m_scheme_wks_idx = -1;
url_clear_string_ref(url);
return url;
@@ -250,7 +250,7 @@ void
url_clear(URLImpl *url_impl)
{
obj_clear_data((HdrHeapObjImpl *)url_impl);
- url_impl->m_url_type = URL_TYPE_NONE;
+ url_impl->m_url_type = URL_TYPE_NONE;
url_impl->m_scheme_wks_idx = -1;
}
@@ -284,20 +284,20 @@ url_copy_onto(URLImpl *s_url, HdrHeap *s_heap, URLImpl *d_url, HdrHeap *d_heap,
void
url_nuke_proxy_stuff(URLImpl *d_url)
{
- d_url->m_len_scheme = 0;
- d_url->m_len_user = 0;
+ d_url->m_len_scheme = 0;
+ d_url->m_len_user = 0;
d_url->m_len_password = 0;
- d_url->m_len_host = 0;
- d_url->m_len_port = 0;
+ d_url->m_len_host = 0;
+ d_url->m_len_port = 0;
- d_url->m_ptr_scheme = NULL;
- d_url->m_ptr_user = NULL;
+ d_url->m_ptr_scheme = NULL;
+ d_url->m_ptr_user = NULL;
d_url->m_ptr_password = NULL;
- d_url->m_ptr_host = NULL;
- d_url->m_ptr_port = NULL;
+ d_url->m_ptr_host = NULL;
+ d_url->m_ptr_port = NULL;
d_url->m_scheme_wks_idx = -1;
- d_url->m_port = 0;
+ d_url->m_port = 0;
}
/*-------------------------------------------------------------------------
@@ -313,18 +313,18 @@ url_copy_onto_as_server_url(URLImpl *s_url, HdrHeap *s_heap, URLImpl *d_url, Hdr
{
url_nuke_proxy_stuff(d_url);
- d_url->m_ptr_path = s_url->m_ptr_path;
- d_url->m_ptr_params = s_url->m_ptr_params;
- d_url->m_ptr_query = s_url->m_ptr_query;
+ d_url->m_ptr_path = s_url->m_ptr_path;
+ d_url->m_ptr_params = s_url->m_ptr_params;
+ d_url->m_ptr_query = s_url->m_ptr_query;
d_url->m_ptr_fragment = s_url->m_ptr_fragment;
url_clear_string_ref(d_url);
- d_url->m_len_path = s_url->m_len_path;
- d_url->m_len_params = s_url->m_len_params;
- d_url->m_len_query = s_url->m_len_query;
+ d_url->m_len_path = s_url->m_len_path;
+ d_url->m_len_params = s_url->m_len_params;
+ d_url->m_len_query = s_url->m_len_query;
d_url->m_len_fragment = s_url->m_len_fragment;
- d_url->m_url_type = s_url->m_url_type;
+ d_url->m_url_type = s_url->m_url_type;
d_url->m_type_code = s_url->m_type_code;
if (inherit_strs && (s_heap != d_heap))
@@ -603,7 +603,7 @@ url_clear_string_ref(URLImpl *url)
if (url->m_ptr_printed_string) {
url->m_len_printed_string = 0;
url->m_ptr_printed_string = NULL;
- url->m_clean = true;
+ url->m_clean = true;
}
return;
}
@@ -621,7 +621,7 @@ url_string_get_ref(HdrHeap *heap, URLImpl *url, int *length)
} else { // either not clean or never printed
int len = url_length_get(url);
char *buf;
- int index = 0;
+ int index = 0;
int offset = 0;
/* stuff alloc'd here gets gc'd on HdrHeap::destroy() */
@@ -632,7 +632,7 @@ url_string_get_ref(HdrHeap *heap, URLImpl *url, int *length)
if (length) {
*length = len;
}
- url->m_clean = true; // reset since we have url_print()'ed again
+ url->m_clean = true; // reset since we have url_print()'ed again
url->m_len_printed_string = len;
url->m_ptr_printed_string = buf;
return buf;
@@ -645,7 +645,7 @@ url_string_get(URLImpl *url, Arena *arena, int *length, HdrHeap *heap)
int len = url_length_get(url);
char *buf;
char *buf2;
- int index = 0;
+ int index = 0;
int offset = 0;
buf = arena ? arena->str_alloc(len) : (char *)ats_malloc(len + 1);
@@ -657,8 +657,8 @@ url_string_get(URLImpl *url, Arena *arena, int *length, HdrHeap *heap)
if (heap) {
buf2 = heap->allocate_str(len + 1);
memcpy(buf2, buf, len);
- buf2[len] = '\0';
- url->m_clean = true; // reset since we have url_print()'ed again
+ buf2[len] = '\0';
+ url->m_clean = true; // reset since we have url_print()'ed again
url->m_len_printed_string = len;
url->m_ptr_printed_string = buf2;
}
@@ -675,10 +675,10 @@ url_string_get(URLImpl *url, Arena *arena, int *length, HdrHeap *heap)
char *
url_string_get_buf(URLImpl *url, char *dstbuf, int dstbuf_size, int *length)
{
- int len = url_length_get(url);
- int index = 0;
+ int len = url_length_get(url);
+ int index = 0;
int offset = 0;
- char *buf = 0;
+ char *buf = 0;
if (dstbuf && dstbuf_size > 0) {
buf = dstbuf;
@@ -702,10 +702,10 @@ url_scheme_get(URLImpl *url, int *length)
const char *str;
if (url->m_scheme_wks_idx >= 0) {
- str = hdrtoken_index_to_wks(url->m_scheme_wks_idx);
+ str = hdrtoken_index_to_wks(url->m_scheme_wks_idx);
*length = hdrtoken_index_to_length(url->m_scheme_wks_idx);
} else {
- str = url->m_ptr_scheme;
+ str = url->m_ptr_scheme;
*length = url->m_len_scheme;
}
return str;
@@ -958,7 +958,7 @@ unescape_str(char *&buf, char *buf_e, const char *&str, const char *str_e, int &
int min_len = (int)(str_len < buf_len ? str_len : buf_len);
first_pct = ink_memcpy_until_char(buf, (char *)str, min_len, '%');
- copy_len = (int)(first_pct - str);
+ copy_len = (int)(first_pct - str);
str += copy_len;
buf += copy_len;
if (copy_len == min_len)
@@ -981,7 +981,7 @@ unescape_str(char *&buf, char *buf_e, const char *&str, const char *str_e, int &
state = 2;
} else {
*buf++ = str[-1];
- state = 0;
+ state = 0;
}
break;
case 2:
@@ -1004,12 +1004,12 @@ unescape_str(char *&buf, char *buf_e, const char *&str, const char *str_e, int &
state = 0;
} else {
*buf++ = str[-2];
- state = 3;
+ state = 3;
}
break;
case 3:
*buf++ = str[-1];
- state = 0;
+ state = 0;
break;
}
}
@@ -1038,7 +1038,7 @@ unescape_str_tolower(char *&buf, char *end, const char *&str, const char *str_e,
state = 2;
} else {
*buf++ = ParseRules::ink_tolower(str[-1]);
- state = 0;
+ state = 0;
}
break;
case 2:
@@ -1061,12 +1061,12 @@ unescape_str_tolower(char *&buf, char *end, const char *&str, const char *str_e,
state = 0;
} else {
*buf++ = ParseRules::ink_tolower(str[-2]);
- state = 3;
+ state = 3;
}
break;
case 3:
*buf++ = ParseRules::ink_tolower(str[-1]);
- state = 0;
+ state = 0;
break;
}
}
@@ -1086,9 +1086,9 @@ url_unescapify(Arena *arena, const char *str, int length)
length = (int)strlen(str);
buffer = arena->str_alloc(length);
- t = buffer;
- e = buffer + length;
- s = 0;
+ t = buffer;
+ e = buffer + length;
+ s = 0;
unescape_str(t, e, str, str + length, s);
*t = '\0';
@@ -1119,7 +1119,7 @@ url_parse_scheme(HdrHeap *heap, URLImpl *url, const char **start, const char *en
const char *cur = *start;
const char *scheme_wks;
const char *scheme_start = NULL;
- const char *scheme_end = NULL;
+ const char *scheme_end = NULL;
int scheme_wks_idx;
while (' ' == *cur && ++cur < end)
@@ -1194,8 +1194,8 @@ url_parse_internet(HdrHeap *heap, URLImpl *url, char const **start, char const *
char const *bracket = 0; // marker for open bracket, if any.
ts::ConstBuffer user, passw, host, port;
static size_t const MAX_COLON = 8; // max # of valid colons.
- size_t n_colon = 0;
- char const *last_colon = 0; // pointer to last colon seen.
+ size_t n_colon = 0;
+ char const *last_colon = 0; // pointer to last colon seen.
// Do a quick check for "://"
if (end - cur > 3 && (((':' ^ *cur) | ('/' ^ cur[1]) | ('/' ^ cur[2])) == 0)) {
@@ -1245,7 +1245,7 @@ url_parse_internet(HdrHeap *heap, URLImpl *url, char const **start, char const *
if (n_colon) {
user.set(base, last_colon);
passw.set(last_colon + 1, cur);
- n_colon = 0;
+ n_colon = 0;
last_colon = 0;
} else {
user.set(base, cur);
@@ -1315,14 +1315,14 @@ url_parse_http(HdrHeap *heap, URLImpl *url, const char **start, const char *end,
{
MIMEParseResult err;
const char *cur;
- const char *path_start = NULL;
- const char *path_end = NULL;
- const char *params_start = NULL;
- const char *params_end = NULL;
- const char *query_start = NULL;
- const char *query_end = NULL;
+ const char *path_start = NULL;
+ const char *path_end = NULL;
+ const char *params_start = NULL;
+ const char *params_end = NULL;
+ const char *query_start = NULL;
+ const char *query_end = NULL;
const char *fragment_start = NULL;
- const char *fragment_end = NULL;
+ const char *fragment_end = NULL;
char mask;
err = url_parse_internet(heap, url, start, end, copy_strings);
@@ -1334,7 +1334,7 @@ url_parse_http(HdrHeap *heap, URLImpl *url, const char **start, const char *end,
goto done;
path_start = cur;
- mask = ';' & '?' & '#';
+ mask = ';' & '?' & '#';
parse_path2:
if ((*cur & mask) == mask) {
if (*cur == ';') {
@@ -1427,7 +1427,7 @@ url_parse_http_no_path_component_breakdown(HdrHeap *heap, URLImpl *url, const ch
// Grab everything until EOS or slash.
char const *base = cur;
- cur = static_cast<char const *>(memchr(cur, '/', end - cur));
+ cur = static_cast<char const *>(memchr(cur, '/', end - cur));
if (cur) {
host_end = cur;
++cur;
@@ -1438,11 +1438,11 @@ url_parse_http_no_path_component_breakdown(HdrHeap *heap, URLImpl *url, const ch
// Did we find something for the host?
if (base != host_end) {
char const *port = 0;
- int port_len = 0;
+ int port_len = 0;
// Check for port. Search from the end stopping on the first non-digit
// or more than 5 digits and a delimiter.
- port = host_end - 1;
+ port = host_end - 1;
char const *port_limit = host_end - 6;
if (port_limit < base)
port_limit = base; // don't go past start.
@@ -1508,7 +1508,7 @@ url_print(URLImpl *url, char *buf_start, int buf_length, int *buf_index_inout, i
if (url->m_ptr_host) {
// Force brackets for IPv6. Note colon must occur in first 5 characters.
// But it can be less (e.g. "::1").
- int n = url->m_len_host;
+ int n = url->m_len_host;
bool bracket_p = '[' != *url->m_ptr_host && (0 != memchr(url->m_ptr_host, ':', n > 5 ? 5 : n));
if (bracket_p)
TRY(mime_mem_print("[", 1, buf_start, buf_length, buf_index_inout, buf_chars_to_skip_inout));
@@ -1625,8 +1625,8 @@ url_MD5_get_fast(const URLImpl *url, CryptoContext &ctx, CryptoHash *hash, cache
ink_assert(sizeof(url->m_port) == 2);
uint16_t port = (uint16_t)url_canonicalize_port(url->m_url_type, url->m_port);
- *p++ = ((char *)&port)[0];
- *p++ = ((char *)&port)[1];
+ *p++ = ((char *)&port)[0];
+ *p++ = ((char *)&port)[1];
ctx.update(buffer, p - buffer);
if (generation != -1) {
@@ -1666,11 +1666,11 @@ url_MD5_get_general(const URLImpl *url, CryptoContext &ctx, CryptoHash &hash, ca
ends[7] = strs[7] + 1;
ends[8] = strs[8] + url->m_len_path;
- strs[9] = ";";
+ strs[9] = ";";
strs[10] = url->m_ptr_params;
strs[11] = "?";
strs[12] = url->m_ptr_query;
- ends[9] = strs[9] + 1;
+ ends[9] = strs[9] + 1;
ends[10] = strs[10] + url->m_len_params;
ends[11] = strs[11] + 1;
ends[12] = strs[12] + url->m_len_query;
@@ -1791,7 +1791,7 @@ REGRESSION_TEST(VALIDATE_HDR_FIELD)(RegressionTest *t, int /* level ATS_UNUSED *
for (unsigned int i = 0; i < sizeof(http_validate_hdr_field_test_case) / sizeof(http_validate_hdr_field_test_case[0]); ++i) {
const char *const txt = http_validate_hdr_field_test_case[i].text;
- ts::ConstBuffer tmp = ts::ConstBuffer(txt, strlen(txt));
+ ts::ConstBuffer tmp = ts::ConstBuffer(txt, strlen(txt));
box.check(validate_host_name(tmp) == http_validate_hdr_field_test_case[i].valid,
"Validation of FQDN (host) header: \"%s\", expected %s, but not", txt,
(http_validate_hdr_field_test_case[i].valid ? "true" : "false"));
diff --git a/proxy/hdrs/load_http_hdr.cc b/proxy/hdrs/load_http_hdr.cc
index dc9b5da..66269bb 100644
--- a/proxy/hdrs/load_http_hdr.cc
+++ b/proxy/hdrs/load_http_hdr.cc
@@ -54,10 +54,10 @@
#include <fcntl.h>
#include <unistd.h>
-void *low_load_addr = NULL;
+void *low_load_addr = NULL;
void *high_load_addr = NULL;
-int heap_load_size = 0;
-int marshalled = 0;
+int heap_load_size = 0;
+int marshalled = 0;
// Diags *diags;
@@ -79,7 +79,7 @@ load_string(const char *s, int len, int offset)
copy_from = s + offset;
} else {
copy_from = "<BAD>";
- len = strlen(copy_from);
+ len = strlen(copy_from);
}
char *r = (char *)ats_malloc(len + 1);
memcpy(r, copy_from, len);
@@ -202,7 +202,7 @@ load_buffer(int fd, hdr_type h_type)
exit(1);
}
- char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
+ char *file_buf = (char *)ats_malloc(sizeof(char) * (s_info.st_size + 1));
file_buf[s_info.st_size] = '\0';
// Read in the entire file
@@ -225,7 +225,7 @@ load_buffer(int fd, hdr_type h_type)
Tokenizer el_tok(" \t");
int num_lines = line_tok.Initialize(file_buf);
- int num_el = el_tok.Initialize(line_tok[0]);
+ int num_el = el_tok.Initialize(line_tok[0]);
if (num_el < 3) {
fprintf(stderr, "Corrupted data file\n");
@@ -244,12 +244,12 @@ load_buffer(int fd, hdr_type h_type)
fprintf(stderr, "Corrupted data file\n");
exit(1);
}
- hdr_size = (num_lines * 16);
+ hdr_size = (num_lines * 16);
heap_load_size = hdr_size;
char *hdr_heap = (char *)ats_malloc(hdr_size);
int bytes_read = 0;
- int cur_line = 0;
+ int cur_line = 0;
while (cur_line < num_lines && bytes_read < hdr_size) {
int *cur_ptr;
@@ -267,7 +267,7 @@ load_buffer(int fd, hdr_type h_type)
fprintf(stderr, "Corrupted data file\n");
exit(1);
}
- cur_ptr = (int *)(hdr_heap + bytes_read);
+ cur_ptr = (int *)(hdr_heap + bytes_read);
*cur_ptr = el;
bytes_read += 4;
}
@@ -275,17 +275,17 @@ load_buffer(int fd, hdr_type h_type)
}
HdrHeap *my_heap = (HdrHeap *)hdr_heap;
- int offset = hdr_heap - (char *)old_addr;
+ int offset = hdr_heap - (char *)old_addr;
// Patch up some values
if (my_heap->m_magic == HDR_BUF_MAGIC_MARSHALED) {
// HdrHeapObjImpl* obj;
// my_heap->unmarshal(hdr_size, HDR_HEAP_OBJ_HTTP_HEADER, &obj, NULL);
marshalled = 1;
- offset = (int)hdr_heap;
+ offset = (int)hdr_heap;
} else {
- my_heap->m_free_start = my_heap->m_free_start + offset;
- my_heap->m_data_start = my_heap->m_data_start + offset;
+ my_heap->m_free_start = my_heap->m_free_start + offset;
+ my_heap->m_data_start = my_heap->m_data_start + offset;
my_heap->m_ronly_heap[0].m_heap_start = my_heap->m_ronly_heap[0].m_heap_start + offset;
}
loop_over_heap_objs(my_heap, offset);
diff --git a/proxy/hdrs/test_header.cc b/proxy/hdrs/test_header.cc
index 176d32b..9f218ec 100644
--- a/proxy/hdrs/test_header.cc
+++ b/proxy/hdrs/test_header.cc
@@ -127,7 +127,7 @@ test_format_date()
time_t t, t2;
char buffer[128], buffer2[128];
static char *envstr = "TZ=GMT";
- int failures = 0;
+ int failures = 0;
// shift into GMT timezone for cftime conversions
putenv(envstr);
@@ -217,8 +217,8 @@ test_url()
failed = 0;
for (i = 0; i < nstrs; i++) {
old_length = strlen(strs[i]);
- start = strs[i];
- end = start + old_length;
+ start = strs[i];
+ end = start + old_length;
url.create(NULL);
err = url.parse(&start, end);
@@ -296,7 +296,7 @@ test_mime()
printf(" <<< MUST BE HAND-VERIFIED >>>\n\n");
start = mime;
- end = start + strlen(start);
+ end = start + strlen(start);
mime_parser_init(&parser);
@@ -346,7 +346,7 @@ test_mime()
MIMEField *cc_field;
StrList slist;
int slist_count;
- cc_field = hdr.field_find("Cache-Control", 13);
+ cc_field = hdr.field_find("Cache-Control", 13);
slist_count = cc_field->value_get_comma_list(&slist); // FIX: correct usage?
mime_parser_clear(&parser);
@@ -406,15 +406,15 @@ test_http_parser_eos_boundary_cases()
HTTPHdr req_hdr;
start = tests[i].msg;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
req_hdr.create(HTTP_TYPE_REQUEST);
http_parser_clear(&parser);
// http_parser_init (&parser);
- orig_start = start;
- ret = req_hdr.parse_req(&parser, &start, end, true);
+ orig_start = start;
+ ret = req_hdr.parse_req(&parser, &start, end, true);
bytes_consumed = start - orig_start;
printf("======== test %d (length=%d, consumed=%d)\n", i, strlen(tests[i].msg), bytes_consumed);
@@ -455,7 +455,7 @@ test_http_aux(const char *request, const char *response)
/*** (1) parse the request string into req_hdr ***/
start = request;
- end = start + strlen(start); // 1 character past end of string
+ end = start + strlen(start); // 1 character past end of string
http_parser_init(&parser);
@@ -496,7 +496,7 @@ test_http_aux(const char *request, const char *response)
/*** (3) parse the response string into rsp_hdr ***/
start = response;
- end = start + strlen(start);
+ end = start + strlen(start);
http_parser_clear(&parser);
http_parser_init(&parser);
@@ -535,9 +535,9 @@ test_http_aux(const char *request, const char *response)
do {
last_bufindex = bufindex;
- tmp = bufindex;
- buf[0] = '#'; // make it obvious if hdr.print doesn't print anything
- err = rsp_hdr.print(buf, NNN, &bufindex, &tmp);
+ tmp = bufindex;
+ buf[0] = '#'; // make it obvious if hdr.print doesn't print anything
+ err = rsp_hdr.print(buf, NNN, &bufindex, &tmp);
// printf("test_header: tmp = %d err = %d bufindex = %d\n", tmp, err, bufindex);
putchar('{');
@@ -741,7 +741,7 @@ test_http_mutation()
/*** (1) parse the response string into req_hdr ***/
start = base_resp;
- end = start + strlen(start);
+ end = start + strlen(start);
http_parser_init(&parser);
@@ -808,7 +808,7 @@ test_http_mutation()
static int
test_arena_aux(Arena *arena, int len)
{
- char *str = arena->str_alloc(len);
+ char *str = arena->str_alloc(len);
int verify_len = arena->str_length(str);
if (len != verify_len) {
diff --git a/proxy/hdrs/test_urlhash.cc b/proxy/hdrs/test_urlhash.cc
index c91c9bb..2a4124b 100644
--- a/proxy/hdrs/test_urlhash.cc
+++ b/proxy/hdrs/test_urlhash.cc
@@ -35,7 +35,7 @@ static void
test_url()
{
static const char *strs[] = {"http://npdev:19080/1.6664000000/4000", "http://npdev:19080/1.8666000000/4000"};
- static int nstrs = sizeof(strs) / sizeof(strs[0]);
+ static int nstrs = sizeof(strs) / sizeof(strs[0]);
int err, failed;
URL url;
@@ -46,8 +46,8 @@ test_url()
failed = 0;
for (i = 0; i < nstrs; i++) {
old_length = strlen(strs[i]);
- start = strs[i];
- end = start + old_length;
+ start = strs[i];
+ end = start + old_length;
url.create(NULL);
err = url.parse(&start, end);
diff --git a/proxy/http/Http1ClientSession.cc b/proxy/http/Http1ClientSession.cc
index e31b953..d83ac1b 100644
--- a/proxy/http/Http1ClientSession.cc
+++ b/proxy/http/Http1ClientSession.cc
@@ -51,7 +51,7 @@
enum {
HTTP_CS_MAGIC_ALIVE = 0x0123F00D,
- HTTP_CS_MAGIC_DEAD = 0xDEADF00D,
+ HTTP_CS_MAGIC_DEAD = 0xDEADF00D,
};
// We have debugging list that we can use to find stuck
@@ -119,10 +119,10 @@ Http1ClientSession::new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOB
{
ink_assert(new_vc != NULL);
ink_assert(client_vc == NULL);
- client_vc = new_vc;
- magic = HTTP_CS_MAGIC_ALIVE;
- mutex = new_vc->mutex;
- trans.mutex = mutex; // Share this mutex with the transaction
+ client_vc = new_vc;
+ magic = HTTP_CS_MAGIC_ALIVE;
+ mutex = new_vc->mutex;
+ trans.mutex = mutex; // Share this mutex with the transaction
ssn_start_time = Thread::get_hrtime();
MUTEX_TRY_LOCK(lock, mutex, this_ethread());
@@ -171,13 +171,13 @@ Http1ClientSession::new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOB
DebugHttpSsn("[%" PRId64 "] session born, netvc %p", con_id, new_vc);
read_buffer = iobuf ? iobuf : new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
- sm_reader = reader ? reader : read_buffer->alloc_reader();
+ sm_reader = reader ? reader : read_buffer->alloc_reader();
trans.set_reader(sm_reader);
// INKqa11186: Use a local pointer to the mutex as
// when we return from do_api_callout, the ClientSession may
// have already been deallocated.
- EThread *ethis = this_ethread();
+ EThread *ethis = this_ethread();
Ptr<ProxyMutex> lmutex = this->mutex;
MUTEX_TAKE_LOCK(lmutex, ethis);
do_api_callout(TS_HTTP_SSN_START_HOOK);
@@ -242,7 +242,7 @@ Http1ClientSession::do_io_close(int alerrno)
// it back to our shared pool
if (bound_ss) {
bound_ss->release();
- bound_ss = NULL;
+ bound_ss = NULL;
slave_ka_vio = NULL;
}
@@ -329,7 +329,7 @@ Http1ClientSession::state_slave_keep_alive(int event, void *data)
case VC_EVENT_EOS:
// The server session closed or something is amiss
bound_ss->do_io_close();
- bound_ss = NULL;
+ bound_ss = NULL;
slave_ka_vio = NULL;
break;
@@ -337,7 +337,7 @@ Http1ClientSession::state_slave_keep_alive(int event, void *data)
case VC_EVENT_INACTIVITY_TIMEOUT:
// Timeout - place the session on the shared pool
bound_ss->release();
- bound_ss = NULL;
+ bound_ss = NULL;
slave_ka_vio = NULL;
break;
}
@@ -463,7 +463,7 @@ Http1ClientSession::attach_server_session(HttpServerSession *ssession, bool tran
if (ssession) {
ink_assert(bound_ss == NULL);
ssession->state = HSS_KA_CLIENT_SLAVE;
- bound_ss = ssession;
+ bound_ss = ssession;
DebugHttpSsn("[%" PRId64 "] attaching server session [%" PRId64 "] as slave", con_id, ssession->con_id);
ink_assert(ssession->get_reader()->read_avail() == 0);
ink_assert(ssession->get_netvc() != this->get_netvc());
@@ -494,7 +494,7 @@ Http1ClientSession::attach_server_session(HttpServerSession *ssession, bool tran
}
} else {
ink_assert(bound_ss != NULL);
- bound_ss = NULL;
+ bound_ss = NULL;
slave_ka_vio = NULL;
}
}
diff --git a/proxy/http/Http1ClientTransaction.cc b/proxy/http/Http1ClientTransaction.cc
index 074d283..a5673c3 100644
--- a/proxy/http/Http1ClientTransaction.cc
+++ b/proxy/http/Http1ClientTransaction.cc
@@ -55,12 +55,12 @@ Http1ClientTransaction::release(IOBufferReader *r)
void
Http1ClientTransaction::set_parent(ProxyClientSession *new_parent)
{
- parent = new_parent;
+ parent = new_parent;
Http1ClientSession *http1_parent = dynamic_cast<Http1ClientSession *>(new_parent);
if (http1_parent) {
- outbound_port = http1_parent->outbound_port;
- outbound_ip4 = http1_parent->outbound_ip4;
- outbound_ip6 = http1_parent->outbound_ip6;
+ outbound_port = http1_parent->outbound_port;
+ outbound_ip4 = http1_parent->outbound_ip4;
+ outbound_ip6 = http1_parent->outbound_ip6;
outbound_transparent = http1_parent->f_outbound_transparent;
}
super::set_parent(new_parent);
diff --git a/proxy/http/HttpBodyFactory.cc b/proxy/http/HttpBodyFactory.cc
index 8483a3a..34c0455 100644
--- a/proxy/http/HttpBodyFactory.cc
+++ b/proxy/http/HttpBodyFactory.cc
@@ -65,13 +65,13 @@ HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *c
size_t content_language_buf_size, char *content_type_out_buf, size_t content_type_buf_size,
const char *format, va_list ap)
{
- char *buffer = NULL;
- const char *lang_ptr = NULL;
+ char *buffer = NULL;
+ const char *lang_ptr = NULL;
const char *charset_ptr = NULL;
char url[1024];
- const char *set = NULL;
+ const char *set = NULL;
bool found_requested_template = false;
- bool plain_flag = false;
+ bool plain_flag = false;
lock();
@@ -90,9 +90,9 @@ HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *c
if (u->valid()) { /* if url exists, copy the string into buffer */
size_t i;
char *s = u->string_get(&context->arena);
- for (i = 0; (i < sizeof(url) - 1) && s[i]; i++)
+ for (i = 0; (i < sizeof(url) - 1) && s[i]; i++)
url[i] = s[i];
- url[i] = '\0';
+ url[i] = '\0';
if (s)
context->arena.str_free(s);
}
@@ -127,9 +127,9 @@ HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *c
// length accordingly.
int l = ink_bvsprintf(NULL, format, ap);
if (l <= max_buffer_length) {
- buffer = (char *)ats_malloc(l);
+ buffer = (char *)ats_malloc(l);
*resulting_buffer_length = ink_bvsprintf(buffer, format, ap) - 1;
- plain_flag = true;
+ plain_flag = true;
}
}
/////////////////////////////////////////////////////////
@@ -158,7 +158,7 @@ HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State *c
set, type, *resulting_buffer_length, max_buffer_length);
}
*resulting_buffer_length = 0;
- buffer = (char *)ats_free_null(buffer);
+ buffer = (char *)ats_free_null(buffer);
}
/////////////////////////////////////////////////////////////////////
// handle return of instantiated template and generate the content //
@@ -212,8 +212,8 @@ HttpBodyFactory::dump_template_tables(FILE *fp)
///////////////////////////////////////////
for (b1 = h1->firstBinding(&i1); b1 != NULL; b1 = h1->nextBinding(&i1)) {
- k1 = table_of_sets->getKeyFromBinding(b1);
- v1 = table_of_sets->getValueFromBinding(b1);
+ k1 = table_of_sets->getKeyFromBinding(b1);
+ v1 = table_of_sets->getValueFromBinding(b1);
body_set = (HttpBodySet *)v1;
if (body_set != NULL) {
@@ -228,8 +228,8 @@ HttpBodyFactory::dump_template_tables(FILE *fp)
h2 = body_set->table_of_pages;
for (b2 = h2->firstBinding(&i2); b2 != NULL; b2 = h2->nextBinding(&i2)) {
- k2 = table_of_sets->getKeyFromBinding(b2);
- v2 = table_of_sets->getValueFromBinding(b2);
+ k2 = table_of_sets->getKeyFromBinding(b2);
+ v2 = table_of_sets->getValueFromBinding(b2);
HttpBodyTemplate *t = (HttpBodyTemplate *)v2;
fprintf(fp, " %-30s: %" PRId64 " bytes\n", k2, t->byte_count);
@@ -282,24 +282,24 @@ HttpBodyFactory::reconfigure()
all_found = true;
// enable_customizations if records.config set
- rec_err = RecGetRecordInt("proxy.config.body_factory.enable_customizations", &e);
+ rec_err = RecGetRecordInt("proxy.config.body_factory.enable_customizations", &e);
enable_customizations = ((rec_err == REC_ERR_OKAY) ? e : 0);
- all_found = all_found && (rec_err == REC_ERR_OKAY);
+ all_found = all_found && (rec_err == REC_ERR_OKAY);
Debug("body_factory", "enable_customizations = %d (found = %" PRId64 ")", enable_customizations, e);
- rec_err = RecGetRecordInt("proxy.config.body_factory.enable_logging", &e);
+ rec_err = RecGetRecordInt("proxy.config.body_factory.enable_logging", &e);
enable_logging = ((rec_err == REC_ERR_OKAY) ? (e ? true : false) : false);
- all_found = all_found && (rec_err == REC_ERR_OKAY);
+ all_found = all_found && (rec_err == REC_ERR_OKAY);
Debug("body_factory", "enable_logging = %d (found = %" PRId64 ")", enable_logging, e);
- rec_err = RecGetRecordInt("proxy.config.body_factory.response_suppression_mode", &e);
+ rec_err = RecGetRecordInt("proxy.config.body_factory.response_suppression_mode", &e);
response_suppression_mode = ((rec_err == REC_ERR_OKAY) ? e : 0);
- all_found = all_found && (rec_err == REC_ERR_OKAY);
+ all_found = all_found && (rec_err == REC_ERR_OKAY);
Debug("body_factory", "response_suppression_mode = %d (found = %" PRId64 ")", response_suppression_mode, e);
ats_scoped_str directory_of_template_sets;
- rec_err = RecGetRecordString_Xmalloc("proxy.config.body_factory.template_sets_dir", &s);
+ rec_err = RecGetRecordString_Xmalloc("proxy.config.body_factory.template_sets_dir", &s);
all_found = all_found && (rec_err == REC_ERR_OKAY);
if (rec_err == REC_ERR_OKAY) {
directory_of_template_sets = Layout::get()->relative(s);
@@ -351,9 +351,9 @@ HttpBodyFactory::HttpBodyFactory()
magic = HTTP_BODY_FACTORY_MAGIC;
ink_mutex_init(&mutex, "HttpBodyFactory::lock");
- table_of_sets = NULL;
+ table_of_sets = NULL;
enable_customizations = 0;
- enable_logging = true;
+ enable_logging = true;
callbacks_established = false;
//////////////////////////////////////////////////////
@@ -402,9 +402,9 @@ HttpBodyFactory::fabricate(StrList *acpt_language_list, StrList *acpt_charset_li
char template_base[PATH_NAME_MAX];
if (set_return)
- *set_return = "???";
+ *set_return = "???";
*content_language_return = NULL;
- *content_charset_return = NULL;
+ *content_charset_return = NULL;
Debug("body_factory", "calling fabricate(type '%s')", type);
*buffer_length_return = 0;
@@ -445,7 +445,7 @@ HttpBodyFactory::fabricate(StrList *acpt_language_list, StrList *acpt_charset_li
}
*content_language_return = body_set->content_language;
- *content_charset_return = body_set->content_charset;
+ *content_charset_return = body_set->content_charset;
// build the custom error page
buffer = t->build_instantiated_buffer(context, buffer_length_return);
@@ -497,7 +497,7 @@ HttpBodyFactory::find_template(const char *set, const char *type, HttpBodySet **
if (table_of_sets == NULL)
return (NULL);
if (table_of_sets->getValue((RawHashTable_Key)set, &v)) {
- HttpBodySet *body_set = (HttpBodySet *)v;
+ HttpBodySet *body_set = (HttpBodySet *)v;
RawHashTable *table_of_types = body_set->table_of_pages;
if (table_of_types == NULL)
@@ -630,7 +630,7 @@ HttpBodyFactory::load_sets_from_directory(char *set_dir)
}
new_table_of_sets = new RawHashTable(RawHashTable_KeyType_String);
- entry_buffer = (struct dirent *)ats_malloc(sizeof(struct dirent) + MAXPATHLEN + 1);
+ entry_buffer = (struct dirent *)ats_malloc(sizeof(struct dirent) + MAXPATHLEN + 1);
//////////////////////////////////////////
// loop over each language subdirectory //
@@ -757,9 +757,9 @@ HttpBodySet::HttpBodySet()
{
magic = HTTP_BODY_SET_MAGIC;
- set_name = NULL;
+ set_name = NULL;
content_language = NULL;
- content_charset = NULL;
+ content_charset = NULL;
table_of_pages = NULL;
}
@@ -919,9 +919,9 @@ HttpBodySet::set_template_by_name(const char *name, HttpBodyTemplate *t)
HttpBodyTemplate::HttpBodyTemplate()
{
- magic = HTTP_BODY_TEMPLATE_MAGIC;
- byte_count = 0;
- template_buffer = NULL;
+ magic = HTTP_BODY_TEMPLATE_MAGIC;
+ byte_count = 0;
+ template_buffer = NULL;
template_pathname = NULL;
}
@@ -935,7 +935,7 @@ HttpBodyTemplate::reset()
{
ats_free(template_buffer);
template_buffer = NULL;
- byte_count = 0;
+ byte_count = 0;
ats_free(template_pathname);
}
@@ -974,9 +974,9 @@ HttpBodyTemplate::load_from_file(char *dir, char *file)
// read in the template file contents //
////////////////////////////////////////
- new_byte_count = stat_buf.st_size;
- new_template_buffer = (char *)ats_malloc(new_byte_count + 1);
- bytes_read = read(fd, new_template_buffer, new_byte_count);
+ new_byte_count = stat_buf.st_size;
+ new_template_buffer = (char *)ats_malloc(new_byte_count + 1);
+ bytes_read = read(fd, new_template_buffer, new_byte_count);
new_template_buffer[new_byte_count] = '\0';
close(fd);
@@ -998,8 +998,8 @@ HttpBodyTemplate::load_from_file(char *dir, char *file)
/////////////////////////////////
reset();
- template_buffer = new_template_buffer;
- byte_count = new_byte_count;
+ template_buffer = new_template_buffer;
+ byte_count = new_byte_count;
template_pathname = ats_strdup(path);
return (1);
diff --git a/proxy/http/HttpCacheSM.cc b/proxy/http/HttpCacheSM.cc
index 5fe5da6..645c226 100644
--- a/proxy/http/HttpCacheSM.cc
+++ b/proxy/http/HttpCacheSM.cc
@@ -126,7 +126,7 @@ HttpCacheSM::state_cache_open_read(int event, void *data)
// redirect follow in progress, close the previous cache_read_vc
close_read();
}
- open_read_cb = true;
+ open_read_cb = true;
cache_read_vc = (CacheVConnection *)data;
master_sm->handleEvent(event, data);
break;
@@ -182,7 +182,7 @@ HttpCacheSM::state_cache_open_write(int event, void *data)
HTTP_INCREMENT_DYN_STAT(http_current_cache_connections_stat);
ink_assert(cache_write_vc == NULL);
cache_write_vc = (CacheVConnection *)data;
- open_write_cb = true;
+ open_write_cb = true;
master_sm->handleEvent(event, data);
break;
@@ -249,7 +249,7 @@ HttpCacheSM::do_cache_open_read(const HttpCacheKey &key)
}
// Initialising read-while-write-inprogress flag
this->readwhilewrite_inprogress = false;
- Action *action_handle = cacheProcessor.open_read(this, &key, master_sm->t_state.cache_control.cluster_cache_local,
+ Action *action_handle = cacheProcessor.open_read(this, &key, master_sm->t_state.cache_control.cluster_cache_local,
this->read_request_hdr, this->read_config, this->read_pin_in_cache);
if (action_handle != ACTION_RESULT_DONE) {
@@ -272,10 +272,10 @@ HttpCacheSM::open_read(const HttpCacheKey *key, URL *url, HTTPHdr *hdr, CacheLoo
{
Action *act_return;
- cache_key = *key;
- lookup_url = url;
- read_request_hdr = hdr;
- read_config = params;
+ cache_key = *key;
+ lookup_url = url;
+ read_request_hdr = hdr;
+ read_config = params;
read_pin_in_cache = pin_in_cache;
ink_assert(pending_action == NULL);
SET_HANDLER(&HttpCacheSM::state_cache_open_read);
@@ -283,7 +283,7 @@ HttpCacheSM::open_read(const HttpCacheKey *key, URL *url, HTTPHdr *hdr, CacheLoo
lookup_max_recursive++;
current_lookup_level++;
open_read_cb = false;
- act_return = do_cache_open_read(cache_key);
+ act_return = do_cache_open_read(cache_key);
// the following logic is based on the assumption that the secnod
// lookup won't happen if the HttpSM hasn't been called back for the
// first lookup
@@ -322,9 +322,9 @@ HttpCacheSM::open_write(const HttpCacheKey *key, URL *url, HTTPHdr *request, Cac
// this is no longer true for multiple cache lookup
// ink_assert(url == lookup_url || lookup_url == NULL);
ink_assert(request == read_request_hdr || read_request_hdr == NULL);
- this->lookup_url = url;
+ this->lookup_url = url;
this->read_request_hdr = request;
- cache_key = *key;
+ cache_key = *key;
// Make sure we are not stuck in a loop where the write
// fails but the retry read succeeds causing to issue
diff --git a/proxy/http/HttpCacheSM.h b/proxy/http/HttpCacheSM.h
index e5a9a5f..bf35304 100644
--- a/proxy/http/HttpCacheSM.h
+++ b/proxy/http/HttpCacheSM.h
@@ -63,7 +63,7 @@ public:
init(HttpSM *sm_arg, ProxyMutex *amutex)
{
master_sm = sm_arg;
- mutex = amutex;
+ mutex = amutex;
captive_action.init(this);
}
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 1077926..4f78bae 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -157,7 +157,7 @@ http_config_cb(const char * /* name ATS_UNUSED */, RecDataT /* data_type ATS_UNU
static int
http_server_session_sharing_cb(char const *name, RecDataT dtype, RecData data, void *cookie)
{
- bool valid_p = true;
+ bool valid_p = true;
HttpConfigParams *c = static_cast<HttpConfigParams *>(cookie);
if (0 == strcasecmp("proxy.config.http.server_session_sharing.match", name)) {
@@ -873,7 +873,7 @@ HttpConfig::startup()
c.proxy_hostname_len = -1;
if (c.proxy_hostname == NULL) {
- c.proxy_hostname = (char *)ats_malloc(sizeof(char));
+ c.proxy_hostname = (char *)ats_malloc(sizeof(char));
c.proxy_hostname[0] = '\0';
}
@@ -1140,21 +1140,21 @@ HttpConfig::reconfigure()
params->outbound_ip4 = m_master.outbound_ip4;
params->outbound_ip6 = m_master.outbound_ip6;
- params->proxy_hostname = ats_strdup(m_master.proxy_hostname);
- params->proxy_hostname_len = (params->proxy_hostname) ? strlen(params->proxy_hostname) : 0;
- params->no_dns_forward_to_parent = INT_TO_BOOL(m_master.no_dns_forward_to_parent);
+ params->proxy_hostname = ats_strdup(m_master.proxy_hostname);
+ params->proxy_hostname_len = (params->proxy_hostname) ? strlen(params->proxy_hostname) : 0;
+ params->no_dns_forward_to_parent = INT_TO_BOOL(m_master.no_dns_forward_to_parent);
params->oride.uncacheable_requests_bypass_parent = INT_TO_BOOL(m_master.oride.uncacheable_requests_bypass_parent);
- params->no_origin_server_dns = INT_TO_BOOL(m_master.no_origin_server_dns);
- params->use_client_target_addr = m_master.use_client_target_addr;
- params->use_client_source_port = INT_TO_BOOL(m_master.use_client_source_port);
- params->oride.maintain_pristine_host_hdr = INT_TO_BOOL(m_master.oride.maintain_pristine_host_hdr);
+ params->no_origin_server_dns = INT_TO_BOOL(m_master.no_origin_server_dns);
+ params->use_client_target_addr = m_master.use_client_target_addr;
+ params->use_client_source_port = INT_TO_BOOL(m_master.use_client_source_port);
+ params->oride.maintain_pristine_host_hdr = INT_TO_BOOL(m_master.oride.maintain_pristine_host_hdr);
params->disable_ssl_parenting = INT_TO_BOOL(m_master.disable_ssl_parenting);
- params->server_max_connections = m_master.server_max_connections;
- params->max_websocket_connections = m_master.max_websocket_connections;
- params->oride.server_tcp_init_cwnd = m_master.oride.server_tcp_init_cwnd;
- params->oride.origin_max_connections = m_master.oride.origin_max_connections;
+ params->server_max_connections = m_master.server_max_connections;
+ params->max_websocket_connections = m_master.max_websocket_connections;
+ params->oride.server_tcp_init_cwnd = m_master.oride.server_tcp_init_cwnd;
+ params->oride.origin_max_connections = m_master.oride.origin_max_connections;
params->oride.origin_max_connections_queue = m_master.oride.origin_max_connections_queue;
// if origin_max_connections_queue is set without max_connections, it is meaningless, so we'll warn
if (params->oride.origin_max_connections_queue >= 0 &&
@@ -1162,7 +1162,7 @@ HttpConfig::reconfigure()
Warning("origin_max_connections_queue is set, but neither origin_max_connections nor origin_min_keep_alive_connections are "
"set, please correct your records.config");
}
- params->origin_min_keep_alive_connections = m_master.origin_min_keep_alive_connections;
+ params->origin_min_keep_alive_connections = m_master.origin_min_keep_alive_connections;
params->oride.attach_server_session_to_client = m_master.oride.attach_server_session_to_client;
if (params->oride.origin_max_connections && params->oride.origin_max_connections < params->origin_min_keep_alive_connections) {
@@ -1172,21 +1172,21 @@ HttpConfig::reconfigure()
params->enable_url_expandomatic = INT_TO_BOOL(m_master.enable_url_expandomatic);
- params->oride.insert_request_via_string = m_master.oride.insert_request_via_string;
- params->oride.insert_response_via_string = m_master.oride.insert_response_via_string;
- params->proxy_request_via_string = ats_strdup(m_master.proxy_request_via_string);
- params->proxy_request_via_string_len = (params->proxy_request_via_string) ? strlen(params->proxy_request_via_string) : 0;
- params->proxy_response_via_string = ats_strdup(m_master.proxy_response_via_string);
- params->proxy_response_via_string_len = (params->proxy_response_via_string) ? strlen(params->proxy_response_via_string) : 0;
+ params->oride.insert_request_via_string = m_master.oride.insert_request_via_string;
+ params->oride.insert_response_via_string = m_master.oride.insert_response_via_string;
+ params->proxy_request_via_string = ats_strdup(m_master.proxy_request_via_string);
+ params->proxy_request_via_string_len = (params->proxy_request_via_string) ? strlen(params->proxy_request_via_string) : 0;
+ params->proxy_response_via_string = ats_strdup(m_master.proxy_response_via_string);
+ params->proxy_response_via_string_len = (params->proxy_response_via_string) ? strlen(params->proxy_response_via_string) : 0;
params->oride.proxy_response_hsts_max_age = m_master.oride.proxy_response_hsts_max_age;
params->oride.proxy_response_hsts_include_subdomains = m_master.oride.proxy_response_hsts_include_subdomains;
params->url_expansions_string = ats_strdup(m_master.url_expansions_string);
- params->url_expansions = parse_url_expansions(params->url_expansions_string, ¶ms->num_url_expansions);
+ params->url_expansions = parse_url_expansions(params->url_expansions_string, ¶ms->num_url_expansions);
- params->oride.keep_alive_enabled_in = INT_TO_BOOL(m_master.oride.keep_alive_enabled_in);
- params->oride.keep_alive_enabled_out = INT_TO_BOOL(m_master.oride.keep_alive_enabled_out);
- params->oride.chunking_enabled = INT_TO_BOOL(m_master.oride.chunking_enabled);
+ params->oride.keep_alive_enabled_in = INT_TO_BOOL(m_master.oride.keep_alive_enabled_in);
+ params->oride.keep_alive_enabled_out = INT_TO_BOOL(m_master.oride.keep_alive_enabled_out);
+ params->oride.chunking_enabled = INT_TO_BOOL(m_master.oride.chunking_enabled);
params->oride.auth_server_session_private = INT_TO_BOOL(m_master.oride.auth_server_session_private);
params->oride.http_chunking_size = m_master.oride.http_chunking_size;
@@ -1195,7 +1195,7 @@ HttpConfig::reconfigure()
params->oride.flow_control_enabled = INT_TO_BOOL(m_master.oride.flow_control_enabled);
params->oride.flow_high_water_mark = m_master.oride.flow_high_water_mark;
- params->oride.flow_low_water_mark = m_master.oride.flow_low_water_mark;
+ params->oride.flow_low_water_mark = m_master.oride.flow_low_water_mark;
// If not set (zero) then make values the same.
if (params->oride.flow_low_water_mark <= 0)
params->oride.flow_low_water_mark = params->oride.flow_high_water_mark;
@@ -1209,45 +1209,45 @@ HttpConfig::reconfigure()
}
params->oride.server_session_sharing_match = m_master.oride.server_session_sharing_match;
- params->server_session_sharing_pool = m_master.server_session_sharing_pool;
- params->oride.keep_alive_post_out = m_master.oride.keep_alive_post_out;
+ params->server_session_sharing_pool = m_master.server_session_sharing_pool;
+ params->oride.keep_alive_post_out = m_master.oride.keep_alive_post_out;
- params->oride.keep_alive_no_activity_timeout_in = m_master.oride.keep_alive_no_activity_timeout_in;
- params->oride.keep_alive_no_activity_timeout_out = m_master.oride.keep_alive_no_activity_timeout_out;
- params->oride.transaction_no_activity_timeout_in = m_master.oride.transaction_no_activity_timeout_in;
+ params->oride.keep_alive_no_activity_timeout_in = m_master.oride.keep_alive_no_activity_timeout_in;
+ params->oride.keep_alive_no_activity_timeout_out = m_master.oride.keep_alive_no_activity_timeout_out;
+ params->oride.transaction_no_activity_timeout_in = m_master.oride.transaction_no_activity_timeout_in;
params->oride.transaction_no_activity_timeout_out = m_master.oride.transaction_no_activity_timeout_out;
- params->oride.transaction_active_timeout_in = m_master.oride.transaction_active_timeout_in;
- params->oride.transaction_active_timeout_out = m_master.oride.transaction_active_timeout_out;
- params->oride.websocket_active_timeout = m_master.oride.websocket_active_timeout;
- params->oride.websocket_inactive_timeout = m_master.oride.websocket_inactive_timeout;
- params->accept_no_activity_timeout = m_master.accept_no_activity_timeout;
- params->oride.background_fill_active_timeout = m_master.oride.background_fill_active_timeout;
- params->oride.background_fill_threshold = m_master.oride.background_fill_threshold;
-
- params->oride.connect_attempts_max_retries = m_master.oride.connect_attempts_max_retries;
+ params->oride.transaction_active_timeout_in = m_master.oride.transaction_active_timeout_in;
+ params->oride.transaction_active_timeout_out = m_master.oride.transaction_active_timeout_out;
+ params->oride.websocket_active_timeout = m_master.oride.websocket_active_timeout;
+ params->oride.websocket_inactive_timeout = m_master.oride.websocket_inactive_timeout;
+ params->accept_no_activity_timeout = m_master.accept_no_activity_timeout;
+ params->oride.background_fill_active_timeout = m_master.oride.background_fill_active_timeout;
+ params->oride.background_fill_threshold = m_master.oride.background_fill_threshold;
+
+ params->oride.connect_attempts_max_retries = m_master.oride.connect_attempts_max_retries;
params->oride.connect_attempts_max_retries_dead_server = m_master.oride.connect_attempts_max_retries_dead_server;
- params->oride.connect_attempts_rr_retries = m_master.oride.connect_attempts_rr_retries;
- params->oride.connect_attempts_timeout = m_master.oride.connect_attempts_timeout;
- params->oride.post_connect_attempts_timeout = m_master.oride.post_connect_attempts_timeout;
- params->oride.parent_connect_attempts = m_master.oride.parent_connect_attempts;
- params->per_parent_connect_attempts = m_master.per_parent_connect_attempts;
- params->parent_connect_timeout = m_master.parent_connect_timeout;
+ params->oride.connect_attempts_rr_retries = m_master.oride.connect_attempts_rr_retries;
+ params->oride.connect_attempts_timeout = m_master.oride.connect_attempts_timeout;
+ params->oride.post_connect_attempts_timeout = m_master.oride.post_connect_attempts_timeout;
+ params->oride.parent_connect_attempts = m_master.oride.parent_connect_attempts;
+ params->per_parent_connect_attempts = m_master.per_parent_connect_attempts;
+ params->parent_connect_timeout = m_master.parent_connect_timeout;
params->oride.sock_recv_buffer_size_out = m_master.oride.sock_recv_buffer_size_out;
params->oride.sock_send_buffer_size_out = m_master.oride.sock_send_buffer_size_out;
- params->oride.sock_option_flag_out = m_master.oride.sock_option_flag_out;
- params->oride.sock_packet_mark_out = m_master.oride.sock_packet_mark_out;
- params->oride.sock_packet_tos_out = m_master.oride.sock_packet_tos_out;
+ params->oride.sock_option_flag_out = m_master.oride.sock_option_flag_out;
+ params->oride.sock_packet_mark_out = m_master.oride.sock_packet_mark_out;
+ params->oride.sock_packet_tos_out = m_master.oride.sock_packet_tos_out;
params->oride.fwd_proxy_auth_to_parent = INT_TO_BOOL(m_master.oride.fwd_proxy_auth_to_parent);
- params->oride.anonymize_remove_from = INT_TO_BOOL(m_master.oride.anonymize_remove_from);
- params->oride.anonymize_remove_referer = INT_TO_BOOL(m_master.oride.anonymize_remove_referer);
+ params->oride.anonymize_remove_from = INT_TO_BOOL(m_master.oride.anonymize_remove_from);
+ params->oride.anonymize_remove_referer = INT_TO_BOOL(m_master.oride.anonymize_remove_referer);
params->oride.anonymize_remove_user_agent = INT_TO_BOOL(m_master.oride.anonymize_remove_user_agent);
- params->oride.anonymize_remove_cookie = INT_TO_BOOL(m_master.oride.anonymize_remove_cookie);
- params->oride.anonymize_remove_client_ip = INT_TO_BOOL(m_master.oride.anonymize_remove_client_ip);
- params->oride.anonymize_insert_client_ip = INT_TO_BOOL(m_master.oride.anonymize_insert_client_ip);
- params->anonymize_other_header_list = ats_strdup(m_master.anonymize_other_header_list);
+ params->oride.anonymize_remove_cookie = INT_TO_BOOL(m_master.oride.anonymize_remove_cookie);
+ params->oride.anonymize_remove_client_ip = INT_TO_BOOL(m_master.oride.anonymize_remove_client_ip);
+ params->oride.anonymize_insert_client_ip = INT_TO_BOOL(m_master.oride.anonymize_insert_client_ip);
+ params->anonymize_other_header_list = ats_strdup(m_master.anonymize_other_header_list);
params->oride.global_user_agent_header = ats_strdup(m_master.oride.global_user_agent_header);
params->oride.global_user_agent_header_size =
@@ -1259,84 +1259,84 @@ HttpConfig::reconfigure()
params->oride.proxy_response_server_enabled = m_master.oride.proxy_response_server_enabled;
params->oride.insert_squid_x_forwarded_for = INT_TO_BOOL(m_master.oride.insert_squid_x_forwarded_for);
- params->oride.insert_age_in_response = INT_TO_BOOL(m_master.oride.insert_age_in_response);
- params->enable_http_stats = INT_TO_BOOL(m_master.enable_http_stats);
- params->oride.normalize_ae_gzip = INT_TO_BOOL(m_master.oride.normalize_ae_gzip);
+ params->oride.insert_age_in_response = INT_TO_BOOL(m_master.oride.insert_age_in_response);
+ params->enable_http_stats = INT_TO_BOOL(m_master.enable_http_stats);
+ params->oride.normalize_ae_gzip = INT_TO_BOOL(m_master.oride.normalize_ae_gzip);
- params->icp_enabled = (m_master.icp_enabled == ICP_MODE_SEND_RECEIVE ? 1 : 0); // INT_TO_BOOL
+ params->icp_enabled = (m_master.icp_enabled == ICP_MODE_SEND_RECEIVE ? 1 : 0); // INT_TO_BOOL
params->stale_icp_enabled = INT_TO_BOOL(m_master.stale_icp_enabled);
params->oride.cache_heuristic_min_lifetime = m_master.oride.cache_heuristic_min_lifetime;
params->oride.cache_heuristic_max_lifetime = m_master.oride.cache_heuristic_max_lifetime;
- params->oride.cache_heuristic_lm_factor = min(max(m_master.oride.cache_heuristic_lm_factor, 0.0f), 1.0f);
+ params->oride.cache_heuristic_lm_factor = min(max(m_master.oride.cache_heuristic_lm_factor, 0.0f), 1.0f);
params->oride.cache_guaranteed_min_lifetime = m_master.oride.cache_guaranteed_min_lifetime;
params->oride.cache_guaranteed_max_lifetime = m_master.oride.cache_guaranteed_max_lifetime;
- params->oride.cache_max_stale_age = m_master.oride.cache_max_stale_age;
- params->oride.freshness_fuzz_time = m_master.oride.freshness_fuzz_time;
+ params->oride.cache_max_stale_age = m_master.oride.cache_max_stale_age;
+ params->oride.freshness_fuzz_time = m_master.oride.freshness_fuzz_time;
params->oride.freshness_fuzz_min_time = m_master.oride.freshness_fuzz_min_time;
- params->oride.freshness_fuzz_prob = m_master.oride.freshness_fuzz_prob;
+ params->oride.freshness_fuzz_prob = m_master.oride.freshness_fuzz_prob;
- params->cache_vary_default_text = ats_strdup(m_master.cache_vary_default_text);
+ params->cache_vary_default_text = ats_strdup(m_master.cache_vary_default_text);
params->cache_vary_default_images = ats_strdup(m_master.cache_vary_default_images);
- params->cache_vary_default_other = ats_strdup(m_master.cache_vary_default_other);
+ params->cache_vary_default_other = ats_strdup(m_master.cache_vary_default_other);
// open read failure retries
params->oride.max_cache_open_read_retries = m_master.oride.max_cache_open_read_retries;
- params->oride.cache_open_read_retry_time = m_master.oride.cache_open_read_retry_time;
- params->oride.cache_generation_number = m_master.oride.cache_generation_number;
+ params->oride.cache_open_read_retry_time = m_master.oride.cache_open_read_retry_time;
+ params->oride.cache_generation_number = m_master.oride.cache_generation_number;
// open write failure retries
params->oride.max_cache_open_write_retries = m_master.oride.max_cache_open_write_retries;
- params->oride.cache_http = INT_TO_BOOL(m_master.oride.cache_http);
- params->oride.cache_cluster_cache_local = INT_TO_BOOL(m_master.oride.cache_cluster_cache_local);
- params->oride.cache_ignore_client_no_cache = INT_TO_BOOL(m_master.oride.cache_ignore_client_no_cache);
+ params->oride.cache_http = INT_TO_BOOL(m_master.oride.cache_http);
+ params->oride.cache_cluster_cache_local = INT_TO_BOOL(m_master.oride.cache_cluster_cache_local);
+ params->oride.cache_ignore_client_no_cache = INT_TO_BOOL(m_master.oride.cache_ignore_client_no_cache);
params->oride.cache_ignore_client_cc_max_age = INT_TO_BOOL(m_master.oride.cache_ignore_client_cc_max_age);
- params->oride.cache_ims_on_client_no_cache = INT_TO_BOOL(m_master.oride.cache_ims_on_client_no_cache);
- params->oride.cache_ignore_server_no_cache = INT_TO_BOOL(m_master.oride.cache_ignore_server_no_cache);
- params->oride.cache_responses_to_cookies = m_master.oride.cache_responses_to_cookies;
- params->oride.cache_ignore_auth = INT_TO_BOOL(m_master.oride.cache_ignore_auth);
- params->oride.cache_urls_that_look_dynamic = INT_TO_BOOL(m_master.oride.cache_urls_that_look_dynamic);
- params->cache_enable_default_vary_headers = INT_TO_BOOL(m_master.cache_enable_default_vary_headers);
- params->cache_post_method = INT_TO_BOOL(m_master.cache_post_method);
-
- params->ignore_accept_mismatch = m_master.ignore_accept_mismatch;
+ params->oride.cache_ims_on_client_no_cache = INT_TO_BOOL(m_master.oride.cache_ims_on_client_no_cache);
+ params->oride.cache_ignore_server_no_cache = INT_TO_BOOL(m_master.oride.cache_ignore_server_no_cache);
+ params->oride.cache_responses_to_cookies = m_master.oride.cache_responses_to_cookies;
+ params->oride.cache_ignore_auth = INT_TO_BOOL(m_master.oride.cache_ignore_auth);
+ params->oride.cache_urls_that_look_dynamic = INT_TO_BOOL(m_master.oride.cache_urls_that_look_dynamic);
+ params->cache_enable_default_vary_headers = INT_TO_BOOL(m_master.cache_enable_default_vary_headers);
+ params->cache_post_method = INT_TO_BOOL(m_master.cache_post_method);
+
+ params->ignore_accept_mismatch = m_master.ignore_accept_mismatch;
params->ignore_accept_language_mismatch = m_master.ignore_accept_language_mismatch;
params->ignore_accept_encoding_mismatch = m_master.ignore_accept_encoding_mismatch;
- params->ignore_accept_charset_mismatch = m_master.ignore_accept_charset_mismatch;
+ params->ignore_accept_charset_mismatch = m_master.ignore_accept_charset_mismatch;
- params->send_100_continue_response = INT_TO_BOOL(m_master.send_100_continue_response);
- params->disallow_post_100_continue = INT_TO_BOOL(m_master.disallow_post_100_continue);
- params->parser_allow_non_http = INT_TO_BOOL(m_master.parser_allow_non_http);
+ params->send_100_continue_response = INT_TO_BOOL(m_master.send_100_continue_response);
+ params->disallow_post_100_continue = INT_TO_BOOL(m_master.disallow_post_100_continue);
+ params->parser_allow_non_http = INT_TO_BOOL(m_master.parser_allow_non_http);
params->oride.cache_open_write_fail_action = m_master.oride.cache_open_write_fail_action;
params->oride.cache_when_to_revalidate = m_master.oride.cache_when_to_revalidate;
- params->max_post_size = m_master.max_post_size;
+ params->max_post_size = m_master.max_post_size;
params->oride.cache_required_headers = m_master.oride.cache_required_headers;
- params->oride.cache_range_lookup = INT_TO_BOOL(m_master.oride.cache_range_lookup);
- params->oride.cache_range_write = INT_TO_BOOL(m_master.oride.cache_range_write);
+ params->oride.cache_range_lookup = INT_TO_BOOL(m_master.oride.cache_range_lookup);
+ params->oride.cache_range_write = INT_TO_BOOL(m_master.oride.cache_range_write);
params->connect_ports_string = ats_strdup(m_master.connect_ports_string);
- params->connect_ports = parse_ports_list(params->connect_ports_string);
+ params->connect_ports = parse_ports_list(params->connect_ports_string);
- params->oride.request_hdr_max_size = m_master.oride.request_hdr_max_size;
+ params->oride.request_hdr_max_size = m_master.oride.request_hdr_max_size;
params->oride.response_hdr_max_size = m_master.oride.response_hdr_max_size;
params->push_method_enabled = INT_TO_BOOL(m_master.push_method_enabled);
- params->reverse_proxy_enabled = INT_TO_BOOL(m_master.reverse_proxy_enabled);
- params->url_remap_required = INT_TO_BOOL(m_master.url_remap_required);
- params->errors_log_error_pages = INT_TO_BOOL(m_master.errors_log_error_pages);
- params->oride.slow_log_threshold = m_master.oride.slow_log_threshold;
- params->record_cop_page = INT_TO_BOOL(m_master.record_cop_page);
- params->oride.send_http11_requests = m_master.oride.send_http11_requests;
- params->oride.doc_in_cache_skip_dns = INT_TO_BOOL(m_master.oride.doc_in_cache_skip_dns);
- params->oride.default_buffer_size_index = m_master.oride.default_buffer_size_index;
- params->oride.default_buffer_water_mark = m_master.oride.default_buffer_water_mark;
- params->enable_http_info = INT_TO_BOOL(m_master.enable_http_info);
+ params->reverse_proxy_enabled = INT_TO_BOOL(m_master.reverse_proxy_enabled);
+ params->url_remap_required = INT_TO_BOOL(m_master.url_remap_required);
+ params->errors_log_error_pages = INT_TO_BOOL(m_master.errors_log_error_pages);
+ params->oride.slow_log_threshold = m_master.oride.slow_log_threshold;
+ params->record_cop_page = INT_TO_BOOL(m_master.record_cop_page);
+ params->oride.send_http11_requests = m_master.oride.send_http11_requests;
+ params->oride.doc_in_cache_skip_dns = INT_TO_BOOL(m_master.oride.doc_in_cache_skip_dns);
+ params->oride.default_buffer_size_index = m_master.oride.default_buffer_size_index;
+ params->oride.default_buffer_water_mark = m_master.oride.default_buffer_water_mark;
+ params->enable_http_info = INT_TO_BOOL(m_master.enable_http_info);
params->oride.body_factory_template_base = ats_strdup(m_master.oride.body_factory_template_base);
params->oride.body_factory_template_base_len =
params->oride.body_factory_template_base ? strlen(params->oride.body_factory_template_base) : 0;
@@ -1344,17 +1344,17 @@ HttpConfig::reconfigure()
params->reverse_proxy_no_host_redirect_len =
params->reverse_proxy_no_host_redirect ? strlen(params->reverse_proxy_no_host_redirect) : 0;
- params->referer_filter_enabled = INT_TO_BOOL(m_master.referer_filter_enabled);
+ params->referer_filter_enabled = INT_TO_BOOL(m_master.referer_filter_enabled);
params->referer_format_redirect = INT_TO_BOOL(m_master.referer_format_redirect);
params->oride.accept_encoding_filter_enabled = INT_TO_BOOL(m_master.oride.accept_encoding_filter_enabled);
- params->oride.down_server_timeout = m_master.oride.down_server_timeout;
+ params->oride.down_server_timeout = m_master.oride.down_server_timeout;
params->oride.client_abort_threshold = m_master.oride.client_abort_threshold;
- params->oride.negative_caching_enabled = INT_TO_BOOL(m_master.oride.negative_caching_enabled);
- params->oride.negative_caching_lifetime = m_master.oride.negative_caching_lifetime;
- params->oride.negative_revalidating_enabled = INT_TO_BOOL(m_master.oride.negative_revalidating_enabled);
+ params->oride.negative_caching_enabled = INT_TO_BOOL(m_master.oride.negative_caching_enabled);
+ params->oride.negative_caching_lifetime = m_master.oride.negative_caching_lifetime;
+ params->oride.negative_revalidating_enabled = INT_TO_BOOL(m_master.oride.negative_revalidating_enabled);
params->oride.negative_revalidating_lifetime = m_master.oride.negative_revalidating_lifetime;
//##############################################################################
@@ -1369,11 +1369,11 @@ HttpConfig::reconfigure()
//#
//##############################################################################
- params->oride.redirection_enabled = INT_TO_BOOL(m_master.oride.redirection_enabled);
+ params->oride.redirection_enabled = INT_TO_BOOL(m_master.oride.redirection_enabled);
params->oride.redirect_use_orig_cache_key = INT_TO_BOOL(m_master.oride.redirect_use_orig_cache_key);
- params->redirection_host_no_port = INT_TO_BOOL(m_master.redirection_host_no_port);
- params->oride.number_of_redirections = m_master.oride.number_of_redirections;
- params->post_copy_size = m_master.post_copy_size;
+ params->redirection_host_no_port = INT_TO_BOOL(m_master.redirection_host_no_port);
+ params->oride.number_of_redirections = m_master.oride.number_of_redirections;
+ params->post_copy_size = m_master.post_copy_size;
// Local Manager
params->synthetic_port = m_master.synthetic_port;
@@ -1423,8 +1423,8 @@ HttpConfig::parse_ports_list(char *ports_string)
return (0);
if (strchr(ports_string, '*')) {
- ports_list = new HttpConfigPortRange;
- ports_list->low = -1;
+ ports_list = new HttpConfigPortRange;
+ ports_list->low = -1;
ports_list->high = -1;
ports_list->next = NULL;
} else {
@@ -1432,7 +1432,7 @@ HttpConfig::parse_ports_list(char *ports_string)
char *start;
char *end;
- pr = NULL;
+ pr = NULL;
prev = NULL;
start = ports_string;
@@ -1450,8 +1450,8 @@ HttpConfig::parse_ports_list(char *ports_string)
if (start == end)
break;
- pr = new HttpConfigPortRange;
- pr->low = atoi(start);
+ pr = new HttpConfigPortRange;
+ pr->low = atoi(start);
pr->high = pr->low;
pr->next = NULL;
@@ -1459,7 +1459,7 @@ HttpConfig::parse_ports_list(char *ports_string)
prev->next = pr;
else
ports_list = pr;
- prev = pr;
+ prev = pr;
// if the next character after the current port
// number is a dash then we are parsing a range
@@ -1495,7 +1495,7 @@ char **
HttpConfig::parse_url_expansions(char *url_expansions_str, int *num_expansions)
{
char **expansions = NULL;
- int count = 0, i;
+ int count = 0, i;
if (!url_expansions_str) {
*num_expansions = count;
@@ -1521,13 +1521,13 @@ HttpConfig::parse_url_expansions(char *url_expansions_str, int *num_expansions)
// Now extract the URL expansions
if (count) {
expansions = (char **)ats_malloc(count * sizeof(char *));
- start = url_expansions_str;
+ start = url_expansions_str;
for (i = 0; i < count; i++) {
// Skip whitespace
while (isspace(*start))
start++;
expansions[i] = start;
- end = start + 1;
+ end = start + 1;
// Find end of expansion
while (!isspace(*end) && *end != '\0')
diff --git a/proxy/http/HttpConfig.h b/proxy/http/HttpConfig.h
index a872492..b046643 100644
--- a/proxy/http/HttpConfig.h
+++ b/proxy/http/HttpConfig.h
@@ -693,15 +693,15 @@ public:
~HttpConfigParams();
enum {
- CACHE_REQUIRED_HEADERS_NONE = 0,
+ CACHE_REQUIRED_HEADERS_NONE = 0,
CACHE_REQUIRED_HEADERS_AT_LEAST_LAST_MODIFIED = 1,
- CACHE_REQUIRED_HEADERS_CACHE_CONTROL = 2
+ CACHE_REQUIRED_HEADERS_CACHE_CONTROL = 2
};
enum {
- SEND_HTTP11_NEVER = 0,
- SEND_HTTP11_ALWAYS = 1,
- SEND_HTTP11_UPGRADE_HOSTDB = 2,
+ SEND_HTTP11_NEVER = 0,
+ SEND_HTTP11_ALWAYS = 1,
+ SEND_HTTP11_UPGRADE_HOSTDB = 2,
SEND_HTTP11_IF_REQUEST_11_AND_HOSTDB = 3,
};
diff --git a/proxy/http/HttpPages.cc b/proxy/http/HttpPages.cc
index 8b52a37..11ea9ff 100644
--- a/proxy/http/HttpPages.cc
+++ b/proxy/http/HttpPages.cc
@@ -44,7 +44,7 @@ HttpPagesHandler::HttpPagesHandler(Continuation *cont, HTTPHdr *header)
URL *url;
int length;
- url = header->url_get();
+ url = header->url_get();
request = (char *)url->path_get(&length);
request = arena.str_store(request, length);
@@ -100,7 +100,7 @@ HttpPagesHandler::dump_hdr(HTTPHdr *hdr, const char *desc)
offset = 0;
do {
used = 0;
- tmp = offset;
+ tmp = offset;
done = hdr->print(b, 4095, &used, &tmp);
offset += used;
b[used] = '\0';
@@ -267,7 +267,7 @@ int
HttpPagesHandler::handle_smdetails(int event, void * /* data ATS_UNUSED */)
{
EThread *ethread = this_ethread();
- HttpSM *sm = NULL;
+ HttpSM *sm = NULL;
switch (event) {
case EVENT_NONE:
@@ -369,7 +369,7 @@ HttpPagesHandler::handle_smlist(int event, void * /* data ATS_UNUSED */)
sm = HttpSMList[list_bucket].sm_list.head;
while (sm != NULL) {
- char *url = NULL;
+ char *url = NULL;
const char *method = NULL;
int method_len;
const char *sm_state = NULL;
@@ -391,11 +391,11 @@ HttpPagesHandler::handle_smlist(int event, void * /* data ATS_UNUSED */)
}
if (url == NULL) {
- url = arena.str_store("-", 1);
+ url = arena.str_store("-", 1);
sm_state = "READ_REQUEST";
}
} else {
- url = arena.str_store("-", 1);
+ url = arena.str_store("-", 1);
sm_state = "LOCKED";
}
}
@@ -430,10 +430,10 @@ HttpPagesHandler::handle_callback(int /* event ATS_UNUSED */, void * /* edata AT
if (response) {
StatPageData data;
- data.data = response;
- data.type = ats_strdup("text/html");
+ data.data = response;
+ data.type = ats_strdup("text/html");
data.length = response_length;
- response = NULL;
+ response = NULL;
action.continuation->handleEvent(STAT_PAGE_SUCCESS, &data);
} else {
diff --git a/proxy/http/HttpPages.h b/proxy/http/HttpPages.h
index 20f96f9..5cc78f1 100644
--- a/proxy/http/HttpPages.h
+++ b/proxy/http/HttpPages.h
@@ -44,7 +44,7 @@
class HttpSM;
const int HTTP_LIST_BUCKETS = 63;
-const int HTTP_LIST_RETRY = HRTIME_MSECONDS(10);
+const int HTTP_LIST_RETRY = HRTIME_MSECONDS(10);
struct HttpSMListBucket {
Ptr<ProxyMutex> mutex;
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 76c0925..b131782 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -41,7 +41,7 @@
#include "SpdySessionAccept.h"
#include "http2/Http2SessionAccept.h"
-HttpSessionAccept *plugin_http_accept = NULL;
+HttpSessionAccept *plugin_http_accept = NULL;
HttpSessionAccept *plugin_http_transparent_accept = 0;
static SLL<SSLNextProtocolAccept> ssl_plugin_acceptors;
@@ -117,8 +117,8 @@ make_net_accept_options(const HttpProxyPort &port, unsigned nthreads)
net.accept_threads = nthreads;
net.f_inbound_transparent = port.m_inbound_transparent_p;
- net.ip_family = port.m_family;
- net.local_port = port.m_port;
+ net.ip_family = port.m_family;
+ net.local_port = port.m_port;
if (port.m_inbound_ip.isValid()) {
net.local_ip = port.m_inbound_ip;
@@ -144,7 +144,7 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor &acceptor, HttpProxyPort &port, unsigned
REC_ReadConfigInteger(net_opt.packet_tos, "proxy.config.net.sock_packet_tos_in");
accept_opt.f_outbound_transparent = port.m_outbound_transparent_p;
- accept_opt.transport_type = port.m_type;
+ accept_opt.transport_type = port.m_type;
accept_opt.setHostResPreference(port.m_host_res_preference);
accept_opt.setTransparentPassthrough(port.m_transparent_passthrough);
accept_opt.setSessionProtocolPreference(port.m_session_protocol_preference);
@@ -169,7 +169,7 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor &acceptor, HttpProxyPort &port, unsigned
// XXX the protocol probe should be a configuration option.
ProtocolProbeSessionAccept *probe = new ProtocolProbeSessionAccept();
- HttpSessionAccept *http = 0; // don't allocate this unless it will be used.
+ HttpSessionAccept *http = 0; // don't allocate this unless it will be used.
if (port.m_session_protocol_preference.intersects(HTTP_PROTOCOL_SET)) {
http = new HttpSessionAccept(accept_opt);
@@ -256,14 +256,14 @@ init_HttpProxyServer(int n_accept_threads)
// port but without going through the operating system
//
if (plugin_http_accept == NULL) {
- plugin_http_accept = new HttpSessionAccept;
+ plugin_http_accept = new HttpSessionAccept;
plugin_http_accept->mutex = new_ProxyMutex();
}
// Same as plugin_http_accept except outbound transparent.
if (!plugin_http_transparent_accept) {
HttpSessionAccept::Options ha_opt;
ha_opt.setOutboundTransparent(true);
- plugin_http_transparent_accept = new HttpSessionAccept(ha_opt);
+ plugin_http_transparent_accept = new HttpSessionAccept(ha_opt);
plugin_http_transparent_accept->mutex = new_ProxyMutex();
}
if (ssl_plugin_mutex == NULL) {
@@ -280,7 +280,7 @@ init_HttpProxyServer(int n_accept_threads)
void
start_HttpProxyServer()
{
- static bool called_once = false;
+ static bool called_once = false;
HttpProxyPort::Group &proxy_ports = HttpProxyPort::global();
///////////////////////////////////
@@ -292,7 +292,7 @@ start_HttpProxyServer()
for (int i = 0, n = proxy_ports.length(); i < n; ++i) {
HttpProxyAcceptor &acceptor = HttpProxyAcceptors[i];
- HttpProxyPort &port = proxy_ports[i];
+ HttpProxyPort &port = proxy_ports[i];
if (port.isSSL()) {
if (NULL == sslNetProcessor.main_accept(acceptor._accept, port.m_fd, acceptor._net_opt))
return;
@@ -324,11 +324,11 @@ start_HttpProxyServerBackDoor(int port, int accept_threads)
NetProcessor::AcceptOptions opt;
HttpSessionAccept::Options ha_opt;
- opt.local_port = port;
+ opt.local_port = port;
opt.accept_threads = accept_threads;
opt.localhost_only = true;
- ha_opt.backdoor = true;
- opt.backdoor = true;
+ ha_opt.backdoor = true;
+ opt.backdoor = true;
// The backdoor only binds the loopback interface
netProcessor.main_accept(new HttpSessionAccept(ha_opt), NO_FD, opt);
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index d9fa832..a3ccd79 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -73,13 +73,13 @@ DList(HttpSM, debug_link) debug_sm_list;
ink_mutex debug_sm_list_mutex;
static const int sub_header_size = sizeof("Content-type: ") - 1 + 2 + sizeof("Content-range: bytes ") - 1 + 4;
-static const int boundary_size = 2 + sizeof("RANGE_SEPARATOR") - 1 + 2;
+static const int boundary_size = 2 + sizeof("RANGE_SEPARATOR") - 1 + 2;
static const char *str_100_continue_response = "HTTP/1.1 100 Continue\r\n\r\n";
-static const int len_100_continue_response = strlen(str_100_continue_response);
+static const int len_100_continue_response = strlen(str_100_continue_response);
static const char *str_408_request_timeout_response = "HTTP/1.1 408 Request Timeout\r\nConnection: close\r\n\r\n";
-static const int len_408_request_timeout_response = strlen(str_408_request_timeout_response);
+static const int len_408_request_timeout_response = strlen(str_408_request_timeout_response);
namespace
{
@@ -95,8 +95,8 @@ milestone_update_api_time(TransactionMilestones &milestones, ink_hrtime &api_tim
bool active = api_timer >= 0;
if (!active)
api_timer = -api_timer;
- delta = Thread::get_hrtime_updated() - api_timer;
- api_timer = 0;
+ delta = Thread::get_hrtime_updated() - api_timer;
+ api_timer = 0;
// Zero or negative time is a problem because we want to signal *something* happened
// vs. no API activity at all. This can happen due to graininess or real time
// clock adjustment.
@@ -170,7 +170,7 @@ void
HttpVCTable::remove_entry(HttpVCTableEntry *e)
{
ink_assert(e->vc == NULL || e->in_tunnel);
- e->vc = NULL;
+ e->vc = NULL;
e->eos = false;
if (e->read_buffer) {
free_MIOBuffer(e->read_buffer);
@@ -180,11 +180,11 @@ HttpVCTable::remove_entry(HttpVCTableEntry *e)
free_MIOBuffer(e->write_buffer);
e->write_buffer = NULL;
}
- e->read_vio = NULL;
- e->write_vio = NULL;
+ e->read_vio = NULL;
+ e->write_vio = NULL;
e->vc_handler = NULL;
- e->vc_type = HTTP_UNKNOWN;
- e->in_tunnel = false;
+ e->vc_type = HTTP_UNKNOWN;
+ e->in_tunnel = false;
}
// bool HttpVCTable::cleanup_entry(HttpVCEntry* e)
@@ -347,7 +347,7 @@ HttpSM::cleanup()
second_cache_sm->mutex.clear();
delete second_cache_sm;
}
- magic = HTTP_SM_MAGIC_DEAD;
+ magic = HTTP_SM_MAGIC_DEAD;
debug_on = false;
}
@@ -374,9 +374,9 @@ HttpSM::init()
// (To test this, initialize next_sm_id to 0x7ffffff0)
// Leaving sm_id as int64_t to minimize code changes.
- sm_id = (int64_t)ink_atomic_increment((&next_sm_id), 1);
+ sm_id = (int64_t)ink_atomic_increment((&next_sm_id), 1);
t_state.state_machine_id = sm_id;
- t_state.state_machine = this;
+ t_state.state_machine = this;
t_state.http_config_param = HttpConfig::acquire();
@@ -386,17 +386,17 @@ HttpSM::init()
// update the cache info config structure so that
// selection from alternates happens correctly.
- t_state.cache_info.config.cache_global_user_agent_header = t_state.txn_conf->global_user_agent_header ? true : false;
- t_state.cache_info.config.ignore_accept_mismatch = t_state.http_config_param->ignore_accept_mismatch;
+ t_state.cache_info.config.cache_global_user_agent_header = t_state.txn_conf->global_user_agent_header ? true : false;
+ t_state.cache_info.config.ignore_accept_mismatch = t_state.http_config_param->ignore_accept_mismatch;
t_state.cache_info.config.ignore_accept_language_mismatch = t_state.http_config_param->ignore_accept_language_mismatch;
t_state.cache_info.config.ignore_accept_encoding_mismatch = t_state.http_config_param->ignore_accept_encoding_mismatch;
- t_state.cache_info.config.ignore_accept_charset_mismatch = t_state.http_config_param->ignore_accept_charset_mismatch;
+ t_state.cache_info.config.ignore_accept_charset_mismatch = t_state.http_config_param->ignore_accept_charset_mismatch;
t_state.cache_info.config.cache_enable_default_vary_headers =
t_state.http_config_param->cache_enable_default_vary_headers ? true : false;
- t_state.cache_info.config.cache_vary_default_text = t_state.http_config_param->cache_vary_default_text;
+ t_state.cache_info.config.cache_vary_default_text = t_state.http_config_param->cache_vary_default_text;
t_state.cache_info.config.cache_vary_default_images = t_state.http_config_param->cache_vary_default_images;
- t_state.cache_info.config.cache_vary_default_other = t_state.http_config_param->cache_vary_default_other;
+ t_state.cache_info.config.cache_vary_default_other = t_state.http_config_param->cache_vary_default_other;
t_state.init();
t_state.srv_lookup = hostdb_srv_enabled;
@@ -494,7 +494,7 @@ HttpSM::kill_this_async_hook(int /* event ATS_UNUSED */, void * /* data ATS_UNUS
// do here. subclasses can override this function
// to do their own asynchronous cleanup
// So We're now ready to finish off the state machine
- terminate_sm = true;
+ terminate_sm = true;
kill_this_async_done = true;
return EVENT_DONE;
@@ -520,15 +520,15 @@ HttpSM::attach_client_session(ProxyClientTransaction *client_vc, IOBufferReader
ua_session = client_vc;
// Collect log & stats information
- client_tcp_reused = (1 < ua_session->get_transact_count());
+ client_tcp_reused = (1 < ua_session->get_transact_count());
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(netvc);
if (ssl_vc != NULL) {
client_connection_is_ssl = true;
- client_ssl_reused = ssl_vc->getSSLSessionCacheHit();
- const char *protocol = ssl_vc->getSSLProtocol();
- client_sec_protocol = protocol ? protocol : "-";
- const char *cipher = ssl_vc->getSSLCipherSuite();
- client_cipher_suite = cipher ? cipher : "-";
+ client_ssl_reused = ssl_vc->getSSLSessionCacheHit();
+ const char *protocol = ssl_vc->getSSLProtocol();
+ client_sec_protocol = protocol ? protocol : "-";
+ const char *cipher = ssl_vc->getSSLCipherSuite();
+ client_cipher_suite = cipher ? cipher : "-";
}
ink_release_assert(ua_session->get_half_close_flag() == false);
@@ -540,16 +540,16 @@ HttpSM::attach_client_session(ProxyClientTransaction *client_vc, IOBufferReader
// Allocate a user agent entry in the state machine's
// vc table
- ua_entry = vc_table.new_entry();
- ua_entry->vc = client_vc;
+ ua_entry = vc_table.new_entry();
+ ua_entry->vc = client_vc;
ua_entry->vc_type = HTTP_UA_VC;
ats_ip_copy(&t_state.client_info.src_addr, netvc->get_remote_addr());
ats_ip_copy(&t_state.client_info.dst_addr, netvc->get_local_addr());
t_state.client_info.dst_addr.port() = netvc->get_local_port();
- t_state.client_info.is_transparent = netvc->get_is_transparent();
- t_state.backdoor_request = !client_vc->hooks_enabled();
- t_state.client_info.port_attribute = static_cast<HttpProxyPort::TransportType>(netvc->attributes);
+ t_state.client_info.is_transparent = netvc->get_is_transparent();
+ t_state.backdoor_request = !client_vc->hooks_enabled();
+ t_state.client_info.port_attribute = static_cast<HttpProxyPort::TransportType>(netvc->attributes);
HTTP_INCREMENT_DYN_STAT(http_current_client_transactions_stat);
@@ -557,7 +557,7 @@ HttpSM::attach_client_session(ProxyClientTransaction *client_vc, IOBufferReader
hooks_set = client_vc->has_hooks();
// Setup for parsing the header
- ua_buffer_reader = buffer_reader;
+ ua_buffer_reader = buffer_reader;
ua_entry->vc_handler = &HttpSM::state_read_client_request_header;
t_state.hdr_info.client_request.destroy();
t_state.hdr_info.client_request.create(HTTP_TYPE_REQUEST);
@@ -653,9 +653,9 @@ HttpSM::state_read_client_request_header(int event, void *data)
// The user agent is hosed. Close it &
// bail on the state machine
vc_table.cleanup_entry(ua_entry);
- ua_entry = NULL;
+ ua_entry = NULL;
t_state.client_info.abort = HttpTransact::ABORTED;
- terminate_sm = true;
+ terminate_sm = true;
return 0;
}
@@ -727,7 +727,7 @@ HttpSM::state_read_client_request_header(int event, void *data)
ua_raw_buffer_reader = NULL;
}
http_parser_clear(&http_parser);
- ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
+ ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
milestones[TS_MILESTONE_UA_READ_HEADER_DONE] = Thread::get_hrtime();
}
@@ -777,7 +777,7 @@ HttpSM::state_read_client_request_header(int event, void *data)
(t_state.hdr_info.client_request.method_get_wksidx() == HTTP_WKSIDX_POST ||
t_state.hdr_info.client_request.method_get_wksidx() == HTTP_WKSIDX_PUT) &&
t_state.http_config_param->send_100_continue_response) {
- int len = 0;
+ int len = 0;
const char *expect = t_state.hdr_info.client_request.value_get(MIME_FIELD_EXPECT, MIME_LEN_EXPECT, &len);
// When receive an "Expect: 100-continue" request from client, ATS sends a "100 Continue" response to client
// imediately, before receive the real response from original server.
@@ -787,7 +787,7 @@ HttpSM::state_read_client_request_header(int event, void *data)
free_MIOBuffer(ua_entry->write_buffer);
ua_entry->write_buffer = NULL;
}
- ua_entry->write_buffer = new_MIOBuffer(alloc_index);
+ ua_entry->write_buffer = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = ua_entry->write_buffer->alloc_reader();
DebugSM("http_seq", "send 100 Continue response to client");
@@ -847,7 +847,7 @@ HttpSM::state_drain_client_request_body(int event, void *data)
}
case VC_EVENT_READ_READY: {
int64_t avail = ua_buffer_reader->read_avail();
- int64_t left = t_state.hdr_info.request_content_length - client_request_body_bytes;
+ int64_t left = t_state.hdr_info.request_content_length - client_request_body_bytes;
// Since we are only reading what's needed to complete
// the post, there must be something left to do
@@ -867,8 +867,8 @@ HttpSM::state_drain_client_request_body(int event, void *data)
ink_assert(client_request_body_bytes == t_state.hdr_info.request_content_length);
ua_buffer_reader->mbuf->size_index = HTTP_HEADER_BUFFER_SIZE_INDEX;
- ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
- ua_entry->read_vio = ua_entry->vc->do_io_read(this, INT64_MAX, ua_buffer_reader->mbuf);
+ ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
+ ua_entry->read_vio = ua_entry->vc->do_io_read(this, INT64_MAX, ua_buffer_reader->mbuf);
call_transact_and_set_next_state(NULL);
break;
}
@@ -905,7 +905,7 @@ HttpSM::state_watch_for_client_abort(int event, void *data)
if (netvc)
netvc->do_io_close();
ua_session->do_io_close();
- ua_session = NULL;
+ ua_session = NULL;
ua_buffer_reader = NULL;
vc_table.cleanup_entry(ua_entry);
ua_entry = NULL;
@@ -1013,7 +1013,7 @@ HttpSM::state_read_push_response_header(int event, void *data)
ink_assert(ua_entry->read_vio == (VIO *)data);
ink_assert(t_state.current.server == NULL);
- int64_t data_size = 0;
+ int64_t data_size = 0;
int64_t bytes_used = 0;
// Not used here.
@@ -1042,8 +1042,8 @@ HttpSM::state_read_push_response_header(int event, void *data)
int state = PARSE_CONT;
while (ua_buffer_reader->read_avail() && state == PARSE_CONT) {
const char *start = ua_buffer_reader->start();
- const char *tmp = start;
- data_size = ua_buffer_reader->block_read_avail();
+ const char *tmp = start;
+ data_size = ua_buffer_reader->block_read_avail();
ink_assert(data_size >= 0);
/////////////////////
@@ -1115,7 +1115,7 @@ HttpSM::state_raw_http_server_open(int event, void *data)
STATE_ENTER(&HttpSM::state_raw_http_server_open, event);
ink_assert(server_entry == NULL);
milestones[TS_MILESTONE_SERVER_CONNECT_END] = Thread::get_hrtime();
- NetVConnection *netvc = NULL;
+ NetVConnection *netvc = NULL;
pending_action = NULL;
switch (event) {
@@ -1126,10 +1126,10 @@ HttpSM::state_raw_http_server_open(int event, void *data)
t_state.congestion_connection_opened = 1;
}
// Record the VC in our table
- server_entry = vc_table.new_entry();
+ server_entry = vc_table.new_entry();
server_entry->vc = netvc = (NetVConnection *)data;
- server_entry->vc_type = HTTP_RAW_SERVER_VC;
- t_state.current.state = HttpTransact::CONNECTION_ALIVE;
+ server_entry->vc_type = HTTP_RAW_SERVER_VC;
+ t_state.current.state = HttpTransact::CONNECTION_ALIVE;
netvc->set_inactivity_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_no_activity_timeout_out));
netvc->set_active_timeout(HRTIME_SECONDS(t_state.txn_conf->transaction_active_timeout_out));
@@ -1427,7 +1427,7 @@ HttpSM::state_api_callout(int event, void *data)
Ptr<ProxyMutex> plugin_mutex;
if (cur_hook->m_cont->mutex) {
plugin_mutex = cur_hook->m_cont->mutex;
- plugin_lock = MUTEX_TAKE_TRY_LOCK(cur_hook->m_cont->mutex, mutex->thread_holding);
+ plugin_lock = MUTEX_TAKE_TRY_LOCK(cur_hook->m_cont->mutex, mutex->thread_holding);
if (!plugin_lock) {
api_timer = -Thread::get_hrtime_updated();
@@ -1448,7 +1448,7 @@ HttpSM::state_api_callout(int event, void *data)
cur_hook);
APIHook *hook = cur_hook;
- cur_hook = cur_hook->next();
+ cur_hook = cur_hook->next();
if (!api_timer)
api_timer = Thread::get_hrtime_updated();
@@ -1496,18 +1496,18 @@ HttpSM::state_api_callout(int event, void *data)
// jump to an error state so just continue
api_next = API_RETURN_CONTINUE;
} else if (t_state.api_http_sm_shutdown) {
- t_state.api_http_sm_shutdown = false;
+ t_state.api_http_sm_shutdown = false;
t_state.cache_info.object_read = NULL;
cache_sm.close_read();
transform_cache_sm.close_read();
release_server_session();
- terminate_sm = true;
- api_next = API_RETURN_SHUTDOWN;
+ terminate_sm = true;
+ api_next = API_RETURN_SHUTDOWN;
t_state.squid_codes.log_code = SQUID_LOG_TCP_DENIED;
} else if (t_state.api_modifiable_cached_resp &&
t_state.api_update_cached_object == HttpTransact::UPDATE_CACHED_OBJECT_PREPARE) {
t_state.api_update_cached_object = HttpTransact::UPDATE_CACHED_OBJECT_ERROR;
- api_next = API_RETURN_INVALIDATE_ERROR;
+ api_next = API_RETURN_INVALIDATE_ERROR;
} else {
api_next = API_RETURN_ERROR_JUMP;
}
@@ -1528,7 +1528,7 @@ HttpSM::state_api_callout(int event, void *data)
// Now that we're completed with the api state and figured out what
// to do next, do it
callout_state = HTTP_API_NO_CALLOUT;
- api_timer = 0;
+ api_timer = 0;
switch (api_next) {
case API_RETURN_CONTINUE:
if (t_state.api_next_action == HttpTransact::SM_ACTION_API_SEND_RESPONSE_HDR) {
@@ -1591,7 +1591,7 @@ HttpSM::handle_api_return()
t_state.api_update_cached_object != HttpTransact::UPDATE_CACHED_OBJECT_PREPARE) {
t_state.api_cleanup_cache_read = false;
t_state.cache_info.object_read = NULL;
- t_state.request_sent_time = UNDEFINED_TIME;
+ t_state.request_sent_time = UNDEFINED_TIME;
t_state.response_received_time = UNDEFINED_TIME;
cache_sm.close_read();
transform_cache_sm.close_read();
@@ -1708,7 +1708,7 @@ HttpSM::state_http_server_open(int event, void *data)
STATE_ENTER(&HttpSM::state_http_server_open, event);
// TODO decide whether to uncomment after finish testing redirect
// ink_assert(server_entry == NULL);
- pending_action = NULL;
+ pending_action = NULL;
milestones[TS_MILESTONE_SERVER_CONNECT_END] = Thread::get_hrtime();
HttpServerSession *session;
@@ -1717,7 +1717,7 @@ HttpSM::state_http_server_open(int event, void *data)
session = (TS_SERVER_SESSION_SHARING_POOL_THREAD == t_state.http_config_param->server_session_sharing_pool) ?
THREAD_ALLOC_INIT(httpServerSessionAllocator, mutex->thread_holding) :
httpServerSessionAllocator.alloc();
- session->sharing_pool = static_cast<TSServerSessionSharingPoolType>(t_state.http_config_param->server_session_sharing_pool);
+ session->sharing_pool = static_cast<TSServerSessionSharingPoolType>(t_state.http_config_param->server_session_sharing_pool);
session->sharing_match = static_cast<TSServerSessionSharingMatchType>(t_state.txn_conf->server_session_sharing_match);
// If origin_max_connections or origin_min_keep_alive_connections is
// set then we are metering the max and or min number
@@ -1774,7 +1774,7 @@ HttpSM::state_http_server_open(int event, void *data)
ats_ip_nptop(&t_state.server_info.dst_addr.sa, ip_s, sizeof ip_s), sm_id);
}
t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE; // part of the problem, clear it.
- terminate_sm = true;
+ terminate_sm = true;
} else {
call_transact_and_set_next_state(HttpTransact::HandleResponse);
}
@@ -1806,7 +1806,7 @@ HttpSM::state_read_server_response_header(int event, void *data)
ink_assert(t_state.current.state == HttpTransact::STATE_UNDEFINED);
int bytes_used = 0;
- VIO *vio = (VIO *)data;
+ VIO *vio = (VIO *)data;
switch (event) {
case VC_EVENT_EOS:
@@ -1941,9 +1941,9 @@ HttpSM::state_read_server_response_header(int event, void *data)
}
*/
- t_state.current.state = HttpTransact::CONNECTION_ALIVE;
+ t_state.current.state = HttpTransact::CONNECTION_ALIVE;
t_state.transact_return_point = HttpTransact::HandleResponse;
- t_state.api_next_action = HttpTransact::SM_ACTION_API_READ_RESPONSE_HDR;
+ t_state.api_next_action = HttpTransact::SM_ACTION_API_READ_RESPONSE_HDR;
// if exceeded limit deallocate postdata buffers and disable redirection
if (enable_redirection && (redirection_tries < t_state.txn_conf->number_of_redirections)) {
@@ -1986,7 +1986,7 @@ HttpSM::state_send_server_request_header(int event, void *data)
// our buffer and then decide what to do next
free_MIOBuffer(server_entry->write_buffer);
server_entry->write_buffer = NULL;
- method = t_state.hdr_info.server_request.method_get_wksidx();
+ method = t_state.hdr_info.server_request.method_get_wksidx();
if (!t_state.api_server_request_body_set && method != HTTP_WKSIDX_TRACE &&
(t_state.hdr_info.request_content_length > 0 || t_state.client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING)) {
if (post_transform_info.vc) {
@@ -2069,27 +2069,27 @@ HttpSM::process_srv_info(HostDBInfo *r)
/* we didnt get any SRV records, continue w normal lookup */
if (!r || !r->is_srv || !r->round_robin) {
- t_state.dns_info.srv_hostname[0] = '\0';
+ t_state.dns_info.srv_hostname[0] = '\0';
t_state.dns_info.srv_lookup_success = false;
- t_state.srv_lookup = false;
+ t_state.srv_lookup = false;
DebugSM("dns_srv", "No SRV records were available, continuing to lookup %s", t_state.dns_info.lookup_name);
} else {
HostDBRoundRobin *rr = r->rr();
- HostDBInfo *srv = NULL;
+ HostDBInfo *srv = NULL;
if (rr) {
srv = rr->select_best_srv(t_state.dns_info.srv_hostname, &mutex.m_ptr->thread_holding->generator, ink_cluster_time(),
(int)t_state.txn_conf->down_server_timeout);
}
if (!srv) {
t_state.dns_info.srv_lookup_success = false;
- t_state.dns_info.srv_hostname[0] = '\0';
- t_state.srv_lookup = false;
+ t_state.dns_info.srv_hostname[0] = '\0';
+ t_state.srv_lookup = false;
DebugSM("dns_srv", "SRV records empty for %s", t_state.dns_info.lookup_name);
} else {
ink_assert(r->md5_high == srv->md5_high && r->md5_low == srv->md5_low && r->md5_low_low == srv->md5_low_low);
t_state.dns_info.srv_lookup_success = true;
- t_state.dns_info.srv_port = srv->data.srv.srv_port;
- t_state.dns_info.srv_app = srv->app;
+ t_state.dns_info.srv_port = srv->data.srv.srv_port;
+ t_state.dns_info.srv_app = srv->app;
// t_state.dns_info.single_srv = (rr->good == 1);
ink_assert(srv->data.srv.key == makeHostHash(t_state.dns_info.srv_hostname));
DebugSM("dns_srv", "select SRV records %s", t_state.dns_info.srv_hostname);
@@ -2102,9 +2102,9 @@ void
HttpSM::process_hostdb_info(HostDBInfo *r)
{
if (r && !r->failed()) {
- ink_time_t now = ink_cluster_time();
- HostDBInfo *ret = NULL;
- t_state.dns_info.lookup_success = true;
+ ink_time_t now = ink_cluster_time();
+ HostDBInfo *ret = NULL;
+ t_state.dns_info.lookup_success = true;
t_state.dns_info.lookup_validated = true;
if (r->round_robin) {
// if use_client_target_addr is set, make sure the client
@@ -2180,7 +2180,7 @@ HttpSM::process_hostdb_info(HostDBInfo *r)
} else {
DebugSM("http", "[%" PRId64 "] DNS lookup failed for '%s'", sm_id, t_state.dns_info.lookup_name);
- t_state.dns_info.lookup_success = false;
+ t_state.dns_info.lookup_success = false;
t_state.host_db_info.app.allotment.application1 = 0;
t_state.host_db_info.app.allotment.application2 = 0;
ink_assert(!t_state.host_db_info.round_robin);
@@ -2224,17 +2224,17 @@ HttpSM::state_hostdb_lookup(int event, void *data)
char *host_name = t_state.dns_info.srv_lookup_success ? t_state.dns_info.srv_hostname : t_state.dns_info.lookup_name;
HostDBProcessor::Options opt;
- opt.port = t_state.dns_info.srv_lookup_success ? t_state.dns_info.srv_port : t_state.server_info.dst_addr.host_order_port();
+ opt.port = t_state.dns_info.srv_lookup_success ? t_state.dns_info.srv_port : t_state.server_info.dst_addr.host_order_port();
opt.flags = (t_state.cache_info.directives.does_client_permit_dns_storing) ? HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS :
HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD;
- opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
+ opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
opt.host_res_style = ua_session->get_host_res_style();
Action *dns_lookup_action_handle =
hostDBProcessor.getbyname_imm(this, (process_hostdb_info_pfn)&HttpSM::process_hostdb_info, host_name, 0, opt);
if (dns_lookup_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = dns_lookup_action_handle;
+ pending_action = dns_lookup_action_handle;
historical_action = pending_action;
} else {
call_transact_and_set_next_state(NULL);
@@ -2333,8 +2333,8 @@ HttpSM::state_handle_stat_page(int event, void *data)
if (spd->type)
t_state.internal_msg_buffer_type = spd->type;
else
- t_state.internal_msg_buffer_type = NULL; // Defaults to text/html
- t_state.internal_msg_buffer_size = spd->length;
+ t_state.internal_msg_buffer_type = NULL; // Defaults to text/html
+ t_state.internal_msg_buffer_size = spd->length;
t_state.internal_msg_buffer_fast_allocator_size = -1;
}
@@ -2412,7 +2412,7 @@ HttpSM::state_icp_lookup(int event, void *data)
DebugSM("http", "ICP says ICP_LOOKUP_FOUND");
t_state.icp_lookup_success = true;
- t_state.icp_ip_result = *(struct sockaddr_in *)data;
+ t_state.icp_ip_result = *(struct sockaddr_in *)data;
/*
* Disable ICP loop detection since the Cidera network
@@ -2462,7 +2462,7 @@ HttpSM::state_cache_open_write(int event, void *data)
}
milestones[TS_MILESTONE_CACHE_OPEN_WRITE_END] = Thread::get_hrtime();
- pending_action = NULL;
+ pending_action = NULL;
switch (event) {
case CACHE_EVENT_OPEN_WRITE:
@@ -2478,7 +2478,7 @@ HttpSM::state_cache_open_write(int event, void *data)
if (t_state.redirect_info.redirect_in_process) {
DebugSM("http_redirect", "[%" PRId64 "] CACHE_EVENT_OPEN_WRITE_FAILED during redirect follow", sm_id);
t_state.cache_open_write_fail_action = HttpTransact::CACHE_WL_FAIL_ACTION_DEFAULT;
- t_state.cache_info.write_lock_state = HttpTransact::CACHE_WL_FAIL;
+ t_state.cache_info.write_lock_state = HttpTransact::CACHE_WL_FAIL;
break;
}
if (t_state.txn_conf->cache_open_write_fail_action == HttpTransact::CACHE_WL_FAIL_ACTION_DEFAULT) {
@@ -2512,7 +2512,7 @@ HttpSM::state_cache_open_write(int event, void *data)
t_state.source = HttpTransact::SOURCE_CACHE;
// clear up CACHE_LOOKUP_MISS, let Freshness function decide
// hit status
- t_state.cache_lookup_result = HttpTransact::CACHE_LOOKUP_NONE;
+ t_state.cache_lookup_result = HttpTransact::CACHE_LOOKUP_NONE;
t_state.cache_info.write_lock_state = HttpTransact::CACHE_WL_READ_RETRY;
break;
@@ -2971,7 +2971,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
case VC_EVENT_INACTIVITY_TIMEOUT:
case VC_EVENT_ACTIVE_TIMEOUT:
case VC_EVENT_ERROR:
- t_state.squid_codes.log_code = SQUID_LOG_ERR_READ_TIMEOUT;
+ t_state.squid_codes.log_code = SQUID_LOG_ERR_READ_TIMEOUT;
t_state.squid_codes.hier_code = SQUID_HIER_TIMEOUT_DIRECT;
/* fallthru */
@@ -3006,13 +3006,13 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
if (ua_entry->in_tunnel)
ua_session = NULL;
- t_state.current.server->abort = HttpTransact::ABORTED;
- t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
+ t_state.current.server->abort = HttpTransact::ABORTED;
+ t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
t_state.current.server->keep_alive = HTTP_NO_KEEPALIVE;
- t_state.squid_codes.log_code = SQUID_LOG_ERR_READ_ERROR;
+ t_state.squid_codes.log_code = SQUID_LOG_ERR_READ_ERROR;
} else {
DebugSM("http", "[%" PRId64 "] [HttpSM::tunnel_handler_server] finishing HTTP tunnel", sm_id);
- p->read_success = true;
+ p->read_success = true;
t_state.current.server->abort = HttpTransact::DIDNOT_ABORT;
// Appending reason to a response without Content-Length will result in
// the reason string being written to the client and a bad CL when reading from cache.
@@ -3037,7 +3037,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
// The transfer completed successfully
// If there is still data in the buffer, the server
// sent too much indicating a failed transfer
- p->read_success = true;
+ p->read_success = true;
t_state.current.server->state = HttpTransact::TRANSACTION_COMPLETE;
t_state.current.server->abort = HttpTransact::DIDNOT_ABORT;
@@ -3046,7 +3046,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
tunnel.abort_cache_write_finish_others(p);
// We couldn't read all chunks successfully:
// Disable keep-alive.
- t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
+ t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
t_state.current.server->keep_alive = HTTP_NO_KEEPALIVE;
} else {
tunnel.local_finish_all(p);
@@ -3057,10 +3057,10 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
case HTTP_TUNNEL_EVENT_CONSUMER_DETACH:
// All consumers are prematurely gone. Shutdown
// the server connection
- p->read_success = true;
+ p->read_success = true;
t_state.current.server->state = HttpTransact::TRANSACTION_COMPLETE;
t_state.current.server->abort = HttpTransact::DIDNOT_ABORT;
- close_connection = true;
+ close_connection = true;
break;
case VC_EVENT_READ_READY:
@@ -3090,7 +3090,7 @@ HttpSM::tunnel_handler_server(int event, HttpTunnelProducer *p)
if (close_connection) {
p->vc->do_io_close();
server_session = NULL; // Because p->vc == server_session
- p->read_vio = NULL;
+ p->read_vio = NULL;
/* TS-1424: if we're outbound transparent and using the client
source port for the outbound connection we must effectively
propagate server closes back to the client. Part of that is
@@ -3150,7 +3150,7 @@ HttpSM::tunnel_handler_100_continue_ua(int event, HttpTunnelConsumer *c)
// so we don't get hosed if the ua abort before
// real response header is received
ua_entry->in_tunnel = false;
- c->write_success = true;
+ c->write_success = true;
}
return 0;
@@ -3177,7 +3177,7 @@ HttpSM::is_bg_fill_necessary(HttpTunnelConsumer *c)
if (ua_cl > 0) {
int64_t ua_body_done = c->bytes_written - client_response_hdr_bytes;
- float pDone = (float)ua_body_done / ua_cl;
+ float pDone = (float)ua_body_done / ua_cl;
// If we got a good content length. Check to make sure that we haven't already
// done more the content length since that would indicate the content-length
@@ -3197,8 +3197,8 @@ HttpSM::is_bg_fill_necessary(HttpTunnelConsumer *c)
int
HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
{
- bool close_connection = true;
- HttpTunnelProducer *p = NULL;
+ bool close_connection = true;
+ HttpTunnelProducer *p = NULL;
HttpTunnelConsumer *selfc = NULL;
STATE_ENTER(&HttpSM::tunnel_handler_ua, event);
@@ -3249,7 +3249,7 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
break;
case VC_EVENT_WRITE_COMPLETE:
- c->write_success = true;
+ c->write_success = true;
t_state.client_info.abort = HttpTransact::DIDNOT_ABORT;
if (t_state.client_info.keep_alive == HTTP_KEEPALIVE) {
if (t_state.www_auth_content != HttpTransact::CACHE_AUTH_SERVE || ua_session->get_server_session()) {
@@ -3323,7 +3323,7 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
ink_assert(ua_buffer_reader != NULL);
ua_session->release(ua_buffer_reader);
ua_buffer_reader = NULL;
- ua_session = NULL;
+ ua_session = NULL;
}
return 0;
@@ -3353,7 +3353,7 @@ HttpSM::tunnel_handler_ua_push(int event, HttpTunnelProducer *p)
case VC_EVENT_READ_COMPLETE:
//
// The transfer completed successfully
- p->read_success = true;
+ p->read_success = true;
ua_entry->in_tunnel = false;
break;
@@ -3419,7 +3419,7 @@ HttpSM::tunnel_handler_cache_write(int event, HttpTunnelConsumer *c)
case VC_EVENT_ERROR:
case VC_EVENT_EOS:
// Abnormal termination
- *status_ptr = HttpTransact::CACHE_WRITE_ERROR;
+ *status_ptr = HttpTransact::CACHE_WRITE_ERROR;
c->write_vio = NULL;
c->vc->do_io_close(EHTTP_ERROR);
@@ -3436,13 +3436,13 @@ HttpSM::tunnel_handler_cache_write(int event, HttpTunnelConsumer *c)
// we got a truncated header from the origin server
// but decided to accept it anyways
if (c->write_vio == NULL) {
- *status_ptr = HttpTransact::CACHE_WRITE_ERROR;
+ *status_ptr = HttpTransact::CACHE_WRITE_ERROR;
c->write_success = false;
c->vc->do_io_close(EHTTP_ERROR);
} else {
- *status_ptr = HttpTransact::CACHE_WRITE_COMPLETE;
+ *status_ptr = HttpTransact::CACHE_WRITE_COMPLETE;
c->write_success = true;
- c->write_vio = c->vc->do_io(VIO::CLOSE);
+ c->write_vio = c->vc->do_io(VIO::CLOSE);
}
break;
default:
@@ -3487,7 +3487,7 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)
ua_entry->write_buffer = NULL;
}
ua_entry->write_buffer = new_MIOBuffer(alloc_index);
- buf_start = ua_entry->write_buffer->alloc_reader();
+ buf_start = ua_entry->write_buffer->alloc_reader();
DebugSM("http_tunnel", "send 408 response to client to vc %p, tunnel vc %p", ua_session->get_netvc(), p->vc);
@@ -3526,8 +3526,8 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)
case VC_EVENT_READ_COMPLETE:
case HTTP_TUNNEL_EVENT_PRECOMPLETE:
- p->handler_state = HTTP_SM_POST_SUCCESS;
- p->read_success = true;
+ p->handler_state = HTTP_SM_POST_SUCCESS;
+ p->read_success = true;
ua_entry->in_tunnel = false;
if (p->do_dechunking || p->do_chunked_passthru) {
@@ -3540,7 +3540,7 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)
// Initiate another read to watch catch aborts and
// timeouts
ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
- ua_entry->read_vio = p->vc->do_io_read(this, INT64_MAX, ua_buffer_reader->mbuf);
+ ua_entry->read_vio = p->vc->do_io_read(this, INT64_MAX, ua_buffer_reader->mbuf);
break;
default:
ink_release_assert(0);
@@ -3611,7 +3611,7 @@ HttpSM::tunnel_handler_post_server(int event, HttpTunnelConsumer *c)
if (c->producer->handler_state == HTTP_SM_TRANSFORM_OPEN) {
ink_assert(c->producer->vc == post_transform_info.vc);
c->producer->vc->do_io_close();
- c->producer->alive = false;
+ c->producer->alive = false;
c->producer->self_consumer->alive = false;
}
ua_producer = c->producer->self_consumer->producer;
@@ -3650,7 +3650,7 @@ HttpSM::tunnel_handler_post_server(int event, HttpTunnelConsumer *c)
// We want to shutdown the tunnel here and see if there
// is a response on from the server. Mark the user
// agent as down so that tunnel concludes.
- ua_producer->alive = false;
+ ua_producer->alive = false;
ua_producer->handler_state = HTTP_SM_POST_SERVER_FAIL;
ink_assert(tunnel.is_tunnel_alive() == false);
break;
@@ -4063,7 +4063,7 @@ HttpSM::do_hostdb_lookup()
ink_assert(pending_action == NULL);
milestones[TS_MILESTONE_DNS_LOOKUP_BEGIN] = Thread::get_hrtime();
- bool use_srv_records = t_state.srv_lookup;
+ bool use_srv_records = t_state.srv_lookup;
if (use_srv_records) {
char d[MAXDNAME];
@@ -4081,24 +4081,24 @@ HttpSM::do_hostdb_lookup()
if (srv_lookup_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = srv_lookup_action_handle;
+ pending_action = srv_lookup_action_handle;
historical_action = pending_action;
} else {
char *host_name = t_state.dns_info.srv_lookup_success ? t_state.dns_info.srv_hostname : t_state.dns_info.lookup_name;
- opt.port = t_state.dns_info.srv_lookup_success ?
+ opt.port = t_state.dns_info.srv_lookup_success ?
t_state.dns_info.srv_port :
t_state.server_info.dst_addr.isValid() ? t_state.server_info.dst_addr.host_order_port() :
t_state.hdr_info.client_request.port_get();
opt.flags = (t_state.cache_info.directives.does_client_permit_dns_storing) ? HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS :
HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD;
- opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
+ opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
opt.host_res_style = ua_session->get_host_res_style();
Action *dns_lookup_action_handle =
hostDBProcessor.getbyname_imm(this, (process_hostdb_info_pfn)&HttpSM::process_hostdb_info, host_name, 0, opt);
if (dns_lookup_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = dns_lookup_action_handle;
+ pending_action = dns_lookup_action_handle;
historical_action = pending_action;
} else {
call_transact_and_set_next_state(NULL);
@@ -4120,10 +4120,10 @@ HttpSM::do_hostdb_lookup()
}
HostDBProcessor::Options opt;
- opt.port = server_port;
+ opt.port = server_port;
opt.flags = (t_state.cache_info.directives.does_client_permit_dns_storing) ? HostDBProcessor::HOSTDB_DO_NOT_FORCE_DNS :
HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD;
- opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
+ opt.timeout = (t_state.api_txn_dns_timeout_value != -1) ? t_state.api_txn_dns_timeout_value : 0;
opt.host_res_style = ua_session->get_host_res_style();
Action *dns_lookup_action_handle = hostDBProcessor.getbyname_imm(this, (process_hostdb_info_pfn)&HttpSM::process_hostdb_info,
@@ -4131,7 +4131,7 @@ HttpSM::do_hostdb_lookup()
if (dns_lookup_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = dns_lookup_action_handle;
+ pending_action = dns_lookup_action_handle;
historical_action = pending_action;
} else {
call_transact_and_set_next_state(NULL);
@@ -4156,7 +4156,7 @@ HttpSM::do_hostdb_reverse_lookup()
if (dns_lookup_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = dns_lookup_action_handle;
+ pending_action = dns_lookup_action_handle;
historical_action = pending_action;
}
return;
@@ -4243,7 +4243,7 @@ HttpSM::parse_range_and_compare(MIMEField *field, int64_t content_length)
const char *value;
int value_len;
int n_values;
- int nr = 0; // number of valid ranges, also index to range array.
+ int nr = 0; // number of valid ranges, also index to range array.
int not_satisfy = 0;
HdrCsvIter csv;
const char *s, *e, *tmp;
@@ -4268,7 +4268,7 @@ HttpSM::parse_range_and_compare(MIMEField *field, int64_t content_length)
parse_range_done = true;
n_values = 0;
- value = csv.get_first(field, &value_len);
+ value = csv.get_first(field, &value_len);
while (value) {
++n_values;
value = csv.get_next(&value_len);
@@ -4345,7 +4345,7 @@ HttpSM::parse_range_and_compare(MIMEField *field, int64_t content_length)
if (end >= content_length)
end = content_length;
start = content_length - end;
- end = content_length - 1;
+ end = content_length - 1;
} else if (start >= content_length && start <= end) {
not_satisfy++;
continue;
@@ -4367,15 +4367,15 @@ HttpSM::parse_range_and_compare(MIMEField *field, int64_t content_length)
ink_assert(start >= 0 && end >= 0 && start < content_length && end < content_length);
- prev_good_range = nr;
+ prev_good_range = nr;
ranges[nr]._start = start;
- ranges[nr]._end = end;
+ ranges[nr]._end = end;
++nr;
if (!cache_sm.cache_read_vc->is_pread_capable() && cache_config_read_while_writer == 2) {
// write in progress, check if request range not in cache yet
HTTPInfo::FragOffset *frag_offset_tbl = t_state.cache_info.object_read->get_frag_table();
- int frag_offset_cnt = t_state.cache_info.object_read->get_frag_offset_count();
+ int frag_offset_cnt = t_state.cache_info.object_read->get_frag_offset_count();
if (!frag_offset_tbl || !frag_offset_cnt || (frag_offset_tbl[frag_offset_cnt - 1] < (uint64_t)end)) {
Debug("http_range", "request range in cache, end %" PRId64 ", frg_offset_cnt %d" PRId64, end, frag_offset_cnt);
@@ -4385,8 +4385,8 @@ HttpSM::parse_range_and_compare(MIMEField *field, int64_t content_length)
}
if (nr > 0) {
- t_state.range_setup = HttpTransact::RANGE_REQUESTED;
- t_state.ranges = ranges;
+ t_state.range_setup = HttpTransact::RANGE_REQUESTED;
+ t_state.ranges = ranges;
t_state.num_range_fields = nr;
return;
}
@@ -4395,7 +4395,7 @@ HttpSM::parse_range_and_compare(MIMEField *field, int64_t content_length)
t_state.range_setup = HttpTransact::RANGE_NOT_SATISFIABLE;
Lfaild:
- t_state.range_in_cache = false;
+ t_state.range_in_cache = false;
t_state.num_range_fields = -1;
delete[] ranges;
return;
@@ -4437,7 +4437,7 @@ HttpSM::do_range_parse(MIMEField *range_field)
int num_chars_for_ct = 0;
t_state.cache_info.object_read->response_get()->value_get(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE, &num_chars_for_ct);
- int64_t content_length = t_state.cache_info.object_read->object_size_get();
+ int64_t content_length = t_state.cache_info.object_read->object_size_get();
int64_t num_chars_for_cl = num_chars_for_int(content_length);
parse_range_and_compare(range_field, content_length);
@@ -4499,7 +4499,7 @@ HttpSM::do_cache_lookup_and_read()
HTTP_INCREMENT_DYN_STAT(http_cache_lookups_stat);
milestones[TS_MILESTONE_CACHE_OPEN_READ_BEGIN] = Thread::get_hrtime();
- t_state.cache_lookup_result = HttpTransact::CACHE_LOOKUP_NONE;
+ t_state.cache_lookup_result = HttpTransact::CACHE_LOOKUP_NONE;
t_state.cache_info.lookup_count++;
// YTS Team, yamsat Plugin
// Changed the lookup_url to c_url which enables even
@@ -4527,7 +4527,7 @@ HttpSM::do_cache_lookup_and_read()
//
if (cache_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = cache_action_handle;
+ pending_action = cache_action_handle;
historical_action = pending_action;
}
REMEMBER((long)pending_action, reentrancy_count);
@@ -4552,7 +4552,7 @@ HttpSM::do_cache_delete_all_alts(Continuation *cont)
if (cont != NULL) {
if (cache_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = cache_action_handle;
+ pending_action = cache_action_handle;
historical_action = pending_action;
}
}
@@ -4566,7 +4566,7 @@ HttpSM::do_cache_prepare_write()
// statistically no need to retry when we are trying to lock
// LOCK_URL_SECOND url because the server's behavior is unlikely to change
milestones[TS_MILESTONE_CACHE_OPEN_WRITE_BEGIN] = Thread::get_hrtime();
- bool retry = (t_state.api_lock_url == HttpTransact::LOCK_URL_FIRST);
+ bool retry = (t_state.api_lock_url == HttpTransact::LOCK_URL_FIRST);
do_cache_prepare_action(&cache_sm, t_state.cache_info.object_read, retry);
}
@@ -4614,7 +4614,7 @@ HttpSM::do_cache_prepare_action(HttpCacheSM *c_sm, CacheHTTPInfo *object_read_in
o_url = &(t_state.redirect_info.original_url);
ink_assert(o_url->valid());
restore_client_request = true;
- s_url = o_url;
+ s_url = o_url;
} else {
o_url = &(t_state.cache_info.original_url);
if (o_url->valid())
@@ -4626,7 +4626,7 @@ HttpSM::do_cache_prepare_action(HttpCacheSM *c_sm, CacheHTTPInfo *object_read_in
s_url = &t_state.cache_info.lookup_url_storage;
} else {
ink_assert(t_state.api_lock_url == HttpTransact::LOCK_URL_ORIGINAL);
- s_url = &(t_state.cache_info.original_url);
+ s_url = &(t_state.cache_info.original_url);
restore_client_request = true;
}
@@ -4649,7 +4649,7 @@ HttpSM::do_cache_prepare_action(HttpCacheSM *c_sm, CacheHTTPInfo *object_read_in
if (cache_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = cache_action_handle;
+ pending_action = cache_action_handle;
historical_action = pending_action;
}
}
@@ -4693,8 +4693,8 @@ HttpSM::do_http_server_open(bool raw)
ats_ip_nptop(&t_state.current.server->dst_addr.sa, addrbuf, sizeof(addrbuf)));
if (plugin_tunnel) {
- PluginVCCore *t = plugin_tunnel;
- plugin_tunnel = NULL;
+ PluginVCCore *t = plugin_tunnel;
+ plugin_tunnel = NULL;
Action *pvc_action_handle = t->connect_re(this);
// This connect call is always reentrant
@@ -4910,10 +4910,10 @@ HttpSM::do_http_server_open(bool raw)
const IpAddr &outbound_ip = AF_INET6 == ip_family ? ua_session->get_outbound_ip6() : ua_session->get_outbound_ip4();
if (outbound_ip.isValid()) {
opt.addr_binding = NetVCOptions::INTF_ADDR;
- opt.local_ip = outbound_ip;
+ opt.local_ip = outbound_ip;
} else if (ua_session->is_outbound_transparent()) {
opt.addr_binding = NetVCOptions::FOREIGN_ADDR;
- opt.local_ip = t_state.client_info.src_addr;
+ opt.local_ip = t_state.client_info.src_addr;
/* If the connection is server side transparent, we can bind to the
port that the client chose instead of randomly assigning one at
the proxy. This is controlled by the 'use_client_source_port'
@@ -4942,7 +4942,7 @@ HttpSM::do_http_server_open(bool raw)
if (scheme_to_use == URL_WKSIDX_HTTPS) {
DebugSM("http", "calling sslNetProcessor.connect_re");
- int len = 0;
+ int len = 0;
const char *host = t_state.hdr_info.server_request.host_get(&len);
if (host && len > 0)
opt.set_sni_servername(host, len);
@@ -4980,7 +4980,7 @@ HttpSM::do_http_server_open(bool raw)
if (connect_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = connect_action_handle;
+ pending_action = connect_action_handle;
historical_action = pending_action;
}
@@ -4998,7 +4998,7 @@ HttpSM::do_icp_lookup()
if (icp_lookup_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
- pending_action = icp_lookup_action_handle;
+ pending_action = icp_lookup_action_handle;
historical_action = pending_action;
}
@@ -5042,7 +5042,7 @@ HttpSM::do_api_callout_internal()
cur_hook_id = TS_HTTP_READ_RESPONSE_HDR_HOOK;
break;
case HttpTransact::SM_ACTION_API_SEND_RESPONSE_HDR:
- cur_hook_id = TS_HTTP_SEND_RESPONSE_HDR_HOOK;
+ cur_hook_id = TS_HTTP_SEND_RESPONSE_HDR_HOOK;
milestones[TS_MILESTONE_UA_BEGIN_WRITE] = Thread::get_hrtime();
break;
case HttpTransact::SM_ACTION_API_SM_SHUTDOWN:
@@ -5058,7 +5058,7 @@ HttpSM::do_api_callout_internal()
ink_assert(!"not reached");
}
- cur_hook = NULL;
+ cur_hook = NULL;
cur_hooks = 0;
state_api_callout(0, NULL);
}
@@ -5075,8 +5075,8 @@ HttpSM::do_post_transform_open()
post_transform_info.vc = transformProcessor.open(this, api_hooks.get(TS_HTTP_REQUEST_TRANSFORM_HOOK));
if (post_transform_info.vc) {
// Record the transform VC in our table
- post_transform_info.entry = vc_table.new_entry();
- post_transform_info.entry->vc = post_transform_info.vc;
+ post_transform_info.entry = vc_table.new_entry();
+ post_transform_info.entry->vc = post_transform_info.vc;
post_transform_info.entry->vc_type = HTTP_TRANSFORM_VC;
}
@@ -5098,8 +5098,8 @@ HttpSM::do_transform_open()
transform_info.vc = transformProcessor.open(this, hooks);
// Record the transform VC in our table
- transform_info.entry = vc_table.new_entry();
- transform_info.entry->vc = transform_info.vc;
+ transform_info.entry = vc_table.new_entry();
+ transform_info.entry->vc = transform_info.vc;
transform_info.entry->vc_type = HTTP_TRANSFORM_VC;
} else {
transform_info.vc = NULL;
@@ -5234,7 +5234,7 @@ HttpSM::release_server_session(bool serve_from_cache)
ink_assert(server_entry->vc == server_session);
server_entry->in_tunnel = true;
vc_table.cleanup_entry(server_entry);
- server_entry = NULL;
+ server_entry = NULL;
server_session = NULL;
}
@@ -5263,7 +5263,7 @@ HttpSM::handle_post_failure()
if (false == t_state.redirect_info.redirect_in_process) {
ua_entry->read_vio = ua_session->do_io_read(this, 0, NULL);
}
- ua_entry->in_tunnel = false;
+ ua_entry->in_tunnel = false;
server_entry->in_tunnel = false;
// disable redirection in case we got a partial response and then EOS, because the buffer might not
@@ -5272,7 +5272,7 @@ HttpSM::handle_post_failure()
tunnel.deallocate_redirect_postdata_buffers();
// Don't even think about doing keep-alive after this debacle
- t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
+ t_state.client_info.keep_alive = HTTP_NO_KEEPALIVE;
t_state.current.server->keep_alive = HTTP_NO_KEEPALIVE;
if (server_buffer_reader->read_avail() > 0) {
@@ -5285,8 +5285,8 @@ HttpSM::handle_post_failure()
tunnel.reset();
// Server died
vc_table.cleanup_entry(server_entry);
- server_entry = NULL;
- server_session = NULL;
+ server_entry = NULL;
+ server_session = NULL;
t_state.current.state = HttpTransact::CONNECTION_CLOSED;
call_transact_and_set_next_state(HttpTransact::HandleResponse);
}
@@ -5325,8 +5325,8 @@ HttpSM::handle_http_server_open()
vc->options.packet_mark != t_state.txn_conf->sock_packet_mark_out ||
vc->options.packet_tos != t_state.txn_conf->sock_packet_tos_out)) {
vc->options.sockopt_flags = t_state.txn_conf->sock_option_flag_out;
- vc->options.packet_mark = t_state.txn_conf->sock_packet_mark_out;
- vc->options.packet_tos = t_state.txn_conf->sock_packet_tos_out;
+ vc->options.packet_mark = t_state.txn_conf->sock_packet_mark_out;
+ vc->options.packet_tos = t_state.txn_conf->sock_packet_tos_out;
vc->apply_options();
}
}
@@ -5388,10 +5388,10 @@ HttpSM::handle_server_setup_error(int event, void *data)
ink_assert(ua_entry->vc == ua_producer->vc);
ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
- ua_entry->read_vio = ua_producer->vc->do_io_read(this, INT64_MAX, c->producer->read_buffer);
+ ua_entry->read_vio = ua_producer->vc->do_io_read(this, INT64_MAX, c->producer->read_buffer);
ua_producer->vc->do_io_shutdown(IO_SHUTDOWN_READ);
- ua_producer->alive = false;
+ ua_producer->alive = false;
ua_producer->handler_state = HTTP_SM_POST_SERVER_FAIL;
tunnel.handleEvent(VC_EVENT_ERROR, c->write_vio);
}
@@ -5448,7 +5448,7 @@ HttpSM::handle_server_setup_error(int event, void *data)
// Closedown server connection and deallocate buffers
ink_assert(server_entry->in_tunnel == false);
vc_table.cleanup_entry(server_entry);
- server_entry = NULL;
+ server_entry = NULL;
server_session = NULL;
// if we are waiting on a plugin callout for
@@ -5484,9 +5484,9 @@ HttpSM::setup_transform_to_server_transfer()
ink_assert(post_transform_info.vc != NULL);
ink_assert(post_transform_info.entry->vc == post_transform_info.vc);
- int64_t nbytes = t_state.hdr_info.transform_request_cl;
- int64_t alloc_index = buffer_size_to_index(nbytes);
- MIOBuffer *post_buffer = new_MIOBuffer(alloc_index);
+ int64_t nbytes = t_state.hdr_info.transform_request_cl;
+ int64_t alloc_index = buffer_size_to_index(nbytes);
+ MIOBuffer *post_buffer = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = post_buffer->alloc_reader();
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::tunnel_handler_post);
@@ -5510,7 +5510,7 @@ void
HttpSM::do_drain_request_body()
{
int64_t post_bytes = t_state.hdr_info.request_content_length;
- int64_t avail = ua_buffer_reader->read_avail();
+ int64_t avail = ua_buffer_reader->read_avail();
int64_t act_on = (avail < post_bytes) ? avail : post_bytes;
@@ -5521,7 +5521,7 @@ HttpSM::do_drain_request_body()
if (client_request_body_bytes < post_bytes) {
ua_buffer_reader->mbuf->size_index = buffer_size_to_index(t_state.hdr_info.request_content_length);
- ua_entry->vc_handler = &HttpSM::state_drain_client_request_body;
+ ua_entry->vc_handler = &HttpSM::state_drain_client_request_body;
ua_entry->read_vio = ua_entry->vc->do_io_read(this, post_bytes - client_request_body_bytes, ua_buffer_reader->mbuf);
} else {
call_transact_and_set_next_state(NULL);
@@ -5532,7 +5532,7 @@ HttpSM::do_drain_request_body()
void
HttpSM::do_setup_post_tunnel(HttpVC_t to_vc_type)
{
- bool chunked = (t_state.client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING);
+ bool chunked = (t_state.client_info.transfer_encoding == HttpTransact::CHUNKED_ENCODING);
bool post_redirect = false;
HttpTunnelProducer *p = NULL;
@@ -5545,8 +5545,8 @@ HttpSM::do_setup_post_tunnel(HttpVC_t to_vc_type)
// copy the post data into a new producer buffer for static producer
tunnel.postbuf->postdata_producer_buffer->write(tunnel.postbuf->postdata_copy_buffer_start);
int64_t post_bytes = tunnel.postbuf->postdata_producer_reader->read_avail();
- transfered_bytes = post_bytes;
- p = tunnel.add_producer(HTTP_TUNNEL_STATIC_PRODUCER, post_bytes, tunnel.postbuf->postdata_producer_reader,
+ transfered_bytes = post_bytes;
+ p = tunnel.add_producer(HTTP_TUNNEL_STATIC_PRODUCER, post_bytes, tunnel.postbuf->postdata_producer_reader,
(HttpProducerHandler)NULL, HT_STATIC, "redirect static agent post");
// the tunnel has taken over the buffer and will free it
tunnel.postbuf->postdata_producer_buffer = NULL;
@@ -5562,9 +5562,9 @@ HttpSM::do_setup_post_tunnel(HttpVC_t to_vc_type)
} else {
alloc_index = buffer_size_to_index(t_state.hdr_info.request_content_length);
}
- MIOBuffer *post_buffer = new_MIOBuffer(alloc_index);
+ MIOBuffer *post_buffer = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = post_buffer->alloc_reader();
- int64_t post_bytes = chunked ? INT64_MAX : t_state.hdr_info.request_content_length;
+ int64_t post_bytes = chunked ? INT64_MAX : t_state.hdr_info.request_content_length;
// Note: Many browsers, Netscape and IE included send two extra
// bytes (CRLF) at the end of the post. We just ignore those
@@ -5721,7 +5721,7 @@ HttpSM::perform_cache_write_action()
// use the cache writevc to cache the transformed copy
ink_assert(transform_cache_sm.cache_write_vc == NULL);
transform_cache_sm.cache_write_vc = cache_sm.cache_write_vc;
- cache_sm.cache_write_vc = NULL;
+ cache_sm.cache_write_vc = NULL;
}
break;
@@ -5758,8 +5758,8 @@ HttpSM::write_header_into_buffer(HTTPHdr *h, MIOBuffer *b)
dumpoffset = 0;
do {
bufindex = 0;
- tmp = dumpoffset;
- block = b->get_current_block();
+ tmp = dumpoffset;
+ block = b->get_current_block();
ink_assert(block->write_avail() > 0);
done = h->print(block->start(), block->write_avail(), &bufindex, &tmp);
dumpoffset += bufindex;
@@ -5779,7 +5779,7 @@ HttpSM::attach_server_session(HttpServerSession *s)
hsm_release_assert(server_session == NULL);
hsm_release_assert(server_entry == NULL);
hsm_release_assert(s->state == HSS_ACTIVE);
- server_session = s;
+ server_session = s;
server_transact_count = server_session->transact_count++;
// Propagate the per client IP debugging
if (ua_session)
@@ -5790,7 +5790,7 @@ HttpSM::attach_server_session(HttpServerSession *s)
if (ua_session) {
NetVConnection *server_vc = s->get_netvc();
- NetVConnection *ua_vc = ua_session->get_netvc();
+ NetVConnection *ua_vc = ua_session->get_netvc();
ink_release_assert(server_vc->thread == ua_vc->thread);
}
@@ -5802,24 +5802,24 @@ HttpSM::attach_server_session(HttpServerSession *s)
++s->server_trans_stat;
// Record the VC in our table
- server_entry = vc_table.new_entry();
- server_entry->vc = server_session;
- server_entry->vc_type = HTTP_SERVER_VC;
+ server_entry = vc_table.new_entry();
+ server_entry->vc = server_session;
+ server_entry->vc_type = HTTP_SERVER_VC;
server_entry->vc_handler = &HttpSM::state_send_server_request_header;
// es - is this a concern here in HttpSM? Does it belong somewhere else?
// Get server and client connections
UnixNetVConnection *server_vc = dynamic_cast<UnixNetVConnection *>(server_session->get_netvc());
UnixNetVConnection *client_vc = (UnixNetVConnection *)(ua_session->get_netvc());
- SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(client_vc);
- bool associated_connection = false;
+ SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection *>(client_vc);
+ bool associated_connection = false;
if (server_vc) { // if server_vc isn't a PluginVC
if (ssl_vc) { // if incoming connection is SSL
bool client_trace = ssl_vc->getSSLTrace();
if (client_trace) {
// get remote address and port to mark corresponding traces
const sockaddr *remote_addr = ssl_vc->get_remote_addr();
- uint16_t remote_port = ssl_vc->get_remote_port();
+ uint16_t remote_port = ssl_vc->get_remote_port();
server_vc->setOriginTrace(true);
server_vc->setOriginTraceAddr(remote_addr);
server_vc->setOriginTracePort(remote_port);
@@ -5914,7 +5914,7 @@ HttpSM::setup_server_send_request()
hsm_release_assert(server_entry->vc == server_session);
// Send the request header
- server_entry->vc_handler = &HttpSM::state_send_server_request_header;
+ server_entry->vc_handler = &HttpSM::state_send_server_request_header;
server_entry->write_buffer = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
if (t_state.api_server_request_body_set) {
@@ -5939,7 +5939,7 @@ HttpSM::setup_server_send_request()
}
milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] = Thread::get_hrtime();
- server_entry->write_vio = server_entry->vc->do_io_write(this, hdr_length, buf_start);
+ server_entry->write_vio = server_entry->vc->do_io_write(this, hdr_length, buf_start);
}
void
@@ -5959,7 +5959,7 @@ HttpSM::setup_server_read_response_header()
// server, setup to read the response header
server_entry->vc_handler = &HttpSM::state_read_server_response_header;
- t_state.current.state = HttpTransact::STATE_UNDEFINED;
+ t_state.current.state = HttpTransact::STATE_UNDEFINED;
t_state.current.server->state = HttpTransact::STATE_UNDEFINED;
// Note: we must use destroy() here since clear()
@@ -5967,7 +5967,7 @@ HttpSM::setup_server_read_response_header()
t_state.hdr_info.server_response.destroy();
t_state.hdr_info.server_response.create(HTTP_TYPE_RESPONSE);
http_parser_clear(&http_parser);
- server_response_hdr_bytes = 0;
+ server_response_hdr_bytes = 0;
milestones[TS_MILESTONE_SERVER_READ_HEADER_DONE] = 0;
// We already done the READ when we setup the connection to
@@ -5994,7 +5994,7 @@ HttpSM::setup_cache_read_transfer()
ink_assert(cache_sm.cache_read_vc != NULL);
- doc_size = t_state.cache_info.object_read->object_size_get();
+ doc_size = t_state.cache_info.object_read->object_size_get();
alloc_index = buffer_size_to_index(doc_size + index_to_buffer_size(HTTP_HEADER_BUFFER_SIZE_INDEX));
#ifndef USE_NEW_EMPTY_MIOBUFFER
@@ -6011,7 +6011,7 @@ HttpSM::setup_cache_read_transfer()
// Now dump the header into the buffer
ink_assert(t_state.hdr_info.client_response.status_get() != HTTP_STATUS_NOT_MODIFIED);
client_response_hdr_bytes = hdr_size = write_response_header_into_buffer(&t_state.hdr_info.client_response, buf);
- cache_response_hdr_bytes = client_response_hdr_bytes;
+ cache_response_hdr_bytes = client_response_hdr_bytes;
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::tunnel_handler);
@@ -6028,7 +6028,7 @@ HttpSM::setup_cache_read_transfer()
tunnel.set_producer_chunking_action(p, client_response_hdr_bytes, TCA_CHUNK_CONTENT);
tunnel.set_producer_chunking_size(p, t_state.txn_conf->http_chunking_size);
}
- ua_entry->in_tunnel = true;
+ ua_entry->in_tunnel = true;
cache_sm.cache_read_vc = NULL;
return p;
}
@@ -6046,9 +6046,9 @@ HttpSM::setup_cache_transfer_to_transform()
// grab this here
cache_response_hdr_bytes = t_state.hdr_info.cache_response.length_get();
- doc_size = t_state.cache_info.object_read->object_size_get();
- alloc_index = buffer_size_to_index(doc_size);
- MIOBuffer *buf = new_MIOBuffer(alloc_index);
+ doc_size = t_state.cache_info.object_read->object_size_get();
+ alloc_index = buffer_size_to_index(doc_size);
+ MIOBuffer *buf = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = buf->alloc_reader();
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_response_wait_for_transform_read);
@@ -6059,7 +6059,7 @@ HttpSM::setup_cache_transfer_to_transform()
tunnel.add_consumer(transform_info.vc, cache_sm.cache_read_vc, &HttpSM::tunnel_handler_transform_write, HT_TRANSFORM,
"transform write");
transform_info.entry->in_tunnel = true;
- cache_sm.cache_read_vc = NULL;
+ cache_sm.cache_read_vc = NULL;
return p;
}
@@ -6086,7 +6086,7 @@ HttpSM::setup_cache_write_transfer(HttpCacheSM *c_sm, VConnection *source_vc, HT
void
HttpSM::setup_100_continue_transfer()
{
- MIOBuffer *buf = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
+ MIOBuffer *buf = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
IOBufferReader *buf_start = buf->alloc_reader();
// First write the client response header into the buffer
@@ -6137,9 +6137,9 @@ HttpSM::setup_error_transfer()
} else {
DebugSM("http", "[setup_error_transfer] Now closing connection ...");
vc_table.cleanup_entry(ua_entry);
- ua_entry = NULL;
- ua_session = NULL;
- terminate_sm = true;
+ ua_entry = NULL;
+ ua_session = NULL;
+ terminate_sm = true;
t_state.source = HttpTransact::SOURCE_INTERNAL;
}
}
@@ -6188,12 +6188,12 @@ HttpSM::setup_internal_transfer(HttpSMHandler handler_arg)
int64_t buf_size =
index_to_buffer_size(HTTP_HEADER_BUFFER_SIZE_INDEX) + (is_msg_buf_present ? t_state.internal_msg_buffer_size : 0);
- MIOBuffer *buf = new_MIOBuffer(buffer_size_to_index(buf_size));
+ MIOBuffer *buf = new_MIOBuffer(buffer_size_to_index(buf_size));
IOBufferReader *buf_start = buf->alloc_reader();
// First write the client response header into the buffer
client_response_hdr_bytes = write_response_header_into_buffer(&t_state.hdr_info.client_response, buf);
- int64_t nbytes = client_response_hdr_bytes;
+ int64_t nbytes = client_response_hdr_bytes;
// Next append the message onto the MIOBuffer
@@ -6216,7 +6216,7 @@ HttpSM::setup_internal_transfer(HttpSMHandler handler_arg)
// The IOBufferBlock will free the msg buffer when necessary so
// eliminate our pointer to it
- t_state.internal_msg_buffer = NULL;
+ t_state.internal_msg_buffer = NULL;
t_state.internal_msg_buffer_size = 0;
}
@@ -6292,7 +6292,7 @@ HttpSM::server_transfer_init(MIOBuffer *buf, int hdr_size)
// truncate it as we've already decided to trust the content
// length
to_copy = t_state.hdr_info.response_content_length;
- nbytes = t_state.hdr_info.response_content_length + hdr_size;
+ nbytes = t_state.hdr_info.response_content_length + hdr_size;
}
// Next order of business if copy the remaining data from the
@@ -6329,10 +6329,10 @@ HttpSM::setup_server_transfer_to_transform()
int64_t alloc_index;
int64_t nbytes;
- alloc_index = find_server_buffer_size();
- MIOBuffer *buf = new_MIOBuffer(alloc_index);
+ alloc_index = find_server_buffer_size();
+ MIOBuffer *buf = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = buf->alloc_reader();
- nbytes = server_transfer_init(buf, 0);
+ nbytes = server_transfer_init(buf, 0);
if (t_state.negative_caching && t_state.hdr_info.server_response.status_get() == HTTP_STATUS_NO_CONTENT) {
int s = sizeof("No Content") - 1;
@@ -6348,7 +6348,7 @@ HttpSM::setup_server_transfer_to_transform()
tunnel.add_consumer(transform_info.vc, server_entry->vc, &HttpSM::tunnel_handler_transform_write, HT_TRANSFORM,
"transform write");
- server_entry->in_tunnel = true;
+ server_entry->in_tunnel = true;
transform_info.entry->in_tunnel = true;
if (t_state.current.server->transfer_encoding == HttpTransact::CHUNKED_ENCODING) {
@@ -6365,8 +6365,8 @@ HttpSM::setup_transfer_from_transform()
int64_t alloc_index = find_server_buffer_size();
// TODO change this call to new_empty_MIOBuffer()
- MIOBuffer *buf = new_MIOBuffer(alloc_index);
- buf->water_mark = (int)t_state.txn_conf->default_buffer_water_mark;
+ MIOBuffer *buf = new_MIOBuffer(alloc_index);
+ buf->water_mark = (int)t_state.txn_conf->default_buffer_water_mark;
IOBufferReader *buf_start = buf->alloc_reader();
HttpTunnelConsumer *c = tunnel.get_consumer(transform_info.vc);
@@ -6387,7 +6387,7 @@ HttpSM::setup_transfer_from_transform()
tunnel.add_consumer(ua_entry->vc, transform_info.vc, &HttpSM::tunnel_handler_ua, HT_HTTP_CLIENT, "user agent");
transform_info.entry->in_tunnel = true;
- ua_entry->in_tunnel = true;
+ ua_entry->in_tunnel = true;
this->setup_plugin_agents(p);
@@ -6402,8 +6402,8 @@ HttpSM::setup_transfer_from_transform()
HttpTunnelProducer *
HttpSM::setup_transfer_from_transform_to_cache_only()
{
- int64_t alloc_index = find_server_buffer_size();
- MIOBuffer *buf = new_MIOBuffer(alloc_index);
+ int64_t alloc_index = find_server_buffer_size();
+ MIOBuffer *buf = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = buf->alloc_reader();
HttpTunnelConsumer *c = tunnel.get_consumer(transform_info.vc);
@@ -6433,8 +6433,8 @@ HttpSM::setup_server_transfer_to_cache_only()
int64_t alloc_index;
int64_t nbytes;
- alloc_index = find_server_buffer_size();
- MIOBuffer *buf = new_MIOBuffer(alloc_index);
+ alloc_index = find_server_buffer_size();
+ MIOBuffer *buf = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = buf->alloc_reader();
action = (t_state.current.server && t_state.current.server->transfer_encoding == HttpTransact::CHUNKED_ENCODING) ?
@@ -6470,7 +6470,7 @@ HttpSM::setup_server_transfer()
MIOBuffer *buf = new_empty_MIOBuffer(alloc_index);
buf->append_block(HTTP_HEADER_BUFFER_SIZE_INDEX);
#endif
- buf->water_mark = (int)t_state.txn_conf->default_buffer_water_mark;
+ buf->water_mark = (int)t_state.txn_conf->default_buffer_water_mark;
IOBufferReader *buf_start = buf->alloc_reader();
// we need to know if we are going to chunk the response or not
@@ -6512,7 +6512,7 @@ HttpSM::setup_server_transfer()
tunnel.add_consumer(ua_entry->vc, server_entry->vc, &HttpSM::tunnel_handler_ua, HT_HTTP_CLIENT, "user agent");
- ua_entry->in_tunnel = true;
+ ua_entry->in_tunnel = true;
server_entry->in_tunnel = true;
this->setup_plugin_agents(p);
@@ -6549,8 +6549,8 @@ HttpSM::setup_push_transfer_to_cache()
{
int64_t nbytes, alloc_index;
- alloc_index = find_http_resp_buffer_size(t_state.hdr_info.request_content_length);
- MIOBuffer *buf = new_MIOBuffer(alloc_index);
+ alloc_index = find_http_resp_buffer_size(t_state.hdr_info.request_content_length);
+ MIOBuffer *buf = new_MIOBuffer(alloc_index);
IOBufferReader *buf_start = buf->alloc_reader();
ink_release_assert(t_state.hdr_info.request_content_length != HTTP_UNDEFINED_CL);
@@ -6594,9 +6594,9 @@ HttpSM::setup_blind_tunnel(bool send_response_hdr)
HttpTunnelProducer *p_ua;
HttpTunnelProducer *p_os;
MIOBuffer *from_ua_buf = new_MIOBuffer(BUFFER_SIZE_INDEX_32K);
- MIOBuffer *to_ua_buf = new_MIOBuffer(BUFFER_SIZE_INDEX_32K);
+ MIOBuffer *to_ua_buf = new_MIOBuffer(BUFFER_SIZE_INDEX_32K);
IOBufferReader *r_from = from_ua_buf->alloc_reader();
- IOBufferReader *r_to = to_ua_buf->alloc_reader();
+ IOBufferReader *r_to = to_ua_buf->alloc_reader();
milestones[TS_MILESTONE_SERVER_BEGIN_WRITE] = Thread::get_hrtime();
if (send_response_hdr) {
@@ -6633,7 +6633,7 @@ HttpSM::setup_blind_tunnel(bool send_response_hdr)
tunnel.chain(c_os, p_os);
tunnel.chain(c_ua, p_ua);
- ua_entry->in_tunnel = true;
+ ua_entry->in_tunnel = true;
server_entry->in_tunnel = true;
tunnel.tunnel_run();
@@ -6648,7 +6648,7 @@ HttpSM::setup_blind_tunnel(bool send_response_hdr)
void
HttpSM::setup_plugin_agents(HttpTunnelProducer *p)
{
- APIHook *agent = txn_hook_get(TS_HTTP_RESPONSE_CLIENT_HOOK);
+ APIHook *agent = txn_hook_get(TS_HTTP_RESPONSE_CLIENT_HOOK);
has_active_plugin_agents = agent != 0;
while (agent) {
INKVConnInternal *contp = static_cast<INKVConnInternal *>(agent->m_cont);
@@ -6747,13 +6747,13 @@ HttpSM::kill_this()
plugin_tunnel = NULL;
}
- ua_session = NULL;
+ ua_session = NULL;
server_session = NULL;
// So we don't try to nuke the state machine
// if the plugin receives event we must reset
// the terminate_flag
- terminate_sm = false;
+ terminate_sm = false;
t_state.api_next_action = HttpTransact::SM_ACTION_API_SM_SHUTDOWN;
do_api_callout();
}
@@ -6820,7 +6820,7 @@ HttpSM::kill_this()
if (redirect_url != NULL) {
ats_free((void *)redirect_url);
- redirect_url = NULL;
+ redirect_url = NULL;
redirect_url_len = 0;
}
@@ -6906,10 +6906,10 @@ HttpSM::update_stats()
// print slow requests if the threshold is set (> 0) and if we are over the time threshold
if (t_state.txn_conf->slow_log_threshold != 0 && ink_hrtime_from_msec(t_state.txn_conf->slow_log_threshold) < total_time) {
- URL *url = t_state.hdr_info.client_request.url_get();
+ URL *url = t_state.hdr_info.client_request.url_get();
char url_string[256] = "";
- int offset = 0;
- int skip = 0;
+ int offset = 0;
+ int skip = 0;
t_state.hdr_info.client_request.url_print(url_string, sizeof(url_string) - 1, &offset, &skip);
url_string[offset] = 0; // NULL terminate the string
@@ -6918,7 +6918,7 @@ HttpSM::update_stats()
char unique_id_string[128] = "";
// [amc] why do we check the URL to get a MIME field?
if (0 != url && url->valid()) {
- int length = 0;
+ int length = 0;
const char *field = t_state.hdr_info.client_request.value_get(MIME_FIELD_X_ID, MIME_LEN_X_ID, &length);
if (field != NULL) {
ink_strlcpy(unique_id_string, field, sizeof(unique_id_string));
@@ -6926,7 +6926,7 @@ HttpSM::update_stats()
}
// set the fd for the request
- int fd = 0;
+ int fd = 0;
NetVConnection *vc = NULL;
if (ua_session != NULL) {
vc = ua_session->get_netvc();
@@ -7030,10 +7030,10 @@ HttpSM::dump_state_hdr(HTTPHdr *h, const char *s)
{
// Dump the client request if available
if (h->valid()) {
- int l = h->length_get();
+ int l = h->length_get();
char *hdr_buf = (char *)ats_malloc(l + 1);
- int index = 0;
- int offset = 0;
+ int index = 0;
+ int offset = 0;
h->print(hdr_buf, l, &index, &offset);
@@ -7244,7 +7244,7 @@ HttpSM::set_next_state()
if (server_entry) {
ink_assert(server_entry->vc_type == HTTP_SERVER_VC);
vc_table.cleanup_entry(server_entry);
- server_entry = NULL;
+ server_entry = NULL;
server_session = NULL;
} else {
// Now that we have gotten the user agent request, we can cancel
@@ -7406,7 +7406,7 @@ HttpSM::set_next_state()
Action *action_handle = statPagesManager.handle_http(this, &t_state.hdr_info.client_request);
if (action_handle != ACTION_RESULT_DONE) {
- pending_action = action_handle;
+ pending_action = action_handle;
historical_action = pending_action;
}
@@ -7535,7 +7535,7 @@ HttpSM::do_congestion_control_lookup()
Action *congestion_control_action_handle = get_congest_entry(this, &t_state.request_data, &t_state.pCongestionEntry);
if (congestion_control_action_handle != ACTION_RESULT_DONE) {
- pending_action = congestion_control_action_handle;
+ pending_action = congestion_control_action_handle;
historical_action = pending_action;
return false;
}
@@ -7547,8 +7547,8 @@ HttpSM::state_congestion_control_lookup(int event, void *data)
{
STATE_ENTER(&HttpSM::state_congestion_control_lookup, event);
if (event == CONGESTION_EVENT_CONTROL_LOOKUP_DONE) {
- pending_action = NULL;
- t_state.next_action = t_state.congest_saved_next_action;
+ pending_action = NULL;
+ t_state.next_action = t_state.congest_saved_next_action;
t_state.transact_return_point = NULL;
set_next_state();
} else {
@@ -7606,7 +7606,7 @@ HttpSM::do_redirect()
if (redirect_url != NULL) {
redirect_request(redirect_url, redirect_url_len);
ats_free((void *)redirect_url);
- redirect_url = NULL;
+ redirect_url = NULL;
redirect_url_len = 0;
HTTP_INCREMENT_DYN_STAT(http_total_x_redirect_stat);
} else {
@@ -7630,7 +7630,7 @@ HttpSM::redirect_request(const char *redirect_url, const int redirect_len)
DebugSM("http_redirect", "[HttpSM::redirect_request]");
// get a reference to the client request header and client url and check to see if the url is valid
HTTPHdr &clientRequestHeader = t_state.hdr_info.client_request;
- URL &clientUrl = *clientRequestHeader.url_get();
+ URL &clientUrl = *clientRequestHeader.url_get();
if (!clientUrl.valid()) {
return;
}
@@ -7644,7 +7644,7 @@ HttpSM::redirect_request(const char *redirect_url, const int redirect_len)
if (t_state.hdr_info.server_request.valid()) {
char *tmpOrigHost;
- origPort = t_state.hdr_info.server_request.port_get();
+ origPort = t_state.hdr_info.server_request.port_get();
tmpOrigHost = (char *)t_state.hdr_info.server_request.value_get(MIME_FIELD_HOST, MIME_LEN_HOST, &origHost_len);
if (tmpOrigHost) {
@@ -7694,8 +7694,8 @@ HttpSM::redirect_request(const char *redirect_url, const int redirect_len)
t_state.hdr_info.client_response.destroy();
}
- int scheme = t_state.next_hop_scheme;
- int scheme_len = hdrtoken_index_to_length(scheme);
+ int scheme = t_state.next_hop_scheme;
+ int scheme_len = hdrtoken_index_to_length(scheme);
const char *next_hop_scheme = hdrtoken_index_to_wks(scheme);
char scheme_str[scheme_len + 1];
@@ -7710,13 +7710,13 @@ HttpSM::redirect_request(const char *redirect_url, const int redirect_len)
// will do that in handle_api_return under the
// HttpTransact::SM_ACTION_REDIRECT_READ state
t_state.parent_result.reset();
- t_state.request_sent_time = 0;
- t_state.response_received_time = 0;
+ t_state.request_sent_time = 0;
+ t_state.response_received_time = 0;
t_state.cache_info.write_lock_state = HttpTransact::CACHE_WL_INIT;
- t_state.next_action = HttpTransact::SM_ACTION_REDIRECT_READ;
+ t_state.next_action = HttpTransact::SM_ACTION_REDIRECT_READ;
// we have a new OS and need to have DNS lookup the new OS
t_state.dns_info.lookup_success = false;
- t_state.force_dns = false;
+ t_state.force_dns = false;
if (t_state.txn_conf->cache_http) {
t_state.cache_info.object_read = NULL;
@@ -7775,7 +7775,7 @@ HttpSM::redirect_request(const char *redirect_url, const int redirect_len)
host_len = strlen(origHostNoPort);
if (noPortInHost) {
int redirectSchemeIdx = t_state.next_hop_scheme;
- bool defaultPort = (((redirectSchemeIdx == URL_WKSIDX_HTTP) && (origPort == 80)) ||
+ bool defaultPort = (((redirectSchemeIdx == URL_WKSIDX_HTTP) && (origPort == 80)) ||
((redirectSchemeIdx == URL_WKSIDX_HTTPS) && (origPort == 443)));
if (!defaultPort)
@@ -7824,7 +7824,7 @@ HttpSM::get_http_schedule(int event, void * /* data ATS_UNUSED */)
Ptr<ProxyMutex> plugin_mutex;
if (schedule_cont->mutex) {
plugin_mutex = schedule_cont->mutex;
- plugin_lock = MUTEX_TAKE_TRY_LOCK(schedule_cont->mutex, mutex->thread_holding);
+ plugin_lock = MUTEX_TAKE_TRY_LOCK(schedule_cont->mutex, mutex->thread_holding);
if (!plugin_lock) {
HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::get_http_schedule);
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index 93b957c..4c066e6 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -144,20 +144,20 @@ struct HttpTransformInfo {
enum {
HTTP_SM_MAGIC_ALIVE = 0x0000FEED,
- HTTP_SM_MAGIC_DEAD = 0xDEADFEED,
+ HTTP_SM_MAGIC_DEAD = 0xDEADFEED,
};
enum {
- HTTP_SM_POST_UNKNOWN = 0,
- HTTP_SM_POST_UA_FAIL = 1,
+ HTTP_SM_POST_UNKNOWN = 0,
+ HTTP_SM_POST_UA_FAIL = 1,
HTTP_SM_POST_SERVER_FAIL = 2,
- HTTP_SM_POST_SUCCESS = 3,
+ HTTP_SM_POST_SUCCESS = 3,
};
enum {
- HTTP_SM_TRANSFORM_OPEN = 0,
+ HTTP_SM_TRANSFORM_OPEN = 0,
HTTP_SM_TRANSFORM_CLOSED = 1,
- HTTP_SM_TRANSFORM_FAIL = 2,
+ HTTP_SM_TRANSFORM_FAIL = 2,
};
enum HttpApiState_t {
@@ -604,9 +604,9 @@ HttpSM::write_response_header_into_buffer(HTTPHdr *h, MIOBuffer *b)
inline void
HttpSM::add_history_entry(const char *fileline, int event, int reentrant)
{
- int pos = history_pos++ % HISTORY_SIZE;
- history[pos].fileline = fileline;
- history[pos].event = (unsigned short)event;
+ int pos = history_pos++ % HISTORY_SIZE;
+ history[pos].fileline = fileline;
+ history[pos].event = (unsigned short)event;
history[pos].reentrancy = (short)reentrant;
}
@@ -643,11 +643,11 @@ HttpSM::add_cache_sm()
second_cache_sm = new HttpCacheSM;
second_cache_sm->init(this, mutex);
if (t_state.cache_info.object_read != NULL) {
- second_cache_sm->cache_read_vc = cache_sm.cache_read_vc;
- cache_sm.cache_read_vc = NULL;
- second_cache_sm->read_locked = cache_sm.read_locked;
+ second_cache_sm->cache_read_vc = cache_sm.cache_read_vc;
+ cache_sm.cache_read_vc = NULL;
+ second_cache_sm->read_locked = cache_sm.read_locked;
t_state.cache_info.second_object_read = t_state.cache_info.object_read;
- t_state.cache_info.object_read = NULL;
+ t_state.cache_info.object_read = NULL;
}
}
}
diff --git a/proxy/http/HttpServerSession.h b/proxy/http/HttpServerSession.h
index 129c61c..b2625fc 100644
--- a/proxy/http/HttpServerSession.h
+++ b/proxy/http/HttpServerSession.h
@@ -62,7 +62,7 @@ enum HSS_State {
enum {
HTTP_SS_MAGIC_ALIVE = 0x0123FEED,
- HTTP_SS_MAGIC_DEAD = 0xDEADFEED,
+ HTTP_SS_MAGIC_DEAD = 0xDEADFEED,
};
class HttpServerSession : public VConnection
@@ -99,7 +99,7 @@ public:
ink_assert(buf_reader != NULL);
read_buffer->dealloc_all_readers();
read_buffer->_writer = NULL;
- buf_reader = read_buffer->alloc_reader();
+ buf_reader = read_buffer->alloc_reader();
}
IOBufferReader *
diff --git a/proxy/http/HttpSessionAccept.cc b/proxy/http/HttpSessionAccept.cc
index ba5a500..2030b52 100644
--- a/proxy/http/HttpSessionAccept.cc
+++ b/proxy/http/HttpSessionAccept.cc
@@ -30,7 +30,7 @@
void
HttpSessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferReader *reader)
{
- sockaddr const *client_ip = netvc->get_remote_addr();
+ sockaddr const *client_ip = netvc->get_remote_addr();
const AclRecord *acl_record = NULL;
ip_port_text_buffer ipb;
@@ -63,13 +63,13 @@ HttpSessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferReade
Http1ClientSession *new_session = THREAD_ALLOC_INIT(http1ClientSessionAllocator, this_ethread());
// copy over session related data.
- new_session->f_outbound_transparent = f_outbound_transparent;
+ new_session->f_outbound_transparent = f_outbound_transparent;
new_session->f_transparent_passthrough = f_transparent_passthrough;
- new_session->outbound_ip4 = outbound_ip4;
- new_session->outbound_ip6 = outbound_ip6;
- new_session->outbound_port = outbound_port;
- new_session->host_res_style = ats_host_res_from(client_ip->sa_family, host_res_preference);
- new_session->acl_record = acl_record;
+ new_session->outbound_ip4 = outbound_ip4;
+ new_session->outbound_ip6 = outbound_ip6;
+ new_session->outbound_port = outbound_port;
+ new_session->host_res_style = ats_host_res_from(client_ip->sa_family, host_res_preference);
+ new_session->acl_record = acl_record;
new_session->new_connection(netvc, iobuf, reader, backdoor);
diff --git a/proxy/http/HttpSessionManager.cc b/proxy/http/HttpSessionManager.cc
index 004beaa..7129586 100644
--- a/proxy/http/HttpSessionManager.cc
+++ b/proxy/http/HttpSessionManager.cc
@@ -82,7 +82,7 @@ ServerSessionPool::acquireSession(sockaddr const *addr, INK_MD5 const &hostname_
if (TS_SERVER_SESSION_SHARING_MATCH_HOST == match_style) {
// This is broken out because only in this case do we check the host hash first.
HostHashTable::Location loc = m_host_pool.find(hostname_hash);
- in_port_t port = ats_ip_port_cast(addr);
+ in_port_t port = ats_ip_port_cast(addr);
while (loc && port != ats_ip_port_cast(loc->server_ip))
++loc; // scan for matching port.
if (loc) {
@@ -140,7 +140,7 @@ int
ServerSessionPool::eventHandler(int event, void *data)
{
NetVConnection *net_vc = NULL;
- HttpServerSession *s = NULL;
+ HttpServerSession *s = NULL;
switch (event) {
case VC_EVENT_READ_READY:
@@ -159,9 +159,9 @@ ServerSessionPool::eventHandler(int event, void *data)
return 0;
}
- sockaddr const *addr = net_vc->get_remote_addr();
+ sockaddr const *addr = net_vc->get_remote_addr();
HttpConfigParams *http_config_params = HttpConfig::acquire();
- bool found = false;
+ bool found = false;
for (ServerSessionPool::IPHashTable::Location lh = m_ip_pool.find(addr); lh; ++lh) {
if ((s = lh)->get_netvc() == net_vc) {
@@ -277,7 +277,7 @@ HttpSessionManager::acquire_session(Continuation * /* cont ATS_UNUSED */, sockad
// client session
{
// Now check to see if we have a connection in our shared connection pool
- EThread *ethread = this_ethread();
+ EThread *ethread = this_ethread();
ProxyMutex *pool_mutex = (TS_SERVER_SESSION_SHARING_POOL_THREAD == sm->t_state.http_config_param->server_session_sharing_pool) ?
ethread->server_session_pool->mutex :
m_g_pool->mutex;
@@ -303,7 +303,7 @@ HttpSessionManager::acquire_session(Continuation * /* cont ATS_UNUSED */, sockad
// Close out to_return, we were't able to get a connection
to_return->do_io_close();
to_return = NULL;
- retval = HSM_NOT_FOUND;
+ retval = HSM_NOT_FOUND;
} else {
// Keep things from timing out on us
new_vc->set_inactivity_timeout(new_vc->get_inactivity_timeout());
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index c4d10f5..62954c6 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -49,14 +49,14 @@
static char range_type[] = "multipart/byteranges; boundary=RANGE_SEPARATOR";
#define RANGE_NUMBERS_LENGTH 60
-#define TRANSACT_REMEMBER(_s, _e, _d) \
- { \
- HttpSM *sm = (_s)->state_machine; \
- sm->history[sm->history_pos % HISTORY_SIZE].file = __FILE__; \
- sm->history[sm->history_pos % HISTORY_SIZE].line = __LINE__; \
- sm->history[sm->history_pos % HISTORY_SIZE].event = _e; \
- sm->history[sm->history_pos % HISTORY_SIZE].data = (void *)_d; \
- sm->history_pos += 1; \
+#define TRANSACT_REMEMBER(_s, _e, _d) \
+ { \
+ HttpSM *sm = (_s)->state_machine; \
+ sm->history[sm->history_pos % HISTORY_SIZE].file = __FILE__; \
+ sm->history[sm->history_pos % HISTORY_SIZE].line = __LINE__; \
+ sm->history[sm->history_pos % HISTORY_SIZE].event = _e; \
+ sm->history[sm->history_pos % HISTORY_SIZE].data = (void *)_d; \
+ sm->history_pos += 1; \
}
#define DebugTxn(tag, ...) DebugSpecific((s->state_machine->debug_on), tag, __VA_ARGS__)
@@ -82,7 +82,7 @@ simple_or_unavailable_server_retry(HttpTransact::State *s)
server_response == HTTP_STATUS_NOT_FOUND) {
DebugTxn("parent_select", "RECEIVED A SIMPLE RETRY RESPONSE");
if (s->current.simple_retry_attempts < s->parent_params->numParents(&s->parent_result)) {
- s->current.state = HttpTransact::PARENT_ORIGIN_RETRY;
+ s->current.state = HttpTransact::PARENT_ORIGIN_RETRY;
s->current.retry_type = HttpTransact::PARENT_ORIGIN_SIMPLE_RETRY;
return;
} else {
@@ -96,7 +96,7 @@ simple_or_unavailable_server_retry(HttpTransact::State *s)
s->parent_result.response_is_retryable(server_response)) {
DebugTxn("parent_select", "RECEIVED A PARENT_ORIGIN_UNAVAILABLE_SERVER_RETRY RESPONSE");
if (s->current.unavailable_server_retry_attempts < s->parent_params->numParents(&s->parent_result)) {
- s->current.state = HttpTransact::PARENT_ORIGIN_RETRY;
+ s->current.state = HttpTransact::PARENT_ORIGIN_RETRY;
s->current.retry_type = HttpTransact::PARENT_ORIGIN_UNAVAILABLE_SERVER_RETRY;
return;
} else {
@@ -149,7 +149,7 @@ update_cache_control_information_from_config(HttpTransact::State *s)
HttpTransact::does_client_request_permit_dns_caching(&s->cache_control, &s->hdr_info.client_request);
if (s->client_info.http_version == HTTPVersion(0, 9)) {
- s->cache_info.directives.does_client_permit_lookup = false;
+ s->cache_info.directives.does_client_permit_lookup = false;
s->cache_info.directives.does_client_permit_storing = false;
}
@@ -184,16 +184,16 @@ update_current_info(HttpTransact::CurrentInfo *into, HttpTransact::ConnectionAtt
int attempts)
{
into->request_to = who;
- into->server = from;
- into->attempts = attempts;
+ into->server = from;
+ into->attempts = attempts;
}
inline static void
update_dns_info(HttpTransact::DNSLookupInfo *dns, HttpTransact::CurrentInfo *from, int attempts, Arena * /* arena ATS_UNUSED */)
{
- dns->looking_up = from->request_to;
+ dns->looking_up = from->request_to;
dns->lookup_name = from->server->name;
- dns->attempts = attempts;
+ dns->attempts = attempts;
}
inline static HTTPHdr *
@@ -338,12 +338,12 @@ inline static bool
do_cookies_prevent_caching(int cookies_conf, HTTPHdr *request, HTTPHdr *response, HTTPHdr *cached_request = NULL)
{
enum CookiesConfig {
- COOKIES_CACHE_NONE = 0, // do not cache any responses to cookies
- COOKIES_CACHE_ALL = 1, // cache for any content-type (ignore cookies)
- COOKIES_CACHE_IMAGES = 2, // cache only for image types
- COOKIES_CACHE_ALL_BUT_TEXT = 3, // cache for all but text content-types
- COOKIES_CACHE_ALL_BUT_TEXT_EXT = 4 // cache for all but text content-types except with OS response
- // without "Set-Cookie" or with "Cache-Control: public"
+ COOKIES_CACHE_NONE = 0, // do not cache any responses to cookies
+ COOKIES_CACHE_ALL = 1, // cache for any content-type (ignore cookies)
+ COOKIES_CACHE_IMAGES = 2, // cache only for image types
+ COOKIES_CACHE_ALL_BUT_TEXT = 3, // cache for all but text content-types
+ COOKIES_CACHE_ALL_BUT_TEXT_EXT = 4 // cache for all but text content-types except with OS response
+ // without "Set-Cookie" or with "Cache-Control: public"
};
const char *content_type = NULL;
@@ -488,7 +488,7 @@ how_to_open_connection(HttpTransact::State *s)
if (/*outgoing_version != HTTPVersion(0,9) && */
!s->hdr_info.server_request.presence(MIME_PRESENCE_HOST)) {
URL *url = s->hdr_info.server_request.url_get();
- host = url->host_get(&host_len);
+ host = url->host_get(&host_len);
// Add a ':port' to the HOST header if the request is not going
// to the default port.
int port = url->port_get();
@@ -517,7 +517,7 @@ how_to_open_connection(HttpTransact::State *s)
DebugTxn("cdn", "Host Hdr: %s", d_hst);
ats_free(d_url);
}
- s->cdn_remap_complete = true; // It doesn't matter if there was an actual remap or not
+ s->cdn_remap_complete = true; // It doesn't matter if there was an actual remap or not
s->transact_return_point = HttpTransact::OSDNSLookup;
ink_assert(s->next_action);
ink_assert(s->cdn_saved_next_action);
@@ -600,7 +600,7 @@ HttpTransact::HandleBlindTunnel(State *s)
// Do request_url_remap only if url_remap_mode != URL_REMAP_FOR_OS.
bool url_remap_success = false;
- char *remap_redirect = NULL;
+ char *remap_redirect = NULL;
if (s->transparent_passthrough) {
url_remap_success = true;
@@ -645,9 +645,9 @@ HttpTransact::perform_accept_encoding_filtering(State *s)
MIMEField *usragent_field;
char tmp_ua_buf[1024], *c;
char const *u_agent = NULL;
- int u_agent_len = 0;
- bool retcode = false;
- bool ua_match = false;
+ int u_agent_len = 0;
+ bool retcode = false;
+ bool ua_match = false;
client_request = &s->hdr_info.client_request;
@@ -742,11 +742,11 @@ HttpTransact::StartRemapRequest(State *s)
**/
HTTPHdr *incoming_request = &s->hdr_info.client_request;
- URL *url = incoming_request->url_get();
+ URL *url = incoming_request->url_get();
int host_len, path_len;
const char *host = url->host_get(&host_len);
const char *path = url->path_get(&path_len);
- const int port = url->port_get();
+ const int port = url->port_get();
const char syntxt[] = "synthetic.txt";
@@ -802,7 +802,7 @@ HttpTransact::EndRemapRequest(State *s)
DebugTxn("http_trans", "START HttpTransact::EndRemapRequest");
HTTPHdr *incoming_request = &s->hdr_info.client_request;
- int method = incoming_request->method_get_wksidx();
+ int method = incoming_request->method_get_wksidx();
int host_len;
const char *host = incoming_request->host_get(&host_len);
DebugTxn("http_trans", "EndRemapRequest host is %.*s", host_len, host);
@@ -876,7 +876,7 @@ HttpTransact::EndRemapRequest(State *s)
// * if there was a host, say "not found".
/////////////////////////////////////////////////////////
- char *redirect_url = s->http_config_param->reverse_proxy_no_host_redirect;
+ char *redirect_url = s->http_config_param->reverse_proxy_no_host_redirect;
int redirect_url_len = s->http_config_param->reverse_proxy_no_host_redirect_len;
SET_VIA_STRING(VIA_DETAIL_TUNNEL, VIA_DETAIL_TUNNEL_NO_FORWARD);
@@ -912,7 +912,7 @@ HttpTransact::EndRemapRequest(State *s)
s->req_flavor = REQ_FLAVOR_REVPROXY;
}
}
- s->reverse_proxy = true;
+ s->reverse_proxy = true;
s->server_info.is_transparent = s->state_machine->ua_session ? s->state_machine->ua_session->is_outbound_transparent() : false;
done:
@@ -965,12 +965,12 @@ HttpTransact::handle_upgrade_request(State *s)
return false;
}
- MIMEField *upgrade_hdr = s->hdr_info.client_request.field_find(MIME_FIELD_UPGRADE, MIME_LEN_UPGRADE);
+ MIMEField *upgrade_hdr = s->hdr_info.client_request.field_find(MIME_FIELD_UPGRADE, MIME_LEN_UPGRADE);
MIMEField *connection_hdr = s->hdr_info.client_request.field_find(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION);
StrList connection_hdr_vals;
const char *upgrade_hdr_val = NULL;
- int upgrade_hdr_val_len = 0;
+ int upgrade_hdr_val_len = 0;
if (!upgrade_hdr || !connection_hdr || connection_hdr->value_get_comma_list(&connection_hdr_vals) == 0 ||
(upgrade_hdr_val = upgrade_hdr->value_get(&upgrade_hdr_val_len)) == NULL) {
@@ -1051,7 +1051,7 @@ HttpTransact::handle_websocket_upgrade_pre_remap(State *s)
* We will use this opportunity to set everything up so that during the remap stage we can deal with
* ws:// and wss:// remap rules, and then we will take over again post remap.
*/
- s->is_websocket = true;
+ s->is_websocket = true;
s->post_remap_upgrade_return_point = HttpTransact::handle_websocket_upgrade_post_remap;
/* let's modify the url scheme to be wss or ws, so remapping will happen as expected */
@@ -1091,7 +1091,7 @@ static bool
mimefield_value_equal(MIMEField *field, const char *value, const int value_len)
{
if (field != NULL) {
- int field_value_len = 0;
+ int field_value_len = 0;
const char *field_value = field->value_get(&field_value_len);
if (field_value != NULL) {
if (field_value_len == value_len) {
@@ -1155,10 +1155,10 @@ HttpTransact::ModifyRequest(State *s)
if ((max_forwards != 0) && !s->hdr_info.client_req_is_server_style && s->method != HTTP_WKSIDX_CONNECT) {
MIMEField *host_field = request.field_find(MIME_FIELD_HOST, MIME_LEN_HOST);
- int host_val_len = hostname_len;
+ int host_val_len = hostname_len;
const char **host_val = &hostname;
- int port = url->port_get_raw();
- char *buf = NULL;
+ int port = url->port_get_raw();
+ char *buf = NULL;
// Form the host:port string if not a default port (e.g. 80)
if (port > 0) {
@@ -1309,8 +1309,8 @@ HttpTransact::HandleRequest(State *s)
if (expect != NULL) {
const char *expect_hdr_val = NULL;
- int expect_hdr_val_len = 0;
- expect_hdr_val = expect->value_get(&expect_hdr_val_len);
+ int expect_hdr_val_len = 0;
+ expect_hdr_val = expect->value_get(&expect_hdr_val_len);
if (ptr_len_casecmp(expect_hdr_val, expect_hdr_val_len, HTTP_VALUE_100_CONTINUE, HTTP_LEN_100_CONTINUE) == 0) {
// Let's error out this request.
DebugTxn("http_trans", "Client sent a post expect: 100-continue, sending 405.");
@@ -1325,7 +1325,7 @@ HttpTransact::HandleRequest(State *s)
// Before it's decided to do a cache lookup,
// assume no cache lookup and using proxy (not tunneling)
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->current.mode = GENERIC_PROXY;
+ s->current.mode = GENERIC_PROXY;
// initialize the cache_control structure read from cache.config
update_cache_control_information_from_config(s);
@@ -1441,7 +1441,7 @@ HttpTransact::setup_plugin_request_intercept(State *s)
// We just want to write the request straight to the plugin
if (s->cache_info.action != HttpTransact::CACHE_DO_NO_ACTION) {
s->cache_info.action = HttpTransact::CACHE_DO_NO_ACTION;
- s->current.mode = TUNNELLING_PROXY;
+ s->current.mode = TUNNELLING_PROXY;
HTTP_INCREMENT_DYN_STAT(http_tunnels_stat);
}
// Regardless of the protocol we're gatewaying to
@@ -1454,7 +1454,7 @@ HttpTransact::setup_plugin_request_intercept(State *s)
// Also "fake" the info we'd normally get from
// hostDB
s->server_info.http_version.set(1, 0);
- s->server_info.keep_alive = HTTP_NO_KEEPALIVE;
+ s->server_info.keep_alive = HTTP_NO_KEEPALIVE;
s->host_db_info.app.http_data.http_version = HostDBApplicationInfo::HTTP_VERSION_10;
s->host_db_info.app.http_data.pipeline_max = 1;
s->server_info.dst_addr.setToAnyAddr(AF_INET); // must set an address or we can't set the port.
@@ -1634,7 +1634,7 @@ HttpTransact::ReDNSRoundRobin(State *s)
// Our ReDNS failed so output the DNS failure error message
build_error_response(s, HTTP_STATUS_BAD_GATEWAY, "Cannot find server.", "connect#dns_failed", NULL);
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_SEND_ERROR_CACHE_NOOP;
+ s->next_action = SM_ACTION_SEND_ERROR_CACHE_NOOP;
// s->next_action = PROXY_INTERNAL_CACHE_NOOP;
}
@@ -1707,7 +1707,7 @@ HttpTransact::OSDNSLookup(State *s)
if (DNSLookupInfo::OS_ADDR_TRY_HOSTDB == s->dns_info.os_addr_style) {
// No HostDB data, just keep on with the CTA.
s->dns_info.lookup_success = true;
- s->dns_info.os_addr_style = DNSLookupInfo::OS_ADDR_USE_CLIENT;
+ s->dns_info.os_addr_style = DNSLookupInfo::OS_ADDR_USE_CLIENT;
DebugTxn("http_seq", "[HttpTransact::OSDNSLookup] DNS lookup unsuccessful reverting to force client target address use");
} else {
if (host_name_expansion == EXPANSION_NOT_ALLOWED) {
@@ -1747,7 +1747,7 @@ HttpTransact::OSDNSLookup(State *s)
HostDBInfo *cta = s->host_db_info.rr()->select_next(&s->current.server->dst_addr.sa);
if (cta) {
// found another addr, lock in host DB.
- s->host_db_info = *cta;
+ s->host_db_info = *cta;
s->dns_info.os_addr_style = DNSLookupInfo::OS_ADDR_USE_HOSTDB;
} else {
// nothing else there, continue with CTA.
@@ -1920,21 +1920,21 @@ HttpTransact::DecideCacheLookup(State *s)
// for redirect, we want to skip cache lookup and write into
// the cache directly with the URL before the redirect
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->current.mode = GENERIC_PROXY;
+ s->current.mode = GENERIC_PROXY;
} else {
if (is_request_cache_lookupable(s) && !s->is_upgrade_request) {
s->cache_info.action = CACHE_DO_LOOKUP;
- s->current.mode = GENERIC_PROXY;
+ s->current.mode = GENERIC_PROXY;
} else {
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->current.mode = TUNNELLING_PROXY;
+ s->current.mode = TUNNELLING_PROXY;
HTTP_INCREMENT_DYN_STAT(http_tunnels_stat);
}
}
if (service_transaction_in_proxy_only_mode(s)) {
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->current.mode = TUNNELLING_PROXY;
+ s->current.mode = TUNNELLING_PROXY;
HTTP_INCREMENT_DYN_STAT(http_throttled_proxy_only_stat);
}
// at this point the request is ready to continue down the
@@ -2038,7 +2038,7 @@ HttpTransact::LookupSkipOpenServer(State *s)
build_request(s, &s->hdr_info.client_request, &s->hdr_info.server_request, s->current.server->http_version);
StateMachineAction_t next = how_to_open_connection(s);
- s->next_action = next;
+ s->next_action = next;
if (next == SM_ACTION_ORIGIN_SERVER_OPEN || next == SM_ACTION_ORIGIN_SERVER_RAW_OPEN) {
TRANSACT_RETURN(next, HttpTransact::HandleResponse);
}
@@ -2210,7 +2210,7 @@ HttpTransact::HandleCacheOpenRead(State *s)
//
if (s->cache_lookup_result == CACHE_LOOKUP_DOC_BUSY) {
s->cache_lookup_result = CACHE_LOOKUP_MISS;
- s->cache_info.action = CACHE_DO_NO_ACTION;
+ s->cache_info.action = CACHE_DO_NO_ACTION;
}
} else {
CacheHTTPInfo *obj = s->cache_info.object_read;
@@ -2395,11 +2395,11 @@ HttpTransact::HandleCacheOpenReadHitFreshness(State *s)
if (delete_all_document_alternates_and_return(s, true)) {
DebugTxn("http_trans", "[HandleCacheOpenReadHitFreshness] Delete and return");
s->cache_info.action = CACHE_DO_DELETE;
- s->next_action = HttpTransact::SM_ACTION_INTERNAL_CACHE_DELETE;
+ s->next_action = HttpTransact::SM_ACTION_INTERNAL_CACHE_DELETE;
return;
}
- s->request_sent_time = obj->request_sent_time_get();
+ s->request_sent_time = obj->request_sent_time_get();
s->response_received_time = obj->response_received_time_get();
// There may be clock skew if one of the machines
@@ -2407,7 +2407,7 @@ HttpTransact::HandleCacheOpenReadHitFreshness(State *s)
// for it. this is just to deal with the effects
// of the skew by setting minimum and maximum times
// so that ages are not negative, etc.
- s->request_sent_time = min(s->client_request_time, s->request_sent_time);
+ s->request_sent_time = min(s->client_request_time, s->request_sent_time);
s->response_received_time = min(s->client_request_time, s->response_received_time);
ink_assert(s->request_sent_time <= s->response_received_time);
@@ -2434,7 +2434,7 @@ HttpTransact::HandleCacheOpenReadHitFreshness(State *s)
case FRESHNESS_STALE:
DebugTxn("http_seq", "[HttpTransact::HandleCacheOpenReadHitFreshness] "
"Stale in cache");
- s->cache_lookup_result = HttpTransact::CACHE_LOOKUP_HIT_STALE;
+ s->cache_lookup_result = HttpTransact::CACHE_LOOKUP_HIT_STALE;
s->is_revalidation_necessary = true; // to identify a revalidation occurrence
break;
default:
@@ -2518,7 +2518,7 @@ HttpTransact::need_to_revalidate(State *s)
DebugTxn("http_seq", "[HttpTransact::HandleCacheOpenReadHit] "
"Authentication needed for cache_auth_content");
needs_authenticate = false;
- needs_cache_auth = true;
+ needs_cache_auth = true;
break;
default:
ink_assert(!("AuthenticationNeeded has returned unsupported code."));
@@ -2537,7 +2537,7 @@ HttpTransact::need_to_revalidate(State *s)
bool send_revalidate = ((needs_authenticate == true) || (needs_revalidate == true) || (is_cache_response_returnable(s) == false));
if (needs_cache_auth == true) {
s->www_auth_content = send_revalidate ? CACHE_AUTH_STALE : CACHE_AUTH_FRESH;
- send_revalidate = true;
+ send_revalidate = true;
}
return send_revalidate;
}
@@ -2579,7 +2579,7 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
{
bool needs_revalidate, needs_authenticate = false;
bool needs_cache_auth = false;
- bool server_up = true;
+ bool server_up = true;
CacheHTTPInfo *obj;
if (s->api_update_cached_object == HttpTransact::UPDATE_CACHED_OBJECT_CONTINUE) {
@@ -2613,7 +2613,7 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
DebugTxn("http_seq", "[HttpTransact::HandleCacheOpenReadHit] "
"Authentication needed for cache_auth_content");
needs_authenticate = false;
- needs_cache_auth = true;
+ needs_cache_auth = true;
break;
default:
ink_assert(!("AuthenticationNeeded has returned unsupported code."));
@@ -2653,7 +2653,7 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
if (needs_cache_auth == true) {
SET_VIA_STRING(VIA_DETAIL_CACHE_LOOKUP, VIA_DETAIL_MISS_EXPIRED);
s->www_auth_content = send_revalidate ? CACHE_AUTH_STALE : CACHE_AUTH_FRESH;
- send_revalidate = true;
+ send_revalidate = true;
}
DebugTxn("http_trans", "CacheOpenRead --- needs_auth = %d", needs_authenticate);
@@ -2808,9 +2808,9 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
}
if (s->api_update_cached_object == HttpTransact::UPDATE_CACHED_OBJECT_CONTINUE) {
- s->saved_update_next_action = s->next_action;
+ s->saved_update_next_action = s->next_action;
s->saved_update_cache_action = s->cache_info.action;
- s->next_action = SM_ACTION_CACHE_PREPARE_UPDATE;
+ s->next_action = SM_ACTION_CACHE_PREPARE_UPDATE;
}
}
@@ -2830,16 +2830,16 @@ HttpTransact::HandleCacheOpenReadHit(State *s)
void
HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code)
{
- HTTPHdr *client_request = &s->hdr_info.client_request;
+ HTTPHdr *client_request = &s->hdr_info.client_request;
HTTPHdr *cached_response = NULL;
- HTTPHdr *to_warn = &s->hdr_info.client_response;
+ HTTPHdr *to_warn = &s->hdr_info.client_response;
CacheHTTPInfo *obj;
if (s->api_update_cached_object == HttpTransact::UPDATE_CACHED_OBJECT_CONTINUE) {
obj = &s->cache_info.object_store;
ink_assert(obj->valid());
} else
- obj = s->cache_info.object_read;
+ obj = s->cache_info.object_read;
cached_response = obj->response_get();
// If the client request is conditional, and the cached copy meets
@@ -2861,7 +2861,7 @@ HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code)
build_response(s, cached_response, &s->hdr_info.client_response, s->client_info.http_version, client_response_code);
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
break;
case HTTP_STATUS_PRECONDITION_FAILED:
@@ -2872,7 +2872,7 @@ HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code)
build_response(s, &s->hdr_info.client_response, s->client_info.http_version, client_response_code);
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
break;
case HTTP_STATUS_RANGE_NOT_SATISFIABLE:
@@ -2896,7 +2896,7 @@ HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code)
if (s->range_setup == RANGE_NOT_SATISFIABLE) {
build_error_response(s, HTTP_STATUS_RANGE_NOT_SATISFIABLE, "Requested Range Not Satisfiable", "default", NULL);
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
break;
} else if ((s->range_setup == RANGE_NOT_HANDLED) || !s->range_in_cache) {
// we switch to tunneling for Range requests if it is out of order.
@@ -2929,7 +2929,7 @@ HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code)
build_response(s, cached_response, &s->hdr_info.client_response, s->client_info.http_version);
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
} else {
// We handled the request but it's not GET or HEAD (eg. DELETE),
// and server is not reacheable: 502
@@ -2937,8 +2937,8 @@ HttpTransact::build_response_from_cache(State *s, HTTPWarningCode warning_code)
DebugTxn("http_trans", "[build_response_from_cache] No match! Connection failed.");
build_error_response(s, HTTP_STATUS_BAD_GATEWAY, "Connection Failed", "connect#failed_connect", NULL);
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
- warning_code = HTTP_WARNING_CODE_NONE;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ warning_code = HTTP_WARNING_CODE_NONE;
}
break;
}
@@ -3005,7 +3005,7 @@ HttpTransact::handle_cache_write_lock(State *s)
return;
default:
s->cache_info.write_status = CACHE_WRITE_LOCK_MISS;
- remove_ims = true;
+ remove_ims = true;
break;
}
break;
@@ -3014,10 +3014,10 @@ HttpTransact::handle_cache_write_lock(State *s)
// We need to clean up our state so that transact does
// not assert later on. Then handle the open read hit
//
- s->request_sent_time = UNDEFINED_TIME;
+ s->request_sent_time = UNDEFINED_TIME;
s->response_received_time = UNDEFINED_TIME;
- s->cache_info.action = CACHE_DO_LOOKUP;
- remove_ims = true;
+ s->cache_info.action = CACHE_DO_LOOKUP;
+ remove_ims = true;
SET_VIA_STRING(VIA_DETAIL_CACHE_TYPE, VIA_DETAIL_CACHE);
break;
case CACHE_WL_INIT:
@@ -3099,12 +3099,12 @@ HttpTransact::HandleCacheOpenReadMiss(State *s)
if (delete_all_document_alternates_and_return(s, false)) {
DebugTxn("http_trans", "[HandleCacheOpenReadMiss] Delete and return");
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
return;
}
// reinitialize some variables to reflect cache miss state.
s->cache_info.object_read = NULL;
- s->request_sent_time = UNDEFINED_TIME;
+ s->request_sent_time = UNDEFINED_TIME;
s->response_received_time = UNDEFINED_TIME;
SET_VIA_STRING(VIA_CACHE_RESULT, VIA_CACHE_MISS);
if (GET_VIA_STRING(VIA_DETAIL_CACHE_LOOKUP) == ' ') {
@@ -3330,7 +3330,7 @@ HttpTransact::HandleResponse(State *s)
DebugTxn("http_trans", "[HttpTransact::HandleResponse]");
DebugTxn("http_seq", "[HttpTransact::HandleResponse] Response received");
- s->source = SOURCE_HTTP_ORIGIN_SERVER;
+ s->source = SOURCE_HTTP_ORIGIN_SERVER;
s->response_received_time = ink_cluster_time();
ink_assert(s->response_received_time >= s->request_sent_time);
s->current.now = s->response_received_time;
@@ -3399,7 +3399,7 @@ HttpTransact::HandleUpdateCachedObject(State *s)
if (!s->cache_info.object_store.request_get())
s->cache_info.object_store.request_set(s->cache_info.object_read->request_get());
- s->request_sent_time = s->cache_info.object_read->request_sent_time_get();
+ s->request_sent_time = s->cache_info.object_read->request_sent_time_get();
s->response_received_time = s->cache_info.object_read->response_received_time_get();
if (s->api_update_cached_object == UPDATE_CACHED_OBJECT_CONTINUE) {
TRANSACT_RETURN(SM_ACTION_CACHE_ISSUE_UPDATE, HttpTransact::HandleUpdateCachedObjectContinue);
@@ -3420,7 +3420,7 @@ HttpTransact::HandleUpdateCachedObjectContinue(State *s)
{
ink_assert(s->api_update_cached_object == UPDATE_CACHED_OBJECT_CONTINUE);
s->cache_info.action = s->saved_update_cache_action;
- s->next_action = s->saved_update_next_action;
+ s->next_action = s->saved_update_next_action;
}
///////////////////////////////////////////////////////////////////////////////
@@ -3463,7 +3463,7 @@ HttpTransact::HandleStatPage(State *s)
}
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
}
///////////////////////////////////////////////////////////////////////////////
@@ -3599,7 +3599,7 @@ HttpTransact::handle_response_from_parent(State *s)
s->current.simple_retry_attempts++;
DebugTxn("http_trans", "PARENT_ORIGIN_SIMPLE_RETRY: try another parent.\n");
s->current.retry_type = PARENT_ORIGIN_UNDEFINED_RETRY;
- next_lookup = find_server_and_update_current_info(s);
+ next_lookup = find_server_and_update_current_info(s);
}
} else { // try unavailable server retry if we have a unavailable server retry response from the parent.
if (s->current.unavailable_server_retry_attempts >= s->parent_result.max_retries(PARENT_RETRY_UNAVAILABLE_SERVER)) {
@@ -3641,7 +3641,7 @@ HttpTransact::handle_response_from_parent(State *s)
DebugTxn("http_trans", "[handle_response_from_parent] Error. No more retries.");
s->parent_params->markParentDown(&s->parent_result);
s->parent_result.result = PARENT_FAIL;
- next_lookup = find_server_and_update_current_info(s);
+ next_lookup = find_server_and_update_current_info(s);
}
// We have either tried to find a new parent or failed over to the
@@ -3653,7 +3653,7 @@ HttpTransact::handle_response_from_parent(State *s)
break;
case ORIGIN_SERVER:
s->current.attempts = 0;
- s->next_action = how_to_open_connection(s);
+ s->next_action = how_to_open_connection(s);
if (s->current.server == &s->server_info && s->next_hop_scheme == URL_WKSIDX_HTTP) {
HttpTransactHeaders::remove_host_name_from_url(&s->hdr_info.server_request);
}
@@ -3972,8 +3972,8 @@ HttpTransact::handle_forward_server_connection_open(State *s)
build_response(s, &s->hdr_info.client_response, s->client_info.http_version, HTTP_STATUS_OK, "Connection Established");
s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
- s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_SERVER_READ;
+ s->cache_info.action = CACHE_DO_NO_ACTION;
+ s->next_action = SM_ACTION_SERVER_READ;
return;
} else if (s->hdr_info.server_response.version_get() == HTTPVersion(1, 0)) {
@@ -4172,11 +4172,11 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
DebugTxn("http_trans", "[handle_cache_operation_on_forward_server_response] (hcoofsr)");
DebugTxn("http_seq", "[handle_cache_operation_on_forward_server_response]");
- HTTPHdr *base_response = NULL;
+ HTTPHdr *base_response = NULL;
HTTPStatus server_response_code = HTTP_STATUS_NONE;
HTTPStatus client_response_code = HTTP_STATUS_NONE;
- const char *warn_text = NULL;
- bool cacheable = false;
+ const char *warn_text = NULL;
+ bool cacheable = false;
cacheable = is_response_cacheable(s, &s->hdr_info.client_request, &s->hdr_info.server_response);
DebugTxn("http_trans", "[hcoofsr] response %s cacheable", cacheable ? "is" : "is not");
@@ -4194,11 +4194,11 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
if (s->api_server_response_ignore && s->cache_info.action == CACHE_DO_UPDATE) {
s->api_server_response_ignore = false;
ink_assert(s->cache_info.object_read);
- base_response = s->cache_info.object_read->response_get();
+ base_response = s->cache_info.object_read->response_get();
s->cache_info.action = CACHE_DO_SERVE;
DebugTxn("http_trans", "[hcoofsr] not merging, cache action changed to: %s",
HttpDebugNames::get_cache_action_name(s->cache_info.action));
- s->next_action = SM_ACTION_SERVE_FROM_CACHE;
+ s->next_action = SM_ACTION_SERVE_FROM_CACHE;
client_response_code = base_response->status_get();
} else if ((s->cache_info.action == CACHE_DO_DELETE) || ((s->cache_info.action == CACHE_DO_UPDATE) && !cacheable)) {
if (is_request_conditional(&s->hdr_info.client_request)) {
@@ -4211,10 +4211,10 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
if (client_response_code != HTTP_STATUS_OK) {
// we can just forward the not modified response
// from the server and delete the cached copy
- base_response = &s->hdr_info.server_response;
+ base_response = &s->hdr_info.server_response;
client_response_code = base_response->status_get();
s->cache_info.action = CACHE_DO_DELETE;
- s->next_action = SM_ACTION_INTERNAL_CACHE_DELETE;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_DELETE;
} else {
// We got screwed. The client did not send a conditional request,
// but we had a cached copy which we revalidated. The server has
@@ -4222,12 +4222,12 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
// We need to send the cached copy to the client, then delete it.
if (s->method == HTTP_WKSIDX_HEAD) {
s->cache_info.action = CACHE_DO_DELETE;
- s->next_action = SM_ACTION_SERVER_READ;
+ s->next_action = SM_ACTION_SERVER_READ;
} else {
s->cache_info.action = CACHE_DO_SERVE_AND_DELETE;
- s->next_action = SM_ACTION_SERVE_FROM_CACHE;
+ s->next_action = SM_ACTION_SERVE_FROM_CACHE;
}
- base_response = s->cache_info.object_read->response_get();
+ base_response = s->cache_info.object_read->response_get();
client_response_code = base_response->status_get();
}
@@ -4247,17 +4247,17 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
// delete the cached copy unless configured to always verify IMS
if (s->txn_conf->cache_when_to_revalidate != 4) {
s->cache_info.action = CACHE_DO_UPDATE;
- s->next_action = SM_ACTION_INTERNAL_CACHE_UPDATE_HEADERS;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_UPDATE_HEADERS;
/* base_response will be set after updating headers below */
} else {
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
- base_response = &s->hdr_info.server_response;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ base_response = &s->hdr_info.server_response;
}
} else {
if (s->method == HTTP_WKSIDX_HEAD) {
s->cache_info.action = CACHE_DO_UPDATE;
- s->next_action = SM_ACTION_SERVER_READ;
+ s->next_action = SM_ACTION_SERVER_READ;
} else {
if (s->hdr_info.client_request.presence(MIME_PRESENCE_RANGE)) {
s->state_machine->do_range_setup_if_necessary();
@@ -4266,7 +4266,7 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
// a bad client, but allows us to avoid pegging the origin (e.g. abuse).
}
s->cache_info.action = CACHE_DO_SERVE_AND_UPDATE;
- s->next_action = SM_ACTION_SERVE_FROM_CACHE;
+ s->next_action = SM_ACTION_SERVE_FROM_CACHE;
}
/* base_response will be set after updating headers below */
}
@@ -4278,9 +4278,9 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
// should not have been an conditional.
DebugTxn("http_trans", "[hcoofsr] 304 for non-conditional request");
s->cache_info.action = CACHE_DO_NO_ACTION;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
client_response_code = s->hdr_info.server_response.status_get();
- base_response = &s->hdr_info.server_response;
+ base_response = &s->hdr_info.server_response;
// since this is bad, insert warning header into client response
// The only exception case is conditional client request,
@@ -4306,7 +4306,7 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
/* Downgrade the request level and retry */
if (!HttpTransactHeaders::downgrade_request(&keep_alive, &s->hdr_info.server_request)) {
build_error_response(s, HTTP_STATUS_HTTPVER_NOT_SUPPORTED, "HTTP Version Not Supported", "response#bad_version", NULL);
- s->next_action = SM_ACTION_SEND_ERROR_CACHE_NOOP;
+ s->next_action = SM_ACTION_SEND_ERROR_CACHE_NOOP;
s->already_downgraded = true;
} else {
if (!keep_alive) {
@@ -4315,7 +4315,7 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
/* END Hack */
}
s->already_downgraded = true;
- s->next_action = how_to_open_connection(s);
+ s->next_action = how_to_open_connection(s);
}
}
return;
@@ -4339,7 +4339,7 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
s->cache_info.object_store.create();
s->cache_info.object_store.request_set(&s->hdr_info.client_request);
s->cache_info.object_store.response_set(s->cache_info.object_read->response_get());
- base_response = s->cache_info.object_store.response_get();
+ base_response = s->cache_info.object_store.response_get();
time_t exp_time = s->txn_conf->negative_revalidating_lifetime + ink_cluster_time();
base_response->set_expires(exp_time);
@@ -4356,15 +4356,15 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
HttpTransactCache::match_response_to_request_conditionals(&s->hdr_info.client_request,
s->cache_info.object_read->response_get(),
s->response_received_time) == HTTP_STATUS_NOT_MODIFIED) {
- s->next_action = SM_ACTION_INTERNAL_CACHE_UPDATE_HEADERS;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_UPDATE_HEADERS;
client_response_code = HTTP_STATUS_NOT_MODIFIED;
} else {
if (s->method == HTTP_WKSIDX_HEAD) {
s->cache_info.action = CACHE_DO_UPDATE;
- s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
+ s->next_action = SM_ACTION_INTERNAL_CACHE_NOOP;
} else {
s->cache_info.action = CACHE_DO_SERVE_AND_UPDATE;
- s->next_action = SM_ACTION_SERVE_FROM_CACHE;
+ s->next_action = SM_ACTION_SERVE_FROM_CACHE;
}
client_response_code = s->cache_info.object_read->response_get()->status_get();
@@ -4391,9 +4391,9 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
return;
}
- s->next_action = SM_ACTION_SERVER_READ;
+ s->next_action = SM_ACTION_SERVER_READ;
client_response_code = server_response_code;
- base_response = &s->hdr_info.server_response;
+ base_response = &s->hdr_info.server_response;
s->negative_caching = is_negative_caching_appropriate(s) && cacheable;
@@ -4407,12 +4407,12 @@ HttpTransact::handle_cache_operation_on_forward_server_response(State *s)
s->hdr_info.server_request.method_get_wksidx() == HTTP_WKSIDX_HEAD) {
s->api_server_response_ignore = false;
ink_assert(s->cache_info.object_read);
- base_response = s->cache_info.object_read->response_get();
+ base_response = s->cache_info.object_read->response_get();
s->cache_info.action = CACHE_DO_SERVE;
DebugTxn("http_trans", "[hcoofsr] ignoring server response, "
"cache action changed to: %s",
HttpDebugNames::get_cache_action_name(s->cache_info.action));
- s->next_action = SM_ACTION_SERVE_FROM_CACHE;
+ s->next_action = SM_ACTION_SERVE_FROM_CACHE;
client_response_code = base_response->status_get();
} else if (s->cache_info.action == CACHE_DO_UPDATE) {
if (s->www_auth_content == CACHE_AUTH_FRESH || s->api_server_response_ignore) {
@@ -4625,7 +4625,7 @@ HttpTransact::handle_no_cache_operation_on_forward_server_response(State *s)
DebugTxn("http_trans", "[handle_no_cache_operation_on_forward_server_response] (hncoofsr)");
DebugTxn("http_seq", "[handle_no_cache_operation_on_forward_server_response]");
- bool keep_alive = s->current.server->keep_alive == HTTP_KEEPALIVE;
+ bool keep_alive = s->current.server->keep_alive == HTTP_KEEPALIVE;
const char *warn_text = NULL;
switch (s->hdr_info.server_response.status_get()) {
@@ -4673,7 +4673,7 @@ HttpTransact::handle_no_cache_operation_on_forward_server_response(State *s)
s->next_action = SM_ACTION_SEND_ERROR_CACHE_NOOP;
} else {
s->already_downgraded = true;
- s->next_action = how_to_open_connection(s);
+ s->next_action = how_to_open_connection(s);
}
return;
case HTTP_STATUS_PARTIAL_CONTENT:
@@ -4747,7 +4747,7 @@ HttpTransact::merge_and_update_headers_for_cache_update(State *s)
// Hack fix. If the server sends back
// a 304 without a Date Header, use the current time
// as the new Date value in the header to be cached.
- time_t date_value = s->hdr_info.server_response.get_date();
+ time_t date_value = s->hdr_info.server_response.get_date();
HTTPHdr *cached_hdr = s->cache_info.object_store.response_get();
if (date_value <= 0) {
@@ -4784,7 +4784,7 @@ HttpTransact::handle_transform_cache_write(State *s)
break;
case CACHE_WL_FAIL:
// No write lock, ignore the cache
- s->cache_info.transform_action = CACHE_DO_NO_ACTION;
+ s->cache_info.transform_action = CACHE_DO_NO_ACTION;
s->cache_info.transform_write_status = CACHE_WRITE_LOCK_MISS;
break;
default:
@@ -4800,7 +4800,7 @@ HttpTransact::handle_transform_ready(State *s)
ink_assert(s->hdr_info.transform_response.valid() == true);
s->pre_transform_source = s->source;
- s->source = SOURCE_TRANSFORM;
+ s->source = SOURCE_TRANSFORM;
if (!s->cop_test_page)
DUMP_HEADER("http_hdrs", &s->hdr_info.transform_response, s->state_machine_id, "Header From Transform");
@@ -4990,8 +4990,8 @@ HttpTransact::merge_response_header_with_cached_header(HTTPHdr *cached_header, H
// remaining response headers in the cached response,
// so that they will be added in the next iterations.
MIMEFieldIter fiter2 = fiter;
- const char *dname = name;
- int dlen = name_len;
+ const char *dname = name;
+ int dlen = name_len;
while (dname) {
cached_header->field_delete(dname, dlen);
@@ -5041,8 +5041,8 @@ HttpTransact::merge_warning_header(HTTPHdr *cached_header, HTTPHdr *response_hea
// the response header, append if to
// the cached header
//
- MIMEField *c_warn = cached_header->field_find(MIME_FIELD_WARNING, MIME_LEN_WARNING);
- MIMEField *r_warn = response_header->field_find(MIME_FIELD_WARNING, MIME_LEN_WARNING);
+ MIMEField *c_warn = cached_header->field_find(MIME_FIELD_WARNING, MIME_LEN_WARNING);
+ MIMEField *r_warn = response_header->field_find(MIME_FIELD_WARNING, MIME_LEN_WARNING);
MIMEField *new_cwarn = NULL;
int move_warn_len;
const char *move_warn;
@@ -5058,7 +5058,7 @@ HttpTransact::merge_warning_header(HTTPHdr *cached_header, HTTPHdr *response_hea
if (code < 100 || code > 199) {
bool first_move;
if (!new_cwarn) {
- new_cwarn = cached_header->field_create();
+ new_cwarn = cached_header->field_create();
first_move = true;
} else {
first_move = false;
@@ -5117,7 +5117,7 @@ HttpTransact::get_ka_info_from_config(State *s, ConnectionAttributes *server_inf
break;
case HttpConfigParams::SEND_HTTP11_UPGRADE_HOSTDB:
server_info->http_version = HTTPVersion(1, 0);
- check_hostdb = true;
+ check_hostdb = true;
break;
case HttpConfigParams::SEND_HTTP11_IF_REQUEST_11_AND_HOSTDB:
server_info->http_version = HTTPVersion(1, 0);
@@ -5153,7 +5153,7 @@ void
HttpTransact::get_ka_info_from_host_db(State *s, ConnectionAttributes *server_info,
ConnectionAttributes * /* client_info ATS_UNUSED */, HostDBInfo *host_db_info)
{
- bool force_http11 = false;
+ bool force_http11 = false;
bool http11_if_hostdb = false;
switch (s->txn_conf->send_http11_requests) {
@@ -5193,7 +5193,7 @@ HttpTransact::get_ka_info_from_host_db(State *s, ConnectionAttributes *server_in
// not set yet for this host. set defaults. //
//////////////////////////////////////////////
server_info->http_version.set(1, 0);
- server_info->keep_alive = HTTP_KEEPALIVE;
+ server_info->keep_alive = HTTP_KEEPALIVE;
host_db_info->app.http_data.http_version = HostDBApplicationInfo::HTTP_VERSION_10;
}
@@ -5211,7 +5211,7 @@ void
HttpTransact::add_client_ip_to_outgoing_request(State *s, HTTPHdr *request)
{
char ip_string[INET6_ADDRSTRLEN + 1] = {'\0'};
- size_t ip_string_size = 0;
+ size_t ip_string_size = 0;
if (!ats_is_ip(&s->client_info.src_addr.sa))
return;
@@ -5222,7 +5222,7 @@ HttpTransact::add_client_ip_to_outgoing_request(State *s, HTTPHdr *request)
} else {
// Failure, omg
ip_string_size = 0;
- ip_string[0] = 0;
+ ip_string[0] = 0;
}
////////////////////////////////////////////////////////////////
@@ -5322,7 +5322,7 @@ HttpTransact::check_request_validity(State *s, HTTPHdr *incoming_hdr)
// than in initialize_state_variables_from_request //
/////////////////////////////////////////////////////
if (method != HTTP_WKSIDX_TRACE) {
- int64_t length = incoming_hdr->get_content_length();
+ int64_t length = incoming_hdr->get_content_length();
s->hdr_info.request_content_length = (length >= 0) ? length : HTTP_UNDEFINED_CL; // content length less than zero is invalid
DebugTxn("http_trans", "[init_stat_vars_from_req] set req cont length to %" PRId64, s->hdr_info.request_content_length);
@@ -5537,14 +5537,14 @@ HttpTransact::handle_trace_and_options_requests(State *s, HTTPHdr *incoming_hdr)
s->internal_msg_buffer = (char *)ioBufAllocator[s->internal_msg_buffer_fast_allocator_size].alloc_void();
} else {
s->internal_msg_buffer_fast_allocator_size = -1;
- s->internal_msg_buffer = (char *)ats_malloc(s->internal_msg_buffer_size);
+ s->internal_msg_buffer = (char *)ats_malloc(s->internal_msg_buffer_size);
}
// clear the stupid buffer
memset(s->internal_msg_buffer, '\0', s->internal_msg_buffer_size);
int offset = 0;
- int used = 0;
+ int used = 0;
int done;
done = incoming_hdr->print(s->internal_msg_buffer, s->internal_msg_buffer_size, &used, &offset);
HTTP_RELEASE_ASSERT(done);
@@ -5585,11 +5585,11 @@ HttpTransact::initialize_state_variables_for_origin_server(State *s, HTTPHdr *in
}
int host_len;
- const char *host = incoming_request->host_get(&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.attempts = 0;
s->dns_info.lookup_name = s->server_info.name;
}
}
@@ -5598,7 +5598,7 @@ void
HttpTransact::bootstrap_state_variables_from_request(State *s, HTTPHdr *incoming_request)
{
s->current.now = s->client_request_time = ink_cluster_time();
- s->client_info.http_version = incoming_request->version_get();
+ s->client_info.http_version = incoming_request->version_get();
}
void
@@ -5639,7 +5639,7 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
if (s->state_machine->ua_session) {
s->request_data.incoming_port = s->state_machine->ua_session->get_netvc()->get_local_port();
- s->request_data.internal_txn = s->state_machine->ua_session->get_netvc()->get_is_internal_request();
+ s->request_data.internal_txn = s->state_machine->ua_session->get_netvc()->get_is_internal_request();
}
NetVConnection *vc = NULL;
if (s->state_machine->ua_session) {
@@ -5672,18 +5672,18 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
if (s->next_hop_scheme == URL_WKSIDX_WS) {
DebugTxn("http_trans", "Switching WS next hop scheme to http.");
s->next_hop_scheme = URL_WKSIDX_HTTP;
- s->scheme = URL_WKSIDX_HTTP;
+ s->scheme = URL_WKSIDX_HTTP;
// s->request_data.hdr->url_get()->scheme_set(URL_SCHEME_HTTP, URL_LEN_HTTP);
} else if (s->next_hop_scheme == URL_WKSIDX_WSS) {
DebugTxn("http_trans", "Switching WSS next hop scheme to https.");
s->next_hop_scheme = URL_WKSIDX_HTTPS;
- s->scheme = URL_WKSIDX_HTTPS;
+ s->scheme = URL_WKSIDX_HTTPS;
// s->request_data.hdr->url_get()->scheme_set(URL_SCHEME_HTTPS, URL_LEN_HTTPS);
} else {
Error("Scheme doesn't match websocket...!");
}
- s->current.mode = GENERIC_PROXY;
+ s->current.mode = GENERIC_PROXY;
s->cache_info.action = CACHE_DO_NO_ACTION;
}
@@ -5714,7 +5714,7 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
} else {
HTTP_INCREMENT_DYN_STAT(http_extension_method_requests_stat);
SET_VIA_STRING(VIA_DETAIL_TUNNEL, VIA_DETAIL_TUNNEL_METHOD);
- s->squid_codes.log_code = SQUID_LOG_TCP_MISS;
+ s->squid_codes.log_code = SQUID_LOG_TCP_MISS;
s->hdr_info.extension_method = true;
}
@@ -5734,15 +5734,15 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
}
}
s->request_data.xact_start = s->client_request_time;
- s->request_data.api_info = &s->api_info;
+ s->request_data.api_info = &s->api_info;
/////////////////////////////////////////////
// Do dns lookup for the host. We need //
// the expanded host for cache lookup, and //
// the host ip for reverse proxy. //
/////////////////////////////////////////////
- s->dns_info.looking_up = ORIGIN_SERVER;
- s->dns_info.attempts = 0;
+ s->dns_info.looking_up = ORIGIN_SERVER;
+ s->dns_info.attempts = 0;
s->dns_info.lookup_name = s->server_info.name;
}
@@ -5782,17 +5782,17 @@ HttpTransact::initialize_state_variables_from_response(State *s, HTTPHdr *incomi
HTTPStatus status_code = incoming_response->status_get();
if (is_response_body_precluded(status_code, s->method)) {
s->hdr_info.response_content_length = 0;
- s->hdr_info.trust_response_cl = true;
+ s->hdr_info.trust_response_cl = true;
} else {
// This code used to discriminate CL: headers when the origin disabled keep-alive.
if (incoming_response->presence(MIME_PRESENCE_CONTENT_LENGTH)) {
int64_t cl = incoming_response->get_content_length();
s->hdr_info.response_content_length = (cl >= 0) ? cl : HTTP_UNDEFINED_CL;
- s->hdr_info.trust_response_cl = true;
+ s->hdr_info.trust_response_cl = true;
} else {
s->hdr_info.response_content_length = HTTP_UNDEFINED_CL;
- s->hdr_info.trust_response_cl = false;
+ s->hdr_info.trust_response_cl = false;
}
}
@@ -5814,7 +5814,7 @@ HttpTransact::initialize_state_variables_from_response(State *s, HTTPHdr *incomi
s->current.server->transfer_encoding = CHUNKED_ENCODING;
s->hdr_info.response_content_length = HTTP_UNDEFINED_CL;
- s->hdr_info.trust_response_cl = false;
+ s->hdr_info.trust_response_cl = false;
// OBJECTIVE: Since we are dechunking the request remove the
// chunked value If this is the only value, we need to remove
@@ -6584,14 +6584,14 @@ HttpTransact::process_quick_http_filter(State *s, int method)
if (s->state_machine->ua_session) {
const AclRecord *acl_record = s->state_machine->ua_session->get_acl_record();
- bool deny_request = (acl_record == NULL);
+ bool deny_request = (acl_record == NULL);
if (acl_record && (acl_record->_method_mask != AclRecord::ALL_METHOD_MASK)) {
if (method != -1) {
deny_request = !acl_record->isMethodAllowed(method);
} else {
int method_str_len;
const char *method_str = s->hdr_info.client_request.method_get(&method_str_len);
- deny_request = !acl_record->isNonstandardMethodAllowed(std::string(method_str, method_str_len));
+ deny_request = !acl_record->isNonstandardMethodAllowed(std::string(method_str, method_str_len));
}
}
if (deny_request) {
@@ -6609,7 +6609,7 @@ HttpTransact::HostNameExpansionError_t
HttpTransact::try_to_expand_host_name(State *s)
{
static int max_dns_lookups = 2 + s->http_config_param->num_url_expansions;
- static int last_expansion = max_dns_lookups - 2;
+ static int last_expansion = max_dns_lookups - 2;
HTTP_RELEASE_ASSERT(!s->dns_info.lookup_success);
@@ -6626,7 +6626,7 @@ HttpTransact::try_to_expand_host_name(State *s)
// Try a URL expansion
if (attempts <= last_expansion) {
char *expansion = s->http_config_param->url_expansions[attempts - 1];
- int length = strlen(s->server_info.name) + strlen(expansion) + 1;
+ int length = strlen(s->server_info.name) + strlen(expansion) + 1;
s->dns_info.lookup_name = s->arena.str_alloc(length);
ink_string_concatenate_strings_n(s->dns_info.lookup_name, length + 1, s->server_info.name, ".", expansion, NULL);
@@ -6656,8 +6656,8 @@ HttpTransact::try_to_expand_host_name(State *s)
ink_assert(s->dns_info.looking_up == PARENT_PROXY);
s->dns_info.lookup_name = s->server_info.name;
- s->dns_info.looking_up = ORIGIN_SERVER;
- s->dns_info.attempts = 0;
+ s->dns_info.looking_up = ORIGIN_SERVER;
+ s->dns_info.attempts = 0;
return RETRY_EXPANDED_NAME;
}
@@ -6671,7 +6671,7 @@ HttpTransact::will_this_request_self_loop(State *s)
////////////////////////////////////////
if (s->dns_info.lookup_success) {
if (ats_ip_addr_eq(s->host_db_info.ip(), &Machine::instance()->ip.sa)) {
- in_port_t host_port = s->hdr_info.client_request.url_get()->port_get();
+ in_port_t host_port = s->hdr_info.client_request.url_get()->port_get();
in_port_t local_port = s->client_info.src_addr.host_order_port();
if (host_port == local_port) {
switch (s->dns_info.looking_up) {
@@ -6796,7 +6796,7 @@ HttpTransact::handle_content_length_header(State *s, HTTPHdr *header, HTTPHdr *b
cl = s->cache_info.object_read->object_size_get();
if (cl == INT64_MAX) { // INT64_MAX cl in cache indicates rww in progress
header->field_delete(MIME_FIELD_CONTENT_LENGTH, MIME_LEN_CONTENT_LENGTH);
- s->hdr_info.trust_response_cl = false;
+ s->hdr_info.trust_response_cl = false;
s->hdr_info.request_content_length = HTTP_UNDEFINED_CL;
ink_assert(s->range_setup == RANGE_NONE);
} else if (s->range_setup == RANGE_NOT_TRANSFORM_REQUESTED) {
@@ -6849,7 +6849,7 @@ HttpTransact::handle_request_keep_alive_headers(State *s, HTTPVersion ver, HTTPH
};
KA_Action_t ka_action = KA_UNKNOWN;
- bool upstream_ka = (s->current.server->keep_alive == HTTP_KEEPALIVE);
+ bool upstream_ka = (s->current.server->keep_alive == HTTP_KEEPALIVE);
ink_assert(heads->type_get() == HTTP_TYPE_REQUEST);
@@ -6919,7 +6919,7 @@ HttpTransact::handle_request_keep_alive_headers(State *s, HTTPVersion ver, HTTPH
}
} else { /* websocket connection */
s->current.server->keep_alive = HTTP_NO_KEEPALIVE;
- s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
+ s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
heads->value_set(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, MIME_FIELD_UPGRADE, MIME_LEN_UPGRADE);
if (s->is_websocket) {
@@ -7095,13 +7095,13 @@ HttpTransact::delete_all_document_alternates_and_return(State *s, bool cache_hit
if ((s->method != HTTP_WKSIDX_GET) && (s->method == HTTP_WKSIDX_DELETE || s->method == HTTP_WKSIDX_PURGE)) {
bool valid_max_forwards;
- int max_forwards = -1;
+ int max_forwards = -1;
MIMEField *max_forwards_f = s->hdr_info.client_request.field_find(MIME_FIELD_MAX_FORWARDS, MIME_LEN_MAX_FORWARDS);
// Check the max forwards value for DELETE
if (max_forwards_f) {
valid_max_forwards = true;
- max_forwards = max_forwards_f->value_get_int();
+ max_forwards = max_forwards_f->value_get_int();
} else {
valid_max_forwards = false;
}
@@ -7190,7 +7190,7 @@ HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, ti
time_t date_value, expires_value, last_modified_value;
MgmtInt min_freshness_bounds, max_freshness_bounds;
int freshness_limit = 0;
- uint32_t cc_mask = response->get_cooked_cc_mask();
+ uint32_t cc_mask = response->get_cooked_cc_mask();
*heuristic = false;
@@ -7207,10 +7207,10 @@ HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, ti
date_set = last_modified_set = false;
if (s->plugin_set_expire_time != UNDEFINED_TIME) {
- expires_set = true;
+ expires_set = true;
expires_value = s->plugin_set_expire_time;
} else {
- expires_set = (response->presence(MIME_PRESENCE_EXPIRES) != 0);
+ expires_set = (response->presence(MIME_PRESENCE_EXPIRES) != 0);
expires_value = response->get_expires();
}
@@ -7243,7 +7243,7 @@ HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, ti
} else {
last_modified_value = 0;
if (response->presence(MIME_PRESENCE_LAST_MODIFIED)) {
- last_modified_set = true;
+ last_modified_set = true;
last_modified_value = response->get_last_modified();
DebugTxn("http_match", "calculate_document_freshness_limit --- Last Modified header = %" PRId64,
(int64_t)last_modified_value);
@@ -7262,8 +7262,8 @@ HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, ti
MgmtFloat f = s->txn_conf->cache_heuristic_lm_factor;
ink_assert((f >= 0.0) && (f <= 1.0));
ink_time_t time_since_last_modify = date_value - last_modified_value;
- int h_freshness = (int)(time_since_last_modify * f);
- freshness_limit = max(h_freshness, 0);
+ int h_freshness = (int)(time_since_last_modify * f);
+ freshness_limit = max(h_freshness, 0);
DebugTxn("http_match", "calculate_document_freshness_limit --- heuristic: date=%" PRId64 ", lm=%" PRId64
", time_since_last_modify=%" PRId64 ", f=%g, freshness_limit = %d",
(int64_t)date_value, (int64_t)last_modified_value, (int64_t)time_since_last_modify, f, freshness_limit);
@@ -7308,13 +7308,13 @@ HttpTransact::calculate_document_freshness_limit(State *s, HTTPHdr *response, ti
int
HttpTransact::calculate_freshness_fuzz(State *s, int fresh_limit)
{
- static double LOG_YEAR = log10((double)s->txn_conf->cache_guaranteed_max_lifetime);
+ static double LOG_YEAR = log10((double)s->txn_conf->cache_guaranteed_max_lifetime);
const uint32_t granularity = 1000;
- int result = 0;
+ int result = 0;
uint32_t random_num = this_ethread()->generator.random();
- uint32_t index = random_num % granularity;
- uint32_t range = (uint32_t)(granularity * s->txn_conf->freshness_fuzz_prob);
+ uint32_t index = random_num % granularity;
+ uint32_t range = (uint32_t)(granularity * s->txn_conf->freshness_fuzz_prob);
if (index < range) {
if (s->txn_conf->freshness_fuzz_min_time > 0) {
@@ -7385,9 +7385,9 @@ HttpTransact::what_is_document_freshness(State *s, HTTPHdr *client_request, HTTP
}
}
- cooked_cc_mask = cached_obj_response->get_cooked_cc_mask();
+ cooked_cc_mask = cached_obj_response->get_cooked_cc_mask();
os_specifies_revalidate = cooked_cc_mask & (MIME_COOKED_MASK_CC_MUST_REVALIDATE | MIME_COOKED_MASK_CC_PROXY_REVALIDATE);
- cc_mask = MIME_COOKED_MASK_CC_NEED_REVALIDATE_ONCE;
+ cc_mask = MIME_COOKED_MASK_CC_NEED_REVALIDATE_ONCE;
// Check to see if the server forces revalidation
@@ -7398,7 +7398,7 @@ HttpTransact::what_is_document_freshness(State *s, HTTPHdr *client_request, HTTP
}
response_date = cached_obj_response->get_date();
- fresh_limit = calculate_document_freshness_limit(s, cached_obj_response, response_date, &heuristic);
+ fresh_limit = calculate_document_freshness_limit(s, cached_obj_response, response_date, &heuristic);
ink_assert(fresh_limit >= 0);
// Fuzz the freshness to prevent too many revalidates to popular
@@ -7468,7 +7468,7 @@ HttpTransact::what_is_document_freshness(State *s, HTTPHdr *client_request, HTTP
DebugTxn("http_match", "[..._document_freshness] initial age limit: %d", age_limit);
cooked_cc_mask = client_request->get_cooked_cc_mask();
- cc_mask = (MIME_COOKED_MASK_CC_MAX_STALE | MIME_COOKED_MASK_CC_MIN_FRESH | MIME_COOKED_MASK_CC_MAX_AGE);
+ cc_mask = (MIME_COOKED_MASK_CC_MAX_STALE | MIME_COOKED_MASK_CC_MIN_FRESH | MIME_COOKED_MASK_CC_MAX_AGE);
if (cooked_cc_mask & cc_mask) {
/////////////////////////////////////////////////
// if max-stale set, relax the freshness limit //
@@ -7501,7 +7501,7 @@ HttpTransact::what_is_document_freshness(State *s, HTTPHdr *client_request, HTTP
int age_val = client_request->get_cooked_cc_max_age();
if (age_val == 0)
do_revalidate = true;
- age_limit = min(age_limit, age_val);
+ age_limit = min(age_limit, age_val);
DebugTxn("http_match", "[..._document_freshness] min_fresh set, age limit: %d", age_limit);
}
}
@@ -7611,9 +7611,9 @@ HttpTransact::handle_parent_died(State *s)
void
HttpTransact::handle_server_died(State *s)
{
- const char *reason = NULL;
+ const char *reason = NULL;
const char *body_type = "UNKNOWN";
- HTTPStatus status = HTTP_STATUS_BAD_GATEWAY;
+ HTTPStatus status = HTTP_STATUS_BAD_GATEWAY;
////////////////////////////////////////////////////////
// FIX: all the body types below need to be filled in //
@@ -7632,43 +7632,43 @@ HttpTransact::handle_server_died(State *s)
switch (s->current.state) {
case CONNECTION_ALIVE: /* died while alive for unknown reason */
ink_release_assert(s->hdr_info.response_error != NO_RESPONSE_HEADER_ERROR);
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Unknown Error";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Unknown Error";
body_type = "response#bad_response";
break;
case CONNECTION_ERROR:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = (char *)get_error_string(s->cause_of_death_errno);
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = (char *)get_error_string(s->cause_of_death_errno);
body_type = "connect#failed_connect";
break;
case OPEN_RAW_ERROR:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Tunnel Connection Failed";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Tunnel Connection Failed";
body_type = "connect#failed_connect";
break;
case CONNECTION_CLOSED:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Server Hangup";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Server Hangup";
body_type = "connect#hangup";
break;
case ACTIVE_TIMEOUT:
if (s->api_txn_active_timeout_value != -1)
DebugTxn("http_timeout", "Maximum active time of %d msec exceeded", s->api_txn_active_timeout_value);
- status = HTTP_STATUS_GATEWAY_TIMEOUT;
- reason = "Maximum Transaction Time Exceeded";
+ status = HTTP_STATUS_GATEWAY_TIMEOUT;
+ reason = "Maximum Transaction Time Exceeded";
body_type = "timeout#activity";
break;
case INACTIVE_TIMEOUT:
if (s->api_txn_connect_timeout_value != -1)
DebugTxn("http_timeout", "Maximum connect time of %d msec exceeded", s->api_txn_connect_timeout_value);
- status = HTTP_STATUS_GATEWAY_TIMEOUT;
- reason = "Connection Timed Out";
+ status = HTTP_STATUS_GATEWAY_TIMEOUT;
+ reason = "Connection Timed Out";
body_type = "timeout#inactivity";
break;
case PARSE_ERROR:
case BAD_INCOMING_RESPONSE:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Invalid HTTP Response";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Invalid HTTP Response";
body_type = "response#bad_response";
break;
case CONGEST_CONTROL_CONGESTED_ON_F:
@@ -7677,7 +7677,7 @@ HttpTransact::handle_server_died(State *s)
if (s->pCongestionEntry)
body_type = s->pCongestionEntry->getErrorPage();
else
- body_type = "congestion#retryAfter";
+ body_type = "congestion#retryAfter";
s->hdr_info.response_error = TOTAL_RESPONSE_ERROR_TYPES;
break;
case CONGEST_CONTROL_CONGESTED_ON_M:
@@ -7686,15 +7686,15 @@ HttpTransact::handle_server_died(State *s)
if (s->pCongestionEntry)
body_type = s->pCongestionEntry->getErrorPage();
else
- body_type = "congestion#retryAfter";
+ body_type = "congestion#retryAfter";
s->hdr_info.response_error = TOTAL_RESPONSE_ERROR_TYPES;
break;
case STATE_UNDEFINED:
case TRANSACTION_COMPLETE:
default: /* unknown death */
ink_release_assert(!"[handle_server_died] Unreasonable state - not dead, shouldn't be here");
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = NULL;
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = NULL;
body_type = "response#bad_response";
break;
}
@@ -7702,9 +7702,9 @@ HttpTransact::handle_server_died(State *s)
if (s->pCongestionEntry && s->pCongestionEntry->F_congested() && status != HTTP_STATUS_SERVICE_UNAVAILABLE) {
s->pCongestionEntry->stat_inc_F();
CONGEST_SUM_GLOBAL_DYN_STAT(congested_on_F_stat, 1);
- status = HTTP_STATUS_SERVICE_UNAVAILABLE;
- reason = "Service Unavailable";
- body_type = s->pCongestionEntry->getErrorPage();
+ status = HTTP_STATUS_SERVICE_UNAVAILABLE;
+ reason = "Service Unavailable";
+ body_type = s->pCongestionEntry->getErrorPage();
s->hdr_info.response_error = TOTAL_RESPONSE_ERROR_TYPES;
}
////////////////////////////////////////////////////////
@@ -7713,8 +7713,8 @@ HttpTransact::handle_server_died(State *s)
switch (s->hdr_info.response_error) {
case NON_EXISTANT_RESPONSE_HEADER:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "No Response Header From Server";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "No Response Header From Server";
body_type = "response#bad_response";
break;
case MISSING_REASON_PHRASE:
@@ -7723,13 +7723,13 @@ HttpTransact::handle_server_died(State *s)
#ifdef REALLY_NEED_TO_CHECK_DATE_VALIDITY
case BOGUS_OR_NO_DATE_IN_RESPONSE:
#endif
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Malformed Server Response";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Malformed Server Response";
body_type = "response#bad_response";
break;
case MISSING_STATUS_CODE:
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Malformed Server Response Status";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Malformed Server Response Status";
body_type = "response#bad_response";
break;
default:
@@ -7737,8 +7737,8 @@ HttpTransact::handle_server_died(State *s)
}
if (reason == NULL) {
- status = HTTP_STATUS_BAD_GATEWAY;
- reason = "Server Connection Failed";
+ status = HTTP_STATUS_BAD_GATEWAY;
+ reason = "Server Connection Failed";
body_type = "connect#failed_connect";
}
@@ -7883,7 +7883,7 @@ HttpTransact::build_request(State *s, HTTPHdr *base_request, HTTPHdr *outgoing_r
}
s->request_sent_time = ink_cluster_time();
- s->current.now = s->request_sent_time;
+ s->current.now = s->request_sent_time;
// The assert is backwards in this case because request is being (re)sent.
ink_assert(s->request_sent_time >= s->response_received_time);
@@ -7988,10 +7988,10 @@ HttpTransact::build_response(State *s, HTTPHdr *base_response, HTTPHdr *outgoing
// If the response is prohibited from containing a body,
// we know the content length is trustable for keep-alive
if (is_response_body_precluded(status_code, s->method)) {
- s->hdr_info.trust_response_cl = true;
+ s->hdr_info.trust_response_cl = true;
s->hdr_info.response_content_length = 0;
- s->client_info.transfer_encoding = HttpTransact::NO_TRANSFER_ENCODING;
- s->server_info.transfer_encoding = HttpTransact::NO_TRANSFER_ENCODING;
+ s->client_info.transfer_encoding = HttpTransact::NO_TRANSFER_ENCODING;
+ s->server_info.transfer_encoding = HttpTransact::NO_TRANSFER_ENCODING;
}
handle_response_keep_alive_headers(s, outgoing_version, outgoing_response);
@@ -8181,7 +8181,7 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
e = c + user_agent_value_len - 4;
while (1) {
slen = (int)(e - c);
- c = (const char *)memchr(c, 'M', slen);
+ c = (const char *)memchr(c, 'M', slen);
if (c == NULL || (e - c) < 3)
break;
if ((c[1] == 'S') && (c[2] == 'I') && (c[3] == 'E')) {
@@ -8227,8 +8227,8 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
// After the body factory is called, a new "body" is allocated, and we must replace it. It is
// unfortunate that there's no way to avoid this fabrication even when there is no substitutions...
s->free_internal_msg_buffer();
- s->internal_msg_buffer = new_msg;
- s->internal_msg_buffer_size = len;
+ s->internal_msg_buffer = new_msg;
+ s->internal_msg_buffer_size = len;
s->internal_msg_buffer_fast_allocator_size = -1;
s->hdr_info.client_response.value_set(MIME_FIELD_CONTENT_TYPE, MIME_LEN_CONTENT_TYPE, body_type, strlen(body_type));
@@ -8241,7 +8241,7 @@ HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char
if (s->current.state == CONNECTION_ERROR) {
char *reason_buffer;
- int buf_len = sizeof(char) * (strlen(get_error_string(s->cause_of_death_errno)) + 50);
+ int buf_len = sizeof(char) * (strlen(get_error_string(s->cause_of_death_errno)) + 50);
reason_buffer = (char *)alloca(buf_len);
snprintf(reason_buffer, buf_len, "Connect Error <%s/%d>", get_error_string(s->cause_of_death_errno), s->cause_of_death_errno);
reason_phrase = reason_buffer;
@@ -8275,7 +8275,7 @@ HttpTransact::build_redirect_response(State *s)
char body_language[256], body_type[256];
HTTPStatus status_code = HTTP_STATUS_MOVED_TEMPORARILY;
- char *reason_phrase = (char *)(http_hdr_reason_lookup(status_code));
+ char *reason_phrase = (char *)(http_hdr_reason_lookup(status_code));
build_response(s, &s->hdr_info.client_response, s->client_info.http_version, status_code, reason_phrase);
@@ -8284,7 +8284,7 @@ HttpTransact::build_redirect_response(State *s)
// inserts expanded hostname into old url in order to //
// get scheme information, then puts the old url back. //
//////////////////////////////////////////////////////////
- u = s->hdr_info.client_request.url_get();
+ u = s->hdr_info.client_request.url_get();
old_host = u->host_get(&old_host_len);
u->host_set(s->dns_info.lookup_name, strlen(s->dns_info.lookup_name));
new_url = to_free = u->string_get(&s->arena, &new_url_len);
@@ -8310,7 +8310,7 @@ HttpTransact::build_redirect_response(State *s)
//////////////////////////
s->free_internal_msg_buffer();
s->internal_msg_buffer_fast_allocator_size = -1;
- s->internal_msg_buffer = body_factory->fabricate_with_old_api_build_va(
+ s->internal_msg_buffer = body_factory->fabricate_with_old_api_build_va(
"redirect#moved_temporarily", s, 8192, &s->internal_msg_buffer_size, body_language, sizeof(body_language), body_type,
sizeof(body_type), "%s <a href=\"%s\">%s</a>. %s.", "The document you requested is now", new_url, new_url,
"Please update your documents and bookmarks accordingly", NULL);
@@ -8327,7 +8327,7 @@ HttpTransact::build_upgrade_response(State *s)
DebugTxn("http_upgrade", "[HttpTransact::build_upgrade_response]");
// 101 Switching Protocols
- HTTPStatus status_code = HTTP_STATUS_SWITCHING_PROTOCOL;
+ HTTPStatus status_code = HTTP_STATUS_SWITCHING_PROTOCOL;
const char *reason_phrase = http_hdr_reason_lookup(status_code);
build_response(s, &s->hdr_info.client_response, s->client_info.http_version, status_code, reason_phrase);
@@ -8372,7 +8372,7 @@ ink_cluster_time(void)
int highest_delta;
ink_time_t local_time;
- local_time = Thread::get_hrtime() / HRTIME_SECOND;
+ local_time = Thread::get_hrtime() / HRTIME_SECOND;
highest_delta = (int)HttpConfig::m_master.cluster_time_delta;
// highest_delta =
// lmgmt->record_data->readInteger("proxy.process.http.cluster_delta",
@@ -8439,7 +8439,7 @@ void
HttpTransact::user_agent_connection_speed(State *s, ink_hrtime transfer_time, int64_t nbytes)
{
float bytes_per_hrtime = (transfer_time == 0) ? (nbytes) : ((float)nbytes / (float)(int64_t)transfer_time);
- int bytes_per_sec = (int)(bytes_per_hrtime * HRTIME_SECOND);
+ int bytes_per_sec = (int)(bytes_per_hrtime * HRTIME_SECOND);
if (bytes_per_sec <= 100) {
HTTP_INCREMENT_DYN_STAT(http_user_agent_speed_bytes_per_sec_100_stat);
@@ -8712,7 +8712,7 @@ HttpTransact::client_result_stat(State *s, ink_hrtime total_time, ink_hrtime req
HTTP_INCREMENT_DYN_STAT(http_completed_requests_stat);
// Set the stat now that we know what happend
- ink_hrtime total_msec = ink_hrtime_to_msec(total_time);
+ ink_hrtime total_msec = ink_hrtime_to_msec(total_time);
ink_hrtime process_msec = ink_hrtime_to_msec(request_process_time);
switch (client_transaction_result) {
case CLIENT_TRANSACTION_RESULT_HIT_FRESH:
@@ -8758,7 +8758,7 @@ void
HttpTransact::origin_server_connection_speed(State *s, ink_hrtime transfer_time, int64_t nbytes)
{
float bytes_per_hrtime = (transfer_time == 0) ? (nbytes) : ((float)nbytes / (float)(int64_t)transfer_time);
- int bytes_per_sec = (int)(bytes_per_hrtime * HRTIME_SECOND);
+ int bytes_per_sec = (int)(bytes_per_hrtime * HRTIME_SECOND);
if (bytes_per_sec <= 100) {
HTTP_INCREMENT_DYN_STAT(http_origin_server_speed_bytes_per_sec_100_stat);
@@ -8788,19 +8788,19 @@ HttpTransact::update_size_and_time_stats(State *s, ink_hrtime total_time, ink_hr
int64_t origin_server_response_body_size, int pushed_response_header_size,
int64_t pushed_response_body_size, const TransactionMilestones &milestones)
{
- int64_t user_agent_request_size = user_agent_request_header_size + user_agent_request_body_size;
+ int64_t user_agent_request_size = user_agent_request_header_size + user_agent_request_body_size;
int64_t user_agent_response_size = user_agent_response_header_size + user_agent_response_body_size;
- int64_t user_agent_bytes = user_agent_request_size + user_agent_response_size;
+ int64_t user_agent_bytes = user_agent_request_size + user_agent_response_size;
- int64_t origin_server_request_size = origin_server_request_header_size + origin_server_request_body_size;
+ int64_t origin_server_request_size = origin_server_request_header_size + origin_server_request_body_size;
int64_t origin_server_response_size = origin_server_response_header_size + origin_server_response_body_size;
- int64_t origin_server_bytes = origin_server_request_size + origin_server_response_size;
+ int64_t origin_server_bytes = origin_server_request_size + origin_server_response_size;
// Background fill stats
switch (s->state_machine->background_fill) {
case BACKGROUND_FILL_COMPLETED: {
int64_t bg_size = origin_server_response_body_size - user_agent_response_body_size;
- bg_size = max((int64_t)0, bg_size);
+ bg_size = max((int64_t)0, bg_size);
HTTP_SUM_DYN_STAT(http_background_fill_bytes_completed_stat, bg_size);
break;
}
@@ -9002,7 +9002,7 @@ HttpTransact::update_size_and_time_stats(State *s, ink_hrtime total_time, ink_hr
void
HttpTransact::delete_warning_value(HTTPHdr *to_warn, HTTPWarningCode warning_code)
{
- int w_code = (int)warning_code;
+ int w_code = (int)warning_code;
MIMEField *field = to_warn->field_find(MIME_FIELD_WARNING, MIME_LEN_WARNING);
;
@@ -9017,7 +9017,7 @@ HttpTransact::delete_warning_value(HTTPHdr *to_warn, HTTPWarningCode warning_cod
int value_len;
MIMEField *new_field = NULL;
- val_code = iter.get_first_int(field, &valid);
+ val_code = iter.get_first_int(field, &valid);
while (valid) {
if (val_code == w_code) {
diff --git a/proxy/http/HttpTransact.h b/proxy/http/HttpTransact.h
index 4fddf58..858426b 100644
--- a/proxy/http/HttpTransact.h
+++ b/proxy/http/HttpTransact.h
@@ -65,7 +65,7 @@
if ((H)->valid()) { \
do { \
used = 0; \
- tmp = offset; \
+ tmp = offset; \
done = (H)->print(b, 4095, &used, &tmp); \
offset += used; \
b[used] = '\0'; \
@@ -77,7 +77,7 @@
}
#define TRANSACT_SETUP_RETURN(n, r) \
- s->next_action = n; \
+ s->next_action = n; \
s->transact_return_point = r; \
DebugSpecific((s->state_machine && s->state_machine->debug_on), "http_trans", "Next action %s; %s", #n, #r);
@@ -144,45 +144,45 @@ enum ViaStringIndex_t {
enum ViaString_t {
// client stuff
- VIA_CLIENT_STRING = 'u',
- VIA_CLIENT_ERROR = 'E',
- VIA_CLIENT_IMS = 'I',
+ VIA_CLIENT_STRING = 'u',
+ VIA_CLIENT_ERROR = 'E',
+ VIA_CLIENT_IMS = 'I',
VIA_CLIENT_NO_CACHE = 'N',
- VIA_CLIENT_COOKIE = 'C',
- VIA_CLIENT_SIMPLE = 'S',
+ VIA_CLIENT_COOKIE = 'C',
+ VIA_CLIENT_SIMPLE = 'S',
// cache lookup stuff
- VIA_CACHE_STRING = 'c',
- VIA_CACHE_MISS = 'M',
+ VIA_CACHE_STRING = 'c',
+ VIA_CACHE_MISS = 'M',
VIA_IN_CACHE_NOT_ACCEPTABLE = 'A',
- VIA_IN_CACHE_STALE = 'S',
- VIA_IN_CACHE_FRESH = 'H',
- VIA_IN_RAM_CACHE_FRESH = 'R',
+ VIA_IN_CACHE_STALE = 'S',
+ VIA_IN_CACHE_FRESH = 'H',
+ VIA_IN_RAM_CACHE_FRESH = 'R',
// server stuff
- VIA_SERVER_STRING = 's',
- VIA_SERVER_ERROR = 'E',
+ VIA_SERVER_STRING = 's',
+ VIA_SERVER_ERROR = 'E',
VIA_SERVER_NOT_MODIFIED = 'N',
- VIA_SERVER_SERVED = 'S',
+ VIA_SERVER_SERVED = 'S',
// cache fill stuff
VIA_CACHE_FILL_STRING = 'f',
- VIA_CACHE_DELETED = 'D',
- VIA_CACHE_WRITTEN = 'W',
- VIA_CACHE_UPDATED = 'U',
+ VIA_CACHE_DELETED = 'D',
+ VIA_CACHE_WRITTEN = 'W',
+ VIA_CACHE_UPDATED = 'U',
// proxy stuff
- VIA_PROXY_STRING = 'p',
- VIA_PROXY_NOT_MODIFIED = 'N',
- VIA_PROXY_SERVED = 'S',
+ VIA_PROXY_STRING = 'p',
+ VIA_PROXY_NOT_MODIFIED = 'N',
+ VIA_PROXY_SERVED = 'S',
VIA_PROXY_SERVER_REVALIDATED = 'R',
// errors
- VIA_ERROR_STRING = 'e',
- VIA_ERROR_NO_ERROR = 'N',
- VIA_ERROR_AUTHORIZATION = 'A',
- VIA_ERROR_CONNECTION = 'C',
- VIA_ERROR_DNS_FAILURE = 'D',
- VIA_ERROR_FORBIDDEN = 'F',
- VIA_ERROR_HEADER_SYNTAX = 'H',
- VIA_ERROR_SERVER = 'S',
- VIA_ERROR_TIMEOUT = 'T',
- VIA_ERROR_CACHE_READ = 'R',
+ VIA_ERROR_STRING = 'e',
+ VIA_ERROR_NO_ERROR = 'N',
+ VIA_ERROR_AUTHORIZATION = 'A',
+ VIA_ERROR_CONNECTION = 'C',
+ VIA_ERROR_DNS_FAILURE = 'D',
+ VIA_ERROR_FORBIDDEN = 'F',
+ VIA_ERROR_HEADER_SYNTAX = 'H',
+ VIA_ERROR_SERVER = 'S',
+ VIA_ERROR_TIMEOUT = 'T',
+ VIA_ERROR_CACHE_READ = 'R',
VIA_ERROR_MOVED_TEMPORARILY = 'M',
//
// Now the detailed stuff
@@ -190,41 +190,41 @@ enum ViaString_t {
VIA_DETAIL_SEPARATOR_STRING = ':',
// tunnelling
VIA_DETAIL_TUNNEL_DESCRIPTOR_STRING = 't',
- VIA_DETAIL_TUNNEL_HEADER_FIELD = 'F',
- VIA_DETAIL_TUNNEL_METHOD = 'M',
- VIA_DETAIL_TUNNEL_CACHE_OFF = 'O',
- VIA_DETAIL_TUNNEL_URL = 'U',
- VIA_DETAIL_TUNNEL_NO_FORWARD = 'N',
- VIA_DETAIL_TUNNEL_AUTHORIZATION = 'A',
+ VIA_DETAIL_TUNNEL_HEADER_FIELD = 'F',
+ VIA_DETAIL_TUNNEL_METHOD = 'M',
+ VIA_DETAIL_TUNNEL_CACHE_OFF = 'O',
+ VIA_DETAIL_TUNNEL_URL = 'U',
+ VIA_DETAIL_TUNNEL_NO_FORWARD = 'N',
+ VIA_DETAIL_TUNNEL_AUTHORIZATION = 'A',
// cache type
VIA_DETAIL_CACHE_DESCRIPTOR_STRING = 'c',
- VIA_DETAIL_CACHE = 'C',
- VIA_DETAIL_CLUSTER = 'L',
- VIA_DETAIL_ICP = 'I',
- VIA_DETAIL_PARENT = 'P',
- VIA_DETAIL_SERVER = 'S',
+ VIA_DETAIL_CACHE = 'C',
+ VIA_DETAIL_CLUSTER = 'L',
+ VIA_DETAIL_ICP = 'I',
+ VIA_DETAIL_PARENT = 'P',
+ VIA_DETAIL_SERVER = 'S',
// result of cache lookup
- VIA_DETAIL_HIT_CONDITIONAL = 'N',
- VIA_DETAIL_HIT_SERVED = 'H',
+ VIA_DETAIL_HIT_CONDITIONAL = 'N',
+ VIA_DETAIL_HIT_SERVED = 'H',
VIA_DETAIL_MISS_CONDITIONAL = 'I',
- VIA_DETAIL_MISS_NOT_CACHED = 'M',
- VIA_DETAIL_MISS_EXPIRED = 'S',
- VIA_DETAIL_MISS_CONFIG = 'C',
- VIA_DETAIL_MISS_CLIENT = 'U',
- VIA_DETAIL_MISS_METHOD = 'D',
- VIA_DETAIL_MISS_COOKIE = 'K',
+ VIA_DETAIL_MISS_NOT_CACHED = 'M',
+ VIA_DETAIL_MISS_EXPIRED = 'S',
+ VIA_DETAIL_MISS_CONFIG = 'C',
+ VIA_DETAIL_MISS_CLIENT = 'U',
+ VIA_DETAIL_MISS_METHOD = 'D',
+ VIA_DETAIL_MISS_COOKIE = 'K',
// result of icp suggested host lookup
VIA_DETAIL_ICP_DESCRIPTOR_STRING = 'i',
- VIA_DETAIL_ICP_SUCCESS = 'S',
- VIA_DETAIL_ICP_FAILURE = 'F',
+ VIA_DETAIL_ICP_SUCCESS = 'S',
+ VIA_DETAIL_ICP_FAILURE = 'F',
// result of pp suggested host lookup
VIA_DETAIL_PP_DESCRIPTOR_STRING = 'p',
- VIA_DETAIL_PP_SUCCESS = 'S',
- VIA_DETAIL_PP_FAILURE = 'F',
+ VIA_DETAIL_PP_SUCCESS = 'S',
+ VIA_DETAIL_PP_FAILURE = 'F',
// result of server suggested host lookup
VIA_DETAIL_SERVER_DESCRIPTOR_STRING = 's',
- VIA_DETAIL_SERVER_SUCCESS = 'S',
- VIA_DETAIL_SERVER_FAILURE = 'F'
+ VIA_DETAIL_SERVER_SUCCESS = 'S',
+ VIA_DETAIL_SERVER_FAILURE = 'F'
};
struct HttpApiInfo {
@@ -302,11 +302,11 @@ public:
};
enum CacheOpenWriteFailAction_t {
- CACHE_WL_FAIL_ACTION_DEFAULT = 0x00,
- CACHE_WL_FAIL_ACTION_ERROR_ON_MISS = 0x01,
- CACHE_WL_FAIL_ACTION_STALE_ON_REVALIDATE = 0x02,
+ CACHE_WL_FAIL_ACTION_DEFAULT = 0x00,
+ CACHE_WL_FAIL_ACTION_ERROR_ON_MISS = 0x01,
+ CACHE_WL_FAIL_ACTION_STALE_ON_REVALIDATE = 0x02,
CACHE_WL_FAIL_ACTION_ERROR_ON_MISS_STALE_ON_REVALIDATE = 0x03,
- CACHE_WL_FAIL_ACTION_ERROR_ON_MISS_OR_REVALIDATE = 0x04,
+ CACHE_WL_FAIL_ACTION_ERROR_ON_MISS_OR_REVALIDATE = 0x04,
TOTAL_CACHE_WL_FAIL_ACTION_TYPES
};
@@ -347,14 +347,14 @@ public:
};
enum HttpTransactMagic_t {
- HTTP_TRANSACT_MAGIC_ALIVE = 0x00001234,
- HTTP_TRANSACT_MAGIC_DEAD = 0xDEAD1234,
+ HTTP_TRANSACT_MAGIC_ALIVE = 0x00001234,
+ HTTP_TRANSACT_MAGIC_DEAD = 0xDEAD1234,
HTTP_TRANSACT_MAGIC_SEPARATOR = 0x12345678
};
enum ParentOriginRetry_t {
- PARENT_ORIGIN_UNDEFINED_RETRY = 0x0,
- PARENT_ORIGIN_SIMPLE_RETRY = 0x1,
+ PARENT_ORIGIN_UNDEFINED_RETRY = 0x0,
+ PARENT_ORIGIN_SIMPLE_RETRY = 0x1,
PARENT_ORIGIN_UNAVAILABLE_SERVER_RETRY = 0x2
};
@@ -428,9 +428,9 @@ public:
};
enum HttpRequestFlavor_t {
- REQ_FLAVOR_INTERCEPTED = 0,
- REQ_FLAVOR_REVPROXY = 1,
- REQ_FLAVOR_FWDPROXY = 2,
+ REQ_FLAVOR_INTERCEPTED = 0,
+ REQ_FLAVOR_REVPROXY = 1,
+ REQ_FLAVOR_FWDPROXY = 2,
REQ_FLAVOR_SCHEDULED_UPDATE = 3
};
@@ -777,7 +777,7 @@ public:
srv_port(0),
lookup_validated(true)
{
- srv_hostname[0] = '\0';
+ srv_hostname[0] = '\0';
srv_app.allotment.application1 = 0;
srv_app.allotment.application2 = 0;
}
@@ -1104,20 +1104,20 @@ public:
*via_ptr++ = ' ';
}
- via_string[VIA_CLIENT] = VIA_CLIENT_STRING;
- via_string[VIA_CACHE] = VIA_CACHE_STRING;
- via_string[VIA_SERVER] = VIA_SERVER_STRING;
- via_string[VIA_CACHE_FILL] = VIA_CACHE_FILL_STRING;
- via_string[VIA_PROXY] = VIA_PROXY_STRING;
- via_string[VIA_ERROR] = VIA_ERROR_STRING;
- via_string[VIA_ERROR_TYPE] = VIA_ERROR_NO_ERROR;
- via_string[VIA_DETAIL_SEPARATOR] = VIA_DETAIL_SEPARATOR_STRING;
+ via_string[VIA_CLIENT] = VIA_CLIENT_STRING;
+ via_string[VIA_CACHE] = VIA_CACHE_STRING;
+ via_string[VIA_SERVER] = VIA_SERVER_STRING;
+ via_string[VIA_CACHE_FILL] = VIA_CACHE_FILL_STRING;
+ via_string[VIA_PROXY] = VIA_PROXY_STRING;
+ via_string[VIA_ERROR] = VIA_ERROR_STRING;
+ via_string[VIA_ERROR_TYPE] = VIA_ERROR_NO_ERROR;
+ via_string[VIA_DETAIL_SEPARATOR] = VIA_DETAIL_SEPARATOR_STRING;
via_string[VIA_DETAIL_TUNNEL_DESCRIPTOR] = VIA_DETAIL_TUNNEL_DESCRIPTOR_STRING;
- via_string[VIA_DETAIL_CACHE_DESCRIPTOR] = VIA_DETAIL_CACHE_DESCRIPTOR_STRING;
- via_string[VIA_DETAIL_ICP_DESCRIPTOR] = VIA_DETAIL_ICP_DESCRIPTOR_STRING;
- via_string[VIA_DETAIL_PP_DESCRIPTOR] = VIA_DETAIL_PP_DESCRIPTOR_STRING;
+ via_string[VIA_DETAIL_CACHE_DESCRIPTOR] = VIA_DETAIL_CACHE_DESCRIPTOR_STRING;
+ via_string[VIA_DETAIL_ICP_DESCRIPTOR] = VIA_DETAIL_ICP_DESCRIPTOR_STRING;
+ via_string[VIA_DETAIL_PP_DESCRIPTOR] = VIA_DETAIL_PP_DESCRIPTOR_STRING;
via_string[VIA_DETAIL_SERVER_DESCRIPTOR] = VIA_DETAIL_SERVER_DESCRIPTOR_STRING;
- via_string[MAX_VIA_INDICES] = '\0';
+ via_string[MAX_VIA_INDICES] = '\0';
memset(user_args, 0, sizeof(user_args));
memset(&host_db_info, 0, sizeof(host_db_info));
@@ -1160,7 +1160,7 @@ public:
pristine_url.clear();
delete[] ranges;
- ranges = NULL;
+ ranges = NULL;
range_setup = RANGE_NONE;
return;
}
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index 2a85a6e..4ee77cc 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -45,9 +45,9 @@ inline static const char *
find_etag(const char *raw_tag_field, int raw_tag_field_len, int *length)
{
const char *quote;
- int etag_length = 0;
+ int etag_length = 0;
const char *etag_start = raw_tag_field;
- const char *etag_end = raw_tag_field + raw_tag_field_len;
+ const char *etag_end = raw_tag_field + raw_tag_field_len;
if ((raw_tag_field_len >= 2) && (etag_start[0] == 'W' && etag_start[1] == '/')) {
etag_start += 2;
@@ -168,9 +168,9 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
CacheLookupHttpConfig *http_config_params)
{
time_t current_age, best_age = CacheHighAgeWatermark;
- time_t t_now = 0;
- int best_index = -1;
- float best_Q = -1.0;
+ time_t t_now = 0;
+ int best_index = -1;
+ float best_Q = -1.0;
float unacceptable_Q = 0.0;
int alt_count = cache_vector->count();
@@ -200,8 +200,8 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
for (int i = 0; i < alt_count; i++) {
float Q;
- CacheHTTPInfo *obj = cache_vector->get(i);
- HTTPHdr *cached_request = obj->request_get();
+ CacheHTTPInfo *obj = cache_vector->get(i);
+ HTTPHdr *cached_request = obj->request_get();
HTTPHdr *cached_response = obj->response_get();
if (!(obj->object_key_get() == zero_key)) {
@@ -212,7 +212,7 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
if (alt_count > 1) {
if (t_now == 0)
- t_now = ink_cluster_time();
+ t_now = ink_cluster_time();
current_age = HttpTransactHeaders::calculate_document_age(obj->request_sent_time_get(), obj->response_received_time_get(),
cached_response, cached_response->get_date(), t_now);
// Overflow?
@@ -232,7 +232,7 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
offset = 0;
do {
used = 0;
- tmp = offset;
+ tmp = offset;
done = cached_request->print(b, sizeof(b) - 1, &used, &tmp);
offset += used;
b[used] = '\0';
@@ -242,7 +242,7 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
offset = 0;
do {
used = 0;
- tmp = offset;
+ tmp = offset;
done = cached_response->print(b, sizeof(b) - 1, &used, &tmp);
offset += used;
b[used] = '\0';
@@ -251,8 +251,8 @@ HttpTransactCache::SelectFromAlternates(CacheHTTPInfoVector *cache_vector, HTTPH
}
if ((Q > best_Q) || ((Q == best_Q) && (current_age <= best_age))) {
- best_Q = Q;
- best_age = current_age;
+ best_Q = Q;
+ best_age = current_age;
best_index = i;
}
}
@@ -346,7 +346,7 @@ HttpTransactCache::calculate_quality_of_match(CacheLookupHttpConfig *http_config
// Ignore it
q[1] = 1.0;
} else {
- accept_field = client_request->field_find(MIME_FIELD_ACCEPT_CHARSET, MIME_LEN_ACCEPT_CHARSET);
+ accept_field = client_request->field_find(MIME_FIELD_ACCEPT_CHARSET, MIME_LEN_ACCEPT_CHARSET);
cached_accept_field = obj_client_request->field_find(MIME_FIELD_ACCEPT_CHARSET, MIME_LEN_ACCEPT_CHARSET);
// absence in both requests counts as exact match
@@ -364,8 +364,8 @@ HttpTransactCache::calculate_quality_of_match(CacheLookupHttpConfig *http_config
// Ignore it
q[2] = 1.0;
} else {
- accept_field = client_request->field_find(MIME_FIELD_ACCEPT_ENCODING, MIME_LEN_ACCEPT_ENCODING);
- content_field = obj_origin_server_response->field_find(MIME_FIELD_CONTENT_ENCODING, MIME_LEN_CONTENT_ENCODING);
+ accept_field = client_request->field_find(MIME_FIELD_ACCEPT_ENCODING, MIME_LEN_ACCEPT_ENCODING);
+ content_field = obj_origin_server_response->field_find(MIME_FIELD_CONTENT_ENCODING, MIME_LEN_CONTENT_ENCODING);
cached_accept_field = obj_client_request->field_find(MIME_FIELD_ACCEPT_ENCODING, MIME_LEN_ACCEPT_ENCODING);
// absence in both requests counts as exact match
@@ -383,8 +383,8 @@ HttpTransactCache::calculate_quality_of_match(CacheLookupHttpConfig *http_config
// Ignore it
q[3] = 1.0;
} else {
- accept_field = client_request->field_find(MIME_FIELD_ACCEPT_LANGUAGE, MIME_LEN_ACCEPT_LANGUAGE);
- content_field = obj_origin_server_response->field_find(MIME_FIELD_CONTENT_LANGUAGE, MIME_LEN_CONTENT_LANGUAGE);
+ accept_field = client_request->field_find(MIME_FIELD_ACCEPT_LANGUAGE, MIME_LEN_ACCEPT_LANGUAGE);
+ content_field = obj_origin_server_response->field_find(MIME_FIELD_CONTENT_LANGUAGE, MIME_LEN_CONTENT_LANGUAGE);
cached_accept_field = obj_client_request->field_find(MIME_FIELD_ACCEPT_LANGUAGE, MIME_LEN_ACCEPT_LANGUAGE);
// absence in both requests counts as exact match
@@ -443,7 +443,7 @@ HttpTransactCache::calculate_quality_of_match(CacheLookupHttpConfig *http_config
info.m_qvalue = 0.0;
} else if (info.m_qvalue > 1.0) {
if (info.m_qvalue == FLT_MAX)
- force_alt = 1;
+ force_alt = 1;
info.m_qvalue = 1.0;
}
qvalue *= info.m_qvalue;
@@ -510,10 +510,10 @@ HttpTransactCache::calculate_quality_of_accept_match(MIMEField *accept_field, MI
char c_type[32], c_subtype[32];
Str *a_value;
StrList c_param_list, a_values_list;
- bool wildcard_type_present = false;
+ bool wildcard_type_present = false;
bool wildcard_subtype_present = false;
- float wildcard_type_q = 1.0;
- float wildcard_subtype_q = 1.0;
+ float wildcard_type_q = 1.0;
+ float wildcard_subtype_q = 1.0;
ink_assert((accept_field != NULL) && (content_field != NULL));
@@ -540,7 +540,7 @@ HttpTransactCache::calculate_quality_of_accept_match(MIMEField *accept_field, MI
for (a_value = a_values_list.head; a_value; a_value = a_value->next) {
// Get the raw string to the current comma-sep Accept field value
- a_raw = a_value->str;
+ a_raw = a_value->str;
a_raw_len = a_value->len;
// Extract the field value before the semicolon
@@ -562,16 +562,16 @@ HttpTransactCache::calculate_quality_of_accept_match(MIMEField *accept_field, MI
// Is there a wildcard in the type or subtype?
if (is_asterisk(a_type)) {
wildcard_type_present = true;
- wildcard_type_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
+ wildcard_type_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
} else if (is_asterisk(a_subtype) && (strcasecmp(a_type, c_type) == 0)) {
wildcard_subtype_present = true;
- wildcard_subtype_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
+ wildcard_subtype_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
} else {
// No wildcard. Do explicit matching of accept and content values.
if (do_content_types_match(a_type, a_subtype, c_type, c_subtype)) {
float tq;
tq = HttpCompat::find_Q_param_in_strlist(&a_param_list);
- q = (tq > q ? tq : q);
+ q = (tq > q ? tq : q);
}
}
}
@@ -628,12 +628,12 @@ HttpTransactCache::calculate_quality_of_accept_charset_match(MIMEField *accept_f
char *a_charset;
int a_charset_len;
const char *default_charset = "utf-8";
- bool wildcard_present = false;
- float wildcard_q = 1.0;
+ bool wildcard_present = false;
+ float wildcard_q = 1.0;
// prefer exact matches
if (accept_field && cached_accept_field) {
- a_raw = accept_field->value_get(&a_raw_len);
+ a_raw = accept_field->value_get(&a_raw_len);
ca_raw = cached_accept_field->value_get(&ca_raw_len);
if (a_raw && ca_raw && a_raw_len == ca_raw_len && !strncmp(a_raw, ca_raw, a_raw_len)) {
Debug("http_alternate", "Exact match for ACCEPT CHARSET");
@@ -656,7 +656,7 @@ HttpTransactCache::calculate_quality_of_accept_charset_match(MIMEField *accept_f
for (a_value = a_values_list.head; a_value; a_value = a_value->next) {
// Get the raw string to the current comma-sep Accept-Charset field value
- a_raw = a_value->str;
+ a_raw = a_value->str;
a_raw_len = a_value->len;
// Extract the field value before the semicolon
@@ -664,7 +664,7 @@ HttpTransactCache::calculate_quality_of_accept_charset_match(MIMEField *accept_f
HttpCompat::parse_semicolon_list(&a_param_list, a_raw, a_raw_len);
if (a_param_list.head) {
- a_charset = (char *)a_param_list.head->str;
+ a_charset = (char *)a_param_list.head->str;
a_charset_len = a_param_list.head->len;
} else
continue;
@@ -675,13 +675,13 @@ HttpTransactCache::calculate_quality_of_accept_charset_match(MIMEField *accept_f
// dont match wildcards //
if ((a_charset_len == 1) && (a_charset[0] == '*')) {
wildcard_present = true;
- wildcard_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
+ wildcard_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
} else {
// if type matches, get the Q factor //
if (does_charset_match(a_charset, c_charset)) {
float tq;
tq = HttpCompat::find_Q_param_in_strlist(&a_param_list);
- q = (tq > q ? tq : q);
+ q = (tq > q ? tq : q);
}
}
}
@@ -808,7 +808,7 @@ match_accept_content_encoding(const char *c_raw, MIMEField *accept_field, bool *
if (is_asterisk(a_encoding)) {
*wildcard_present = true;
- *wildcard_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
+ *wildcard_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
return true;
} else if (does_encoding_match(a_encoding, c_raw)) {
// if type matches, get the Q factor //
@@ -828,12 +828,12 @@ float
HttpTransactCache::calculate_quality_of_accept_encoding_match(MIMEField *accept_field, MIMEField *content_field,
MIMEField *cached_accept_field)
{
- float q = -1.0;
+ float q = -1.0;
bool is_identity_encoding = false;
const char *c_encoding;
int c_encoding_len;
bool wildcard_present = false;
- float wildcard_q = 1.0;
+ float wildcard_q = 1.0;
StrList c_values_list;
Str *c_value;
const char *a_raw, *ca_raw;
@@ -841,7 +841,7 @@ HttpTransactCache::calculate_quality_of_accept_encoding_match(MIMEField *accept_
// prefer exact matches
if (accept_field && cached_accept_field) {
- a_raw = accept_field->value_get(&a_raw_len);
+ a_raw = accept_field->value_get(&a_raw_len);
ca_raw = cached_accept_field->value_get(&ca_raw_len);
if (a_raw && ca_raw && a_raw_len == ca_raw_len && !strncmp(a_raw, ca_raw, a_raw_len)) {
Debug("http_alternate", "Exact match for ACCEPT ENCODING");
@@ -868,7 +868,7 @@ HttpTransactCache::calculate_quality_of_accept_encoding_match(MIMEField *accept_
} else {
// does this document have the identity encoding? //
for (c_value = c_values_list.head; c_value; c_value = c_value->next) {
- c_encoding = c_value->str;
+ c_encoding = c_value->str;
c_encoding_len = c_value->len;
if ((c_encoding_len >= 8) && (strncasecmp(c_encoding, "identity", 8) == 0)) {
is_identity_encoding = true;
@@ -1008,7 +1008,7 @@ match_accept_content_language(const char *c_raw, MIMEField *accept_field, bool *
accept_field->value_get_comma_list(&a_values_list);
for (a_value = a_values_list.head; a_value; a_value = a_value->next) {
- a_raw = a_value->str;
+ a_raw = a_value->str;
a_raw_len = a_value->len;
char *a_range;
@@ -1025,7 +1025,7 @@ match_accept_content_language(const char *c_raw, MIMEField *accept_field, bool *
// was specified, this document matches all accept headers. //
/////////////////////////////////////////////////////////////////////
if (a_param_list.head) {
- a_range = (char *)a_param_list.head->str;
+ a_range = (char *)a_param_list.head->str;
*a_range_length = a_param_list.head->len;
} else {
continue;
@@ -1033,7 +1033,7 @@ match_accept_content_language(const char *c_raw, MIMEField *accept_field, bool *
if (is_asterisk(a_range)) {
*wildcard_present = true;
- *wildcard_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
+ *wildcard_q = HttpCompat::find_Q_param_in_strlist(&a_param_list);
return true;
} else if (does_language_range_match(a_range, c_raw)) {
*q = tq;
@@ -1062,9 +1062,9 @@ HttpTransactCache::calculate_quality_of_accept_language_match(MIMEField *accept_
float q = -1.0;
int a_range_length;
bool wildcard_present = false;
- float wildcard_q = 1.0;
- float min_q = 1.0;
- bool match_found = false;
+ float wildcard_q = 1.0;
+ float min_q = 1.0;
+ bool match_found = false;
StrList c_values_list;
Str *c_value;
const char *c_raw, *a_raw, *ca_raw;
@@ -1072,7 +1072,7 @@ HttpTransactCache::calculate_quality_of_accept_language_match(MIMEField *accept_
// Bug 2393700 prefer exact matches
if (accept_field && cached_accept_field) {
- a_raw = accept_field->value_get(&a_raw_len);
+ a_raw = accept_field->value_get(&a_raw_len);
ca_raw = cached_accept_field->value_get(&ca_raw_len);
if (a_raw && ca_raw && a_raw_len == ca_raw_len && !strncmp(a_raw, ca_raw, a_raw_len)) {
Debug("http_alternate", "Exact match for ACCEPT LANGUAGE");
@@ -1104,7 +1104,7 @@ HttpTransactCache::calculate_quality_of_accept_language_match(MIMEField *accept_
// get Content-Language value //
if (match_accept_content_language(c_raw, accept_field, &wildcard_present, &wildcard_q, &q, &a_range_length)) {
- min_q = (min_q < q ? min_q : q);
+ min_q = (min_q < q ? min_q : q);
match_found = true;
}
}
@@ -1162,7 +1162,7 @@ HttpTransactCache::CalcVariability(CacheLookupHttpConfig *http_config_params, HT
if (content_type) {
HttpCompat::parse_mime_type_with_len(content_type, content_type_len, type, subtype, sizeof(type), sizeof(subtype));
} else {
- type[0] = '\0';
+ type[0] = '\0';
subtype[0] = '\0';
}
@@ -1239,7 +1239,7 @@ HttpTransactCache::CalcVariability(CacheLookupHttpConfig *http_config_params, HT
if (field_name_str == NULL)
field_name_str = (char *)field->str;
- MIMEField *cached_hdr_field = obj_client_request->field_find(field_name_str, field->len);
+ MIMEField *cached_hdr_field = obj_client_request->field_find(field_name_str, field->len);
MIMEField *current_hdr_field = client_request->field_find(field_name_str, field->len);
// Header values match? //
@@ -1325,13 +1325,13 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
// If-None-Match: may match weakly //
if (request->presence(MIME_PRESENCE_IF_NONE_MATCH)) {
int raw_etags_len, comma_sep_tag_list_len;
- const char *raw_etags = response->value_get(MIME_FIELD_ETAG, MIME_LEN_ETAG, &raw_etags_len);
+ const char *raw_etags = response->value_get(MIME_FIELD_ETAG, MIME_LEN_ETAG, &raw_etags_len);
const char *comma_sep_tag_list = NULL;
if (raw_etags) {
comma_sep_tag_list = request->value_get(MIME_FIELD_IF_NONE_MATCH, MIME_LEN_IF_NONE_MATCH, &comma_sep_tag_list_len);
if (!comma_sep_tag_list) {
- comma_sep_tag_list = "";
+ comma_sep_tag_list = "";
comma_sep_tag_list_len = 0;
}
@@ -1376,7 +1376,7 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
// If-Match: must match strongly //
if (request->presence(MIME_PRESENCE_IF_MATCH)) {
int raw_etags_len, comma_sep_tag_list_len;
- const char *raw_etags = response->value_get(MIME_FIELD_ETAG, MIME_LEN_ETAG, &raw_etags_len);
+ const char *raw_etags = response->value_get(MIME_FIELD_ETAG, MIME_LEN_ETAG, &raw_etags_len);
const char *comma_sep_tag_list = NULL;
if (raw_etags) {
@@ -1384,12 +1384,12 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
}
if (!comma_sep_tag_list) {
- comma_sep_tag_list = "";
+ comma_sep_tag_list = "";
comma_sep_tag_list_len = 0;
}
if (!raw_etags) {
- raw_etags = "";
+ raw_etags = "";
raw_etags_len = 0;
}
@@ -1418,7 +1418,7 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
// this is an ETag, similar to If-Match
if (!if_value || if_value[0] == '"' || (comma_sep_list_len > 1 && if_value[1] == '/')) {
if (!if_value) {
- if_value = "";
+ if_value = "";
comma_sep_list_len = 0;
}
@@ -1426,7 +1426,7 @@ HttpTransactCache::match_response_to_request_conditionals(HTTPHdr *request, HTTP
if (!raw_etags) {
raw_etags = "";
- raw_len = 0;
+ raw_len = 0;
}
if (do_strings_match_strongly(raw_etags, raw_len, if_value, comma_sep_list_len)) {
@@ -1504,7 +1504,7 @@ int
CacheLookupHttpConfig::unmarshal(Arena *arena, const char *buf, int buflen)
{
const char *p = buf;
- int length = buflen;
+ int length = buflen;
int len;
int32_t i32_tmp;
diff --git a/proxy/http/HttpTransactHeaders.cc b/proxy/http/HttpTransactHeaders.cc
index 2b06baf..9d4e2bd 100644
--- a/proxy/http/HttpTransactHeaders.cc
+++ b/proxy/http/HttpTransactHeaders.cc
@@ -87,7 +87,7 @@ HttpTransactHeaders::insert_supported_methods_in_response(HTTPHdr *response, int
char *p;
int i, is_supported;
- size_t bytes = 0;
+ size_t bytes = 0;
int num_methods_supported = 0;
MIMEField *field;
@@ -118,10 +118,10 @@ HttpTransactHeaders::insert_supported_methods_in_response(HTTPHdr *response, int
// step 3: get a big enough buffer
if (bytes <= sizeof(inline_buffer)) {
alloced_buffer = NULL;
- value_buffer = inline_buffer;
+ value_buffer = inline_buffer;
} else {
alloced_buffer = (char *)ats_malloc(bytes);
- value_buffer = alloced_buffer;
+ value_buffer = alloced_buffer;
}
// step 4: build the value
@@ -369,19 +369,19 @@ ink_time_t
HttpTransactHeaders::calculate_document_age(ink_time_t request_time, ink_time_t response_time, HTTPHdr *base_response,
ink_time_t base_response_date, ink_time_t now)
{
- ink_time_t age_value = base_response->get_age();
- ink_time_t date_value = 0;
- ink_time_t apparent_age = 0;
+ ink_time_t age_value = base_response->get_age();
+ ink_time_t date_value = 0;
+ ink_time_t apparent_age = 0;
ink_time_t corrected_received_age = 0;
- ink_time_t response_delay = 0;
- ink_time_t corrected_initial_age = 0;
- ink_time_t current_age = 0;
- ink_time_t resident_time = 0;
- ink_time_t now_value = 0;
+ ink_time_t response_delay = 0;
+ ink_time_t corrected_initial_age = 0;
+ ink_time_t current_age = 0;
+ ink_time_t resident_time = 0;
+ ink_time_t now_value = 0;
ink_time_t tmp_value = 0;
- tmp_value = base_response_date;
+ tmp_value = base_response_date;
date_value = (tmp_value > 0) ? tmp_value : 0;
// Deal with clock skew. Sigh.
@@ -401,10 +401,10 @@ HttpTransactHeaders::calculate_document_age(ink_time_t request_time, ink_time_t
current_age = -1; // Overflow from Age: header
} else {
corrected_received_age = max(apparent_age, age_value);
- response_delay = response_time - request_time;
- corrected_initial_age = corrected_received_age + response_delay;
- resident_time = now_value - response_time;
- current_age = corrected_initial_age + resident_time;
+ response_delay = response_time - request_time;
+ corrected_initial_age = corrected_received_age + response_delay;
+ resident_time = now_value - response_time;
+ current_age = corrected_initial_age + resident_time;
}
Debug("http_age", "[calculate_document_age] age_value: %" PRId64, (int64_t)age_value);
@@ -575,14 +575,14 @@ HttpTransactHeaders::generate_and_set_squid_codes(HTTPHdr *header, char *via_str
}
break;
case VIA_ERROR_DNS_FAILURE:
- log_code = SQUID_LOG_ERR_DNS_FAIL;
+ log_code = SQUID_LOG_ERR_DNS_FAIL;
hier_code = SQUID_HIER_NONE;
break;
case VIA_ERROR_FORBIDDEN:
log_code = SQUID_LOG_ERR_PROXY_DENIED;
break;
case VIA_ERROR_HEADER_SYNTAX:
- log_code = SQUID_LOG_ERR_INVALID_REQ;
+ log_code = SQUID_LOG_ERR_INVALID_REQ;
hier_code = SQUID_HIER_NONE;
break;
case VIA_ERROR_SERVER:
@@ -603,7 +603,7 @@ HttpTransactHeaders::generate_and_set_squid_codes(HTTPHdr *header, char *via_str
}
break;
case VIA_ERROR_CACHE_READ:
- log_code = SQUID_LOG_TCP_SWAPFAIL;
+ log_code = SQUID_LOG_TCP_SWAPFAIL;
hier_code = SQUID_HIER_NONE;
break;
default:
@@ -612,8 +612,8 @@ HttpTransactHeaders::generate_and_set_squid_codes(HTTPHdr *header, char *via_str
Debug("http_trans", "[Squid code generation] Hit/Miss: %c, Log: %c, Hier: %c", hit_miss_code, log_code, hier_code);
- squid_codes->log_code = log_code;
- squid_codes->hier_code = hier_code;
+ squid_codes->log_code = log_code;
+ squid_codes->hier_code = hier_code;
squid_codes->hit_miss_code = hit_miss_code;
}
@@ -644,7 +644,7 @@ void
HttpTransactHeaders::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)
{
- ink_time_t date = base->get_date();
+ ink_time_t date = base->get_date();
ink_time_t current_age = calculate_document_age(request_sent_time, response_received_time, base, date, now);
outgoing->set_age(current_age); // set_age() deals with overflow properly, so pass it along
@@ -719,10 +719,10 @@ HttpTransactHeaders::insert_via_header_in_request(HttpTransact::State *s, HTTPHd
}
char *incoming_via = s->via_string;
- int scheme = s->orig_scheme;
+ int scheme = s->orig_scheme;
ink_assert(scheme >= 0);
- int scheme_len = hdrtoken_index_to_length(scheme);
+ int scheme_len = hdrtoken_index_to_length(scheme);
int32_t hversion = header->version_get().m_version;
memcpy(via_string, hdrtoken_index_to_wks(scheme), scheme_len);
@@ -770,7 +770,7 @@ HttpTransactHeaders::insert_via_header_in_request(HttpTransact::State *s, HTTPHd
}
*via_string++ = ')';
- *via_string = 0;
+ *via_string = 0;
ink_assert((size_t)(via_string - new_via_string) < (sizeof(new_via_string) - 1));
header->value_append(MIME_FIELD_VIA, MIME_LEN_VIA, new_via_string, via_string - new_via_string, true);
@@ -780,7 +780,7 @@ void
HttpTransactHeaders::insert_hsts_header_in_response(HttpTransact::State *s, HTTPHdr *header)
{
char new_hsts_string[64];
- char *hsts_string = new_hsts_string;
+ char *hsts_string = new_hsts_string;
const char include_subdomains[] = "; includeSubDomains";
// add max-age
@@ -808,10 +808,10 @@ HttpTransactHeaders::insert_via_header_in_response(HttpTransact::State *s, HTTPH
}
char *incoming_via = s->via_string;
- int scheme = s->next_hop_scheme;
+ int scheme = s->next_hop_scheme;
ink_assert(scheme >= 0);
- int scheme_len = hdrtoken_index_to_length(scheme);
+ int scheme_len = hdrtoken_index_to_length(scheme);
int32_t hversion = header->version_get().m_version;
memcpy(via_string, hdrtoken_index_to_wks(scheme), scheme_len);
@@ -850,7 +850,7 @@ HttpTransactHeaders::insert_via_header_in_response(HttpTransact::State *s, HTTPH
}
*via_string++ = ')';
- *via_string = 0;
+ *via_string = 0;
ink_assert((size_t)(via_string - new_via_string) < (sizeof(new_via_string) - 1));
header->value_append(MIME_FIELD_VIA, MIME_LEN_VIA, new_via_string, via_string - new_via_string, true);
@@ -872,7 +872,7 @@ HttpTransactHeaders::insert_basic_realm_in_proxy_authenticate(const char *realm,
basic_realm += nstrcpy(basic_realm, "Basic realm=\"");
basic_realm += nstrcpy(basic_realm, (char *)realm);
*basic_realm++ = '"';
- *basic_realm = 0;
+ *basic_realm = 0;
MIMEField *auth;
if (false == bRevPrxy) {
@@ -901,7 +901,7 @@ HttpTransactHeaders::remove_conditional_headers(HTTPHdr *outgoing)
void
HttpTransactHeaders::remove_100_continue_headers(HttpTransact::State *s, HTTPHdr *outgoing)
{
- int len = 0;
+ int len = 0;
const char *expect = s->hdr_info.client_request.value_get(MIME_FIELD_EXPECT, MIME_LEN_EXPECT, &len);
if ((len == HTTP_LEN_100_CONTINUE) && (strncasecmp(expect, HTTP_VALUE_100_CONTINUE, HTTP_LEN_100_CONTINUE) == 0)) {
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index f46ae67..32694c4 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -106,24 +106,24 @@ ChunkedHandler::init(IOBufferReader *buffer_in, HttpTunnelProducer *p)
void
ChunkedHandler::init_by_action(IOBufferReader *buffer_in, Action action)
{
- running_sum = 0;
- num_digits = 0;
+ running_sum = 0;
+ num_digits = 0;
cur_chunk_size = 0;
- bytes_left = 0;
- truncation = false;
- this->action = action;
+ bytes_left = 0;
+ truncation = false;
+ this->action = action;
switch (action) {
case ACTION_DOCHUNK:
- dechunked_reader = buffer_in->mbuf->clone_reader(buffer_in);
+ dechunked_reader = buffer_in->mbuf->clone_reader(buffer_in);
dechunked_reader->mbuf->water_mark = min_block_transfer_bytes;
- chunked_buffer = new_MIOBuffer(CHUNK_IOBUFFER_SIZE_INDEX);
- chunked_size = 0;
+ chunked_buffer = new_MIOBuffer(CHUNK_IOBUFFER_SIZE_INDEX);
+ chunked_size = 0;
break;
case ACTION_DECHUNK:
- chunked_reader = buffer_in->mbuf->clone_reader(buffer_in);
+ chunked_reader = buffer_in->mbuf->clone_reader(buffer_in);
dechunked_buffer = new_MIOBuffer(BUFFER_SIZE_INDEX_256);
- dechunked_size = 0;
+ dechunked_size = 0;
break;
case ACTION_PASSTHRU:
chunked_reader = buffer_in->mbuf->clone_reader(buffer_in);
@@ -156,7 +156,7 @@ ChunkedHandler::clear()
void
ChunkedHandler::set_max_chunk_size(int64_t size)
{
- max_chunk_size = size ? size : DEFAULT_MAX_CHUNK_SIZE;
+ max_chunk_size = size ? size : DEFAULT_MAX_CHUNK_SIZE;
max_chunk_header_len = snprintf(max_chunk_header, sizeof(max_chunk_header), CHUNK_HEADER_FMT, max_chunk_size);
}
@@ -167,7 +167,7 @@ ChunkedHandler::read_size()
bool done = false;
while (chunked_reader->read_avail() > 0 && !done) {
- const char *tmp = chunked_reader->start();
+ const char *tmp = chunked_reader->start();
int64_t data_size = chunked_reader->block_read_avail();
ink_assert(data_size > 0);
@@ -191,7 +191,7 @@ ChunkedHandler::read_size()
if (num_digits == 0 || running_sum < 0) {
// Bogus chunk size
state = CHUNK_READ_ERROR;
- done = true;
+ done = true;
break;
} else {
state = CHUNK_READ_SIZE_CRLF; // now look for CRLF
@@ -202,14 +202,14 @@ ChunkedHandler::read_size()
Debug("http_chunk", "read chunk size of %d bytes", running_sum);
bytes_left = (cur_chunk_size = running_sum);
state = (running_sum == 0) ? CHUNK_READ_TRAILER_BLANK : CHUNK_READ_CHUNK;
- done = true;
+ done = true;
break;
}
} else if (state == CHUNK_READ_SIZE_START) {
if (ParseRules::is_lf(*tmp)) {
running_sum = 0;
- num_digits = 0;
- state = CHUNK_READ_SIZE;
+ num_digits = 0;
+ state = CHUNK_READ_SIZE;
}
}
tmp++;
@@ -288,7 +288,7 @@ ChunkedHandler::read_trailer()
bool done = false;
while (chunked_reader->is_read_avail_more_than(0) && !done) {
- const char *tmp = chunked_reader->start();
+ const char *tmp = chunked_reader->start();
int64_t data_size = chunked_reader->block_read_avail();
ink_assert(data_size > 0);
@@ -492,7 +492,7 @@ HttpTunnelProducer::backlog(uint64_t limit)
void
HttpTunnelProducer::set_throttle_src(HttpTunnelProducer *srcp)
{
- HttpTunnelProducer *p = this;
+ HttpTunnelProducer *p = this;
p->flow_control_source = srcp;
for (HttpTunnelConsumer *c = consumer_list.head; c; c = c->link.next) {
if (!c->is_sink()) {
@@ -537,9 +537,9 @@ void
HttpTunnel::init(HttpSM *sm_arg, ProxyMutex *amutex)
{
HttpConfigParams *params = sm_arg->t_state.http_config_param;
- sm = sm_arg;
- active = false;
- mutex = amutex;
+ sm = sm_arg;
+ active = false;
+ mutex = amutex;
ink_release_assert(reentrancy_count == 0);
SET_HANDLER(&HttpTunnel::main_handler);
flow_state.enabled_p = params->oride.flow_control_enabled;
@@ -622,7 +622,7 @@ HttpTunnel::deallocate_buffers()
if (producers[i].read_buffer != NULL) {
ink_assert(producers[i].vc != NULL);
free_MIOBuffer(producers[i].read_buffer);
- producers[i].read_buffer = NULL;
+ producers[i].read_buffer = NULL;
producers[i].buffer_start = NULL;
num++;
}
@@ -649,7 +649,7 @@ void
HttpTunnel::set_producer_chunking_action(HttpTunnelProducer *p, int64_t skip_bytes, TunnelChunkingAction_t action)
{
p->chunked_handler.skip_bytes = skip_bytes;
- p->chunking_action = action;
+ p->chunking_action = action;
switch (action) {
case TCA_CHUNK_CONTENT:
@@ -684,17 +684,17 @@ HttpTunnel::add_producer(VConnection *vc, int64_t nbytes_arg, IOBufferReader *re
ink_assert(reader_start->mbuf);
if ((p = alloc_producer()) != NULL) {
- p->vc = vc;
- p->nbytes = nbytes_arg;
- p->buffer_start = reader_start;
- p->read_buffer = reader_start->mbuf;
- p->vc_handler = sm_handler;
- p->vc_type = vc_type;
- p->name = name_arg;
+ p->vc = vc;
+ p->nbytes = nbytes_arg;
+ p->buffer_start = reader_start;
+ p->read_buffer = reader_start->mbuf;
+ p->vc_handler = sm_handler;
+ p->vc_type = vc_type;
+ p->name = name_arg;
p->chunking_action = TCA_PASSTHRU_DECHUNKED_CONTENT;
- p->do_chunking = false;
- p->do_dechunking = false;
+ p->do_chunking = false;
+ p->do_dechunking = false;
p->do_chunked_passthru = false;
p->init_bytes_done = reader_start->read_avail();
@@ -713,7 +713,7 @@ HttpTunnel::add_producer(VConnection *vc, int64_t nbytes_arg, IOBufferReader *re
// It just has data in the buffer
if (vc == HTTP_TUNNEL_STATIC_PRODUCER) {
ink_assert(p->ntodo == 0);
- p->alive = false;
+ p->alive = false;
p->read_success = true;
} else {
p->alive = true;
@@ -749,13 +749,13 @@ HttpTunnel::add_consumer(VConnection *vc, VConnection *producer, HttpConsumerHan
}
// Initialize the consumer structure
HttpTunnelConsumer *c = alloc_consumer();
- c->producer = p;
- c->vc = vc;
- c->alive = true;
- c->skip_bytes = skip_bytes;
- c->vc_handler = sm_handler;
- c->vc_type = vc_type;
- c->name = name_arg;
+ c->producer = p;
+ c->vc = vc;
+ c->alive = true;
+ c->skip_bytes = skip_bytes;
+ c->vc_handler = sm_handler;
+ c->vc_type = vc_type;
+ c->name = name_arg;
// Register the consumer with the producer
p->consumer_list.push(c);
@@ -888,8 +888,8 @@ HttpTunnel::producer_run(HttpTunnelProducer *p)
if (p->vc_type == HT_CACHE_READ && sm->t_state.range_setup == HttpTransact::RANGE_NOT_TRANSFORM_REQUESTED) {
ink_assert(sm->t_state.num_range_fields == 1); // we current just support only one range entry
read_start_pos = sm->t_state.ranges[0]._start;
- producer_n = (sm->t_state.ranges[0]._end - sm->t_state.ranges[0]._start) + 1;
- consumer_n = (producer_n + sm->client_response_hdr_bytes);
+ producer_n = (sm->t_state.ranges[0]._end - sm->t_state.ranges[0]._start) + 1;
+ consumer_n = (producer_n + sm->client_response_hdr_bytes);
} else if (p->nbytes >= 0) {
consumer_n = p->nbytes;
producer_n = p->ntodo;
@@ -961,8 +961,8 @@ HttpTunnel::producer_run(HttpTunnelProducer *p)
if (p->vc_type == HT_HTTP_CLIENT) {
ProxyClientTransaction *ua_vc = static_cast<ProxyClientTransaction *>(p->vc);
if (ua_vc->get_half_close_flag()) {
- c_write = c->buffer_reader->read_avail();
- p->alive = false;
+ c_write = c->buffer_reader->read_avail();
+ p->alive = false;
p->handler_state = HTTP_SM_POST_SUCCESS;
}
}
@@ -1035,8 +1035,8 @@ HttpTunnel::producer_run(HttpTunnelProducer *p)
// Everything is already in the buffer so mark the producer as done. We need to notify
// state machine that everything is done. We use a special event to say the producers is
// done but we didn't do anything
- p->alive = false;
- p->read_success = true;
+ p->alive = false;
+ p->read_success = true;
p->handler_state = HTTP_SM_POST_SUCCESS;
Debug("http_tunnel", "[%" PRId64 "] [tunnel_run] producer already done", sm->sm_id);
producer_handler(HTTP_TUNNEL_EVENT_PRECOMPLETE, p);
@@ -1107,7 +1107,7 @@ HttpTunnel::producer_handler_chunked(int event, HttpTunnelProducer *p)
}
p->last_event = p->chunked_handler.last_server_event = event;
- bool done = p->chunked_handler.process_chunked_content();
+ bool done = p->chunked_handler.process_chunked_content();
// If we couldn't understand the encoding, return
// an error
@@ -1255,7 +1255,7 @@ HttpTunnel::producer_handler(int event, HttpTunnelProducer *p)
case VC_EVENT_ACTIVE_TIMEOUT:
case VC_EVENT_INACTIVITY_TIMEOUT:
case HTTP_TUNNEL_EVENT_CONSUMER_DETACH:
- p->alive = false;
+ p->alive = false;
p->bytes_read = p->read_vio->ndone;
// Interesting tunnel event, call SM
jump_point = p->vc_handler;
@@ -1291,7 +1291,7 @@ HttpTunnel::consumer_reenable(HttpTunnelConsumer *c)
// the backlog short cuts quit when the value is equal (or
// greater) to the target, we use strict comparison only for
// checking low water, otherwise the flow control can stall out.
- uint64_t backlog = (flow_state.enabled_p && p->is_source()) ? p->backlog(flow_state.high_water) : 0;
+ uint64_t backlog = (flow_state.enabled_p && p->is_source()) ? p->backlog(flow_state.high_water) : 0;
HttpTunnelProducer *srcp = p->flow_control_source;
if (backlog >= flow_state.high_water) {
@@ -1439,7 +1439,7 @@ HttpTunnel::chain_abort_all(HttpTunnelProducer *p)
while (c) {
if (c->alive) {
- c->alive = false;
+ c->alive = false;
c->write_vio = NULL;
c->vc->do_io_close(EHTTP_ERROR);
update_stats_after_abort(c->vc_type);
@@ -1450,7 +1450,7 @@ HttpTunnel::chain_abort_all(HttpTunnelProducer *p)
// freeing to avoid looks introduced by
// blind tunneling
HttpTunnelProducer *selfp = c->self_producer;
- c->self_producer = NULL;
+ c->self_producer = NULL;
chain_abort_all(selfp);
}
@@ -1480,8 +1480,8 @@ void
HttpTunnel::finish_all_internal(HttpTunnelProducer *p, bool chain)
{
ink_assert(p->alive == false);
- HttpTunnelConsumer *c = p->consumer_list.head;
- int64_t total_bytes = 0;
+ HttpTunnelConsumer *c = p->consumer_list.head;
+ int64_t total_bytes = 0;
TunnelChunkingAction_t action = p->chunking_action;
while (c) {
@@ -1612,7 +1612,7 @@ HttpTunnel::main_handler(int event, void *data)
{
HttpTunnelProducer *p = NULL;
HttpTunnelConsumer *c = NULL;
- bool sm_callback = false;
+ bool sm_callback = false;
++reentrancy_count;
@@ -1638,7 +1638,7 @@ HttpTunnel::main_handler(int event, void *data)
if (call_sm || (sm_callback && !is_tunnel_alive())) {
if (reentrancy_count == 1) {
reentrancy_count = 0;
- active = false;
+ active = false;
sm->handleEvent(HTTP_TUNNEL_EVENT_DONE, this);
return EVENT_DONE;
} else {
@@ -1706,9 +1706,9 @@ HttpTunnel::allocate_redirect_postdata_buffers(IOBufferReader *ua_reader)
// TODO: This is uncool, shouldn't this use the class allocator or proxy allocator ?
// If fixed, obviously also fix the deallocator.
if (postbuf == NULL) {
- postbuf = new PostDataBuffers();
- postbuf->ua_buffer_reader = ua_reader;
- postbuf->postdata_copy_buffer = new_MIOBuffer(alloc_index);
+ postbuf = new PostDataBuffers();
+ postbuf->ua_buffer_reader = ua_reader;
+ postbuf->postdata_copy_buffer = new_MIOBuffer(alloc_index);
postbuf->postdata_copy_buffer_start = postbuf->postdata_copy_buffer->alloc_reader();
allocate_redirect_postdata_producer_buffer();
} else {
@@ -1735,7 +1735,7 @@ HttpTunnel::deallocate_redirect_postdata_buffers()
}
if (postbuf->postdata_copy_buffer != NULL) {
free_MIOBuffer(postbuf->postdata_copy_buffer);
- postbuf->postdata_copy_buffer = NULL;
+ postbuf->postdata_copy_buffer = NULL;
postbuf->postdata_copy_buffer_start = NULL; // deallocated by the buffer
}
delete postbuf;
diff --git a/proxy/http/HttpUpdateSM.cc b/proxy/http/HttpUpdateSM.cc
index 42cd9e2..3c190f5 100644
--- a/proxy/http/HttpUpdateSM.cc
+++ b/proxy/http/HttpUpdateSM.cc
@@ -62,7 +62,7 @@ HttpUpdateSM::start_scheduled_update(Continuation *cont, HTTPHdr *request)
SCOPED_MUTEX_LOCK(lock, this->mutex, this_ethread());
// Set up the Action
- cb_cont = cont;
+ cb_cont = cont;
cb_action = cont;
start_sub_sm();
@@ -74,7 +74,7 @@ HttpUpdateSM::start_scheduled_update(Continuation *cont, HTTPHdr *request)
// Fix ME: What should these be set to since there is not a
// real client
ats_ip4_set(&t_state.client_info.src_addr, htonl(INADDR_LOOPBACK), 0);
- t_state.backdoor_request = 0;
+ t_state.backdoor_request = 0;
t_state.client_info.port_attribute = HttpProxyPort::TRANSPORT_DEFAULT;
t_state.req_flavor = HttpTransact::REQ_FLAVOR_SCHEDULED_UPDATE;
@@ -156,9 +156,9 @@ HttpUpdateSM::handle_api_return()
case HttpTransact::SM_ACTION_INTERNAL_CACHE_NOOP:
case HttpTransact::SM_ACTION_SEND_ERROR_CACHE_NOOP:
case HttpTransact::SM_ACTION_SERVE_FROM_CACHE: {
- cb_event = HTTP_SCH_UPDATE_EVENT_NOT_CACHED;
+ cb_event = HTTP_SCH_UPDATE_EVENT_NOT_CACHED;
t_state.squid_codes.log_code = SQUID_LOG_TCP_MISS;
- terminate_sm = true;
+ terminate_sm = true;
return;
}
@@ -186,7 +186,7 @@ HttpUpdateSM::set_next_state()
{
if (t_state.cache_info.action == HttpTransact::CACHE_DO_NO_ACTION || t_state.cache_info.action == HttpTransact::CACHE_DO_SERVE) {
if (t_state.next_action == HttpTransact::SM_ACTION_SERVE_FROM_CACHE) {
- cb_event = HTTP_SCH_UPDATE_EVENT_NO_ACTION;
+ cb_event = HTTP_SCH_UPDATE_EVENT_NO_ACTION;
t_state.squid_codes.log_code = SQUID_LOG_TCP_HIT;
} else {
t_state.squid_codes.log_code = SQUID_LOG_TCP_MISS;
diff --git a/proxy/http/RegressionHttpTransact.cc b/proxy/http/RegressionHttpTransact.cc
index 4eb94d9..d333db2 100644
--- a/proxy/http/RegressionHttpTransact.cc
+++ b/proxy/http/RegressionHttpTransact.cc
@@ -42,7 +42,7 @@ setup_client_request(HttpSM *sm, const char *scheme, const char *request)
{
init_sm(sm);
- MIOBuffer *read_buffer = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
+ MIOBuffer *read_buffer = new_MIOBuffer(HTTP_HEADER_BUFFER_SIZE_INDEX);
IOBufferReader *buffer_reader = read_buffer->alloc_reader();
read_buffer->write(request, strlen(request));
diff --git a/proxy/http/TestUrl.cc b/proxy/http/TestUrl.cc
index f30f748..fc5b78c 100644
--- a/proxy/http/TestUrl.cc
+++ b/proxy/http/TestUrl.cc
@@ -29,24 +29,24 @@ URL *
create_url(const char *url_string)
{
char buf[4096];
- int len = 0;
+ int len = 0;
URL *url_p = new URL(url_string);
- URL &url = *url_p;
+ URL &url = *url_p;
cout << "scheme : " << url.getScheme() << endl;
- len = url.getUserName(buf, sizeof(buf));
+ len = url.getUserName(buf, sizeof(buf));
buf[len] = '\0';
cout << "user name : " << buf << endl;
cout << "UserNameExists: " << url.userNameExists() << endl;
cout << "UserNameEmpty : " << url.userNameEmpty() << endl;
- len = url.getPassword(buf, sizeof(buf));
+ len = url.getPassword(buf, sizeof(buf));
buf[len] = '\0';
cout << "password : " << buf << endl;
cout << "PasswordExists: " << url.passwordExists() << endl;
cout << "PasswordEmpty : " << url.passwordEmpty() << endl;
- len = url.getHost(buf, sizeof(buf));
+ len = url.getHost(buf, sizeof(buf));
buf[len] = '\0';
cout << "host : " << buf << endl;
cout << "HostEmpty : " << url.hostEmpty() << endl;
@@ -60,16 +60,16 @@ create_url(const char *url_string)
case URL_SCHEME_NONE:
case URL_SCHEME_HTTP:
case URL_SCHEME_HTTPS:
- len = url.getHttpPath(buf, sizeof(buf));
+ len = url.getHttpPath(buf, sizeof(buf));
buf[len] = '\0';
cout << "http path : " << buf << endl;
- len = url.getParams(buf, sizeof(buf));
+ len = url.getParams(buf, sizeof(buf));
buf[len] = '\0';
cout << "http params : " << buf << endl;
- len = url.getQuery(buf, sizeof(buf));
+ len = url.getQuery(buf, sizeof(buf));
buf[len] = '\0';
cout << "http query : " << buf << endl;
- len = url.getFragment(buf, sizeof(buf));
+ len = url.getFragment(buf, sizeof(buf));
buf[len] = '\0';
cout << "http fragment : " << buf << endl;
break;
diff --git a/proxy/http/remap/AclFiltering.cc b/proxy/http/remap/AclFiltering.cc
index 6a545f3..53bc8a3 100644
--- a/proxy/http/remap/AclFiltering.cc
+++ b/proxy/http/remap/AclFiltering.cc
@@ -50,7 +50,7 @@ acl_filter_rule::reset(void)
in_ip_array[i].reset();
}
in_ip_valid = 0;
- internal = 0;
+ internal = 0;
}
acl_filter_rule::acl_filter_rule()
@@ -130,7 +130,7 @@ acl_filter_rule::print(void)
acl_filter_rule *
acl_filter_rule::find_byname(acl_filter_rule *list, const char *_name)
{
- int _name_size = 0;
+ int _name_size = 0;
acl_filter_rule *rp = 0;
if (likely(list && _name && (_name_size = strlen(_name)) > 0)) {
for (rp = list; rp; rp = rp->next) {
@@ -173,7 +173,7 @@ acl_filter_rule::requeue_in_active_list(acl_filter_rule **list, acl_filter_rule
if (r->active_queue_flag == 0)
break;
}
- (*rpp = rp)->next = r;
+ (*rpp = rp)->next = r;
rp->active_queue_flag = 1;
}
}
@@ -193,7 +193,7 @@ acl_filter_rule::requeue_in_passive_list(acl_filter_rule **list, acl_filter_rule
}
for (rpp = list; *rpp; rpp = &((*rpp)->next))
;
- (*rpp = rp)->next = NULL;
+ (*rpp = rp)->next = NULL;
rp->active_queue_flag = 0;
}
}
diff --git a/proxy/http/remap/AclFiltering.h b/proxy/http/remap/AclFiltering.h
index ef04f9c..5e2303f 100644
--- a/proxy/http/remap/AclFiltering.h
+++ b/proxy/http/remap/AclFiltering.h
@@ -35,8 +35,8 @@
// ACL like filtering defs (per one remap rule)
static int const ACL_FILTER_MAX_SRC_IP = 128;
-static int const ACL_FILTER_MAX_IN_IP = 8;
-static int const ACL_FILTER_MAX_ARGV = 512;
+static int const ACL_FILTER_MAX_IN_IP = 8;
+static int const ACL_FILTER_MAX_ARGV = 512;
struct src_ip_info_t {
IpEndpoint start; ///< Minimum value in range.
diff --git a/proxy/http/remap/RemapConfig.cc b/proxy/http/remap/RemapConfig.cc
index 6a33352..4565fb2 100644
--- a/proxy/http/remap/RemapConfig.cc
+++ b/proxy/http/remap/RemapConfig.cc
@@ -263,7 +263,7 @@ parse_remap_fragment(const char *path, BUILD_TABLE_INFO *bti, char *errbuf, size
}
nbti.rules_list = bti->rules_list;
- nbti.rewrite = bti->rewrite;
+ nbti.rewrite = bti->rewrite;
// XXX at this point, we need to register the included file(s) with the management subsystem
// so that we can correctly reload them when they change. Otherwise, the operator will have to
@@ -481,7 +481,7 @@ remap_validate_filter_args(acl_filter_rule **rule_pp, const char **argv, int arg
else if (!strcasecmp(argptr, "PUSH"))
m = HTTP_WKSIDX_PUSH;
if (m != -1) {
- m = m - HTTP_WKSIDX_CONNECT; // get method index
+ m = m - HTTP_WKSIDX_CONNECT; // get method index
rule->standard_method_lookup[m] = true;
} else {
Debug("url_rewrite", "[validate_filter_args] Using nonstandard method [%s]", argptr);
@@ -600,7 +600,7 @@ unsigned long
remap_check_option(const char **argv, int argc, unsigned long findmode, int *_ret_idx, const char **argptr)
{
unsigned long ret_flags = 0;
- int idx = 0;
+ int idx = 0;
if (argptr)
*argptr = NULL;
@@ -773,12 +773,12 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
snprintf(errbuf, errbufsize, "Can't load plugin \"%s\" - %s", c, err ? err : "Unknown dlopen() error");
return -4;
}
- pi->fp_tsremap_init = (remap_plugin_info::_tsremap_init *)dlsym(pi->dlh, TSREMAP_FUNCNAME_INIT);
- pi->fp_tsremap_done = (remap_plugin_info::_tsremap_done *)dlsym(pi->dlh, TSREMAP_FUNCNAME_DONE);
+ pi->fp_tsremap_init = (remap_plugin_info::_tsremap_init *)dlsym(pi->dlh, TSREMAP_FUNCNAME_INIT);
+ pi->fp_tsremap_done = (remap_plugin_info::_tsremap_done *)dlsym(pi->dlh, TSREMAP_FUNCNAME_DONE);
pi->fp_tsremap_new_instance = (remap_plugin_info::_tsremap_new_instance *)dlsym(pi->dlh, TSREMAP_FUNCNAME_NEW_INSTANCE);
pi->fp_tsremap_delete_instance =
(remap_plugin_info::_tsremap_delete_instance *)dlsym(pi->dlh, TSREMAP_FUNCNAME_DELETE_INSTANCE);
- pi->fp_tsremap_do_remap = (remap_plugin_info::_tsremap_do_remap *)dlsym(pi->dlh, TSREMAP_FUNCNAME_DO_REMAP);
+ pi->fp_tsremap_do_remap = (remap_plugin_info::_tsremap_do_remap *)dlsym(pi->dlh, TSREMAP_FUNCNAME_DO_REMAP);
pi->fp_tsremap_os_response = (remap_plugin_info::_tsremap_os_response *)dlsym(pi->dlh, TSREMAP_FUNCNAME_OS_RESPONSE);
if (!pi->fp_tsremap_init) {
@@ -796,7 +796,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
return retcode;
}
memset(&ri, 0, sizeof(ri));
- ri.size = sizeof(ri);
+ ri.size = sizeof(ri);
ri.tsremap_version = TSREMAP_VERSION;
if (pi->fp_tsremap_init(&ri, tmpbuf, sizeof(tmpbuf) - 1) != TS_SUCCESS) {
@@ -855,7 +855,7 @@ remap_load_plugin(const char **argv, int argc, url_mapping *mp, char *errbuf, in
Debug("remap_plugin", "creating new plugin instance");
- void *ih = NULL;
+ void *ih = NULL;
TSReturnCode res = TS_SUCCESS;
if (pi->fp_tsremap_new_instance) {
res = pi->fp_tsremap_new_instance(parc, parv, &ih, tmpbuf, sizeof(tmpbuf) - 1);
@@ -892,9 +892,9 @@ process_regex_mapping_config(const char *from_host_lower, url_mapping *new_mappi
int substitution_count = 0;
int captures;
- reg_map->to_url_host_template = NULL;
+ reg_map->to_url_host_template = NULL;
reg_map->to_url_host_template_len = 0;
- reg_map->n_substitutions = 0;
+ reg_map->n_substitutions = 0;
reg_map->url_map = new_mapping;
@@ -929,7 +929,7 @@ process_regex_mapping_config(const char *from_host_lower, url_mapping *new_mappi
goto lFail;
}
reg_map->substitution_markers[reg_map->n_substitutions] = i;
- reg_map->substitution_ids[reg_map->n_substitutions] = substitution_id;
+ reg_map->substitution_ids[reg_map->n_substitutions] = substitution_id;
++reg_map->n_substitutions;
}
}
@@ -937,9 +937,9 @@ process_regex_mapping_config(const char *from_host_lower, url_mapping *new_mappi
// so the regex itself is stored in fromURL.host; string to match
// will be in the request; string to use for substitutions will be
// in this buffer
- str = new_mapping->toUrl.host_get(&str_index); // reusing str and str_index
+ str = new_mapping->toUrl.host_get(&str_index); // reusing str and str_index
reg_map->to_url_host_template_len = str_index;
- reg_map->to_url_host_template = static_cast<char *>(ats_malloc(str_index));
+ reg_map->to_url_host_template = static_cast<char *>(ats_malloc(str_index));
memcpy(reg_map->to_url_host_template, str, str_index);
return true;
@@ -947,7 +947,7 @@ process_regex_mapping_config(const char *from_host_lower, url_mapping *new_mappi
lFail:
if (reg_map->to_url_host_template) {
ats_free(reg_map->to_url_host_template);
- reg_map->to_url_host_template = NULL;
+ reg_map->to_url_host_template = NULL;
reg_map->to_url_host_template_len = 0;
}
return false;
@@ -973,7 +973,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
char *map_from, *map_from_start;
char *map_to, *map_to_start;
const char *tmp; // Appease the DEC compiler
- char *fromHost_lower = NULL;
+ char *fromHost_lower = NULL;
char *fromHost_lower_ptr = NULL;
char fromHost_lower_buf[1024];
url_mapping *new_mapping = NULL;
@@ -996,8 +996,8 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
Debug("url_rewrite", "[BuildTable] UrlRewrite::BuildTable()");
for (cur_line = tokLine(file_buf, &tok_state, '\\'); cur_line != NULL;) {
- reg_map = NULL;
- new_mapping = NULL;
+ reg_map = NULL;
+ new_mapping = NULL;
errStrBuf[0] = 0;
bti->reset();
@@ -1060,7 +1060,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
}
is_cur_mapping_regex = (strncasecmp("regex_", bti->paramv[0], 6) == 0);
- type_id_str = is_cur_mapping_regex ? (bti->paramv[0] + 6) : bti->paramv[0];
+ type_id_str = is_cur_mapping_regex ? (bti->paramv[0] + 6) : bti->paramv[0];
// Check to see whether is a reverse or forward mapping
if (!strcasecmp("reverse_map", type_id_str)) {
@@ -1101,13 +1101,13 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
char *c;
int ret = remap_check_option((const char **)bti->argv, bti->argc, REMAP_OPTFLG_MAP_ID, &idx);
if (ret & REMAP_OPTFLG_MAP_ID) {
- c = strchr(bti->argv[idx], (int)'=');
+ c = strchr(bti->argv[idx], (int)'=');
new_mapping->map_id = (unsigned int)atoi(++c);
}
}
map_from = bti->paramv[1];
- length = UrlWhack(map_from, &origLength);
+ length = UrlWhack(map_from, &origLength);
// FIX --- what does this comment mean?
//
@@ -1128,13 +1128,13 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
goto MAP_ERROR;
}
- map_to = bti->paramv[2];
- length = UrlWhack(map_to, &origLength);
+ map_to = bti->paramv[2];
+ length = UrlWhack(map_to, &origLength);
map_to_start = map_to;
- tmp = map_to;
+ tmp = map_to;
new_mapping->toUrl.create(NULL);
- rparse = new_mapping->toUrl.parse_no_path_component_breakdown(tmp, length);
+ rparse = new_mapping->toUrl.parse_no_path_component_breakdown(tmp, length);
map_to_start[origLength] = '\0'; // Unwhack
if (rparse != PARSE_DONE) {
@@ -1147,7 +1147,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
// we need to default the scheme to http
if (fromScheme == NULL || fromSchemeLen == 0) {
new_mapping->fromURL.scheme_set(URL_SCHEME_HTTP, URL_LEN_HTTP);
- fromScheme = new_mapping->fromURL.scheme_get(&fromSchemeLen);
+ fromScheme = new_mapping->fromURL.scheme_get(&fromSchemeLen);
new_mapping->wildcard_from_scheme = true;
}
toScheme = new_mapping->toUrl.scheme_get(&toSchemeLen);
@@ -1176,7 +1176,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
if (!strcasecmp(bti->paramv[3], "<default>") || !strcasecmp(bti->paramv[3], "default") ||
!strcasecmp(bti->paramv[3], "<default_redirect_url>") || !strcasecmp(bti->paramv[3], "default_redirect_url"))
new_mapping->default_redirect_url = true;
- new_mapping->redir_chunk_list = redirect_tag_str::parse_format_redirect_url(bti->paramv[3]);
+ new_mapping->redir_chunk_list = redirect_tag_str::parse_format_redirect_url(bti->paramv[3]);
for (int j = bti->paramc; j > 4; j--) {
if (bti->paramv[j - 1] != NULL) {
char refinfo_error_buf[1024];
@@ -1201,7 +1201,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
}
}
if (ri) {
- ri->next = new_mapping->referer_list;
+ ri->next = new_mapping->referer_list;
new_mapping->referer_list = ri;
}
}
@@ -1218,7 +1218,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
errStr = "Relative remappings must begin with a /";
goto MAP_ERROR;
} else {
- fromHost = "";
+ fromHost = "";
fromHostLen = 0;
}
} else {
@@ -1310,7 +1310,7 @@ remap_parse_config_bti(const char *path, BUILD_TABLE_INFO *bti)
(maptype == FORWARD_MAP || maptype == FORWARD_MAP_REFERER || maptype == FORWARD_MAP_WITH_RECV_PORT)) {
if ((remap_check_option((const char **)bti->argv, bti->argc, REMAP_OPTFLG_PLUGIN, &tok_count) & REMAP_OPTFLG_PLUGIN) != 0) {
int plugin_found_at = 0;
- int jump_to_argc = 0;
+ int jump_to_argc = 0;
// this loads the first plugin
if (remap_load_plugin((const char **)bti->argv, bti->argc, new_mapping, errStrBuf, sizeof(errStrBuf), 0,
diff --git a/proxy/http/remap/RemapPluginInfo.cc b/proxy/http/remap/RemapPluginInfo.cc
index 0b09fec..8bd08d6 100644
--- a/proxy/http/remap/RemapPluginInfo.cc
+++ b/proxy/http/remap/RemapPluginInfo.cc
@@ -56,7 +56,7 @@ remap_plugin_info::~remap_plugin_info()
remap_plugin_info *
remap_plugin_info::find_by_path(char *_path)
{
- int _path_size = 0;
+ int _path_size = 0;
remap_plugin_info *pi = 0;
if (likely(_path && (_path_size = strlen(_path)) > 0)) {
@@ -81,7 +81,7 @@ remap_plugin_info::add_to_list(remap_plugin_info *pi)
while (p->next)
p = p->next;
- p->next = pi;
+ p->next = pi;
pi->next = NULL;
}
}
diff --git a/proxy/http/remap/RemapPlugins.cc b/proxy/http/remap/RemapPlugins.cc
index 74f8675..7a3a595 100644
--- a/proxy/http/remap/RemapPlugins.cc
+++ b/proxy/http/remap/RemapPlugins.cc
@@ -31,8 +31,8 @@ RemapPlugins::run_plugin(remap_plugin_info *plugin)
TSRemapStatus plugin_retcode;
TSRemapRequestInfo rri;
url_mapping *map = _s->url_map.getMapping();
- URL *map_from = _s->url_map.getFromURL();
- URL *map_to = _s->url_map.getToURL();
+ URL *map_from = _s->url_map.getFromURL();
+ URL *map_to = _s->url_map.getToURL();
// This is the equivalent of TSHttpTxnClientReqGet(), which every remap plugin would
// have to call.
@@ -41,7 +41,7 @@ RemapPlugins::run_plugin(remap_plugin_info *plugin)
// Read-only URL's (TSMLoc's to the SDK)
rri.mapFromUrl = reinterpret_cast<TSMLoc>(map_from->m_url_impl);
- rri.mapToUrl = reinterpret_cast<TSMLoc>(map_to->m_url_impl);
+ rri.mapToUrl = reinterpret_cast<TSMLoc>(map_to->m_url_impl);
rri.requestUrl = reinterpret_cast<TSMLoc>(_request_url->m_url_impl);
rri.redirect = 0;
@@ -69,7 +69,7 @@ RemapPlugins::run_plugin(remap_plugin_info *plugin)
// Prepare State for the future
if (_s && _cur == 0) {
_s->fp_tsremap_os_response = plugin->fp_tsremap_os_response;
- _s->remap_plugin_instance = ih;
+ _s->remap_plugin_instance = ih;
}
plugin_retcode = plugin->fp_tsremap_do_remap(ih, _s ? reinterpret_cast<TSHttpTxn>(_s->state_machine) : NULL, &rri);
@@ -96,8 +96,8 @@ RemapPlugins::run_plugin(remap_plugin_info *plugin)
int
RemapPlugins::run_single_remap()
{
- url_mapping *map = _s->url_map.getMapping();
- remap_plugin_info *plugin = map->get_plugin(_cur); // get the nth plugin in our list of plugins
+ url_mapping *map = _s->url_map.getMapping();
+ remap_plugin_info *plugin = map->get_plugin(_cur); // get the nth plugin in our list of plugins
TSRemapStatus plugin_retcode = TSREMAP_NO_REMAP;
Debug("url_rewrite", "running single remap rule id %d for the %d%s time", map->map_id, _cur,
@@ -179,7 +179,7 @@ RemapPlugins::run_remap(int event, Event *e)
action.continuation->handleEvent(EVENT_REMAP_COMPLETE, NULL);
mutex.clear();
action.mutex.clear();
- mutex = NULL;
+ mutex = NULL;
action.mutex = NULL;
// THREAD_FREE(this, pluginAllocator, t);
pluginAllocator.free(this); // ugly
diff --git a/proxy/http/remap/RemapProcessor.cc b/proxy/http/remap/RemapProcessor.cc
index fd3e524..8ba5704 100644
--- a/proxy/http/remap/RemapProcessor.cc
+++ b/proxy/http/remap/RemapProcessor.cc
@@ -46,10 +46,10 @@ bool
RemapProcessor::setup_for_remap(HttpTransact::State *s)
{
Debug("url_rewrite", "setting up for remap: %p", s);
- URL *request_url = NULL;
- bool mapping_found = false;
+ URL *request_url = NULL;
+ bool mapping_found = false;
HTTPHdr *request_header = &s->hdr_info.client_request;
- char **redirect_url = &s->remap_redirect;
+ char **redirect_url = &s->remap_redirect;
const char *request_host;
int request_host_len;
int request_port;
@@ -74,13 +74,13 @@ RemapProcessor::setup_for_remap(HttpTransact::State *s)
return false;
}
- request_host = request_header->host_get(&request_host_len);
- request_port = request_header->port_get();
+ request_host = request_header->host_get(&request_host_len);
+ request_port = request_header->port_get();
proxy_request = request_header->is_target_in_url() || !s->reverse_proxy;
// Default to empty host.
if (!request_host) {
- request_host = "";
+ request_host = "";
request_host_len = 0;
}
@@ -115,7 +115,7 @@ RemapProcessor::setup_for_remap(HttpTransact::State *s)
// Save this information for later
// @amc: why is this done only for requests without a host in the URL?
- s->hh_info.host_len = request_host_len;
+ s->hh_info.host_len = request_host_len;
s->hh_info.request_host = request_host;
s->hh_info.request_port = request_port;
@@ -140,10 +140,10 @@ RemapProcessor::setup_for_remap(HttpTransact::State *s)
bool
RemapProcessor::finish_remap(HttpTransact::State *s)
{
- url_mapping *map = NULL;
+ url_mapping *map = NULL;
HTTPHdr *request_header = &s->hdr_info.client_request;
- URL *request_url = request_header->url_get();
- char **redirect_url = &s->remap_redirect;
+ URL *request_url = request_header->url_get();
+ char **redirect_url = &s->remap_redirect;
char host_hdr_buf[TS_MAX_HOST_NAME_LEN], tmp_referer_buf[4096], tmp_redirect_buf[4096], tmp_buf[2048], *c;
const char *remapped_host;
int remapped_host_len, remapped_port, tmp;
@@ -161,8 +161,8 @@ RemapProcessor::finish_remap(HttpTransact::State *s)
// Check referer filtering rules
if ((s->filter_mask & URL_REMAP_FILTER_REFERER) != 0 && (ri = map->referer_list) != 0) {
const char *referer_hdr = 0;
- int referer_len = 0;
- bool enabled_flag = map->optional_referer ? true : false;
+ int referer_len = 0;
+ bool enabled_flag = map->optional_referer ? true : false;
if (request_header->presence(MIME_PRESENCE_REFERER) &&
(referer_hdr = request_header->value_get(MIME_FIELD_REFERER, MIME_LEN_REFERER, &referer_len)) != NULL) {
@@ -215,7 +215,7 @@ RemapProcessor::finish_remap(HttpTransact::State *s)
}
}
tmp_redirect_buf[sizeof(tmp_redirect_buf) - 1] = 0;
- *redirect_url = ats_strdup(tmp_redirect_buf);
+ *redirect_url = ats_strdup(tmp_redirect_buf);
}
} else {
*redirect_url = ats_strdup(rewrite_table->http_default_redirect_url);
@@ -290,9 +290,9 @@ RemapProcessor::perform_remap(Continuation *cont, HttpTransact::State *s)
{
Debug("url_rewrite", "Beginning RemapProcessor::perform_remap");
HTTPHdr *request_header = &s->hdr_info.client_request;
- URL *request_url = request_header->url_get();
- url_mapping *map = s->url_map.getMapping();
- host_hdr_info *hh_info = &(s->hh_info);
+ URL *request_url = request_header->url_get();
+ url_mapping *map = s->url_map.getMapping();
+ host_hdr_info *hh_info = &(s->hh_info);
if (!map) {
Error("Could not find corresponding url_mapping for this transaction %p", s);
@@ -312,7 +312,7 @@ RemapProcessor::perform_remap(Continuation *cont, HttpTransact::State *s)
// Execute "inline" if not using separate remap threads.
ink_assert(cont->mutex->thread_holding == this_ethread());
- plugins->mutex = cont->mutex;
+ plugins->mutex = cont->mutex;
plugins->action = cont;
SET_CONTINUATION_HANDLER(plugins, &RemapPlugins::run_remap);
eventProcessor.schedule_imm(plugins, ET_REMAP);
diff --git a/proxy/http/remap/UrlMapping.cc b/proxy/http/remap/UrlMapping.cc
index 7f15961..8c6efb4 100644
--- a/proxy/http/remap/UrlMapping.cc
+++ b/proxy/http/remap/UrlMapping.cc
@@ -59,7 +59,7 @@ url_mapping::add_plugin(remap_plugin_info *i, void *ih)
if (_plugin_count >= MAX_REMAP_PLUGIN_CHAIN)
return false;
- _plugin_list[_plugin_count] = i;
+ _plugin_list[_plugin_count] = i;
_instance_data[_plugin_count] = ih;
++_plugin_count;
@@ -85,7 +85,7 @@ url_mapping::get_plugin(unsigned int index) const
void
url_mapping::delete_instance(unsigned int index)
{
- void *ih = get_instance(index);
+ void *ih = get_instance(index);
remap_plugin_info *p = get_plugin(index);
if (ih && p && p->fp_tsremap_delete_instance) {
@@ -102,7 +102,7 @@ url_mapping::~url_mapping()
redirect_tag_str *rc;
acl_filter_rule *afr;
- tag = (char *)ats_free_null(tag);
+ tag = (char *)ats_free_null(tag);
filter_redirect_url = (char *)ats_free_null(filter_redirect_url);
while ((r = referer_list) != 0) {
@@ -150,7 +150,7 @@ redirect_tag_str::parse_format_redirect_url(char *url)
char *c;
redirect_tag_str *r, **rr;
redirect_tag_str *list = 0;
- char type = 0;
+ char type = 0;
if (url && *url) {
for (rr = &list; *(c = url) != 0;) {
@@ -167,15 +167,15 @@ redirect_tag_str::parse_format_redirect_url(char *url)
r = new redirect_tag_str();
if (likely(r)) {
if ((r->type = type) == 's') {
- char svd = *c;
- *c = 0;
+ char svd = *c;
+ *c = 0;
r->chunk_str = ats_strdup(url);
- *c = svd;
- url = c;
+ *c = svd;
+ url = c;
} else
url += 2;
(*rr = r)->next = 0;
- rr = &(r->next);
+ rr = &(r->next);
// printf("\t***********'%c' - '%s'*******\n",r->type,r->chunk_str ? r->chunk_str : "<NULL>");
} else
break; /* memory allocation error */
@@ -195,7 +195,7 @@ referer_info::referer_info(char *_ref, bool *error_flag, char *errmsgbuf, int er
if (error_flag)
*error_flag = false;
- regx = NULL;
+ regx = NULL;
if (_ref) {
if (*_ref == '~') {
@@ -226,12 +226,12 @@ referer_info::referer_info(char *_ref, bool *error_flag, char *errmsgbuf, int er
referer_info::~referer_info()
{
ats_free(referer);
- referer = 0;
+ referer = 0;
referer_size = 0;
if (regx_valid) {
pcre_free(regx);
- regx = NULL;
+ regx = NULL;
regx_valid = false;
}
}
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index 86f305b..2ae1fa8 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -160,7 +160,7 @@ public:
set(url_mapping *m)
{
deleteToURL();
- _mapping = m;
+ _mapping = m;
_toURLPtr = m ? &(m->toUrl) : NULL;
}
@@ -192,9 +192,9 @@ public:
clear()
{
deleteToURL();
- _mapping = NULL;
+ _mapping = NULL;
_toURLPtr = NULL;
- _heap = NULL;
+ _heap = NULL;
}
private:
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index ce16b88..aab5918 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -45,7 +45,7 @@ SetHomePageRedirectFlag(url_mapping *new_mapping, URL &new_to_url)
{
int fromLen, toLen;
const char *from_path = new_mapping->fromURL.path_get(&fromLen);
- const char *to_path = new_to_url.path_get(&toLen);
+ const char *to_path = new_to_url.path_get(&toLen);
new_mapping->homePageRedirect = (from_path && !to_path) ? true : false;
}
@@ -69,7 +69,7 @@ UrlRewrite::UrlRewrite()
ats_scoped_str config_file_path;
forward_mappings.hash_lookup = reverse_mappings.hash_lookup = permanent_redirects.hash_lookup = temporary_redirects.hash_lookup =
- forward_mappings_with_recv_port.hash_lookup = NULL;
+ forward_mappings_with_recv_port.hash_lookup = NULL;
config_file_path = RecConfigReadConfigPath("proxy.config.url_remap.filename", "remap.config");
if (!config_file_path) {
@@ -141,7 +141,7 @@ url_mapping *
UrlRewrite::SetupBackdoorMapping()
{
const char from_url[] = "/ink/rh";
- const char to_url[] = "http://{backdoor}/ink/rh";
+ const char to_url[] = "http://{backdoor}/ink/rh";
url_mapping *mapping = new url_mapping;
@@ -250,7 +250,7 @@ UrlRewrite::_tableLookup(InkHashTable *h_table, URL *request_url, int request_po
void
url_rewrite_remap_request(const UrlMappingContainer &mapping_container, URL *request_url, int method)
{
- URL *map_to = mapping_container.getToURL();
+ URL *map_to = mapping_container.getToURL();
URL *map_from = mapping_container.getFromURL();
const char *toHost;
int toHostLen;
@@ -269,7 +269,7 @@ url_rewrite_remap_request(const UrlMappingContainer &mapping_container, URL *req
int toSchemeLen;
const char *requestPath;
int requestPathLen = 0;
- int fromPathLen = 0;
+ int fromPathLen = 0;
const char *toPath;
int toPathLen;
@@ -277,13 +277,13 @@ url_rewrite_remap_request(const UrlMappingContainer &mapping_container, URL *req
request_url->scheme_set(toScheme, toSchemeLen);
map_from->path_get(&fromPathLen);
- toPath = map_to->path_get(&toPathLen);
+ toPath = map_to->path_get(&toPathLen);
requestPath = request_url->path_get(&requestPathLen);
// Should be +3, little extra padding won't hurt. Use the stack allocation
// for better performance (bummer that arrays of variable length is not supported
// on Solaris CC.
- char *newPath = static_cast<char *>(alloca(sizeof(char) * ((requestPathLen - fromPathLen) + toPathLen + 8)));
+ char *newPath = static_cast<char *>(alloca(sizeof(char) * ((requestPathLen - fromPathLen) + toPathLen + 8)));
int newPathLen = 0;
*newPath = 0;
@@ -392,8 +392,8 @@ UrlRewrite::PerformACLFiltering(HttpTransact::State *s, url_mapping *map)
s->acl_filtering_performed = true; // small protection against reverse mapping
if (map->filter) {
- int method = s->hdr_info.client_request.method_get_wksidx();
- int method_wksidx = (method != -1) ? (method - HTTP_WKSIDX_CONNECT) : -1;
+ int method = s->hdr_info.client_request.method_get_wksidx();
+ int method_wksidx = (method != -1) ? (method - HTTP_WKSIDX_CONNECT) : -1;
bool client_enabled_flag = true;
ink_release_assert(ats_is_ip(&s->client_info.src_addr));
@@ -407,7 +407,7 @@ UrlRewrite::PerformACLFiltering(HttpTransact::State *s, url_mapping *map)
} else if (!rp->nonstandard_methods.empty()) {
int method_str_len;
const char *method_str = s->hdr_info.client_request.method_get(&method_str_len);
- match = rp->nonstandard_methods.count(std::string(method_str, method_str_len));
+ match = rp->nonstandard_methods.count(std::string(method_str, method_str_len));
}
}
@@ -510,7 +510,7 @@ UrlRewrite::Remap_redirect(HTTPHdr *request_header, URL *redirect_url)
return NONE;
}
- host = request_url->host_get(&host_len);
+ host = request_url->host_get(&host_len);
request_port = request_url->port_get();
if (host_len == 0 && reverse_proxy != 0) { // Server request. Use the host header to figure out where
@@ -519,7 +519,7 @@ UrlRewrite::Remap_redirect(HTTPHdr *request_header, URL *redirect_url)
const char *host_hdr = request_header->value_get(MIME_FIELD_HOST, MIME_LEN_HOST, &host_hdr_len);
if (!host_hdr) {
- host_hdr = "";
+ host_hdr = "";
host_hdr_len = 0;
}
@@ -528,7 +528,7 @@ UrlRewrite::Remap_redirect(HTTPHdr *request_header, URL *redirect_url)
if (tmp == NULL) {
host_len = host_hdr_len;
} else {
- host_len = tmp - host_hdr;
+ host_len = tmp - host_hdr;
request_port = ink_atoi(tmp + 1, host_hdr_len - host_len);
// If atoi fails, try the default for the
@@ -685,10 +685,10 @@ UrlRewrite::BuildTable(const char *path)
ink_assert(num_rules_redirect_temporary == 0);
ink_assert(num_rules_forward_with_recv_port == 0);
- forward_mappings.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
- reverse_mappings.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
- permanent_redirects.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
- temporary_redirects.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
+ forward_mappings.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
+ reverse_mappings.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
+ permanent_redirects.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
+ temporary_redirects.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
forward_mappings_with_recv_port.hash_lookup = ink_hash_table_create(InkHashTableKeyType_String);
if (!remap_parse_config(path, this)) {
@@ -736,7 +736,7 @@ UrlRewrite::TableInsert(InkHashTable *h_table, url_mapping *mapping, const char
UrlMappingPathIndex *ht_contents;
if (!src_host) {
- src_host = &src_host_tmp_buf[0];
+ src_host = &src_host_tmp_buf[0];
src_host_tmp_buf[0] = 0;
}
// Insert the new_mapping into hash table
@@ -781,8 +781,8 @@ UrlRewrite::_mappingLookup(MappingsStore &mappings, URL *request_url, int reques
}
request_host_lower[request_host_len] = 0;
- bool retval = false;
- int rank_ceiling = -1;
+ bool retval = false;
+ int rank_ceiling = -1;
url_mapping *mapping = _tableLookup(mappings.hash_lookup, request_url, request_port, request_host_lower, request_host_len);
if (mapping != NULL) {
rank_ceiling = mapping->getRank();
@@ -804,7 +804,7 @@ UrlRewrite::_expandSubstitutions(int *matches_info, const RegexMapping *reg_map,
int dest_buf_size)
{
int cur_buf_size = 0;
- int token_start = 0;
+ int token_start = 0;
int n_bytes_needed;
int match_index;
for (int i = 0; i < reg_map->n_substitutions; ++i) {
@@ -817,7 +817,7 @@ UrlRewrite::_expandSubstitutions(int *matches_info, const RegexMapping *reg_map,
cur_buf_size += n_bytes_needed;
// then copy the sub pattern match
- match_index = reg_map->substitution_ids[i] * 2;
+ match_index = reg_map->substitution_ids[i] * 2;
n_bytes_needed = matches_info[match_index + 1] - matches_info[match_index];
if ((cur_buf_size + n_bytes_needed) > dest_buf_size) {
goto lOverFlow;
@@ -868,7 +868,7 @@ UrlRewrite::_regexMappingLookup(RegexMappingList ®ex_mappings, URL *request_u
// If the scheme is empty (e.g. because of a CONNECT method), guess it based on port
// This is equivalent to the logic in UrlMappingPathIndex::_GetTrie().
if (request_scheme_len == 0) {
- request_scheme = request_port == 80 ? URL_SCHEME_HTTP : URL_SCHEME_HTTPS;
+ request_scheme = request_port == 80 ? URL_SCHEME_HTTP : URL_SCHEME_HTTPS;
request_scheme_len = hdrtoken_wks_to_length(request_scheme);
}
@@ -915,7 +915,7 @@ UrlRewrite::_regexMappingLookup(RegexMappingList ®ex_mappings, URL *request_u
int buf_len;
// Expand substitutions in the host field from the stored template
- buf_len = _expandSubstitutions(matches_info, list_iter, request_host, buf, sizeof(buf));
+ buf_len = _expandSubstitutions(matches_info, list_iter, request_host, buf, sizeof(buf));
URL *expanded_url = mapping_container.createNewToURL();
expanded_url->copy(&((list_iter->url_map)->toUrl));
expanded_url->host_set(buf, buf_len);
diff --git a/proxy/http/test_socket_close.cc b/proxy/http/test_socket_close.cc
index 94f9a11..a049b29 100644
--- a/proxy/http/test_socket_close.cc
+++ b/proxy/http/test_socket_close.cc
@@ -162,7 +162,7 @@ main(int argc, char **argv)
client.state.tasks_count = 0;
server.state.tasks_count = 1;
- server.state.tasks[0] = TASK_LISTEN_SETUP;
+ server.state.tasks[0] = TASK_LISTEN_SETUP;
client.state_delay_ms = state_delay_ms;
server.state_delay_ms = state_delay_ms;
@@ -218,18 +218,18 @@ state_act(Conn *c)
if (IS_DONE(cr)) {
cr.state.tasks_count = 1;
- cr.state.tasks[0] = TASK_DONE;
+ cr.state.tasks[0] = TASK_DONE;
}
if ((c == &client && IS_DONE(server)) || (c == &server && IS_DONE(client))) {
cr.state.tasks_count = 1;
- cr.state.tasks[0] = saved_task;
+ cr.state.tasks[0] = saved_task;
} else if (c == &client) {
server.state.tasks_count = 1;
- server.state.tasks[0] = client_set_next_server_task[saved_task];
+ server.state.tasks[0] = client_set_next_server_task[saved_task];
} else {
client.state.tasks_count = 1;
- client.state.tasks[0] = server_set_next_client_task[saved_task];
+ client.state.tasks[0] = server_set_next_client_task[saved_task];
}
return;
}
@@ -369,7 +369,7 @@ do_listen_setup(Conn *c, int port)
c->addr.sin_family = AF_INET;
memset(&c->addr.sin_zero, 0, 8);
c->addr.sin_addr.s_addr = htonl(INADDR_ANY);
- c->addr.sin_port = htons(port);
+ c->addr.sin_port = htons(port);
// create a non-blocking socket
if ((c->listen_s = create_nonblocking_socket()) < 0) {
@@ -416,12 +416,12 @@ do_accept(Conn *c)
FD_ZERO(&readfds);
FD_SET(c->listen_s, &readfds);
- timeout.tv_sec = 0;
+ timeout.tv_sec = 0;
timeout.tv_usec = 10; /* 0.01 ms */
if (select(c->listen_s + 1, &readfds, 0, 0, &timeout) > 0) {
addrlen = sizeof(c->addr);
- c->s = accept(c->listen_s, (struct sockaddr *)&c->addr, &addrlen);
+ c->s = accept(c->listen_s, (struct sockaddr *)&c->addr, &addrlen);
if (c->s < 0) {
c->s = -errno;
cout << "accept failed (" << c->s << ")" << endl;
@@ -465,7 +465,7 @@ int
set_nonblocking_socket(int s)
{
int error = 0;
- int on = 1;
+ int on = 1;
if (fcntl(s, F_SETFL, O_NDELAY) < 0) {
error = -errno;
@@ -570,18 +570,18 @@ setup_scenario(Scenario_t scenario)
switch (scenario) {
case SERVER_WRITE_CLIENT_READ:
server_set_next_client_task[TASK_LISTEN_SETUP] = TASK_CONNECT;
- client_set_next_server_task[TASK_CONNECT] = TASK_ACCEPT;
- server_set_next_client_task[TASK_ACCEPT] = TASK_TRY_READ;
- client_set_next_server_task[TASK_TRY_READ] = TASK_TRY_WRITE;
- server_set_next_client_task[TASK_TRY_WRITE] = TASK_TRY_READ;
+ client_set_next_server_task[TASK_CONNECT] = TASK_ACCEPT;
+ server_set_next_client_task[TASK_ACCEPT] = TASK_TRY_READ;
+ client_set_next_server_task[TASK_TRY_READ] = TASK_TRY_WRITE;
+ server_set_next_client_task[TASK_TRY_WRITE] = TASK_TRY_READ;
break;
case SERVER_SHUTDOWN_OUTPUT_CLIENT_TRY_READ:
- server_set_next_client_task[TASK_LISTEN_SETUP] = TASK_CONNECT;
- server_set_next_client_task[TASK_ACCEPT] = TASK_TRY_READ;
+ server_set_next_client_task[TASK_LISTEN_SETUP] = TASK_CONNECT;
+ server_set_next_client_task[TASK_ACCEPT] = TASK_TRY_READ;
server_set_next_client_task[TASK_SHUTDOWN_OUTPUT] = TASK_TRY_READ;
- client_set_next_server_task[TASK_CONNECT] = TASK_ACCEPT;
+ client_set_next_server_task[TASK_CONNECT] = TASK_ACCEPT;
client_set_next_server_task[TASK_TRY_READ] = TASK_SHUTDOWN_OUTPUT;
break;
@@ -608,13 +608,13 @@ setup_scenario(Scenario_t scenario)
case CLIENT_SHUTDOWN_BOTH_SERVER_TRY_WRITE:
break;
case SERVER_WRITE_IMMIDIATE_SHUTDOWN_CLIENT_WRITE:
- server_set_next_client_task[TASK_LISTEN_SETUP] = TASK_CONNECT;
- client_set_next_server_task[TASK_CONNECT] = TASK_ACCEPT;
- server_set_next_client_task[TASK_ACCEPT] = TASK_TRY_READ;
- client_set_next_server_task[TASK_TRY_READ] = TASK_TRY_WRITE_THEN_SHUTDOWN_BOTH;
+ server_set_next_client_task[TASK_LISTEN_SETUP] = TASK_CONNECT;
+ client_set_next_server_task[TASK_CONNECT] = TASK_ACCEPT;
+ server_set_next_client_task[TASK_ACCEPT] = TASK_TRY_READ;
+ client_set_next_server_task[TASK_TRY_READ] = TASK_TRY_WRITE_THEN_SHUTDOWN_BOTH;
server_set_next_client_task[TASK_TRY_WRITE_THEN_SHUTDOWN_BOTH] = TASK_TRY_READ;
- server_set_next_client_task[TASK_DONE] = TASK_TRY_READ;
- server.state.nbytes_write = sizeof(write_buf);
+ server_set_next_client_task[TASK_DONE] = TASK_TRY_READ;
+ server.state.nbytes_write = sizeof(write_buf);
break;
}
return;
diff --git a/proxy/http2/HPACK.cc b/proxy/http2/HPACK.cc
index d33c440..a31e0db 100644
--- a/proxy/http2/HPACK.cc
+++ b/proxy/http2/HPACK.cc
@@ -205,7 +205,7 @@ HpackLookupResult
HpackIndexingTable::lookup(const MIMEFieldWrapper &field) const
{
int target_name_len = 0, target_value_len = 0;
- const char *target_name = field.name_get(&target_name_len);
+ const char *target_name = field.name_get(&target_name_len);
const char *target_value = field.value_get(&target_value_len);
return lookup(target_name, target_name_len, target_value, target_value_len);
}
@@ -222,26 +222,26 @@ HpackIndexingTable::lookup(const char *name, int name_len, const char *value, in
if (index < TS_HPACK_STATIC_TABLE_ENTRY_NUM) {
// static table
- table_name = STATIC_TABLE[index].name;
- table_value = STATIC_TABLE[index].value;
- table_name_len = strlen(table_name);
+ table_name = STATIC_TABLE[index].name;
+ table_value = STATIC_TABLE[index].value;
+ table_name_len = strlen(table_name);
table_value_len = strlen(table_value);
} else {
// dynamic table
const MIMEField *m_field = _dynamic_table->get_header_field(index - TS_HPACK_STATIC_TABLE_ENTRY_NUM);
- table_name = m_field->name_get(&table_name_len);
+ table_name = m_field->name_get(&table_name_len);
table_value = m_field->value_get(&table_value_len);
}
// Check whether name (and value) are matched
if (ptr_len_casecmp(name, name_len, table_name, table_name_len) == 0) {
if (ptr_len_cmp(value, value_len, table_value, table_value_len) == 0) {
- result.index = index;
+ result.index = index;
result.match_type = HPACK_EXACT_MATCH;
break;
} else if (!result.index) {
- result.index = index;
+ result.index = index;
result.match_type = HPACK_NAME_MATCH;
}
}
@@ -273,7 +273,7 @@ HpackIndexingTable::get_header_field(uint32_t index, MIMEFieldWrapper &field) co
const MIMEField *m_field = _dynamic_table->get_header_field(index - TS_HPACK_STATIC_TABLE_ENTRY_NUM);
int name_len, value_len;
- const char *name = m_field->name_get(&name_len);
+ const char *name = m_field->name_get(&name_len);
const char *value = m_field->value_get(&value_len);
field.name_set(name, name_len);
@@ -316,8 +316,8 @@ void
HpackDynamicTable::add_header_field(const MIMEField *field)
{
int name_len, value_len;
- const char *name = field->name_get(&name_len);
- const char *value = field->value_get(&value_len);
+ const char *name = field->name_get(&name_len);
+ const char *value = field->value_get(&value_len);
uint32_t header_size = ADDITIONAL_OCTETS + name_len + value_len;
if (header_size > _maximum_size) {
@@ -412,7 +412,7 @@ encode_integer(uint8_t *buf_start, const uint8_t *buf_end, uint32_t value, uint8
return -1;
}
*(p++) = (value & 0x7F) | 0x80;
- value = value >> 7;
+ value = value >> 7;
}
if (p + 1 >= buf_end) {
return -1;
@@ -425,9 +425,9 @@ encode_integer(uint8_t *buf_start, const uint8_t *buf_end, uint32_t value, uint8
int64_t
encode_string(uint8_t *buf_start, const uint8_t *buf_end, const char *value, size_t value_len)
{
- uint8_t *p = buf_start;
+ uint8_t *p = buf_start;
bool use_huffman = true;
- char *data = NULL;
+ char *data = NULL;
int64_t data_len = 0;
// TODO Choose whether to use Huffman encoding wisely
@@ -514,15 +514,15 @@ encode_literal_header_field_with_indexed_name(uint8_t *buf_start, const uint8_t
case HPACK_FIELD_INDEXED_LITERAL:
indexing_table.add_header_field(header.field_get());
prefix = 6;
- flag = 0x40;
+ flag = 0x40;
break;
case HPACK_FIELD_NOINDEX_LITERAL:
prefix = 4;
- flag = 0x00;
+ flag = 0x00;
break;
case HPACK_FIELD_NEVERINDEX_LITERAL:
prefix = 4;
- flag = 0x10;
+ flag = 0x10;
break;
default:
return -1;
@@ -543,7 +543,7 @@ encode_literal_header_field_with_indexed_name(uint8_t *buf_start, const uint8_t
// Value String
int value_len;
const char *value = header.value_get(&value_len);
- len = encode_string(p, buf_end, value, value_len);
+ len = encode_string(p, buf_end, value, value_len);
if (len == -1)
return -1;
p += len;
@@ -587,7 +587,7 @@ encode_literal_header_field_with_new_name(uint8_t *buf_start, const uint8_t *buf
int name_len;
const char *name = header.name_get(&name_len);
char *lower_name = arena.str_store(name, name_len);
- for (int i = 0; i < name_len; i++)
+ for (int i = 0; i < name_len; i++)
lower_name[i] = ParseRules::ink_tolower(lower_name[i]);
// Name String
@@ -600,7 +600,7 @@ encode_literal_header_field_with_new_name(uint8_t *buf_start, const uint8_t *buf
// Value String
int value_len;
const char *value = header.value_get(&value_len);
- len = encode_string(p, buf_end, value, value_len);
+ len = encode_string(p, buf_end, value, value_len);
if (len == -1) {
return -1;
}
@@ -655,10 +655,10 @@ decode_string(Arena &arena, char **str, uint32_t &str_length, const uint8_t *buf
return HPACK_ERROR_COMPRESSION_ERROR;
}
- const uint8_t *p = buf_start;
- bool isHuffman = *p & 0x80;
+ const uint8_t *p = buf_start;
+ bool isHuffman = *p & 0x80;
uint32_t encoded_string_len = 0;
- int64_t len = 0;
+ int64_t len = 0;
len = decode_integer(encoded_string_len, p, buf_end, 7);
if (len == HPACK_ERROR_COMPRESSION_ERROR)
@@ -696,7 +696,7 @@ decode_indexed_header_field(MIMEFieldWrapper &header, const uint8_t *buf_start,
HpackIndexingTable &indexing_table)
{
uint32_t index = 0;
- int64_t len = 0;
+ int64_t len = 0;
len = decode_integer(index, buf_start, buf_end, 7);
if (len == HPACK_ERROR_COMPRESSION_ERROR)
@@ -728,15 +728,15 @@ int64_t
decode_literal_header_field(MIMEFieldWrapper &header, const uint8_t *buf_start, const uint8_t *buf_end,
HpackIndexingTable &indexing_table)
{
- const uint8_t *p = buf_start;
- bool isIncremental = false;
- uint32_t index = 0;
- int64_t len = 0;
- HpackFieldType ftype = hpack_parse_field_type(*p);
+ const uint8_t *p = buf_start;
+ bool isIncremental = false;
+ uint32_t index = 0;
+ int64_t len = 0;
+ HpackFieldType ftype = hpack_parse_field_type(*p);
bool has_http2_violation = false;
if (ftype == HPACK_FIELD_INDEXED_LITERAL) {
- len = decode_integer(index, p, buf_end, 6);
+ len = decode_integer(index, p, buf_end, 6);
isIncremental = true;
} else if (ftype == HPACK_FIELD_NEVERINDEX_LITERAL) {
len = decode_integer(index, p, buf_end, 4);
@@ -756,7 +756,7 @@ decode_literal_header_field(MIMEFieldWrapper &header, const uint8_t *buf_start,
if (index) {
indexing_table.get_header_field(index, header);
} else {
- char *name_str = NULL;
+ char *name_str = NULL;
uint32_t name_str_len = 0;
len = decode_string(arena, &name_str, name_str_len, p, buf_end);
@@ -777,7 +777,7 @@ decode_literal_header_field(MIMEFieldWrapper &header, const uint8_t *buf_start,
}
// Decode header field value
- char *value_str = NULL;
+ char *value_str = NULL;
uint32_t value_str_len = 0;
len = decode_string(arena, &value_str, value_str_len, p, buf_end);
@@ -822,7 +822,7 @@ update_dynamic_table_size(const uint8_t *buf_start, const uint8_t *buf_end, Hpac
// Update header table size if its required.
uint32_t size = 0;
- int64_t len = decode_integer(size, buf_start, buf_end, 5);
+ int64_t len = decode_integer(size, buf_start, buf_end, 5);
if (len == HPACK_ERROR_COMPRESSION_ERROR)
return HPACK_ERROR_COMPRESSION_ERROR;
@@ -836,12 +836,12 @@ update_dynamic_table_size(const uint8_t *buf_start, const uint8_t *buf_end, Hpac
int64_t
hpack_decode_header_block(HpackIndexingTable &indexing_table, HTTPHdr *hdr, const uint8_t *in_buf, const size_t in_buf_len)
{
- const uint8_t *cursor = in_buf;
+ const uint8_t *cursor = in_buf;
const uint8_t *const in_buf_end = in_buf + in_buf_len;
- HdrHeap *heap = hdr->m_heap;
- HTTPHdrImpl *hh = hdr->m_http;
- bool header_field_started = false;
- bool has_http2_violation = false;
+ HdrHeap *heap = hdr->m_heap;
+ HTTPHdrImpl *hh = hdr->m_http;
+ bool header_field_started = false;
+ bool has_http2_violation = false;
while (cursor < in_buf_end) {
int64_t read_bytes = 0;
@@ -869,7 +869,7 @@ hpack_decode_header_block(HpackIndexingTable &indexing_table, HTTPHdr *hdr, cons
}
if (read_bytes < 0) {
has_http2_violation = true;
- read_bytes = -read_bytes;
+ read_bytes = -read_bytes;
}
cursor += read_bytes;
header_field_started = true;
@@ -899,9 +899,9 @@ hpack_decode_header_block(HpackIndexingTable &indexing_table, HTTPHdr *hdr, cons
int64_t
hpack_encode_header_block(HpackIndexingTable &indexing_table, uint8_t *out_buf, const size_t out_buf_len, HTTPHdr *hdr)
{
- uint8_t *cursor = out_buf;
+ uint8_t *cursor = out_buf;
const uint8_t *const out_buf_end = out_buf + out_buf_len;
- int64_t written = 0;
+ int64_t written = 0;
ink_assert(http_hdr_type_get(hdr->m_http) != HTTP_TYPE_UNKNOWN);
diff --git a/proxy/http2/HTTP2.cc b/proxy/http2/HTTP2.cc
index 4bee9ed..d9218ff 100644
--- a/proxy/http2/HTTP2.cc
+++ b/proxy/http2/HTTP2.cc
@@ -31,35 +31,35 @@
const char *const HTTP2_CONNECTION_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n";
// Constant strings for pseudo headers
-const char *HTTP2_VALUE_SCHEME = ":scheme";
-const char *HTTP2_VALUE_METHOD = ":method";
+const char *HTTP2_VALUE_SCHEME = ":scheme";
+const char *HTTP2_VALUE_METHOD = ":method";
const char *HTTP2_VALUE_AUTHORITY = ":authority";
-const char *HTTP2_VALUE_PATH = ":path";
-const char *HTTP2_VALUE_STATUS = ":status";
+const char *HTTP2_VALUE_PATH = ":path";
+const char *HTTP2_VALUE_STATUS = ":status";
-const unsigned HTTP2_LEN_SCHEME = countof(":scheme") - 1;
-const unsigned HTTP2_LEN_METHOD = countof(":method") - 1;
+const unsigned HTTP2_LEN_SCHEME = countof(":scheme") - 1;
+const unsigned HTTP2_LEN_METHOD = countof(":method") - 1;
const unsigned HTTP2_LEN_AUTHORITY = countof(":authority") - 1;
-const unsigned HTTP2_LEN_PATH = countof(":path") - 1;
-const unsigned HTTP2_LEN_STATUS = countof(":status") - 1;
+const unsigned HTTP2_LEN_PATH = countof(":path") - 1;
+const unsigned HTTP2_LEN_STATUS = countof(":status") - 1;
static size_t HTTP2_LEN_STATUS_VALUE_STR = 3;
// Statistics
RecRawStatBlock *http2_rsb;
-static char const *const HTTP2_STAT_CURRENT_CLIENT_SESSION_NAME = "proxy.process.http2.current_client_sessions";
-static char const *const HTTP2_STAT_CURRENT_CLIENT_STREAM_NAME = "proxy.process.http2.current_client_streams";
-static char const *const HTTP2_STAT_TOTAL_CLIENT_STREAM_NAME = "proxy.process.http2.total_client_streams";
+static char const *const HTTP2_STAT_CURRENT_CLIENT_SESSION_NAME = "proxy.process.http2.current_client_sessions";
+static char const *const HTTP2_STAT_CURRENT_CLIENT_STREAM_NAME = "proxy.process.http2.current_client_streams";
+static char const *const HTTP2_STAT_TOTAL_CLIENT_STREAM_NAME = "proxy.process.http2.total_client_streams";
static char const *const HTTP2_STAT_TOTAL_TRANSACTIONS_TIME_NAME = "proxy.process.http2.total_transactions_time";
static char const *const HTTP2_STAT_TOTAL_CLIENT_CONNECTION_NAME = "proxy.process.http2.total_client_connections";
-static char const *const HTTP2_STAT_CONNECTION_ERRORS_NAME = "proxy.process.http2.connection_errors";
-static char const *const HTTP2_STAT_STREAM_ERRORS_NAME = "proxy.process.http2.stream_errors";
-static char const *const HTTP2_STAT_SESSION_DIE_DEFAULT_NAME = "proxy.process.http2.session_die_default";
-static char const *const HTTP2_STAT_SESSION_DIE_OTHER_NAME = "proxy.process.http2.session_die_other";
-static char const *const HTTP2_STAT_SESSION_DIE_ACTIVE_NAME = "proxy.process.http2.session_die_active";
-static char const *const HTTP2_STAT_SESSION_DIE_INACTIVE_NAME = "proxy.process.http2.session_die_inactive";
-static char const *const HTTP2_STAT_SESSION_DIE_EOS_NAME = "proxy.process.http2.session_die_eos";
-static char const *const HTTP2_STAT_SESSION_DIE_ERROR_NAME = "proxy.process.http2.session_die_error";
+static char const *const HTTP2_STAT_CONNECTION_ERRORS_NAME = "proxy.process.http2.connection_errors";
+static char const *const HTTP2_STAT_STREAM_ERRORS_NAME = "proxy.process.http2.stream_errors";
+static char const *const HTTP2_STAT_SESSION_DIE_DEFAULT_NAME = "proxy.process.http2.session_die_default";
+static char const *const HTTP2_STAT_SESSION_DIE_OTHER_NAME = "proxy.process.http2.session_die_other";
+static char const *const HTTP2_STAT_SESSION_DIE_ACTIVE_NAME = "proxy.process.http2.session_die_active";
+static char const *const HTTP2_STAT_SESSION_DIE_INACTIVE_NAME = "proxy.process.http2.session_die_inactive";
+static char const *const HTTP2_STAT_SESSION_DIE_EOS_NAME = "proxy.process.http2.session_die_eos";
+static char const *const HTTP2_STAT_SESSION_DIE_ERROR_NAME = "proxy.process.http2.session_die_error";
union byte_pointer {
byte_pointer(void *p) : ptr(p) {}
@@ -214,7 +214,7 @@ http2_parse_frame_header(IOVec iov, Http2FrameHeader &hdr)
memcpy_and_advance(streamid.bytes, ptr);
hdr.length = ntohl(length_and_type.value) >> 8;
- hdr.type = ntohl(length_and_type.value) & 0xff;
+ hdr.type = ntohl(length_and_type.value) & 0xff;
streamid.bytes[0] &= 0x7f; // Clear the high reserved bit
hdr.streamid = ntohl(streamid.value);
@@ -379,7 +379,7 @@ http2_parse_settings_parameter(IOVec iov, Http2SettingsParameter ¶m)
memcpy_and_advance(pid.bytes, ptr);
memcpy_and_advance(pval.bytes, ptr);
- param.id = ntohs(pid.value);
+ param.id = ntohs(pid.value);
param.value = ntohl(pval.value);
return true;
@@ -396,7 +396,7 @@ http2_parse_goaway(IOVec iov, Http2Goaway &goaway)
memcpy_and_advance(ec.bytes, ptr);
goaway.last_streamid = ntohl(sid.value);
- goaway.error_code = ntohl(ec.value);
+ goaway.error_code = ntohl(ec.value);
return true;
}
@@ -445,8 +445,8 @@ http2_convert_header_from_2_to_1_1(HTTPHdr *headers)
// Parse URL
Arena arena;
- size_t url_length = scheme_len + 3 + authority_len + path_len;
- char *url = arena.str_alloc(url_length);
+ size_t url_length = scheme_len + 3 + authority_len + path_len;
+ char *url = arena.str_alloc(url_length);
const char *url_start = url;
memcpy(url, scheme, scheme_len);
@@ -538,9 +538,9 @@ http2_generate_h2_header_from_1_1(HTTPHdr *headers, HTTPHdr *h2_headers)
}
MIMEField *newfield;
- name = field->name_get(&name_len);
+ name = field->name_get(&name_len);
newfield = h2_headers->field_create(name, name_len);
- value = field->value_get(&value_len);
+ value = field->value_get(&value_len);
newfield->value_set(h2_headers->m_heap, h2_headers->m_mime, value, value_len);
h2_headers->field_attach(newfield);
}
@@ -572,7 +572,7 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t *buf_start, const uint32_
const char *value;
int len;
bool is_trailing_header = trailing_header;
- int64_t result = hpack_decode_header_block(handle, hdr, buf_start, buf_len);
+ int64_t result = hpack_decode_header_block(handle, hdr, buf_start, buf_len);
if (result < 0) {
if (result == HPACK_ERROR_COMPRESSION_ERROR) {
@@ -586,7 +586,7 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t *buf_start, const uint32_
MIMEFieldIter iter;
unsigned int expected_pseudo_header_count = 4;
- unsigned int pseudo_header_count = 0;
+ unsigned int pseudo_header_count = 0;
if (is_trailing_header) {
expected_pseudo_header_count = 0;
@@ -630,7 +630,7 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t *buf_start, const uint32_
// turn on that we have a trailer header
const char trailer_name[] = "trailer";
- field = hdr->field_find(trailer_name, sizeof(trailer_name) - 1);
+ field = hdr->field_find(trailer_name, sizeof(trailer_name) - 1);
if (field) {
trailing_header = true;
}
@@ -666,19 +666,19 @@ http2_decode_header_blocks(HTTPHdr *hdr, const uint8_t *buf_start, const uint32_
}
// Initialize this subsystem with librecords configs (for now)
-uint32_t Http2::max_concurrent_streams_in = 100;
-uint32_t Http2::min_concurrent_streams_in = 10;
-uint32_t Http2::max_active_streams_in = 0;
-bool Http2::throttling = false;
-uint32_t Http2::stream_priority_enabled = 0;
-uint32_t Http2::initial_window_size = 1048576;
-uint32_t Http2::max_frame_size = 16384;
-uint32_t Http2::header_table_size = 4096;
-uint32_t Http2::max_header_list_size = 4294967295;
-uint32_t Http2::max_request_header_size = 131072;
+uint32_t Http2::max_concurrent_streams_in = 100;
+uint32_t Http2::min_concurrent_streams_in = 10;
+uint32_t Http2::max_active_streams_in = 0;
+bool Http2::throttling = false;
+uint32_t Http2::stream_priority_enabled = 0;
+uint32_t Http2::initial_window_size = 1048576;
+uint32_t Http2::max_frame_size = 16384;
+uint32_t Http2::header_table_size = 4096;
+uint32_t Http2::max_header_list_size = 4294967295;
+uint32_t Http2::max_request_header_size = 131072;
uint32_t Http2::accept_no_activity_timeout = 120;
-uint32_t Http2::no_activity_timeout_in = 115;
-uint32_t Http2::active_timeout_in = 0;
+uint32_t Http2::no_activity_timeout_in = 115;
+uint32_t Http2::active_timeout_in = 0;
void
Http2::init()
diff --git a/proxy/http2/HTTP2.h b/proxy/http2/HTTP2.h
index 1fde5fc..f77be18 100644
--- a/proxy/http2/HTTP2.h
+++ b/proxy/http2/HTTP2.h
@@ -41,30 +41,30 @@ typedef int32_t Http2WindowSize;
extern const char *const HTTP2_CONNECTION_PREFACE;
const size_t HTTP2_CONNECTION_PREFACE_LEN = 24;
-const size_t HTTP2_FRAME_HEADER_LEN = 9;
-const size_t HTTP2_DATA_PADLEN_LEN = 1;
-const size_t HTTP2_HEADERS_PADLEN_LEN = 1;
-const size_t HTTP2_PRIORITY_LEN = 5;
-const size_t HTTP2_RST_STREAM_LEN = 4;
-const size_t HTTP2_PING_LEN = 8;
-const size_t HTTP2_GOAWAY_LEN = 8;
-const size_t HTTP2_WINDOW_UPDATE_LEN = 4;
+const size_t HTTP2_FRAME_HEADER_LEN = 9;
+const size_t HTTP2_DATA_PADLEN_LEN = 1;
+const size_t HTTP2_HEADERS_PADLEN_LEN = 1;
+const size_t HTTP2_PRIORITY_LEN = 5;
+const size_t HTTP2_RST_STREAM_LEN = 4;
+const size_t HTTP2_PING_LEN = 8;
+const size_t HTTP2_GOAWAY_LEN = 8;
+const size_t HTTP2_WINDOW_UPDATE_LEN = 4;
const size_t HTTP2_SETTINGS_PARAMETER_LEN = 6;
// SETTINGS initial values. NOTE: These should not be modified
// unless the protocol changes! Do not change this thinking you
// are changing server defaults. that is done via RecordsConfig.cc
const uint32_t HTTP2_MAX_CONCURRENT_STREAMS = UINT_MAX;
-const uint32_t HTTP2_INITIAL_WINDOW_SIZE = 65535;
-const uint32_t HTTP2_MAX_FRAME_SIZE = 16384;
-const uint32_t HTTP2_HEADER_TABLE_SIZE = 4096;
-const uint32_t HTTP2_MAX_HEADER_LIST_SIZE = UINT_MAX;
+const uint32_t HTTP2_INITIAL_WINDOW_SIZE = 65535;
+const uint32_t HTTP2_MAX_FRAME_SIZE = 16384;
+const uint32_t HTTP2_HEADER_TABLE_SIZE = 4096;
+const uint32_t HTTP2_MAX_HEADER_LIST_SIZE = UINT_MAX;
// [RFC 7540] 5.3.5 Default Priorities
// The RFC says weight value is 1 to 256, but the value in TS is between 0 to 255
// to use uint8_t. So the default weight is 16 minus 1.
const uint32_t HTTP2_PRIORITY_DEFAULT_STREAM_DEPENDENCY = 0;
-const uint8_t HTTP2_PRIORITY_DEFAULT_WEIGHT = 15;
+const uint8_t HTTP2_PRIORITY_DEFAULT_WEIGHT = 15;
// Statistics
enum {
@@ -102,20 +102,20 @@ enum Http2ErrorClass {
// [RFC 7540] 7. Error Codes
enum Http2ErrorCode {
- HTTP2_ERROR_NO_ERROR = 0,
- HTTP2_ERROR_PROTOCOL_ERROR = 1,
- HTTP2_ERROR_INTERNAL_ERROR = 2,
- HTTP2_ERROR_FLOW_CONTROL_ERROR = 3,
- HTTP2_ERROR_SETTINGS_TIMEOUT = 4,
- HTTP2_ERROR_STREAM_CLOSED = 5,
- HTTP2_ERROR_FRAME_SIZE_ERROR = 6,
- HTTP2_ERROR_REFUSED_STREAM = 7,
- HTTP2_ERROR_CANCEL = 8,
- HTTP2_ERROR_COMPRESSION_ERROR = 9,
- HTTP2_ERROR_CONNECT_ERROR = 10,
- HTTP2_ERROR_ENHANCE_YOUR_CALM = 11,
+ HTTP2_ERROR_NO_ERROR = 0,
+ HTTP2_ERROR_PROTOCOL_ERROR = 1,
+ HTTP2_ERROR_INTERNAL_ERROR = 2,
+ HTTP2_ERROR_FLOW_CONTROL_ERROR = 3,
+ HTTP2_ERROR_SETTINGS_TIMEOUT = 4,
+ HTTP2_ERROR_STREAM_CLOSED = 5,
+ HTTP2_ERROR_FRAME_SIZE_ERROR = 6,
+ HTTP2_ERROR_REFUSED_STREAM = 7,
+ HTTP2_ERROR_CANCEL = 8,
+ HTTP2_ERROR_COMPRESSION_ERROR = 9,
+ HTTP2_ERROR_CONNECT_ERROR = 10,
+ HTTP2_ERROR_ENHANCE_YOUR_CALM = 11,
HTTP2_ERROR_INADEQUATE_SECURITY = 12,
- HTTP2_ERROR_HTTP_1_1_REQUIRED = 13,
+ HTTP2_ERROR_HTTP_1_1_REQUIRED = 13,
HTTP2_ERROR_MAX,
};
@@ -132,16 +132,16 @@ enum Http2StreamState {
};
enum Http2FrameType {
- HTTP2_FRAME_TYPE_DATA = 0,
- HTTP2_FRAME_TYPE_HEADERS = 1,
- HTTP2_FRAME_TYPE_PRIORITY = 2,
- HTTP2_FRAME_TYPE_RST_STREAM = 3,
- HTTP2_FRAME_TYPE_SETTINGS = 4,
- HTTP2_FRAME_TYPE_PUSH_PROMISE = 5,
- HTTP2_FRAME_TYPE_PING = 6,
- HTTP2_FRAME_TYPE_GOAWAY = 7,
+ HTTP2_FRAME_TYPE_DATA = 0,
+ HTTP2_FRAME_TYPE_HEADERS = 1,
+ HTTP2_FRAME_TYPE_PRIORITY = 2,
+ HTTP2_FRAME_TYPE_RST_STREAM = 3,
+ HTTP2_FRAME_TYPE_SETTINGS = 4,
+ HTTP2_FRAME_TYPE_PUSH_PROMISE = 5,
+ HTTP2_FRAME_TYPE_PING = 6,
+ HTTP2_FRAME_TYPE_GOAWAY = 7,
HTTP2_FRAME_TYPE_WINDOW_UPDATE = 8,
- HTTP2_FRAME_TYPE_CONTINUATION = 9,
+ HTTP2_FRAME_TYPE_CONTINUATION = 9,
HTTP2_FRAME_TYPE_MAX,
};
@@ -149,17 +149,17 @@ enum Http2FrameType {
// [RFC 7540] 6.1. Data
enum Http2FrameFlagsData {
HTTP2_FLAGS_DATA_END_STREAM = 0x01,
- HTTP2_FLAGS_DATA_PADDED = 0x08,
+ HTTP2_FLAGS_DATA_PADDED = 0x08,
HTTP2_FLAGS_DATA_MASK = 0x09,
};
// [RFC 7540] 6.2. Headers
enum Http2FrameFlagsHeaders {
- HTTP2_FLAGS_HEADERS_END_STREAM = 0x01,
+ HTTP2_FLAGS_HEADERS_END_STREAM = 0x01,
HTTP2_FLAGS_HEADERS_END_HEADERS = 0x04,
- HTTP2_FLAGS_HEADERS_PADDED = 0x08,
- HTTP2_FLAGS_HEADERS_PRIORITY = 0x20,
+ HTTP2_FLAGS_HEADERS_PADDED = 0x08,
+ HTTP2_FLAGS_HEADERS_PRIORITY = 0x20,
HTTP2_FLAGS_HEADERS_MASK = 0x2D,
};
@@ -184,7 +184,7 @@ enum Http2FrameFlagsSettings {
// [RFC 7540] 6.6. Push Promise
enum Http2FrameFlagsPushPromise {
HTTP2_FLAGS_PUSH_PROMISE_END_HEADERS = 0x04,
- HTTP2_FLAGS_PUSH_PROMISE_PADDED = 0x08,
+ HTTP2_FLAGS_PUSH_PROMISE_PADDED = 0x08,
HTTP2_FLAGS_PUSH_PROMISE_MASK = 0x0C,
};
@@ -221,12 +221,12 @@ static const uint8_t HTTP2_FRAME_FLAGS_MASKS[HTTP2_FRAME_TYPE_MAX] = {
// [RFC 7540] 6.5.2. Defined SETTINGS Parameters
enum Http2SettingsIdentifier {
- HTTP2_SETTINGS_HEADER_TABLE_SIZE = 1,
- HTTP2_SETTINGS_ENABLE_PUSH = 2,
+ HTTP2_SETTINGS_HEADER_TABLE_SIZE = 1,
+ HTTP2_SETTINGS_ENABLE_PUSH = 2,
HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS = 3,
- HTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 4,
- HTTP2_SETTINGS_MAX_FRAME_SIZE = 5,
- HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 6,
+ HTTP2_SETTINGS_INITIAL_WINDOW_SIZE = 4,
+ HTTP2_SETTINGS_MAX_FRAME_SIZE = 5,
+ HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE = 6,
HTTP2_SETTINGS_MAX
};
@@ -243,7 +243,7 @@ struct Http2FrameHeader {
struct Http2Error {
Http2Error(const Http2ErrorClass error_class = HTTP2_ERROR_CLASS_NONE, const Http2ErrorCode error_code = HTTP2_ERROR_NO_ERROR)
{
- cls = error_class;
+ cls = error_class;
code = error_code;
};
diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc
index 5bbcab4..70ec06f 100644
--- a/proxy/http2/Http2ClientSession.cc
+++ b/proxy/http2/Http2ClientSession.cc
@@ -120,7 +120,7 @@ Http2ClientSession::start()
SET_HANDLER(&Http2ClientSession::main_event_handler);
HTTP2_SET_SESSION_HANDLER(&Http2ClientSession::state_read_connection_preface);
- read_vio = this->do_io_read(this, INT64_MAX, this->read_buffer);
+ read_vio = this->do_io_read(this, INT64_MAX, this->read_buffer);
write_vio = this->do_io_write(this, INT64_MAX, this->sm_writer);
// 3.5 HTTP/2 Connection Preface. Upon establishment of a TCP connection and
@@ -145,7 +145,7 @@ Http2ClientSession::new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOB
ink_release_assert(backdoor == false);
// Unique client session identifier.
- this->con_id = ProxyClientSession::next_connection_id();
+ this->con_id = ProxyClientSession::next_connection_id();
this->client_vc = new_vc;
client_vc->set_inactivity_timeout(HRTIME_SECONDS(Http2::accept_no_activity_timeout));
this->mutex = new_vc->mutex;
@@ -158,12 +158,12 @@ Http2ClientSession::new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOB
DebugHttp2Ssn("session born, netvc %p", this->client_vc);
- this->read_buffer = iobuf ? iobuf : new_MIOBuffer(HTTP2_HEADER_BUFFER_SIZE_INDEX);
+ this->read_buffer = iobuf ? iobuf : new_MIOBuffer(HTTP2_HEADER_BUFFER_SIZE_INDEX);
this->read_buffer->water_mark = connection_state.server_settings.get(HTTP2_SETTINGS_MAX_FRAME_SIZE);
- this->sm_reader = reader ? reader : this->read_buffer->alloc_reader();
+ this->sm_reader = reader ? reader : this->read_buffer->alloc_reader();
this->write_buffer = new_MIOBuffer(HTTP2_HEADER_BUFFER_SIZE_INDEX);
- this->sm_writer = this->write_buffer->alloc_reader();
+ this->sm_writer = this->write_buffer->alloc_reader();
do_api_callout(TS_HTTP_SSN_START_HOOK);
}
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index b0ddc69..1f787bd 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -66,7 +66,7 @@ public:
Http2Frame(const Http2FrameHeader &h, IOBufferReader *r)
{
this->hdr.cooked = h;
- this->ioreader = r;
+ this->ioreader = r;
}
Http2Frame(Http2FrameType type, Http2StreamId streamid, uint8_t flags)
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index da294e4..6986244 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -67,9 +67,9 @@ static Http2Error
rcv_data_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
{
char buf[BUFFER_SIZE_FOR_INDEX(buffer_size_index[HTTP2_FRAME_TYPE_DATA])];
- unsigned nbytes = 0;
- Http2StreamId id = frame.header().streamid;
- uint8_t pad_length = 0;
+ unsigned nbytes = 0;
+ Http2StreamId id = frame.header().streamid;
+ uint8_t pad_length = 0;
const uint32_t payload_length = frame.header().length;
DebugHttp2Stream(cstate.ua_session, id, "Received DATA frame");
@@ -153,7 +153,7 @@ rcv_data_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
myreader->writer()->dealloc_reader(myreader);
uint32_t initial_rwnd = cstate.server_settings.get(HTTP2_SETTINGS_INITIAL_WINDOW_SIZE);
- uint32_t min_rwnd = min(initial_rwnd, cstate.server_settings.get(HTTP2_SETTINGS_MAX_FRAME_SIZE));
+ uint32_t min_rwnd = min(initial_rwnd, cstate.server_settings.get(HTTP2_SETTINGS_MAX_FRAME_SIZE));
// Connection level WINDOW UPDATE
if (cstate.server_rwnd <= min_rwnd) {
Http2WindowSize diff_size = initial_rwnd - cstate.server_rwnd;
@@ -192,7 +192,7 @@ rcv_headers_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
}
Http2Stream *stream = NULL;
- bool new_stream = false;
+ bool new_stream = false;
if (stream_id <= cstate.get_latest_stream_id()) {
stream = cstate.find_stream(stream_id);
@@ -202,7 +202,7 @@ rcv_headers_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
} else {
// Create new stream
new_stream = true;
- stream = cstate.create_stream(stream_id);
+ stream = cstate.create_stream(stream_id);
if (!stream) {
return Http2Error(HTTP2_ERROR_CLASS_CONNECTION, HTTP2_ERROR_PROTOCOL_ERROR);
}
@@ -436,7 +436,7 @@ rcv_settings_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
{
Http2SettingsParameter param;
char buf[HTTP2_SETTINGS_PARAMETER_LEN];
- unsigned nbytes = 0;
+ unsigned nbytes = 0;
const Http2StreamId stream_id = frame.header().streamid;
DebugHttp2Stream(cstate.ua_session, stream_id, "Received SETTINGS frame");
@@ -552,7 +552,7 @@ rcv_goaway_frame(Http2ConnectionState &cstate, const Http2Frame &frame)
{
Http2Goaway goaway;
char buf[HTTP2_GOAWAY_LEN];
- unsigned nbytes = 0;
+ unsigned nbytes = 0;
const Http2StreamId stream_id = frame.header().streamid;
DebugHttp2Stream(cstate.ua_session, stream_id, "Received GOAWAY frame");
@@ -808,7 +808,7 @@ Http2ConnectionState::main_event_handler(int event, void *edata)
// Parse received HTTP/2 frames
case HTTP2_SESSION_EVENT_RECV: {
- const Http2Frame *frame = (Http2Frame *)edata;
+ const Http2Frame *frame = (Http2Frame *)edata;
const Http2StreamId stream_id = frame->header().streamid;
Http2Error error;
@@ -996,7 +996,7 @@ Http2ConnectionState::send_data_frames_depends_on_priority()
ink_release_assert(stream != NULL);
DebugHttp2Stream(ua_session, stream->get_id(), "top node, point=%d", node->point);
- size_t len = 0;
+ size_t len = 0;
Http2SendADataFrameResult result = send_a_data_frame(stream, len);
if (result != HTTP2_SEND_A_DATA_FRAME_NO_ERROR) {
@@ -1030,7 +1030,7 @@ Http2ConnectionState::send_a_data_frame(Http2Stream *stream, size_t &payload_len
if (window_size <= 0) {
return HTTP2_SEND_A_DATA_FRAME_NO_WINDOW;
}
- const size_t buf_len = BUFFER_SIZE_FOR_INDEX(buffer_size_index[HTTP2_FRAME_TYPE_DATA]) - HTTP2_FRAME_HEADER_LEN;
+ const size_t buf_len = BUFFER_SIZE_FOR_INDEX(buffer_size_index[HTTP2_FRAME_TYPE_DATA]) - HTTP2_FRAME_HEADER_LEN;
const size_t available_size = min(buf_len, static_cast<size_t>(window_size));
uint8_t flags = 0x00;
@@ -1111,12 +1111,12 @@ Http2ConnectionState::send_data_frames(Http2Stream *stream)
void
Http2ConnectionState::send_headers_frame(Http2Stream *stream)
{
- uint8_t *buf = NULL;
- uint32_t buf_len = 0;
+ uint8_t *buf = NULL;
+ uint32_t buf_len = 0;
uint32_t header_blocks_size = 0;
- int payload_length = 0;
- uint64_t sent = 0;
- uint8_t flags = 0x00;
+ int payload_length = 0;
+ uint64_t sent = 0;
+ uint8_t flags = 0x00;
HTTPHdr *resp_header = &stream->response_header;
@@ -1126,7 +1126,7 @@ Http2ConnectionState::send_headers_frame(Http2Stream *stream)
http2_generate_h2_header_from_1_1(resp_header, &h2_hdr);
buf_len = resp_header->length_get() * 2; // Make it double just in case
- buf = (uint8_t *)ats_malloc(buf_len);
+ buf = (uint8_t *)ats_malloc(buf_len);
if (buf == NULL) {
h2_hdr.destroy();
return;
@@ -1219,12 +1219,12 @@ Http2ConnectionState::send_settings_frame(const Http2ConnectionSettings &new_set
Http2Frame settings(HTTP2_FRAME_TYPE_SETTINGS, stream_id, 0);
settings.alloc(buffer_size_index[HTTP2_FRAME_TYPE_SETTINGS]);
- IOVec iov = settings.write();
+ IOVec iov = settings.write();
uint32_t settings_length = 0;
for (int i = HTTP2_SETTINGS_HEADER_TABLE_SIZE; i < HTTP2_SETTINGS_MAX; ++i) {
Http2SettingsIdentifier id = static_cast<Http2SettingsIdentifier>(i);
- unsigned settings_value = new_settings.get(id);
+ unsigned settings_value = new_settings.get(id);
// Send only difference
if (settings_value != server_settings.get(id)) {
@@ -1282,7 +1282,7 @@ Http2ConnectionState::send_goaway_frame(Http2StreamId id, Http2ErrorCode ec)
ink_assert(this->ua_session != NULL);
goaway.last_streamid = id;
- goaway.error_code = ec;
+ goaway.error_code = ec;
frame.alloc(buffer_size_index[HTTP2_FRAME_TYPE_GOAWAY]);
http2_write_goaway(goaway, frame.write());
diff --git a/proxy/http2/Http2ConnectionState.h b/proxy/http2/Http2ConnectionState.h
index 584f0f8..1594b9f 100644
--- a/proxy/http2/Http2ConnectionState.h
+++ b/proxy/http2/Http2ConnectionState.h
@@ -32,8 +32,8 @@
class Http2ClientSession;
enum Http2SendADataFrameResult {
- HTTP2_SEND_A_DATA_FRAME_NO_ERROR = 0,
- HTTP2_SEND_A_DATA_FRAME_NO_WINDOW = 1,
+ HTTP2_SEND_A_DATA_FRAME_NO_ERROR = 0,
+ HTTP2_SEND_A_DATA_FRAME_NO_WINDOW = 1,
HTTP2_SEND_A_DATA_FRAME_NO_PAYLOAD = 2,
};
@@ -48,20 +48,20 @@ public:
settings[indexof(HTTP2_SETTINGS_ENABLE_PUSH)] = 0; // Disabled for now
settings[indexof(HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS)] = HTTP2_MAX_CONCURRENT_STREAMS;
- settings[indexof(HTTP2_SETTINGS_INITIAL_WINDOW_SIZE)] = HTTP2_INITIAL_WINDOW_SIZE;
- settings[indexof(HTTP2_SETTINGS_MAX_FRAME_SIZE)] = HTTP2_MAX_FRAME_SIZE;
- settings[indexof(HTTP2_SETTINGS_HEADER_TABLE_SIZE)] = HTTP2_HEADER_TABLE_SIZE;
- settings[indexof(HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE)] = HTTP2_MAX_HEADER_LIST_SIZE;
+ settings[indexof(HTTP2_SETTINGS_INITIAL_WINDOW_SIZE)] = HTTP2_INITIAL_WINDOW_SIZE;
+ settings[indexof(HTTP2_SETTINGS_MAX_FRAME_SIZE)] = HTTP2_MAX_FRAME_SIZE;
+ settings[indexof(HTTP2_SETTINGS_HEADER_TABLE_SIZE)] = HTTP2_HEADER_TABLE_SIZE;
+ settings[indexof(HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE)] = HTTP2_MAX_HEADER_LIST_SIZE;
}
void
settings_from_configs()
{
settings[indexof(HTTP2_SETTINGS_MAX_CONCURRENT_STREAMS)] = Http2::max_concurrent_streams_in;
- settings[indexof(HTTP2_SETTINGS_INITIAL_WINDOW_SIZE)] = Http2::initial_window_size;
- settings[indexof(HTTP2_SETTINGS_MAX_FRAME_SIZE)] = Http2::max_frame_size;
- settings[indexof(HTTP2_SETTINGS_HEADER_TABLE_SIZE)] = Http2::header_table_size;
- settings[indexof(HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE)] = Http2::max_header_list_size;
+ settings[indexof(HTTP2_SETTINGS_INITIAL_WINDOW_SIZE)] = Http2::initial_window_size;
+ settings[indexof(HTTP2_SETTINGS_MAX_FRAME_SIZE)] = Http2::max_frame_size;
+ settings[indexof(HTTP2_SETTINGS_HEADER_TABLE_SIZE)] = Http2::header_table_size;
+ settings[indexof(HTTP2_SETTINGS_MAX_HEADER_LIST_SIZE)] = Http2::max_header_list_size;
}
unsigned
@@ -137,11 +137,11 @@ public:
void
init()
{
- local_hpack_handle = new HpackHandle(HTTP2_HEADER_TABLE_SIZE);
+ local_hpack_handle = new HpackHandle(HTTP2_HEADER_TABLE_SIZE);
remote_hpack_handle = new HpackHandle(HTTP2_HEADER_TABLE_SIZE);
continued_buffer.iov_base = NULL;
- continued_buffer.iov_len = 0;
+ continued_buffer.iov_len = 0;
dependency_tree = new DependencyTree();
}
diff --git a/proxy/http2/Http2DependencyTree.h b/proxy/http2/Http2DependencyTree.h
index 8ea3bc2..4e83cd0 100644
--- a/proxy/http2/Http2DependencyTree.h
+++ b/proxy/http2/Http2DependencyTree.h
@@ -265,7 +265,7 @@ Http2DependencyTree<T>::activate(Node *node)
while (node->parent != NULL && !node->queued) {
node->parent->queue->push(node->entry);
node->queued = true;
- node = node->parent;
+ node = node->parent;
}
}
diff --git a/proxy/http2/Http2SessionAccept.cc b/proxy/http2/Http2SessionAccept.cc
index 3699d4c..b2594de 100644
--- a/proxy/http2/Http2SessionAccept.cc
+++ b/proxy/http2/Http2SessionAccept.cc
@@ -39,7 +39,7 @@ Http2SessionAccept::~Http2SessionAccept()
void
Http2SessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferReader *reader)
{
- sockaddr const *client_ip = netvc->get_remote_addr();
+ sockaddr const *client_ip = netvc->get_remote_addr();
const AclRecord *session_acl_record = testIpAllowPolicy(client_ip);
if (!session_acl_record) {
ip_port_text_buffer ipb;
@@ -57,7 +57,7 @@ Http2SessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferRead
}
Http2ClientSession *new_session = THREAD_ALLOC_INIT(http2ClientSessionAllocator, this_ethread());
- new_session->acl_record = session_acl_record;
+ new_session->acl_record = session_acl_record;
new_session->new_connection(netvc, iobuf, reader, false /* backdoor */);
}
diff --git a/proxy/http2/Http2Stream.cc b/proxy/http2/Http2Stream.cc
index b2959df..482898a 100644
--- a/proxy/http2/Http2Stream.cc
+++ b/proxy/http2/Http2Stream.cc
@@ -37,7 +37,7 @@ Http2Stream::main_event_handler(int event, void *edata)
if (e == cross_thread_event) {
cross_thread_event = NULL;
} else if (e == active_event) {
- event = VC_EVENT_ACTIVE_TIMEOUT;
+ event = VC_EVENT_ACTIVE_TIMEOUT;
active_event = NULL;
} else if (e == inactive_event) {
if (inactive_timeout_at && inactive_timeout_at < Thread::get_hrtime()) {
@@ -111,8 +111,8 @@ Http2Stream::send_request(Http2ConnectionState &cstate)
IOBufferBlock *block;
do {
bufindex = 0;
- tmp = dumpoffset;
- block = request_buffer.get_current_block();
+ tmp = dumpoffset;
+ block = request_buffer.get_current_block();
if (!block) {
request_buffer.add_block();
block = request_buffer.get_current_block();
@@ -205,12 +205,12 @@ Http2Stream::do_io_read(Continuation *c, int64_t nbytes, MIOBuffer *buf)
read_vio.buffer.clear();
}
- read_vio.mutex = c ? c->mutex : this->mutex;
- read_vio._cont = c;
- read_vio.nbytes = nbytes;
- read_vio.ndone = 0;
+ read_vio.mutex = c ? c->mutex : this->mutex;
+ read_vio._cont = c;
+ read_vio.nbytes = nbytes;
+ read_vio.ndone = 0;
read_vio.vc_server = this;
- read_vio.op = VIO::READ;
+ read_vio.op = VIO::READ;
// Is there already data in the request_buffer? If so, copy it over and then
// schedule a READ_READY or READ_COMPLETE event after we return.
@@ -227,13 +227,13 @@ Http2Stream::do_io_write(Continuation *c, int64_t nbytes, IOBufferReader *abuffe
} else {
write_vio.buffer.clear();
}
- write_vio.mutex = c ? c->mutex : this->mutex;
- write_vio._cont = c;
- write_vio.nbytes = nbytes;
- write_vio.ndone = 0;
+ write_vio.mutex = c ? c->mutex : this->mutex;
+ write_vio._cont = c;
+ write_vio.nbytes = nbytes;
+ write_vio.ndone = 0;
write_vio.vc_server = this;
- write_vio.op = VIO::WRITE;
- response_reader = response_buffer.alloc_reader();
+ write_vio.op = VIO::WRITE;
+ response_reader = response_buffer.alloc_reader();
return update_write_request(abuffer, nbytes, false) ? &write_vio : NULL;
}
@@ -438,7 +438,7 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len,
if (write_vio.nbytes > 0 && write_vio.ndone < write_vio.nbytes) {
int64_t num_to_write = write_vio.nbytes - write_vio.ndone;
if (num_to_write > write_len)
- num_to_write = write_len;
+ num_to_write = write_len;
int64_t bytes_avail = buf_reader->read_avail();
if (bytes_avail > num_to_write)
bytes_avail = num_to_write;
@@ -457,7 +457,7 @@ Http2Stream::update_write_request(IOBufferReader *buf_reader, int64_t write_len,
if (!this->response_header_done) {
// Still parsing the response_header
int bytes_used = 0;
- int state = this->response_header.parse_resp(&http_parser, this->response_reader, &bytes_used, false);
+ int state = this->response_header.parse_resp(&http_parser, this->response_reader, &bytes_used, false);
// this->response_reader->consume(bytes_used);
switch (state) {
case PARSE_DONE: {
@@ -606,8 +606,8 @@ check_continuation(Continuation *cont)
bool
Http2Stream::response_initialize_data_handling()
{
- bool is_done = false;
- const char *name = "transfer-encoding";
+ bool is_done = false;
+ const char *name = "transfer-encoding";
const char *value = "chunked";
int chunked_index = response_header.value_get_index(name, strlen(name), value, strlen(value));
// -1 means this value was not found for this field
@@ -615,7 +615,7 @@ Http2Stream::response_initialize_data_handling()
Debug("http2_stream", "Response is chunked");
chunked = true;
this->chunked_handler.init_by_action(this->response_reader, ChunkedHandler::ACTION_DECHUNK);
- this->chunked_handler.state = ChunkedHandler::CHUNK_READ_SIZE;
+ this->chunked_handler.state = ChunkedHandler::CHUNK_READ_SIZE;
this->chunked_handler.dechunked_reader = this->chunked_handler.dechunked_buffer->alloc_reader();
this->response_reader->dealloc();
this->response_reader = NULL;
diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h
index 1008072..a72d281 100644
--- a/proxy/http2/Http2Stream.h
+++ b/proxy/http2/Http2Stream.h
@@ -71,9 +71,9 @@ public:
void
init(Http2StreamId sid, ssize_t initial_rwnd)
{
- _id = sid;
- _start_time = Thread::get_hrtime();
- _thread = this_ethread();
+ _id = sid;
+ _start_time = Thread::get_hrtime();
+ _thread = this_ethread();
this->client_rwnd = initial_rwnd;
HTTP2_INCREMENT_THREAD_DYN_STAT(HTTP2_STAT_CURRENT_CLIENT_STREAM_COUNT, _thread);
sm_reader = request_reader = request_buffer.alloc_reader();
diff --git a/proxy/http2/HuffmanCodec.cc b/proxy/http2/HuffmanCodec.cc
index 1d56068..604c558 100644
--- a/proxy/http2/HuffmanCodec.cc
+++ b/proxy/http2/HuffmanCodec.cc
@@ -81,11 +81,11 @@ Node *HUFFMAN_TREE_ROOT;
static Node *
make_huffman_tree_node()
{
- Node *n = static_cast<Node *>(ats_malloc(sizeof(Node)));
- n->left = NULL;
- n->right = NULL;
+ Node *n = static_cast<Node *>(ats_malloc(sizeof(Node)));
+ n->left = NULL;
+ n->right = NULL;
n->ascii_code = '\0';
- n->leaf_node = false;
+ n->leaf_node = false;
return n;
}
@@ -103,16 +103,16 @@ make_huffman_tree()
if (huffman_table[i].code_as_hex & (1 << (bit_len - 1))) {
if (!current->right)
current->right = make_huffman_tree_node();
- current = current->right;
+ current = current->right;
} else {
if (!current->left)
current->left = make_huffman_tree_node();
- current = current->left;
+ current = current->left;
}
bit_len--;
}
current->ascii_code = i;
- current->leaf_node = true;
+ current->leaf_node = true;
}
return root;
}
@@ -187,11 +187,11 @@ huffman_encode(uint8_t *dst_start, const uint8_t *src, uint32_t src_len)
{
uint8_t *dst = dst_start;
// NOTE: The maximum length of Huffman Code is 30, thus using uint32_t as buffer.
- uint32_t buf = 0;
+ uint32_t buf = 0;
uint32_t remain_bits = 32;
for (uint32_t i = 0; i < src_len; ++i) {
- const uint32_t hex = huffman_table[src[i]].code_as_hex;
+ const uint32_t hex = huffman_table[src[i]].code_as_hex;
const uint32_t bit_len = huffman_table[src[i]].bit_len;
if (remain_bits > bit_len) {
@@ -199,14 +199,14 @@ huffman_encode(uint8_t *dst_start, const uint8_t *src, uint32_t src_len)
buf |= hex << remain_bits;
} else if (remain_bits == bit_len) {
buf |= hex;
- dst = huffman_encode_append(dst, buf);
+ dst = huffman_encode_append(dst, buf);
remain_bits = 32;
- buf = 0;
+ buf = 0;
} else {
buf |= hex >> (bit_len - remain_bits);
- dst = huffman_encode_append(dst, buf);
+ dst = huffman_encode_append(dst, buf);
remain_bits = (32 - (bit_len - remain_bits));
- buf = hex << remain_bits;
+ buf = hex << remain_bits;
}
}
diff --git a/proxy/http2/RegressionHPACK.cc b/proxy/http2/RegressionHPACK.cc
index e78a7e7..4e506b3 100644
--- a/proxy/http2/RegressionHPACK.cc
+++ b/proxy/http2/RegressionHPACK.cc
@@ -27,8 +27,8 @@
// Constants for regression test
const static int DYNAMIC_TABLE_SIZE_FOR_REGRESSION_TEST = 256;
-const static int BUFSIZE_FOR_REGRESSION_TEST = 128;
-const static int MAX_TEST_FIELD_NUM = 8;
+const static int BUFSIZE_FOR_REGRESSION_TEST = 128;
+const static int MAX_TEST_FIELD_NUM = 8;
/***********************************************************************************
* *
@@ -401,7 +401,7 @@ REGRESSION_TEST(HPACK_Encode)(RegressionTest *t, int, int *pstatus)
headers->create(HTTP_TYPE_RESPONSE);
for (unsigned int j = 0; j < sizeof(raw_field_response_test_case[i]) / sizeof(raw_field_response_test_case[i][0]); j++) {
- const char *expected_name = raw_field_response_test_case[i][j].raw_name;
+ const char *expected_name = raw_field_response_test_case[i][j].raw_name;
const char *expected_value = raw_field_response_test_case[i][j].raw_value;
if (strlen(expected_name) == 0)
break;
@@ -414,7 +414,7 @@ REGRESSION_TEST(HPACK_Encode)(RegressionTest *t, int, int *pstatus)
memset(buf, 0, BUFSIZE_FOR_REGRESSION_TEST);
uint64_t buf_len = BUFSIZE_FOR_REGRESSION_TEST;
- int64_t len = hpack_encode_header_block(indexing_table, buf, buf_len, headers);
+ int64_t len = hpack_encode_header_block(indexing_table, buf, buf_len, headers);
if (len < 0) {
box.check(false, "hpack_encode_header_blocks returned negative value: %" PRId64, len);
@@ -429,10 +429,10 @@ REGRESSION_TEST(HPACK_Encode)(RegressionTest *t, int, int *pstatus)
uint32_t expected_dynamic_table_size = 0;
for (unsigned int j = 0; j < sizeof(dynamic_table_response_test_case[i]) / sizeof(dynamic_table_response_test_case[i][0]);
j++) {
- const char *expected_name = dynamic_table_response_test_case[i][j].name;
+ const char *expected_name = dynamic_table_response_test_case[i][j].name;
const char *expected_value = dynamic_table_response_test_case[i][j].value;
- int expected_name_len = strlen(expected_name);
- int expected_value_len = strlen(expected_value);
+ int expected_name_len = strlen(expected_name);
+ int expected_value_len = strlen(expected_value);
if (expected_name_len == 0)
break;
@@ -472,7 +472,7 @@ REGRESSION_TEST(HPACK_DecodeString)(RegressionTest *t, int, int *pstatus)
box = REGRESSION_TEST_PASSED;
Arena arena;
- char *actual = NULL;
+ char *actual = NULL;
uint32_t actual_len = 0;
hpack_huffman_init();
@@ -565,7 +565,7 @@ REGRESSION_TEST(HPACK_Decode)(RegressionTest *t, int, int *pstatus)
encoded_field_request_test_case[i].encoded_field_len);
for (unsigned int j = 0; j < sizeof(raw_field_request_test_case[i]) / sizeof(raw_field_request_test_case[i][0]); j++) {
- const char *expected_name = raw_field_request_test_case[i][j].raw_name;
+ const char *expected_name = raw_field_request_test_case[i][j].raw_name;
const char *expected_value = raw_field_request_test_case[i][j].raw_value;
if (strlen(expected_name) == 0)
break;
diff --git a/proxy/http2/test_Huffmancode.cc b/proxy/http2/test_Huffmancode.cc
index 24cf41f..a8d6a64 100644
--- a/proxy/http2/test_Huffmancode.cc
+++ b/proxy/http2/test_Huffmancode.cc
@@ -67,16 +67,16 @@ uint32_t test_values[] = {
void
random_test()
{
- const int size = 1024;
+ const int size = 1024;
char *dst_start = (char *)malloc(size * 2);
char string[size];
for (int i = 0; i < size; i++) {
// coverity[dont_call]
- long num = lrand48();
+ long num = lrand48();
string[i] = (char)num;
}
const uint8_t *src = (const uint8_t *)string;
- uint32_t src_len = sizeof(string);
+ uint32_t src_len = sizeof(string);
int bytes = huffman_decode(dst_start, src, src_len);
@@ -100,12 +100,12 @@ values_test()
int size = sizeof(test_values) / 4;
for (int i = 0; i < size; i += 2) {
const uint32_t value = test_values[i];
- const uint32_t bits = test_values[i + 1];
+ const uint32_t bits = test_values[i + 1];
// copy the bits and set remaining bits to 1
union Value encoded;
union Value encoded_mapped;
- encoded.x = 0;
+ encoded.x = 0;
uint32_t bits_counter = bits;
for (uint32_t pos = 32; pos > 0; pos--) {
if (bits_counter > 0) {
@@ -134,7 +134,7 @@ values_test()
encoded_mapped.y[2] = encoded.y[1];
encoded_mapped.y[3] = encoded.y[0];
- int bytes = huffman_decode(dst_start, encoded_mapped.y, encoded_size);
+ int bytes = huffman_decode(dst_start, encoded_mapped.y, encoded_size);
char ascii_value = i / 2;
assert(dst_start[0] == ascii_value);
assert(bytes == 1);
@@ -161,7 +161,7 @@ void
encode_test()
{
for (uint64_t i = 0; i < sizeof(huffman_encode_test_data) / sizeof(huffman_encode_test_data[0]); ++i) {
- uint8_t *dst = static_cast<uint8_t *>(malloc(huffman_encode_test_data[i].expect_len));
+ uint8_t *dst = static_cast<uint8_t *>(malloc(huffman_encode_test_data[i].expect_len));
int64_t encoded_len = huffman_encode(dst, huffman_encode_test_data[i].src, huffman_encode_test_data[i].src_len);
assert(encoded_len == huffman_encode_test_data[i].expect_len);
diff --git a/proxy/logcat.cc b/proxy/logcat.cc
index 81cfb95..139091b 100644
--- a/proxy/logcat.cc
+++ b/proxy/logcat.cc
@@ -46,12 +46,12 @@
#include "Log.h"
// logcat-specific command-line flags
-static int squid_flag = 0;
-static int follow_flag = 0;
-static int clf_flag = 0;
-static int elf_flag = 0;
-static int elf2_flag = 0;
-static int auto_filenames = 0;
+static int squid_flag = 0;
+static int follow_flag = 0;
+static int clf_flag = 0;
+static int elf_flag = 0;
+static int elf2_flag = 0;
+static int auto_filenames = 0;
static int overwrite_existing_file = 0;
static char output_file[1024];
int auto_clear_cache_flag = 0;
@@ -87,8 +87,8 @@ process_file(int in_fd, int out_fd)
// cookie and the version number.
//
unsigned first_read_size = sizeof(uint32_t) + sizeof(uint32_t);
- unsigned header_size = sizeof(LogBufferHeader);
- LogBufferHeader *header = (LogBufferHeader *)&buffer[0];
+ unsigned header_size = sizeof(LogBufferHeader);
+ LogBufferHeader *header = (LogBufferHeader *)&buffer[0];
nread = read(in_fd, buffer, first_read_size);
if (!nread || nread == EOF)
@@ -199,7 +199,7 @@ int
main(int /* argc ATS_UNUSED */, const char *argv[])
{
enum {
- NO_ERROR = 0,
+ NO_ERROR = 0,
CMD_LINE_OPTION_ERROR = 1,
DATA_PROCESSING_ERROR = 2,
};
@@ -244,7 +244,7 @@ main(int /* argc ATS_UNUSED */, const char *argv[])
int error = NO_ERROR;
if (n_file_arguments) {
- int bin_ext_len = strlen(LOG_FILE_BINARY_OBJECT_FILENAME_EXTENSION);
+ int bin_ext_len = strlen(LOG_FILE_BINARY_OBJECT_FILENAME_EXTENSION);
int ascii_ext_len = strlen(LOG_FILE_ASCII_OBJECT_FILENAME_EXTENSION);
for (unsigned i = 0; i < n_file_arguments; ++i) {
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index c71e373..e336758 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -64,7 +64,7 @@ inkcoreapi LogObject *Log::error_log = NULL;
LogFieldList Log::global_field_list;
LogFormat *Log::global_scrap_format = NULL;
LogObject *Log::global_scrap_object = NULL;
-Log::LoggingMode Log::logging_mode = LOG_MODE_NONE;
+Log::LoggingMode Log::logging_mode = LOG_MODE_NONE;
// Flush thread stuff
EventNotify *Log::preproc_notify;
@@ -79,9 +79,9 @@ int Log::collation_preproc_threads;
int Log::collation_port;
// Log private objects
-int Log::init_status = 0;
-int Log::config_flags = 0;
-bool Log::logging_mode_changed = false;
+int Log::init_status = 0;
+int Log::config_flags = 0;
+bool Log::logging_mode_changed = false;
uint32_t Log::periodic_tasks_interval = PERIODIC_TASKS_INTERVAL_FALLBACK;
// Hash table for LogField symbols
@@ -96,13 +96,13 @@ RecRawStatBlock *log_rsb;
to be changed (as the result of a manager callback).
-------------------------------------------------------------------------*/
-LogConfig *Log::config = NULL;
+LogConfig *Log::config = NULL;
static unsigned log_configid = 0;
void
Log::change_configuration()
{
- LogConfig *prev = Log::config;
+ LogConfig *prev = Log::config;
LogConfig *new_config = NULL;
Debug("log-config", "Changing configuration ...");
@@ -828,7 +828,7 @@ Log::handle_periodic_tasks_int_change(const char * /* name ATS_UNUSED */, RecDat
void
Log::init(int flags)
{
- collation_preproc_threads = 1;
+ collation_preproc_threads = 1;
collation_accept_file_descriptor = NO_FD;
// store the configuration flags
@@ -850,7 +850,7 @@ Log::init(int flags)
LogConfig::register_stat_callbacks();
config->read_configuration_variables();
- collation_port = config->collation_port;
+ collation_port = config->collation_port;
collation_preproc_threads = config->collation_preproc_threads;
if (config_flags & STANDALONE_COLLATOR) {
@@ -966,7 +966,7 @@ Log::create_threads()
// TODO: Enable multiple flush threads, such as
// one flush thread per file.
//
- flush_notify = new EventNotify;
+ flush_notify = new EventNotify;
flush_data_list = new InkAtomicList;
sprintf(desc, "Logging flush buffer list");
@@ -1053,7 +1053,7 @@ Log::error(const char *format, ...)
int
Log::va_error(const char *format, va_list ap)
{
- int ret_val = Log::SKIP;
+ int ret_val = Log::SKIP;
ProxyMutex *mutex = this_ethread()->mutex;
if (error_log) {
@@ -1155,7 +1155,7 @@ Log::preproc_thread_main(void *args)
return NULL;
}
size_t buffers_preproced = 0;
- LogConfig *current = (LogConfig *)configProcessor.get(log_configid);
+ LogConfig *current = (LogConfig *)configProcessor.get(log_configid);
if (likely(current)) {
buffers_preproced = current->log_object_manager.preproc_buffers(idx);
@@ -1210,19 +1210,19 @@ Log::flush_thread_main(void * /* args ATS_UNUSED */)
// process each flush data
//
while ((fdata = invert_link.pop())) {
- buf = NULL;
+ buf = NULL;
bytes_written = 0;
- logfile = fdata->m_logfile;
+ logfile = fdata->m_logfile;
if (logfile->m_file_format == LOG_FILE_BINARY) {
- logbuffer = (LogBuffer *)fdata->m_data;
+ logbuffer = (LogBuffer *)fdata->m_data;
LogBufferHeader *buffer_header = logbuffer->header();
- buf = (char *)buffer_header;
+ buf = (char *)buffer_header;
total_bytes = buffer_header->byte_count;
} else if (logfile->m_file_format == LOG_FILE_ASCII || logfile->m_file_format == LOG_FILE_PIPE) {
- buf = (char *)fdata->m_data;
+ buf = (char *)fdata->m_data;
total_bytes = fdata->m_len;
} else {
diff --git a/proxy/logging/Log.h b/proxy/logging/Log.h
index e77101c..e7ea17a 100644
--- a/proxy/logging/Log.h
+++ b/proxy/logging/Log.h
@@ -354,10 +354,10 @@ class Log
public:
enum ReturnCodeFlags {
LOG_OK = 1,
- SKIP = 2,
- AGGR = 4,
- FAIL = 8,
- FULL = 16,
+ SKIP = 2,
+ AGGR = 4,
+ FAIL = 8,
+ FULL = 16,
};
enum LoggingMode {
@@ -369,13 +369,13 @@ public:
enum InitFlags {
FIELDS_INITIALIZED = 1,
- FULLY_INITIALIZED = 2,
+ FULLY_INITIALIZED = 2,
};
enum ConfigFlags {
NO_REMOTE_MANAGEMENT = 1,
- STANDALONE_COLLATOR = 2,
- LOGCAT = 4,
+ STANDALONE_COLLATOR = 2,
+ LOGCAT = 4,
};
enum CollationMode {
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index 639e0e8..d99549f 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -438,8 +438,8 @@ LogAccess::marshal_client_retry_after_time(char *buf)
int
LogAccess::marshal_proxy_host_name(char *buf)
{
- char *str = NULL;
- int len = 0;
+ char *str = NULL;
+ int len = 0;
Machine *machine = Machine::instance();
if (machine) {
@@ -719,8 +719,8 @@ int
LogAccess::marshal_config_str_var(char *config_var, char *buf)
{
char *str = NULL;
- str = REC_ConfigReadString(config_var);
- int len = LogAccess::strlen(str);
+ str = REC_ConfigReadString(config_var);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -766,7 +766,7 @@ LogAccess::marshal_record(char *record, char *buf)
return max_chars;
}
- const char *record_not_found_msg = "RECORD_NOT_FOUND";
+ const char *record_not_found_msg = "RECORD_NOT_FOUND";
const unsigned int record_not_found_chars = ::strlen(record_not_found_msg) + 1;
char ascii_buf[max_chars];
@@ -779,10 +779,10 @@ LogAccess::marshal_record(char *record, char *buf)
#define LOG_STRING RECD_STRING
RecDataT stype = RECD_NULL;
- bool found = false;
+ bool found = false;
if (RecGetRecordDataType(record, &stype) != REC_ERR_OKAY) {
- out_buf = "INVALID_RECORD";
+ out_buf = "INVALID_RECORD";
num_chars = ::strlen(out_buf) + 1;
} else {
if (LOG_INTEGER == stype || LOG_COUNTER == stype) {
@@ -802,7 +802,7 @@ LogAccess::marshal_record(char *record, char *buf)
out_buf = int64_to_str(ascii_buf, max_chars, val, &num_chars);
ink_assert(out_buf);
} else {
- out_buf = (char *)record_not_found_msg;
+ out_buf = (char *)record_not_found_msg;
num_chars = record_not_found_chars;
}
} else if (LOG_FLOAT == stype) {
@@ -829,13 +829,13 @@ LogAccess::marshal_record(char *record, char *buf)
//
if (num_chars > max_chars) {
// data does not fit, output asterisks
- out_buf = "***";
+ out_buf = "***";
num_chars = ::strlen(out_buf) + 1;
} else {
out_buf = ascii_buf;
}
} else {
- out_buf = (char *)record_not_found_msg;
+ out_buf = (char *)record_not_found_msg;
num_chars = record_not_found_chars;
}
} else if (LOG_STRING == stype) {
@@ -851,19 +851,19 @@ LogAccess::marshal_record(char *record, char *buf)
ascii_buf[max_chars - 2] = '.';
ascii_buf[max_chars - 3] = '.';
ascii_buf[max_chars - 4] = '.';
- out_buf = ascii_buf;
- num_chars = max_chars;
+ out_buf = ascii_buf;
+ num_chars = max_chars;
}
} else {
- out_buf = "NULL";
+ out_buf = "NULL";
num_chars = ::strlen(out_buf) + 1;
}
} else {
- out_buf = (char *)record_not_found_msg;
+ out_buf = (char *)record_not_found_msg;
num_chars = record_not_found_chars;
}
} else {
- out_buf = "INVALID_MgmtType";
+ out_buf = "INVALID_MgmtType";
num_chars = ::strlen(out_buf) + 1;
ink_assert(!"invalid MgmtType for requested record");
}
@@ -919,7 +919,7 @@ void
LogAccess::marshal_mem(char *dest, const char *source, int actual_len, int padded_len)
{
if (source == NULL || source[0] == 0 || actual_len == 0) {
- source = DEFAULT_STR;
+ source = DEFAULT_STR;
actual_len = DEFAULT_STR_LEN;
ink_assert(actual_len < padded_len);
}
@@ -957,13 +957,13 @@ LogAccess::marshal_ip(char *dest, sockaddr const *ip)
} else if (ats_is_ip4(ip)) {
if (dest) {
data._ip4._family = AF_INET;
- data._ip4._addr = ats_ip4_addr_cast(ip);
+ data._ip4._addr = ats_ip4_addr_cast(ip);
}
len = sizeof(data._ip4);
} else if (ats_is_ip6(ip)) {
if (dest) {
data._ip6._family = AF_INET6;
- data._ip6._addr = ats_ip6_addr_cast(ip);
+ data._ip6._addr = ats_ip6_addr_cast(ip);
}
len = sizeof(data._ip6);
} else {
@@ -1071,7 +1071,7 @@ LogAccess::unmarshal_itox(int64_t val, char *dest, int field_width, char leading
{
ink_assert(dest != NULL);
- char *p = dest;
+ char *p = dest;
static char table[] = "0123456789abcdef?";
for (int i = 0; i < (int)(sizeof(int64_t) * 2); i++) {
@@ -1150,7 +1150,7 @@ LogAccess::unmarshal_str(char **buf, char *dest, int len, LogSlice *slice)
ink_assert(dest != NULL);
char *val_buf = *buf;
- int val_len = (int)::strlen(val_buf);
+ int val_len = (int)::strlen(val_buf);
*buf += LogAccess::strlen(val_buf); // this is how it was stored
@@ -1183,7 +1183,7 @@ LogAccess::unmarshal_ttmsf(char **buf, char *dest, int len)
ink_assert(dest != NULL);
int64_t val = unmarshal_int(buf);
- float secs = (float)val / 1000;
+ float secs = (float)val / 1000;
int val_len = snprintf(dest, len, "%.3f", secs);
return val_len;
}
@@ -1218,7 +1218,7 @@ LogAccess::unmarshal_http_version(char **buf, char *dest, int len)
ink_assert(dest != NULL);
static const char *http = "HTTP/";
- static int http_len = (int)::strlen(http);
+ static int http_len = (int)::strlen(http);
char val_buf[128];
char *p = val_buf;
@@ -1231,7 +1231,7 @@ LogAccess::unmarshal_http_version(char **buf, char *dest, int len)
return -1;
}
p += res1;
- *p++ = '.';
+ *p++ = '.';
int res2 = unmarshal_int_to_str(buf, p, 128 - http_len - res1 - 1);
if (res2 < 0) {
return -1;
@@ -1267,13 +1267,13 @@ LogAccess::unmarshal_http_text(char **buf, char *dest, int len, LogSlice *slice)
return -1;
}
p += res1;
- *p++ = ' ';
+ *p++ = ' ';
int res2 = unmarshal_str(buf, p, len - res1 - 1, slice);
if (res2 < 0) {
return -1;
}
p += res2;
- *p++ = ' ';
+ *p++ = ' ';
int res3 = unmarshal_http_version(buf, p, len - res1 - res2 - 2);
if (res3 < 0) {
return -1;
@@ -1355,7 +1355,7 @@ LogAccess::unmarshal_ip_to_str(char **buf, char *dest, int len)
unmarshal_ip(buf, &ip);
if (!ats_is_ip(&ip)) {
*dest = '0';
- zret = 1;
+ zret = 1;
} else if (ats_ip_ntop(&ip, dest, len)) {
zret = static_cast<int>(::strlen(dest));
}
@@ -1381,7 +1381,7 @@ LogAccess::unmarshal_ip_to_hex(char **buf, char *dest, int len)
unmarshal_ip(buf, &ip);
if (!ats_is_ip(&ip)) {
*dest = '0';
- zret = 1;
+ zret = 1;
} else {
zret = ats_ip_to_hex(&ip.sa, dest, len);
}
@@ -1494,7 +1494,7 @@ LogAccess::unmarshal_record(char **buf, char *dest, int len)
ink_assert(dest != NULL);
char *val_buf = *buf;
- int val_len = (int)::strlen(val_buf);
+ int val_len = (int)::strlen(val_buf);
*buf += MARSHAL_RECORD_LENGTH; // this is how it was stored
if (val_len < len) {
memcpy(dest, val_buf, val_len);
@@ -1532,7 +1532,7 @@ resolve_logfield_string(LogAccess *context, const char *format_str)
//
char *printf_str = NULL;
char *fields_str = NULL;
- int n_fields = LogFormat::parse_format_string(format_str, &printf_str, &fields_str);
+ int n_fields = LogFormat::parse_format_string(format_str, &printf_str, &fields_str);
//
// Perhaps there were no fields to resolve? Then just return the
@@ -1566,8 +1566,8 @@ resolve_logfield_string(LogAccess *context, const char *format_str)
Debug("log-resolve", "Marshaling data from LogAccess into buffer ...");
context->init();
unsigned bytes_needed = fields.marshal_len(context);
- char *buf = (char *)ats_malloc(bytes_needed);
- unsigned bytes_used = fields.marshal(context, buf);
+ char *buf = (char *)ats_malloc(bytes_needed);
+ unsigned bytes_used = fields.marshal(context, buf);
ink_assert(bytes_needed == bytes_used);
Debug("log-resolve", " %u bytes marshalled", bytes_used);
diff --git a/proxy/logging/LogAccess.h b/proxy/logging/LogAccess.h
index bda148b..9fb5168 100644
--- a/proxy/logging/LogAccess.h
+++ b/proxy/logging/LogAccess.h
@@ -106,7 +106,7 @@
#define DEFAULT_STR_FIELD \
{ \
char *str = NULL; \
- int len = INK_MIN_ALIGN; \
+ int len = INK_MIN_ALIGN; \
if (buf) { \
marshal_str(buf, str, len); \
} \
diff --git a/proxy/logging/LogAccessHttp.cc b/proxy/logging/LogAccessHttp.cc
index d6b74d2..7ddf3a2 100644
--- a/proxy/logging/LogAccessHttp.cc
+++ b/proxy/logging/LogAccessHttp.cc
@@ -110,7 +110,7 @@ LogAccessHttp::init()
// make a copy of the incoming url into the arena
const char *url_string_ref = m_client_request->url_string_get_ref(&m_client_req_url_len);
- m_client_req_url_str = m_arena.str_alloc(m_client_req_url_len + 1);
+ m_client_req_url_str = m_arena.str_alloc(m_client_req_url_len + 1);
memcpy(m_client_req_url_str, url_string_ref, m_client_req_url_len);
m_client_req_url_str[m_client_req_url_len] = '\0';
@@ -232,7 +232,7 @@ LogAccessHttp::marshal_plugin_identity_id(char *buf)
int
LogAccessHttp::marshal_plugin_identity_tag(char *buf)
{
- int len = INK_MIN_ALIGN;
+ int len = INK_MIN_ALIGN;
char const *tag = m_http_sm->plugin_tag;
if (!tag)
@@ -295,7 +295,7 @@ int
LogAccessHttp::marshal_client_auth_user_name(char *buf)
{
char *str = NULL;
- int len = INK_MIN_ALIGN;
+ int len = INK_MIN_ALIGN;
// Jira TS-40:
// NOTE: Authentication related code and modules were removed/disabled.
@@ -417,8 +417,8 @@ int
LogAccessHttp::marshal_client_req_http_method(char *buf)
{
char *str = NULL;
- int alen = 0;
- int plen = INK_MIN_ALIGN;
+ int alen = 0;
+ int plen = INK_MIN_ALIGN;
if (m_client_request) {
str = (char *)m_client_request->method_get(&alen);
@@ -556,17 +556,17 @@ LogAccessHttp::marshal_client_req_url_path(char *buf)
int
LogAccessHttp::marshal_client_req_url_scheme(char *buf)
{
- int scheme = m_http_sm->t_state.orig_scheme;
+ int scheme = m_http_sm->t_state.orig_scheme;
const char *str = NULL;
int alen;
int plen = INK_MIN_ALIGN;
// If the transaction aborts very early, the scheme may not be set, or so ASAN reports.
if (scheme >= 0) {
- str = hdrtoken_index_to_wks(scheme);
+ str = hdrtoken_index_to_wks(scheme);
alen = hdrtoken_index_to_length(scheme);
} else {
- str = "UNKNOWN";
+ str = "UNKNOWN";
alen = strlen(str);
}
@@ -599,8 +599,8 @@ LogAccessHttp::marshal_client_req_http_version(char *buf)
int64_t minor = 0;
if (m_client_request) {
HTTPVersion versionObject = m_client_request->version_get();
- major = HTTP_MAJOR(versionObject.m_version);
- minor = HTTP_MINOR(versionObject.m_version);
+ major = HTTP_MAJOR(versionObject.m_version);
+ minor = HTTP_MINOR(versionObject.m_version);
}
marshal_int(buf, major);
marshal_int((buf + INK_MIN_ALIGN), minor);
@@ -614,14 +614,14 @@ LogAccessHttp::marshal_client_req_http_version(char *buf)
int
LogAccessHttp::marshal_client_req_protocol_version(char *buf)
{
- int len = INK_MIN_ALIGN;
+ int len = INK_MIN_ALIGN;
char const *tag = m_http_sm->plugin_tag;
if (!tag) {
if (m_client_request) {
HTTPVersion versionObject = m_client_request->version_get();
- int64_t major = HTTP_MAJOR(versionObject.m_version);
- int64_t minor = HTTP_MINOR(versionObject.m_version);
+ int64_t major = HTTP_MAJOR(versionObject.m_version);
+ int64_t minor = HTTP_MINOR(versionObject.m_version);
if (major == 1 && minor == 1) {
tag = "http/1.1";
} else if (major == 1 && minor == 0) {
@@ -722,7 +722,7 @@ int
LogAccessHttp::marshal_client_finish_status_code(char *buf)
{
if (buf) {
- int code = LOG_FINISH_FIN;
+ int code = LOG_FINISH_FIN;
HttpTransact::AbortState_t cl_abort_state = m_http_sm->t_state.client_info.abort;
if (cl_abort_state == HttpTransact::ABORTED) {
// Check to see if the abort is due to a timeout
@@ -744,7 +744,7 @@ int
LogAccessHttp::marshal_client_security_protocol(char *buf)
{
const char *proto = m_http_sm->client_sec_protocol;
- int round_len = LogAccess::strlen(proto);
+ int round_len = LogAccess::strlen(proto);
if (buf) {
marshal_str(buf, proto, round_len);
@@ -757,7 +757,7 @@ int
LogAccessHttp::marshal_client_security_cipher_suite(char *buf)
{
const char *cipher = m_http_sm->client_cipher_suite;
- int round_len = LogAccess::strlen(cipher);
+ int round_len = LogAccess::strlen(cipher);
if (buf) {
marshal_str(buf, cipher, round_len);
@@ -952,7 +952,7 @@ int
LogAccessHttp::marshal_proxy_req_server_name(char *buf)
{
char *str = NULL;
- int len = INK_MIN_ALIGN;
+ int len = INK_MIN_ALIGN;
if (m_http_sm->t_state.current.server) {
str = m_http_sm->t_state.current.server->name;
@@ -1017,7 +1017,7 @@ int
LogAccessHttp::marshal_server_host_ip(char *buf)
{
sockaddr const *ip = 0;
- ip = &m_http_sm->t_state.server_info.dst_addr.sa;
+ ip = &m_http_sm->t_state.server_info.dst_addr.sa;
if (!ats_is_ip(ip)) {
if (m_http_sm->t_state.current.server) {
ip = &m_http_sm->t_state.current.server->dst_addr.sa;
@@ -1037,8 +1037,8 @@ int
LogAccessHttp::marshal_server_host_name(char *buf)
{
char const *str = NULL;
- int padded_len = INK_MIN_ALIGN;
- int actual_len = 0;
+ int padded_len = INK_MIN_ALIGN;
+ int actual_len = 0;
if (m_client_request) {
str = m_client_request->host_get(&actual_len);
@@ -1125,7 +1125,7 @@ LogAccessHttp::marshal_server_resp_time_ms(char *buf)
{
if (buf) {
ink_hrtime elapsed = m_http_sm->milestones[TS_MILESTONE_SERVER_CLOSE] - m_http_sm->milestones[TS_MILESTONE_SERVER_CONNECT];
- int64_t val = (int64_t)ink_hrtime_to_msec(elapsed);
+ int64_t val = (int64_t)ink_hrtime_to_msec(elapsed);
marshal_int(buf, val);
}
return INK_MIN_ALIGN;
@@ -1136,7 +1136,7 @@ LogAccessHttp::marshal_server_resp_time_s(char *buf)
{
if (buf) {
ink_hrtime elapsed = m_http_sm->milestones[TS_MILESTONE_SERVER_CLOSE] - m_http_sm->milestones[TS_MILESTONE_SERVER_CONNECT];
- int64_t val = (int64_t)ink_hrtime_to_sec(elapsed);
+ int64_t val = (int64_t)ink_hrtime_to_sec(elapsed);
marshal_int(buf, val);
}
return INK_MIN_ALIGN;
@@ -1308,7 +1308,7 @@ LogAccessHttp::marshal_transfer_time_ms(char *buf)
{
if (buf) {
ink_hrtime elapsed = m_http_sm->milestones[TS_MILESTONE_SM_FINISH] - m_http_sm->milestones[TS_MILESTONE_SM_START];
- int64_t val = (int64_t)ink_hrtime_to_msec(elapsed);
+ int64_t val = (int64_t)ink_hrtime_to_msec(elapsed);
marshal_int(buf, val);
}
return INK_MIN_ALIGN;
@@ -1319,7 +1319,7 @@ LogAccessHttp::marshal_transfer_time_s(char *buf)
{
if (buf) {
ink_hrtime elapsed = m_http_sm->milestones[TS_MILESTONE_SM_FINISH] - m_http_sm->milestones[TS_MILESTONE_SM_START];
- int64_t val = (int64_t)ink_hrtime_to_sec(elapsed);
+ int64_t val = (int64_t)ink_hrtime_to_sec(elapsed);
marshal_int(buf, val);
}
return INK_MIN_ALIGN;
@@ -1364,9 +1364,9 @@ LogAccessHttp::marshal_file_size(char *buf)
int
LogAccessHttp::marshal_http_header_field(LogField::Container container, char *field, char *buf)
{
- char *str = NULL;
- int padded_len = INK_MIN_ALIGN;
- int actual_len = 0;
+ char *str = NULL;
+ int padded_len = INK_MIN_ALIGN;
+ int actual_len = 0;
bool valid_field = false;
HTTPHdr *header;
@@ -1507,7 +1507,7 @@ LogAccessHttp::marshal_http_header_field_escapify(LogField::Container container,
//
int running_len = 0;
while (fld) {
- str = (char *)fld->value_get(&actual_len);
+ str = (char *)fld->value_get(&actual_len);
new_str = LogUtils::escapify_url(&m_arena, str, actual_len, &new_len);
if (buf) {
memcpy(buf, new_str, new_len);
@@ -1579,7 +1579,7 @@ LogAccessHttp::marshal_milestone_diff(TSMilestonesType ms1, TSMilestonesType ms2
{
if (buf) {
ink_hrtime elapsed = m_http_sm->milestones.elapsed(ms2, ms1);
- int64_t val = (int64_t)ink_hrtime_to_msec(elapsed);
+ int64_t val = (int64_t)ink_hrtime_to_msec(elapsed);
marshal_int(buf, val);
}
return INK_MIN_ALIGN;
diff --git a/proxy/logging/LogAccessICP.cc b/proxy/logging/LogAccessICP.cc
index 3890051..be20a29 100644
--- a/proxy/logging/LogAccessICP.cc
+++ b/proxy/logging/LogAccessICP.cc
@@ -89,7 +89,7 @@ int
LogAccessICP::marshal_client_auth_user_name(char *buf)
{
char *str = (char *)m_icp_log->GetIdent();
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -121,7 +121,7 @@ int
LogAccessICP::marshal_client_req_http_method(char *buf)
{
char *str = (char *)m_icp_log->GetMethod();
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
@@ -136,7 +136,7 @@ int
LogAccessICP::marshal_client_req_url(char *buf)
{
char *str = (char *)m_icp_log->GetURI();
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -155,8 +155,8 @@ LogAccessICP::marshal_client_req_url_canon(char *buf)
// FIXME: need to ensure that m_icp_log->GetURI() is NUL-terminated
//
char *uri_str = (char *)m_icp_log->GetURI();
- int uri_len = ::strlen(uri_str);
- char *str = LogUtils::escapify_url(&arena, uri_str, uri_len, &escapified_len);
+ int uri_len = ::strlen(uri_str);
+ char *str = LogUtils::escapify_url(&arena, uri_str, uri_len, &escapified_len);
int len = round_strlen(escapified_len + 1); // the padded len
if (buf)
@@ -173,7 +173,7 @@ LogAccessICP::marshal_proxy_resp_content_type(char *buf)
// FIXME: need to ensure that m_icp_log->GetContentType() is NUL-terminated
//
char *ct_str = (char *)m_icp_log->GetContentType();
- int ct_len = ::strlen(ct_str);
+ int ct_len = ::strlen(ct_str);
// FIXME: need to be sure remove_content_type_attributecan mutate ct_str
//
@@ -256,7 +256,7 @@ int
LogAccessICP::marshal_server_host_name(char *buf)
{
char *str = (char *)m_icp_log->GetFromHost();
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
diff --git a/proxy/logging/LogAccessTest.cc b/proxy/logging/LogAccessTest.cc
index 2c2cc28..401f9ac 100644
--- a/proxy/logging/LogAccessTest.cc
+++ b/proxy/logging/LogAccessTest.cc
@@ -78,7 +78,7 @@ int
LogAccessTest::marshal_client_auth_user_name(char *buf)
{
static char const *str = "major tom";
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -92,7 +92,7 @@ int
LogAccessTest::marshal_client_req_text(char *buf)
{
static char const *str = "GET http://www.foobar.com/ HTTP/1.0";
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -119,7 +119,7 @@ int
LogAccessTest::marshal_client_req_url(char *buf)
{
static char const *str = "http://www.foobar.com/";
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -185,7 +185,7 @@ int
LogAccessTest::marshal_proxy_resp_content_type(char *buf)
{
static char const *str = "text/html";
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
@@ -340,7 +340,7 @@ int
LogAccessTest::marshal_server_host_name(char *buf)
{
static char const *str = "www.foobar.com";
- int len = LogAccess::strlen(str);
+ int len = LogAccess::strlen(str);
if (buf) {
marshal_str(buf, str, len);
}
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 75a370b..6f54da5 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -56,7 +56,7 @@ enum {
FieldListCacheElement fieldlist_cache[FIELDLIST_CACHE_SIZE];
int fieldlist_cache_entries = 0;
-vint32 LogBuffer::M_ID = 0;
+vint32 LogBuffer::M_ID = 0;
/*-------------------------------------------------------------------------
The following LogBufferHeader routines are used to grab strings out from
@@ -132,10 +132,10 @@ LogBuffer::LogBuffer(LogObject *owner, size_t size, size_t buf_align, size_t wri
if (alloc_size <= max_iobuffer_size) {
m_buffer_fast_allocator_size = buffer_size_to_index(alloc_size);
- m_unaligned_buffer = (char *)ioBufAllocator[m_buffer_fast_allocator_size].alloc_void();
+ m_unaligned_buffer = (char *)ioBufAllocator[m_buffer_fast_allocator_size].alloc_void();
} else {
m_buffer_fast_allocator_size = -1;
- m_unaligned_buffer = (char *)ats_malloc(alloc_size);
+ m_unaligned_buffer = (char *)ats_malloc(alloc_size);
}
m_buffer = (char *)align_pointer_forward(m_unaligned_buffer, buf_align);
@@ -202,7 +202,7 @@ LogBuffer::freeLogBuffer()
LogBuffer::~LogBuffer()
{
freeLogBuffer();
- m_buffer = 0;
+ m_buffer = 0;
m_unaligned_buffer = 0;
}
@@ -223,7 +223,7 @@ LogBuffer::checkout_write(size_t *write_offset, size_t write_size)
LB_ResultCode ret_val = LB_BUSY;
LB_State old_s, new_s;
- size_t offset = 0;
+ size_t offset = 0;
size_t actual_write_size = INK_ALIGN(write_size + sizeof(LogEntryHeader), m_write_align);
uint64_t retries = (uint64_t)-1;
@@ -257,7 +257,7 @@ LogBuffer::checkout_write(size_t *write_offset, size_t write_size)
ret_val = LB_BUFFER_TOO_SMALL;
} else {
new_s.s.full = 1;
- ret_val = old_s.s.num_writers ? LB_FULL_ACTIVE_WRITERS : LB_FULL_NO_WRITERS;
+ ret_val = old_s.s.num_writers ? LB_FULL_ACTIVE_WRITERS : LB_FULL_NO_WRITERS;
}
}
} else {
@@ -297,9 +297,9 @@ LogBuffer::checkout_write(size_t *write_offset, size_t write_size)
// entry_header->timestamp = LogUtils::timestamp();
struct timeval tp = ink_gettimeofday();
- entry_header->timestamp = tp.tv_sec;
+ entry_header->timestamp = tp.tv_sec;
entry_header->timestamp_usec = tp.tv_usec;
- entry_header->entry_len = actual_write_size;
+ entry_header->entry_len = actual_write_size;
*write_offset = offset + sizeof(LogEntryHeader);
}
@@ -369,16 +369,16 @@ LogBuffer::_add_buffer_header()
//
// initialize the header
//
- LogFormat *fmt = m_owner->m_format;
- m_header = (LogBufferHeader *)m_buffer;
- m_header->cookie = LOG_SEGMENT_COOKIE;
- m_header->version = LOG_SEGMENT_VERSION;
- m_header->format_type = fmt->type();
- m_header->entry_count = 0;
- m_header->low_timestamp = LogUtils::timestamp();
- m_header->high_timestamp = 0;
+ LogFormat *fmt = m_owner->m_format;
+ m_header = (LogBufferHeader *)m_buffer;
+ m_header->cookie = LOG_SEGMENT_COOKIE;
+ m_header->version = LOG_SEGMENT_VERSION;
+ m_header->format_type = fmt->type();
+ m_header->entry_count = 0;
+ m_header->low_timestamp = LogUtils::timestamp();
+ m_header->high_timestamp = 0;
m_header->log_object_signature = m_owner->get_signature();
- m_header->log_object_flags = m_owner->get_flags();
+ m_header->log_object_flags = m_owner->get_flags();
#if defined(LOG_BUFFER_TRACKING)
m_header->id = lrand48();
#endif // defined(LOG_BUFFER_TRACKING)
@@ -391,11 +391,11 @@ LogBuffer::_add_buffer_header()
header_len = sizeof(LogBufferHeader); // at least ...
- m_header->fmt_name_offset = 0;
+ m_header->fmt_name_offset = 0;
m_header->fmt_fieldlist_offset = 0;
- m_header->fmt_printf_offset = 0;
- m_header->src_hostname_offset = 0;
- m_header->log_filename_offset = 0;
+ m_header->fmt_printf_offset = 0;
+ m_header->src_hostname_offset = 0;
+ m_header->log_filename_offset = 0;
if (fmt->name()) {
m_header->fmt_name_offset = header_len;
@@ -424,7 +424,7 @@ LogBuffer::_add_buffer_header()
header_len = INK_ALIGN_DEFAULT(header_len);
- m_header->byte_count = header_len;
+ m_header->byte_count = header_len;
m_header->data_offset = header_len;
return header_len;
@@ -438,8 +438,8 @@ LogBuffer::update_header_data()
//
if (m_unaligned_buffer) {
- m_header->entry_count = m_state.s.num_entries;
- m_header->byte_count = m_state.s.offset;
+ m_header->entry_count = m_state.s.num_entries;
+ m_header->byte_count = m_state.s.offset;
m_header->high_timestamp = LogUtils::timestamp();
}
}
@@ -472,7 +472,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
if (alt_fieldlist && alt_printf_str) {
LogField *f, *g;
int n_alt_fields = alt_fieldlist->count();
- int i = 0;
+ int i = 0;
readfrom_map = (int *)ats_malloc(n_alt_fields * sizeof(int));
for (f = alt_fieldlist->first(); f; f = alt_fieldlist->next(f)) {
@@ -480,7 +480,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
bool found_match = false;
for (g = fieldlist->first(); g; g = fieldlist->next(g)) {
if (strcmp(f->symbol(), g->symbol()) == 0) {
- found_match = true;
+ found_match = true;
readfrom_map[i++] = readfrom_pos;
break;
}
@@ -502,8 +502,8 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
// LogField object, obtained from the fieldlist.
//
- LogField *field = fieldlist->first();
- int printf_len = (int)::strlen(printf_str); // OPTIMIZE
+ LogField *field = fieldlist->first();
+ int printf_len = (int)::strlen(printf_str); // OPTIMIZE
int bytes_written = 0;
int res, i;
@@ -525,7 +525,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
if (strcmp(sym, "cqts") == 0) {
char *ptr = (char *)×tamp;
- res = LogAccess::unmarshal_int_to_str(&ptr, to, write_to_len - bytes_written);
+ res = LogAccess::unmarshal_int_to_str(&ptr, to, write_to_len - bytes_written);
if (buffer_version > 1) {
// space was reserved in read buffer; remove it
read_from += INK_MIN_ALIGN;
@@ -535,7 +535,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
} else if (strcmp(sym, "cqth") == 0) {
char *ptr = (char *)×tamp;
- res = LogAccess::unmarshal_int_to_str_hex(&ptr, to, write_to_len - bytes_written);
+ res = LogAccess::unmarshal_int_to_str_hex(&ptr, to, write_to_len - bytes_written);
if (buffer_version > 1) {
// space was reserved in read buffer; remove it
read_from += INK_MIN_ALIGN;
@@ -558,7 +558,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
} else if (strcmp(sym, "cqtn") == 0) {
char *str = LogUtils::timestamp_to_netscape_str(timestamp);
- res = (int)::strlen(str);
+ res = (int)::strlen(str);
if (res < write_to_len - bytes_written) {
memcpy(to, str, res);
} else {
@@ -573,7 +573,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
} else if (strcmp(sym, "cqtd") == 0) {
char *str = LogUtils::timestamp_to_date_str(timestamp);
- res = (int)::strlen(str);
+ res = (int)::strlen(str);
if (res < write_to_len - bytes_written) {
memcpy(to, str, res);
} else {
@@ -588,7 +588,7 @@ LogBuffer::resolve_custom_entry(LogFieldList *fieldlist, char *printf_str, char
} else if (strcmp(sym, "cqtt") == 0) {
char *str = LogUtils::timestamp_to_time_str(timestamp);
- res = (int)::strlen(str);
+ res = (int)::strlen(str);
if (res < write_to_len - bytes_written) {
memcpy(to, str, res);
} else {
@@ -655,7 +655,7 @@ LogBuffer::to_ascii(LogEntryHeader *entry, LogFormatType type, char *buf, int bu
char *write_to; // keeps track of where we're writing into buf
read_from = (char *)entry + sizeof(LogEntryHeader);
- write_to = buf;
+ write_to = buf;
if (type == LOG_FORMAT_TEXT) {
//
@@ -696,7 +696,7 @@ LogBuffer::to_ascii(LogEntryHeader *entry, LogFormatType type, char *buf, int bu
if (fieldlist_cache_entries < FIELDLIST_CACHE_SIZE) {
Debug("log-fieldlist", "Fieldlist cached as entry %d", fieldlist_cache_entries);
- fieldlist_cache[fieldlist_cache_entries].fieldlist = fieldlist;
+ fieldlist_cache[fieldlist_cache_entries].fieldlist = fieldlist;
fieldlist_cache[fieldlist_cache_entries].symbol_str = ats_strdup(symbol_str);
fieldlist_cache_entries++;
} else {
@@ -705,9 +705,9 @@ LogBuffer::to_ascii(LogEntryHeader *entry, LogFormatType type, char *buf, int bu
}
LogFieldList *alt_fieldlist = NULL;
- char *alt_printf_str = NULL;
- char *alt_symbol_str = NULL;
- bool bad_alt_format = false;
+ char *alt_printf_str = NULL;
+ char *alt_symbol_str = NULL;
+ bool bad_alt_format = false;
if (alt_format) {
int n_alt_fields = LogFormat::parse_format_string(alt_format, &alt_printf_str, &alt_symbol_str);
@@ -717,9 +717,9 @@ LogBuffer::to_ascii(LogEntryHeader *entry, LogFormatType type, char *buf, int bu
}
if (!bad_alt_format) {
- alt_fieldlist = new LogFieldList;
+ alt_fieldlist = new LogFieldList;
bool contains_aggs = false;
- int n_alt_fields2 = LogFormat::parse_symbol_string(alt_symbol_str, alt_fieldlist, &contains_aggs);
+ int n_alt_fields2 = LogFormat::parse_symbol_string(alt_symbol_str, alt_fieldlist, &contains_aggs);
if (n_alt_fields2 > 0 && contains_aggs) {
Note("Alternative formats not allowed to contain aggregates");
bad_alt_format = true;
@@ -732,7 +732,7 @@ LogBuffer::to_ascii(LogEntryHeader *entry, LogFormatType type, char *buf, int bu
delete alt_fieldlist;
ats_free(alt_printf_str);
ats_free(alt_symbol_str);
- alt_fieldlist = NULL;
+ alt_fieldlist = NULL;
alt_printf_str = NULL;
alt_symbol_str = NULL;
}
@@ -827,7 +827,7 @@ LogEntryHeader *
LogBufferIterator::next()
{
LogEntryHeader *ret_val = NULL;
- LogEntryHeader *entry = (LogEntryHeader *)m_next;
+ LogEntryHeader *entry = (LogEntryHeader *)m_next;
if (entry) {
if (m_iter_entry_count < m_buffer_entry_count) {
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 1031a0f..3db2ed6 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -304,7 +304,7 @@ inline LogBufferIterator::LogBufferIterator(LogBufferHeader *header, bool in_net
switch (header->version) {
case LOG_SEGMENT_VERSION:
- m_next = (char *)header + header->data_offset;
+ m_next = (char *)header + header->data_offset;
m_buffer_entry_count = header->entry_count;
break;
diff --git a/proxy/logging/LogCollationAccept.cc b/proxy/logging/LogCollationAccept.cc
index 525c9ed..6f66d3a 100644
--- a/proxy/logging/LogCollationAccept.cc
+++ b/proxy/logging/LogCollationAccept.cc
@@ -45,10 +45,10 @@ LogCollationAccept::LogCollationAccept(int port) : Continuation(new_ProxyMutex()
// small amounts of data. Most arguments are default except for the
// last one which we will set to true.
// [amc] That argument is ignored so I dropped it.
- opt.local_port = m_port;
- opt.ip_family = AF_INET;
+ opt.local_port = m_port;
+ opt.ip_family = AF_INET;
opt.accept_threads = 0;
- m_accept_action = netProcessor.accept(this, opt);
+ m_accept_action = netProcessor.accept(this, opt);
ink_assert(NULL != m_accept_action);
}
diff --git a/proxy/logging/LogCollationClientSM.cc b/proxy/logging/LogCollationClientSM.cc
index 5cab601..0d459e8 100644
--- a/proxy/logging/LogCollationClientSM.cc
+++ b/proxy/logging/LogCollationClientSM.cc
@@ -238,7 +238,7 @@ LogCollationClientSM::client_auth(int event, VIO * /* vio ATS_UNUSED */)
NetMsgHeader nmh;
int bytes_to_send = (int)strlen(Log::config->collation_secret);
- nmh.msg_bytes = bytes_to_send;
+ nmh.msg_bytes = bytes_to_send;
// memory copies, I know... but it happens rarely!!! ^_^
ink_assert(m_auth_buffer != NULL);
@@ -621,7 +621,7 @@ LogCollationClientSM::client_send(int event, VIO * /* vio ATS_UNUSED */)
ink_assert(log_buffer_header != NULL);
NetMsgHeader nmh;
int bytes_to_send = log_buffer_header->byte_count;
- nmh.msg_bytes = bytes_to_send;
+ nmh.msg_bytes = bytes_to_send;
// TODO: We currently don't try to make the log buffers handle little vs big endian. TS-1156.
// m_buffer_in_iocore->convert_to_network_order();
diff --git a/proxy/logging/LogCollationHostSM.cc b/proxy/logging/LogCollationHostSM.cc
index 37eb989..e081f8c 100644
--- a/proxy/logging/LogCollationHostSM.cc
+++ b/proxy/logging/LogCollationHostSM.cc
@@ -79,7 +79,7 @@ LogCollationHostSM::LogCollationHostSM(NetVConnection *client_vc)
ink_assert(m_client_vc != NULL);
// get client info
- m_client_ip = m_client_vc->get_remote_ip();
+ m_client_ip = m_client_vc->get_remote_ip();
m_client_port = m_client_vc->get_remote_port();
Note("[log-coll] client connected [%d.%d.%d.%d:%d]", ((unsigned char *)(&m_client_ip))[0], ((unsigned char *)(&m_client_ip))[1],
((unsigned char *)(&m_client_ip))[2], ((unsigned char *)(&m_client_ip))[3], m_client_port);
@@ -245,7 +245,7 @@ LogCollationHostSM::host_init(int event, void * /* data ATS_UNUSED */)
switch (event) {
case LOG_COLL_EVENT_SWITCH:
- m_host_state = LOG_COLL_HOST_INIT;
+ m_host_state = LOG_COLL_HOST_INIT;
m_pending_event = eventProcessor.schedule_imm(this);
return EVENT_CONT;
@@ -388,9 +388,9 @@ LogCollationHostSM::read_hdr(int event, VIO *vio)
Debug("log-coll", "[%d]host:read_hdr - SWITCH", m_id);
m_read_state = LOG_COLL_READ_HDR;
- m_read_bytes_wanted = sizeof(NetMsgHeader);
+ m_read_bytes_wanted = sizeof(NetMsgHeader);
m_read_bytes_received = 0;
- m_read_buffer = (char *)&m_net_msg_header;
+ m_read_buffer = (char *)&m_net_msg_header;
ink_assert(m_client_vc != NULL);
Debug("log-coll", "[%d]host:read_hdr - do_io_read(%" PRId64 ")", m_id, m_read_bytes_wanted);
m_client_vio = m_client_vc->do_io_read(this, m_read_bytes_wanted, m_client_buffer);
@@ -443,10 +443,10 @@ LogCollationHostSM::read_body(int event, VIO *vio)
m_read_bytes_received = 0;
if (m_read_bytes_wanted <= max_iobuffer_size) {
m_read_buffer_fast_allocator_size = buffer_size_to_index(m_read_bytes_wanted);
- m_read_buffer = (char *)ioBufAllocator[m_read_buffer_fast_allocator_size].alloc_void();
+ m_read_buffer = (char *)ioBufAllocator[m_read_buffer_fast_allocator_size].alloc_void();
} else {
m_read_buffer_fast_allocator_size = -1;
- m_read_buffer = (char *)ats_malloc(m_read_bytes_wanted);
+ m_read_buffer = (char *)ats_malloc(m_read_bytes_wanted);
}
ink_assert(m_read_buffer != NULL);
ink_assert(m_client_vc != NULL);
@@ -507,8 +507,8 @@ LogCollationHostSM::read_partial(VIO *vio)
ink_assert(m_client_reader != NULL);
// careful not to read more than we have memory for
- char *p = &(m_read_buffer[m_read_bytes_received]);
- int64_t bytes_wanted_now = m_read_bytes_wanted - m_read_bytes_received;
+ char *p = &(m_read_buffer[m_read_bytes_received]);
+ int64_t bytes_wanted_now = m_read_bytes_wanted - m_read_bytes_received;
int64_t bytes_received_now = m_client_reader->read(p, bytes_wanted_now);
m_read_bytes_received += bytes_received_now;
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 7efefee..2bff832 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -73,40 +73,40 @@ LogConfig::setup_default_values()
}
hostname = ats_strdup(name);
- log_buffer_size = (int)(10 * LOG_KILOBYTE);
- max_secs_per_buffer = 5;
- max_space_mb_for_logs = 100;
+ log_buffer_size = (int)(10 * LOG_KILOBYTE);
+ max_secs_per_buffer = 5;
+ max_space_mb_for_logs = 100;
max_space_mb_for_orphan_logs = 25;
- max_space_mb_headroom = 10;
- logfile_perm = 0644;
- logfile_dir = ats_strdup(".");
-
- collation_mode = Log::NO_COLLATION;
- collation_host = ats_strdup("none");
- collation_port = 0;
- collation_host_tagged = false;
- collation_preproc_threads = 1;
- collation_secret = ats_strdup("foobar");
- collation_retry_sec = 0;
+ max_space_mb_headroom = 10;
+ logfile_perm = 0644;
+ logfile_dir = ats_strdup(".");
+
+ collation_mode = Log::NO_COLLATION;
+ collation_host = ats_strdup("none");
+ collation_port = 0;
+ collation_host_tagged = false;
+ collation_preproc_threads = 1;
+ collation_secret = ats_strdup("foobar");
+ collation_retry_sec = 0;
collation_max_send_buffers = 0;
- rolling_enabled = Log::NO_ROLLING;
- rolling_interval_sec = 86400; // 24 hours
- rolling_offset_hr = 0;
- rolling_size_mb = 10;
+ rolling_enabled = Log::NO_ROLLING;
+ rolling_interval_sec = 86400; // 24 hours
+ rolling_offset_hr = 0;
+ rolling_size_mb = 10;
auto_delete_rolled_files = true;
- roll_log_files_now = false;
+ roll_log_files_now = false;
custom_logs_enabled = false;
- sampling_frequency = 1;
- file_stat_frequency = 16;
+ sampling_frequency = 1;
+ file_stat_frequency = 16;
space_used_frequency = 900;
use_orphan_log_space_value = false;
ascii_buffer_size = 4 * 9216;
- max_line_size = 9216; // size of pipe buffer for SunOS 5.6
+ max_line_size = 9216; // size of pipe buffer for SunOS 5.6
}
void *
@@ -149,7 +149,7 @@ LogConfig::read_configuration_variables()
max_space_mb_headroom = val;
}
- ptr = REC_ConfigReadString("proxy.config.log.logfile_perm");
+ ptr = REC_ConfigReadString("proxy.config.log.logfile_perm");
int logfile_perm_parsed = ink_fileperm_parse(ptr);
if (logfile_perm_parsed != -1)
logfile_perm = logfile_perm_parsed;
@@ -188,7 +188,7 @@ LogConfig::read_configuration_variables()
collation_port = val;
}
- val = (int)REC_ConfigReadInteger("proxy.config.log.collation_host_tagged");
+ val = (int)REC_ConfigReadInteger("proxy.config.log.collation_host_tagged");
collation_host_tagged = (val > 0);
val = (int)REC_ConfigReadInteger("proxy.config.log.collation_preproc_threads");
@@ -218,8 +218,8 @@ LogConfig::read_configuration_variables()
// rolling_offset_hr, or rolling_size_mb because the LogObject takes care of this
//
rolling_interval_sec = (int)REC_ConfigReadInteger("proxy.config.log.rolling_interval_sec");
- rolling_offset_hr = (int)REC_ConfigReadInteger("proxy.config.log.rolling_offset_hr");
- rolling_size_mb = (int)REC_ConfigReadInteger("proxy.config.log.rolling_size_mb");
+ rolling_offset_hr = (int)REC_ConfigReadInteger("proxy.config.log.rolling_offset_hr");
+ rolling_size_mb = (int)REC_ConfigReadInteger("proxy.config.log.rolling_size_mb");
val = (int)REC_ConfigReadInteger("proxy.config.log.rolling_enabled");
if (LogRollingEnabledIsValid(val)) {
@@ -229,11 +229,11 @@ LogConfig::read_configuration_variables()
rolling_enabled = Log::NO_ROLLING;
}
- val = (int)REC_ConfigReadInteger("proxy.config.log.auto_delete_rolled_files");
+ val = (int)REC_ConfigReadInteger("proxy.config.log.auto_delete_rolled_files");
auto_delete_rolled_files = (val > 0);
// CUSTOM LOGGING
- val = (int)REC_ConfigReadInteger("proxy.config.log.custom_logs_enabled");
+ val = (int)REC_ConfigReadInteger("proxy.config.log.custom_logs_enabled");
custom_logs_enabled = (val > 0);
// PERFORMANCE
@@ -355,7 +355,7 @@ LogConfig::setup_collation(LogConfig *prev_config)
}
if (!m_log_collation_accept) {
- Log::collation_port = collation_port;
+ Log::collation_port = collation_port;
m_log_collation_accept = new LogCollationAccept(collation_port);
}
Debug("log", "I am a collation host listening on port %d.", collation_port);
@@ -681,10 +681,10 @@ LogConfig::space_to_write(int64_t bytes_to_write)
int64_t logical_space_used, physical_space_left;
bool space;
- config_space = (int64_t)get_max_space_mb() * LOG_MEGABYTE;
+ config_space = (int64_t)get_max_space_mb() * LOG_MEGABYTE;
partition_headroom = (int64_t)PARTITION_HEADROOM_MB * LOG_MEGABYTE;
- logical_space_used = m_space_used + bytes_to_write;
+ logical_space_used = m_space_used + bytes_to_write;
physical_space_left = m_partition_space_left - (int64_t)bytes_to_write;
space = ((logical_space_used < config_space) && (physical_space_left > partition_headroom));
@@ -769,7 +769,7 @@ LogConfig::update_space_used()
if (!m_dir_entry) {
size_t name_max = ink_file_namemax(logfile_dir);
- m_dir_entry = (struct dirent *)ats_malloc(sizeof(struct dirent) + name_max + 1);
+ m_dir_entry = (struct dirent *)ats_malloc(sizeof(struct dirent) + name_max + 1);
}
total_space_used = 0LL;
@@ -791,8 +791,8 @@ LogConfig::update_space_used()
//
// then add this entry to the candidate list
//
- candidates[candidate_count].name = ats_strdup(path);
- candidates[candidate_count].size = (int64_t)sbuf.st_size;
+ candidates[candidate_count].name = ats_strdup(path);
+ candidates[candidate_count].size = (int64_t)sbuf.st_size;
candidates[candidate_count].mtime = sbuf.st_mtime;
candidate_count++;
}
@@ -814,7 +814,7 @@ LogConfig::update_space_used()
//
// Update the config variables for space used/left
//
- m_space_used = total_space_used;
+ m_space_used = total_space_used;
m_partition_space_left = partition_space_left;
RecSetRawStatSum(log_rsb, log_stat_log_files_space_used_stat, m_space_used);
RecSetRawStatCount(log_rsb, log_stat_log_files_space_used_stat, 1);
@@ -834,7 +834,7 @@ LogConfig::update_space_used()
//
int64_t max_space = (int64_t)get_max_space_mb() * LOG_MEGABYTE;
- int64_t headroom = (int64_t)max_space_mb_headroom * LOG_MEGABYTE;
+ int64_t headroom = (int64_t)max_space_mb_headroom * LOG_MEGABYTE;
if (candidate_count > 0 && !space_to_write(headroom)) {
Debug("logspace", "headroom reached, trying to clear space ...");
@@ -928,12 +928,12 @@ LogConfig::update_space_used()
logging_space_exhausted = false;
if (m_disk_full || m_partition_full) {
Note("Logging disk is no longer full; access logging to local log directory resumed.");
- m_disk_full = false;
+ m_disk_full = false;
m_partition_full = false;
}
if (m_disk_low || m_partition_low) {
Note("Logging disk is no longer low; access logging to local log directory resumed.");
- m_disk_low = false;
+ m_disk_low = false;
m_partition_low = false;
}
}
@@ -1020,8 +1020,8 @@ LogConfig::read_xml_log_config()
Note("Multiple values for 'Format' attribute in %s; using the first one", xobj->object_name());
}
- char *format_str = format.dequeue();
- char *name_str = name.dequeue();
+ char *format_str = format.dequeue();
+ char *name_str = name.dequeue();
unsigned interval_num = 0;
// if the format_str contains any of the aggregate operators,
@@ -1112,7 +1112,7 @@ LogConfig::read_xml_log_config()
// convert the action string to an enum value and validate it
//
- char *action_str = action.dequeue();
+ char *action_str = action.dequeue();
LogFilter::Action act = LogFilter::REJECT; /* lv: make gcc happy */
for (i = 0; i < LogFilter::N_ACTIONS; i++) {
if (strcasecmp(action_str, LogFilter::ACTION_NAME[i]) == 0) {
@@ -1137,8 +1137,8 @@ LogConfig::read_xml_log_config()
}
char *field_str = tok.getNext();
- char *oper_str = tok.getNext();
- char *val_str = tok.getRest();
+ char *oper_str = tok.getNext();
+ char *val_str = tok.getRest();
// validate field symbol
//
@@ -1160,7 +1160,7 @@ LogConfig::read_xml_log_config()
char *fname_end = strchr(field_str, '}');
if (NULL != fname_end) {
char *fname = field_str + 1;
- *fname_end = 0; // changes '}' to '\0'
+ *fname_end = 0; // changes '}' to '\0'
char *cname = fname_end + 1; // start of container symbol
Note("Found Container Field: Name = %s, symbol = %s", fname, cname);
LogField::Container container = LogField::valid_container_name(cname);
@@ -1199,7 +1199,7 @@ LogConfig::read_xml_log_config()
}
// now create the correct LogFilter
//
- LogFilter *filter = NULL;
+ LogFilter *filter = NULL;
LogField::Type field_type = logfield->type();
switch (field_type) {
@@ -1353,14 +1353,14 @@ LogConfig::read_xml_log_config()
LogFileFormat file_type = LOG_FILE_ASCII; // default value
if (mode.count()) {
char *mode_str = mode.dequeue();
- file_type = (strncasecmp(mode_str, "bin", 3) == 0 || (mode_str[0] == 'b' && mode_str[1] == 0) ?
+ file_type = (strncasecmp(mode_str, "bin", 3) == 0 || (mode_str[0] == 'b' && mode_str[1] == 0) ?
LOG_FILE_BINARY :
(strcasecmp(mode_str, "ascii_pipe") == 0 ? LOG_FILE_PIPE : LOG_FILE_ASCII));
}
// rolling
//
char *rollingEnabled_str = rollingEnabled.dequeue();
- int obj_rolling_enabled = rollingEnabled_str ? ink_atoui(rollingEnabled_str) : rolling_enabled;
+ int obj_rolling_enabled = rollingEnabled_str ? ink_atoui(rollingEnabled_str) : rolling_enabled;
char *rollingIntervalSec_str = rollingIntervalSec.dequeue();
int obj_rolling_interval_sec = rollingIntervalSec_str ? ink_atoui(rollingIntervalSec_str) : rolling_interval_sec;
@@ -1409,7 +1409,7 @@ LogConfig::read_xml_log_config()
if (n) {
int64_t *val_array = new int64_t[n];
- size_t numValid = 0;
+ size_t numValid = 0;
char *t;
while (t = tok.getNext(), t != NULL) {
if (strcasecmp(t, "icp") == 0) {
@@ -1479,7 +1479,7 @@ LogConfig::read_xml_log_config()
prev = lh;
} else {
prev->failover_link.next = lh;
- prev = lh;
+ prev = lh;
}
}
}
@@ -1513,7 +1513,7 @@ LogConfig::read_log_hosts_file(size_t *num_hosts)
Debug("log-config", "Reading log hosts from %s", (const char *)config_path);
size_t nhosts = 0;
- int fd = open(config_path, O_RDONLY);
+ int fd = open(config_path, O_RDONLY);
if (fd < 0) {
Warning("Traffic Server can't open %s for reading log hosts for splitting: %s.", (const char *)config_path, strerror(errno));
} else {
diff --git a/proxy/logging/LogField.cc b/proxy/logging/LogField.cc
index 3ae1a0b..bc09d5b 100644
--- a/proxy/logging/LogField.cc
+++ b/proxy/logging/LogField.cc
@@ -46,8 +46,8 @@ LogSlice::LogSlice(char *str)
char *a, *b, *c;
m_enable = false;
- m_start = 0;
- m_end = INT_MAX;
+ m_start = 0;
+ m_end = INT_MAX;
if ((a = strchr(str, '[')) == NULL)
return;
diff --git a/proxy/logging/LogField.h b/proxy/logging/LogField.h
index 754aa89..0b56876 100644
--- a/proxy/logging/LogField.h
+++ b/proxy/logging/LogField.h
@@ -39,8 +39,8 @@ struct LogSlice {
LogSlice()
{
m_enable = false;
- m_start = 0;
- m_end = INT_MAX;
+ m_start = 0;
+ m_end = INT_MAX;
}
//
diff --git a/proxy/logging/LogFieldAliasMap.cc b/proxy/logging/LogFieldAliasMap.cc
index c0ade1c..564c363 100644
--- a/proxy/logging/LogFieldAliasMap.cc
+++ b/proxy/logging/LogFieldAliasMap.cc
@@ -68,16 +68,16 @@ LogFieldAliasTable::init(size_t numPairs, ...)
va_start(ap, numPairs);
m_entries = m_max - m_min + 1;
- m_table = new LogFieldAliasTableEntry[m_entries];
+ m_table = new LogFieldAliasTableEntry[m_entries];
for (n = 0; n < numPairs; n++) {
IntType val = va_arg(ap, int);
- size_t i = val - m_min;
- name = va_arg(ap, char *);
+ size_t i = val - m_min;
+ name = va_arg(ap, char *);
- m_table[i].name = ats_strdup(name);
+ m_table[i].name = ats_strdup(name);
m_table[i].length = strlen(name);
- m_table[i].valid = true;
+ m_table[i].valid = true;
}
va_end(ap);
diff --git a/proxy/logging/LogFieldAliasMap.h b/proxy/logging/LogFieldAliasMap.h
index 752c4ce..51ffde2 100644
--- a/proxy/logging/LogFieldAliasMap.h
+++ b/proxy/logging/LogFieldAliasMap.h
@@ -147,7 +147,7 @@ public:
found = false;
}
if (found) {
- *val = (unsigned int)(i + m_min);
+ *val = (unsigned int)(i + m_min);
retVal = ALL_OK;
break;
}
@@ -168,14 +168,14 @@ public:
if (l < bufLen) {
ink_strlcpy(buf, m_table[key - m_min].name, bufLen);
numChars = l;
- retVal = ALL_OK;
+ retVal = ALL_OK;
} else {
numChars = 0;
- retVal = BUFFER_TOO_SMALL;
+ retVal = BUFFER_TOO_SMALL;
}
} else {
numChars = 0;
- retVal = INVALID_INT;
+ retVal = INVALID_INT;
}
if (numCharsPtr) {
*numCharsPtr = numChars;
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index df7aa21..2043044 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -76,7 +76,7 @@ LogFile::LogFile(const char *name, const char *header, LogFileFormat format, uin
m_log = NULL;
}
- m_fd = -1;
+ m_fd = -1;
m_ascii_buffer_size = (ascii_buffer_size < max_line_size ? max_line_size : ascii_buffer_size);
Debug("log-file", "exiting LogFile constructor, m_name=%s, this=%p", m_name, this);
@@ -298,7 +298,7 @@ LogFile::preproc_and_try_delete(LogBuffer *lb)
//
if (!m_log->m_start_time)
m_log->m_start_time = buffer_header->low_timestamp;
- m_log->m_end_time = buffer_header->high_timestamp;
+ m_log->m_end_time = buffer_header->high_timestamp;
if (m_file_format == LOG_FILE_BINARY) {
//
@@ -357,9 +357,9 @@ LogFile::write_ascii_logbuffer(LogBufferHeader *buffer_header, int fd, const cha
char fmt_line[LOG_MAX_FORMATTED_LINE];
LogBufferIterator iter(buffer_header);
LogEntryHeader *entry_header;
- int fmt_buf_bytes = 0;
+ int fmt_buf_bytes = 0;
int fmt_line_bytes = 0;
- int bytes = 0;
+ int bytes = 0;
LogFormatType format_type;
char *fieldlist_str;
@@ -370,7 +370,7 @@ LogFile::write_ascii_logbuffer(LogBufferHeader *buffer_header, int fd, const cha
format_type = (LogFormatType)buffer_header->format_type;
fieldlist_str = buffer_header->fmt_fieldlist();
- printf_str = buffer_header->fmt_printf();
+ printf_str = buffer_header->fmt_printf();
break;
default:
@@ -423,8 +423,8 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader *buffer_header, const char *alt_
LogBufferIterator iter(buffer_header);
LogEntryHeader *entry_header;
int fmt_entry_count = 0;
- int fmt_buf_bytes = 0;
- int total_bytes = 0;
+ int fmt_buf_bytes = 0;
+ int total_bytes = 0;
LogFormatType format_type;
char *fieldlist_str;
@@ -433,9 +433,9 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader *buffer_header, const char *alt_
switch (buffer_header->version) {
case LOG_SEGMENT_VERSION:
- format_type = (LogFormatType)buffer_header->format_type;
+ format_type = (LogFormatType)buffer_header->format_type;
fieldlist_str = buffer_header->fmt_fieldlist();
- printf_str = buffer_header->fmt_printf();
+ printf_str = buffer_header->fmt_printf();
break;
default:
@@ -447,7 +447,7 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader *buffer_header, const char *alt_
while ((entry_header = iter.next())) {
fmt_entry_count = 0;
- fmt_buf_bytes = 0;
+ fmt_buf_bytes = 0;
if (m_file_format == LOG_FILE_PIPE)
ascii_buffer = (char *)malloc(m_max_line_size);
@@ -573,7 +573,7 @@ LogFile::writeln(char *data, int len, int fd, const char *path)
void
LogFile::check_fd()
{
- static bool failure_last_call = false;
+ static bool failure_last_call = false;
static unsigned stat_check_count = 1;
if ((stat_check_count % Log::config->file_stat_frequency) == 0) {
diff --git a/proxy/logging/LogFilter.cc b/proxy/logging/LogFilter.cc
index 592df6a..adaa0e3 100644
--- a/proxy/logging/LogFilter.cc
+++ b/proxy/logging/LogFilter.cc
@@ -43,7 +43,7 @@
#include "ts/SimpleTokenizer.h"
const char *LogFilter::OPERATOR_NAME[] = {"MATCH", "CASE_INSENSITIVE_MATCH", "CONTAIN", "CASE_INSENSITIVE_CONTAIN"};
-const char *LogFilter::ACTION_NAME[] = {"REJECT", "ACCEPT", "WIPE_FIELD_VALUE"};
+const char *LogFilter::ACTION_NAME[] = {"REJECT", "ACCEPT", "WIPE_FIELD_VALUE"};
/*-------------------------------------------------------------------------
LogFilter::LogFilter
@@ -74,16 +74,16 @@ LogFilter::~LogFilter()
void
LogFilterString::_setValues(size_t n, char **value)
{
- m_type = STRING_FILTER;
+ m_type = STRING_FILTER;
m_num_values = n;
if (n) {
- m_value = new char *[n];
+ m_value = new char *[n];
m_value_uppercase = new char *[n];
- m_length = new size_t[n];
+ m_length = new size_t[n];
ink_assert(m_value && m_value_uppercase && m_length);
for (size_t i = 0; i < n; ++i) {
- m_value[i] = ats_strdup(value[i]);
- m_length[i] = strlen(value[i]);
+ m_value[i] = ats_strdup(value[i]);
+ m_length[i] = strlen(value[i]);
m_value_uppercase[i] = (char *)ats_malloc((unsigned int)m_length[i] + 1);
size_t j;
for (j = 0; j < m_length[i]; ++j) {
@@ -101,7 +101,7 @@ LogFilterString::LogFilterString(const char *name, LogField *field, LogFilter::A
// parse the comma-separated list of values and construct array
//
char **val_array = 0;
- size_t i = 0;
+ size_t i = 0;
SimpleTokenizer tok(values, ',');
size_t n = tok.getNumTokensRemaining();
if (n) {
@@ -195,8 +195,8 @@ LogFilterString::wipe_this_entry(LogAccess *lad)
static const unsigned BUFSIZE = 1024;
char small_buf[BUFSIZE];
- char *big_buf = NULL;
- char *buf = small_buf;
+ char *big_buf = NULL;
+ char *buf = small_buf;
size_t marsh_len = m_field->marshal_len(lad); // includes null termination
if (marsh_len > BUFSIZE) {
@@ -267,11 +267,11 @@ LogFilterString::toss_this_entry(LogAccess *lad)
static const unsigned BUFSIZE = 1024;
char small_buf[BUFSIZE];
char small_buf_upper[BUFSIZE];
- char *big_buf = NULL;
+ char *big_buf = NULL;
char *big_buf_upper = NULL;
- char *buf = small_buf;
- char *buf_upper = small_buf_upper;
- size_t marsh_len = m_field->marshal_len(lad); // includes null termination
+ char *buf = small_buf;
+ char *buf_upper = small_buf_upper;
+ size_t marsh_len = m_field->marshal_len(lad); // includes null termination
if (marsh_len > BUFSIZE) {
big_buf = (char *)ats_malloc((unsigned int)marsh_len);
@@ -303,7 +303,7 @@ LogFilterString::toss_this_entry(LogAccess *lad)
case CASE_INSENSITIVE_CONTAIN: {
if (big_buf) {
big_buf_upper = (char *)ats_malloc((unsigned int)marsh_len);
- buf_upper = big_buf_upper;
+ buf_upper = big_buf_upper;
} else {
buf = small_buf; // make clang happy
}
@@ -372,7 +372,7 @@ LogFilterString::display_as_XML(FILE *fd)
void
LogFilterInt::_setValues(size_t n, int64_t *value)
{
- m_type = INT_FILTER;
+ m_type = INT_FILTER;
m_num_values = n;
if (n) {
m_value = new int64_t[n];
@@ -426,7 +426,7 @@ LogFilterInt::LogFilterInt(const char *name, LogField *field, LogFilter::Action
// parse the comma-separated list of values and construct array
//
int64_t *val_array = 0;
- size_t i = 0;
+ size_t i = 0;
SimpleTokenizer tok(values, ',');
size_t n = tok.getNumTokensRemaining();
@@ -688,7 +688,7 @@ LogFilterIP::LogFilterIP(const LogFilterIP &rhs) : LogFilter(rhs.m_name, rhs.m_f
void
LogFilterIP::init()
{
- m_type = IP_FILTER;
+ m_type = IP_FILTER;
m_num_values = m_map.getCount();
}
@@ -887,7 +887,7 @@ bool
LogFilterList::operator==(LogFilterList &rhs)
{
if (m_does_conjunction == rhs.does_conjunction()) {
- LogFilter *f = first();
+ LogFilter *f = first();
LogFilter *rhsf = rhs.first();
while (true) {
@@ -898,7 +898,7 @@ LogFilterList::operator==(LogFilterList &rhs)
} else if (!filters_are_equal(f, rhsf)) {
return false;
} else {
- f = next(f);
+ f = next(f);
rhsf = rhs.next(rhsf);
}
}
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 02e4c9b..a49dc66 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -406,12 +406,12 @@ wipeField(char **dest, char *field)
temp_text += (p2 - p1);
char *p3 = strstr(p2, "&");
if (p3) {
- for (int i = 0; i < (p3 - p2); i++)
+ for (int i = 0; i < (p3 - p2); i++)
temp_text[i] = 'X';
temp_text += (p3 - p2);
memcpy(temp_text, p3, ((buf_dest + strlen(buf_dest)) - p3));
} else {
- for (int i = 0; i < ((buf_dest + strlen(buf_dest)) - p2); i++)
+ for (int i = 0; i < ((buf_dest + strlen(buf_dest)) - p2); i++)
temp_text[i] = 'X';
}
} else {
diff --git a/proxy/logging/LogFormat.cc b/proxy/logging/LogFormat.cc
index b049cdc..f3281ef 100644
--- a/proxy/logging/LogFormat.cc
+++ b/proxy/logging/LogFormat.cc
@@ -65,9 +65,9 @@ LogFormat::setup(const char *name, const char *format_str, unsigned interval_sec
}
if (format_str) {
- const char *tag = " %<phn>";
+ const char *tag = " %<phn>";
const size_t m_format_str_size = strlen(format_str) + (m_tagging_on ? strlen(tag) : 0) + 1;
- m_format_str = (char *)ats_malloc(m_format_str_size);
+ m_format_str = (char *)ats_malloc(m_format_str_size);
ink_strlcpy(m_format_str, format_str, m_format_str_size);
if (m_tagging_on) {
Note("Log tagging enabled, adding %%<phn> field at the end of "
@@ -76,9 +76,9 @@ LogFormat::setup(const char *name, const char *format_str, unsigned interval_sec
ink_strlcat(m_format_str, tag, m_format_str_size);
};
- char *printf_str = NULL;
+ char *printf_str = NULL;
char *fieldlist_str = NULL;
- int nfields = parse_format_string(m_format_str, &printf_str, &fieldlist_str);
+ int nfields = parse_format_string(m_format_str, &printf_str, &fieldlist_str);
if (nfields > (m_tagging_on ? 1 : 0)) {
init_variables(name, fieldlist_str, printf_str, interval_sec);
} else {
@@ -148,25 +148,25 @@ LogFormat::init_variables(const char *name, const char *fieldlist_str, const cha
if (m_name_str) {
ats_free(m_name_str);
m_name_str = NULL;
- m_name_id = 0;
+ m_name_id = 0;
}
if (name) {
m_name_str = ats_strdup(name);
- m_name_id = id_from_name(m_name_str);
+ m_name_id = id_from_name(m_name_str);
}
if (m_fieldlist_str) {
ats_free(m_fieldlist_str);
m_fieldlist_str = NULL;
- m_fieldlist_id = 0;
+ m_fieldlist_id = 0;
}
if (fieldlist_str) {
m_fieldlist_str = ats_strdup(fieldlist_str);
- m_fieldlist_id = id_from_name(m_fieldlist_str);
+ m_fieldlist_id = id_from_name(m_fieldlist_str);
}
- m_printf_str = ats_strdup(printf_str);
- m_interval_sec = interval_sec;
+ m_printf_str = ats_strdup(printf_str);
+ m_interval_sec = interval_sec;
m_interval_next = LogUtils::timestamp();
m_valid = true;
@@ -451,7 +451,7 @@ LogFormat::parse_symbol_string(const char *symbol_string, LogFieldList *field_li
// strtok_r will mangle the input string; we'll make a copy for that.
//
sym_str = ats_strdup(symbol_string);
- symbol = strtok_r(sym_str, ",", &saveptr);
+ symbol = strtok_r(sym_str, ",", &saveptr);
while (symbol != NULL) {
//
@@ -463,9 +463,9 @@ LogFormat::parse_symbol_string(const char *symbol_string, LogFieldList *field_li
if (end_paren) {
Debug("log-agg", "Aggregate symbol: %s", symbol);
*begin_paren = '\0';
- *end_paren = '\0';
- name = begin_paren + 1;
- sym = symbol;
+ *end_paren = '\0';
+ name = begin_paren + 1;
+ sym = symbol;
Debug("log-agg", "Aggregate = %s, field = %s", sym, name);
aggregate = LogField::valid_aggregate_name(sym);
if (aggregate == LogField::NO_AGGREGATE) {
@@ -502,12 +502,12 @@ LogFormat::parse_symbol_string(const char *symbol_string, LogFieldList *field_li
//
else if (*symbol == '{') {
Debug("log-format", "Container symbol: %s", symbol);
- f = NULL;
+ f = NULL;
char *name_end = strchr(symbol, '}');
if (name_end != NULL) {
- name = symbol + 1;
- *name_end = 0; // changes '}' to '\0'
- sym = name_end + 1; // start of container symbol
+ name = symbol + 1;
+ *name_end = 0; // changes '}' to '\0'
+ sym = name_end + 1; // start of container symbol
LogSlice slice(sym);
Debug("log-format", "Name = %s, symbol = %s", name, sym);
container = LogField::valid_container_name(sym);
@@ -664,11 +664,11 @@ LogFormat::parse_format_string(const char *format_str, char **printf_str, char *
// string.
//
unsigned len = (unsigned)::strlen(format_str);
- *printf_str = (char *)ats_malloc(len + 1);
- *fields_str = (char *)ats_malloc(len + 1);
+ *printf_str = (char *)ats_malloc(len + 1);
+ *fields_str = (char *)ats_malloc(len + 1);
- unsigned printf_pos = 0;
- unsigned fields_pos = 0;
+ unsigned printf_pos = 0;
+ unsigned fields_pos = 0;
unsigned field_count = 0;
unsigned field_len;
unsigned start, stop;
diff --git a/proxy/logging/LogFormat.h b/proxy/logging/LogFormat.h
index 2062c1a..586182a 100644
--- a/proxy/logging/LogFormat.h
+++ b/proxy/logging/LogFormat.h
@@ -34,7 +34,7 @@ enum LogFormatType {
// We start the numbering at 4 to compatibility with Traffic Server 4.x, which used
// to have the predefined log formats enumerated above ...
LOG_FORMAT_CUSTOM = 4,
- LOG_FORMAT_TEXT = 5
+ LOG_FORMAT_TEXT = 5
};
enum LogFileFormat {
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index b4efa96..796419f 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -144,7 +144,7 @@ LogHost::set_name_or_ipstr(char *name_or_ip)
ts::ConstBuffer addr, port;
if (ats_ip_parse(ts::ConstBuffer(name_or_ip, strlen(name_or_ip)), &addr, &port) == 0) {
uint16_t p = port ? atoi(port.data()) : Log::config->collation_port;
- char *n = const_cast<char *>(addr.data());
+ char *n = const_cast<char *>(addr.data());
// Force termination. We know we can do this because the address
// string is followed by either a nul or a colon.
n[addr.size()] = 0;
@@ -231,8 +231,8 @@ LogHost::create_orphan_LogFile_object()
delete m_orphan_file;
const char *orphan_ext = "orphan";
- unsigned name_len = (unsigned)(strlen(m_object_filename) + strlen(name()) + strlen(orphan_ext) + 16);
- char *name_buf = (char *)ats_malloc(name_len);
+ unsigned name_len = (unsigned)(strlen(m_object_filename) + strlen(name()) + strlen(orphan_ext) + 16);
+ char *name_buf = (char *)ats_malloc(name_len);
// NT: replace ':'s with '-'s. This change is necessary because
// NT doesn't like filenames with ':'s in them. ^_^
@@ -327,9 +327,9 @@ LogHost::clear()
ink_zero(m_ip);
m_port = 0;
ink_zero(m_ipstr);
- m_name = NULL;
- m_sock = NULL;
- m_sock_fd = -1;
+ m_name = NULL;
+ m_sock = NULL;
+ m_sock_fd = -1;
m_connected = false;
}
@@ -342,9 +342,9 @@ LogHost::authenticated()
}
Debug("log-host", "Authenticating LogHost %s ...", name());
- char *auth_key = Log::config->collation_secret;
+ char *auth_key = Log::config->collation_secret;
unsigned auth_key_len = (unsigned)::strlen(auth_key) + 1; // incl null
- int bytes = m_sock->write(m_sock_fd, auth_key, auth_key_len);
+ int bytes = m_sock->write(m_sock_fd, auth_key, auth_key_len);
if ((unsigned)bytes != auth_key_len) {
Debug("log-host", "... bad write on authenticate");
return false;
@@ -402,7 +402,7 @@ LogHostList::preproc_and_try_delete(LogBuffer *lb)
{
int ret;
unsigned nr_host, nr;
- bool need_orphan = true;
+ bool need_orphan = true;
LogHost *available_host = NULL;
ink_release_assert(lb->m_references == 0);
@@ -411,12 +411,12 @@ LogHostList::preproc_and_try_delete(LogBuffer *lb)
ink_atomic_increment(&lb->m_references, nr_host);
for (LogHost *host = first(); host && nr; host = next(host)) {
- LogHost *lh = host;
+ LogHost *lh = host;
available_host = lh;
do {
ink_atomic_increment(&lb->m_references, 1);
- ret = lh->preproc_and_try_delete(lb);
+ ret = lh->preproc_and_try_delete(lb);
need_orphan = need_orphan && (ret < 0);
} while (ret < 0 && (lh = lh->failover_link.next));
diff --git a/proxy/logging/LogLimits.h b/proxy/logging/LogLimits.h
index 6c8ae07..a7a57ec 100644
--- a/proxy/logging/LogLimits.h
+++ b/proxy/logging/LogLimits.h
@@ -30,9 +30,9 @@
#define LOG_LIMITS_H
enum {
- LOG_MAX_FORMAT_LINE = 2048, /* "format:enable:..." */
+ LOG_MAX_FORMAT_LINE = 2048, /* "format:enable:..." */
LOG_MAX_FORMATTED_BUFFER = 20480,
- LOG_MAX_FORMATTED_LINE = 10240
+ LOG_MAX_FORMATTED_LINE = 10240
};
#define LOG_KILOBYTE ((int64_t)1024)
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 2ce619b..b027d91 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -102,7 +102,7 @@ LogObject::LogObject(const LogFormat *format, const char *log_dir, const char *b
m_buffer_manager_idx(0)
{
ink_release_assert(format);
- m_format = new LogFormat(*format);
+ m_format = new LogFormat(*format);
m_buffer_manager = new LogBufferManager[m_flush_threads];
if (file_format == LOG_FILE_BINARY) {
@@ -140,7 +140,7 @@ LogObject::LogObject(LogObject &rhs)
m_rolling_interval_sec(rhs.m_rolling_interval_sec),
m_last_roll_time(rhs.m_last_roll_time)
{
- m_format = new LogFormat(*(rhs.m_format));
+ m_format = new LogFormat(*(rhs.m_format));
m_buffer_manager = new LogBufferManager[m_flush_threads];
if (rhs.m_logFile) {
@@ -220,19 +220,19 @@ LogObject::generate_filenames(const char *log_dir, const char *basename, LogFile
}; // remove dot at end of name
const char *ext = 0;
- int ext_len = 0;
+ int ext_len = 0;
if (i < 0) { // no extension, add one
switch (file_format) {
case LOG_FILE_ASCII:
- ext = LOG_FILE_ASCII_OBJECT_FILENAME_EXTENSION;
+ ext = LOG_FILE_ASCII_OBJECT_FILENAME_EXTENSION;
ext_len = 4;
break;
case LOG_FILE_BINARY:
- ext = LOG_FILE_BINARY_OBJECT_FILENAME_EXTENSION;
+ ext = LOG_FILE_BINARY_OBJECT_FILENAME_EXTENSION;
ext_len = 5;
break;
case LOG_FILE_PIPE:
- ext = LOG_FILE_PIPE_OBJECT_FILENAME_EXTENSION;
+ ext = LOG_FILE_PIPE_OBJECT_FILENAME_EXTENSION;
ext_len = 5;
break;
default:
@@ -240,9 +240,9 @@ LogObject::generate_filenames(const char *log_dir, const char *basename, LogFile
}
}
- int dir_len = (int)strlen(log_dir);
- int basename_len = len + ext_len + 1; // include null terminator
- int total_len = dir_len + 1 + basename_len; // include '/'
+ int dir_len = (int)strlen(log_dir);
+ int basename_len = len + ext_len + 1; // include null terminator
+ int total_len = dir_len + 1 + basename_len; // include '/'
m_filename = (char *)ats_malloc(total_len);
m_basename = (char *)ats_malloc(basename_len);
@@ -256,7 +256,7 @@ LogObject::generate_filenames(const char *log_dir, const char *basename, LogFile
memcpy(&m_filename[dir_len + len], ext, ext_len);
memcpy(&m_basename[len], ext, ext_len);
}
- m_filename[total_len - 1] = 0;
+ m_filename[total_len - 1] = 0;
m_basename[basename_len - 1] = 0;
}
@@ -315,8 +315,8 @@ LogObject::add_loghost(LogHost *host, bool copy)
uint64_t
LogObject::compute_signature(LogFormat *format, char *filename, unsigned int flags)
{
- char *fl = format->fieldlist();
- char *ps = format->printf_str();
+ char *fl = format->fieldlist();
+ char *ps = format->printf_str();
uint64_t signature = 0;
if (fl && ps && filename) {
@@ -399,8 +399,8 @@ LogObject::_checkout_write(size_t *write_offset, size_t bytes_needed)
SET_FREELIST_POINTER_VERSION(new_h, FREELIST_POINTER(h), FREELIST_VERSION(h) + 1);
result = ink_atomic_cas(&m_log_buffer.data, h.data, new_h.data);
} while (!result);
- buffer = (LogBuffer *)FREELIST_POINTER(h);
- result_code = buffer->checkout_write(write_offset, bytes_needed);
+ buffer = (LogBuffer *)FREELIST_POINTER(h);
+ result_code = buffer->checkout_write(write_offset, bytes_needed);
bool decremented = false;
switch (result_code) {
@@ -518,7 +518,7 @@ int
LogObject::log(LogAccess *lad, const char *text_entry)
{
LogBuffer *buffer;
- size_t offset = 0; // prevent warning
+ size_t offset = 0; // prevent warning
size_t bytes_needed = 0, bytes_used = 0;
// log to a pipe even if space is exhausted since pipe uses no space
@@ -558,7 +558,7 @@ LogObject::log(LogAccess *lad, const char *text_entry)
// step through each of the fields and update the LogField object
// with the newly-marshalled data
LogFieldList *fl = &m_format->m_field_list;
- char *data_ptr = m_format->m_agg_marshal_space;
+ char *data_ptr = m_format->m_agg_marshal_space;
LogField *f;
int64_t val;
for (f = fl->first(); f; f = fl->next(f)) {
@@ -627,10 +627,10 @@ LogObject::_setup_rolling(Log::RollingEnabledValues rolling_enabled, int rolling
int rolling_size_mb)
{
if (!LogRollingEnabledIsValid((int)rolling_enabled)) {
- m_rolling_enabled = Log::NO_ROLLING;
+ m_rolling_enabled = Log::NO_ROLLING;
m_rolling_interval_sec = 0;
- m_rolling_offset_hr = 0;
- m_rolling_size_mb = 0;
+ m_rolling_offset_hr = 0;
+ m_rolling_size_mb = 0;
if (rolling_enabled != Log::NO_ROLLING) {
Warning("Valid rolling_enabled values are %d to %d, invalid value "
"(%d) specified for %s, rolling will be disabled for this file.",
@@ -669,8 +669,8 @@ LogObject::_setup_rolling(Log::RollingEnabledValues rolling_enabled, int rolling
}
m_rolling_offset_hr = rolling_offset_hr;
- m_rolling_size_mb = 0; // it is safe to set it as 0, if we set SIZE rolling,
- // it will be updated later
+ m_rolling_size_mb = 0; // it is safe to set it as 0, if we set SIZE rolling,
+ // it will be updated later
}
if (rolling_enabled == Log::ROLL_ON_SIZE_ONLY || rolling_enabled == Log::ROLL_ON_TIME_OR_SIZE ||
@@ -694,8 +694,8 @@ LogObject::roll_files(long time_now)
return 0;
unsigned num_rolled = 0;
- bool roll_on_time = false;
- bool roll_on_size = false;
+ bool roll_on_time = false;
+ bool roll_on_size = false;
if (!time_now)
time_now = LogUtils::timestamp();
@@ -879,7 +879,7 @@ LogObjectManager::_manage_object(LogObject *log_object, bool is_api_object, int
}
bool col_client = log_object->is_collation_client();
- int retVal = _solve_internal_filename_conflicts(log_object, maxConflicts);
+ int retVal = _solve_internal_filename_conflicts(log_object, maxConflicts);
if (retVal == NO_FILENAME_CONFLICTS) {
// check for external conflicts only if the object is not a collation
@@ -941,7 +941,7 @@ LogObjectManager::_solve_filename_conflicts(LogObject *log_object, int maxConfli
if (access(filename, F_OK)) {
if (errno != ENOENT) {
const char *msg = "Cannot access log file %s: %s";
- const char *se = strerror(errno);
+ const char *se = strerror(errno);
Error(msg, filename, se);
LogUtils::manager_alarm(LogUtils::LOG_ALARM_ERROR, msg, filename, se);
@@ -955,7 +955,7 @@ LogObjectManager::_solve_filename_conflicts(LogObject *log_object, int maxConfli
bool conflicts = true;
if (meta_info.file_open_successful()) {
- bool got_sig = meta_info.get_log_object_signature(&signature);
+ bool got_sig = meta_info.get_log_object_signature(&signature);
uint64_t obj_sig = log_object->get_signature();
if (got_sig && signature == obj_sig) {
@@ -998,11 +998,11 @@ LogObjectManager::_solve_filename_conflicts(LogObject *log_object, int maxConfli
// an error happened while trying to get file info
//
const char *msg = "Cannot stat log file %s: %s";
- char *se = strerror(errno);
+ char *se = strerror(errno);
Error(msg, filename, se);
LogUtils::manager_alarm(LogUtils::LOG_ALARM_ERROR, msg, filename, se);
- retVal = ERROR_DETERMINING_FILE_INFO;
+ retVal = ERROR_DETERMINING_FILE_INFO;
roll_file = false;
} else {
if (S_ISFIFO(s.st_mode)) {
@@ -1067,7 +1067,7 @@ LogObjectManager::_has_internal_filename_conflict(const char *filename, LogObjec
int
LogObjectManager::_solve_internal_filename_conflicts(LogObject *log_object, int maxConflicts, int fileNum)
{
- int retVal = NO_FILENAME_CONFLICTS;
+ int retVal = NO_FILENAME_CONFLICTS;
const char *filename = log_object->get_full_filename();
if (_has_internal_filename_conflict(filename, _objects) || _has_internal_filename_conflict(filename, _APIobjects)) {
@@ -1300,7 +1300,7 @@ LogObjectManager::get_num_collation_clients() const
int
LogObjectManager::log(LogAccess *lad)
{
- int ret = Log::SKIP;
+ int ret = Log::SKIP;
ProxyMutex *mutex = this_thread()->mutex;
for (unsigned i = 0; i < this->_objects.length(); i++) {
diff --git a/proxy/logging/LogObject.h b/proxy/logging/LogObject.h
index abfef3a..470e8d0 100644
--- a/proxy/logging/LogObject.h
+++ b/proxy/logging/LogObject.h
@@ -87,9 +87,9 @@ class LogObject : public RefCountObj
{
public:
enum LogObjectFlags {
- BINARY = 1,
- REMOTE_DATA = 2,
- WRITES_TO_PIPE = 4,
+ BINARY = 1,
+ REMOTE_DATA = 2,
+ WRITES_TO_PIPE = 4,
LOG_OBJECT_FMT_TIMESTAMP = 8, // always format a timestamp into each log line (for raw text logs)
};
diff --git a/proxy/logging/LogSock.cc b/proxy/logging/LogSock.cc
index ed431e4..2c8bc42 100644
--- a/proxy/logging/LogSock.cc
+++ b/proxy/logging/LogSock.cc
@@ -96,7 +96,7 @@ LogSock::listen(int accept_port, int family)
return -1;
}
bind_addr.port() = htons(accept_port);
- size = ats_ip_size(&bind_addr.sa);
+ size = ats_ip_size(&bind_addr.sa);
//
// create the socket for accepting new connections
@@ -116,7 +116,7 @@ LogSock::listen(int accept_port, int family)
}
// NO_LINGER
struct linger l;
- l.l_onoff = 0;
+ l.l_onoff = 0;
l.l_linger = 0;
if ((ret = safe_setsockopt(accept_sd, SOL_SOCKET, SO_LINGER, (char *)&l, sizeof(l))) < 0) {
Warning("Could not set option NO_LINGER on socket (%d): %s", ret, strerror(errno));
@@ -306,11 +306,11 @@ LogSock::pending_data(int *cid, int timeout_msec, bool include_connects)
if (*cid >= 0) { // look for data on this specific socket
ink_assert(*cid < m_max_connections);
- fds[0].fd = ct[*cid].sd;
- fds[0].events = POLLIN;
+ fds[0].fd = ct[*cid].sd;
+ fds[0].events = POLLIN;
fds[0].revents = 0;
- fd_to_cid[0] = *cid;
- n_poll_fds = 1;
+ fd_to_cid[0] = *cid;
+ n_poll_fds = 1;
} else { // look for data on any INCOMING socket
@@ -322,10 +322,10 @@ LogSock::pending_data(int *cid, int timeout_msec, bool include_connects)
n_poll_fds = 0;
for (i = start_index; i < m_max_connections; i++) {
if (ct[i].state == LogSock::LS_STATE_INCOMING) {
- fds[n_poll_fds].fd = ct[i].sd;
- fds[n_poll_fds].events = POLLIN;
+ fds[n_poll_fds].fd = ct[i].sd;
+ fds[n_poll_fds].events = POLLIN;
fds[n_poll_fds].revents = 0;
- fd_to_cid[n_poll_fds] = i;
+ fd_to_cid[n_poll_fds] = i;
n_poll_fds++;
}
}
@@ -459,7 +459,7 @@ int
LogSock::write(int cid, void *buf, int bytes)
{
LogSock::MsgHeader header = {0};
- header.msg_bytes = 0;
+ header.msg_bytes = 0;
int ret;
ink_assert(cid >= 0 && cid < m_max_connections);
@@ -479,7 +479,7 @@ LogSock::write(int cid, void *buf, int bytes)
//
Debug("log-sock", " sending header (%zu bytes)", sizeof(LogSock::MsgHeader));
header.msg_bytes = bytes;
- ret = ::send(ct[cid].sd, (char *)&header, sizeof(LogSock::MsgHeader), 0);
+ ret = ::send(ct[cid].sd, (char *)&header, sizeof(LogSock::MsgHeader), 0);
if (ret != sizeof(LogSock::MsgHeader)) {
return LogSock::LS_ERROR_WRITE;
}
@@ -683,14 +683,14 @@ LogSock::init_cid(int cid, char *host, int port, int sd, LogSock::State state)
if (host != NULL) {
const size_t host_size = strlen(host) + 1;
- ct[cid].host = new char[host_size];
+ ct[cid].host = new char[host_size];
ink_strlcpy(ct[cid].host, host, host_size);
} else {
ct[cid].host = NULL;
}
- ct[cid].port = port;
- ct[cid].sd = sd;
+ ct[cid].port = port;
+ ct[cid].sd = sd;
ct[cid].state = state;
}
diff --git a/proxy/logging/LogSock.h b/proxy/logging/LogSock.h
index 31c96e1..e92d1b6 100644
--- a/proxy/logging/LogSock.h
+++ b/proxy/logging/LogSock.h
@@ -37,22 +37,22 @@ class LogSock
{
public:
enum Constant {
- LS_CONST_PACKETSIZE = 1024,
+ LS_CONST_PACKETSIZE = 1024,
LS_CONST_CLUSTER_MAX_MACHINES = 256,
};
enum Err {
- LS_ERROR_UNKNOWN = -1,
+ LS_ERROR_UNKNOWN = -1,
LS_ERROR_CONNECT_TABLE_FULL = -3,
- LS_ERROR_SOCKET = -4,
- LS_ERROR_BIND = -5,
- LS_ERROR_CONNECT = -6,
- LS_ERROR_ACCEPT = -7,
- LS_ERROR_NO_SUCH_HOST = -8,
- LS_ERROR_NO_CONNECTION = -9,
- LS_ERROR_STATE = -10,
- LS_ERROR_WRITE = -11,
- LS_ERROR_READ = -12
+ LS_ERROR_SOCKET = -4,
+ LS_ERROR_BIND = -5,
+ LS_ERROR_CONNECT = -6,
+ LS_ERROR_ACCEPT = -7,
+ LS_ERROR_NO_SUCH_HOST = -8,
+ LS_ERROR_NO_CONNECTION = -9,
+ LS_ERROR_STATE = -10,
+ LS_ERROR_WRITE = -11,
+ LS_ERROR_READ = -12
};
enum State {
diff --git a/proxy/logging/LogStandalone.cc b/proxy/logging/LogStandalone.cc
index 8fe5770..c60cf17 100644
--- a/proxy/logging/LogStandalone.cc
+++ b/proxy/logging/LogStandalone.cc
@@ -51,19 +51,19 @@ class HttpBodyFactory;
extern int fds_limit;
extern int cluster_port_number;
-int command_flag = 0;
-int http_accept_port_number = 0;
+int command_flag = 0;
+int http_accept_port_number = 0;
int http_accept_file_descriptor = 0;
-int remote_management_flag = 0;
-int auto_clear_hostdb_flag = 0;
-char proxy_name[MAXDNAME + 1] = "unknown";
+int remote_management_flag = 0;
+int auto_clear_hostdb_flag = 0;
+char proxy_name[MAXDNAME + 1] = "unknown";
-char error_tags[1024] = "";
-char action_tags[1024] = "";
+char error_tags[1024] = "";
+char action_tags[1024] = "";
char command_string[512] = "";
// Diags *diags = NULL;
-DiagsConfig *diagsConfig = NULL;
+DiagsConfig *diagsConfig = NULL;
HttpBodyFactory *body_factory = NULL;
AppVersionInfo appVersionInfo;
@@ -211,7 +211,7 @@ init_log_standalone(const char *pgm_name, bool one_copy)
init_system(true);
initialize_process_manager();
diagsConfig = new DiagsConfig(logfile, error_tags, action_tags);
- diags = diagsConfig->diags;
+ diags = diagsConfig->diags;
}
/*-------------------------------------------------------------------------
@@ -238,8 +238,8 @@ init_log_standalone_basic(const char *pgm_name)
init_system(false);
const bool use_records = false;
- diagsConfig = new DiagsConfig(logfile, error_tags, action_tags, use_records);
- diags = diagsConfig->diags;
+ diagsConfig = new DiagsConfig(logfile, error_tags, action_tags, use_records);
+ diags = diagsConfig->diags;
// set stdin/stdout to be unbuffered
//
setbuf(stdin, NULL);
diff --git a/proxy/logging/LogUtils.cc b/proxy/logging/LogUtils.cc
index 4f2d829..d4985f0 100644
--- a/proxy/logging/LogUtils.cc
+++ b/proxy/logging/LogUtils.cc
@@ -85,7 +85,7 @@ LogUtils::timestamp_to_netscape_str(long timestamp)
static char timebuf[64]; // NOTE: not MT safe
static char gmtstr[16];
static long last_timestamp = 0;
- static char bad_time[] = "Bad timestamp";
+ static char bad_time[] = "Bad timestamp";
// safety check
if (timestamp < 0) {
@@ -113,10 +113,10 @@ LogUtils::timestamp_to_netscape_str(long timestamp)
if (zone >= 0) {
offset = zone / 60;
- sign = '-';
+ sign = '-';
} else {
offset = zone / -60;
- sign = '+';
+ sign = '+';
}
int glen = snprintf(gmtstr, 16, "%c%.2d%.2d", sign, offset / 60, offset % 60);
@@ -139,7 +139,7 @@ LogUtils::timestamp_to_date_str(long timestamp)
{
static char timebuf[64]; // NOTE: not MT safe
static long last_timestamp = 0;
- static char bad_time[] = "Bad timestamp";
+ static char bad_time[] = "Bad timestamp";
// safety check
if (timestamp < 0) {
@@ -171,7 +171,7 @@ LogUtils::timestamp_to_time_str(long timestamp)
{
static char timebuf[64]; // NOTE: not MT safe
static long last_timestamp = 0;
- static char bad_time[] = "Bad timestamp";
+ static char bad_time[] = "Bad timestamp";
// safety check
if (timestamp < 0) {
@@ -304,8 +304,8 @@ LogUtils::escapify_url(Arena *arena, char *url, size_t len_in, int *len_out, cha
// Count specials in the url, assuming that there won't be any.
//
- int count = 0;
- char *p = url;
+ int count = 0;
+ char *p = url;
char *in_url_end = url + len_in;
while (p < in_url_end) {
@@ -351,7 +351,7 @@ LogUtils::escapify_url(Arena *arena, char *url, size_t len_in, int *len_out, cha
new_url = (char *)arena->str_alloc(out_len + 1);
char *from = url;
- char *to = new_url;
+ char *to = new_url;
while (from < in_url_end) {
unsigned char c = *from;
@@ -411,8 +411,8 @@ int
LogUtils::timestamp_to_hex_str(unsigned ip, char *buf, size_t bufLen, size_t *numCharsPtr)
{
static const char *table = "0123456789abcdef@";
- int retVal = 1;
- int shift = 28;
+ int retVal = 1;
+ int shift = 28;
if (buf && bufLen > 0) {
if (bufLen > 8)
bufLen = 8;
@@ -452,7 +452,7 @@ LogUtils::seconds_to_next_roll(time_t time_now, int rolling_offset, int rolling_
struct tm lt;
ink_localtime_r((const time_t *)&time_now, <);
int sidl = lt.tm_sec + lt.tm_min * 60 + lt.tm_hour * 3600;
- int tr = rolling_offset * 3600;
+ int tr = rolling_offset * 3600;
return ((tr >= sidl ? (tr - sidl) % rolling_interval : (86400 - (sidl - tr)) % rolling_interval));
}
@@ -490,7 +490,7 @@ LogUtils::file_is_writeable(const char *full_filename, off_t *size_bytes, bool *
if (!(S_ISREG(stat_data.st_mode) || S_ISFIFO(stat_data.st_mode))) {
ret_val = 1;
} else if (!(stat_data.st_mode & S_IWUSR)) {
- errno = EACCES;
+ errno = EACCES;
ret_val = -1;
}
if (size_bytes)
@@ -515,10 +515,10 @@ LogUtils::file_is_writeable(const char *full_filename, off_t *size_bytes, bool *
const char *slash = strrchr(full_filename, '/');
if (slash) {
size_t prefix_len = slash - full_filename + 1;
- prefix = new char[prefix_len + 1];
+ prefix = new char[prefix_len + 1];
memcpy(prefix, full_filename, prefix_len);
prefix[prefix_len] = 0;
- dir = prefix;
+ dir = prefix;
} else {
dir = (char *)"."; // full_filename has no prefix, use .
}
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index a4be9d0..2de96b1 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -65,28 +65,28 @@ using namespace std;
#define PROGRAM_NAME "traffic_logstats"
const int MAX_LOGBUFFER_SIZE = 65536;
-const int DEFAULT_LINE_LEN = 78;
-const double LOG10_1024 = 3.0102999566398116;
-const int MAX_ORIG_STRING = 4096;
+const int DEFAULT_LINE_LEN = 78;
+const double LOG10_1024 = 3.0102999566398116;
+const int MAX_ORIG_STRING = 4096;
// Optimizations for "strcmp()", treat some fixed length (3 or 4 bytes) strings
// as integers.
-const int GET_AS_INT = 5522759;
-const int PUT_AS_INT = 5526864;
+const int GET_AS_INT = 5522759;
+const int PUT_AS_INT = 5526864;
const int HEAD_AS_INT = 1145128264;
const int POST_AS_INT = 1414745936;
const int TEXT_AS_INT = 1954047348;
const int JPEG_AS_INT = 1734701162;
-const int JPG_AS_INT = 6778986;
-const int GIF_AS_INT = 6711655;
-const int PNG_AS_INT = 6778480;
-const int BMP_AS_INT = 7368034;
-const int CSS_AS_INT = 7566179;
-const int XML_AS_INT = 7105912;
+const int JPG_AS_INT = 6778986;
+const int GIF_AS_INT = 6711655;
+const int PNG_AS_INT = 6778480;
+const int BMP_AS_INT = 7368034;
+const int CSS_AS_INT = 7566179;
+const int XML_AS_INT = 7105912;
const int HTML_AS_INT = 1819112552;
-const int ZIP_AS_INT = 7367034;
+const int ZIP_AS_INT = 7367034;
const int JAVA_AS_INT = 1635148138; // For "javascript"
const int X_JA_AS_INT = 1634348408; // For "x-javascript"
@@ -437,8 +437,8 @@ public:
// Move this entry to the top of the stack (hence, LRU)
if (_size > 0)
_stack.splice(_stack.begin(), _stack, l);
- } else { // "new" URL
- const char *u = ats_strdup(url); // We own it.
+ } else { // "new" URL
+ const char *u = ats_strdup(url); // We own it.
LruStack::iterator l = _stack.end();
if (_size > 0) {
@@ -458,7 +458,7 @@ public:
}
// Setup this URL stat
- l->url = u;
+ l->url = u;
l->req.bytes = bytes;
l->req.count = 1;
@@ -603,10 +603,10 @@ struct CommandLineArgs {
show_urls(0),
as_object(0)
{
- log_file[0] = '\0';
+ log_file[0] = '\0';
origin_file[0] = '\0';
origin_list[0] = '\0';
- state_tag[0] = '\0';
+ state_tag[0] = '\0';
}
void parse_arguments(const char **argv);
@@ -648,7 +648,7 @@ CommandLineArgs::parse_arguments(const char **argv)
char *query;
json = 1;
- cgi = 1;
+ cgi = 1;
if (NULL != (query = getenv("QUERY_STRING"))) {
char buffer[MAX_ORIG_STRING];
@@ -690,10 +690,10 @@ CommandLineArgs::parse_arguments(const char **argv)
// Enum for return code levels.
enum ExitLevel {
- EXIT_OK = 0,
- EXIT_WARNING = 1,
+ EXIT_OK = 0,
+ EXIT_WARNING = 1,
EXIT_CRITICAL = 2,
- EXIT_UNKNOWN = 3,
+ EXIT_UNKNOWN = 3,
};
struct ExitStatus {
@@ -767,17 +767,17 @@ enum URLScheme {
inline void
init_elapsed(OriginStats *stats)
{
- stats->elapsed.hits.hit.min = -1;
- stats->elapsed.hits.hit_ram.min = -1;
- stats->elapsed.hits.ims.min = -1;
- stats->elapsed.hits.refresh.min = -1;
- stats->elapsed.hits.other.min = -1;
- stats->elapsed.hits.total.min = -1;
- stats->elapsed.misses.miss.min = -1;
- stats->elapsed.misses.ims.min = -1;
+ stats->elapsed.hits.hit.min = -1;
+ stats->elapsed.hits.hit_ram.min = -1;
+ stats->elapsed.hits.ims.min = -1;
+ stats->elapsed.hits.refresh.min = -1;
+ stats->elapsed.hits.other.min = -1;
+ stats->elapsed.hits.total.min = -1;
+ stats->elapsed.misses.miss.min = -1;
+ stats->elapsed.misses.ims.min = -1;
stats->elapsed.misses.refresh.min = -1;
- stats->elapsed.misses.other.min = -1;
- stats->elapsed.misses.total.min = -1;
+ stats->elapsed.misses.other.min = -1;
+ stats->elapsed.misses.total.min = -1;
}
// Update the counters for one StatsCounter
@@ -811,8 +811,8 @@ update_elapsed(ElapsedStats &stat, const int elapsed, const StatsCounter &counte
// New count should never be zero, else there was a programming error.
ink_release_assert(newcount);
oldcount = counter.count - 1;
- oldavg = stat.avg;
- newavg = (oldavg * oldcount + elapsed) / newcount;
+ oldavg = stat.avg;
+ newavg = (oldavg * oldcount + elapsed) / newcount;
// Now find the new standard deviation from the old one
if (oldcount != 0)
@@ -827,7 +827,7 @@ update_elapsed(ElapsedStats &stat, const int elapsed, const StatsCounter &counte
sum_of_squares = sum_of_squares + (elapsed - newavg) * (elapsed - newavg);
stat.stddev = sqrt(sum_of_squares / newcount);
- stat.avg = newavg;
+ stat.avg = newavg;
}
///////////////////////////////////////////////////////////////////////////////
@@ -1178,16 +1178,16 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
else // This shouldn't happen, buffer must be messed up.
break;
- state = P_STATE_ELAPSED;
- o_stats = NULL;
+ state = P_STATE_ELAPSED;
+ o_stats = NULL;
o_server = NULL;
- method = METHOD_OTHER;
- scheme = SCHEME_OTHER;
+ method = METHOD_OTHER;
+ scheme = SCHEME_OTHER;
while ((field = fieldlist->next(field))) {
switch (state) {
case P_STATE_ELAPSED:
- state = P_STATE_IP;
+ state = P_STATE_IP;
elapsed = *((int64_t *)(read_from));
read_from += INK_MIN_ALIGN;
break;
@@ -1197,7 +1197,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
// Just skip the IP, we no longer assume it's always the same.
{
LogFieldIp *ip = reinterpret_cast<LogFieldIp *>(read_from);
- int len = sizeof(LogFieldIp);
+ int len = sizeof(LogFieldIp);
if (AF_INET == ip->_family)
len = sizeof(LogFieldIp4);
else if (AF_INET6 == ip->_family)
@@ -1207,21 +1207,21 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
break;
case P_STATE_RESULT:
- state = P_STATE_CODE;
+ state = P_STATE_CODE;
result = *((int64_t *)(read_from));
read_from += INK_MIN_ALIGN;
if ((result < 32) || (result > 255)) {
- flag = 1;
+ flag = 1;
state = P_STATE_END;
}
break;
case P_STATE_CODE:
- state = P_STATE_SIZE;
+ state = P_STATE_SIZE;
http_code = *((int64_t *)(read_from));
read_from += INK_MIN_ALIGN;
if ((http_code < 0) || (http_code > 999)) {
- flag = 1;
+ flag = 1;
state = P_STATE_END;
}
break;
@@ -1230,13 +1230,13 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
// Warning: This is not 64-bit safe, when converting the log format,
// this needs to be fixed as well.
state = P_STATE_METHOD;
- size = *((int64_t *)(read_from));
+ size = *((int64_t *)(read_from));
read_from += INK_MIN_ALIGN;
break;
case P_STATE_METHOD:
state = P_STATE_URL;
- flag = 0;
+ flag = 0;
// Small optimization for common (3-4 char) cases
switch (*reinterpret_cast<int *>(read_from)) {
@@ -1266,7 +1266,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
method = METHOD_OPTIONS;
else if ((1 == tok_len) && ('-' == *read_from)) {
method = METHOD_NONE;
- flag = 1; // No method, so no need to parse the URL
+ flag = 1; // No method, so no need to parse the URL
} else {
ptr = read_from;
while (*ptr && isupper(*ptr))
@@ -1303,7 +1303,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
} else {
if ('/' == *tok)
scheme = SCHEME_NONE;
- tok_len = strlen(tok);
+ tok_len = strlen(tok);
}
if ('/' == *tok) // This is to handle crazy stuff like http:///origin.com
tok++;
@@ -1321,7 +1321,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
init_elapsed(o_stats);
o_server = ats_strdup(tok);
if (o_stats && o_server) {
- o_stats->server = o_server;
+ o_stats->server = o_server;
origins[o_server] = o_stats;
}
} else
@@ -1332,7 +1332,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
// No method given
if ('/' == *read_from)
scheme = SCHEME_NONE;
- tok_len = strlen(read_from);
+ tok_len = strlen(read_from);
}
read_from += LogAccess::round_strlen(tok_len + 1);
@@ -1361,7 +1361,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
case P_STATE_HIERARCHY:
state = P_STATE_PEER;
- hier = *((int64_t *)(read_from));
+ hier = *((int64_t *)(read_from));
switch (hier) {
case SQUID_HIER_NONE:
update_counter(totals.hierarchies.none, size);
@@ -1560,7 +1560,7 @@ parse_log_buff(LogBufferHeader *buf_header, bool summary = false)
}
}
} else if (0 == strncmp(read_from, "audio", 5)) {
- tok = read_from + 6;
+ tok = read_from + 6;
tok_len = 6 + strlen(tok);
update_counter(totals.content.audio.total, size);
if (o_stats != NULL)
@@ -1620,7 +1620,7 @@ process_file(int in_fd, off_t offset, unsigned max_age)
buffer[0] = '\0';
unsigned first_read_size = sizeof(uint32_t) + sizeof(uint32_t);
- LogBufferHeader *header = (LogBufferHeader *)&buffer[0];
+ LogBufferHeader *header = (LogBufferHeader *)&buffer[0];
// Find the next log header, aligning us properly. This is not
// particularly optimal, but we should only have to do this
@@ -1667,7 +1667,7 @@ process_file(int in_fd, off_t offset, unsigned max_age)
// read the rest of the header
unsigned second_read_size = sizeof(LogBufferHeader) - first_read_size;
- nread = read(in_fd, &buffer[first_read_size], second_read_size);
+ nread = read(in_fd, &buffer[first_read_size], second_read_size);
if (!nread || EOF == nread) {
Debug("logstats", "Second read of header failed (attemped %d bytes at offset %d, got nothing), errno=%d.", second_read_size,
first_read_size, errno);
@@ -1687,7 +1687,7 @@ process_file(int in_fd, off_t offset, unsigned max_age)
}
const int MAX_READ_TRIES = 5;
- int total_read = 0;
+ int total_read = 0;
int read_tries_remaining = MAX_READ_TRIES; // since the data will be old anyway, let's only try a few times.
do {
nread = read(in_fd, &buffer[sizeof(LogBufferHeader) + total_read], buffer_bytes - total_read);
@@ -2245,7 +2245,7 @@ main(int /* argc ATS_UNUSED */, const char *argv[])
memset(&totals, 0, sizeof(totals));
init_elapsed(&totals);
- origin_set = new OriginSet;
+ origin_set = new OriginSet;
parse_errors = 0;
// Command line parsing
@@ -2361,11 +2361,11 @@ main(int /* argc ATS_UNUSED */, const char *argv[])
}
// Get an exclusive lock, if possible. Try for up to 20 seconds.
// Use more portable & standard fcntl() over flock()
- lck.l_type = F_WRLCK;
+ lck.l_type = F_WRLCK;
lck.l_whence = 0; /* offset l_start from beginning of file*/
- lck.l_start = (off_t)0;
- lck.l_len = (off_t)0; /* till end of file*/
- cnt = 10;
+ lck.l_start = (off_t)0;
+ lck.l_len = (off_t)0; /* till end of file*/
+ cnt = 10;
while (((res = fcntl(state_fd, F_SETLK, &lck)) < 0) && --cnt) {
switch (errno) {
case EWOULDBLOCK:
@@ -2421,9 +2421,9 @@ main(int /* argc ATS_UNUSED */, const char *argv[])
// Check if the main log file was rotated, and if so, locate
// the old file first, and parse the remaining log data.
if (stat_buf.st_ino != last_state.st_ino) {
- DIR *dirp = NULL;
+ DIR *dirp = NULL;
struct dirent *dp = NULL;
- ino_t old_inode = last_state.st_ino;
+ ino_t old_inode = last_state.st_ino;
// Save the current log-file's I-Node number.
last_state.st_ino = stat_buf.st_ino;
diff --git a/proxy/sac.cc b/proxy/sac.cc
index acfac2b..6f1f17e 100644
--- a/proxy/sac.cc
+++ b/proxy/sac.cc
@@ -87,8 +87,8 @@ main(int /* argc ATS_UNUSED */, const char *argv[])
//
process_args(&appVersionInfo, argument_descriptions, countof(argument_descriptions), argv);
- diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, error_tags, action_tags, false);
- diags = diagsConfig->diags;
+ diagsConfig = new DiagsConfig(DIAGS_LOG_FILENAME, error_tags, action_tags, false);
+ diags = diagsConfig->diags;
diags->prefix_str = "Collector ";
// initialize this application for standalone logging operation
@@ -101,7 +101,7 @@ main(int /* argc ATS_UNUSED */, const char *argv[])
// set up IO Buffers
//
int config_max_iobuffer_size = DEFAULT_MAX_BUFFER_SIZE;
- max_iobuffer_size = buffer_size_to_index(config_max_iobuffer_size, DEFAULT_BUFFER_SIZES - 1);
+ max_iobuffer_size = buffer_size_to_index(config_max_iobuffer_size, DEFAULT_BUFFER_SIZES - 1);
if (default_small_iobuffer_size > max_iobuffer_size)
default_small_iobuffer_size = max_iobuffer_size;
if (default_large_iobuffer_size > max_iobuffer_size)
diff --git a/proxy/shared/DiagsConfig.cc b/proxy/shared/DiagsConfig.cc
index 0f2459e..21c51f0 100644
--- a/proxy/shared/DiagsConfig.cc
+++ b/proxy/shared/DiagsConfig.cc
@@ -64,7 +64,7 @@ DiagsConfig::reconfigure_diags()
all_found = true;
// initial value set to 0 or 1 based on command line tags
- c.enabled[DiagsTagType_Debug] = (diags->base_debug_tags != NULL);
+ c.enabled[DiagsTagType_Debug] = (diags->base_debug_tags != NULL);
c.enabled[DiagsTagType_Action] = (diags->base_action_tags != NULL);
// enabled if records.config set
@@ -72,25 +72,25 @@ DiagsConfig::reconfigure_diags()
e = (int)REC_readInteger("proxy.config.diags.debug.enabled", &found);
if (e && found)
c.enabled[DiagsTagType_Debug] = 1; // implement OR logic
- all_found = all_found && found;
+ all_found = all_found && found;
e = (int)REC_readInteger("proxy.config.diags.action.enabled", &found);
if (e && found)
c.enabled[DiagsTagType_Action] = 1; // implement OR logic
- all_found = all_found && found;
+ all_found = all_found && found;
- e = (int)REC_readInteger("proxy.config.diags.show_location", &found);
+ e = (int)REC_readInteger("proxy.config.diags.show_location", &found);
diags->show_location = ((e && found) ? 1 : 0);
- all_found = all_found && found;
+ all_found = all_found && found;
// read output routing values
for (i = 0;; i++) {
const char *record_name = output_records[i].config_name;
- DiagsLevel l = output_records[i].level;
+ DiagsLevel l = output_records[i].level;
if (!record_name)
break;
- p = REC_readString(record_name, &found);
+ p = REC_readString(record_name, &found);
all_found = all_found && found;
if (found) {
parse_output_string(p, &(c.outputs[l]));
@@ -100,12 +100,12 @@ DiagsConfig::reconfigure_diags()
}
}
- p = REC_readString("proxy.config.diags.debug.tags", &found);
- dt = (found ? p : NULL); // NOTE: needs to be freed
+ p = REC_readString("proxy.config.diags.debug.tags", &found);
+ dt = (found ? p : NULL); // NOTE: needs to be freed
all_found = all_found && found;
- p = REC_readString("proxy.config.diags.action.tags", &found);
- at = (found ? p : NULL); // NOTE: needs to be freed
+ p = REC_readString("proxy.config.diags.action.tags", &found);
+ at = (found ? p : NULL); // NOTE: needs to be freed
all_found = all_found && found;
///////////////////////////////////////////////////////////////////
@@ -186,9 +186,9 @@ diags_config_callback(const char * /* name ATS_UNUSED */, RecDataT /* data_type
void
DiagsConfig::parse_output_string(char *s, DiagsModeOutput *o)
{
- o->to_stdout = (s && strchr(s, 'O'));
- o->to_stderr = (s && strchr(s, 'E'));
- o->to_syslog = (s && strchr(s, 'S'));
+ o->to_stdout = (s && strchr(s, 'O'));
+ o->to_stderr = (s && strchr(s, 'E'));
+ o->to_syslog = (s && strchr(s, 'S'));
o->to_diagslog = (s && strchr(s, 'L'));
}
@@ -261,7 +261,7 @@ DiagsConfig::DiagsConfig(const char *filename, const char *tags, const char *act
ats_scoped_str logpath;
callbacks_established = false;
- diags = NULL;
+ diags = NULL;
////////////////////////////////////////////////////////////////////
// If we aren't using the manager records for configuation //
@@ -289,16 +289,16 @@ DiagsConfig::DiagsConfig(const char *filename, const char *tags, const char *act
// Grab rolling intervals from configuration
// TODO error check these values
- int output_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_interval_sec");
- int output_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_size_mb");
+ int output_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_interval_sec");
+ int output_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_size_mb");
int output_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.output.logfile.rolling_enabled");
- int diags_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_interval_sec");
- int diags_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_size_mb");
- int diags_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_enabled");
+ int diags_log_roll_int = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_interval_sec");
+ int diags_log_roll_size = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_size_mb");
+ int diags_log_roll_enable = (int)REC_ConfigReadInteger("proxy.config.diags.logfile.rolling_enabled");
// Set up diags, FILE streams are opened in Diags constructor
diags_log = new BaseLogFile(diags_logpath);
- diags = new Diags(tags, actions, diags_log);
+ diags = new Diags(tags, actions, diags_log);
diags->config_roll_diagslog((RollingEnabledValues)diags_log_roll_enable, diags_log_roll_int, diags_log_roll_size);
diags->config_roll_outputlog((RollingEnabledValues)output_log_roll_enable, output_log_roll_int, output_log_roll_size);
diff --git a/proxy/shared/InkXml.cc b/proxy/shared/InkXml.cc
index bcfc11c..b76849d 100644
--- a/proxy/shared/InkXml.cc
+++ b/proxy/shared/InkXml.cc
@@ -38,7 +38,7 @@
InkXmlAttr::InkXmlAttr(const char *tag, const char *value)
{
- m_tag = ats_strdup(tag);
+ m_tag = ats_strdup(tag);
m_value = ats_strdup(value);
}
@@ -60,7 +60,7 @@ InkXmlAttr::display(FILE *fd)
InkXmlObject::InkXmlObject(const char *object_name, bool dup_attrs_allowed)
{
- m_object_name = ats_strdup(object_name);
+ m_object_name = ats_strdup(object_name);
m_dup_attrs_allowed = dup_attrs_allowed;
}
@@ -160,7 +160,7 @@ InkXmlConfigFile::parse(int fd)
Debug("log", "Parsing XML config info from memory..");
m_line = 1;
- m_col = 0;
+ m_col = 0;
InkXmlObject *obj;
while ((obj = get_next_xml_object(fd)) != NULL) {
@@ -186,7 +186,7 @@ InkXmlConfigFile::parse()
}
m_line = 1;
- m_col = 0;
+ m_col = 0;
InkXmlObject *obj;
while ((obj = get_next_xml_object(fd)) != NULL) {
@@ -295,7 +295,7 @@ InkXmlConfigFile::scan_object(int fd, char token)
while (token != '>' && ident_len < max_ident_len) {
ident[ident_len++] = token;
- token = next_token(fd);
+ token = next_token(fd);
if (token == EOF)
return parse_error();
}
@@ -303,7 +303,7 @@ InkXmlConfigFile::scan_object(int fd, char token)
return parse_error();
}
- ident[ident_len] = 0;
+ ident[ident_len] = 0;
InkXmlObject *obj = new InkXmlObject(ident);
ink_assert(obj != NULL);
@@ -333,10 +333,10 @@ InkXmlConfigFile::scan_attr(int fd, const char *id)
char name[buf_size];
char value[buf_size];
char ident[buf_size];
- char *write_to = NULL;
- int write_len = 0;
- bool start_attr = false;
- bool in_quotes = false;
+ char *write_to = NULL;
+ int write_len = 0;
+ bool start_attr = false;
+ bool in_quotes = false;
InkXmlAttr *attr = NULL;
prev = next = 0;
@@ -350,8 +350,8 @@ InkXmlConfigFile::scan_attr(int fd, const char *id)
break;
}
start_attr = true;
- write_to = name;
- write_len = 0;
+ write_to = name;
+ write_len = 0;
break;
case '=':
@@ -364,8 +364,8 @@ InkXmlConfigFile::scan_attr(int fd, const char *id)
if (!start_attr)
return BAD_ATTR;
write_to[write_len] = 0;
- write_to = value;
- write_len = 0;
+ write_to = value;
+ write_len = 0;
break;
case '"':
@@ -391,10 +391,10 @@ InkXmlConfigFile::scan_attr(int fd, const char *id)
return BAD_ATTR;
if (prev == '<') {
write_len = 0;
- token = next_token(fd, !in_quotes);
+ token = next_token(fd, !in_quotes);
while (token != '>' && write_len < buf_size) {
ident[write_len++] = token;
- token = next_token(fd, !in_quotes);
+ token = next_token(fd, !in_quotes);
if (token == EOF)
return BAD_ATTR;
}
@@ -411,7 +411,7 @@ InkXmlConfigFile::scan_attr(int fd, const char *id)
if (next != '>')
return BAD_ATTR;
write_to[write_len] = 0;
- attr = new InkXmlAttr(name, value);
+ attr = new InkXmlAttr(name, value);
ink_assert(attr != NULL);
return attr;
diff --git a/proxy/shared/InkXml.h b/proxy/shared/InkXml.h
index 93509e1..63a70dc 100644
--- a/proxy/shared/InkXml.h
+++ b/proxy/shared/InkXml.h
@@ -202,7 +202,7 @@ public:
char *
dequeue()
{
- char *ret = NULL;
+ char *ret = NULL;
ListElem *e = m_list.dequeue();
if (e) {
diff --git a/proxy/shared/UglyLogStubs.cc b/proxy/shared/UglyLogStubs.cc
index 444864c..a5e5069 100644
--- a/proxy/shared/UglyLogStubs.cc
+++ b/proxy/shared/UglyLogStubs.cc
@@ -131,16 +131,16 @@ DNSConnection::Options const DNSConnection::DEFAULT_OPTIONS;
NetProcessor::AcceptOptions &
NetProcessor::AcceptOptions::reset()
{
- local_port = 0;
- accept_threads = 0;
- ip_family = AF_INET;
- etype = ET_NET;
- f_callback_on_open = false;
- recv_bufsize = 0;
- send_bufsize = 0;
- sockopt_flags = 0;
- packet_mark = 0;
- packet_tos = 0;
+ local_port = 0;
+ accept_threads = 0;
+ ip_family = AF_INET;
+ etype = ET_NET;
+ f_callback_on_open = false;
+ recv_bufsize = 0;
+ send_bufsize = 0;
+ sockopt_flags = 0;
+ packet_mark = 0;
+ packet_tos = 0;
f_inbound_transparent = false;
return *this;
}
diff --git a/proxy/spdy/SpdyCallbacks.cc b/proxy/spdy/SpdyCallbacks.cc
index 347e959..8ae6235 100644
--- a/proxy/spdy/SpdyCallbacks.cc
+++ b/proxy/spdy/SpdyCallbacks.cc
@@ -30,23 +30,23 @@ spdy_callbacks_init(spdylay_session_callbacks *callbacks)
{
memset(callbacks, 0, sizeof(spdylay_session_callbacks));
- callbacks->send_callback = spdy_send_callback;
- callbacks->recv_callback = spdy_recv_callback;
- callbacks->on_ctrl_recv_callback = spdy_on_ctrl_recv_callback;
- callbacks->on_invalid_ctrl_recv_callback = spdy_on_invalid_ctrl_recv_callback;
- callbacks->on_data_chunk_recv_callback = spdy_on_data_chunk_recv_callback;
- callbacks->on_data_recv_callback = spdy_on_data_recv_callback;
- callbacks->before_ctrl_send_callback = spdy_before_ctrl_send_callback;
- callbacks->on_ctrl_send_callback = spdy_on_ctrl_send_callback;
- callbacks->on_ctrl_not_send_callback = spdy_on_ctrl_not_send_callback;
- callbacks->on_data_send_callback = spdy_on_data_send_callback;
- callbacks->on_stream_close_callback = spdy_on_stream_close_callback;
- callbacks->on_request_recv_callback = spdy_on_request_recv_callback;
- callbacks->get_credential_proof = spdy_get_credential_proof;
- callbacks->get_credential_ncerts = spdy_get_credential_ncerts;
- callbacks->get_credential_cert = spdy_get_credential_cert;
+ callbacks->send_callback = spdy_send_callback;
+ callbacks->recv_callback = spdy_recv_callback;
+ callbacks->on_ctrl_recv_callback = spdy_on_ctrl_recv_callback;
+ callbacks->on_invalid_ctrl_recv_callback = spdy_on_invalid_ctrl_recv_callback;
+ callbacks->on_data_chunk_recv_callback = spdy_on_data_chunk_recv_callback;
+ callbacks->on_data_recv_callback = spdy_on_data_recv_callback;
+ callbacks->before_ctrl_send_callback = spdy_before_ctrl_send_callback;
+ callbacks->on_ctrl_send_callback = spdy_on_ctrl_send_callback;
+ callbacks->on_ctrl_not_send_callback = spdy_on_ctrl_not_send_callback;
+ callbacks->on_data_send_callback = spdy_on_data_send_callback;
+ callbacks->on_stream_close_callback = spdy_on_stream_close_callback;
+ callbacks->on_request_recv_callback = spdy_on_request_recv_callback;
+ callbacks->get_credential_proof = spdy_get_credential_proof;
+ callbacks->get_credential_ncerts = spdy_get_credential_ncerts;
+ callbacks->get_credential_cert = spdy_get_credential_cert;
callbacks->on_ctrl_recv_parse_error_callback = spdy_on_ctrl_recv_parse_error_callback;
- callbacks->on_unknown_ctrl_recv_callback = spdy_on_unknown_ctrl_recv_callback;
+ callbacks->on_unknown_ctrl_recv_callback = spdy_on_unknown_ctrl_recv_callback;
}
void
@@ -72,7 +72,7 @@ spdy_prepare_status_response_and_clean_request(SpdyClientSession *sm, int stream
nv[7] = date_str.c_str();
for (size_t i = 0; i < req->headers.size(); ++i) {
- nv[8 + i * 2] = req->headers[i].first.c_str();
+ nv[8 + i * 2] = req->headers[i].first.c_str();
nv[8 + i * 2 + 1] = req->headers[i].second.c_str();
}
nv[8 + req->headers.size() * 2] = 0;
@@ -173,7 +173,7 @@ spdy_fetcher_launch(SpdyRequest *req)
const sockaddr *client_addr;
SpdyClientSession *sm = req->spdy_sm;
- url = req->scheme + "://" + req->host + req->path;
+ url = req->scheme + "://" + req->host + req->path;
client_addr = TSNetVConnRemoteAddrGet(reinterpret_cast<TSVConn>(sm->vc));
req->url = url;
@@ -228,13 +228,13 @@ spdy_recv_callback(spdylay_session * /*session*/, uint8_t *buf, size_t length, i
SpdyClientSession *sm = (SpdyClientSession *)user_data;
already = 0;
- blk = TSIOBufferReaderStart(sm->req_reader);
+ blk = TSIOBufferReaderStart(sm->req_reader);
while (blk) {
wavail = length - already;
next_blk = TSIOBufferBlockNext(blk);
- start = TSIOBufferBlockReadStart(blk, sm->req_reader, &blk_len);
+ start = TSIOBufferBlockReadStart(blk, sm->req_reader, &blk_len);
need = blk_len > wavail ? wavail : blk_len;
@@ -309,7 +309,7 @@ spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type, sp
switch (type) {
case SPDYLAY_SYN_STREAM:
stream_id = frame->syn_stream.stream_id;
- req = SpdyRequest::alloc();
+ req = SpdyRequest::alloc();
req->init(sm, stream_id);
req->append_nv(frame->syn_stream.nv);
sm->req_map[stream_id] = req;
@@ -320,7 +320,7 @@ spdy_on_ctrl_recv_callback(spdylay_session *session, spdylay_frame_type type, sp
case SPDYLAY_HEADERS:
stream_id = frame->syn_stream.stream_id;
- req = sm->find_request(stream_id);
+ req = sm->find_request(stream_id);
if (!req) {
Error("spdy_on_ctrl_recv_callback, req object null on SPDYLAY_HEADERS for sm %" PRId64 ", stream_id %d", sm->sm_id,
stream_id);
@@ -352,7 +352,7 @@ spdy_on_data_chunk_recv_callback(spdylay_session * /*session*/, uint8_t /*flags*
size_t len, void *user_data)
{
SpdyClientSession *sm = (SpdyClientSession *)user_data;
- SpdyRequest *req = sm->find_request(stream_id);
+ SpdyRequest *req = sm->find_request(stream_id);
//
// SpdyRequest has been deleted on error, drop this data;
@@ -370,7 +370,7 @@ unsigned
spdy_session_delta_window_size(SpdyClientSession *sm)
{
unsigned sess_delta_window_size = 0;
- map<int, SpdyRequest *>::iterator iter = sm->req_map.begin();
+ map<int, SpdyRequest *>::iterator iter = sm->req_map.begin();
map<int, SpdyRequest *>::iterator endIter = sm->req_map.end();
for (; iter != endIter; ++iter) {
SpdyRequest *req = iter->second;
@@ -384,7 +384,7 @@ void
spdy_on_data_recv_callback(spdylay_session *session, uint8_t flags, int32_t stream_id, int32_t length, void *user_data)
{
SpdyClientSession *sm = (SpdyClientSession *)user_data;
- SpdyRequest *req = sm->find_request(stream_id);
+ SpdyRequest *req = sm->find_request(stream_id);
spdy_show_data_frame("++++RECV", session, flags, stream_id, length, user_data);
diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index 406a906..c10a542 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -63,7 +63,7 @@ SpdyRequest::destroy()
void
SpdyRequest::init(SpdyClientSession *sm, int id)
{
- spdy_sm = sm;
+ spdy_sm = sm;
stream_id = id;
headers.clear();
@@ -108,7 +108,7 @@ SpdyClientSession::init(NetVConnection *netvc)
int r;
this->mutex = netvc->mutex;
- this->vc = netvc;
+ this->vc = netvc;
this->req_map.clear();
r = spdylay_session_server_new(&session, versmap[this->version], &spdy_callbacks, this);
@@ -121,7 +121,7 @@ SpdyClientSession::init(NetVConnection *netvc)
SPDY_INCREMENT_THREAD_DYN_STAT(SPDY_STAT_TOTAL_CLIENT_CONNECTION_COUNT, netvc->mutex->thread_holding);
ink_release_assert(r == 0);
- sm_id = atomic_inc(g_sm_id);
+ sm_id = atomic_inc(g_sm_id);
total_size = 0;
start_time = TShrtime();
@@ -144,7 +144,7 @@ SpdyClientSession::clear()
// SpdyRequest depends on SpdyClientSession,
// we should delete it firstly to avoid race.
//
- map<int, SpdyRequest *>::iterator iter = req_map.begin();
+ map<int, SpdyRequest *>::iterator iter = req_map.begin();
map<int, SpdyRequest *>::iterator endIter = req_map.end();
for (; iter != endIter; ++iter) {
SpdyRequest *req = iter->second;
@@ -225,7 +225,7 @@ SpdyClientSession::state_session_start(int /* event */, void * /* edata */)
{SPDYLAY_SETTINGS_INITIAL_WINDOW_SIZE, SPDYLAY_ID_FLAG_SETTINGS_NONE, spdy_initial_window_size}};
int r;
- this->read_vio = (TSVIO)this->vc->do_io_read(this, INT64_MAX, reinterpret_cast<MIOBuffer *>(this->req_buffer));
+ this->read_vio = (TSVIO)this->vc->do_io_read(this, INT64_MAX, reinterpret_cast<MIOBuffer *>(this->req_buffer));
this->write_vio = (TSVIO)this->vc->do_io_write(this, INT64_MAX, reinterpret_cast<IOBufferReader *>(this->resp_reader));
if (TSIOBufferReaderAvail(this->req_reader) > 0) {
@@ -251,7 +251,7 @@ SpdyClientSession::state_session_start(int /* event */, void * /* edata */)
int
SpdyClientSession::state_session_readwrite(int event, void *edata)
{
- int ret = 0;
+ int ret = 0;
bool from_fetch = false;
this->event = event;
@@ -272,7 +272,7 @@ SpdyClientSession::state_session_readwrite(int event, void *edata)
ret = spdy_process_write((TSEvent)event, this);
} else {
from_fetch = true;
- ret = spdy_process_fetch((TSEvent)event, this, edata);
+ ret = spdy_process_fetch((TSEvent)event, this, edata);
}
Debug("spdy-event", "++++SpdyClientSession[%" PRIu64 "], EVENT:%d, ret:%d", this->sm_id, event, ret);
@@ -344,9 +344,9 @@ spdy_process_write(TSEvent /* event ATS_UNUSED */, SpdyClientSession *sm)
static int
spdy_process_fetch(TSEvent event, SpdyClientSession *sm, void *edata)
{
- int ret = -1;
+ int ret = -1;
TSFetchSM fetch_sm = (TSFetchSM)edata;
- SpdyRequest *req = (SpdyRequest *)TSFetchUserDataGet(fetch_sm);
+ SpdyRequest *req = (SpdyRequest *)TSFetchUserDataGet(fetch_sm);
if (!req) {
Warning("spdy_process_fetch: stream already gone");
return ret;
@@ -366,7 +366,7 @@ spdy_process_fetch(TSEvent event, SpdyClientSession *sm, void *edata)
case TS_FETCH_EVENT_EXT_BODY_DONE:
Debug("spdy", "----[FETCH BODY DONE]");
req->fetch_body_completed = true;
- ret = spdy_process_fetch_body(event, sm, fetch_sm, req);
+ ret = spdy_process_fetch_body(event, sm, fetch_sm, req);
break;
default:
@@ -424,7 +424,7 @@ spdy_read_fetch_body_callback(spdylay_session * /*session*/, int32_t stream_id,
int64_t already;
SpdyClientSession *sm = (SpdyClientSession *)user_data;
- SpdyRequest *req = (SpdyRequest *)source->ptr;
+ SpdyRequest *req = (SpdyRequest *)source->ptr;
//
// req has been deleted, ignore this data.
@@ -478,7 +478,7 @@ spdy_process_fetch_body(TSEvent event, SpdyClientSession *sm, TSFetchSM fetch_sm
spdylay_data_provider data_prd;
req->event = event;
- data_prd.source.ptr = (void *)req;
+ data_prd.source.ptr = (void *)req;
data_prd.read_callback = spdy_read_fetch_body_callback;
if (!req->has_submitted_data) {
diff --git a/proxy/spdy/SpdyCommon.cc b/proxy/spdy/SpdyCommon.cc
index 81f3da9..165cc69 100644
--- a/proxy/spdy/SpdyCommon.cc
+++ b/proxy/spdy/SpdyCommon.cc
@@ -30,23 +30,23 @@ spdylay_session_callbacks spdy_callbacks;
// statistic names
RecRawStatBlock *spdy_rsb; ///< Container for statistics.
-static char const *const SPDY_STAT_CURRENT_CLIENT_SESSION_NAME = "proxy.process.spdy.current_client_sessions";
-static char const *const SPDY_STAT_CURRENT_CLIENT_STREAM_NAME = "proxy.process.spdy.current_client_streams";
-static char const *const SPDY_STAT_TOTAL_CLIENT_STREAM_NAME = "proxy.process.spdy.total_client_streams";
+static char const *const SPDY_STAT_CURRENT_CLIENT_SESSION_NAME = "proxy.process.spdy.current_client_sessions";
+static char const *const SPDY_STAT_CURRENT_CLIENT_STREAM_NAME = "proxy.process.spdy.current_client_streams";
+static char const *const SPDY_STAT_TOTAL_CLIENT_STREAM_NAME = "proxy.process.spdy.total_client_streams";
static char const *const SPDY_STAT_TOTAL_TRANSACTIONS_TIME_NAME = "proxy.process.spdy.total_transactions_time";
static char const *const SPDY_STAT_TOTAL_CLIENT_CONNECTION_NAME = "proxy.process.spdy.total_client_connections";
// Configurations
-uint32_t spdy_max_concurrent_streams = 100;
-uint32_t spdy_initial_window_size = 1048576;
+uint32_t spdy_max_concurrent_streams = 100;
+uint32_t spdy_initial_window_size = 1048576;
int32_t spdy_accept_no_activity_timeout = 120;
-int32_t spdy_no_activity_timeout_in = 115;
+int32_t spdy_no_activity_timeout_in = 115;
string
http_date(time_t t)
{
char buf[32];
- tm *tms = gmtime(&t); // returned struct is statically allocated.
+ tm *tms = gmtime(&t); // returned struct is statically allocated.
size_t r = strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S GMT", tms);
return std::string(&buf[0], &buf[r]);
}
@@ -87,9 +87,9 @@ SpdyNV::SpdyNV(TSFetchSM fetch_sm)
TSMBuffer bufp;
bufp = TSFetchRespHdrMBufGet(fetch_sm);
- loc = TSFetchRespHdrMLocGet(fetch_sm);
+ loc = TSFetchRespHdrMLocGet(fetch_sm);
- hdr_len = TSMimeHdrLengthGet(bufp, loc);
+ hdr_len = TSMimeHdrLengthGet(bufp, loc);
mime_hdr = malloc(hdr_len);
TSReleaseAssert(mime_hdr);
@@ -111,17 +111,17 @@ SpdyNV::SpdyNV(TSFetchSM fetch_sm)
i = TSHttpHdrVersionGet(bufp, loc);
snprintf(version, sizeof(version), "HTTP/%d.%d", TS_HTTP_MAJOR(i), TS_HTTP_MINOR(i));
- i = TSHttpHdrStatusGet(bufp, loc);
+ i = TSHttpHdrStatusGet(bufp, loc);
value = (char *)TSHttpHdrReasonGet(bufp, loc, &value_len);
snprintf(status, sizeof(version), "%d ", i);
- i = strlen(status);
+ i = strlen(status);
len = sizeof(status) - i;
len = value_len > len ? len : value_len;
strncpy(&status[i], value, len);
status[len + i] = '\0';
;
- i = 0;
+ i = 0;
nv[i++] = ":version";
nv[i++] = version;
nv[i++] = ":status";
@@ -130,7 +130,7 @@ SpdyNV::SpdyNV(TSFetchSM fetch_sm)
//
// Process HTTP headers
//
- p = (char *)mime_hdr;
+ p = (char *)mime_hdr;
field_loc = TSMimeHdrFieldGet(bufp, loc, 0);
while (field_loc) {
name = TSMimeHdrFieldNameGet(bufp, loc, field_loc, &name_len);
diff --git a/proxy/spdy/SpdySessionAccept.cc b/proxy/spdy/SpdySessionAccept.cc
index 96c4043..d8c1a60 100644
--- a/proxy/spdy/SpdySessionAccept.cc
+++ b/proxy/spdy/SpdySessionAccept.cc
@@ -44,7 +44,7 @@ SpdySessionAccept::mainEvent(int event, void *edata)
#if TS_HAS_SPDY
SpdyClientSession *sm = SpdyClientSession::alloc();
- sm->version = this->version;
+ sm->version = this->version;
sm->new_connection(netvc, NULL, NULL, false);
#else
@@ -64,7 +64,7 @@ SpdySessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferReade
{
#if TS_HAS_SPDY
SpdyClientSession *sm = SpdyClientSession::alloc();
- sm->version = this->version;
+ sm->version = this->version;
sm->new_connection(netvc, iobuf, reader, false);
#else
(void)netvc;
diff --git a/proxy/test_xml_parser.cc b/proxy/test_xml_parser.cc
index 88f362c..8216c46 100644
--- a/proxy/test_xml_parser.cc
+++ b/proxy/test_xml_parser.cc
@@ -28,9 +28,9 @@
int
main()
{
- InkXmlAttr *a1 = new InkXmlAttr("Name", "Matt");
- InkXmlAttr *a2 = new InkXmlAttr("Title", "Engineer");
- InkXmlAttr *a3 = new InkXmlAttr("Company", "Inktomi");
+ InkXmlAttr *a1 = new InkXmlAttr("Name", "Matt");
+ InkXmlAttr *a2 = new InkXmlAttr("Title", "Engineer");
+ InkXmlAttr *a3 = new InkXmlAttr("Company", "Inktomi");
InkXmlObject *o1 = new InkXmlObject("Employee");
ink_release_assert(strcmp(o1->object_name(), "Employee") == 0);
diff --git a/tools/http_load/http_load.c b/tools/http_load/http_load.c
index 95e7d28..87d08fc 100644
--- a/tools/http_load/http_load.c
+++ b/tools/http_load/http_load.c
@@ -269,7 +269,7 @@ int total_timeouts, total_badbytes, total_badchecksums;
static long start_interval, low_interval, high_interval, range_interval;
static SSL_CTX *ssl_ctx = (SSL_CTX *)0;
-static char *cipher = (char *)0;
+static char *cipher = (char *)0;
/* Forwards. */
static void usage(void);
@@ -333,22 +333,22 @@ main(int argc, char **argv)
#endif /* RLIMIT_NOFILE */
/* Parse args. */
- argv0 = argv[0];
- argn = 1;
+ argv0 = argv[0];
+ argn = 1;
do_checksum = do_throttle = do_verbose = do_jitter = do_proxy = 0;
do_accept_gzip = do_sequential = 0;
- throttle = THROTTLE;
- sip_file = (char *)0;
- user_agent = VERSION;
- cookie = NULL;
- http_version = "1.1";
- is_http_1_1 = 1;
- idle_secs = IDLE_SECS;
- start = START_NONE;
- end = END_NONE;
- keep_alive = 0;
- socket_pool = 0;
- extra_headers = NULL;
+ throttle = THROTTLE;
+ sip_file = (char *)0;
+ user_agent = VERSION;
+ cookie = NULL;
+ http_version = "1.1";
+ is_http_1_1 = 1;
+ idle_secs = IDLE_SECS;
+ start = START_NONE;
+ end = END_NONE;
+ keep_alive = 0;
+ socket_pool = 0;
+ extra_headers = NULL;
while (argn < argc && argv[argn][0] == '-' && argv[argn][1] != '\0') {
if (strncmp(argv[argn], "-checksum", strlen(argv[argn])) == 0)
do_checksum = 1;
@@ -358,7 +358,7 @@ main(int argc, char **argv)
do_throttle = 1;
else if (strncmp(argv[argn], "-Throttle", strlen(argv[argn])) == 0 && argn + 1 < argc) {
do_throttle = 1;
- throttle = atoi(argv[++argn]) / 10.0;
+ throttle = atoi(argv[++argn]) / 10.0;
} else if (strncmp(argv[argn], "-verbose", strlen(argv[argn])) == 0)
do_verbose = 1;
else if (strncmp(argv[argn], "-timeout", strlen(argv[argn])) == 0 && argn + 1 < argc)
@@ -368,7 +368,7 @@ main(int argc, char **argv)
else if (strncmp(argv[argn], "-accept_gzip", strlen(argv[argn])) == 0)
do_accept_gzip = 1;
else if (strncmp(argv[argn], "-parallel", strlen(argv[argn])) == 0 && argn + 1 < argc) {
- start = START_PARALLEL;
+ start = START_PARALLEL;
start_parallel = atoi(argv[++argn]);
if (start_parallel < 1) {
(void)fprintf(stderr, "%s: parallel must be at least 1\n", argv0);
@@ -379,7 +379,7 @@ main(int argc, char **argv)
exit(1);
}
} else if (strncmp(argv[argn], "-rate", strlen(argv[argn])) == 0 && argn + 1 < argc) {
- start = START_RATE;
+ start = START_RATE;
start_rate = atoi(argv[++argn]);
if (start_rate < 1) {
(void)fprintf(stderr, "%s: rate must be at least 1\n", argv0);
@@ -396,14 +396,14 @@ main(int argc, char **argv)
exit(1);
}
} else if (strncmp(argv[argn], "-fetches", strlen(argv[argn])) == 0 && argn + 1 < argc) {
- end = END_FETCHES;
+ end = END_FETCHES;
end_fetches = atoi(argv[++argn]);
if (end_fetches < 1) {
(void)fprintf(stderr, "%s: fetches must be at least 1\n", argv0);
exit(1);
}
} else if (strncmp(argv[argn], "-seconds", strlen(argv[argn])) == 0 && argn + 1 < argc) {
- end = END_SECONDS;
+ end = END_SECONDS;
end_seconds = atoi(argv[++argn]);
if (end_seconds < 1) {
(void)fprintf(stderr, "%s: seconds must be at least 1\n", argv0);
@@ -442,7 +442,7 @@ main(int argc, char **argv)
}
} else if (strncmp(argv[argn], "-http_version", strlen(argv[argn])) == 0 && argn + 1 < argc) {
http_version = argv[++argn];
- is_http_1_1 = (strcmp(http_version, "1.1") == 0);
+ is_http_1_1 = (strcmp(http_version, "1.1") == 0);
} else if (strncmp(argv[argn], "-cipher", strlen(argv[argn])) == 0 && argn + 1 < argc) {
cipher = argv[++argn];
if (strcasecmp(cipher, "fastsec") == 0)
@@ -453,14 +453,14 @@ main(int argc, char **argv)
cipher = "AES256-SHA";
} else if (strncmp(argv[argn], "-proxy", strlen(argv[argn])) == 0 && argn + 1 < argc) {
char *colon;
- do_proxy = 1;
+ do_proxy = 1;
proxy_hostname = argv[++argn];
- colon = strchr(proxy_hostname, ':');
+ colon = strchr(proxy_hostname, ':');
if (colon == (char *)0)
proxy_port = 80;
else {
proxy_port = (unsigned short)atoi(colon + 1);
- *colon = '\0';
+ *colon = '\0';
}
} else
usage();
@@ -484,35 +484,35 @@ main(int argc, char **argv)
/* Initialize the connections table. */
if (start == START_PARALLEL)
max_connections = start_parallel;
- connections = (connection *)malloc_check(max_connections * sizeof(connection));
+ connections = (connection *)malloc_check(max_connections * sizeof(connection));
for (cnum = 0; cnum < max_connections; ++cnum) {
- connections[cnum].conn_state = CNST_FREE;
- connections[cnum].reusable = 0;
- connections[cnum].stats.requests = 0;
- connections[cnum].stats.responses = 0;
+ connections[cnum].conn_state = CNST_FREE;
+ connections[cnum].reusable = 0;
+ connections[cnum].stats.requests = 0;
+ connections[cnum].stats.responses = 0;
connections[cnum].stats.connections = 0;
}
num_connections = max_parallel = num_ka_conns = 0;
/* Initialize the HTTP status-code histogram. */
- for (i = 0; i < 1000; ++i)
+ for (i = 0; i < 1000; ++i)
http_status_counts[i] = 0;
/* Initialize the statistics. */
- fetches_started = 0;
- connects_completed = 0;
- responses_completed = 0;
- fetches_completed = 0;
- total_bytes = 0;
- total_connect_usecs = 0;
- max_connect_usecs = 0;
- min_connect_usecs = 1000000000L;
+ fetches_started = 0;
+ connects_completed = 0;
+ responses_completed = 0;
+ fetches_completed = 0;
+ total_bytes = 0;
+ total_connect_usecs = 0;
+ max_connect_usecs = 0;
+ min_connect_usecs = 1000000000L;
total_response_usecs = 0;
- max_response_usecs = 0;
- min_response_usecs = 1000000000L;
- total_timeouts = 0;
- total_badbytes = 0;
- total_badchecksums = 0;
+ max_response_usecs = 0;
+ min_response_usecs = 1000000000L;
+ total_timeouts = 0;
+ total_badbytes = 0;
+ total_badchecksums = 0;
/* Initialize epoll() and kqueue() etc. */
epfd = epoll_create(max_connections);
@@ -538,8 +538,8 @@ main(int argc, char **argv)
if (start == START_RATE) {
start_interval = 1000L / start_rate;
if (do_jitter) {
- low_interval = start_interval * 9 / 10;
- high_interval = start_interval * 11 / 10;
+ low_interval = start_interval * 9 / 10;
+ high_interval = start_interval * 11 / 10;
range_interval = high_interval - low_interval + 1;
}
(void)tmr_create(&now, start_timer, JunkClientData, start_interval, !do_jitter);
@@ -625,9 +625,9 @@ static void
read_url_file(char *url_file)
{
char line[5000], hostname[5000];
- char *http = "http://";
- int http_len = strlen(http);
- char *https = "https://";
+ char *http = "http://";
+ int http_len = strlen(http);
+ char *https = "https://";
int https_len = strlen(https);
int proto_len, host_len;
char *cp;
@@ -639,9 +639,9 @@ read_url_file(char *url_file)
}
max_urls = 100;
- urls = (url *)malloc_check(max_urls * sizeof(url));
+ urls = (url *)malloc_check(max_urls * sizeof(url));
num_urls = 0;
- cur_url = 0;
+ cur_url = 0;
/* The Host: header can either be user provided (via -header), or
constructed by the URL host and possibly port (if not port 80) */
@@ -680,10 +680,10 @@ read_url_file(char *url_file)
/* Parse it. */
if (strncmp(http, line, http_len) == 0) {
- proto_len = http_len;
+ proto_len = http_len;
urls[num_urls].protocol = PROTO_HTTP;
} else if (strncmp(https, line, https_len) == 0) {
- proto_len = https_len;
+ proto_len = https_len;
urls[num_urls].protocol = PROTO_HTTPS;
} else {
fprintf(stderr, "%s: unknown protocol - %s\n", argv0, line);
@@ -694,7 +694,7 @@ read_url_file(char *url_file)
host_len = cp - line;
host_len -= proto_len;
strncpy(hostname, line + proto_len, host_len);
- hostname[host_len] = '\0';
+ hostname[host_len] = '\0';
urls[num_urls].hostname = strdup_check(hostname);
if (*cp == ':') {
urls[num_urls].port = (unsigned short)atoi(++cp);
@@ -711,8 +711,8 @@ read_url_file(char *url_file)
lookup_address(num_urls);
- urls[num_urls].got_bytes = 0;
- urls[num_urls].got_checksum = 0;
+ urls[num_urls].got_bytes = 0;
+ urls[num_urls].got_checksum = 0;
urls[num_urls].unique_id_offset = 0;
/* Pre-generate the request string, major performance improvement. */
@@ -740,7 +740,7 @@ read_url_file(char *url_file)
req_bytes += snprintf(&req_buf[req_bytes], sizeof(req_buf) - req_bytes, hdr_buf, 0);
urls[num_urls].buf_bytes = req_bytes;
- urls[num_urls].buf = strdup_check(req_buf);
+ urls[num_urls].buf = strdup_check(req_buf);
++num_urls;
}
@@ -751,11 +751,11 @@ static void
lookup_address(int url_num)
{
if (do_proxy && url_num > 0) {
- urls[url_num].sock_family = urls[url_num - 1].sock_family;
- urls[url_num].sock_type = urls[url_num - 1].sock_type;
+ urls[url_num].sock_family = urls[url_num - 1].sock_family;
+ urls[url_num].sock_type = urls[url_num - 1].sock_type;
urls[url_num].sock_protocol = urls[url_num - 1].sock_protocol;
- urls[url_num].sa_len = urls[url_num - 1].sa_len;
- urls[url_num].sa = urls[url_num - 1].sa;
+ urls[url_num].sa_len = urls[url_num - 1].sa_len;
+ urls[url_num].sa = urls[url_num - 1].sa;
return;
}
int i;
@@ -788,11 +788,11 @@ lookup_address(int url_num)
/* Try to do this using existing information */
for (i = 0; i < url_num; i++) {
if ((strcmp(hostname, urls[i].hostname) == 0) && (port == urls[i].port)) {
- urls[url_num].sock_family = urls[i].sock_family;
- urls[url_num].sock_type = urls[i].sock_type;
+ urls[url_num].sock_family = urls[i].sock_family;
+ urls[url_num].sock_type = urls[i].sock_type;
urls[url_num].sock_protocol = urls[i].sock_protocol;
- urls[url_num].sa = urls[i].sa;
- urls[url_num].sa_len = urls[i].sa_len;
+ urls[url_num].sa = urls[i].sa;
+ urls[url_num].sa_len = urls[i].sa_len;
return;
}
}
@@ -800,7 +800,7 @@ lookup_address(int url_num)
#ifdef USE_IPV6
(void)memset(&hints, 0, sizeof(hints));
- hints.ai_family = PF_UNSPEC;
+ hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
(void)snprintf(portstr, sizeof(portstr), "%d", (int)port);
if ((gaierr = getaddrinfo(hostname, portstr, &hints, &ai)) != 0) {
@@ -831,10 +831,10 @@ lookup_address(int url_num)
(unsigned long)aiv4->ai_addrlen);
exit(1);
}
- urls[url_num].sock_family = aiv4->ai_family;
- urls[url_num].sock_type = aiv4->ai_socktype;
+ urls[url_num].sock_family = aiv4->ai_family;
+ urls[url_num].sock_type = aiv4->ai_socktype;
urls[url_num].sock_protocol = aiv4->ai_protocol;
- urls[url_num].sa_len = aiv4->ai_addrlen;
+ urls[url_num].sa_len = aiv4->ai_addrlen;
(void)memmove(&urls[url_num].sa, aiv4->ai_addr, aiv4->ai_addrlen);
freeaddrinfo(ai);
return;
@@ -845,10 +845,10 @@ lookup_address(int url_num)
(unsigned long)aiv6->ai_addrlen);
exit(1);
}
- urls[url_num].sock_family = aiv6->ai_family;
- urls[url_num].sock_type = aiv6->ai_socktype;
+ urls[url_num].sock_family = aiv6->ai_family;
+ urls[url_num].sock_type = aiv6->ai_socktype;
urls[url_num].sock_protocol = aiv6->ai_protocol;
- urls[url_num].sa_len = aiv6->ai_addrlen;
+ urls[url_num].sa_len = aiv6->ai_addrlen;
(void)memmove(&urls[url_num].sa, aiv6->ai_addr, aiv6->ai_addrlen);
freeaddrinfo(ai);
return;
@@ -866,9 +866,9 @@ lookup_address(int url_num)
exit(1);
}
urls[url_num].sock_family = urls[url_num].sa.sin_family = he->h_addrtype;
- urls[url_num].sock_type = SOCK_STREAM;
- urls[url_num].sock_protocol = 0;
- urls[url_num].sa_len = sizeof(urls[url_num].sa);
+ urls[url_num].sock_type = SOCK_STREAM;
+ urls[url_num].sock_protocol = 0;
+ urls[url_num].sa_len = sizeof(urls[url_num].sa);
(void)memmove(&urls[url_num].sa.sin_addr, he->h_addr, he->h_length);
urls[url_num].sa.sin_port = htons(port);
@@ -888,7 +888,7 @@ read_sip_file(char *sip_file)
}
max_sips = 100;
- sips = (sip *)malloc_check(max_sips * sizeof(sip));
+ sips = (sip *)malloc_check(max_sips * sizeof(sip));
num_sips = 0;
while (fgets(line, sizeof(line), fp) != (char *)0) {
/* Nuke trailing newline. */
@@ -996,20 +996,20 @@ start_socket(int url_num, int cnum, struct timeval *nowP)
int reusable = connections[cnum].reusable;
/* Start filling in the connection slot. */
- connections[cnum].url_num = url_num;
- connections[cnum].started_at = *nowP;
- client_data.i = cnum;
- connections[cnum].did_connect = 0;
- connections[cnum].did_response = 0;
- connections[cnum].idle_timer = tmr_create(nowP, idle_connection, client_data, idle_secs * 1000L, 0);
- connections[cnum].wakeup_timer = (Timer *)0;
+ connections[cnum].url_num = url_num;
+ connections[cnum].started_at = *nowP;
+ client_data.i = cnum;
+ connections[cnum].did_connect = 0;
+ connections[cnum].did_response = 0;
+ connections[cnum].idle_timer = tmr_create(nowP, idle_connection, client_data, idle_secs * 1000L, 0);
+ connections[cnum].wakeup_timer = (Timer *)0;
connections[cnum].content_length = -1;
- connections[cnum].bytes = 0;
- connections[cnum].checksum = 0;
- connections[cnum].http_status = -1;
- connections[cnum].reusable = 0;
- connections[cnum].chunked = 0;
- connections[cnum].unique_id = 0;
+ connections[cnum].bytes = 0;
+ connections[cnum].checksum = 0;
+ connections[cnum].http_status = -1;
+ connections[cnum].reusable = 0;
+ connections[cnum].chunked = 0;
+ connections[cnum].unique_id = 0;
// set unique id
if (unique_id == 1 && urls[url_num].unique_id_offset > 0) {
@@ -1025,7 +1025,7 @@ start_socket(int url_num, int cnum, struct timeval *nowP)
struct epoll_event ev;
connections[cnum].keep_alive = keep_alive;
- connections[cnum].conn_fd = socket(urls[url_num].sock_family, urls[url_num].sock_type, urls[url_num].sock_protocol);
+ connections[cnum].conn_fd = socket(urls[url_num].sock_family, urls[url_num].sock_type, urls[url_num].sock_protocol);
if (connections[cnum].conn_fd < 0) {
perror(urls[url_num].url_str);
return;
@@ -1054,7 +1054,7 @@ start_socket(int url_num, int cnum, struct timeval *nowP)
return;
}
}
- ev.events = EPOLLOUT;
+ ev.events = EPOLLOUT;
ev.data.u32 = cnum;
#ifdef DEBUG
fprintf(stderr, "Adding FD %d for CNUM %d\n", connections[cnum].conn_fd, cnum);
@@ -1103,7 +1103,7 @@ start_socket(int url_num, int cnum, struct timeval *nowP)
close_connection(cnum);
return;
}
- connections[cnum].conn_state = CNST_HEADERS;
+ connections[cnum].conn_state = CNST_HEADERS;
connections[cnum].header_state = HDST_LINE1_PROTOCOL;
}
}
@@ -1126,7 +1126,7 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
fprintf(stderr, "Entering handle_connect() for CNUM %d\n", cnum);
#endif
- url_num = connections[cnum].url_num;
+ url_num = connections[cnum].url_num;
connections[cnum].stats.requests_per_connection = 0;
if (double_check) {
/* Check to make sure the non-blocking connect succeeded. */
@@ -1179,7 +1179,7 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
if (!RAND_status()) {
unsigned char bytes[1024];
int i;
- for (i = 0; i < sizeof(bytes); ++i)
+ for (i = 0; i < sizeof(bytes); ++i)
bytes[i] = random() % 0xff;
RAND_seed(bytes, sizeof(bytes));
}
@@ -1197,7 +1197,7 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
}
}
- ev.events = EPOLLIN;
+ ev.events = EPOLLIN;
ev.data.u32 = cnum;
#ifdef DEBUG
@@ -1210,7 +1210,7 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
}
/* Send the request. */
connections[cnum].did_connect = 1;
- connections[cnum].request_at = *nowP;
+ connections[cnum].request_at = *nowP;
connections[cnum].stats.requests++;
if (urls[url_num].protocol == PROTO_HTTPS)
r = SSL_write(connections[cnum].ssl, urls[url_num].buf, urls[url_num].buf_bytes);
@@ -1222,7 +1222,7 @@ handle_connect(int cnum, struct timeval *nowP, int double_check)
close_connection(cnum);
return;
}
- connections[cnum].conn_state = CNST_HEADERS;
+ connections[cnum].conn_state = CNST_HEADERS;
connections[cnum].header_state = HDST_LINE1_PROTOCOL;
}
@@ -1243,7 +1243,7 @@ handle_read(int cnum, struct timeval *nowP)
bytes_to_read = sizeof(buf);
if (!connections[cnum].did_response) {
connections[cnum].did_response = 1;
- connections[cnum].response_at = *nowP;
+ connections[cnum].response_at = *nowP;
if (connections[cnum].did_connect) {
if (connections[cnum].keep_alive == keep_alive) {
num_ka_conns++;
@@ -1305,7 +1305,7 @@ handle_read(int cnum, struct timeval *nowP)
case '7':
case '8':
case '9':
- connections[cnum].http_status = buf[bytes_handled] - '0';
+ connections[cnum].http_status = buf[bytes_handled] - '0';
connections[cnum].header_state = HDST_LINE1_STATUS;
break;
case '\n':
@@ -1755,7 +1755,7 @@ handle_read(int cnum, struct timeval *nowP)
case '8':
case '9':
connections[cnum].content_length = buf[bytes_handled] - '0';
- connections[cnum].header_state = HDST_CONTENT_LENGTH_COLON_WS_NUM;
+ connections[cnum].header_state = HDST_CONTENT_LENGTH_COLON_WS_NUM;
break;
case '\n':
connections[cnum].header_state = HDST_LF;
@@ -2714,8 +2714,8 @@ handle_read(int cnum, struct timeval *nowP)
/* Check if we're reading too fast. */
elapsed = delta_timeval(&connections[cnum].started_at, nowP) / 1000000.0;
if (elapsed > 0.01 && connections[cnum].bytes / elapsed > throttle) {
- connections[cnum].conn_state = CNST_PAUSING;
- client_data.i = cnum;
+ connections[cnum].conn_state = CNST_PAUSING;
+ client_data.i = cnum;
connections[cnum].wakeup_timer = tmr_create(nowP, wakeup_connection, client_data, 1000L, 0);
}
}
@@ -2764,7 +2764,7 @@ idle_connection(ClientData client_data, struct timeval *nowP __attribute__((unus
gettimeofday(&tv, NULL);
strftime(strTime, 32, "%T", localtime(&tv.tv_sec));
- cnum = client_data.i;
+ cnum = client_data.i;
connections[cnum].idle_timer = (Timer *)0;
if (unique_id) {
(void)fprintf(stderr, "[%s.%lld] %s: timed out (%d sec) in state %d, requests %d, unique id: %u\n", strTime,
@@ -2785,9 +2785,9 @@ wakeup_connection(ClientData client_data, struct timeval *nowP __attribute__((un
{
int cnum;
- cnum = client_data.i;
+ cnum = client_data.i;
connections[cnum].wakeup_timer = (Timer *)0;
- connections[cnum].conn_state = CNST_READING;
+ connections[cnum].conn_state = CNST_READING;
}
static void
@@ -2798,7 +2798,7 @@ close_connection(int cnum)
if (!connections[cnum].reusable) {
struct epoll_event ev;
- ev.events = EPOLLIN | EPOLLOUT;
+ ev.events = EPOLLIN | EPOLLOUT;
ev.data.u32 = cnum;
if (epoll_ctl(epfd, EPOLL_CTL_DEL, connections[cnum].conn_fd, &ev) < 0)
perror("epoll delete fd");
@@ -2850,7 +2850,7 @@ close_connection(int cnum)
if (connections[cnum].http_status >= 0 && connections[cnum].http_status < 400) {
if (do_checksum) {
if (!urls[url_num].got_checksum) {
- urls[url_num].checksum = connections[cnum].checksum;
+ urls[url_num].checksum = connections[cnum].checksum;
urls[url_num].got_checksum = 1;
} else {
if (connections[cnum].checksum != urls[url_num].checksum) {
@@ -2860,7 +2860,7 @@ close_connection(int cnum)
}
} else {
if (!urls[url_num].got_bytes) {
- urls[url_num].bytes = connections[cnum].bytes;
+ urls[url_num].bytes = connections[cnum].bytes;
urls[url_num].got_bytes = 1;
} else {
if (connections[cnum].bytes != urls[url_num].bytes) {
@@ -2951,7 +2951,7 @@ finish(struct timeval *nowP)
static long long
delta_timeval(struct timeval *start, struct timeval *finish)
{
- long long delta_secs = finish->tv_sec - start->tv_sec;
+ long long delta_secs = finish->tv_sec - start->tv_sec;
long long delta_usecs = finish->tv_usec - start->tv_usec;
return delta_secs * (long long)1000000L + delta_usecs;
}
diff --git a/tools/http_load/timers.c b/tools/http_load/timers.c
index fcd9f14..76eab78 100644
--- a/tools/http_load/timers.c
+++ b/tools/http_load/timers.c
@@ -34,7 +34,7 @@
#define HASH_SIZE 67
static Timer *timers[HASH_SIZE];
-static Timer *free_timers = (Timer *)0;
+static Timer *free_timers = (Timer *)0;
static long mstimeout_cache = -1;
ClientData JunkClientData;
@@ -66,25 +66,25 @@ l_add(Timer *t)
if (t->time.tv_sec < t2->time.tv_sec || (t->time.tv_sec == t2->time.tv_sec && t->time.tv_usec <= t2->time.tv_usec)) {
/* The new timer goes at the head of the list. */
timers[h] = t;
- t->prev = (Timer *)0;
- t->next = t2;
- t2->prev = t;
+ t->prev = (Timer *)0;
+ t->next = t2;
+ t2->prev = t;
} else {
/* Walk the list to find the insertion point. */
for (t2prev = t2, t2 = t2->next; t2 != (Timer *)0; t2prev = t2, t2 = t2->next) {
if (t->time.tv_sec < t2->time.tv_sec || (t->time.tv_sec == t2->time.tv_sec && t->time.tv_usec <= t2->time.tv_usec)) {
/* Found it. */
t2prev->next = t;
- t->prev = t2prev;
- t->next = t2;
- t2->prev = t;
+ t->prev = t2prev;
+ t->next = t2;
+ t2->prev = t;
return;
}
}
/* Oops, got to the end of the list. Add to tail. */
t2prev->next = t;
- t->prev = t2prev;
- t->next = (Timer *)0;
+ t->prev = t2prev;
+ t->next = (Timer *)0;
}
}
}
@@ -119,7 +119,7 @@ tmr_init(void)
int h;
mstimeout_cache = -1;
- for (h = 0; h < HASH_SIZE; ++h)
+ for (h = 0; h < HASH_SIZE; ++h)
timers[h] = (Timer *)0;
}
@@ -129,7 +129,7 @@ tmr_create(struct timeval *nowP, TimerProc *timer_proc, ClientData client_data,
Timer *t;
if (free_timers != (Timer *)0) {
- t = free_timers;
+ t = free_timers;
free_timers = t->next;
} else {
t = (Timer *)malloc(sizeof(Timer));
@@ -138,10 +138,10 @@ tmr_create(struct timeval *nowP, TimerProc *timer_proc, ClientData client_data,
}
mstimeout_cache = -1;
- t->timer_proc = timer_proc;
- t->client_data = client_data;
- t->msecs = msecs;
- t->periodic = periodic;
+ t->timer_proc = timer_proc;
+ t->client_data = client_data;
+ t->msecs = msecs;
+ t->periodic = periodic;
if (nowP != (struct timeval *)0)
t->time = *nowP;
else
@@ -168,7 +168,7 @@ tmr_timeout(struct timeval *nowP)
msecs = tmr_mstimeout(nowP);
if (msecs == INFTIM)
return (struct timeval *)0;
- timeout.tv_sec = msecs / 1000L;
+ timeout.tv_sec = msecs / 1000L;
timeout.tv_usec = (msecs % 1000L) * 1000L;
return &timeout;
}
@@ -185,16 +185,16 @@ tmr_mstimeout(struct timeval *nowP)
Timer *t;
gotone = 0;
- msecs = 0; /* make lint happy */
- /* Since the lists are sorted, we only need to look at the
- ** first timer on each one.
- */
+ msecs = 0; /* make lint happy */
+ /* Since the lists are sorted, we only need to look at the
+ ** first timer on each one.
+ */
for (h = 0; h < HASH_SIZE; ++h) {
t = timers[h];
if (t != (Timer *)0) {
m = (t->time.tv_sec - nowP->tv_sec) * 1000L + (t->time.tv_usec - nowP->tv_usec) / 1000L;
if (!gotone) {
- msecs = m;
+ msecs = m;
gotone = 1;
} else if (m < msecs)
msecs = m;
@@ -203,7 +203,7 @@ tmr_mstimeout(struct timeval *nowP)
if (!gotone)
return INFTIM;
if (msecs <= 0)
- msecs = 0;
+ msecs = 0;
mstimeout_cache = msecs;
return msecs;
@@ -248,7 +248,7 @@ void
tmr_reset(struct timeval *nowP, Timer *t)
{
mstimeout_cache = -1;
- t->time = *nowP;
+ t->time = *nowP;
t->time.tv_sec += t->msecs / 1000L;
t->time.tv_usec += (t->msecs % 1000L) * 1000L;
if (t->time.tv_usec >= 1000000L) {
@@ -265,9 +265,9 @@ tmr_cancel(Timer *t)
/* Remove it from its active list. */
l_remove(t);
/* And put it on the free list. */
- t->next = free_timers;
+ t->next = free_timers;
free_timers = t;
- t->prev = (Timer *)0;
+ t->prev = (Timer *)0;
}
void
@@ -277,7 +277,7 @@ tmr_cleanup(void)
mstimeout_cache = -1;
while (free_timers != (Timer *)0) {
- t = free_timers;
+ t = free_timers;
free_timers = t->next;
free((void *)t);
}
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index 25bc6be..0017bd5 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -103,9 +103,9 @@
static AppVersionInfo appVersionInfo;
-static const char *hexdigits = "0123456789ABCDEFabcdef";
+static const char *hexdigits = "0123456789ABCDEFabcdef";
static const char *dontunescapify = "#;/?+=&:@%";
-static const char *dontescapify = "#;/?+=&:@~.-_%";
+static const char *dontescapify = "#;/?+=&:@~.-_%";
enum FTP_MODE {
FTP_NULL,
@@ -129,108 +129,108 @@ static int is_done();
static int open_server(unsigned short int port, accept_fn_t accept_fn);
static int accept_ftp_data(int sock);
-static char **defered_urls = NULL;
-static int n_defered_urls = 0;
-static int server_fd = 0;
-static int server_port = 0;
-static int proxy_port = 8080;
+static char **defered_urls = NULL;
+static int n_defered_urls = 0;
+static int server_fd = 0;
+static int server_port = 0;
+static int proxy_port = 8080;
static unsigned int proxy_addr = 0;
static unsigned int local_addr = 0;
-static char proxy_host[81] = "localhost";
+static char proxy_host[81] = "localhost";
static char local_host[255 + 1];
-static int verbose = 0;
-static int verbose_errors = 1;
-static int debug = 0;
-static int nclients = 100;
-static int current_clients = 0;
-static int client_speed = 0;
-static int check_content = 0;
-static int nocheck_length = 0;
-static int obey_redirects = 1;
-static int only_clients = 0;
-static int only_server = 0;
-static int drop_after_CL = 0;
-static int server_speed = 0;
-static int server_delay = 0;
-static int interval = 1;
-static int sbuffersize = SERVER_BUFSIZE;
-static int cbuffersize = CLIENT_BUFSIZE;
-static int test_time = 0;
-static int last_fd = -1;
+static int verbose = 0;
+static int verbose_errors = 1;
+static int debug = 0;
+static int nclients = 100;
+static int current_clients = 0;
+static int client_speed = 0;
+static int check_content = 0;
+static int nocheck_length = 0;
+static int obey_redirects = 1;
+static int only_clients = 0;
+static int only_server = 0;
+static int drop_after_CL = 0;
+static int server_speed = 0;
+static int server_delay = 0;
+static int interval = 1;
+static int sbuffersize = SERVER_BUFSIZE;
+static int cbuffersize = CLIENT_BUFSIZE;
+static int test_time = 0;
+static int last_fd = -1;
static char *response_buffer = NULL;
-static int errors = 0;
+static int errors = 0;
static int clients = 0, running_clients = 0, new_clients = 0, total_clients = 0;
static int servers = 0, running_servers = 0, new_servers = 0, total_servers = 0;
static float running_ops = 0;
-static int new_ops = 0;
-static float total_ops = 0;
+static int new_ops = 0;
+static float total_ops = 0;
static int running_sops = 0, new_sops = 0, total_sops = 0;
static int running_latency = 0, latency = 0;
static int lat_ops = 0, b1_ops = 0, running_b1latency = 0, b1latency = 0;
static uint64_t running_cbytes = 0, new_cbytes = 0, total_cbytes = 0;
static uint64_t running_tbytes = 0, new_tbytes = 0, total_tbytes = 0;
-static int average_over = 5;
-static double hitrate = 0.4;
-static int hotset = 1000;
-static int keepalive = 4;
-static int keepalive_cons = 4;
-static int follow_arg = 0;
-static int follow = 0;
+static int average_over = 5;
+static double hitrate = 0.4;
+static int hotset = 1000;
+static int keepalive = 4;
+static int keepalive_cons = 4;
+static int follow_arg = 0;
+static int follow = 0;
static int follow_same_arg = 0;
-static int follow_same = 0;
+static int follow_same = 0;
static char current_host[512];
-static int fullpage = 0;
-static int show_before = 0;
-static int show_headers = 0;
-static int server_keepalive = 4;
-static int urls_mode = 0;
-static int pipeline = 1;
-static int hostrequest = 0;
-static int ftp = 0;
-static double ftp_mdtm_err_rate = 0.0;
-static int ftp_mdtm_rate = 0;
+static int fullpage = 0;
+static int show_before = 0;
+static int show_headers = 0;
+static int server_keepalive = 4;
+static int urls_mode = 0;
+static int pipeline = 1;
+static int hostrequest = 0;
+static int ftp = 0;
+static double ftp_mdtm_err_rate = 0.0;
+static int ftp_mdtm_rate = 0;
static time_t ftp_mdtm_last_update = 0;
static char ftp_mdtm_str[64];
-static int embed_url = 1;
-static double ims_rate = 0.5;
+static int embed_url = 1;
+static double ims_rate = 0.5;
static double client_abort_rate = 0.0;
static double server_abort_rate = 0.0;
-static int compd_port = 0;
-static int compd_suite = 0;
+static int compd_port = 0;
+static int compd_suite = 0;
static int ka_cache_head[500];
static int ka_cache_tail[500];
-static int n_ka_cache = 0;
-static char urls_file[256] = "";
-static FILE *urls_fp = NULL;
-static char urlsdump_file[256] = "";
-static FILE *urlsdump_fp = NULL;
-static int drand_seed = 0;
-static int docsize = -1;
-static int url_hash_entries = 1000000;
-static char url_hash_filename[256] = "";
-static int bandwidth_test = 0;
-static int bandwidth_test_to_go = 0;
-static uint64_t total_client_request_bytes = 0;
-static uint64_t total_proxy_request_bytes = 0;
-static uint64_t total_server_response_body_bytes = 0;
+static int n_ka_cache = 0;
+static char urls_file[256] = "";
+static FILE *urls_fp = NULL;
+static char urlsdump_file[256] = "";
+static FILE *urlsdump_fp = NULL;
+static int drand_seed = 0;
+static int docsize = -1;
+static int url_hash_entries = 1000000;
+static char url_hash_filename[256] = "";
+static int bandwidth_test = 0;
+static int bandwidth_test_to_go = 0;
+static uint64_t total_client_request_bytes = 0;
+static uint64_t total_proxy_request_bytes = 0;
+static uint64_t total_server_response_body_bytes = 0;
static uint64_t total_server_response_header_bytes = 0;
-static uint64_t total_proxy_response_body_bytes = 0;
-static uint64_t total_proxy_response_header_bytes = 0;
+static uint64_t total_proxy_response_body_bytes = 0;
+static uint64_t total_proxy_response_header_bytes = 0;
static ink_hrtime now = 0, start_time = 0;
-static int extra_headers = 0;
-static int alternates = 0;
-static int abort_retry_speed = 0;
-static int abort_retry_bytes = 0;
-static int abort_retry_secs = 5;
-static int client_rate = 0;
-static double reload_rate = 0;
-static int vary_user_agent = 0;
+static int extra_headers = 0;
+static int alternates = 0;
+static int abort_retry_speed = 0;
+static int abort_retry_bytes = 0;
+static int abort_retry_secs = 5;
+static int client_rate = 0;
+static double reload_rate = 0;
+static int vary_user_agent = 0;
static int server_content_type = 0;
-static int request_extension = 0;
-static int no_cache = 0;
-static double evo_rate = 0.0;
-static double zipf = 0.0;
-static int zipf_bucket_size = 1;
+static int request_extension = 0;
+static int no_cache = 0;
+static double evo_rate = 0.0;
+static double zipf = 0.0;
+static int zipf_bucket_size = 1;
static const ArgumentDescription argument_descriptions[] = {
{"proxy_port", 'p', "Proxy Port", "I", &proxy_port, "JTEST_PROXY_PORT", NULL},
@@ -341,33 +341,33 @@ struct FD {
void
reset()
{
- next = 0;
- fd = -1;
- read_cb = NULL;
+ next = 0;
+ fd = -1;
+ read_cb = NULL;
write_cb = NULL;
- state = 0;
- start = 0;
- active = 0;
- ready = 0;
- req_pos = 0;
- length = 0;
+ state = 0;
+ start = 0;
+ active = 0;
+ ready = 0;
+ req_pos = 0;
+ length = 0;
if (!urls_mode)
response = NULL;
if (response_header)
response_header[0] = 0;
- response_length = 0;
- response_remaining = 0;
- count = NULL;
- bytes = 0;
- doc = 0.0;
- doc_length = 0;
- ims = 0;
- drop_after_CL = ::drop_after_CL;
- client_abort = 0;
- jg_compressed = 0;
- ftp_mode = FTP_NULL;
- ftp_peer_addr = 0;
- ftp_peer_port = 0;
+ response_length = 0;
+ response_remaining = 0;
+ count = NULL;
+ bytes = 0;
+ doc = 0.0;
+ doc_length = 0;
+ ims = 0;
+ drop_after_CL = ::drop_after_CL;
+ client_abort = 0;
+ jg_compressed = 0;
+ ftp_mode = FTP_NULL;
+ ftp_peer_addr = 0;
+ ftp_peer_port = 0;
}
void close();
@@ -389,7 +389,7 @@ FD::close()
if (is_done())
done();
keepalive = 0;
- ip = 0;
+ ip = 0;
if (count)
(*count)--;
if (count == &clients)
@@ -448,7 +448,7 @@ remove_last_seg(char *src, char *dest)
break;
while (src <= ptr)
*dest++ = *src++;
- *dest = '\0';
+ *dest = '\0';
}
static inline void
@@ -521,8 +521,8 @@ read_ready(int fd)
{
struct pollfd p;
p.events = POLLIN;
- p.fd = fd;
- int r = poll(&p, 1, 0);
+ p.fd = fd;
+ int r = poll(&p, 1, 0);
if (r <= 0)
return r;
if (p.revents & (POLLERR | POLLNVAL))
@@ -549,8 +549,8 @@ poll_set(int sock, poll_cb read_cb, poll_cb write_cb = NULL)
{
if (verbose)
printf("adding poll %d\n", sock);
- fd[sock].fd = sock;
- fd[sock].read_cb = read_cb;
+ fd[sock].fd = sock;
+ fd[sock].read_cb = read_cb;
fd[sock].write_cb = write_cb;
if (last_fd < sock)
last_fd = sock;
@@ -568,11 +568,11 @@ fast(int sock, int speed, int d)
{
if (!speed)
return 0;
- int64_t t = now - fd[sock].start + 1;
+ int64_t t = now - fd[sock].start + 1;
int target = (int)(((t / HRTIME_MSECOND) * speed) / 1000);
- int delta = d - target;
+ int delta = d - target;
if (delta > 0) {
- int mwait = (delta * 1000) / speed;
+ int mwait = (delta * 1000) / speed;
fd[sock].ready = now + (mwait * HRTIME_MSECOND);
return 1;
} else
@@ -593,9 +593,9 @@ faster_than(int sock, int speed, int d)
{
if (!speed)
return 1;
- int64_t t = now - fd[sock].start + 1;
+ int64_t t = now - fd[sock].start + 1;
int target = (int)(((t / HRTIME_MSECOND) * speed) / 1000);
- int delta = d - target;
+ int delta = d - target;
if (delta > 0)
return 1;
return 0;
@@ -605,7 +605,7 @@ static void
get_path_from_req(char *buf, char **purl_start, char **purl_end)
{
char *url_start = buf;
- char *url_end = NULL;
+ char *url_end = NULL;
if (!strncasecmp(url_start, "GET ", sizeof("GET ") - 1)) {
url_start += sizeof("GET ") - 1;
url_end = (char *)memchr(url_start, ' ', 70);
@@ -619,7 +619,7 @@ get_path_from_req(char *buf, char **purl_start, char **purl_end)
url_start = (char *)memchr(url_start, '/', 70);
}
*purl_start = url_start;
- *purl_end = url_end;
+ *purl_end = url_end;
}
static int
@@ -647,7 +647,7 @@ send_response(int sock)
if (!ftp && embed_url && fd[sock].response_length > 16) {
get_path_from_req(fd[sock].req_header, &url_start, &url_end);
*url_end = 0;
- url_len = url_end - url_start;
+ url_len = url_end - url_start;
}
int print_len = 0;
if (!ftp) {
@@ -751,7 +751,7 @@ static char *
strncasestr(char *s, const char *find, int len)
{
int findlen = strlen(find);
- char *e = s + len;
+ char *e = s + len;
while (1) {
char *x = (char *)memchr(s, *find, e - s);
if (!x) {
@@ -774,7 +774,7 @@ check_keepalive(char *r, int length)
{
char *ka = strncasestr(r, "Connection:", length);
if (ka) {
- int l = length - (ka - r);
+ int l = length - (ka - r);
char *e = (char *)memchr(ka, '\n', l);
if (!e)
e = (char *)memchr(ka, '\r', l);
@@ -795,7 +795,7 @@ check_alt(char *r, int length)
} else
s += sizeof("Cookie:");
if (s) {
- int l = length - (s - r);
+ int l = length - (s - r);
char *e = (char *)memchr(s, '\n', l);
if (!e)
e = (char *)memchr(s, '\r', l);
@@ -815,9 +815,9 @@ check_alt(char *r, int length)
static void
make_response(int sock, int code)
{
- fd[sock].response = fd[sock].req_header;
- fd[sock].length = sprintf(fd[sock].req_header, "%d\r\n", code);
- fd[sock].req_pos = 0;
+ fd[sock].response = fd[sock].req_header;
+ fd[sock].length = sprintf(fd[sock].req_header, "%d\r\n", code);
+ fd[sock].req_pos = 0;
fd[sock].response_length = strlen(fd[sock].req_header);
poll_set(sock, NULL, write_ftp_response);
}
@@ -825,8 +825,8 @@ make_response(int sock, int code)
static void
make_long_response(int sock)
{
- fd[sock].response = fd[sock].req_header;
- fd[sock].req_pos = 0;
+ fd[sock].response = fd[sock].req_header;
+ fd[sock].req_pos = 0;
fd[sock].response_length = strlen(fd[sock].req_header);
poll_set(sock, NULL, write_ftp_response);
}
@@ -835,12 +835,12 @@ static int
send_ftp_data_when_ready(int sock)
{
if (fd[sock].state == STATE_FTP_DATA_READY && fd[sock].doc_length) {
- fd[sock].response = fd[sock].req_header;
+ fd[sock].response = fd[sock].req_header;
fd[sock].response_length = fd[sock].length = fd[sock].doc_length;
if (verbose)
printf("ftp data %d >-< %d\n", sock, fd[sock].ftp_data_fd);
fd[sock].response = response_buffer + fd[sock].doc_length % 256;
- fd[sock].req_pos = 0;
+ fd[sock].req_pos = 0;
poll_set(sock, NULL, send_response);
}
return 0;
@@ -888,7 +888,7 @@ read_request(int sock)
new_tbytes += err;
fd[sock].req_pos += err;
fd[sock].req_header[fd[sock].req_pos] = 0;
- char *buffer = fd[sock].req_header;
+ char *buffer = fd[sock].req_header;
for (i = fd[sock].req_pos - err; i < fd[sock].req_pos; i++) {
switch (fd[sock].state) {
case 0:
@@ -933,17 +933,17 @@ read_request(int sock)
char *ims = strncasestr(buffer, "If-Modified-Since:", i);
// coverity[dont_call]
if (drand48() > ims_rate)
- ims = NULL;
+ ims = NULL;
fd[sock].ims = ims ? 1 : 0;
if (!ims) {
fd[sock].response_length = fd[sock].length = length;
- fd[sock].nalternate = check_alt(fd[sock].req_header, strlen(fd[sock].req_header));
- fd[sock].response = response_buffer + length % 256 + fd[sock].nalternate;
+ fd[sock].nalternate = check_alt(fd[sock].req_header, strlen(fd[sock].req_header));
+ fd[sock].response = response_buffer + length % 256 + fd[sock].nalternate;
} else {
fd[sock].nalternate = 0;
if (verbose)
printf("sending IMS 304: Not-Modified\n");
- fd[sock].response = NULL;
+ fd[sock].response = NULL;
fd[sock].response_length = fd[sock].length = 0;
}
fd[sock].req_pos = 0;
@@ -954,7 +954,7 @@ read_request(int sock)
// coverity[dont_call]
if (fd[sock].length && drand48() < server_abort_rate) {
// coverity[dont_call]
- fd[sock].length = (int)(drand48() * (fd[sock].length - 1));
+ fd[sock].length = (int)(drand48() * (fd[sock].length - 1));
fd[sock].keepalive = 0;
}
poll_set(sock, NULL, send_response);
@@ -979,7 +979,7 @@ send_compd_response(int sock)
} compd_header;
if (fd[sock].req_pos < (int)sizeof(compd_header)) {
compd_header.code = 0;
- compd_header.len = htonl((fd[sock].length * 2) / 3);
+ compd_header.len = htonl((fd[sock].length * 2) / 3);
do {
err = write(sock, (char *)&compd_header + fd[sock].req_pos, sizeof(compd_header) - fd[sock].req_pos);
} while ((err == -1) && (errno == EINTR));
@@ -1112,7 +1112,7 @@ read_compd_request(int sock)
return 0;
Lcont:
- fd[sock].req_pos = 0;
+ fd[sock].req_pos = 0;
fd[sock].keepalive = 0;
poll_set(sock, NULL, send_compd_response);
return 0;
@@ -1147,9 +1147,9 @@ read_ftp_request(int sock)
new_tbytes += err;
fd[sock].req_pos += err;
fd[sock].req_header[fd[sock].req_pos] = 0;
- char *buffer = fd[sock].req_header, *n;
- int res = 0;
- buffer[fd[sock].req_pos] = 0;
+ char *buffer = fd[sock].req_header, *n;
+ int res = 0;
+ buffer[fd[sock].req_pos] = 0;
if (verbose)
printf("buffer [%s]\n", buffer);
#define STREQ(_x, _s) (!strncasecmp(_x, _s, sizeof(_s) - 1))
@@ -1163,7 +1163,7 @@ read_ftp_request(int sock)
// TS used to send "CWD 1.2110000000..."
// TS now sends "CWD /1.2110000000^M\n", so skip 5 instead of 4
fd[sock].doc = (buffer[4] == '/') ? atof(buffer + 5) : atof(buffer + 4);
- res = 250;
+ res = 250;
goto Lhere;
} else if (STREQ(buffer, "TYPE")) {
res = 200;
@@ -1193,7 +1193,7 @@ read_ftp_request(int sock)
if (mdtm_now - ftp_mdtm_last_update > ftp_mdtm_rate) {
struct tm *mdtm_tm;
ftp_mdtm_last_update = mdtm_now;
- mdtm_tm = localtime(&ftp_mdtm_last_update);
+ mdtm_tm = localtime(&ftp_mdtm_last_update);
sprintf(ftp_mdtm_str, "213 %.4d%.2d%.2d%.2d%.2d%.2d", mdtm_tm->tm_year + 1900, mdtm_tm->tm_mon + 1, mdtm_tm->tm_mday,
mdtm_tm->tm_hour, mdtm_tm->tm_min, mdtm_tm->tm_sec);
}
@@ -1212,7 +1212,7 @@ read_ftp_request(int sock)
if (verbose)
printf("ftp PASV %d <-> %d\n", sock, fd[sock].ftp_data_fd);
unsigned short p = fd[fd[sock].ftp_data_fd].name.sin_port;
- fd[sock].length = sprintf(fd[sock].req_header, "227 (%u,%u,%u,%u,%u,%u)\r\n", ((unsigned char *)&local_addr)[0],
+ fd[sock].length = sprintf(fd[sock].req_header, "227 (%u,%u,%u,%u,%u,%u)\r\n", ((unsigned char *)&local_addr)[0],
((unsigned char *)&local_addr)[1], ((unsigned char *)&local_addr)[2],
((unsigned char *)&local_addr)[3], ((unsigned char *)&p)[0], ((unsigned char *)&p)[1]);
if (verbose)
@@ -1233,9 +1233,9 @@ read_ftp_request(int sock)
;
}
((unsigned char *)&(fd[sock].ftp_peer_port))[0] = strtol(start, &stop, 10);
- start = ++stop;
+ start = ++stop;
((unsigned char *)&(fd[sock].ftp_peer_port))[1] = strtol(start, NULL, 10);
- fd[sock].length = sprintf(fd[sock].req_header, "200 Okay\r\n");
+ fd[sock].length = sprintf(fd[sock].req_header, "200 Okay\r\n");
if (verbose)
puts(fd[sock].req_header);
make_long_response(sock);
@@ -1258,13 +1258,13 @@ read_ftp_request(int sock)
}
fd[sock].ftp_peer_addr = ftp_peer.sin_addr.s_addr;
fd[sock].ftp_peer_port = ftp_peer.sin_port;
- fd[sock].ftp_mode = FTP_PORT;
+ fd[sock].ftp_mode = FTP_PORT;
}
if (fd[sock].ftp_mode == FTP_PORT) {
if ((fd[sock].ftp_data_fd = make_client(fd[sock].ftp_peer_addr, fd[sock].ftp_peer_port)) < 0)
panic("could not open ftp PORT data connection to client\n");
fd[fd[sock].ftp_data_fd].ftp_data_fd = sock;
- fd[fd[sock].ftp_data_fd].state = STATE_FTP_DATA_READY;
+ fd[fd[sock].ftp_data_fd].state = STATE_FTP_DATA_READY;
if (verbose)
printf("ftp PORT %d <-> %d\n", sock, fd[sock].ftp_data_fd);
}
@@ -1278,9 +1278,9 @@ read_ftp_request(int sock)
printf("badly formed ftp request: %s\n", buffer);
return 1;
}
- fd[sock].response = fd[sock].req_header;
- fd[sock].length = sprintf(fd[sock].req_header, "150 %d bytes\r\n", fd[fd[sock].ftp_data_fd].length);
- fd[sock].req_pos = 0;
+ fd[sock].response = fd[sock].req_header;
+ fd[sock].length = sprintf(fd[sock].req_header, "150 %d bytes\r\n", fd[fd[sock].ftp_data_fd].length);
+ fd[sock].req_pos = 0;
fd[sock].response_length = strlen(fd[sock].req_header);
poll_set(sock, NULL, write_ftp_response);
return 0;
@@ -1297,7 +1297,7 @@ static int
accept_sock(int sock)
{
struct sockaddr_in clientname;
- int size = sizeof(clientname);
+ int size = sizeof(clientname);
int new_fd = 0;
do {
new_fd = accept(sock, (struct sockaddr *)&clientname,
@@ -1353,9 +1353,9 @@ accept_compd(int sock)
servers++;
new_servers++;
poll_init_set(new_fd, NULL, read_compd_request);
- fd[new_fd].count = &servers;
- fd[new_fd].start = now;
- fd[new_fd].ready = now + server_delay * HRTIME_MSECOND;
+ fd[new_fd].count = &servers;
+ fd[new_fd].start = now;
+ fd[new_fd].ready = now + server_delay * HRTIME_MSECOND;
fd[new_fd].keepalive = server_keepalive ? server_keepalive : INT_MAX;
return 0;
@@ -1372,9 +1372,9 @@ accept_read(int sock)
make_response(new_fd, 220);
} else
poll_init_set(new_fd, read_request);
- fd[new_fd].count = &servers;
- fd[new_fd].start = now;
- fd[new_fd].ready = now + server_delay * HRTIME_MSECOND;
+ fd[new_fd].count = &servers;
+ fd[new_fd].start = now;
+ fd[new_fd].ready = now + server_delay * HRTIME_MSECOND;
fd[new_fd].keepalive = server_keepalive ? server_keepalive : INT_MAX;
return 0;
@@ -1387,16 +1387,16 @@ accept_ftp_data(int sock)
servers++;
new_servers++;
poll_init(new_fd);
- fd[new_fd].ftp_data_fd = fd[sock].ftp_data_fd;
+ fd[new_fd].ftp_data_fd = fd[sock].ftp_data_fd;
fd[fd[sock].ftp_data_fd].ftp_data_fd = new_fd;
- fd[new_fd].state = STATE_FTP_DATA_READY;
- fd[new_fd].count = &servers;
- fd[new_fd].start = now;
- fd[new_fd].ready = now + server_delay * HRTIME_MSECOND;
- fd[new_fd].keepalive = server_keepalive ? server_keepalive : INT_MAX;
- fd[new_fd].state = STATE_FTP_DATA_READY;
- fd[new_fd].doc = fd[sock].doc;
- fd[new_fd].doc_length = fd[sock].doc_length;
+ fd[new_fd].state = STATE_FTP_DATA_READY;
+ fd[new_fd].count = &servers;
+ fd[new_fd].start = now;
+ fd[new_fd].ready = now + server_delay * HRTIME_MSECOND;
+ fd[new_fd].keepalive = server_keepalive ? server_keepalive : INT_MAX;
+ fd[new_fd].state = STATE_FTP_DATA_READY;
+ fd[new_fd].doc = fd[sock].doc;
+ fd[new_fd].doc_length = fd[sock].doc_length;
if (verbose)
printf("accept_ftp_data %d for %d\n", new_fd, sock);
send_ftp_data_when_ready(new_fd);
@@ -1420,8 +1420,8 @@ open_server(unsigned short int port, accept_fn_t accept_fn)
struct sockaddr_in &name = fd[sock].name;
/* Give the socket a name. */
- name.sin_family = AF_INET;
- name.sin_port = htons(port);
+ name.sin_family = AF_INET;
+ name.sin_port = htons(port);
name.sin_addr.s_addr = htonl(INADDR_ANY);
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one)) < 0) {
perror((char *)"setsockopt");
@@ -1450,7 +1450,7 @@ open_server(unsigned short int port, accept_fn_t accept_fn)
ink_assert(addrlen);
/* Tell the socket not to linger on exit */
- lngr.l_onoff = 0;
+ lngr.l_onoff = 0;
lngr.l_linger = 0;
if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&lngr, sizeof(struct linger)) < 0) {
perror("setsockopt");
@@ -1486,11 +1486,11 @@ poll_loop()
}
pollfd pfd[POLL_GROUP_SIZE];
int ip = 0;
- now = ink_get_hrtime_internal();
+ now = ink_get_hrtime_internal();
for (int i = 0; i <= last_fd; i++) {
if (fd[i].fd > 0 && (!fd[i].ready || now >= fd[i].ready)) {
- pfd[ip].fd = i;
- pfd[ip].events = 0;
+ pfd[ip].fd = i;
+ pfd[ip].events = 0;
pfd[ip].revents = 0;
if (fd[i].read_cb)
pfd[ip].events |= POLLIN;
@@ -1532,7 +1532,7 @@ gen_bfc_dist(double f = 10.0)
if (docsize >= 0)
return docsize;
- double rand = 0.0;
+ double rand = 0.0;
double rand2 = 0.0;
bool f_given = f < 9.0;
if (!f_given) {
@@ -1541,7 +1541,7 @@ gen_bfc_dist(double f = 10.0)
// coverity[dont_call]
rand2 = drand48();
} else {
- rand = f;
+ rand = f;
rand2 = (f * 13.0) - floor(f * 13.0);
}
@@ -1585,7 +1585,7 @@ gen_bfc_dist(double f = 10.0)
size = size * 10;
}
int increment = size;
- size = size * (file_no + 1);
+ size = size * (file_no + 1);
// vary about the mean doc size for
// that class/size
if (!f_given)
@@ -1599,9 +1599,9 @@ gen_bfc_dist(double f = 10.0)
static void
build_response()
{
- int maxsize = docsize > MAX_RESPONSE_LENGTH ? docsize : MAX_RESPONSE_LENGTH;
+ int maxsize = docsize > MAX_RESPONSE_LENGTH ? docsize : MAX_RESPONSE_LENGTH;
response_buffer = (char *)malloc(maxsize + HEADER_SIZE);
- for (int i = 0; i < maxsize + HEADER_SIZE; i++)
+ for (int i = 0; i < maxsize + HEADER_SIZE; i++)
response_buffer[i] = i % 256;
}
@@ -1618,7 +1618,7 @@ Lpush:
fd[ka_cache_tail[i]].next = sock;
else
ka_cache_head[i] = sock;
- ka_cache_tail[i] = sock;
+ ka_cache_tail[i] = sock;
}
static int
@@ -1626,7 +1626,7 @@ get_ka(unsigned int ip)
{
for (int i = 0; i < n_ka_cache; i++)
if (fd[ka_cache_head[i]].ip == ip) {
- int res = ka_cache_head[i];
+ int res = ka_cache_head[i];
ka_cache_head[i] = fd[ka_cache_head[i]].next;
if (res == ka_cache_tail[i]) {
ink_assert(!ka_cache_head[i]);
@@ -1694,7 +1694,7 @@ init_client(int sock)
static unsigned int
get_addr(const char *host)
{
- unsigned int addr = inet_addr(host);
+ unsigned int addr = inet_addr(host);
struct hostent *host_info = NULL;
if (!addr || (-1 == (int)addr)) {
@@ -1751,7 +1751,7 @@ find_href_start(const char *tag, char *base, int len)
return NULL;
char *start = base;
- char *end = base + len;
+ char *end = base + len;
Lagain : {
start = strncasestr(start, tag, len);
@@ -1823,7 +1823,7 @@ compose_all_urls(const char *tag, char *buf, char *start, char *end, int buflen,
end = start + strlen(tag);
continue;
}
- old = *end;
+ old = *end;
*end = 0;
compose_url(newurl, base_url, start);
make_url_client(newurl, base_url);
@@ -1839,7 +1839,7 @@ extract_urls(char *buf, int buflen, char *base_url)
{
// if (verbose) printf("EXTRACT<<%s\n>>", buf);
char *start = NULL;
- char *end = NULL;
+ char *end = NULL;
char old_base[512];
strcpy(old_base, base_url);
@@ -1897,7 +1897,7 @@ follow_links(int sock)
if (urls_mode) {
if (fd[sock].binary)
return;
- int l = fd[sock].response_remaining;
+ int l = fd[sock].response_remaining;
char *r = fd[sock].response, *p = r, *n = r;
if (r)
extract_urls(r, l, fd[sock].base_url);
@@ -1924,8 +1924,8 @@ verify_content(int sock, char *buf, int done)
{
if (urls_mode && !check_content)
return 1;
- int l = fd[sock].response_length;
- char *d = response_buffer + (l % 256) + fd[sock].nalternate;
+ int l = fd[sock].response_length;
+ char *d = response_buffer + (l % 256) + fd[sock].nalternate;
int left = fd[sock].length;
if (left > 0) {
if (embed_url && !fd[sock].jg_compressed) {
@@ -1964,12 +1964,12 @@ static void
build_zipf()
{
zipf_table = (double *)malloc(ZIPF_SIZE * sizeof(double));
- for (int i = 0; i < ZIPF_SIZE; i++)
+ for (int i = 0; i < ZIPF_SIZE; i++)
zipf_table[i] = 1.0 / pow(i + 2, zipf);
- for (int i = 1; i < ZIPF_SIZE; i++)
+ for (int i = 1; i < ZIPF_SIZE; i++)
zipf_table[i] = zipf_table[i - 1] + zipf_table[i];
- double x = zipf_table[ZIPF_SIZE - 1];
- for (int i = 0; i < ZIPF_SIZE; i++)
+ double x = zipf_table[ZIPF_SIZE - 1];
+ for (int i = 0; i < ZIPF_SIZE; i++)
zipf_table[i] = zipf_table[i] / x;
}
@@ -2053,10 +2053,10 @@ read_response(int sock)
fd[sock].req_pos += err;
fd[sock].bytes += err;
fd[sock].active = ink_get_hrtime_internal();
- int total_read = fd[sock].req_pos;
- char *p = fd[sock].req_header;
- char *cl = NULL;
- int cli = 0;
+ int total_read = fd[sock].req_pos;
+ char *p = fd[sock].req_header;
+ char *cl = NULL;
+ int cli = 0;
while ((p = strchr(p, '\n'))) {
if (verbose)
printf("read header end? [%s]\n", p);
@@ -2065,15 +2065,15 @@ read_response(int sock)
p += off;
strncpy(fd[sock].response_header, fd[sock].req_header, p - fd[sock].req_header);
fd[sock].response_header[p - fd[sock].req_header] = '\0';
- int lbody = fd[sock].req_pos - (p - fd[sock].req_header);
+ int lbody = fd[sock].req_pos - (p - fd[sock].req_header);
cl = strncasestr(fd[sock].req_header, "Content-Length:", p - fd[sock].req_header);
if (cl) {
- cli = atoi(cl + 16);
+ cli = atoi(cl + 16);
int expected_length = fd[sock].response_length;
if (compd_suite) {
if (strstr(fd[sock].req_header, "x-jg")) {
fd[sock].jg_compressed = 1;
- expected_length = (fd[sock].response_length * 2) / 3;
+ expected_length = (fd[sock].response_length * 2) / 3;
}
}
if (fd[sock].response_length && verbose_errors && expected_length != cli && !nocheck_length)
@@ -2095,8 +2095,8 @@ read_response(int sock)
if (fd[sock].length && drand48() < client_abort_rate) {
fd[sock].client_abort = 1;
// coverity[dont_call]
- fd[sock].length = (int)(drand48() * (fd[sock].length - 1));
- fd[sock].keepalive = 0;
+ fd[sock].length = (int)(drand48() * (fd[sock].length - 1));
+ fd[sock].keepalive = 0;
fd[sock].drop_after_CL = 1;
}
if (verbose)
@@ -2117,7 +2117,7 @@ read_response(int sock)
if (obey_redirects && urls_mode && fd[sock].req_header[9] == '3' && fd[sock].req_header[10] == '0' &&
(fd[sock].req_header[11] == '1' || fd[sock].req_header[11] == '2')) {
char *redirect = strstr(fd[sock].req_header, "http://");
- char *e = redirect ? (char *)memchr(redirect, '\n', hlen) : 0;
+ char *e = redirect ? (char *)memchr(redirect, '\n', hlen) : 0;
if (!redirect || !e)
fprintf(stderr, "bad redirect '%s'", fd[sock].req_header);
else {
@@ -2146,9 +2146,9 @@ read_response(int sock)
}
return read_response_error(sock);
}
- char *r = fd[sock].req_header;
+ char *r = fd[sock].req_header;
int length = p - r;
- char *ka = check_keepalive(r, length);
+ char *ka = check_keepalive(r, length);
if (urls_mode) {
fd[sock].response_remaining = total_read - length;
if (fd[sock].response_remaining)
@@ -2181,8 +2181,8 @@ read_response(int sock)
if (!toread) {
if (verbose_errors || verbose)
fprintf(stderr, "line exceeds buffer, unable to follow links\n");
- toread = cbuffersize;
- r = fd[sock].response;
+ toread = cbuffersize;
+ r = fd[sock].response;
fd[sock].response_remaining = 0;
} else
r = fd[sock].response + fd[sock].response_remaining;
@@ -2194,7 +2194,7 @@ read_response(int sock)
if (fd[sock].bytes > abort_retry_bytes && (((now - fd[sock].start + 1) / HRTIME_SECOND) > abort_retry_secs) &&
!faster_than(sock, abort_retry_speed, fd[sock].bytes)) {
fd[sock].client_abort = 1;
- fd[sock].keepalive = 0;
+ fd[sock].keepalive = 0;
if (!urls_mode && !client_rate)
make_bfc_client(proxy_addr, proxy_port);
goto Ldone;
@@ -2296,7 +2296,7 @@ write_request(int sock)
if (verbose)
printf("write complete %d %d\n", sock, fd[sock].length);
fd[sock].req_pos = 0;
- fd[sock].length = fd[sock].response_length;
+ fd[sock].length = fd[sock].response_length;
poll_set(sock, read_response);
}
return 0;
@@ -2344,7 +2344,7 @@ write_ftp_response(int sock)
if (verbose)
printf("write complete %d %d\n", sock, fd[sock].length);
fd[sock].req_pos = 0;
- fd[sock].length = fd[sock].response_length;
+ fd[sock].length = fd[sock].response_length;
poll_set(sock, read_ftp_request);
}
return 0;
@@ -2381,7 +2381,7 @@ make_client(unsigned int addr, int port)
panic_perror("setsockopt");
/* Tell the socket not to linger on exit */
- lngr.l_onoff = 1;
+ lngr.l_onoff = 1;
lngr.l_linger = 0;
if (!ftp) { // this causes problems for PORT ftp -- ewong
if (setsockopt(sock, SOL_SOCKET, SO_LINGER, (char *)&lngr, sizeof(struct linger)) < 0) {
@@ -2393,8 +2393,8 @@ make_client(unsigned int addr, int port)
/* Give the socket a name. */
struct sockaddr_in name;
memset(&name, 0, sizeof(sockaddr_in));
- name.sin_family = AF_INET;
- name.sin_port = htons(port);
+ name.sin_family = AF_INET;
+ name.sin_port = htons(port);
name.sin_addr.s_addr = addr;
if (verbose)
@@ -2430,7 +2430,7 @@ make_bfc_client(unsigned int addr, int port)
if (keepalive)
sock = get_ka(addr);
if (sock < 0) {
- sock = make_client(addr, port);
+ sock = make_client(addr, port);
fd[sock].keepalive = keepalive;
} else {
init_client(sock);
@@ -2445,7 +2445,7 @@ make_bfc_client(unsigned int addr, int port)
double dr = drand48();
if (zipf == 0.0) {
if (h < hitrate) {
- dr = 1.0 + (floor(dr * hotset) / hotset);
+ dr = 1.0 + (floor(dr * hotset) / hotset);
fd[sock].response_length = gen_bfc_dist(dr - 1.0);
} else
fd[sock].response_length = gen_bfc_dist(dr);
@@ -2453,16 +2453,16 @@ make_bfc_client(unsigned int addr, int port)
unsigned long long int doc = get_zipf(dr);
// Some large randomish number.
unsigned long long int doc_len_int = doc * 0x14A4D0FB0E93E3A7LL;
- unsigned long int x = doc_len_int;
- double y = (double)x;
+ unsigned long int x = doc_len_int;
+ double y = (double)x;
y /= 0x100000000LL; // deterministic random number between 0 and 1.0
fd[sock].response_length = gen_bfc_dist(y);
- dr = doc;
+ dr = doc;
}
if (verbose)
printf("gen_bfc_dist %d\n", fd[sock].response_length);
char eheaders[16384];
- *eheaders = 0;
+ *eheaders = 0;
int nheaders = extra_headers;
if (nheaders > 0) {
char *eh = eheaders;
@@ -2551,8 +2551,8 @@ make_bfc_client(unsigned int addr, int port)
printf("request %d [%s]\n", sock, fd[sock].req_header);
fd[sock].length = strlen(fd[sock].req_header);
{
- char *s = fd[sock].req_header;
- char *e = (char *)memchr(s, '\r', 512);
+ char *s = fd[sock].req_header;
+ char *e = (char *)memchr(s, '\r', 512);
char *url = fd[sock].base_url;
memcpy(url, s, e - s);
url[e - s] = 0;
@@ -2563,10 +2563,10 @@ make_bfc_client(unsigned int addr, int port)
printf("Request to Proxy: {\n%s}\n", fd[sock].req_header);
}
-#define RUNNING(_n) \
- total_##_n = (((total_##_n * (average_over - 1)) / average_over) + new_##_n); \
- running_##_n = total_##_n / average_over; \
- new_##_n = 0;
+#define RUNNING(_n) \
+ total_##_n = (((total_##_n * (average_over - 1)) / average_over) + new_##_n); \
+ running_##_n = total_##_n / average_over; \
+ new_##_n = 0;
#define RUNNING_AVG(_t, _n, _o) \
_t = _o ? ((_t * (average_over - 1) + _n / _o) / average_over) : _t; \
@@ -2576,7 +2576,7 @@ void
interval_report()
{
static int here = 0;
- now = ink_get_hrtime_internal();
+ now = ink_get_hrtime_internal();
if (!(here++ % 20))
printf(" con new ops 1B lat bytes/per svrs new ops total time err\n");
RUNNING(clients);
@@ -2589,7 +2589,7 @@ interval_report()
RUNNING(servers);
RUNNING(sops);
RUNNING(tbytes);
- float t = (float)(now - start_time);
+ float t = (float)(now - start_time);
uint64_t per = current_clients ? running_cbytes / current_clients : 0;
printf("%4d %4d %7.1f %4d %4d %10" PRIu64 "/%-6" PRIu64 " %4d %4d %4d %9" PRIu64 " %6.1f %4d\n",
current_clients, // clients, n_ka_cache,
@@ -2627,7 +2627,7 @@ interval_report()
#define BEGIN_HASH_LOOP \
unsigned int bucket = (i % BUCKETS); \
- unsigned int tag = MASK_TAG((unsigned int)(i / BUCKETS)); \
+ unsigned int tag = MASK_TAG((unsigned int)(i / BUCKETS)); \
if (!tag) \
tag++; \
unsigned char *base = bytes + bucket * BYTES_PER_BUCKET; \
@@ -2745,7 +2745,7 @@ UrlHashTable::UrlHashTable() : numbytes(0), bytes(NULL), fd(-1)
if (url_hash_entries > 0) {
// if they specify the number of entries round it up
url_hash_entries = (url_hash_entries + ENTRIES_PER_BUCKET - 1) & ~(ENTRIES_PER_BUCKET - 1);
- numbytes = URL_HASH_BYTES;
+ numbytes = URL_HASH_BYTES;
// ensure it is either a new file or the correct size
if (len != 0 && len != numbytes)
@@ -2797,7 +2797,7 @@ seen_it(char *url)
unsigned char md5[16];
uint64_t i[2];
} u;
- int l = 0;
+ int l = 0;
char *para = strrchr(url, '#');
if (para)
l = para - url;
@@ -2819,7 +2819,7 @@ seen_it(char *url)
static int
make_url_client(const char *url, const char *base_url, bool seen, bool unthrottled)
{
- int iport = 80;
+ int iport = 80;
unsigned int ip = 0;
char curl[512];
char sche[8], host[512], port[10], path[512], frag[512], quer[512], para[512];
@@ -2851,7 +2851,7 @@ make_url_client(const char *url, const char *base_url, bool seen, bool unthrottl
}
if (proxy_port) {
iport = proxy_port;
- ip = proxy_addr;
+ ip = proxy_addr;
} else {
if (xport)
iport = atoi(port);
@@ -2871,7 +2871,7 @@ make_url_client(const char *url, const char *base_url, bool seen, bool unthrottl
if (keepalive)
sock = get_ka(ip);
if (sock < 0) {
- sock = make_client(ip, iport);
+ sock = make_client(ip, iport);
fd[sock].keepalive = keepalive;
} else {
init_client(sock);
@@ -2881,7 +2881,7 @@ make_url_client(const char *url, const char *base_url, bool seen, bool unthrottl
if (sock < 0)
panic("cannot make client\n");
char eheaders[16384];
- *eheaders = 0;
+ *eheaders = 0;
int nheaders = extra_headers;
memset(&eheaders, 0, 16384);
if (nheaders > 0) {
@@ -2938,7 +2938,7 @@ make_url_client(const char *url, const char *base_url, bool seen, bool unthrottl
}
fd[sock].response_length = 0;
- fd[sock].length = strlen(fd[sock].req_header);
+ fd[sock].length = strlen(fd[sock].req_header);
if (!fd[sock].response)
fd[sock].response = (char *)malloc(MAX_BUFSIZE);
strcpy(fd[sock].base_url, curl);
@@ -2989,7 +2989,7 @@ main(int argc __attribute__((unused)), const char *argv[])
start_time = now = ink_get_hrtime_internal();
urls_mode = n_file_arguments || *urls_file;
- nclients = client_rate ? 0 : nclients;
+ nclients = client_rate ? 0 : nclients;
if (!local_host[0]) {
if (gethostname(local_host, sizeof(local_host)) != 0) {
@@ -3037,9 +3037,9 @@ main(int argc __attribute__((unused)), const char *argv[])
} else {
if (check_content)
build_response();
- follow = follow_arg;
- follow_same = follow_same_arg;
- uniq_urls = new UrlHashTable;
+ follow = follow_arg;
+ follow_same = follow_same_arg;
+ uniq_urls = new UrlHashTable;
defered_urls = (char **)malloc(sizeof(char *) * MAX_DEFERED_URLS);
average_over = 1;
if (*urlsdump_file) {
@@ -3070,9 +3070,9 @@ main(int argc __attribute__((unused)), const char *argv[])
}
}
- int t = now / HRTIME_SECOND;
+ int t = now / HRTIME_SECOND;
int tclient = now / HRTIME_SECOND;
- int start = now / HRTIME_SECOND;
+ int start = now / HRTIME_SECOND;
while (1) {
if (poll_loop())
break;
@@ -3167,9 +3167,9 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
*/
{
const char *start = src_url;
- int len = strlen(src_url);
- const char *end = start + len;
- const char *ptr = start;
+ int len = strlen(src_url);
+ const char *end = start + len;
+ const char *ptr = start;
const char *ptr2, *temp, *temp2;
const char *sche1, *sche2;
const char *host1, *host2;
@@ -3187,16 +3187,16 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
frag_exists = quer_exists = para_exists = 0;
sche1 = sche2 = host1 = host2 = port1 = port2 = NULL;
path1 = path2 = frag1 = frag2 = quer1 = quer2 = para1 = para2 = NULL;
- leading_slash = 0;
+ leading_slash = 0;
temp2 = ptr;
/* strip fragments "#" off the end */
while (ptr < end) {
if (*ptr == '#') {
- frag1 = ptr + 1;
- frag2 = end;
+ frag1 = ptr + 1;
+ frag2 = end;
frag_exists = 1;
- end = ptr;
+ end = ptr;
}
ptr++;
}
@@ -3204,7 +3204,7 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
/* decide if there is a sche, i.e. if it's an absolute url */
/* find end of sche */
- fail = false;
+ fail = false;
temp2 = ptr;
while ((ptr < end) && !fail) {
if (*ptr == ':') {
@@ -3212,10 +3212,10 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
sche2 = ptr;
ptr++; /* to continue to parse, skip the : */
sche_exists = 1;
- fail = true;
+ fail = true;
} else if ((!ParseRules::is_alpha(*ptr) && (*ptr != '+') && (*ptr != '.') && (*ptr != '-')) || (ptr == end)) {
sche_exists = 0;
- fail = true;
+ fail = true;
} else {
ptr++;
}
@@ -3224,7 +3224,7 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
ptr = temp2;
/* find start of host */
- fail = false;
+ fail = false;
temp2 = ptr;
while ((ptr < end - 1) && !fail) {
if (*(ptr + 0) == '/') {
@@ -3232,11 +3232,11 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
host1 = ptr + 2;
ptr += 2; /* skip "//" */
host_exists = 1;
- fail = true;
+ fail = true;
} else {
/* this is the start of a path, not a host */
host_exists = 0;
- fail = true;
+ fail = true;
}
} else {
ptr++;
@@ -3269,9 +3269,9 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
temp = host2;
while (ptr2 < temp) {
if (*ptr2 == ':') {
- port1 = ptr2 + 1;
- port2 = temp;
- host2 = ptr2;
+ port1 = ptr2 + 1;
+ port2 = temp;
+ host2 = ptr2;
port_exists = 1;
}
ptr2++;
@@ -3285,10 +3285,10 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
/* strip query "?" off the end */
while (ptr < end) {
if (*ptr == '?') {
- quer1 = ptr + 1;
- quer2 = end;
+ quer1 = ptr + 1;
+ quer2 = end;
quer_exists = 1;
- end = ptr;
+ end = ptr;
}
ptr++;
}
@@ -3298,10 +3298,10 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
/* strip parameters ";" off the end */
while (ptr < end) {
if (*ptr == ';') {
- para1 = ptr + 1;
- para2 = end;
+ para1 = ptr + 1;
+ para2 = end;
para_exists = 1;
- end = ptr;
+ end = ptr;
}
ptr++;
}
@@ -3312,17 +3312,17 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
if (ptr < end) {
if (*ptr == '/') {
leading_slash = 1;
- path1 = ptr + 1;
- path2 = end;
- path_exists = 1;
+ path1 = ptr + 1;
+ path2 = end;
+ path_exists = 1;
} else {
- path1 = ptr;
- path2 = end;
+ path1 = ptr;
+ path2 = end;
path_exists = 1;
}
} else {
- path1 = end;
- path2 = end;
+ path1 = end;
+ path2 = end;
path_exists = 0;
}
@@ -3430,13 +3430,13 @@ ink_web_decompose_url(const char *src_url, char *sche, char *host, char *port, c
*para = 0;
}
}
- *real_sche_exists = sche_exists;
- *real_host_exists = host_exists;
- *real_port_exists = port_exists;
- *real_path_exists = path_exists;
- *real_frag_exists = frag_exists;
- *real_quer_exists = quer_exists;
- *real_para_exists = para_exists;
+ *real_sche_exists = sche_exists;
+ *real_host_exists = host_exists;
+ *real_port_exists = port_exists;
+ *real_path_exists = path_exists;
+ *real_frag_exists = frag_exists;
+ *real_quer_exists = quer_exists;
+ *real_para_exists = para_exists;
*real_leading_slash = leading_slash;
} /* End ink_web_decompose_url */
@@ -3543,7 +3543,7 @@ ink_web_canonicalize_url(const char *base_url, const char *emb_url, char *dest_u
} else if (emb.sche_exists && ((strcasecmp(emb.sche, "telnet") == 0) || (strcasecmp(emb.sche, "mailto") == 0) ||
(strcasecmp(emb.sche, "news") == 0))) {
const char *p = emb_url;
- char *q = dest_url;
+ char *q = dest_url;
while (*p) {
*q++ = ParseRules::ink_tolower(*p++);
}
@@ -3613,7 +3613,7 @@ ink_web_canonicalize_url(const char *base_url, const char *emb_url, char *dest_u
/* remove "." and ".." */
ink_web_remove_dots(temp2, emb.path, &leading_slash, MAX_URL_LEN);
- emb.path_exists = 1;
+ emb.path_exists = 1;
emb.leading_slash = base.leading_slash;
} /* 5 */
} /* 4 */
@@ -3812,8 +3812,8 @@ ink_web_remove_dots(char *src, char *dest, int *leadingslash, int max_dest_len)
*leadingslash = 0;
/* first quickly count the "/"s to get lower bound on # of path levels */
- ptr = src;
- end = src + strlen(src);
+ ptr = src;
+ end = src + strlen(src);
scount = 0;
while (ptr < end) {
if (*ptr++ == '/')
@@ -3823,12 +3823,12 @@ ink_web_remove_dots(char *src, char *dest, int *leadingslash, int max_dest_len)
if (scount <= STATIC_PATH_LEVELS) {
/* we can use the statically allocated ones */
- seg = segstatic;
+ seg = segstatic;
type = typestatic;
} else {
/* too many levels of path - must dynamically allocate */
- seg = (char **)malloc(scount * sizeof(char *));
- type = (int *)malloc(scount * sizeof(int));
+ seg = (char **)malloc(scount * sizeof(char *));
+ type = (int *)malloc(scount * sizeof(int));
free_flag = 1;
}
@@ -3841,7 +3841,7 @@ ink_web_remove_dots(char *src, char *dest, int *leadingslash, int max_dest_len)
* Makes my head hurt just to think about it.
*
*/
- ptr = src;
+ ptr = src;
scount = 0;
/* a segstart starts with start-of-string or a '/' */
segstart = 1;
@@ -3850,10 +3850,10 @@ ink_web_remove_dots(char *src, char *dest, int *leadingslash, int max_dest_len)
/* include leading '/' in first segment */
if (ptr == src)
*leadingslash = 1;
- segstart = 1;
+ segstart = 1;
} else if (segstart == 1) {
seg[scount++] = ptr;
- segstart = 0;
+ segstart = 0;
} else {
/* this is neither a "/" nor the first char of another segment */
}
@@ -3887,27 +3887,27 @@ ink_web_remove_dots(char *src, char *dest, int *leadingslash, int max_dest_len)
type[i] = ZAP;
} else if (type[i] == DOTDOT) {
/* got a DOTDOT, count back to find first NORMAL segment */
- temp = i - 1;
+ temp = i - 1;
zapflag = 0;
while ((temp >= 0) && (zapflag == 0)) {
if (type[temp] == NORMAL) {
/* found a NORMAL one, ZAP this pair */
type[temp] = ZAP;
- type[i] = ZAP;
- zapflag = 1;
+ type[i] = ZAP;
+ zapflag = 1;
} else {
temp--;
}
}
if (zapflag == 0) {
type[i] = ERROR;
- error = 1;
+ error = 1;
}
}
}
/* now write out the fixed path */
- doff = 0;
+ doff = 0;
*dest = 0;
if (*leadingslash) {
strncpy(dest + doff, "/", 2);
@@ -3960,15 +3960,15 @@ ink_web_remove_dots(char *src, char *dest, int *leadingslash, int max_dest_len)
static int
ink_web_unescapify_string(char *dest_in, char *src_in, int max_dest_len)
{
- char *src = src_in;
+ char *src = src_in;
char *dest = dest_in;
const char *c1;
const char *c2;
- int quit = 0;
+ int quit = 0;
int dcount = 0;
- int num = 0;
- int dig1 = 0;
- int dig2 = 0;
+ int num = 0;
+ int dig1 = 0;
+ int dig2 = 0;
while ((*src != 0) && !quit) {
if (*src == '%') {
@@ -4076,10 +4076,10 @@ static int
ink_web_escapify_string(char *dest_in, char *src_in, int max_dest_len)
{
int d1, d2;
- char *src = src_in;
+ char *src = src_in;
char *dest = dest_in;
int dcount = 0;
- int quit = 0;
+ int quit = 0;
while ((*src != 0) && (dcount < max_dest_len) && (quit == 0)) {
if ((char *)memchr(dontescapify, *src, INT_MAX) || ParseRules::is_alpha(*src) || ParseRules::is_digit(*src)) {
diff --git a/tools/lighttpd_mod_generator/mod_generator.c b/tools/lighttpd_mod_generator/mod_generator.c
index 551b105..9a25ff4 100644
--- a/tools/lighttpd_mod_generator/mod_generator.c
+++ b/tools/lighttpd_mod_generator/mod_generator.c
@@ -136,7 +136,7 @@ FREE_FUNC(mod_generator_free)
SETDEFAULTS_FUNC(mod_generator_set_defaults)
{
plugin_data *p = p_d;
- size_t i = 0;
+ size_t i = 0;
config_values_t cv[] = {{"generator.array", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_CONNECTION}, /* 0 */
{NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET}};
@@ -149,7 +149,7 @@ SETDEFAULTS_FUNC(mod_generator_set_defaults)
for (i = 0; i < srv->config_context->used; i++) {
plugin_config *s;
- s = calloc(1, sizeof(plugin_config));
+ s = calloc(1, sizeof(plugin_config));
s->match = array_init();
cv[0].destination = s->match;
@@ -176,7 +176,7 @@ mod_generator_patch_connection(server *srv, connection *con, plugin_data *p)
/* skip the first, the global context */
for (i = 1; i < srv->config_context->used; i++) {
data_config *dc = (data_config *)srv->config_context->data[i];
- s = p->config_storage[i];
+ s = p->config_storage[i];
/* condition didn't match */
if (!config_check_cond(srv, con, dc))
@@ -216,7 +216,7 @@ URIHANDLER_FUNC(mod_generator_uri_handler)
for (k = 0; k < p->conf.match->used; k++) {
data_string *ds = (data_string *)p->conf.match->data[k];
- int ct_len = ds->value->used - 1;
+ int ct_len = ds->value->used - 1;
if (ct_len > s_len)
continue;
@@ -340,7 +340,7 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler)
response_header_insert(srv, con, CONST_STR_LEN("Cache-Control"), CONST_STR_LEN("max-age=86400, public"));
}
- con->http_status = 200;
+ con->http_status = 200;
con->file_finished = 1;
return HANDLER_FINISHED;
}
@@ -351,13 +351,13 @@ int
mod_generator_plugin_init(plugin *p)
{
p->version = LIGHTTPD_VERSION_ID;
- p->name = buffer_init_string("generator");
+ p->name = buffer_init_string("generator");
- p->init = mod_generator_init;
+ p->init = mod_generator_init;
p->handle_uri_clean = mod_generator_uri_handler;
- p->handle_physical = mod_generator_subrequest_handler;
- p->set_defaults = mod_generator_set_defaults;
- p->cleanup = mod_generator_free;
+ p->handle_physical = mod_generator_subrequest_handler;
+ p->set_defaults = mod_generator_set_defaults;
+ p->cleanup = mod_generator_free;
p->data = NULL;
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 06/14: TS-4560: Fix the out-of-tree build
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 0c022bff5835b256addf9547640e9d9ae7871fe5
Author: James Peach <jp...@apache.org>
AuthorDate: Fri Jun 17 09:06:48 2016 -0700
TS-4560: Fix the out-of-tree build
(cherry picked from commit c1b8b12d91cf7fc9c9eb9db0eadafd3fc88f2c39)
---
build/plugins.mk | 2 ++
lib/atscppapi/src/Makefile.am | 5 ++++-
plugins/experimental/multiplexer/Makefile.am | 2 +-
plugins/experimental/webp_transform/Makefile.am | 4 +---
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/build/plugins.mk b/build/plugins.mk
index 45c6957..61465a7 100644
--- a/build/plugins.mk
+++ b/build/plugins.mk
@@ -25,6 +25,8 @@ TS_PLUGIN_LDFLAGS = \
TS_PLUGIN_CPPFLAGS = \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
+ -I$(top_srcdir)/lib/atscppapi/src/include \
+ -I$(top_builddir)/lib/atscppapi/src/include \
-I$(top_srcdir)/lib
# Provide a default AM_CPPFLAGS. Automake handles this correctly, but libtool
diff --git a/lib/atscppapi/src/Makefile.am b/lib/atscppapi/src/Makefile.am
index f18ea75..984e55d 100644
--- a/lib/atscppapi/src/Makefile.am
+++ b/lib/atscppapi/src/Makefile.am
@@ -17,6 +17,7 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/$(subdir)/include \
+ -I$(top_builddir)/$(subdir)/include \
-I$(top_builddir)/proxy/api \
-I$(top_srcdir)/proxy/api \
-I$(top_srcdir)/lib
@@ -75,10 +76,12 @@ library_include_HEADERS = $(base_include_folder)/GlobalPlugin.h \
$(base_include_folder)/Stat.h \
$(base_include_folder)/Mutex.h \
$(base_include_folder)/RemapPlugin.h \
- $(base_include_folder)/shared_ptr.h \
$(base_include_folder)/Async.h \
$(base_include_folder)/AsyncHttpFetch.h \
$(base_include_folder)/GzipDeflateTransformation.h \
$(base_include_folder)/GzipInflateTransformation.h \
$(base_include_folder)/AsyncTimer.h \
$(base_include_folder)/InterceptPlugin.h
+
+library_include_HEADERS += \
+ $(top_builddir)/$(subdir)/include/atscppapi/shared_ptr.h
diff --git a/plugins/experimental/multiplexer/Makefile.am b/plugins/experimental/multiplexer/Makefile.am
index 72f527e..e93d45c 100644
--- a/plugins/experimental/multiplexer/Makefile.am
+++ b/plugins/experimental/multiplexer/Makefile.am
@@ -16,7 +16,7 @@
include $(top_srcdir)/build/plugins.mk
-AM_CPPFLAGS += -DPLUGIN_TAG=\"multiplexer\" -I $(top_srcdir)/lib/atscppapi/src/include
+AM_CPPFLAGS += -DPLUGIN_TAG=\"multiplexer\"
pkglib_LTLIBRARIES = multiplexer.la
diff --git a/plugins/experimental/webp_transform/Makefile.am b/plugins/experimental/webp_transform/Makefile.am
index 3132fc9..1e3ab26 100644
--- a/plugins/experimental/webp_transform/Makefile.am
+++ b/plugins/experimental/webp_transform/Makefile.am
@@ -17,9 +17,7 @@
include $(top_srcdir)/build/plugins.mk
-AM_CPPFLAGS += \
- -I$(top_srcdir)/lib/atscppapi/src/include \
- $(LIBMAGICKCPP_CFLAGS)
+AM_CPPFLAGS += $(LIBMAGICKCPP_CFLAGS)
AM_CXXFLAGS += \
-Wno-unused-variable
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 05/14: TS-4560: Fix C++ API shared_ptr detection.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit b1ca1a918570e89d046f1c877884d543c0a8b0b3
Author: James Peach <jp...@apache.org>
AuthorDate: Thu Jun 16 16:51:40 2016 -0700
TS-4560: Fix C++ API shared_ptr detection.
Since ink_autoconf.h is not installed, we can't use it to figure
out which shared_ptr implementation to use. Further, Traffic Server
might not have been built with the same toolchain that 3rd party
plugins are using.
Since shared_ptr is used in the C++ API headers, both Traffic Server
and the plugins need to agree on which implementation to use. The
best (but not perfect) solution is to hardcode it into the header
file during the Traffic Server build. This means that both parties
are consistent and any remaining problems could be attributed to
C++ standard library compatibility.
(cherry picked from commit 57fa22195a259aa61725cf2ddea71879e28c489d)
---
configure.ac | 13 +++++++++----
.../src/include/atscppapi/{shared_ptr.h => shared_ptr.h.in} | 12 ++++++------
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
index bee20f2..260e0e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -592,9 +592,13 @@ AC_COMPILE_IFELSE([
)
AC_MSG_RESULT([$have_std_shared_ptr])
-if test "x${have_std_shared_ptr}" = "xyes" ; then
- AC_DEFINE(HAVE_STD_SHARED_PTR, 1, [whether std::shared_ptr is available])
-fi
+AS_IF([test "x${have_std_shared_ptr}" = "xyes"], [
+ AC_DEFINE(HAVE_STD_SHARED_PTR, 1, [whether std::shared_ptr is available])
+ AC_SUBST(have_std_shared_ptr, 1)
+ ], [
+ AC_SUBST(have_std_shared_ptr, 0)
+ ]
+)
AC_LANG_POP()
@@ -1955,6 +1959,7 @@ AC_CONFIG_FILES([
lib/atscppapi/examples/timeout_example/Makefile
lib/atscppapi/examples/transactionhook/Makefile
lib/atscppapi/src/Makefile
+ lib/atscppapi/src/include/atscppapi/shared_ptr.h
lib/bindings/Makefile
lib/perl/Makefile
lib/perl/lib/Apache/TS.pm
@@ -1984,6 +1989,7 @@ AC_CONFIG_FILES([
plugins/experimental/cachekey/Makefile
plugins/experimental/channel_stats/Makefile
plugins/experimental/collapsed_connection/Makefile
+ plugins/experimental/collapsed_forwarding/Makefile
plugins/experimental/custom_redirect/Makefile
plugins/experimental/epic/Makefile
plugins/experimental/escalate/Makefile
@@ -1991,7 +1997,6 @@ AC_CONFIG_FILES([
plugins/experimental/generator/Makefile
plugins/experimental/geoip_acl/Makefile
plugins/experimental/header_normalize/Makefile
- plugins/experimental/collapsed_forwarding/Makefile
plugins/experimental/hipes/Makefile
plugins/experimental/inliner/Makefile
plugins/experimental/memcache/Makefile
diff --git a/lib/atscppapi/src/include/atscppapi/shared_ptr.h b/lib/atscppapi/src/include/atscppapi/shared_ptr.h.in
similarity index 84%
rename from lib/atscppapi/src/include/atscppapi/shared_ptr.h
rename to lib/atscppapi/src/include/atscppapi/shared_ptr.h.in
index 94b13e1..c6671b4 100644
--- a/lib/atscppapi/src/include/atscppapi/shared_ptr.h
+++ b/lib/atscppapi/src/include/atscppapi/shared_ptr.h.in
@@ -22,12 +22,12 @@
*/
#pragma once
-#ifndef ASTCPPAPI_SHARED_PTR_H_
-#define ASTCPPAPI_SHARED_PTR_H_
+#ifndef ATSCPPAPI_SHARED_PTR_H_
+#define ATSCPPAPI_SHARED_PTR_H_
-#include "ink_autoconf.h"
+#define ATSCPPAPI_USE_STD_SHARED_PTR @have_std_shared_ptr@
-#if HAVE_STD_SHARED_PTR
+#if ATSCPPAPI_USE_STD_SHARED_PTR
#include <memory>
#else
#include <tr1/memory>
@@ -40,7 +40,7 @@ namespace atscppapi
* \todo Consider adding a simple macro to check if c++0x/11 is enabled
* and if so change it to std::shared_ptr and #include <memory>s
*/
-#if HAVE_STD_SHARED_PTR
+#if ATSCPPAPI_USE_STD_SHARED_PTR
using std::shared_ptr;
using std::unique_ptr;
#else
@@ -50,4 +50,4 @@ using std::tr1::unique_ptr;
} /* atscppapi */
-#endif /* SHARED_PTR_H_ */
+#endif /* ATSCPPAPI_SHARED_PTR_H_ */
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 10/14: TS-4470: ASAN stack-buffer-overflow when
slow log is enabled Update to use offset
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 8d9bfb3b5b0c6750716d2e05f6182c87045c3dec
Author: Bryan Call <bc...@apache.org>
AuthorDate: Tue Jun 21 09:49:40 2016 -0700
TS-4470: ASAN stack-buffer-overflow when slow log is enabled
Update to use offset
(cherry picked from commit 639a081ab4a8ff9306b02834a9dc5b028f23501a)
---
proxy/http/HttpSM.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 8b0157a..8204e44 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -6911,8 +6911,8 @@ HttpSM::update_stats()
int offset = 0;
int skip = 0;
- t_state.hdr_info.client_request.url_print(url_string, sizeof(url_string), &offset, &skip);
- url_string[sizeof(url_string) - 1] = 0; // NULL terminate the string
+ t_state.hdr_info.client_request.url_print(url_string, sizeof(url_string) - 1, &offset, &skip);
+ url_string[offset] = 0; // NULL terminate the string
// unique id
char unique_id_string[128] = "";
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 13/14: TS-4565 Enables clang_format
AlignConsecutiveAssignments
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit e384a7e57a4caa72cddaf8077c61548862f73e40
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Sat Jun 18 22:37:30 2016 -0600
TS-4565 Enables clang_format AlignConsecutiveAssignments
(cherry picked from commit 67c23f8e6e7c76dbb81ef7e2f3e0a53baba349e9)
---
.clang-format | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.clang-format b/.clang-format
index e6830f4..87d7734 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,7 +2,7 @@
Language: Cpp
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
+AlignConsecutiveAssignments: true
AlignConsecutiveDeclarations: false
AlignEscapedNewlinesLeft: true
AlignOperands: true
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 08/14: TS-4543: Fix core in
HttpSM::tunnel_handler_post. This closes #718.
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit d4af23584556b21f8a1a8a96fb409bab3bbcb65f
Author: shinrich <sh...@localhost.localdomain>
AuthorDate: Wed Jun 15 08:24:26 2016 -0500
TS-4543: Fix core in HttpSM::tunnel_handler_post. This closes #718.
(cherry picked from commit e5db6be875d4f4d5d291ac249ae2a9f7fed562a6)
---
proxy/http/HttpSM.cc | 9 ++++++---
proxy/http/HttpTunnel.h | 12 ++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 8237a56..a6cc149 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2741,7 +2741,10 @@ HttpSM::tunnel_handler_post(int event, void *data)
{
STATE_ENTER(&HttpSM::tunnel_handler_post, event);
- HttpTunnelProducer *p = tunnel.get_producer(ua_session);
+ HttpTunnelProducer *p = ua_session != NULL ? tunnel.get_producer(ua_session) : tunnel.get_producer(HT_HTTP_CLIENT);
+ if (!p)
+ return 0; // Cannot do anything if there is no producer
+
if (event != HTTP_TUNNEL_EVENT_DONE) {
if ((event == VC_EVENT_WRITE_COMPLETE) || (event == VC_EVENT_EOS)) {
if (ua_entry->write_buffer) {
@@ -2860,9 +2863,9 @@ HttpSM::tunnel_handler_push(int event, void *data)
ink_assert(data == &tunnel);
// Check to see if the client is still around
- HttpTunnelProducer *ua = tunnel.get_producer(ua_session);
+ HttpTunnelProducer *ua = (ua_session) ? tunnel.get_producer(ua_session) : tunnel.get_producer(HT_HTTP_CLIENT);
- if (!ua->read_success) {
+ if (ua && !ua->read_success) {
// Client failed to send the body, it's gone. Kill the
// state machine
terminate_sm = true;
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index c4fce16..7ba53b1 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -331,6 +331,7 @@ public:
DLL<HttpTunnelConsumer> *get_consumers(VConnection *vc);
HttpTunnelProducer *get_producer(VConnection *vc);
HttpTunnelConsumer *get_consumer(VConnection *vc);
+ HttpTunnelProducer *get_producer(HttpTunnelType_t type);
void tunnel_run(HttpTunnelProducer *p = NULL);
int main_handler(int event, void *data);
@@ -460,6 +461,17 @@ HttpTunnel::get_producer(VConnection *vc)
return NULL;
}
+inline HttpTunnelProducer *
+HttpTunnel::get_producer(HttpTunnelType_t type)
+{
+ for (int i = 0; i < MAX_PRODUCERS; i++) {
+ if (producers[i].vc_type == type) {
+ return producers + i;
+ }
+ }
+ return NULL;
+}
+
inline HttpTunnelConsumer *
HttpTunnel::get_consumer(VConnection *vc)
{
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 09/14: TS-4470: ASAN stack-buffer-overflow when
slow log is enabled
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit d7419a92d30ea71fd55c0d74a59196c886b42e2f
Author: Bryan Call <bc...@apache.org>
AuthorDate: Fri Jun 17 11:30:51 2016 -0700
TS-4470: ASAN stack-buffer-overflow when slow log is enabled
(cherry picked from commit 91542118bf17b9b07941998dcce748eaf39b6958)
---
proxy/http/HttpSM.cc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index a6cc149..8b0157a 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -6911,7 +6911,8 @@ HttpSM::update_stats()
int offset = 0;
int skip = 0;
- t_state.hdr_info.client_request.url_print(url_string, sizeof url_string, &offset, &skip);
+ t_state.hdr_info.client_request.url_print(url_string, sizeof(url_string), &offset, &skip);
+ url_string[sizeof(url_string) - 1] = 0; // NULL terminate the string
// unique id
char unique_id_string[128] = "";
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.
[trafficserver] 12/14: TS-4568: Milestones where changed from
seconds to milliseconds
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit fbbe33e03fd43727544330487580c6c3d9a3f786
Author: Bryan Call <bc...@apache.org>
AuthorDate: Tue Jun 21 11:31:43 2016 -0700
TS-4568: Milestones where changed from seconds to milliseconds
---
proxy/Milestones.h | 12 +++++++++---
proxy/http/HttpSM.cc | 30 +++++++++++++++---------------
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/proxy/Milestones.h b/proxy/Milestones.h
index b05d60f..0472aff 100644
--- a/proxy/Milestones.h
+++ b/proxy/Milestones.h
@@ -44,7 +44,7 @@ public:
* Takes two milestones and returns the difference.
* @param start The start time
* @param end The end time
- * @return A double that is the time in seconds
+ * @return The difference time in milliseconds
*/
int64_t
difference_msec(TSMilestonesType ms_start, TSMilestonesType ms_end) const
@@ -55,10 +55,16 @@ public:
return ink_hrtime_to_msec(milestones[ms_end] - milestones[ms_start]);
}
+ /**
+ * Takes two milestones and returns the difference.
+ * @param start The start time
+ * @param end The end time
+ * @return A double that is the difference time in seconds
+ */
double
- difference(TSMilestonesType ms_start, TSMilestonesType ms_end) const
+ difference_sec(TSMilestonesType ms_start, TSMilestonesType ms_end) const
{
- return (double)difference_msec(ms_start, ms_end);
+ return (double)difference_msec(ms_start, ms_end) / 1000.0;
}
ink_hrtime
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 8204e44..d9fa832 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -6970,21 +6970,21 @@ HttpSM::update_stats()
"plugin_total: %.3f",
sm_id, client_ip, t_state.client_info.src_addr.host_order_port(), url_string, status, unique_id_string, redirection_tries,
client_response_body_bytes, fd, t_state.client_info.state, t_state.server_info.state,
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_BEGIN),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_FIRST_READ),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_READ_HEADER_DONE),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_BEGIN),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_END),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_BEGIN),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_END),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_READ),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_READ_HEADER_DONE),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CLOSE),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_UA_CLOSE),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_SM_FINISH),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_ACTIVE),
- milestones.difference(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_TOTAL));
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_BEGIN),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_FIRST_READ),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_READ_HEADER_DONE),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_BEGIN),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_CACHE_OPEN_READ_END),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_BEGIN),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_DNS_LOOKUP_END),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CONNECT),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_FIRST_READ),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_READ_HEADER_DONE),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SERVER_CLOSE),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_UA_CLOSE),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_SM_FINISH),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_ACTIVE),
+ milestones.difference_sec(TS_MILESTONE_SM_START, TS_MILESTONE_PLUGIN_TOTAL));
}
}
--
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.