Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sebastian Schrader
Kea
Commits
4fa4c9a0
Commit
4fa4c9a0
authored
Mar 16, 2017
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[3389a] Rebased (but still many things to do)
parent
3188ae9a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
65 additions
and
7 deletions
+65
-7
doc/examples/kea4/advanced.json
doc/examples/kea4/advanced.json
+5
-1
doc/examples/kea6/advanced.json
doc/examples/kea6/advanced.json
+5
-1
src/bin/dhcp4/dhcp4_lexer.ll
src/bin/dhcp4/dhcp4_lexer.ll
+9
-0
src/bin/dhcp4/dhcp4_parser.yy
src/bin/dhcp4/dhcp4_parser.yy
+8
-0
src/bin/dhcp6/dhcp6_lexer.ll
src/bin/dhcp6/dhcp6_lexer.ll
+9
-0
src/bin/dhcp6/dhcp6_parser.yy
src/bin/dhcp6/dhcp6_parser.yy
+18
-3
src/lib/dhcpsrv/parsers/ifaces_config_parser.cc
src/lib/dhcpsrv/parsers/ifaces_config_parser.cc
+11
-2
No files found.
doc/examples/kea4/advanced.json
View file @
4fa4c9a0
...
...
@@ -29,7 +29,11 @@
//
'udp'
is
generally
better
if
you
have
only
relayed
traffic.
Kea
//
than
opens
up
normal
UDP
socket
and
the
kernel
does
all
the
//
Ethernet/IP
stack
processing.
"dhcp-socket-type"
:
"udp"
"dhcp-socket-type"
:
"udp"
,
//
This
makes
interfaces
to
be
re-detected
at
each
(re-)configuration.
//
By
default
it
is
true
.
"re-detect"
:
true
},
//
We
need
to
specify
the
the
database
used
to
store
leases.
As
of
...
...
doc/examples/kea6/advanced.json
View file @
4fa4c9a0
...
...
@@ -16,7 +16,11 @@
{
//
Kea
is
told
to
listen
on
ethX
network
interface
only.
"interfaces-config"
:
{
"interfaces"
:
[
"ethX"
]
"interfaces"
:
[
"ethX"
],
//
This
makes
interfaces
to
be
re-detected
at
each
(re-)configuration.
//
By
default
it
is
true
.
"re-detect"
:
true
},
//
We
need
to
specify
the
the
database
used
to
store
leases.
As
of
...
...
src/bin/dhcp4/dhcp4_lexer.ll
View file @
4fa4c9a0
...
...
@@ -226,6 +226,15 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"
re-detect\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::INTERFACES_CONFIG:
return isc::dhcp::Dhcp4Parser::make_RE_DETECT(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("
re-detect
", driver.loc_);
}
}
\"
lease-database\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP4:
...
...
src/bin/dhcp4/dhcp4_parser.yy
View file @
4fa4c9a0
...
...
@@ -55,6 +55,7 @@ using namespace std;
DHCP_SOCKET_TYPE "dhcp-socket-type"
RAW "raw"
UDP "udp"
RE_DETECT "re-detect"
ECHO_CLIENT_ID "echo-client-id"
MATCH_CLIENT_ID "match-client-id"
...
...
@@ -456,6 +457,7 @@ interfaces_config_params: interfaces_config_param
interfaces_config_param: interfaces_list
| dhcp_socket_type
| re_detect
;
sub_interfaces4: LCURLY_BRACKET {
...
...
@@ -487,6 +489,12 @@ socket_type: RAW { $$ = ElementPtr(new StringElement("raw", ctx.loc2pos(@1))); }
| UDP { $$ = ElementPtr(new StringElement("udp", ctx.loc2pos(@1))); }
;
re_detect: RE_DETECT COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("re-detect", b);
};
lease_database: LEASE_DATABASE {
ElementPtr i(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("lease-database", i);
...
...
src/bin/dhcp6/dhcp6_lexer.ll
View file @
4fa4c9a0
...
...
@@ -416,6 +416,15 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"
re-detect\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::INTERFACES_CONFIG:
return isc::dhcp::Dhcp6Parser::make_RE_DETECT(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("
re-detect
", driver.loc_);
}
}
\"
lease-database\
" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
...
...
src/bin/dhcp6/dhcp6_parser.yy
View file @
4fa4c9a0
...
...
@@ -52,6 +52,7 @@ using namespace std;
DHCP6 "Dhcp6"
INTERFACES_CONFIG "interfaces-config"
INTERFACES "interfaces"
RE_DETECT "re-detect"
LEASE_DATABASE "lease-database"
HOSTS_DATABASE "hosts-database"
...
...
@@ -449,7 +450,7 @@ interfaces_config: INTERFACES_CONFIG {
ctx.stack_.back()->set("interfaces-config", i);
ctx.stack_.push_back(i);
ctx.enter(ctx.INTERFACES_CONFIG);
} COLON LCURLY_BRACKET interface
_config_map
RCURLY_BRACKET {
} COLON LCURLY_BRACKET interface
s_config_params
RCURLY_BRACKET {
ctx.stack_.pop_back();
ctx.leave();
};
...
...
@@ -458,11 +459,19 @@ sub_interfaces6: LCURLY_BRACKET {
// Parse the interfaces-config map
ElementPtr m(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.push_back(m);
} interface
_config_map
RCURLY_BRACKET {
} interface
s_config_params
RCURLY_BRACKET {
// parsing completed
};
interface_config_map: INTERFACES {
interfaces_config_params: interfaces_config_param
| interfaces_config_params COMMA interfaces_config_param
;
interfaces_config_param: interfaces_list
| re_detect
;
interfaces_list: INTERFACES {
ElementPtr l(new ListElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("interfaces", l);
ctx.stack_.push_back(l);
...
...
@@ -472,6 +481,12 @@ interface_config_map: INTERFACES {
ctx.leave();
};
re_detect: RE_DETECT COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("re-detect", b);
};
lease_database: LEASE_DATABASE {
ElementPtr i(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("lease-database", i);
...
...
src/lib/dhcpsrv/parsers/ifaces_config_parser.cc
View file @
4fa4c9a0
// Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2015
,2017
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
...
...
@@ -20,7 +20,7 @@ namespace dhcp {
void
IfacesConfigParser
::
parseInterfacesList
(
const
CfgIfacePtr
&
cfg_iface
,
ConstElementPtr
ifaces_list
)
{
ConstElementPtr
ifaces_list
)
{
BOOST_FOREACH
(
ConstElementPtr
iface
,
ifaces_list
->
listValue
())
{
std
::
string
iface_name
=
iface
->
stringValue
();
try
{
...
...
@@ -45,6 +45,15 @@ IfacesConfigParser::parse(const CfgIfacePtr& cfg,
bool
socket_type_specified
=
false
;
BOOST_FOREACH
(
ConfigPair
element
,
ifaces_config
->
mapValue
())
{
try
{
// Check for re-detect before calling parseInterfacesList()
if
(
element
.
first
==
"re-detect"
)
{
if
(
element
.
second
->
boolValue
())
{
IfaceMgr
::
instance
().
clearIfaces
();
IfaceMgr
::
instance
().
detectIfaces
();
}
continue
;
}
if
(
element
.
first
==
"interfaces"
)
{
parseInterfacesList
(
cfg
,
element
.
second
);
continue
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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