Skip to content

GitLab

Kea
Kea
Commit 73e2d385 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files
Options

[3414] Renamed server binaries from b10-* to kea-*.

parent c1896c91
Hide whitespace changes
Inline Side-by-side
Showing with 196 additions and 182 deletions
src/bin/d2/.gitignore
View file @ 73e2d385
/b10-dhcp-ddns
/b10-dhcp-ddns.8
/kea-dhcp-ddns
/kea-dhcp-ddns.8
/d2_messages.cc
/d2_messages.h
/spec_config.h
......
src/bin/d2/Makefile.am
View file @ 73e2d385
......@@ -18,15 +18,15 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = *.gcno *.gcda spec_config.h d2_messages.h d2_messages.cc s-messages
man_MANS = b10-dhcp-ddns.8
man_MANS = kea-dhcp-ddns.8
DISTCLEANFILES = $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-dhcp-ddns.xml dhcp-ddns.spec
EXTRA_DIST = $(man_MANS) kea-dhcp-ddns.xml dhcp-ddns.spec
if GENERATE_DOCS
b10-dhcp-ddns.8: b10-dhcp-ddns.xml
kea-dhcp-ddns.8: kea-dhcp-ddns.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/b10-dhcp-ddns.xml
$(srcdir)/kea-dhcp-ddns.xml
else
......@@ -47,52 +47,52 @@ s-messages: d2_messages.mes
BUILT_SOURCES = spec_config.h d2_messages.h d2_messages.cc
pkglibexec_PROGRAMS = b10-dhcp-ddns
b10_dhcp_ddns_SOURCES = main.cc
b10_dhcp_ddns_SOURCES += d_process.h
b10_dhcp_ddns_SOURCES += d_controller.cc d_controller.h
b10_dhcp_ddns_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
b10_dhcp_ddns_SOURCES += d2_asio.h
b10_dhcp_ddns_SOURCES += d2_log.cc d2_log.h
b10_dhcp_ddns_SOURCES += d2_process.cc d2_process.h
b10_dhcp_ddns_SOURCES += d2_config.cc d2_config.h
b10_dhcp_ddns_SOURCES += d2_cfg_mgr.cc d2_cfg_mgr.h
b10_dhcp_ddns_SOURCES += d2_queue_mgr.cc d2_queue_mgr.h
b10_dhcp_ddns_SOURCES += d2_update_message.cc d2_update_message.h
b10_dhcp_ddns_SOURCES += d2_update_mgr.cc d2_update_mgr.h
b10_dhcp_ddns_SOURCES += d2_zone.cc d2_zone.h
b10_dhcp_ddns_SOURCES += dns_client.cc dns_client.h
b10_dhcp_ddns_SOURCES += io_service_signal.cc io_service_signal.h
b10_dhcp_ddns_SOURCES += labeled_value.cc labeled_value.h
b10_dhcp_ddns_SOURCES += nc_add.cc nc_add.h
b10_dhcp_ddns_SOURCES += nc_remove.cc nc_remove.h
b10_dhcp_ddns_SOURCES += nc_trans.cc nc_trans.h
b10_dhcp_ddns_SOURCES += state_model.cc state_model.h
pkglibexec_PROGRAMS = kea-dhcp-ddns
kea_dhcp_ddns_SOURCES = main.cc
kea_dhcp_ddns_SOURCES += d_process.h
kea_dhcp_ddns_SOURCES += d_controller.cc d_controller.h
kea_dhcp_ddns_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
kea_dhcp_ddns_SOURCES += d2_asio.h
kea_dhcp_ddns_SOURCES += d2_log.cc d2_log.h
kea_dhcp_ddns_SOURCES += d2_process.cc d2_process.h
kea_dhcp_ddns_SOURCES += d2_config.cc d2_config.h
kea_dhcp_ddns_SOURCES += d2_cfg_mgr.cc d2_cfg_mgr.h
kea_dhcp_ddns_SOURCES += d2_queue_mgr.cc d2_queue_mgr.h
kea_dhcp_ddns_SOURCES += d2_update_message.cc d2_update_message.h
kea_dhcp_ddns_SOURCES += d2_update_mgr.cc d2_update_mgr.h
kea_dhcp_ddns_SOURCES += d2_zone.cc d2_zone.h
kea_dhcp_ddns_SOURCES += dns_client.cc dns_client.h
kea_dhcp_ddns_SOURCES += io_service_signal.cc io_service_signal.h
kea_dhcp_ddns_SOURCES += labeled_value.cc labeled_value.h
kea_dhcp_ddns_SOURCES += nc_add.cc nc_add.h
kea_dhcp_ddns_SOURCES += nc_remove.cc nc_remove.h
kea_dhcp_ddns_SOURCES += nc_trans.cc nc_trans.h
kea_dhcp_ddns_SOURCES += state_model.cc state_model.h
if CONFIG_BACKEND_BUNDY
b10_dhcp_ddns_SOURCES += bundy_d2_controller.cc bundy_d2_controller.h
kea_dhcp_ddns_SOURCES += bundy_d2_controller.cc bundy_d2_controller.h
else
if CONFIG_BACKEND_JSON
b10_dhcp_ddns_SOURCES += d2_controller.cc d2_controller.h
kea_dhcp_ddns_SOURCES += d2_controller.cc d2_controller.h
endif
endif
nodist_b10_dhcp_ddns_SOURCES = d2_messages.h d2_messages.cc
nodist_kea_dhcp_ddns_SOURCES = d2_messages.h d2_messages.cc
EXTRA_DIST += d2_messages.mes
b10_dhcp_ddns_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
b10_dhcp_ddnsdir = $(pkgdatadir)
b10_dhcp_ddns_DATA = dhcp-ddns.spec
kea_dhcp_ddns_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiodns/libkea-asiodns.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
kea_dhcp_ddnsdir = $(pkgdatadir)
kea_dhcp_ddns_DATA = dhcp-ddns.spec
src/bin/d2/b10-dhcp-ddns.xml → src/bin/d2/kea-dhcp-ddns.xml
View file @ 73e2d385
......@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2013, 2014 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
......@@ -20,37 +20,37 @@
<refentry>
<refentryinfo>
<date>May 15, 2013</date>
<date>July 1, 2014</date>
</refentryinfo>
<refmeta>
<refentrytitle>b10-dhcp-ddns</refentrytitle>
<refentrytitle>kea-dhcp-ddns</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo>BIND10</refmiscinfo>
<refmiscinfo>Kea</refmiscinfo>
</refmeta>
<refnamediv>
<refname>b10-dhcp-ddns</refname>
<refpurpose>DHCP-DDNS process in BIND 10 architecture</refpurpose>
<refpurpose>DHCP-DDNS process in Kea</refpurpose>
</refnamediv>
<docinfo>
<copyright>
<year>2013</year>
<year>2014</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
<refsynopsisdiv>
<cmdsynopsis>
<command>b10-dhcp-ddns</command>
<command>kea-dhcp-ddns</command>
<arg><option>-v</option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsynopsisdiv>
<cmdsynopsis>
<command>b10-dhcp-ddns</command>
<command>kea-dhcp-ddns</command>
<arg><option>-s</option></arg>
</cmdsynopsis>
</refsynopsisdiv>
......@@ -59,9 +59,9 @@
<refsect1>
<title>DESCRIPTION</title>
<para>
The <command>b10-dhcp-ddns</command> service processes requests to
The <command>kea-dhcp-ddns</command> service processes requests to
to update DNS mapping based on DHCP lease change events. The service
may run either as a BIND10 module (integrated mode) or as a individual
may run either as a Kea module (integrated mode) or as a individual
process (stand-alone mode) dependent upon command line arguments. The
default is integrated mode. Stand alone operation is strictly for
development purposes and is not suited for production.
......@@ -85,33 +85,26 @@
</varlistentry>
<varlistentry>
<term><option>-s</option></term>
<term><option>-c</option></term>
<listitem><para>
Causes the process to run without attempting to connect to the
BIND10 message queue. This is for development purposes.
Configuration file including the configuration for DHCP-DDNS server.
It may also contain configuration entries for other Kea services.
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
<para>
<citerefentry>
<refentrytitle>b10-dhcp-ddns</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>.
</para>
</refsect1>
<refsect1>
<title>HISTORY</title>
<para>
The <command>b10-dhcp-ddns</command> process was first coded in
May 2013 by the ISC Kea/Dhcp team.
May 2013 by the ISC Kea/DHCP team.
</para>
<para>
Kea became a standalone server and the BIND10 framework was
removed. The DHCP-DDNS server binary was renamed to kea-dhcp-ddns
in July 2014.
</para>
</refsect1>
</refentry><!--
......
src/bin/d2/tests/d2_process_tests.sh.in
View file @ 73e2d385
......@@ -42,7 +42,7 @@ CONFIG_INVALID="{
}"
# Set the location of the executable.
bin="b10-dhcp-ddns"
bin="kea-dhcp-ddns"
bin_path=@abs_top_builddir@/src/bin/d2
# Import common test library.
......
src/bin/dhcp4/.gitignore
View file @ 73e2d385
/b10-dhcp4
/b10-dhcp4.8
/kea-dhcp4
/kea-dhcp4.8
/dhcp4_messages.cc
/dhcp4_messages.h
/spec_config.h
......
src/bin/dhcp4/Makefile.am
View file @ 73e2d385
......@@ -18,15 +18,15 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = *.gcno *.gcda spec_config.h dhcp4_messages.h dhcp4_messages.cc s-messages
man_MANS = b10-dhcp4.8
man_MANS = kea-dhcp4.8
DISTCLEANFILES = $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-dhcp4.xml dhcp4.spec
EXTRA_DIST = $(man_MANS) kea-dhcp4.xml dhcp4.spec
if GENERATE_DOCS
b10-dhcp4.8: b10-dhcp4.xml
kea-dhcp4.8: kea-dhcp4.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/b10-dhcp4.xml
$(srcdir)/kea-dhcp4.xml
else
......@@ -47,35 +47,35 @@ s-messages: dhcp4_messages.mes
BUILT_SOURCES = spec_config.h dhcp4_messages.h dhcp4_messages.cc
pkglibexec_PROGRAMS = b10-dhcp4
pkglibexec_PROGRAMS = kea-dhcp4
b10_dhcp4_SOURCES = main.cc
b10_dhcp4_SOURCES += ctrl_dhcp4_srv.cc ctrl_dhcp4_srv.h
b10_dhcp4_SOURCES += json_config_parser.cc json_config_parser.h
b10_dhcp4_SOURCES += dhcp4_log.cc dhcp4_log.h
b10_dhcp4_SOURCES += dhcp4_srv.cc dhcp4_srv.h
kea_dhcp4_SOURCES = main.cc
kea_dhcp4_SOURCES += ctrl_dhcp4_srv.cc ctrl_dhcp4_srv.h
kea_dhcp4_SOURCES += json_config_parser.cc json_config_parser.h
kea_dhcp4_SOURCES += dhcp4_log.cc dhcp4_log.h
kea_dhcp4_SOURCES += dhcp4_srv.cc dhcp4_srv.h
if CONFIG_BACKEND_BUNDY
b10_dhcp4_SOURCES += bundy_controller.cc
kea_dhcp4_SOURCES += bundy_controller.cc
endif
if CONFIG_BACKEND_JSON
b10_dhcp4_SOURCES += kea_controller.cc
kea_dhcp4_SOURCES += kea_controller.cc
endif
nodist_b10_dhcp4_SOURCES = dhcp4_messages.h dhcp4_messages.cc
nodist_kea_dhcp4_SOURCES = dhcp4_messages.h dhcp4_messages.cc
EXTRA_DIST += dhcp4_messages.mes
b10_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
b10_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
b10_dhcp4dir = $(pkgdatadir)
b10_dhcp4_DATA = dhcp4.spec
kea_dhcp4_LDADD = $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
kea_dhcp4dir = $(pkgdatadir)
kea_dhcp4_DATA = dhcp4.spec
src/bin/dhcp4/b10-dhcp4.xml → src/bin/dhcp4/kea-dhcp4.xml
View file @ 73e2d385
......@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2011, 2014 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
......@@ -20,39 +20,41 @@
<refentry>
<refentryinfo>
<date>October 27, 2011</date>
<date>July 1, 2014</date>
</refentryinfo>
<refmeta>
<refentrytitle>b10-dhcp4</refentrytitle>
<refentrytitle>kea-dhcp4</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo>BIND10</refmiscinfo>
<refmiscinfo>Kea</refmiscinfo>
</refmeta>
<refnamediv>
<refname>b10-dhcp4</refname>
<refpurpose>DHCPv4 server in BIND 10 architecture</refpurpose>
<refname>kea-dhcp4</refname>
<refpurpose>DHCPv4 server in Kea</refpurpose>
</refnamediv>
<docinfo>
<copyright>
<year>2011</year>
<year>2014</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
<refsynopsisdiv>
<cmdsynopsis>
<command>b10-dhcp4</command>
<command>kea-dhcp4</command>
<arg><option>-v</option></arg>
<arg><option>-c<replaceable class="parameter">config-file</replaceable></option></arg>
<arg><option>-p<replaceable class="parameter">port-number</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
The <command>b10-dhcp4</command> daemon will provide the
DHCPv4 server implementation when it becomes functional.
The <command>kea-dhcp4</command> daemon provides the
DHCPv4 server implementation.
</para>
</refsect1>
......@@ -68,23 +70,26 @@
<term><option>-v</option></term>
<listitem><para>
Enable verbose mode.
<!-- TODO: what does this do? -->
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<varlistentry>
<term><option>-c</option></term>
<listitem><para>
Configuration file including the configuration for DHCPv4 server.
It may also contain configuration entries for other Kea services.
</para></listitem>
</varlistentry>
<refsect1>
<title>SEE ALSO</title>
<para>
<citerefentry>
<refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>.
</para>
<varlistentry>
<term><option>-p</option></term>
<listitem><para>
Port number (1-65535) on which the server listens. This is useful
for testing purposes only.
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
......@@ -93,6 +98,11 @@
The <command>b10-dhcp4</command> daemon was first coded in
November 2011 by Tomek Mrugalski.
</para>
<para>
Kea became a standalone server and the BIND10 framework was
removed. The DHCPv4 server binary was renamed to kea-dhcp4
in July 2014.
</para>
</refsect1>
</refentry><!--
- Local variables:
......
src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
View file @ 73e2d385
......@@ -59,7 +59,7 @@ CONFIG_INVALID="{
}"
# Set the location of the executable.
bin="b10-dhcp4"
bin="kea-dhcp4"
bin_path=@abs_top_builddir@/src/bin/dhcp4
# Import common test library.
......
src/bin/dhcp6/.gitignore
View file @ 73e2d385
/b10-dhcp6
/b10-dhcp6.8
/kea-dhcp6
/kea-dhcp6.8
/dhcp6_messages.cc
/dhcp6_messages.h
/spec_config.h
......
src/bin/dhcp6/Makefile.am
View file @ 73e2d385
......@@ -19,16 +19,16 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
CLEANFILES = spec_config.h dhcp6_messages.h dhcp6_messages.cc s-messages
man_MANS = b10-dhcp6.8
man_MANS = kea-dhcp6.8
DISTCLEANFILES = $(man_MANS)
EXTRA_DIST = $(man_MANS) b10-dhcp6.xml dhcp6.spec
EXTRA_DIST = $(man_MANS) kea-dhcp6.xml dhcp6.spec
if GENERATE_DOCS
b10-dhcp6.8: b10-dhcp6.xml
kea-dhcp6.8: kea-dhcp6.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/b10-dhcp6.xml
$(srcdir)/kea-dhcp6.xml
else
......@@ -49,35 +49,35 @@ s-messages: dhcp6_messages.mes
BUILT_SOURCES = spec_config.h dhcp6_messages.h dhcp6_messages.cc
pkglibexec_PROGRAMS = b10-dhcp6
pkglibexec_PROGRAMS = kea-dhcp6
b10_dhcp6_SOURCES = main.cc
b10_dhcp6_SOURCES += dhcp6_log.cc dhcp6_log.h
b10_dhcp6_SOURCES += dhcp6_srv.cc dhcp6_srv.h
b10_dhcp6_SOURCES += ctrl_dhcp6_srv.cc ctrl_dhcp6_srv.h
b10_dhcp6_SOURCES += json_config_parser.cc json_config_parser.h
kea_dhcp6_SOURCES = main.cc
kea_dhcp6_SOURCES += dhcp6_log.cc dhcp6_log.h
kea_dhcp6_SOURCES += dhcp6_srv.cc dhcp6_srv.h
kea_dhcp6_SOURCES += ctrl_dhcp6_srv.cc ctrl_dhcp6_srv.h
kea_dhcp6_SOURCES += json_config_parser.cc json_config_parser.h
if CONFIG_BACKEND_BUNDY
b10_dhcp6_SOURCES += bundy_controller.cc
kea_dhcp6_SOURCES += bundy_controller.cc
endif
if CONFIG_BACKEND_JSON
b10_dhcp6_SOURCES += kea_controller.cc
kea_dhcp6_SOURCES += kea_controller.cc
endif
nodist_b10_dhcp6_SOURCES = dhcp6_messages.h dhcp6_messages.cc
nodist_kea_dhcp6_SOURCES = dhcp6_messages.h dhcp6_messages.cc
EXTRA_DIST += dhcp6_messages.mes
b10_dhcp6_LDADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
b10_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
b10_dhcp6dir = $(pkgdatadir)
b10_dhcp6_DATA = dhcp6.spec
kea_dhcp6_LDADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/config/libkea-cfgclient.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp/libkea-dhcp++.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la
kea_dhcp6dir = $(pkgdatadir)
kea_dhcp6_DATA = dhcp6.spec
src/bin/dhcp6/b10-dhcp6.xml → src/bin/dhcp6/kea-dhcp6.xml
View file @ 73e2d385
......@@ -2,7 +2,7 @@
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]>
<!--
- Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
- Copyright (C) 2011, 2014 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
......@@ -20,39 +20,41 @@
<refentry>
<refentryinfo>
<date>October 27, 2011</date>
<date>July 1, 2014</date>
</refentryinfo>
<refmeta>
<refentrytitle>b10-dhcp6</refentrytitle>
<refentrytitle>kea-dhcp6</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo>BIND10</refmiscinfo>
<refmiscinfo>Kea</refmiscinfo>
</refmeta>
<refnamediv>
<refname>b10-dhcp6</refname>
<refpurpose>DHCPv6 server in BIND 10 architecture</refpurpose>
<refname>kea-dhcp6</refname>
<refpurpose>DHCPv6 server in Kea</refpurpose>
</refnamediv>
<docinfo>
<copyright>
<year>2011</year>
<year>2014</year>
<holder>Internet Systems Consortium, Inc. ("ISC")</holder>
</copyright>
</docinfo>
<refsynopsisdiv>
<cmdsynopsis>
<command>b10-dhcp6</command>
<command>kea-dhcp6</command>
<arg><option>-v</option></arg>
<arg><option>-c<replaceable class="parameter">config-file</replaceable></option></arg>
<arg><option>-p<replaceable class="parameter">port-number</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
The <command>b10-dhcp6</command> daemon will provide the
DHCPv6 server implementation when it becomes functional.
The <command>kea-dhcp6</command> daemon provides the
DHCPv6 server implementation.
</para>
</refsect1>
......@@ -72,19 +74,23 @@
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<varlistentry>
<term><option>-c</option></term>
<listitem><para>
Configuration file including the configuration for DHCPv6 server.
It may also contain configuration entries for other Kea services.
</para></listitem>
</varlistentry>
<refsect1>
<title>SEE ALSO</title>
<para>
<citerefentry>
<refentrytitle>b10-init</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>bind10</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>.
</para>
<varlistentry>
<term><option>-p</option></term>
<listitem><para>
Port number (1-65535) on which the server listens. This is useful
for testing purposes only.
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
......@@ -93,6 +99,11 @@
The <command>b10-dhcp6</command> daemon was first coded in
June 2011 by Tomek Mrugalski.
</para>
<para>
Kea became a standalone server and the BIND10 framework was
removed. The DHCPv6 server binary was renamed to kea-dhcp6 in
July 2014.
</para>
</refsect1>
</refentry><!--
- Local variables:
......
src/bin/dhcp6/tests/dhcp6_process_tests.sh.in
View file @ 73e2d385
......@@ -61,7 +61,7 @@ CONFIG_INVALID="{
}"
# Set the location of the executable.
bin="b10-dhcp6"
bin="kea-dhcp6"
bin_path=@abs_top_builddir@/src/bin/dhcp6
# Import common test library.
......
src/bin/keactrl/keactrl.conf.in
View file @ 73e2d385
......@@ -10,8 +10,8 @@ kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf
# Location of Kea binaries.
exec_prefix=@exec_prefix@
dhcp4_srv=@libexecdir@/@PACKAGE@/b10-dhcp4
dhcp6_srv=@libexecdir@/@PACKAGE@/b10-dhcp6
dhcp4_srv=@libexecdir@/@PACKAGE@/kea-dhcp4
dhcp6_srv=@libexecdir@/@PACKAGE@/kea-dhcp6
dhcp_ddns_srv=@libexecdir@/@PACKAGE@/b10-dhcp-ddns
# Start DHCPv4 server?
......
src/bin/keactrl/tests/keactrl_tests.sh.in
View file @ 73e2d385
......@@ -79,9 +79,9 @@ config="{
}"
# Fixed part of the keactrl configuration file.
keactrl_fixed_config="dhcp4_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp4/b10-dhcp4\n\
dhcp6_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp6/b10-dhcp6\n\
dhcp_ddns_srv=${KEACTRL_BUILD_DIR}/src/bin/d2/b10-dhcp-ddns\n"
keactrl_fixed_config="dhcp4_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp4/kea-dhcp4\n\
dhcp6_srv=${KEACTRL_BUILD_DIR}/src/bin/dhcp6/kea-dhcp6\n\
dhcp_ddns_srv=${KEACTRL_BUILD_DIR}/src/bin/d2/kea-dhcp-ddns\n"
# This test checks that DHCPv4, DHCPv6 and D2 server can be started and
# shut down.
......
src/lib/testutils/dhcp_test_lib.sh.in
View file @ 73e2d385
......@@ -13,7 +13,7 @@
# PERFORMANCE OF THIS SOFTWARE.
# A list of Kea processes, mainly used by the cleanup functions.
KEA_PROCS="b10-dhcp4 b10-dhcp6 b10-dhcp-ddns"
KEA_PROCS="kea-dhcp4 kea-dhcp6 kea-dhcp-ddns"
### Logging functions ###
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment