]>
git.ipfire.org Git - thirdparty/kea.git/log
Marcin Siodelski [Tue, 1 Dec 2015 13:17:35 +0000 (14:17 +0100)]
[master] Merge branch 'trac4211'
Marcin Siodelski [Tue, 1 Dec 2015 10:35:52 +0000 (11:35 +0100)]
[4211] Addressed review comments.
Two nits.
Marcin Siodelski [Tue, 1 Dec 2015 10:27:33 +0000 (11:27 +0100)]
[master] Added ChangeLog entry for #4204.
Marcin Siodelski [Tue, 1 Dec 2015 10:26:18 +0000 (11:26 +0100)]
[master] Merge branch 'trac4204fd'
Marcin Siodelski [Tue, 1 Dec 2015 08:50:22 +0000 (09:50 +0100)]
[master] Include <mysql.h> rather than <mysql/mysql.h>
This prevents compilation failure on OS-X. Reviewed and approved
on jabber.
Marcin Siodelski [Tue, 1 Dec 2015 08:14:01 +0000 (09:14 +0100)]
[4204fd] Renamed two context functions per Kea coding guidelines.
Tomek Mrugalski [Mon, 30 Nov 2015 21:51:47 +0000 (22:51 +0100)]
[master] Compilation fix for several platforms
Tomek Mrugalski [Mon, 30 Nov 2015 20:31:32 +0000 (21:31 +0100)]
[master] ChangeLog, AUTHORS updated after 3682 merge.
Tomek Mrugalski [Mon, 30 Nov 2015 20:27:21 +0000 (21:27 +0100)]
[master] Merge branch 'trac3682_rebase' (MySQL Host Data Source)
Tomek Mrugalski [Mon, 30 Nov 2015 20:26:25 +0000 (21:26 +0100)]
[3682_rebase] Merge branch 'trac3682' into trac3682_rebase
# Conflicts:
# src/lib/dhcpsrv/mysql_lease_mgr.cc
# src/lib/dhcpsrv/mysql_lease_mgr.h
Stephen Morris [Mon, 30 Nov 2015 19:53:07 +0000 (19:53 +0000)]
[master] ChangeLog for trac4208
Stephen Morris [Mon, 30 Nov 2015 19:49:50 +0000 (19:49 +0000)]
[master] Merge branch 'trac4208'
Marcin Siodelski [Mon, 30 Nov 2015 14:17:23 +0000 (15:17 +0100)]
[4211] Added parameter which enables/disables write of a DUID in file.
Tomek Mrugalski [Mon, 30 Nov 2015 12:38:02 +0000 (13:38 +0100)]
[master] ChangeLog, AUTHORS updated after github pull request 8
Tomek Mrugalski [Mon, 30 Nov 2015 12:30:36 +0000 (13:30 +0100)]
[github8] Unit-tests written for the query4 parameter.
Tomek Mrugalski [Mon, 30 Nov 2015 12:12:05 +0000 (13:12 +0100)]
Merge branch 'kea-fb2' of https://github.com./nchaigne/kea into pullreq8
# Conflicts:
# src/bin/dhcp4/dhcp4_hooks.dox
Tomek Mrugalski [Mon, 30 Nov 2015 12:03:10 +0000 (13:03 +0100)]
[master] ChangeLog updated.
Tomek Mrugalski [Mon, 30 Nov 2015 12:01:09 +0000 (13:01 +0100)]
[master] Compilation fix after merge (missing })
Tomek Mrugalski [Mon, 30 Nov 2015 11:36:46 +0000 (12:36 +0100)]
[master] Merge branch 'trac3988' (lease{4,6}_recover hooks)
# Conflicts:
# src/lib/dhcpsrv/alloc_engine.cc
# src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc
Francis Dupont [Sat, 28 Nov 2015 09:24:39 +0000 (10:24 +0100)]
[master] regen
Francis Dupont [Sat, 28 Nov 2015 09:23:55 +0000 (10:23 +0100)]
[master] Silence cppcheck error
Francis Dupont [Sat, 28 Nov 2015 07:54:29 +0000 (08:54 +0100)]
[master] Regenerated lexer.cc
Francis Dupont [Fri, 27 Nov 2015 22:31:53 +0000 (23:31 +0100)]
[master] Merged trac4203 (no exit())
Stephen Morris [Fri, 27 Nov 2015 17:18:08 +0000 (17:18 +0000)]
[4208] Update KEA_HOOKS_VERSION to 3 in preparation for release of Kea 1.0.
Francis Dupont [Fri, 27 Nov 2015 15:32:30 +0000 (16:32 +0100)]
[4204fd] Refactored grammar
Francis Dupont [Fri, 27 Nov 2015 15:21:46 +0000 (16:21 +0100)]
[4204fd] Reverted to original token.{h,cc}
Francis Dupont [Fri, 27 Nov 2015 15:08:49 +0000 (16:08 +0100)]
[4204fd] Remade option_universe_ private
Francis Dupont [Fri, 27 Nov 2015 14:59:33 +0000 (15:59 +0100)]
[4204fd] Created a convert_option_name method
Francis Dupont [Fri, 27 Nov 2015 14:46:38 +0000 (15:46 +0100)]
[4204fd] Regen
Francis Dupont [Fri, 27 Nov 2015 14:45:35 +0000 (15:45 +0100)]
[4204fd] Moved convert_option_code to context code
Francis Dupont [Fri, 27 Nov 2015 14:15:23 +0000 (15:15 +0100)]
[4204fd] Handle universe in option code range
Francis Dupont [Fri, 27 Nov 2015 13:30:40 +0000 (14:30 +0100)]
[4204fd] Fixed newline handling
Francis Dupont [Fri, 27 Nov 2015 13:11:18 +0000 (14:11 +0100)]
[4204fd] Added a .bin unit test
Francis Dupont [Fri, 27 Nov 2015 12:03:03 +0000 (13:03 +0100)]
[4204fd] Reverted hex->bin change (missed
Francis Dupont [Fri, 27 Nov 2015 11:52:45 +0000 (12:52 +0100)]
[4204fd] Reverted hex->bin change
Marcin Siodelski [Thu, 26 Nov 2015 15:40:12 +0000 (16:40 +0100)]
[master] Added ChangeLog entry for #3874.
Marcin Siodelski [Thu, 26 Nov 2015 15:22:32 +0000 (16:22 +0100)]
[master] Merge branch 'trac3874a'
Francis Dupont [Thu, 26 Nov 2015 14:20:12 +0000 (15:20 +0100)]
[4204fd] Applied my proposed changes
Marcin Siodelski [Thu, 26 Nov 2015 14:11:18 +0000 (15:11 +0100)]
[3874] Fixed compilation issues in DUIDFactory class.
Marcin Siodelski [Thu, 26 Nov 2015 13:00:06 +0000 (14:00 +0100)]
[3874] Addressed review comments.
Francis Dupont [Thu, 26 Nov 2015 12:04:34 +0000 (13:04 +0100)]
[4204fd] Merge original trac4204
Shawn Routhier [Thu, 26 Nov 2015 08:21:33 +0000 (00:21 -0800)]
[master] Update commit number for 4101
Also tidy up entry for 4097
Shawn Routhier [Thu, 26 Nov 2015 08:15:58 +0000 (00:15 -0800)]
[master] Merge trac4101 - documentation for classification
Add the classify.xml file to document the client classification
system
Update the dhcp4-srv.xml and dhcp6-srv.xml files to provide a brief
description of the classification system and pointers to the
text in classify.xml
Shawn Routhier [Thu, 26 Nov 2015 08:12:13 +0000 (00:12 -0800)]
[trac4101] Update per second set of review comments
Shawn Routhier [Wed, 25 Nov 2015 20:18:37 +0000 (12:18 -0800)]
[trac4101] Move the substring examples into a screen
Shawn Routhier [Wed, 25 Nov 2015 20:14:06 +0000 (12:14 -0800)]
[trac4101] Update per review comments
Notable items:
Removed a lot of the classification text from dhcp4.xml and dhcp6.xml
leaving a brief description with a pointer to the main text and some
examples.
Added more examples
Marcin Siodelski [Wed, 25 Nov 2015 15:44:46 +0000 (16:44 +0100)]
[4204] Remove runtime option defs if "option-def" is not in config.
Stephen Morris [Wed, 25 Nov 2015 15:43:47 +0000 (15:43 +0000)]
[4101] Miscellaneous documentation changes during review
Francis Dupont [Wed, 25 Nov 2015 13:22:06 +0000 (14:22 +0100)]
[master] Finished merge trac4097a (Classify and append options)
Francis Dupont [Wed, 25 Nov 2015 12:22:04 +0000 (13:22 +0100)]
[4097a] Added Dhcpv6SrvTest.subnetGlobalPriority
Francis Dupont [Wed, 25 Nov 2015 12:18:13 +0000 (13:18 +0100)]
[4097a] DHCPDISCOVER typos
Francis Dupont [Wed, 25 Nov 2015 12:14:56 +0000 (13:14 +0100)]
[4097a] Use dhcp4_logger for classification messages
Francis Dupont [Wed, 25 Nov 2015 12:09:42 +0000 (13:09 +0100)]
[4097a] Aligned DHCP6_CLASS_* messages
Francis Dupont [Wed, 25 Nov 2015 12:01:24 +0000 (13:01 +0100)]
[4097a] Added Dhcpv4SrvTest.subnetGlobalPriority
Francis Dupont [Wed, 25 Nov 2015 10:47:01 +0000 (11:47 +0100)]
[4097a] Added check of other options to Dhcp4ParserTest.optionDataDefaultsGlobal
Marcin Siodelski [Wed, 25 Nov 2015 10:46:30 +0000 (11:46 +0100)]
[4204] Whitespace may surround option name in expressions.
Francis Dupont [Wed, 25 Nov 2015 10:36:04 +0000 (11:36 +0100)]
[4097a] Added the CfgOptionList explaination to its declaration
Francis Dupont [Wed, 25 Nov 2015 10:32:04 +0000 (11:32 +0100)]
[4097a] Added (non-)const comment
Marcin Siodelski [Wed, 25 Nov 2015 10:30:15 +0000 (11:30 +0100)]
[4204] Regenerated parser and lexer files after recent changes.
Francis Dupont [Wed, 25 Nov 2015 10:27:55 +0000 (11:27 +0100)]
[4097a] Added a no subnet check in buildCfgOptionList()
Shawn Routhier [Wed, 25 Nov 2015 08:19:15 +0000 (00:19 -0800)]
[trac4097] Fix some typos
Marcin Siodelski [Tue, 24 Nov 2015 19:26:08 +0000 (20:26 +0100)]
[4204] Runtime option definitions created using set/commit process.
Marcin Siodelski [Tue, 24 Nov 2015 13:54:10 +0000 (14:54 +0100)]
[4204] Specification of option name doesn't require quotes.
Marcin Siodelski [Tue, 24 Nov 2015 11:31:52 +0000 (12:31 +0100)]
[4204] Extended expression parser tests to reference option by name.
Marcin Siodelski [Tue, 24 Nov 2015 09:39:40 +0000 (10:39 +0100)]
[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.
Shawn Routhier [Tue, 24 Nov 2015 05:37:58 +0000 (21:37 -0800)]
[trac4101] Add proposed change log entry
Shawn Routhier [Tue, 24 Nov 2015 05:33:29 +0000 (21:33 -0800)]
[trac4101] Update v4 and v6 pages
Update the v4 and v6 pages to reflect the new classification.
These are shortened versions of the main classification page.
Also update the option description to incude .text and .hex modifiers.
Francis Dupont [Tue, 24 Nov 2015 00:51:10 +0000 (01:51 +0100)]
[4097a] Addressed not configured class VENDOR_CLASS_*
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)
Marcin Siodelski [Mon, 23 Nov 2015 21:01:47 +0000 (22:01 +0100)]
[4204] Eval parser allows for referencing option by its name.
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
Shawn Routhier [Mon, 23 Nov 2015 19:42:21 +0000 (11:42 -0800)]
[trac4101] Update per review comments
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)
Tomek Mrugalski [Mon, 23 Nov 2015 17:33:18 +0000 (18:33 +0100)]
[3988] Changes after review:
- several v4 => v6
- simpler remove_tmp logic
- ExpirationAllocEngine4Test constructor now cleans up hook buffers
Francis Dupont [Mon, 23 Nov 2015 14:34:53 +0000 (15:34 +0100)]
[4097a] Optimized the no configured options cases
Francis Dupont [Mon, 23 Nov 2015 13:56:49 +0000 (14:56 +0100)]
[4097a] Merged #4093
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 12:19:52 +0000 (13:19 +0100)]
[4204] OptionDef config parser updates runtime definitions in libdhcp.
Marcin Siodelski [Fri, 20 Nov 2015 16:41:39 +0000 (17:41 +0100)]
[4204] Runtime option definitions are stored in LibDHCP.
Marcin Siodelski [Fri, 20 Nov 2015 13:25:18 +0000 (14:25 +0100)]
[4204] Runtime option definitions held in the libdhcp++ library.
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'
Shawn Routhier [Mon, 23 Nov 2015 06:46:25 +0000 (22:46 -0800)]
[trac4101] Add classify.xml file
Add the chapter about classification
Francis Dupont [Sun, 22 Nov 2015 17:39:23 +0000 (18:39 +0100)]
[4097a] Removed no longer used argument
Francis Dupont [Sun, 22 Nov 2015 08:06:29 +0000 (09:06 +0100)]
[4097a] Finished the DHCPv6 part
Francis Dupont [Sat, 21 Nov 2015 14:58:12 +0000 (15:58 +0100)]
[4097a] Removed merging of global configured options into subnets
Francis Dupont [Sat, 21 Nov 2015 14:40:33 +0000 (15:40 +0100)]
[4097a] Ported DHCPv4 code to DHCPv6 (unfinished)
Francis Dupont [Sat, 21 Nov 2015 13:45:08 +0000 (14:45 +0100)]
[4097a] Introduce CfgOptionList and use it for the 3 append/getCfgOption() methods
Francis Dupont [Sat, 21 Nov 2015 12:22:57 +0000 (13:22 +0100)]
[4097a] Moved specific processing to appendRequestedOptions and renamed classSpecificProcessing
Francis Dupont [Sat, 21 Nov 2015 09:28:05 +0000 (10:28 +0100)]
[4097a] Added a new message for unconfigured classes
Francis Dupont [Sat, 21 Nov 2015 08:24:06 +0000 (09:24 +0100)]
[4097a] Merge branch 'trac4097a' of ssh://git.kea.isc.org/git/kea into trac4097a
Francis Dupont [Sat, 21 Nov 2015 08:23:24 +0000 (09:23 +0100)]
[4097a] Changed classSpecificProcessing to be applied only to requested options