]>
git.ipfire.org Git - thirdparty/kea.git/log
Marcin Siodelski [Thu, 10 Dec 2015 21:54:57 +0000 (22:54 +0100)]
Revert "[master] Merge branch 'trac4106'"
This reverts commit
8f2a1f8a7a0e27a8c584186cfda089cd88ec6153 , reversing
changes made to
ed7edadcbd2bde368fdde86e1c997ea225b456f5 .
This merge introduced regressions in our build farm and revealed
issues in the DHCP4o6 IPC code. It also revealed some differences
in sockets handling under Linux and BSD. Rather than continue
patching this here, we should work on the branch to resolve all
issues and then merge 1.1.
Marcin Siodelski [Thu, 10 Dec 2015 15:57:52 +0000 (15:57 +0000)]
[master] Fix compilation issue on RHEL6.
Added missing fctnl.h include. Okayed on jabber.
Tomek Mrugalski [Thu, 10 Dec 2015 13:59:45 +0000 (14:59 +0100)]
[master] ChangeLog updated.
Tomek Mrugalski [Thu, 10 Dec 2015 12:58:19 +0000 (13:58 +0100)]
[master] Merge branch 'trac4206' (empty DUID/client-id fix)
Tomek Mrugalski [Thu, 10 Dec 2015 12:56:38 +0000 (13:56 +0100)]
[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea
Tomek Mrugalski [Thu, 10 Dec 2015 12:55:19 +0000 (13:55 +0100)]
[master] Compilation fix after 4106
Marcin Siodelski [Thu, 10 Dec 2015 11:44:25 +0000 (12:44 +0100)]
[master] Added Changelog entry for #4228.
Marcin Siodelski [Thu, 10 Dec 2015 11:42:54 +0000 (12:42 +0100)]
[master] Merge branch 'trac4228'
Marcin Siodelski [Thu, 10 Dec 2015 11:24:15 +0000 (12:24 +0100)]
[master] Merge branch 'trac4106'
Marcin Siodelski [Thu, 10 Dec 2015 11:20:57 +0000 (12:20 +0100)]
[4106] Fixed a typo.
Marcin Siodelski [Wed, 9 Dec 2015 21:15:53 +0000 (22:15 +0100)]
[4106] Renamed DHCPv4 and DHCPv6 specific IPC classes.
Marcin Siodelski [Wed, 9 Dec 2015 20:13:11 +0000 (21:13 +0100)]
[4106] Minor updates as a result of the review.
Removed debug leftover and changed 'responds' to 'answers'.
Thomas Markwalder [Wed, 9 Dec 2015 16:22:06 +0000 (11:22 -0500)]
[4206] Fixed Dhcp4 unit test failure under OS-X
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
TEST_F(Dhcpv4SrvTest, emptyClientId)
Added code to set up test interfaces
Marcin Siodelski [Wed, 9 Dec 2015 15:14:22 +0000 (16:14 +0100)]
[4228] Added s-messages to gitignore file.
Marcin Siodelski [Wed, 9 Dec 2015 14:29:09 +0000 (15:29 +0100)]
[4228] Renamed 'message' to 'kea-msg-compiler' in Makefiles and docs.
Tomek Mrugalski [Tue, 8 Dec 2015 15:35:35 +0000 (16:35 +0100)]
[4206] Unit-tests implemented for empty duid/client-id.
Tomek Mrugalski [Mon, 7 Dec 2015 16:48:47 +0000 (17:48 +0100)]
[4206] Fix for empty client-id in v4
Tomek Mrugalski [Mon, 7 Dec 2015 16:48:28 +0000 (17:48 +0100)]
[4206] Fix for empty DUID in v6
Francis Dupont [Mon, 7 Dec 2015 14:55:25 +0000 (15:55 +0100)]
[master] Added timestamps (cf #4210)
Wlodek Wencel [Thu, 3 Dec 2015 13:48:14 +0000 (14:48 +0100)]
[v1_0_0b] reorder .mes files
Wlodek Wencel [Thu, 3 Dec 2015 14:41:59 +0000 (15:41 +0100)]
[v1_0_0] differences.txt file removed
Wlodek Wencel [Thu, 3 Dec 2015 14:40:55 +0000 (15:40 +0100)]
[v1_0_0] AUTHORS file update
Wlodek Wencel [Thu, 3 Dec 2015 14:42:42 +0000 (15:42 +0100)]
[v1_0_0] ChangeLog fixes
Conflicts:
ChangeLog
Shawn Routhier [Thu, 3 Dec 2015 20:45:37 +0000 (12:45 -0800)]
[master] Update change log entry with commit number
Shawn Routhier [Thu, 3 Dec 2015 20:43:53 +0000 (12:43 -0800)]
Merge branch 'trac4218' Remove .text operator form classification documentation
Shawn Routhier [Thu, 3 Dec 2015 20:17:39 +0000 (12:17 -0800)]
[trac4218] Remove descritpion of .text from classification
The use of .text isn't really clear yet and rather than confuse
users we are removing it from the documentation.
Tomek Mrugalski [Thu, 3 Dec 2015 16:47:41 +0000 (17:47 +0100)]
[4217] HostMgr now uses exactly one identifier in get4() query
- Includes fix in AllocEngine6Test ctor, provided by Thomas
Tomek Mrugalski [Wed, 2 Dec 2015 09:58:22 +0000 (10:58 +0100)]
[master] ChangeLog updated after 3569 merge.
Tomek Mrugalski [Wed, 2 Dec 2015 09:26:10 +0000 (10:26 +0100)]
[master] Merge branch 'trac3569_rebase' (host data source configuration)
Tomek Mrugalski [Tue, 1 Dec 2015 23:09:30 +0000 (00:09 +0100)]
[3569_rebase] Removed 2 unit-tests as agreed on jabber.
Tomek Mrugalski [Tue, 1 Dec 2015 22:14:08 +0000 (23:14 +0100)]
[3569_rebase] Comment corrected in User's Guide
Tomek Mrugalski [Tue, 1 Dec 2015 22:12:23 +0000 (23:12 +0100)]
[3569_rebase] alternate_source renamed, added comments
Tomek Mrugalski [Tue, 1 Dec 2015 20:54:35 +0000 (21:54 +0100)]
[3569_rebase] Schema clean-up before DbAccessParserTest.commitLeaseDb
Tomek Mrugalski [Tue, 1 Dec 2015 20:14:59 +0000 (21:14 +0100)]
[3569_rebase] Removed unnecessary call.
Tomek Mrugalski [Tue, 1 Dec 2015 19:58:56 +0000 (20:58 +0100)]
[3569_rebase] Doc updated.
Tomek Mrugalski [Tue, 1 Dec 2015 19:50:07 +0000 (20:50 +0100)]
[3569_rebase] MySQL host data source tests now use common schema methods
Tomek Mrugalski [Tue, 1 Dec 2015 19:32:31 +0000 (20:32 +0100)]
[3569_rebase] MySQL host data source is now indeed created and stored.
Tomek Mrugalski [Tue, 1 Dec 2015 19:12:22 +0000 (20:12 +0100)]
[master] ChangeLog updated after 4121 merge.
Tomek Mrugalski [Tue, 1 Dec 2015 19:08:27 +0000 (20:08 +0100)]
[master] Compilation fixes after 4121 merge.
Tomek Mrugalski [Tue, 1 Dec 2015 18:34:47 +0000 (19:34 +0100)]
[master] Merge branch 'trac4121' (RAI option packed last)
# Conflicts:
# src/lib/dhcp/libdhcp++.cc
# src/lib/dhcp/libdhcp++.h
Tomek Mrugalski [Tue, 1 Dec 2015 18:15:43 +0000 (19:15 +0100)]
[4121] added packOptions{4,6}, removed packOptions(), added unit-test
Wlodek Wencel [Tue, 1 Dec 2015 18:00:01 +0000 (19:00 +0100)]
[master] Added eval lib to lfc's Makefile
Marcin Siodelski [Tue, 1 Dec 2015 17:03:46 +0000 (18:03 +0100)]
[master] Disable strict aliasing rules for gcc < 4.5
This is a workaround for a GCC bug which affects gcc 4.4 and
manifests on RHEL6.3 as a build failure. This fix was okayed
on jabber.
Thomas Markwalder [Tue, 1 Dec 2015 15:52:36 +0000 (10:52 -0500)]
[master] Added ChangeLog entry 1063 for Trac #3702
Thomas Markwalder [Tue, 1 Dec 2015 15:33:54 +0000 (10:33 -0500)]
[master] Added Kea logo to Admin and Developer's guides
Merged in branch 'trac3702'
Thomas Markwalder [Tue, 1 Dec 2015 15:32:50 +0000 (10:32 -0500)]
[3702] Deleted no longer needed isc-logo.png
Thomas Markwalder [Tue, 1 Dec 2015 15:14:12 +0000 (10:14 -0500)]
[master] Added eval lib to D2's Makefile
Thomas Markwalder [Tue, 1 Dec 2015 14:27:59 +0000 (09:27 -0500)]
[3702] Added Kea logo to Admin guide and developer's guide
doc/guide/kea-logo-100x70.png
new file, it it the Kea logo with the bird's head only
doc/Doxyfile
Changed PROJECT_LOGO to use use new Kea logo
doc/Makefile.am
Added logo file to dist_html_DATA so it will be installed
doc/guide/kea-guide.xml
Added logo as inlinemedia object to the title
Marcin Siodelski [Tue, 1 Dec 2015 14:05:11 +0000 (15:05 +0100)]
[master] Added ChangeLog entry for #4211.
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.
Tomek Mrugalski [Mon, 30 Nov 2015 21:36:44 +0000 (22:36 +0100)]
[3569_rebase] Compilation fix after rebase.
Tomek Mrugalski [Thu, 26 Nov 2015 16:27:57 +0000 (17:27 +0100)]
[3569] User's guide updated (currently disabled)
Tomek Mrugalski [Thu, 26 Nov 2015 14:14:35 +0000 (15:14 +0100)]
[3569] Unit-tests implemented.
Tomek Mrugalski [Tue, 24 Nov 2015 20:42:19 +0000 (21:42 +0100)]
[3569] Implemented configuration for host data source.
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.