mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[5017] 4o6-interface-id support implemented

Browse Source
This commit is contained in:
Tomek Mrugalski
2016-12-16 18:45:14 +01:00
parent 1c5c135452
commit 9fccdbf54c
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/dhcp4/dhcp4_lexer.ll
View File

@@ -842,6 +842,15 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
} }
} }
\"4o6-interface-id\" {
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::SUBNET4:
return isc::dhcp::Dhcp4Parser::make_SUBNET_4O6_INTERFACE_ID(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("4o6-interface-id", driver.loc_);
}
}
\"4o6-subnet\" { \"4o6-subnet\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case isc::dhcp::Parser4Context::SUBNET4: case isc::dhcp::Parser4Context::SUBNET4:

12
src/bin/dhcp4/dhcp4_parser.yy
View File

@@ -75,6 +75,7 @@ using namespace std;
DECLINE_PROBATION_PERIOD "decline-probation-period" DECLINE_PROBATION_PERIOD "decline-probation-period"
SUBNET4 "subnet4" SUBNET4 "subnet4"
SUBNET_4O6_INTERFACE "4o6-interface" SUBNET_4O6_INTERFACE "4o6-interface"
SUBNET_4O6_INTERFACE_ID "4o6-interface-id"
SUBNET_4O6_SUBNET "4o6-subnet" SUBNET_4O6_SUBNET "4o6-subnet"
OPTION_DEF "option-def" OPTION_DEF "option-def"
OPTION_DATA "option-data" OPTION_DATA "option-data"
@@ -726,7 +727,10 @@ subnet4_param: valid_lifetime
| reservations | reservations
| reservation_mode | reservation_mode
| relay | relay
| match_client_id
| next_server
| subnet_4o6_interface | subnet_4o6_interface
| subnet_4o6_interface_id
| subnet_4o6_subnet | subnet_4o6_subnet
| unknown_map_entry | unknown_map_entry
; ;
@@ -747,6 +751,14 @@ subnet_4o6_interface: SUBNET_4O6_INTERFACE {
ctx.leave(); ctx.leave();
}; };
subnet_4o6_interface_id: SUBNET_4O6_INTERFACE_ID {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr iface(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("4o6-interface-id", iface);
ctx.leave();
};
subnet_4o6_subnet: SUBNET_4O6_SUBNET { subnet_4o6_subnet: SUBNET_4O6_SUBNET {
ctx.enter(ctx.NO_KEYWORD); ctx.enter(ctx.NO_KEYWORD);
} COLON STRING { } COLON STRING {