]>
git.ipfire.org Git - thirdparty/kea.git/log
JINMEI Tatuya [Tue, 23 Oct 2012 18:21:56 +0000 (11:21 -0700)]
[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
JINMEI Tatuya [Tue, 23 Oct 2012 18:21:35 +0000 (11:21 -0700)]
[master] Merge branch 'trac2211'
with fixing Conflicts to:
src/bin/auth/auth_srv.cc
src/bin/auth/auth_srv.h
src/bin/auth/datasrc_clients_mgr.h
src/bin/auth/main.cc
src/bin/auth/tests/auth_srv_unittest.cc
src/bin/auth/tests/command_unittest.cc
Marcin Siodelski [Tue, 23 Oct 2012 18:07:28 +0000 (20:07 +0200)]
[master] Use std::copy to write IP address to buffer.
This fix resolves build issues on Fedora 17. Okayed on jabber.
Marcin Siodelski [Tue, 23 Oct 2012 18:06:52 +0000 (20:06 +0200)]
[master] Remove narrowing conversion from int to uint8_t.
This fix eliminates build failure on Fedora17 and Debian7. Okayed on jabber.
Jelte Jansen [Tue, 23 Oct 2012 17:40:28 +0000 (19:40 +0200)]
[master] Merge branch 'trac2210'
JINMEI Tatuya [Tue, 23 Oct 2012 17:20:21 +0000 (10:20 -0700)]
[2211] adjusted log severity from ERROR to FATAL before aborting.
JINMEI Tatuya [Tue, 23 Oct 2012 17:18:33 +0000 (10:18 -0700)]
[2211] removed an extra block from sendCommand() with clarification comments
JINMEI Tatuya [Tue, 23 Oct 2012 16:48:08 +0000 (09:48 -0700)]
[2211] let the thread abort if it sees an unexpected exception, rather rethrow.
update the test case and log message accordingly.
JINMEI Tatuya [Tue, 23 Oct 2012 16:37:19 +0000 (09:37 -0700)]
[2211] s/swapDataSrcClientLists/setDataSrcClientLists/ and changed the behavior
the users of this method only need the set behavior, and the previous code
actually didn't swap them as expected anyway.
JINMEI Tatuya [Tue, 23 Oct 2012 16:30:48 +0000 (09:30 -0700)]
[2211] style fixes to test JSON configs
Michal 'vorner' Vaner [Tue, 23 Oct 2012 15:00:29 +0000 (17:00 +0200)]
[2209] Hack the ZoneTableSegment into MemoryClient
This branch needs the MemoryClient to have its Zonetablesegment. But it
doesn't have one now and it is not the task of this branch to put it in
there. So I added it inside in somewhat ad-hoc manner.
This is hairy and adds bunch of temporary methods. If there's a better
approach, let's use it. But taking this for now to be cleaned up in some
follow-up ticket.
Michal 'vorner' Vaner [Tue, 23 Oct 2012 14:49:05 +0000 (16:49 +0200)]
[2209] Unrelated fix: don't c-string + int
It doesn't produce the expected result (which was obviously expected
in the code). Changed to lexical_cast, which should be enough.
Marcin Siodelski [Tue, 23 Oct 2012 13:51:15 +0000 (15:51 +0200)]
[2316] Replace constructor with default param values with constructor
without parameters.
Having constructor with default params values caused build issues on
Mac/clang which complained about not providing constructor's params and ignores
default ones.
Jelte Jansen [Tue, 23 Oct 2012 12:37:31 +0000 (14:37 +0200)]
[2210] update catch/error logs in datasrc reconfigure
Marcin Siodelski [Tue, 23 Oct 2012 08:35:14 +0000 (10:35 +0200)]
[master] Merge branch 'trac2304'
Mukund Sivaraman [Tue, 23 Oct 2012 04:55:14 +0000 (10:25 +0530)]
[2236] Remove obsolete comment
Mukund Sivaraman [Tue, 23 Oct 2012 04:06:26 +0000 (09:36 +0530)]
[2236] Don't use PTHREAD_MUTEX_ERRORCHECK in non-debug builds
Also disable tests in non-debug builds that depend on
PTHREAD_MUTEX_ERRORCHECK.
Mukund Sivaraman [Tue, 23 Oct 2012 03:58:43 +0000 (09:28 +0530)]
[2236] Remove config.h include from sync.h
... and move it to sync.cc. This is so that sync.h can be dist-ed.
Also add comments to some methods that may not be available in
non-debug builds.
Mukund Sivaraman [Tue, 23 Oct 2012 03:55:20 +0000 (09:25 +0530)]
[2236] Add comments to configure.ac about --enable-debug and performance
Mukund Sivaraman [Tue, 23 Oct 2012 03:54:50 +0000 (09:24 +0530)]
[2236] Access Mutex::locked() only when ENABLE_DEBUG is defined
Mukund Sivaraman [Tue, 23 Oct 2012 02:58:41 +0000 (08:28 +0530)]
[2208] Pass RRClass to ZoneTableSegment::create() factory method
Mukund Sivaraman [Tue, 23 Oct 2012 02:06:52 +0000 (07:36 +0530)]
[2361] Update comment about local_plugins directory
Mukund Sivaraman [Tue, 23 Oct 2012 00:36:26 +0000 (06:06 +0530)]
Revert "Merge branch 'trac2198_3'"
This reverts commit
e6ba20b0907ab7e861e608a71a35f71ab228e79f , reversing
changes made to
c9ba8373e271fb3c966fb59813c21ca8c575354d .
Stephen Morris [Mon, 22 Oct 2012 20:28:41 +0000 (21:28 +0100)]
[2342] Corrections to comments in configure.ac
Stephen Morris [Mon, 22 Oct 2012 19:43:49 +0000 (20:43 +0100)]
[2342] Incorporate Trac2142 changes
JINMEI Tatuya [Mon, 22 Oct 2012 19:08:42 +0000 (12:08 -0700)]
[2211] added notes about ownership on the returned value of findClientList().
Stephen Morris [Mon, 22 Oct 2012 19:05:35 +0000 (20:05 +0100)]
[2342] Enable MySQL support with flag in configure.ac
JINMEI Tatuya [Mon, 22 Oct 2012 18:26:00 +0000 (11:26 -0700)]
[2211] wording/grammer fixes to documentation and comments.
JINMEI Tatuya [Mon, 22 Oct 2012 17:55:53 +0000 (10:55 -0700)]
[2211] use swap instead of splice. for this purpose it's enough and simpler.
Michal 'vorner' Vaner [Mon, 22 Oct 2012 15:28:45 +0000 (17:28 +0200)]
[2209] Tests for the getCachedZoneWriter
They are the reload() tests reused for this purpose. They fail, since
the method is temporary and contains almost no code.
Stephen Morris [Mon, 22 Oct 2012 15:07:34 +0000 (16:07 +0100)]
[2342] Added deleteLease6 functionality
Michal 'vorner' Vaner [Mon, 22 Oct 2012 14:43:18 +0000 (16:43 +0200)]
[2209] Interface of the getCachedZoneWriter()
Unlike what the ticket suggests, it takes concrete origin parameter, not
some yet unknown config value, for two reasons:
* The format of config is not known.
* Leaking some details about what memory segment or whatever is being
used for the cache through the interface looks like a bad idea. Even
leaking the existence of the cache is enough.
Michal 'vorner' Vaner [Mon, 22 Oct 2012 14:48:24 +0000 (16:48 +0200)]
Revert "[2209] Interface of the getCachedZoneWriter()"
This reverts commit
812392465ae1ffa4a583186fd48f4c7aff1640dd .
This should have gone to a branch, not to master. Reverting it until it
gets reviewed properly.
Michal 'vorner' Vaner [Mon, 22 Oct 2012 14:43:18 +0000 (16:43 +0200)]
[2209] Interface of the getCachedZoneWriter()
Unlike what the ticket suggests, it takes concrete origin parameter, not
some yet unknown config value, for two reasons:
* The format of config is not known.
* Leaking some details about what memory segment or whatever is being
used for the cache through the interface looks like a bad idea. Even
leaking the existence of the cache is enough.
Michal 'vorner' Vaner [Mon, 22 Oct 2012 14:26:25 +0000 (16:26 +0200)]
[2209] Make the reload tests typed
This'll allow us to reuse them for testing the ZoneWriter approach for
the same purpose as reload(). The ZoneWriter one is not there yet, so
this is an equivalent change functionality-wise.
Jelte Jansen [Mon, 22 Oct 2012 13:08:34 +0000 (15:08 +0200)]
[2210] rename DataSrcClientListsPtr to ClientListMapPtr
Jelte Jansen [Mon, 22 Oct 2012 12:55:33 +0000 (14:55 +0200)]
[2210] Address review comments
as discussed in the ticket comments
Marcin Siodelski [Mon, 22 Oct 2012 12:40:12 +0000 (14:40 +0200)]
[2304] Fixed build issues on Mac and BSD systems.
Stephen Morris [Mon, 22 Oct 2012 12:01:40 +0000 (13:01 +0100)]
[2342] INSERT and GET tests now working
... after moving creation of MYSQL_BIND structures to a separate class.
Stephen Morris [Mon, 22 Oct 2012 09:49:51 +0000 (10:49 +0100)]
[2342] Move creation of MYSQL_BIND array for lease addition to separate class
Marcin Siodelski [Mon, 22 Oct 2012 09:14:24 +0000 (11:14 +0200)]
[2304] Removed enum initializers for DataType values.
Mukund Sivaraman [Mon, 22 Oct 2012 01:59:39 +0000 (07:29 +0530)]
[2208] Untabify
Mukund Sivaraman [Mon, 22 Oct 2012 01:59:31 +0000 (07:29 +0530)]
[2208] Use consistent naming for ZoneTableSegment variables
Mukund Sivaraman [Mon, 22 Oct 2012 01:45:49 +0000 (07:15 +0530)]
[2208] Don't use .get() syntax in some places in managed ptrs
Mukund Sivaraman [Mon, 22 Oct 2012 01:19:06 +0000 (06:49 +0530)]
[master] Execute run_dbutil.sh using shell
This is necessary because run_dbutil.sh sometimes loses its execute
(+x) mode bit when regenerated, and tests fail due to it.
Mukund Sivaraman [Mon, 22 Oct 2012 00:55:03 +0000 (06:25 +0530)]
Merge branch 'trac2198_3'
Mukund Sivaraman [Fri, 19 Oct 2012 00:14:58 +0000 (05:44 +0530)]
[2198] Move get methods into unnamed namespace
Mukund Sivaraman [Sun, 21 Oct 2012 23:38:45 +0000 (05:08 +0530)]
[2198] Fix library paths to add lib/util/threads/ too (Mac OS test failure)
Mukund Sivaraman [Tue, 16 Oct 2012 18:47:08 +0000 (00:17 +0530)]
[2198] Avoid static destruction fiasco with InterprocessSyncFile and logger
Mukund Sivaraman [Sun, 21 Oct 2012 23:34:54 +0000 (05:04 +0530)]
[2198] Check for EDEADLK too when using Mutex::tryLock()
Mukund Sivaraman [Sun, 21 Oct 2012 23:33:19 +0000 (05:03 +0530)]
[2198] Link -lpthread in libb10-threads target
Mukund Sivaraman [Tue, 16 Oct 2012 00:30:19 +0000 (06:00 +0530)]
[2198] Don't return anything from thread functions
Mukund Sivaraman [Mon, 15 Oct 2012 04:31:18 +0000 (10:01 +0530)]
[2198] Update comment
Mukund Sivaraman [Mon, 15 Oct 2012 04:29:22 +0000 (09:59 +0530)]
[2198] Test the non-blocking variant of Mutex::Locker
Mukund Sivaraman [Sun, 21 Oct 2012 23:30:34 +0000 (05:00 +0530)]
[2198] Check pthread_mutex_trylock()'s return value
Mukund Sivaraman [Sun, 14 Oct 2012 18:33:13 +0000 (00:03 +0530)]
[2198] Revert include to local
Mukund Sivaraman [Sun, 14 Oct 2012 16:52:35 +0000 (22:22 +0530)]
[2198] Stop using direct lock methods on Mutex inside InterprocessSyncFile
Mukund Sivaraman [Sun, 21 Oct 2012 23:28:20 +0000 (04:58 +0530)]
[2198] Fix include filename
Mukund Sivaraman [Sun, 21 Oct 2012 23:27:51 +0000 (04:57 +0530)]
[2198] Make direct methods on Mutex private
Mukund Sivaraman [Sun, 21 Oct 2012 23:26:07 +0000 (04:56 +0530)]
[2198] Add a block argument to Mutex::Locker's constructor
Mukund Sivaraman [Sun, 21 Oct 2012 23:23:47 +0000 (04:53 +0530)]
[2198] Add AlreadyLocked exception to Mutex::Locker
Mukund Sivaraman [Wed, 10 Oct 2012 14:41:09 +0000 (20:11 +0530)]
[2198] Remove dependency on libb10-util in src/lib/util/unittests/
Mukund Sivaraman [Tue, 9 Oct 2012 21:35:46 +0000 (03:05 +0530)]
[2198] First use a mutex for mutual exclusion among threads, then a lock file
Mukund Sivaraman [Sun, 21 Oct 2012 23:20:00 +0000 (04:50 +0530)]
[2198] Add Mutex::tryLock() and make lock methods public
tryLock() is necessary inside InterprocessSyncFile. It also doesn't
make sense afterwards to make a dynamically constructed Mutex::Locker
that lives after the basic block is exited. So lock() and unlock()
have also been made public.
I've added comments to discourage the use of these methods directly
and use the Mutex::Locker where applicable.
Mukund Sivaraman [Tue, 9 Oct 2012 20:05:38 +0000 (01:35 +0530)]
[2198] Test that locks work from threads
This test fails now because there's no mutual exclusion among threads
in the implementation.
Mukund Sivaraman [Tue, 9 Oct 2012 20:04:36 +0000 (01:34 +0530)]
[2198] Build threads directory first because . depends on it
Stephen Morris [Sat, 20 Oct 2012 21:52:25 +0000 (22:52 +0100)]
[2342] Now have addLease and getLease6 methods apparently working
Michal 'vorner' Vaner [Sat, 20 Oct 2012 13:11:43 +0000 (15:11 +0200)]
Add a virtual destructor
To fix compilation.
Michal 'vorner' Vaner [Sat, 20 Oct 2012 09:11:33 +0000 (11:11 +0200)]
Merge #2207
"define and implement (datasrc::memory::)ZoneUpdater class"
It is now ZoneWriter.
No changelog.
Conflicts:
src/lib/datasrc/memory/Makefile.am
Michal 'vorner' Vaner [Sat, 20 Oct 2012 09:09:58 +0000 (11:09 +0200)]
[2207] Note about compilation problem
JINMEI Tatuya [Sat, 20 Oct 2012 06:59:59 +0000 (23:59 -0700)]
[2211] (unrelated fix) make sure the first time config is installed
it's a topic of #2363, but the change is small and is better to be fixed
here because it would cause conflict.
JINMEI Tatuya [Sat, 20 Oct 2012 06:34:12 +0000 (23:34 -0700)]
[2211] added note about exception cases in remote config handler.
JINMEI Tatuya [Sat, 20 Oct 2012 06:08:53 +0000 (23:08 -0700)]
[2211] cleanup: removed now-unused stuff: auth_srv mutex, client lists, etc.
JINMEI Tatuya [Sat, 20 Oct 2012 05:56:39 +0000 (22:56 -0700)]
[2211] use data source client mgr for query_bench
JINMEI Tatuya [Sat, 20 Oct 2012 05:47:04 +0000 (22:47 -0700)]
[2211] use DataSrcClientsMgr in the remote config handler for data_sources.
JINMEI Tatuya [Sat, 20 Oct 2012 05:33:01 +0000 (22:33 -0700)]
[2211] test duplicate mgr holder acquisition instead using auth locker
the latter will soon be deprecated.
JINMEI Tatuya [Sat, 20 Oct 2012 05:27:30 +0000 (22:27 -0700)]
[2211] use DataSrcClientsMgr for query processing
JINMEI Tatuya [Sat, 20 Oct 2012 03:18:59 +0000 (20:18 -0700)]
[2211] make DataSrcClientsMgr and DataSrcClientsBuilder non copyable.
they are not expected to be copied, and I actually had a bug due to an
accidental copy. Making it non copyable will help avoid such bugs.
JINMEI Tatuya [Sat, 20 Oct 2012 03:15:16 +0000 (20:15 -0700)]
[2211] updated auth LoadZoneCommand so it uses the new DataSrcClientsMgr.
JINMEI Tatuya [Fri, 19 Oct 2012 23:53:01 +0000 (16:53 -0700)]
[2211] introduce DataSrcClientsMgr::Holder.
auth_srv test's clientList tests are now converted to clients manager's test.
("holder" tests).
JINMEI Tatuya [Fri, 19 Oct 2012 22:52:02 +0000 (15:52 -0700)]
[2211] create the client lists map in the DataSrcClientsMgr ctor.
this will help corner case considerations of it being NULL
JINMEI Tatuya [Fri, 19 Oct 2012 22:17:52 +0000 (15:17 -0700)]
[2211] added trivial getter for data source clients manager.
JINMEI Tatuya [Fri, 19 Oct 2012 22:07:32 +0000 (15:07 -0700)]
[2211] moved DataSrcClientsMgr object from main to auth_srv
this way we can avoid having a situtation that it's NULL.
JINMEI Tatuya [Fri, 19 Oct 2012 21:46:21 +0000 (14:46 -0700)]
[2211] added reconfigure() for DataSrcClientsMgr
JINMEI Tatuya [Fri, 19 Oct 2012 20:38:02 +0000 (13:38 -0700)]
[2207] style fix: folded a long line.
Michal 'vorner' Vaner [Fri, 19 Oct 2012 17:55:53 +0000 (19:55 +0200)]
[2207] Extend the strong-exception guarantee test
We try to put some data there and see it survived.
JINMEI Tatuya [Fri, 19 Oct 2012 17:55:19 +0000 (10:55 -0700)]
[2210] editorial cleanup: removed a redundant blank line.
Tomek Mrugalski [Fri, 19 Oct 2012 17:32:16 +0000 (19:32 +0200)]
[2324] AllocEngine is now part of b10-dhcpsrv lib.
JINMEI Tatuya [Fri, 19 Oct 2012 17:24:07 +0000 (10:24 -0700)]
[2210] style fix: adjusted brace position
JINMEI Tatuya [Fri, 19 Oct 2012 17:23:50 +0000 (10:23 -0700)]
[2210] (unrelated) cleanup: removed now-unnecessary include.
Michal 'vorner' Vaner [Fri, 19 Oct 2012 17:10:39 +0000 (19:10 +0200)]
[2207] Exceptions & asserts
Changed an exception for unexpected problem and removed a comment about
assert.
Michal 'vorner' Vaner [Fri, 19 Oct 2012 17:09:07 +0000 (19:09 +0200)]
[2207] Documentation update
Michal 'vorner' Vaner [Fri, 19 Oct 2012 16:58:57 +0000 (18:58 +0200)]
[2207] Use state variable
Instead of several boolean variables.
Tomek Mrugalski [Fri, 19 Oct 2012 16:57:09 +0000 (18:57 +0200)]
[2324] LeaseMgr tests improved.
JINMEI Tatuya [Fri, 19 Oct 2012 16:44:09 +0000 (09:44 -0700)]
[2210] style fix: use const& for catch
Jeremy C. Reed [Fri, 19 Oct 2012 15:17:23 +0000 (10:17 -0500)]
[trac2361] typo fix in comment
noticed this while editing file for previous commit
Jeremy C. Reed [Fri, 19 Oct 2012 15:14:44 +0000 (10:14 -0500)]
[trac2361] fix issue where the bind10 could not run in source tree
when the installation was not done yet.
I added extra local_plugins path and custom datasrc.spec plugin for that.
Mukund Sivaraman [Fri, 19 Oct 2012 00:38:14 +0000 (06:08 +0530)]
[2361] Make minor whitespace updates
Jelte Jansen [Thu, 18 Oct 2012 18:23:39 +0000 (20:23 +0200)]
[2210] assorted cleanups
A few more checks in test
cleaned up added headers
reordered log message file
Jelte Jansen [Thu, 18 Oct 2012 18:11:53 +0000 (20:11 +0200)]
[2210] move DataSrcClientListsPtr typedef
from AuthSrv:: (in auth_srv.h) to isc:datasrc:: (in client_list.h), the previous location wasn't really relevant now that it is used elsewhere, and this seemed the most logical location