[3732] Applied #3732 review comments (doc clean up, add KEA_ to the msgq socket file...

diff --git a/doc/devel/config-backend.dox b/doc/devel/config-backend.dox
index 5e41dd8d44c2479851b92bb95e5727aee6f06bc7..8d5468065e8be489055b9f17ebc1727244fd0bc3 100644 (file)
--- a/doc/devel/config-backend.dox
+++ b/doc/devel/config-backend.dox
@@ -44,10 +44,9 @@ backend that reads a JSON configuration file from disk, it decided to
 make it easy for others to use different backends.
 
 While ISC currently (May 2015) maintains only one configuration backend
-(a JSON file read from disk), there may be other organizations (e.g.
-the Bundy project community) that will maintain other backends. It is quite
-possible that additional backends (e.g. using LDAP or XML) will be
-developed and maintained by other organizations.
+(a JSON file read from disk), it is quite possible that additional backends
+(e.g. using LDAP or XML) will be developed in the future by ISC or other
+organizations.
 
 @section configBackendAdding How to Add a New Configuration Backend
 

diff --git a/doc/guide/config.xml b/doc/guide/config.xml
index a98772f9a315c6a64848e8134062ea800fd40081..3d12cad7476bf94c013613b025fbd1859b8c9c0a 100644 (file)
--- a/doc/guide/config.xml
+++ b/doc/guide/config.xml
@@ -6,8 +6,10 @@
 <chapter id="kea-config">
   <title>Kea configuration</title>
 
-  <para>The following section describe details of the only configuration
-    backend which can be configured and used.</para>
+  <para>Kea is designed to allow different methods by which it can be
+    configured, each method being implemented by a component known as a
+    configuration backend.  At present, only one such backend is
+    available, that allowing configuration by means of a JSON file.</para>
 
   <section id="json-backend">
     <title>JSON configuration backend</title>

diff --git a/src/bin/d2/d2.dox b/src/bin/d2/d2.dox
index fa20b697f3898e1ab41d66d0cea4cdd80dd6cc28..63d1d0c3a81694b64134f2a69d55abeb9a49cd95 100644 (file)
--- a/src/bin/d2/d2.dox
+++ b/src/bin/d2/d2.dox
@@ -54,7 +54,6 @@ an application process class derived from isc::d2::DProcess. These services incl
     - Command line argument handling
     - Process instantiation and initialization
     - Support for stand-alone execution
-    - Support for integrated operation
     - Process event loop invocation and shutdown
 
     It creates and manages an instance of isc::d2::DProcessBase.  The CPL is
@@ -207,11 +206,8 @@ in the diagram below:
 - isc::d2::D2Controller - entry point for running D2, it processes command line
 options, starts and controls the application process, @c D2Process.
 
-There were two implementations of D2Controller, today the only available
-form is JSON.
-
-- isc::d2::D2Process - creates and manages D2's primary resources and implements
-the main event loop described in @ref d2EventLoop.
+- isc::d2::D2Process - creates and manages D2's primary resources and
+implements the main event loop described in @ref d2EventLoop.
 
 - isc::d2::D2CfgMgr - creates, updates, and provides access to D2's application
 configuration which is embodied by @c D2CfgContext.

diff --git a/src/bin/dhcp4/dhcp4.dox b/src/bin/dhcp4/dhcp4.dox
index 9364e8d175333e922d6ec6b6a22a3bd5f3a8157f..6288f52c1fa40a77e72ba46627b835f079202d7d 100644 (file)
--- a/src/bin/dhcp4/dhcp4.dox
+++ b/src/bin/dhcp4/dhcp4.dox
@@ -29,10 +29,6 @@ DHCPv4 server component does not support direct traffic (relayed
 only), as support for transmission to hosts without IPv4 address
 assigned is not implemented in IfaceMgr yet.
 
-@section dhcpv4Session
-
-No longer applicable.
-
 @section dhcpv4ConfigParser Configuration Parser in DHCPv4
 
 This parser follows exactly the same logic as its DHCPv6 counterpart.

diff --git a/src/bin/dhcp6/dhcp6.dox b/src/bin/dhcp6/dhcp6.dox
index cf0349f4fc29541829fce5a539cedd9077fa2840..6fb191f1f6ed0b7a79fc323a090bbf889c2a5e10 100644 (file)
--- a/src/bin/dhcp6/dhcp6.dox
+++ b/src/bin/dhcp6/dhcp6.dox
@@ -28,10 +28,6 @@
  DHCPv6 server component does not support relayed traffic yet, as
  support for relay decapsulation is not implemented yet.
 
- @section dhcpv6Session
-
- No longer applicable.
-
  @section dhcpv6ConfigParser Configuration Parser in DHCPv6
 
  \note With the implementation of the Kea ticket #3534 we're moving away from

diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index a46fb18f7725c58e42b4a1905b94ff104b26315e..f8cc2c4aa443567d0d43390ad6023f67b96511d2 100644 (file)
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -309,10 +309,10 @@ public:
 void
 Session::establish(const char* socket_file) {
     if (socket_file == NULL) {
-        socket_file = getenv("MSGQ_SOCKET_FILE");
+        socket_file = getenv("KEA_MSGQ_SOCKET_FILE");
     }
     if (socket_file == NULL) {
-        socket_file = MSGQ_SOCKET_FILE;
+        socket_file = KEA_MSGQ_SOCKET_FILE;
     }
 
     impl_->establish(*socket_file);

diff --git a/src/lib/cc/session_config.h.pre.in b/src/lib/cc/session_config.h.pre.in
index 96ff421d4306943c231642c698c785e50abcc327..91c26c0490d73b4d8b77a15cdbbe5d399b061e9d 100644 (file)
--- a/src/lib/cc/session_config.h.pre.in
+++ b/src/lib/cc/session_config.h.pre.in
@@ -1,2 +1,2 @@
-#define MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/msgq_socket"
+#define KEA_MSGQ_SOCKET_FILE "@@LOCALSTATEDIR@@/@PACKAGE@/kea_msgq_socket"