Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
c19f1840
Commit
c19f1840
authored
Dec 06, 2016
by
Tomek Mrugalski
🛰
Browse files
[5036] Support for parameters in hooks-libraries added.
parent
fab8be8e
Changes
3
Hide whitespace changes
Inline
Side-by-side
doc/examples/kea6/hooks.json
View file @
c19f1840
...
...
@@ -41,7 +41,11 @@
"library"
:
"/opt/lib/security.so"
},
{
"library"
:
"/opt/lib/charging.so"
"library"
:
"/opt/lib/charging.so"
,
"parameters"
:
{
"path"
:
"/var/kea/var"
,
"base-name"
:
"kea-forensic6"
}
}
]
}
...
...
src/bin/dhcp6/dhcp6_lexer.ll
View file @
c19f1840
...
...
@@ -744,6 +744,16 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"
parameters\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
return isc::dhcp::Dhcp6Parser::make_PARAMETERS(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("
parameters
", driver.loc_);
}
}
\"
library\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::HOOKS_LIBRARIES:
...
...
src/bin/dhcp6/dhcp6_parser.yy
View file @
c19f1840
...
...
@@ -114,6 +114,7 @@ using namespace std;
HOOKS_LIBRARIES "hooks-libraries"
LIBRARY "library"
PARAMETERS "parameters"
EXPIRED_LEASES_PROCESSING "expired-leases-processing"
...
...
@@ -593,7 +594,10 @@ hooks_params: hooks_param
| hooks_params COMMA hooks_param
;
hooks_param: LIBRARY {
hooks_param: library
| parameters;
library: LIBRARY {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr lib(new StringElement($4, ctx.loc2pos(@4)));
...
...
@@ -601,6 +605,13 @@ hooks_param: LIBRARY {
ctx.leave();
};
parameters: PARAMETERS {
ctx.enter(ctx.NO_KEYWORD);
} COLON value {
ctx.stack_.back()->set("parameters", $4);
ctx.leave();
}
// --- expired-leases-processing ------------------------
expired_leases_processing: EXPIRED_LEASES_PROCESSING {
ElementPtr m(new MapElement(ctx.loc2pos(@1)));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment