]>
git.ipfire.org Git - thirdparty/kea.git/log
Tomek Mrugalski [Tue, 24 Nov 2015 20:42:19 +0000 (21:42 +0100)]
[3569] Implemented configuration for host data source.
Francis Dupont [Mon, 23 Nov 2015 21:52:04 +0000 (22:52 +0100)]
[master] Merged trac4201 (distcheck warning)
Francis Dupont [Mon, 23 Nov 2015 21:51:10 +0000 (22:51 +0100)]
[master] Revert only the trac4121 merge
Francis Dupont [Mon, 23 Nov 2015 21:47:59 +0000 (22:47 +0100)]
[master] Revert "[master] Added ChangeLog entry 1054 for Trac #4202"
This reverts commit
d4acc5160abf9aa521285889a2025d64be02fdc3 .
Francis Dupont [Mon, 23 Nov 2015 21:44:35 +0000 (22:44 +0100)]
[master] Merged trac4121 (distcheck warning)
Thomas Markwalder [Mon, 23 Nov 2015 20:24:49 +0000 (15:24 -0500)]
[master] Added ChangeLog entry 1054 for Trac #4202
Thomas Markwalder [Mon, 23 Nov 2015 20:09:28 +0000 (15:09 -0500)]
[master] Replaced underscores with hyphens in D2 config and NCRs
Merged in branch 'trac4202'
Thomas Markwalder [Mon, 23 Nov 2015 20:05:16 +0000 (15:05 -0500)]
[4202] Addressed review comments
Fixed missed underscores in commentary
src/bin/d2/tests/nc_test_utils.h
src/lib/dhcp_ddns/ncr_msg.h
Thomas Markwalder [Mon, 23 Nov 2015 18:22:56 +0000 (13:22 -0500)]
[4202] Replaced underscores with hypens in NCR JSON element names
The NCR element names have also been changed to use hyphens. This touched
quita a few unit tests. Files modified:
src/bin/d2/tests/d2_process_unittests.cc
src/bin/d2/tests/d2_queue_mgr_unittests.cc
src/bin/d2/tests/d2_update_mgr_unittests.cc
src/bin/d2/tests/nc_add_unittests.cc
src/bin/d2/tests/nc_remove_unittests.cc
src/bin/d2/tests/nc_test_utils.cc
src/bin/d2/tests/nc_trans_unittests.cc
src/bin/dhcp4/tests/d2_unittest.cc
src/bin/dhcp6/tests/d2_unittest.cc
src/lib/dhcp_ddns/libdhcp_ddns.dox
src/lib/dhcp_ddns/ncr_msg.cc
src/lib/dhcp_ddns/tests/ncr_udp_unittests.cc
src/lib/dhcp_ddns/tests/ncr_unittests.cc
src/lib/dhcpsrv/tests/d2_udp_unittest.cc
Tomek Mrugalski [Mon, 23 Nov 2015 17:53:56 +0000 (18:53 +0100)]
[master] ChangeLog updated.
Tomek Mrugalski [Mon, 23 Nov 2015 17:37:57 +0000 (18:37 +0100)]
[master] Merge branch 'trac3990' (User's Guide update for Decline)
Francis Dupont [Mon, 23 Nov 2015 13:53:43 +0000 (14:53 +0100)]
[master] Updated option[xxx] in comments
Francis Dupont [Mon, 23 Nov 2015 13:50:46 +0000 (14:50 +0100)]
[master] Added timestamp to *.hh files
Marcin Siodelski [Mon, 23 Nov 2015 09:26:07 +0000 (10:26 +0100)]
[master] Added ChangeLog entry for #4093.
Marcin Siodelski [Mon, 23 Nov 2015 08:47:40 +0000 (09:47 +0100)]
[master] Merge branch 'trac4093'
Francis Dupont [Fri, 20 Nov 2015 22:28:06 +0000 (23:28 +0100)]
[master] Style of last git entries
Thomas Markwalder [Fri, 20 Nov 2015 15:11:47 +0000 (10:11 -0500)]
[4202] Update miscellaneous tests and example files
Replaced underscores with hypens in D2 config in remaining files:
doc/examples/ddns/sample1.json
doc/examples/ddns/template.json
doc/guide/ddns.xml
src/bin/d2/tests/d2_process_tests.sh.in
src/bin/keactrl/kea.conf.pre
src/bin/keactrl/tests/keactrl_tests.sh.in
Thomas Markwalder [Fri, 20 Nov 2015 14:36:37 +0000 (09:36 -0500)]
[4202] Replaced underscore with hypen in src/bin/d2 for kea-ddns parameters
Updated D2 server code, spec file, and tests with hypenated
configuration elements names
Marcin Siodelski [Fri, 20 Nov 2015 13:59:49 +0000 (14:59 +0100)]
[4093] Addressed review comments.
Thomas Markwalder [Thu, 19 Nov 2015 20:00:48 +0000 (15:00 -0500)]
[master] Added ChangeLog entry 1051 for Trac #4096.
Thomas Markwalder [Thu, 19 Nov 2015 19:31:25 +0000 (14:31 -0500)]
[master] DHCP servers now support client-classes element
Merges in branch 'trac4096'
Thomas Markwalder [Thu, 19 Nov 2015 18:24:48 +0000 (13:24 -0500)]
[4096] Reworded error message
Francis Dupont [Thu, 19 Nov 2015 16:55:49 +0000 (17:55 +0100)]
[4096] Removed two spurious extra lines (cut & paste typos)
Shawn Routhier [Thu, 19 Nov 2015 16:54:56 +0000 (08:54 -0800)]
[trac3990] Add v4 statistics descriptions
Francis Dupont [Thu, 19 Nov 2015 16:40:59 +0000 (17:40 +0100)]
[4096] Removed @todo and changed Bison for Eval
Marcin Siodelski [Thu, 19 Nov 2015 15:26:49 +0000 (16:26 +0100)]
[4093] Updated eval section of Developer's Guide.
Thomas Markwalder [Thu, 19 Nov 2015 15:21:30 +0000 (10:21 -0500)]
[4096] Added unit test for an blank client class name
Marcin Siodelski [Thu, 19 Nov 2015 15:02:07 +0000 (16:02 +0100)]
[4093] Applying changes to the files generated by bison.
Marcin Siodelski [Thu, 19 Nov 2015 14:58:16 +0000 (15:58 +0100)]
[4093] Support for option[123].hex operator.
Thomas Markwalder [Thu, 19 Nov 2015 14:32:21 +0000 (09:32 -0500)]
[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.
Marcin Siodelski [Thu, 19 Nov 2015 13:59:31 +0000 (14:59 +0100)]
[4093] TokenOption may evaluate using hexadecimal format.
Marcin Siodelski [Thu, 19 Nov 2015 13:46:39 +0000 (14:46 +0100)]
[4093] Implemented Option::toHexString method.
Thomas Markwalder [Thu, 19 Nov 2015 11:57:57 +0000 (06:57 -0500)]
[4096] Pull in changes from Francis
Merge branch 'trac4096' of ssh://git.kea.isc.org/git/kea into trac4096
Marcin Siodelski [Thu, 19 Nov 2015 11:52:27 +0000 (12:52 +0100)]
[4093] Extended TokenOption class ctor with representation type.
Marcin Siodelski [Thu, 19 Nov 2015 11:04:01 +0000 (12:04 +0100)]
[4093] Use option[123].text rather than option[123] for option text.
Shawn Routhier [Thu, 19 Nov 2015 06:44:05 +0000 (22:44 -0800)]
[trac3990] Typo changes
Some suggested changes to tidy up some of the text.
Francis Dupont [Thu, 19 Nov 2015 00:08:49 +0000 (01:08 +0100)]
[4096] Fixed spelling fixes
Thomas Markwalder [Wed, 18 Nov 2015 20:10:13 +0000 (15:10 -0500)]
[4096] Merge branch 'master' into trac4096
Eval library now supports actual parsing. Need to use it
in class definition's ExpressionParser.
Thomas Markwalder [Wed, 18 Nov 2015 20:04:55 +0000 (15:04 -0500)]
[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
Francis Dupont [Wed, 18 Nov 2015 16:29:36 +0000 (17:29 +0100)]
[4096] speliing
Francis Dupont [Wed, 18 Nov 2015 15:48:03 +0000 (16:48 +0100)]
[4096] spaces & spelling
Francis Dupont [Wed, 18 Nov 2015 15:32:15 +0000 (16:32 +0100)]
[4096] Added a space for readability
Tomek Mrugalski [Wed, 18 Nov 2015 15:31:20 +0000 (16:31 +0100)]
[3990] User's guide now explains how Decline support works.
Francis Dupont [Wed, 18 Nov 2015 15:30:50 +0000 (16:30 +0100)]
[4096] Added a space for readability
Francis Dupont [Wed, 18 Nov 2015 15:15:44 +0000 (16:15 +0100)]
[4096] spelling
Thomas Markwalder [Wed, 18 Nov 2015 12:27:27 +0000 (07:27 -0500)]
[master] Added Changelog entry 1050 for #4117.
Thomas Markwalder [Wed, 18 Nov 2015 12:09:43 +0000 (07:09 -0500)]
[master] Swapped ncr-protocol and ncr-format descriptions in Kea Admin Guide
Merged in branch 'trac4117'
Francis Dupont [Wed, 18 Nov 2015 08:52:21 +0000 (09:52 +0100)]
[master] Finished merge of trac4094 (class evaluator)
Thomas Markwalder [Tue, 17 Nov 2015 19:33:50 +0000 (14:33 -0500)]
[4096] Move libeval up in lib/Makefile.am
Now that libdhcpsrv depends on libeval, eval must be built first.
Thomas Markwalder [Tue, 17 Nov 2015 18:46:02 +0000 (13:46 -0500)]
[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
Thomas Markwalder [Tue, 17 Nov 2015 18:28:40 +0000 (13:28 -0500)]
[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
Thomas Markwalder [Tue, 17 Nov 2015 15:53:05 +0000 (10:53 -0500)]
[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
Thomas Markwalder [Tue, 17 Nov 2015 14:07:54 +0000 (09:07 -0500)]
[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
Francis Dupont [Tue, 17 Nov 2015 13:41:25 +0000 (14:41 +0100)]
[master] Updated git hash
Francis Dupont [Tue, 17 Nov 2015 13:40:45 +0000 (14:40 +0100)]
[master] Finished merge of trac4125 (parser build)
Francis Dupont [Tue, 17 Nov 2015 13:30:35 +0000 (14:30 +0100)]
[master] Merge trac4125 (parser build)
Thomas Markwalder [Mon, 16 Nov 2015 18:27:16 +0000 (13:27 -0500)]
[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)
Francis Dupont [Sun, 15 Nov 2015 05:54:06 +0000 (06:54 +0100)]
[4125] Updated *.hh timestamps
Francis Dupont [Sat, 14 Nov 2015 20:54:29 +0000 (21:54 +0100)]
[4125] Fixed variable init (BTW a false positive as ctx.error throws)
Francis Dupont [Sat, 14 Nov 2015 19:17:01 +0000 (20:17 +0100)]
[4125] Made the parser target dependent on --enable-generate-parser
Francis Dupont [Sat, 14 Nov 2015 18:35:40 +0000 (19:35 +0100)]
[4201] Second attempt with a better fix
Francis Dupont [Sat, 14 Nov 2015 18:18:38 +0000 (19:18 +0100)]
[master] Added *.hh files as sources
Francis Dupont [Sat, 14 Nov 2015 17:40:06 +0000 (18:40 +0100)]
[4201] Fixed DISTCHECK_CRYPTO_CONFIGURE_FLAG for Botan
Francis Dupont [Sat, 14 Nov 2015 14:28:01 +0000 (15:28 +0100)]
[master] Restored *.hh timestamps
Francis Dupont [Sat, 14 Nov 2015 14:27:30 +0000 (15:27 +0100)]
[master] Changed *.hh timestamps
Francis Dupont [Sat, 14 Nov 2015 14:23:00 +0000 (15:23 +0100)]
[master] Minor fix to configure.ac
Francis Dupont [Sat, 14 Nov 2015 14:10:58 +0000 (15:10 +0100)]
[master] Updated git hash
Francis Dupont [Sat, 14 Nov 2015 14:09:06 +0000 (15:09 +0100)]
[master] Finished merge of trac4088 (client classification expression parser)
Francis Dupont [Sat, 14 Nov 2015 14:06:22 +0000 (15:06 +0100)]
[master] Merged trac4088 (client classification expression parser)
Francis Dupont [Sat, 14 Nov 2015 14:03:35 +0000 (15:03 +0100)]
[4088] Merged trac4088fd private branch
Francis Dupont [Sat, 14 Nov 2015 07:39:27 +0000 (08:39 +0100)]
[4088fd] Added a generated date comment to avoid the "no commit because unchanged" #4125 issue
Francis Dupont [Fri, 13 Nov 2015 22:21:13 +0000 (23:21 +0100)]
[4094] Changed EvalNotBoolError to shared EvalTypeError
Francis Dupont [Fri, 13 Nov 2015 21:02:04 +0000 (22:02 +0100)]
[4121] Cloned LibDHCP::packOptions and improved the v4 version
Francis Dupont [Fri, 13 Nov 2015 15:53:23 +0000 (16:53 +0100)]
[4088fd] Changed the syntax to unquote integers
Francis Dupont [Fri, 13 Nov 2015 15:16:23 +0000 (16:16 +0100)]
[4088fd] Added protection against integer overflow
Thomas Markwalder [Fri, 13 Nov 2015 15:16:11 +0000 (10:16 -0500)]
[4096] ClientClassDef now stores CfgOption not OptionCollection
The initial choice for storing options as an OptionCollection
in the ClientClassDef was incorrect. They are now stored within
a CfgOption which is symmetrical with how they are stored globally
and in subnets.
Francis Dupont [Fri, 13 Nov 2015 15:01:32 +0000 (16:01 +0100)]
[4088fd] cleanup grammar (indent, no untyped)
Thomas Markwalder [Thu, 12 Nov 2015 16:05:10 +0000 (11:05 -0500)]
[4117] Fixed ncr-protocol/ncr-format doc in admin guide
Descriptions of the two parameters, ncr-protocol and ncr-format
were swapped in three places (but hey, we were consistent!):
doc/guide/ddns.xml
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml
Stephen Morris [Thu, 12 Nov 2015 12:50:53 +0000 (12:50 +0000)]
[master] ChangeLog for trac3259
Stephen Morris [Thu, 12 Nov 2015 12:48:30 +0000 (12:48 +0000)]
[master] Merge branch 'trac3259'
Francis Dupont [Wed, 11 Nov 2015 21:55:38 +0000 (22:55 +0100)]
[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea
Francis Dupont [Wed, 11 Nov 2015 21:55:18 +0000 (22:55 +0100)]
[master] Trivial comment fix
Thomas Markwalder [Wed, 11 Nov 2015 20:24:43 +0000 (15:24 -0500)]
[master] Added ChangeLog entry 1046 for #3601
Thomas Markwalder [Wed, 11 Nov 2015 20:19:38 +0000 (15:19 -0500)]
[master] Removed periods from log messages
src/lib/dhcpsrv/dhcpsrv_messages.mes
Thomas Markwalder [Wed, 11 Nov 2015 19:58:12 +0000 (14:58 -0500)]
[master] MemfileLeaseMgr now supports upgrading/downgrading lease files
Merged in branch 'trac3601'
Thomas Markwalder [Wed, 11 Nov 2015 19:55:57 +0000 (14:55 -0500)]
[3601] More review comments
Minor log message and comment wording
Thomas Markwalder [Wed, 11 Nov 2015 16:23:44 +0000 (11:23 -0500)]
[master] Added ChangeLog entry 1045 for #4095
Francis Dupont [Wed, 11 Nov 2015 16:13:54 +0000 (17:13 +0100)]
[4088fd] Removed unused File functions
Thomas Markwalder [Wed, 11 Nov 2015 16:05:28 +0000 (11:05 -0500)]
[master] Added client class storgae classes to libdhcpsrv
Merged in #4095.
Francis Dupont [Wed, 11 Nov 2015 16:02:12 +0000 (17:02 +0100)]
[master] Added a check on rcode avoiding unused errors
Francis Dupont [Wed, 11 Nov 2015 15:21:04 +0000 (16:21 +0100)]
[4095] reindent
Francis Dupont [Wed, 11 Nov 2015 15:11:15 +0000 (16:11 +0100)]
[4095] spelling & co
Francis Dupont [Wed, 11 Nov 2015 15:01:01 +0000 (16:01 +0100)]
[4095] spelling
Thomas Markwalder [Wed, 11 Nov 2015 14:59:40 +0000 (09:59 -0500)]
[3601] Addressed additional review comments
doc/guide/admin.xml
src/lib/dhcpsrv/dhcpsrv_messages.mes
src/lib/dhcpsrv/lease_file_loader.h
minor clean up, typos
src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
removed unnecessary use of scoped_ptr
src/lib/util/csv_file.cc
CSVRow::trim() - replaced use of std::vector<>::erase with resise
src/lib/util/versioned_csv_file.h
src/lib/util/versioned_csv_file.cc
VersionedCSVFile::next() - reorganized to use input_schema_state_
VersionedCSVFile::columnCountError() - new convenience method
minor cleanups
Francis Dupont [Wed, 11 Nov 2015 14:56:56 +0000 (15:56 +0100)]
[master] Updated git hash (forgotten)
Francis Dupont [Wed, 11 Nov 2015 14:33:00 +0000 (15:33 +0100)]
[4088fd] Moved option code range check to the parser, freeing INTEGER tokens
Stephen Morris [Wed, 11 Nov 2015 14:08:25 +0000 (14:08 +0000)]
[master] Merge remote-tracking branch 'github/master'
Merged in change made to GitHub for ticket trac4111.
Francis Dupont [Wed, 11 Nov 2015 12:52:55 +0000 (13:52 +0100)]
[master] Finished merge of trac4060a (Kea multi-threaded)
Francis Dupont [Wed, 11 Nov 2015 12:50:07 +0000 (13:50 +0100)]
[master] Merged trac4060a (Kea multi-threaded)
Thomas Markwalder [Tue, 10 Nov 2015 20:40:00 +0000 (15:40 -0500)]
[4095] Implemented new classes for storing client class definitions
src/lib/dhcpsrv/client_class_def.cc
src/lib/dhcpsrv/client_class_def.h
src/lib/dhcpsrv/tests/client_class_def_unittest.cc
New files that define client class storage classes and tests
src/lib/dhcp/classify.h
Amended commentary to reflect how these classes are now being used.
src/lib/dhcp/option.h
Added typedefs:
boost::shared_ptr<Option> OptionPtr;
boost::shared_ptr<OptionCollection> OptionCollectionPtr;
src/lib/dhcpsrv/Makefile.am
Added entries for new files
src/lib/dhcpsrv/tests/Makefile.am
Added entries for new file
src/lib/eval/token.h b/src/lib/eval/token.h
Added typedef:
boost::shared_ptr<Expression> ExpressionPtr;