diff options
Diffstat (limited to 'src/lib/eval')
| -rw-r--r-- | src/lib/eval/eval_context.h | 2 | ||||
| -rw-r--r-- | src/lib/eval/eval_messages.cc | 2 | ||||
| -rw-r--r-- | src/lib/eval/eval_messages.h | 1 | ||||
| -rw-r--r-- | src/lib/eval/eval_messages.mes | 42 | ||||
| -rw-r--r-- | src/lib/eval/evaluate.h | 2 | ||||
| -rw-r--r-- | src/lib/eval/location.hh | 1 |
6 files changed, 25 insertions, 25 deletions
diff --git a/src/lib/eval/eval_context.h b/src/lib/eval/eval_context.h index 9a086e4432..033ff088f0 100644 --- a/src/lib/eval/eval_context.h +++ b/src/lib/eval/eval_context.h @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2022 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/src/lib/eval/eval_messages.cc b/src/lib/eval/eval_messages.cc index 72324a3f32..5872f8ca3b 100644 --- a/src/lib/eval/eval_messages.cc +++ b/src/lib/eval/eval_messages.cc @@ -59,7 +59,6 @@ extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID = "EVAL_DEBUG_V extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH = "EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH"; extern const isc::log::MessageID EVAL_DEBUG_VENDOR_EXISTS = "EVAL_DEBUG_VENDOR_EXISTS"; extern const isc::log::MessageID EVAL_DEBUG_VENDOR_NO_OPTION = "EVAL_DEBUG_VENDOR_NO_OPTION"; -extern const isc::log::MessageID EVAL_RESULT = "EVAL_RESULT"; } // namespace dhcp } // namespace isc @@ -119,7 +118,6 @@ const char* values[] = { "EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH", "%1: Was looking for %2, option had %3, pushing result '%4'", "EVAL_DEBUG_VENDOR_EXISTS", "%1: Option with enterprise-id %2 found, pushing result '%3'", "EVAL_DEBUG_VENDOR_NO_OPTION", "%1: Option with code %2 missing, pushing result '%3'", - "EVAL_RESULT", "%1: Expression %2 evaluated to %3", NULL }; diff --git a/src/lib/eval/eval_messages.h b/src/lib/eval/eval_messages.h index 4eb7f66513..41747f7743 100644 --- a/src/lib/eval/eval_messages.h +++ b/src/lib/eval/eval_messages.h @@ -60,7 +60,6 @@ extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID; extern const isc::log::MessageID EVAL_DEBUG_VENDOR_ENTERPRISE_ID_MISMATCH; extern const isc::log::MessageID EVAL_DEBUG_VENDOR_EXISTS; extern const isc::log::MessageID EVAL_DEBUG_VENDOR_NO_OPTION; -extern const isc::log::MessageID EVAL_RESULT; } // namespace dhcp } // namespace isc diff --git a/src/lib/eval/eval_messages.mes b/src/lib/eval/eval_messages.mes index c30e59a668..7dedeb4e3e 100644 --- a/src/lib/eval/eval_messages.mes +++ b/src/lib/eval/eval_messages.mes @@ -15,6 +15,7 @@ the value stack. Then are then combined via logical and and the result is pushed onto the value stack. # For use with TokenBranch + % EVAL_DEBUG_BRANCH Branching to %1 Logged at debug log level 55. This debug message indicates that an unconditional branch is performed @@ -129,25 +130,6 @@ the value stack, negated and then pushed onto the value stack. The string is displayed in text. # For use with TokenPopAndBranchFalse -% EVAL_DEBUG_POP_AND_BRANCH_FALSE Value is false: branching to %1 -Logged at debug log level 55. -This debug message indicates that a branch on false condition is performed -to the displayed target. - -# For use with TokenPopOrBranchFalse -% EVAL_DEBUG_POP_OR_BRANCH_FALSE Value is false: keeping it and branching to %1 -Logged at debug log level 55. -This debug message indicates that a branch on false condition is performed -to the displayed target. - -# For use with TokenPopOrBranchTrue -% EVAL_DEBUG_POP_OR_BRANCH_TRUE Value is true: keeping it and branching to %1 -Logged at debug log level 55. -This debug message indicates that a branch on true condition is performed -to the displayed target. - -# For use with TokenOption based classes. These include TokenOption, -# TokenRelay4Option and TokenRelay6Option. % EVAL_DEBUG_OPTION %1: Pushing option %2 with value %3 Logged at debug log level 55. @@ -193,6 +175,28 @@ The string is displayed in hex. # For use with TokenRelay6Field +% EVAL_DEBUG_POP_AND_BRANCH_FALSE Value is false: branching to %1 +Logged at debug log level 55. +This debug message indicates that a branch on false condition is performed +to the displayed target. + +# For use with TokenPopOrBranchFalse + +% EVAL_DEBUG_POP_OR_BRANCH_FALSE Value is false: keeping it and branching to %1 +Logged at debug log level 55. +This debug message indicates that a branch on false condition is performed +to the displayed target. + +# For use with TokenPopOrBranchTrue + +% EVAL_DEBUG_POP_OR_BRANCH_TRUE Value is true: keeping it and branching to %1 +Logged at debug log level 55. +This debug message indicates that a branch on true condition is performed +to the displayed target. + +# For use with TokenOption based classes. These include TokenOption, +# TokenRelay4Option and TokenRelay6Option. + % EVAL_DEBUG_RELAY6 %1: Pushing PKT6 relay field %2 nest %3 with value %4 Logged at debug log level 55. This debug message indicates that the given binary string representing diff --git a/src/lib/eval/evaluate.h b/src/lib/eval/evaluate.h index c572debbf2..3e4c2c3be2 100644 --- a/src/lib/eval/evaluate.h +++ b/src/lib/eval/evaluate.h @@ -1,4 +1,4 @@ -// Copyright (C) 2015-2017 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2015-2024 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this diff --git a/src/lib/eval/location.hh b/src/lib/eval/location.hh index 674df6e31a..5bde47985a 100644 --- a/src/lib/eval/location.hh +++ b/src/lib/eval/location.hh @@ -1,4 +1,3 @@ -// Generated 202408071949 // A Bison parser, made by GNU Bison 3.8.2. // Locations for Bison parsers in C++ |