2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Commit Graph

22346 Commits

Author SHA1 Message Date
Francis Dupont
8aa346b44d [4097a] Aligned DHCP6_CLASS_* messages 2015-11-25 13:09:42 +01:00
Francis Dupont
e11158fc1e [4097a] Added Dhcpv4SrvTest.subnetGlobalPriority 2015-11-25 13:01:24 +01:00
Francis Dupont
52887c0ca1 [4097a] Added check of other options to Dhcp4ParserTest.optionDataDefaultsGlobal 2015-11-25 11:47:01 +01:00
Francis Dupont
525a66ecee [4097a] Added the CfgOptionList explaination to its declaration 2015-11-25 11:36:04 +01:00
Francis Dupont
c6bced0e1c [4097a] Added (non-)const comment 2015-11-25 11:32:04 +01:00
Francis Dupont
d40a3b4114 [4097a] Added a no subnet check in buildCfgOptionList() 2015-11-25 11:27:55 +01:00
Shawn Routhier
95fd3715b4 [trac4097] Fix some typos 2015-11-25 00:19:15 -08:00
Francis Dupont
c1270cb6ab [4097a] Addressed not configured class VENDOR_CLASS_* 2015-11-24 01:51:10 +01:00
Francis Dupont
f397db49d4 [4097a] Optimized the no configured options cases 2015-11-23 15:34:53 +01:00
Francis Dupont
fd12a6d69f [4097a] Merged #4093 2015-11-23 14:56:49 +01:00
Francis Dupont
09df1b387a [4097a] Removed no longer used argument 2015-11-22 18:39:23 +01:00
Francis Dupont
c50a482e47 [4097a] Finished the DHCPv6 part 2015-11-22 09:06:29 +01:00
Francis Dupont
db7f698d7f [4097a] Removed merging of global configured options into subnets 2015-11-21 15:58:12 +01:00
Francis Dupont
e0c80090d6 [4097a] Ported DHCPv4 code to DHCPv6 (unfinished) 2015-11-21 15:40:33 +01:00
Francis Dupont
b925400a12 [4097a] Introduce CfgOptionList and use it for the 3 append/getCfgOption() methods 2015-11-21 14:45:08 +01:00
Francis Dupont
102820fc35 [4097a] Moved specific processing to appendRequestedOptions and renamed classSpecificProcessing 2015-11-21 13:22:57 +01:00
Francis Dupont
0c120e9d3e [4097a] Added a new message for unconfigured classes 2015-11-21 10:28:05 +01:00
Francis Dupont
e2e0a9bedc [4097a] Merge branch 'trac4097a' of ssh://git.kea.isc.org/git/kea into trac4097a 2015-11-21 09:24:06 +01:00
Francis Dupont
4b644a946c [4097a] Changed classSpecificProcessing to be applied only to requested options 2015-11-21 09:23:24 +01:00
Shawn Routhier
5d370d081b [trac4097a] Tidy up some text in the comments 2015-11-20 22:07:37 -08:00
Francis Dupont
01dd8b4fa3 [4097a] Split classifyPacket into 2 parts as proposed 2015-11-20 23:18:21 +01:00
Francis Dupont
b66c0b8cff [4097a] Switched class iterators 2015-11-20 16:29:10 +01:00
Francis Dupont
92b4df9e90 [4097a] Added a ClientClasses iteration unit test 2015-11-20 16:12:27 +01:00
Francis Dupont
336a2215ce [4097a] Added class vs other addOption priority unit tests 2015-11-20 15:51:23 +01:00
Francis Dupont
ac0de4134f [4097a] Rebased and updated trac4097 code (still some comments to address) 2015-11-20 14:41:18 +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
Thomas Markwalder
ca10116a5d [4096] Added unit test for an blank client class name 2015-11-19 10:21:30 -05: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
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
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