2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 13:07:50 +00:00

22338 Commits

Author SHA1 Message Date
Marcin Siodelski
749b1261ca [4204] Extended expression parser tests to reference option by name. 2015-11-24 12:31:52 +01:00
Marcin Siodelski
99d13c7de0 [4204] TokenOption uses binary option format for evaluation.
This fixes a bug in the TokenOption class which used the hexadecimal
format of the option when comparing with TokenHexString. Note that
TokenHexString is automatically converted to binary format for
evaluation.
2015-11-24 10:39:40 +01:00
Marcin Siodelski
77e78881aa [4204] Eval parser allows for referencing option by its name. 2015-11-23 22:01:47 +01:00
Marcin Siodelski
6011b53235 [4204] OptionDef config parser updates runtime definitions in libdhcp. 2015-11-23 13:33:04 +01:00
Marcin Siodelski
1e7bdebfd5 [4204] Runtime option definitions are stored in LibDHCP. 2015-11-23 13:33:04 +01:00
Marcin Siodelski
b6beda2888 [4204] Runtime option definitions held in the libdhcp++ library. 2015-11-23 13:33:04 +01:00
Marcin Siodelski
bcc247cccb [master] Added ChangeLog entry for #4093. trac4204_base 2015-11-23 10:26:07 +01:00
Marcin Siodelski
c303175849 [master] Merge branch 'trac4093' 2015-11-23 10:25:13 +01:00
Francis Dupont
37a67a6b34 [master] Style of last git entries 2015-11-20 23:28:06 +01:00
Marcin Siodelski
c1293f6db7 [4093] Addressed review comments. 2015-11-20 14:59:49 +01:00
Thomas Markwalder
2e47244a98 [master] Added ChangeLog entry 1051 for Trac #4096. trac4097a_base 2015-11-19 15:00:48 -05:00
Thomas Markwalder
d21fd69259 [master] DHCP servers now support client-classes element
Merges in branch 'trac4096'
2015-11-19 14:31:25 -05:00
Thomas Markwalder
b1a10eb28c [4096] Reworded error message 2015-11-19 13:24:48 -05:00
Francis Dupont
df93df3f84 [4096] Removed two spurious extra lines (cut & paste typos) 2015-11-19 17:55:49 +01:00
Francis Dupont
80b1ee66d2 [4096] Removed @todo and changed Bison for Eval 2015-11-19 17:40:59 +01:00
Marcin Siodelski
b070bb9cb3 [4093] Updated eval section of Developer's Guide. 2015-11-19 16:26:49 +01:00
Thomas Markwalder
ca10116a5d [4096] Added unit test for an blank client class name 2015-11-19 10:21:30 -05:00
Marcin Siodelski
ae94eaf209 [4093] Applying changes to the files generated by bison. 2015-11-19 16:02:07 +01:00
Marcin Siodelski
00effa23d3 [4093] Support for option[123].hex operator. 2015-11-19 15:59:32 +01:00
Thomas Markwalder
5305d4ea4d [4096] Integrated use of Eval expression parsing
src/lib/dhcpsrv/client_class_def.cc
    - updated comment on empty expressions in ctor,
    - cleaned up whitespace

src/lib/dhcpsrv/parsers/client_class_def_parser.cc
    - ExpressionParser::build() - integrated use of Eval
    parsing in ExpressionParser
    - cleaned up whitespace

src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
    Updated tests to verify that expressions are actually
    parsed and function.
2015-11-19 09:32:21 -05:00
Marcin Siodelski
eb932d6809 [4093] TokenOption may evaluate using hexadecimal format. 2015-11-19 15:01:08 +01:00
Marcin Siodelski
0d6a66ecfb [4093] Implemented Option::toHexString method. 2015-11-19 14:46:39 +01:00
Thomas Markwalder
60a518e724 [4096] Pull in changes from Francis
Merge branch 'trac4096' of ssh://git.kea.isc.org/git/kea into trac4096
2015-11-19 06:57:57 -05:00
Marcin Siodelski
5ad49c1f75 [4093] Extended TokenOption class ctor with representation type. 2015-11-19 12:52:27 +01:00
Marcin Siodelski
b1cc5e4380 [4093] Use option[123].text rather than option[123] for option text. 2015-11-19 12:41:00 +01:00
Francis Dupont
7911ff6e2f [4096] Fixed spelling fixes 2015-11-19 01:08:49 +01:00
Thomas Markwalder
02f6c505d1 [4096] Merge branch 'master' into trac4096
Eval library now supports actual parsing.  Need to use it
    in class definition's ExpressionParser.
2015-11-18 15:10:13 -05:00
Thomas Markwalder
668ec9e68f [4096] Addressed review comments
src/bin/dhcp4/tests/config_parser_unittest.cc
src/bin/dhcp6/tests/config_parser_unittest.cc
src/lib/dhcpsrv/client_class_def.h
    Fixed spellings and spacing.

src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/tests/Makefile.am
    Move eval lib up in the link order
