Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
90825001
Commit
90825001
authored
Dec 14, 2016
by
Andrei Pavel
Browse files
Corrected typos
parent
039622a4
Changes
302
Hide whitespace changes
Inline
Side-by-side
doc/devel/contribute.dox
View file @
90825001
...
...
@@ -37,7 +37,7 @@ that your code compiles. This may seem obvious, but there's more to
it. You have surely checked that it compiles on your system, but Kea
is portable software. Besides Linux, it is compiled and used on
relatively uncommon systems like OpenBSD. Will your code
compile and work there? What about endianess? It is likely that you used
compile and work there? What about endian
n
ess? It is likely that you used
a regular x86 architecture machine to write your patch, but the software
is expected to run on many other architectures. You may take a look at
system specific build notes (http://kea.isc.org/wiki/Install).
...
...
doc/examples/kea4/backends.json
View file @
90825001
...
...
@@ -26,7 +26,7 @@
#
2
.
MySQL
backend.
Leases
will
be
stored
in
MySQL
database.
Make
sure
it
#
is
up
,
running
and
properly
initialized.
See
kea-admin
documentation
#
for
details
on
how
to
intialize
the
database.
The
only
strictly
required
#
for
details
on
how
to
in
i
tialize
the
database.
The
only
strictly
required
#
parameters
are
type
and
name.
If
other
parameters
are
not
specified
,
#
Kea
will
assume
the
database
is
avaiable
on
localhost
,
that
user
and
#
password
is
not
necessary
to
connect
and
that
timeout
is
5
seconds.
...
...
@@ -42,7 +42,7 @@
#
3
.
PostgreSQL
backend.
Leases
will
be
stored
in
PostgreSQL
database.
Make
#
sure
it
is
up
,
running
and
properly
initialized.
See
kea-admin
documentation
#
for
details
on
how
to
intialize
the
database.
The
only
strictly
required
#
for
details
on
how
to
in
i
tialize
the
database.
The
only
strictly
required
#
parameters
are
type
and
name.
If
other
parameters
are
not
specified
,
#
Kea
will
assume
the
database
is
avaiable
on
localhost
,
that
user
and
#
password
is
not
necessary
to
connect
and
that
timeout
is
5
seconds.
...
...
@@ -57,7 +57,7 @@
#
4
.
CQL
(Cassandra)
backend.
Leases
will
be
stored
in
Cassandra
database.
Make
#
sure
it
is
up
,
running
and
properly
initialized.
See
kea-admin
documentation
#
for
details
on
how
to
intialize
the
database.
The
only
strictly
required
#
for
details
on
how
to
in
i
tialize
the
database.
The
only
strictly
required
#
parameters
are
type
,
keyspace
and
contact_points.
At
least
one
contact
point
#
must
be
specified
,
but
more
than
one
is
required
for
redundancy.
Make
sure
#
you
specify
the
contact
points
without
spaces.
Kea
must
be
compiled
with
...
...
doc/examples/kea6/backends.json
View file @
90825001
...
...
@@ -26,7 +26,7 @@
#
2
.
MySQL
backend.
Leases
will
be
stored
in
MySQL
database.
Make
sure
it
#
is
up
,
running
and
properly
initialized.
See
kea-admin
documentation
#
for
details
on
how
to
intialize
the
database.
The
only
strictly
required
#
for
details
on
how
to
in
i
tialize
the
database.
The
only
strictly
required
#
parameters
are
type
and
name.
If
other
parameters
are
not
specified
,
#
Kea
will
assume
the
database
is
avaiable
on
localhost
,
that
user
and
#
password
is
not
necessary
to
connect
and
that
timeout
is
5
seconds.
...
...
@@ -42,7 +42,7 @@
#
3
.
PostgreSQL
backend.
Leases
will
be
stored
in
PostgreSQL
database.
Make
#
sure
it
is
up
,
running
and
properly
initialized.
See
kea-admin
documentation
#
for
details
on
how
to
intialize
the
database.
The
only
strictly
required
#
for
details
on
how
to
in
i
tialize
the
database.
The
only
strictly
required
#
parameters
are
type
and
name.
If
other
parameters
are
not
specified
,
#
Kea
will
assume
the
database
is
avaiable
on
localhost
,
that
user
and
#
password
is
not
necessary
to
connect
and
that
timeout
is
5
seconds.
...
...
@@ -57,7 +57,7 @@
#
4
.
CQL
(Cassandra)
backend.
Leases
will
be
stored
in
Cassandra
database.
Make
#
sure
it
is
up
,
running
and
properly
initialized.
See
kea-admin
documentation
#
for
details
on
how
to
intialize
the
database.
The
only
strictly
required
#
for
details
on
how
to
in
i
tialize
the
database.
The
only
strictly
required
#
parameters
are
type
,
keyspace
and
contact_points.
At
least
one
contact
point
#
must
be
specified
,
but
more
than
one
is
required
for
redundancy.
Make
sure
#
you
specify
the
contact
points
without
spaces.
Kea
must
be
compiled
with
...
...
doc/guide/admin.xml
View file @
90825001
...
...
@@ -18,7 +18,7 @@
For example, Kea currently only stores lease information
and host reservations. Future versions of Kea will store
additional data such as subnet definitions: the database
structure will need to be updated to accomdate the extra
structure will need to be updated to accom
mo
date the extra
information.
</para>
...
...
@@ -72,7 +72,7 @@
<listitem>
<simpara>
<command>
lease-init
</command>
—
Initializes a new lease database. This is useful during a new
Initializes a new lease database. This is useful during a new
Kea installation. The database is initialized to the
latest version supported by the version of the software being
installed.
...
...
@@ -616,7 +616,7 @@ $ <userinput>kea-admin lease-upgrade pgsql -u <replaceable>database-user</replac
<orderedlist>
<listitem>
<para>
Export CQLSH_HOST environ
e
mnt variable:
Export CQLSH_HOST environm
e
nt variable:
<screen>
$
<userinput>
export CQLSH_HOST=localhost
</userinput>
</screen>
...
...
@@ -715,7 +715,7 @@ $ <userinput>kea-admin lease-upgrade cql -n <replaceable>database-name</replacea
read-only mode.
Sections
<xref
linkend=
"read-only-database-configuration4"
/>
and
<xref
linkend=
"read-only-database-configuration6"
/>
describe when
such configuration may be reqired and how to configure Kea to
such configuration may be req
u
ired and how to configure Kea to
operate using a read-only host database.
</para>
</section>
...
...
doc/guide/classify.xml
View file @
90825001
...
...
@@ -820,7 +820,7 @@ concatenation of the strings</entry></row>
</para>
<para>
To enable the debug statements in the classif
c
iaton system you will
To enable the debug statements in the classifi
c
at
i
on system you will
need to set the severity to "DEBUG" and the debug level to at least 55.
The specific loggers are "kea-dhcp4.eval" and "kea-dhcp6.eval".
</para>
...
...
doc/guide/ctrl-channel.xml
View file @
90825001
...
...
@@ -104,7 +104,7 @@ where <command>/path/to/the/kea/socket</command> is the path specified in the
configuration file. Text passed to
<command>
socat
</command>
will be sent to Kea and the responses received from Kea printed to standard output.
</para>
<para>
It is also easy to open UNIX socket program
m
atically. An example of
<para>
It is also easy to open UNIX socket programatically. An example of
such a simplistic client written in C is available in the Kea Developer's
Guide, chapter Control Channel Overview, section Using Control Channel.
</para>
...
...
doc/guide/ddns.xml
View file @
90825001
...
...
@@ -716,7 +716,7 @@ corresponding values in the DHCP servers' "dhcp-ddns" configuration section.
</section>
<!-- "d2-reverse-ddns-config" -->
<section
id=
"d2-ex
m
aple-config"
>
<section
id=
"d2-exa
m
ple-config"
>
<title>
Example DHCP-DDNS Server Configuration
</title>
<para>
This section provides an example DHCP-DDNS server configuration based
...
...
doc/guide/dhcp4-srv.xml
View file @
90825001
...
...
@@ -2969,7 +2969,7 @@ It is merely echoed by the server
</screen>
<para>
Static class assignments, as shown above, can be used in conjuction
<para>
Static class assignments, as shown above, can be used in conju
n
ction
with classification using expressions.
</para>
</section>
...
...
doc/guide/dhcp6-srv.xml
View file @
90825001
...
...
@@ -1203,7 +1203,7 @@ temporarily override a list of interface names and listen on all interfaces.
S46 container options group rules and optional port parameters
for a specified domain. There are three container options specified
in the "dhcp6" (top level) option space: MAP-E Container option,
MAP-T Container option and S46 Li
e
ghtweight 4over6 Container option.
MAP-T Container option and S46 Lightweight 4over6 Container option.
These options only contain encapsulated options specified below.
They do not include any data fields.
</para>
...
...
@@ -2904,7 +2904,7 @@ should include options from the isc option space:
}
</screen>
<para>
Static class assignments, as shown above, can be used in conjuction
<para>
Static class assignments, as shown above, can be used in conju
n
ction
with classification using expressions.
</para>
</section>
...
...
doc/guide/hooks.xml
View file @
90825001
...
...
@@ -271,7 +271,7 @@
</itemizedlist>
</para>
<para>
Once loaded, the library allows segregating incoming
s
requests into
Once loaded, the library allows segregating incoming requests into
known and unknown clients. For known clients, the packets are
processed mostly as usual, except it is possible to override certain
options being sent. That can be done on a per host basis. Clients
...
...
@@ -306,7 +306,7 @@
is "HW_ADDR" for IPv4 users or "DUID" for IPv6
users
</para></listitem>
<listitem><para><command>
id
</command>
, whose value is
either the hardware address or the DUID from the equest
either the hardware address or the DUID from the
r
equest
formatted as a string of hex digits, with or without
":" delimiters.
</para></listitem>
</itemizedlist>
...
...
@@ -344,7 +344,7 @@ and may have the zero or more of the following entries:
<title>
Forensic Logging Hooks
</title>
<para>
This section describes the forensic log hooks library. This library
povides hooks that record a detailed log of lease assignments
p
r
ovides hooks that record a detailed log of lease assignments
and renewals into a set of log files. Currently this library
is only available to ISC customers with a support contract.
</para>
...
...
doc/guide/logging.xml
View file @
90825001
...
...
@@ -61,7 +61,7 @@
runtime) are responsible for creating the loggers used by those
libraries. Such loggers should have unique names, different
from the logger names used by Kea. In this way the
messages output by the hooks library can be distingued from
messages output by the hooks library can be distingu
ish
ed from
messages issued by the core Kea code. Unique names also allow
the loggers to be configured independently of loggers used
by Kea. Whenever it makes sense, a hook library can use multiple
...
...
@@ -150,7 +150,7 @@
packet drops, you must create configuration entry for the
logger called
<quote>
kea-dhcp4.bad-packets
</quote>
and specify
severity DEBUG for this logger. All other configuration
parameters may be omited for this logger if the logger should
parameters may be omit
t
ed for this logger if the logger should
use the default values specified in the root logger's
configuration.
</para>
...
...
ext/coroutine/coroutine.h
View file @
90825001
...
...
@@ -15,22 +15,22 @@
// \brief Coroutine object
//
// A coroutine object maintains the state of a re-enterable routine. It
// is assignable and copy-construct
a
ble, and can be used as a base class
// is assignable and copy-construct
i
ble, and can be used as a base class
// for a class that uses it, or as a data member. The copy overhead is
// a single int.
//
// A reent
e
ra
ble
function contains a CORO_REENTER (coroutine) { ... }
// A reentra
nt
function contains a CORO_REENTER (coroutine) { ... }
// block. Whenever an asychrnonous operation is initiated within the
// routine, the function is provided as the handler object. (The simplest
// way to do this is to have the reent
e
ra
ble
function be the operator()
// way to do this is to have the reentra
nt
function be the operator()
// member for the coroutine object itself.) For example:
//
//
// CORO_YIELD socket->async_read_some(buffer, *this);
//
// The CORO_YIELD keyword updates the current status of the coroutine to
// indicate the line number currently being executed. The
// async_read_some() call is initiated, with a copy of the updated
// coro
t
utine as its handler object, and the current coroutine exits. When
// coroutine as its handler object, and the current coroutine exits. When
// the async_read_some() call finishes, the copied coroutine will be
// called, and will resume processing exactly where the original one left
// off--right after asynchronous call. This allows asynchronous I/O
...
...
src/bin/admin/tests/cql_tests.sh.in
View file @
90825001
...
...
@@ -81,7 +81,7 @@ cql_lease_version_test() {
$keaadmin
lease-init cql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
assert_eq 0
$?
"kea-admin lease-init cql failed, expected exit code: %d, actual: %d"
# Ver
f
iy that kea-admin lease-version returns the correct version.
# Veri
f
y that kea-admin lease-version returns the correct version.
version
=
$(
$keaadmin
lease-version cql
-u
$db_user
-p
$db_password
-n
$db_name
)
assert_str_eq
"1.0"
$version
"Expected kea-admin to return %s, returned value was %s"
...
...
src/bin/admin/tests/mysql_tests.sh.in
View file @
90825001
...
...
@@ -38,7 +38,7 @@ mysql_lease_init_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's init
i
alize the database
${
keaadmin
}
lease-init mysql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
ERRCODE
=
$?
...
...
@@ -117,7 +117,7 @@ mysql_host_reservation_init_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's init
i
alize the database
${
keaadmin
}
lease-init mysql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
ERRCODE
=
$?
...
...
@@ -387,7 +387,7 @@ mysql_lease4_dump_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's init
i
alize the database
${
keaadmin
}
lease-init mysql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
ERRCODE
=
$?
assert_eq 0
$ERRCODE
"could not create database, expected exit code %d, actual %d"
...
...
@@ -447,7 +447,7 @@ mysql_lease6_dump_test() {
# Let's wipe the whole database
mysql_wipe
# Ok, now let's initalize the database
# Ok, now let's init
i
alize the database
${
keaadmin
}
lease-init mysql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
ERRCODE
=
$?
assert_eq 0
$ERRCODE
"could not create database, expected exit code %d, actual %d"
...
...
src/bin/admin/tests/pgsql_tests.sh.in
View file @
90825001
...
...
@@ -86,7 +86,7 @@ pgsql_lease_version_test() {
${
keaadmin
}
lease-init pgsql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
assert_eq 0
$?
"cannot initialize the database, expected exit code: %d, actual: %d"
# Ver
f
iy that kea-admin lease-version returns the correct version
# Veri
f
y that kea-admin lease-version returns the correct version
version
=
$(
${
keaadmin
}
lease-version pgsql
-u
$db_user
-p
$db_password
-n
$db_name
)
assert_str_eq
"3.0"
${
version
}
"Expected kea-admin to return %s, returned value was %s"
...
...
@@ -280,7 +280,7 @@ pgsql_lease4_dump_test() {
# Let's wipe the whole database
pgsql_wipe
# Ok, now let's initalize the database
# Ok, now let's init
i
alize the database
${
keaadmin
}
lease-init pgsql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
ERRCODE
=
$?
assert_eq 0
$ERRCODE
"could not create database, expected exit code %d, actual %d"
...
...
@@ -375,7 +375,7 @@ pgsql_lease6_dump_test() {
# Let's wipe the whole database
pgsql_wipe
# Ok, now let's initalize the database
# Ok, now let's init
i
alize the database
${
keaadmin
}
lease-init pgsql
-u
$db_user
-p
$db_password
-n
$db_name
-d
$db_scripts_dir
ERRCODE
=
$?
assert_eq 0
$ERRCODE
"could not create database, status code %d"
...
...
src/bin/d2/d2_cfg_mgr.cc
View file @
90825001
...
...
@@ -80,7 +80,7 @@ D2CfgMgr::forwardUpdatesEnabled() {
bool
D2CfgMgr
::
reverseUpdatesEnabled
()
{
// Reverse updates are not enabled if no revese servers are defined.
// Reverse updates are not enabled if no reve
r
se servers are defined.
return
(
getD2CfgContext
()
->
getReverseMgr
()
->
size
()
>
0
);
}
...
...
src/bin/d2/d2_config.cc
View file @
90825001
...
...
@@ -130,7 +130,7 @@ operator<<(std::ostream& os, const D2Params& config) {
}
// *********************** TSIGKeyInfo *************************
// Note these values match corre
p
sonding values for Bind9's
// Note these values match corres
p
onding values for Bind9's
// dnssec-keygen
const
char
*
TSIGKeyInfo
::
HMAC_MD5_STR
=
"HMAC-MD5"
;
const
char
*
TSIGKeyInfo
::
HMAC_SHA1_STR
=
"HMAC-SHA1"
;
...
...
src/bin/d2/d2_config.h
View file @
90825001
...
...
@@ -258,7 +258,7 @@ private:
/// @brief Dumps the contents of a D2Params as text to an output stream
///
/// @param os output stream to which text should be sent
/// @param config D2Param inst
n
ace to dump
/// @param config D2Param insta
n
ce to dump
std
::
ostream
&
operator
<<
(
std
::
ostream
&
os
,
const
D2Params
&
config
);
...
...
@@ -287,7 +287,7 @@ public:
/// @brief Constructor
///
/// @param name the unique label used to identify this key
/// @param algorithm the id of the encryption al
ogir
thm this key uses.
/// @param algorithm the id of the encryption al
gori
thm this key uses.
/// Currently supported values are (case insensitive):
/// -# "HMAC-MD5"
/// -# "HMAC-SHA1"
...
...
@@ -538,7 +538,7 @@ public:
///
/// @param name is the domain name of the domain.
/// @param servers is the list of server(s) supporting this domain.
/// @param tsig_key_info pointer to the TSIGKeyInfo for the dom
m
ain's key
/// @param tsig_key_info pointer to the TSIGKeyInfo for the domain's key
/// It defaults to an empty pointer, signifying the domain has no key.
DdnsDomain
(
const
std
::
string
&
name
,
DnsServerInfoStoragePtr
servers
,
...
...
src/bin/d2/d2_process.cc
View file @
90825001
...
...
@@ -243,7 +243,7 @@ D2Process::checkQueueStatus() {
:
"shutdown"
);
queue_mgr_
->
stopListening
();
}
catch
(
const
isc
::
Exception
&
ex
)
{
// It is very unlikey that we would experience an error
// It is very unlike
l
y that we would experience an error
// here, but theoretically possible.
LOG_ERROR
(
d2_logger
,
DHCP_DDNS_QUEUE_MGR_STOP_ERROR
)
.
arg
(
ex
.
what
());
...
...
src/bin/d2/d2_process.h
View file @
90825001
...
...
@@ -66,9 +66,9 @@ public:
/// This is invoked by the controller after command line arguments but
/// PRIOR to configuration reception. The base class provides this method
/// as a place to perform any derivation-specific initialization steps
/// that are inapp
p
ropriate for the constructor but necessary prior to
/// that are inappropriate for the constructor but necessary prior to
/// launch. So far, no such steps have been identified for D2, so its
/// implementa
n
tion is empty but required.
/// implementation is empty but required.
///
/// @throw DProcessBaseError if the initialization fails.
virtual
void
init
();
...
...
Prev
1
2
3
4
5
…
16
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment