traeak commented on code in PR #12593:
URL: https://github.com/apache/trafficserver/pull/12593#discussion_r4168408728
##########
src/api/InkAPI.cc:
##########
@@ -5023,57 +5023,92 @@ TSHttpTxnServerRequestBodySet(TSHttpTxn txnp, char
*buf, int64_t buflength)
s->internal_msg_buffer_fast_allocator_size = -1;
}
-void const *
+TSStrategy
TSHttpTxnNextHopStrategyGet(TSHttpTxn txnp)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
auto sm = reinterpret_cast<HttpSM const *>(txnp);
- return static_cast<void *>(sm->t_state.next_hop_strategy);
+ return reinterpret_cast<TSStrategy>(sm->t_state.next_hop_strategy);
+}
+
+TSStrategy
+TSHttpTxnNextHopStrategyFind(TSHttpTxn txnp, const char *name)
+{
+ sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
+ sdk_assert(sdk_sanity_check_null_ptr((void *)name) == TS_SUCCESS);
+
+ auto sm = reinterpret_cast<HttpSM const *>(txnp);
+
+ sdk_assert(sdk_sanity_check_null_ptr((void *)sm->m_remap) == TS_SUCCESS);
+ sdk_assert(sdk_sanity_check_null_ptr((void *)sm->m_remap->strategyFactory)
== TS_SUCCESS);
+
+ // HttpSM has a reference count handle to UrlRewrite which has a
+ // pointer to NextHopStrategyFactory
+ NextHopSelectionStrategy *const strategy =
sm->m_remap->strategyFactory->strategyInstance(name);
+
+ return reinterpret_cast<TSStrategy>(strategy);
}
void
-TSHttpTxnNextHopStrategySet(TSHttpTxn txnp, void const *stratptr)
+TSHttpTxnNextHopStrategySet(TSHttpTxn txnp, TSStrategy stratptr)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
// null strategy falls back to parent.config
- // sdk_assert(sdk_sanity_check_null_ptr(strategy) == TS_SUCCESS);
-
- auto sm = reinterpret_cast<HttpSM *>(txnp);
- auto strategy = reinterpret_cast<NextHopSelectionStrategy const *>(stratptr);
+ // sdk_assert(sdk_sanity_check_null_ptr(stratptr) == TS_SUCCESS);
- sm->t_state.next_hop_strategy = const_cast<NextHopSelectionStrategy
*>(strategy);
+ auto sm = reinterpret_cast<HttpSM *>(txnp);
+ sm->t_state.next_hop_strategy = reinterpret_cast<NextHopSelectionStrategy
*>(stratptr);
}
-char const *
-TSHttpNextHopStrategyNameGet(void const *stratptr)
+TSStrategy
+TSRemapNextHopStrategyFind(const char *name)
{
- char const *name = nullptr;
- if (nullptr != stratptr) {
- auto strategy = reinterpret_cast<NextHopSelectionStrategy const
*>(stratptr);
- name = strategy->strategy_name.c_str();
+ auto const um = url_mapping::instance;
+ sdk_assert(sdk_sanity_check_null_ptr((void *)um) == TS_SUCCESS);
+
+ NextHopSelectionStrategy *strategy = nullptr;
+
+ if (nullptr != um->strategyFactory) {
+ // HttpSM has a reference count handle to UrlRewrite which manages
+ // the NextHopStrategyFactory pointer.
+ strategy = um->strategyFactory->strategyInstance(name);
}
- return name;
+ return reinterpret_cast<TSStrategy>(strategy);
}
-void const *
-TSHttpTxnNextHopNamedStrategyGet(TSHttpTxn txnp, const char *name)
+void
+TSRemapNextHopStrategySet(TSStrategy strategy)
{
- sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
- sdk_assert(sdk_sanity_check_null_ptr((void *)name) == TS_SUCCESS);
+ auto const um = url_mapping::instance;
+ sdk_assert(sdk_sanity_check_null_ptr((void *)um) == TS_SUCCESS);
+ // null strategy falls back to parent.config
+ // sdk_assert(sdk_sanity_check_null_ptr(stratptr) == TS_SUCCESS);
- auto sm = reinterpret_cast<HttpSM const *>(txnp);
+ um->strategy = reinterpret_cast<NextHopSelectionStrategy *>(strategy);
+}
- sdk_assert(sdk_sanity_check_null_ptr((void *)sm->m_remap) == TS_SUCCESS);
- sdk_assert(sdk_sanity_check_null_ptr((void *)sm->m_remap->strategyFactory)
== TS_SUCCESS);
+TSStrategy
+TSRemapNextHopStrategyGet()
+{
+ auto const um = url_mapping::instance;
+ sdk_assert(sdk_sanity_check_null_ptr((void *)um) == TS_SUCCESS);
+ return reinterpret_cast<TSStrategy>(um->strategy);
+}
- // HttpSM has a reference count handle to UrlRewrite which has a
- // pointer to NextHopStrategyFactory
- NextHopSelectionStrategy const *const strat =
sm->m_remap->strategyFactory->strategyInstance(name);
+char const *
+TSNextHopStrategyNameGet(TSStrategy stratptr)
+{
+ static char const *const nullname = "null";
+ char const *name = nullname;
+ if (nullptr != stratptr) {
+ auto strategy = reinterpret_cast<NextHopSelectionStrategy *>(stratptr);
+ name = strategy->strategy_name.c_str();
+ }
- return static_cast<void const *>(strat);
+ return name;
}
Review Comment:
addressed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
