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
Sebastian Schrader
Kea
Commits
5580d438
Commit
5580d438
authored
Nov 18, 2016
by
Francis Dupont
Committed by
Tomek Mrugalski
Nov 29, 2016
Browse files
[5014] Partial fix for process tests (dhcp-ddns still missing)
parent
3043fdb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp6/dhcp6_lexer.ll
View file @
5580d438
...
...
@@ -142,6 +142,7 @@ JSONString \"{JSONStringCharacter}*\"
\
"password\"
{
return
isc:
:
dhcp:
:
Dhcp6Parser:
:make_PASSWORD
(
loc
)
; }
\
"host\"
{
return
isc:
:
dhcp:
:
Dhcp6Parser:
:make_HOST
(
loc
)
; }
\
"persist\"
{
return
isc:
:
dhcp:
:
Dhcp6Parser:
:make_PERSIST
(
loc
)
; }
\
"lfc-interval\"
{
return
isc:
:
dhcp:
:
Dhcp6Parser:
:make_LFC_INTERVAL
(
loc
)
; }
\
"preferred-lifetime\"
{
return
isc:
:
dhcp:
:
Dhcp6Parser:
:make_PREFERRED_LIFETIME
(
loc
)
; }
\
"valid-lifetime\"
{
return
isc:
:
dhcp:
:
Dhcp6Parser:
:make_VALID_LIFETIME
(
loc
)
; }
...
...
src/bin/dhcp6/dhcp6_parser.yy
View file @
5580d438
...
...
@@ -59,6 +59,7 @@ using namespace std;
PASSWORD "password"
HOST "host"
PERSIST "persist"
LFC_INTERVAL "lfc-interval"
PREFERRED_LIFETIME "preferred-lifetime"
VALID_LIFETIME "valid-lifetime"
...
...
@@ -332,7 +333,9 @@ lease_database_map_param: type
| password
| host
| name
| persist;
| persist
| lfc_interval;
;
type: TYPE COLON STRING {
ElementPtr prf(new StringElement($3));
...
...
@@ -364,6 +367,11 @@ persist: PERSIST COLON BOOLEAN {
ctx.stack_.back()->set("persist", n);
};
lfc_interval: LFC_INTERVAL COLON INTEGER {
ElementPtr n(new IntElement($3));
ctx.stack_.back()->set("lfc-interval", n);
};
mac_sources: MAC_SOURCES {
ElementPtr l(new ListElement());
ctx.stack_.back()->set("mac-sources", l);
...
...
@@ -806,7 +814,8 @@ server_id_param: type
| identifier
| time
| htype
| enterprise_id;
| enterprise_id
| persist;
htype: HTYPE COLON INTEGER {
ElementPtr htype(new IntElement($3));
...
...
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