2015-11-18 15:04:55 -05:00
Francis Dupont
5bb87b1ef4 [4096] speliing 2015-11-18 17:29:36 +01:00
Francis Dupont
5a456a9009 [4096] spaces & spelling 2015-11-18 16:48:03 +01:00
Francis Dupont
5e3af86871 [4096] Added a space for readability 2015-11-18 16:32:15 +01:00
Francis Dupont
92aff79502 [4096] Added a space for readability 2015-11-18 16:30:50 +01:00
Francis Dupont
dd9843b528 [4096] spelling 2015-11-18 16:15:44 +01:00
Thomas Markwalder
ab2bcf4e9b [master] Added Changelog entry 1050 for #4117. trac4203_base 2015-11-18 07:27:27 -05:00
Thomas Markwalder
034c1c95b5 [master] Swapped ncr-protocol and ncr-format descriptions in Kea Admin Guide
Merged in branch 'trac4117'
2015-11-18 07:09:43 -05:00
Francis Dupont
fa1e32d952 [master] Finished merge of trac4094 (class evaluator) 2015-11-18 09:52:21 +01:00
Thomas Markwalder
b260200e6f [4096] Move libeval up in lib/Makefile.am
Now that libdhcpsrv depends on libeval, eval must be built first.
2015-11-17 14:33:50 -05:00
Thomas Markwalder
db990992e4 [4096] kea-dhcp6 now parses client class definitions list
src/bin/dhcp6/json_config_parser.cc
        - createGlobalDhcp6ConfigParser() - creates ClientClassDefListParser
        for "client-classes" element
        - configureDhcp6Server() - runs the ClientClassDefListParser against
        the "client-classes" element

    src/bin/dhcp6/tests/config_parser_unittest.cc
        Added new tests for parsing client class definitions:
        TEST_F(Dhcp6ParserTest, clientClassDictionary)
        TEST_F(Dhcp6ParserTest, invalidClientClassDictionary)

    src/bin/dhcp6/dhcp6.spec
        Added global "client-classes" element
2015-11-17 13:46:02 -05:00
Thomas Markwalder
a419556f01 [4096] kea-dhcp4 now parses client class definitions list
src/bin/dhcp4/json_config_parser.cc
    - createGlobalDhcp4ConfigParser() - creates ClientClassDefListParser
    for "client-classes" element
    - configureDhcp4Server() - runs the ClientClassDefListParser against
    the "client-classes" element

src/bin/dhcp4/tests/config_parser_unittest.cc
    Added new tests for parsing client class definitions:
    TEST_F(Dhcp4ParserTest, clientClassDictionary)
    TEST_F(Dhcp4ParserTest, invalidClientClassDictionary)

src/bin/dhcp4/dhcp4.spec
    Added global "client-classes" element
2015-11-17 13:28:40 -05:00
Thomas Markwalder
559c0a696a [4096] Added client class dictionary to SrvConfig
src/lib/dhcpsrv/parsers/client_class_def_parser.cc
    ClientClassDefListParser::commit() - pushes the newly built local
    dictionary to CfgMgr staging

src/lib/dhcpsrv/srv_config.h
src/lib/dhcpsrv/srv_config.cc
    Added client class dictionary member to SrvConfig

src/lib/dhcpsrv/tests/client_class_def_parser_unittest.cc
    TEST_F(ClientClassDefListParserTest, simpleValidList) - now
    verifies that ClientClassDefListParser::commit() pushes its
    local dictionary to CfgMgr staging.

src/lib/dhcpsrv/tests/srv_config_unittest.cc
    Added support to test new client class dictionary member
2015-11-17 10:53:05 -05:00
Thomas Markwalder
87ed3316ec [4096] Added copy constructors and equality tools to client class storage
In anticipation adding client class storage to SrvConfig:

src/lib/dhcpsrv/client_class_def.h
src/lib/dhcpsrv/client_class_def.cc
    added copy contructor, equals() method, ==, != operators
    To ClientClassDef and ClientClassDictionary

src/lib/dhcpsrv/tests/client_class_def_unittest.cc
    Added copyAndEquality tests for ClientClassDef and
    ClientClassDictionary
2015-11-17 09:07:54 -05:00
Francis Dupont
c4557eef26 [master] Updated git hash 2015-11-17 14:41:25 +01:00
Francis Dupont
18321bf85f [master] Finished merge of trac4125 (parser build) 2015-11-17 14:40:45 +01:00
Francis Dupont
f4bf83b15c [master] Merge trac4125 (parser build) 2015-11-17 14:30:35 +01:00
Thomas Markwalder
dd80413a61 [4096] Added parsers for client class definitions
New Files:
    parsers/client_class_def_parser.cc
    parsers/client_class_def_parser.h
    tests/client_class_def_parser_unittest.cc

src/lib/dhcpsrv/parsers/Makefile.am
    Added entries for new files
    Added EXTRA_DIST entries for several files that were missing.

src/lib/dhcpsrv/parsers/dhcp_parsers.h
    Added typedef for OptionDataListParserPtr

src/lib/dhcpsrv/tests/Makefile.am
    Added entries for new unitest file

src/lib/dhcpsrv/tests/client_class_def_unittest.cc
    Fixed broken unit test TEST(ClientClassDef, cfgOptionBasics)
2015-11-16 13:29:38 -05:00
Francis Dupont
809dc82912 [4125] Updated *.hh timestamps 2015-11-15 06:54:06 +01:00
Francis Dupont
2c39600ea5 [4125] Fixed variable init (BTW a false positive as ctx.error throws) 2015-11-14 21:54:29 +01:00
Francis Dupont
14e1063618 [4125] Made the parser target dependent on --enable-generate-parser 2015-11-14 20:17:01 +01:00
Francis Dupont
1e9e05b085 [master] Added *.hh files as sources 2015-11-14 19:18:38 +01:00
Francis Dupont
e1e91c6c05 [master] Restored *.hh timestamps trac4201_base 2015-11-14 15:28:01 +01:00