mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[master] Tried another way to fix UDP flex overload

Browse Source
This commit is contained in:
Francis Dupont
2017-01-16 14:19:20 +01:00
parent 1ab759dc97
commit b053f42907
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,6 +207,16 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
} }
} }
\"udp\" {
switch(driver.ctx_) {
case isc::dhcp::Parser4Context::DHCP_SOCKET_TYPE:
case isc::dhcp::Parser4Context::NCR_PROTOCOL:
return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_);
default:
return isc::dhcp::Dhcp4Parser::make_STRING("udp", driver.loc_);
}
}
\"interfaces\" { \"interfaces\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case isc::dhcp::Parser4Context::INTERFACES_CONFIG: case isc::dhcp::Parser4Context::INTERFACES_CONFIG:
@@ -1017,10 +1027,8 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
(?i:\"UDP\") { (?i:\"UDP\") {
/* dhcp-ddns value keywords are case insensitive */ /* dhcp-ddns value keywords are case insensitive */
if ((driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) || if (driver.ctx_ == isc::dhcp::Parser4Context::NCR_PROTOCOL) {
((driver.ctx_ == isc::dhcp::Parser4Context::DHCP_SOCKET_TYPE) && return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_);
(yytext == "\"udp\""))) {
return isc::dhcp::Dhcp4Parser::make_UDP(driver.loc_);
} }
std::string tmp(yytext+1); std::string tmp(yytext+1);
tmp.resize(tmp.size() - 1); tmp.resize(tmp.size() - 1);