cancel includes the current depth

Author: alandekok

src/lib/unlang/interpret.c

@@ -1497,7 +1497,7 @@ static void instruction_retry_handler(UNUSED fr_timer_list_t *tl, UNUSED fr_time
 	/*
 	 *	Signal all lower frames to exit.
 	 */
-	unlang_stack_signal(request, FR_SIGNAL_CANCEL, retry->depth);
+	unlang_stack_signal(request, FR_SIGNAL_CANCEL, retry->depth + 1);
 
 	retry->state = FR_RETRY_MRD;
 	unlang_interpret_mark_runnable(request);

src/lib/unlang/unlang_priv.h

@@ -559,12 +559,12 @@ static inline unsigned int unlang_frame_by_op_flag(unlang_stack_t *stack, unlang
  *	the request.
  *
  * @param[in] stack	The current stack.
- * @param[in] to_depth	mark all frames below this depth as cancelled.
+ * @param[in] to_depth	mark all frames up to and including this depth as cancelled.
  */
 static inline unlang_action_t unwind_to_depth(unlang_stack_t *stack, unsigned int to_depth)
 {
 	unlang_stack_frame_t	*frame;
-	unsigned int i, depth = stack->depth;	/* must be signed to avoid underflow */
+	unsigned int i, depth = stack->depth;
 
 	if (!fr_cond_assert(to_depth >= 1)) return UNLANG_ACTION_FAIL;