fix for NextHopStrategyNameGet

Author: traeak

include/ts/ts.h

@@ -1584,7 +1584,7 @@ char *TSHttpTxnErrorBodyGet(TSHttpTxn txnp, size_t *buflength, char **mimetype);
     Returns nullptr if no strategy is found.
     This uses the current transaction's state machine to get
     access to UrlRewrite's NextHopStrategyFactory.
-                It's preferable to retrive strategies during TSRemapNewInstance.
+    It's preferable to retrieve strategies during TSRemapNewInstance.
 
     @param txnp HTTP transaction which holds the strategy table.
     @param name of the strategy to look up.
@@ -1594,7 +1594,7 @@ void const *TSHttpTxnNextHopStrategyFind(TSHttpTxn txnp, const char *name);
 
 /**
     Sets the Transaction's Next Hop Parent Strategy.
-                Must be called before parent selection logic is required.
+    Must be called before parent selection logic is required.
 
     You can get this strategy pointer by calling TSHttpTxnParentStrategyGet().
 
@@ -1617,7 +1617,7 @@ void const *TSHttpTxnNextHopStrategyGet(TSHttpTxn txnp);
 
 /**
     Returns either null pointer or null terminated pointer to name.
-                DO NOT FREE.
+    DO NOT FREE.
 
     This value may be a nullptr due to:
       - parent proxying not enabled
@@ -1630,8 +1630,8 @@ char const *TSNextHopStrategyNameGet(void const *strategy);
 
 /**
     Retrieves a pointer to the named strategy in the strategy table.
-                This can only be called during TSRemapNewInstance.
-                                                                DO NOT FREE.
+    This can only be called during TSRemapNewInstance.
+    DO NOT FREE.
 
     Returns nullptr if no strategy found.
     This uses the currently being loaded RemapConfig NextHopStrategyFactory.
@@ -1643,19 +1643,18 @@ void const *TSRemapNextHopStrategyFind(const char *name);
 
 /**
     Retrieves a pointer to remap rule strategy pointer.
-                This can only be called during TSRemapNewInstance.
-                                                                DO NOT FREE.
+    This can only be called during TSRemapNewInstance.
+    DO NOT FREE.
 
     Returns nullptr if no strategy assigned.
-    @param name of the strategy to look up.
 
  */
 void const *TSRemapNextHopStrategyGet();
 
 /**
     Retrieves a pointer to the named strategy in the strategy table.
-                This can only be called during TSRemapNewInstance.
-                                                                DO NOT FREE.
+    This can only be called during TSRemapNewInstance.
+    DO NOT FREE.
 
     Returns nullptr if no strategy found.
     This uses the currently being loaded RemapConfig NextHopStrategyFactory.

plugins/header_rewrite/conditions.cc

@@ -1539,12 +1539,13 @@ ConditionNextHop::append_value(std::string &s, const Resources &res)
     s.append(std::to_string(port));
   } break;
   case NEXT_HOP_STRATEGY: {
-    char const *const name = TSNextHopStrategyNameGet(res.state.txnp);
-    if (nullptr != name) {
+    void const *const strategy = TSHttpTxnNextHopStrategyGet(res.state.txnp);
+    if (nullptr != strategy) {
+      char const *const name = TSNextHopStrategyNameGet(strategy);
       Dbg(pi_dbg_ctl, "Appending '%s' to evaluation value", name);
       s.append(name);
     } else {
-      Dbg(pi_dbg_ctl, "NextHopStrategyName is empty");
+      Dbg(pi_dbg_ctl, "NextHopStrategy is empty");
     }
   } break;
   default: