hoist reverse_coa checks before _all_ "remove from proxy hash" calls

diff --git a/src/main/process.c b/src/main/process.c
index 49bc481f4867ba4fda5f5691609988d595eb922c..03f066891b1b9ed256a1e20d132fb1a933d56b77 100644 (file)
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -2528,6 +2528,15 @@ static int process_proxy_reply(REQUEST *request, RADIUS_PACKET *reply)
        if (post_proxy_type > 0) RDEBUG2("Found Post-Proxy-Type %s",
                                         dict_valnamebyattr(PW_POST_PROXY_TYPE, 0, post_proxy_type));
 
+#ifdef WITH_COA_TUNNEL
+       /*
+        *      Cache this, as request->proxy_listener will be
+        *      NULL after removing the request from the proxy
+        *      hash.
+        */
+       reverse_coa = request->proxy_listener->type != RAD_LISTEN_PROXY;
+#endif
+
        if (reply) {
                VERIFY_PACKET(reply);
 
@@ -2552,14 +2561,6 @@ static int process_proxy_reply(REQUEST *request, RADIUS_PACKET *reply)
                        rad_assert(!request->in_proxy_hash);
                }
        } else if (request->in_proxy_hash) {
-#ifdef WITH_COA_TUNNEL
-               /*
-                *      Cache this, as request->proxy_listener will be
-                *      NULL after removing the request from the proxy
-                *      hash.
-                */
-               reverse_coa = request->proxy_listener->type != RAD_LISTEN_PROXY;
-#endif
                remove_from_proxy_hash(request);
        }