Browse Source

Refactory kea dockers

Espinoza Guillermo 6 years ago
parent
commit
3be6ce4067
63 changed files with 762 additions and 70 deletions
  1. 38 6
      .drone.yml
  2. 0 63
      1.3.0/Dockerfile
  3. 37 0
      1.3.0/kea-ik/Dockerfile
  4. 0 0
      1.3.0/kea-ik/keys/bitbucket.id_rsa
  5. 0 0
      1.3.0/kea-ik/keys/bitbucket.id_rsa.pub
  6. 15 0
      1.3.0/kea-ik/script.sh
  7. 26 0
      1.3.0/kea-oss/Dockerfile
  8. 0 1
      1.3.0/script.sh
  9. 7 0
      1.3.0/kea-premium/Dockerfile
  10. 75 0
      hooks/README.md
  11. 0 0
      hooks/amqp/Makefile
  12. BIN
      hooks/amqp/kea-hook-flowdat3.so
  13. 0 0
      hooks/amqp/s-messages
  14. 0 0
      hooks/amqp/src/amqppublisher.cc
  15. 3 0
      hooks/amqp/src/amqppublisher.d
  16. 0 0
      hooks/amqp/src/amqppublisher.h
  17. BIN
      hooks/amqp/src/amqppublisher.o
  18. 0 0
      hooks/amqp/src/callouts.cc
  19. 133 0
      hooks/amqp/src/callouts.d
  20. BIN
      hooks/amqp/src/callouts.o
  21. 0 0
      hooks/amqp/src/common.h
  22. 0 0
      hooks/amqp/src/load.cc
  23. 39 0
      hooks/amqp/src/load.d
  24. BIN
      hooks/amqp/src/load.o
  25. 0 0
      hooks/amqp/src/logger.cc
  26. 26 0
      hooks/amqp/src/logger.d
  27. 0 0
      hooks/amqp/src/logger.h
  28. BIN
      hooks/amqp/src/logger.o
  29. 33 0
      hooks/amqp/src/messages.cc
  30. 6 0
      hooks/amqp/src/messages.d
  31. 17 0
      hooks/amqp/src/messages.h
  32. 0 0
      hooks/amqp/src/messages.mes
  33. BIN
      hooks/amqp/src/messages.o
  34. 0 0
      hooks/amqp/src/version.cc
  35. 14 0
      hooks/amqp/src/version.d
  36. BIN
      hooks/amqp/src/version.o
  37. 0 0
      hooks/mysql/Makefile
  38. BIN
      hooks/mysql/kea-hook-flowdat3-mysql.so
  39. 0 0
      hooks/mysql/s-messages
  40. 0 0
      hooks/mysql/src/amqppublisher.h
  41. 0 0
      hooks/mysql/src/callouts.cc
  42. 133 0
      hooks/mysql/src/callouts.d
  43. BIN
      hooks/mysql/src/callouts.o
  44. 0 0
      hooks/mysql/src/common.h
  45. 0 0
      hooks/mysql/src/load.cc
  46. 39 0
      hooks/mysql/src/load.d
  47. BIN
      hooks/mysql/src/load.o
  48. 0 0
      hooks/mysql/src/logger.cc
  49. 26 0
      hooks/mysql/src/logger.d
  50. 0 0
      hooks/mysql/src/logger.h
  51. BIN
      hooks/mysql/src/logger.o
  52. 33 0
      hooks/mysql/src/messages.cc
  53. 6 0
      hooks/mysql/src/messages.d
  54. 17 0
      hooks/mysql/src/messages.h
  55. 0 0
      hooks/mysql/src/messages.mes
  56. BIN
      hooks/mysql/src/messages.o
  57. 0 0
      hooks/mysql/src/mysql_connection.cc
  58. 25 0
      hooks/mysql/src/mysql_connection.d
  59. 0 0
      hooks/mysql/src/mysql_connection.h
  60. BIN
      hooks/mysql/src/mysql_connection.o
  61. 0 0
      hooks/mysql/src/version.cc
  62. 14 0
      hooks/mysql/src/version.d
  63. BIN
      hooks/mysql/src/version.o

+ 38 - 6
.drone.yml

@@ -6,18 +6,50 @@ pipeline:
       - env
       - php -v
 
- docker_kea_1.3.0:
-   repo : docker.infra.flowdat.com/fd3/kea-1.3.0
+ docker_kea_oss_1.3.0:
+   repo : docker.infra.flowdat.com/fd3/kea-oss-1.3.0
    image: plugins/docker
    pull: true
    email: luciano@interlink.com.ar
    registry: docker.infra.flowdat.com
-   dockerfile: 1.3.0/Dockerfile
-   context: 1.3.0/
+   dockerfile: 1.3.0/kea-oss/Dockerfile
+   context: 1.3.0/kea-oss/
    tag:
       - latest
-      - "1.3.0"
-      - "1.3"
+      - "1.3.0-kea-oss"
+      - "1.3-kea-oss"
+   when:
+      event: [pull_request, push, tag]
+      branch: master
+
+ docker_kea_ik_1.3.0:
+   repo : docker.infra.flowdat.com/fd3/kea-ik-1.3.0
+   image: plugins/docker
+   pull: true
+   email: luciano@interlink.com.ar
+   registry: docker.infra.flowdat.com
+   dockerfile: 1.3.0/kea-ik/Dockerfile
+   context: 1.3.0/kea-ik/
+   tag:
+      - latest
+      - "1.3.0-kea-ik"
+      - "1.3-kea-ik"
+   when:
+      event: [pull_request, push, tag]
+      branch: master
+
+ docker_kea_premium_1.3.0:
+   repo : docker.infra.flowdat.com/fd3/kea-premium-1.3.0
+   image: plugins/docker
+   pull: true
+   email: luciano@interlink.com.ar
+   registry: docker.infra.flowdat.com
+   dockerfile: 1.3.0/kea-premium/Dockerfile
+   context: 1.3.0/kea-premium/
+   tag:
+      - latest
+      - "1.3.0-kea-premium"
+      - "1.3-kea-premium"
    when:
       event: [pull_request, push, tag]
       branch: master

+ 0 - 63
1.3.0/Dockerfile

@@ -1,63 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update && apt-get install -yq git vim build-essential dhcping
-
-RUN apt-get update && apt-get install -yq dh-autoreconf automake
-RUN apt-get update && apt-get install -yq libssl-dev liblog4cplus-dev libboost-dev libmysqlclient-dev libboost-all-dev mysql-client wget
-
-RUN wget -O kea-1.3.0.tar.gz https://www.isc.org/downloads/file/kea-1-3-0/?version=tar-gz
-RUN tar -zxvf kea-1.3.0.tar.gz
-RUN mv kea-1.3.0 /opt/kea
-
-# KEA HOOKS
-RUN cd /opt/kea && wget -O kea-subscription-1.3.0.tar.gz https://ftp.isc.org/isc/kea/private/47481ef775c232ef/kea-subscription-1.3.0.tar.gz && tar xvzf kea-subscription-1.3.0.tar.gz
-
-RUN cd /opt/kea && autoreconf --install
-RUN cd /opt/kea && ./configure --with-dhcp-mysql --enable-shell --with-tier2=yes
-RUN cd /opt/kea && make && make install
-
-RUN cd /opt/kea && ldconfig
-
-RUN apt install -yq python-pip supervisor
-RUN pip install superfsmon
-
-EXPOSE 67/udp
-EXPOSE 68/udp
-
-ENV KEA_MSG_COMPILER=/usr/local/bin/kea-msg-compiler
-ENV KEA_LIB=/opt/kea/src/lib
-ENV KEA_INCLUDE=/opt/kea/src/lib
-
-RUN mkdir ~/.ssh
-RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
-COPY keys/ /opt/keys
-RUN chmod 0600 /opt/keys/bitbucket.id_rsa
-RUN eval $(ssh-agent) && ssh-add /opt/keys/bitbucket.id_rsa && git clone git@bitbucket.org:ikflowdat/kea-cm-hook.git
-
-RUN cd kea-cm-hook && make
-
-RUN git clone git://github.com/alanxz/rabbitmq-c.git
-RUN apt-get update && apt-get install -yq cmake
-RUN cd rabbitmq-c && mkdir build && cd build && cmake .. && cmake --build . 
-RUN cd rabbitmq-c/build && make  && make install
-
-RUN git clone https://github.com/akalend/amqpcpp
-RUN cd amqpcpp && make && make install
-
-RUN cp -P /usr/local/lib/x86_64-linux-gnu/librabbitmq.* /usr/local/lib/
-RUN cp amqpcpp/libamqpcpp.a /usr/local/lib/libamqpcpp.a
-RUN cp amqpcpp/libamqpcpp.so /usr/local/lib/libamqpcpp.so
-
-RUN wget -O libzdb-3.1.tar.gz http://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz
-RUN tar xvzf libzdb-3.1.tar.gz
-RUN cd libzdb-3.1 && ./configure --without-postgresql --without-sqlite && make && make install
-
-RUN ldconfig
-
-COPY hook/ hook/
-RUN cd hook/amqp && make
-RUN cd hook/mysql && make
-
-COPY script.sh /opt/script.sh
-RUN chmod +x /opt/script.sh
-CMD /opt/script.sh

+ 37 - 0
1.3.0/kea-ik/Dockerfile

@@ -0,0 +1,37 @@
+FROM docker.infra.flowdat.com/fd3/kea-oss-1.3.0:latest
+
+# C++ LIBRARIES
+
+RUN apt-get update && apt-get install -yq cmake
+
+RUN git clone git://github.com/alanxz/rabbitmq-c.git
+RUN cd rabbitmq-c && mkdir build && cd build && cmake .. && cmake --build . 
+RUN cd rabbitmq-c/build && make  && make install
+
+RUN git clone https://github.com/akalend/amqpcpp
+RUN cd amqpcpp && make && make install
+
+RUN cp -P /usr/local/lib/x86_64-linux-gnu/librabbitmq.* /usr/local/lib/
+RUN cp amqpcpp/libamqpcpp.a /usr/local/lib/libamqpcpp.a
+RUN cp amqpcpp/libamqpcpp.so /usr/local/lib/libamqpcpp.so
+
+RUN wget -O libzdb-3.1.tar.gz http://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz
+RUN tar xvzf libzdb-3.1.tar.gz
+RUN cd libzdb-3.1 && ./configure --without-postgresql --without-sqlite && make && make install
+
+RUN ldconfig
+
+# FLOWDAT KEA HOOK
+
+RUN mkdir ~/.ssh
+RUN ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts
+COPY keys/ /opt/keys
+RUN chmod 0600 /opt/keys/bitbucket.id_rsa
+RUN eval $(ssh-agent) && ssh-add /opt/keys/bitbucket.id_rsa && git clone git@bitbucket.org:ikflowdat/kea-cm-hook.git
+
+RUN cd kea-cm-hook && make
+
+COPY script.sh /opt/script.sh
+RUN chmod +x /opt/script.sh
+
+CMD /opt/script.sh

1.3.0/keys/bitbucket.id_rsa → 1.3.0/kea-ik/keys/bitbucket.id_rsa


1.3.0/keys/bitbucket.id_rsa.pub → 1.3.0/kea-ik/keys/bitbucket.id_rsa.pub


+ 15 - 0
1.3.0/kea-ik/script.sh

@@ -0,0 +1,15 @@
+echo "[mysql]\nprotocol=tcp\n[client]\nhost=mysql" >> /etc/my.cnf
+echo "[mysql]\nprotocol=tcp\n[client]\nhost=mysql" >> /etc/mysql/my.cnf
+
+DATABASE=kea
+
+if ! mysql -u$MYSQL_USER -p$MYSQL_ROOT_PASSWORD -e "use ${DATABASE}"; then
+  mysql -u$MYSQL_USER -p$MYSQL_ROOT_PASSWORD -e "CREATE DATABASE ${DATABASE} /*\!40100 DEFAULT CHARACTER SET utf8 */;"
+fi
+
+kea-admin lease-init mysql -h mysql -u $MYSQL_USER -p $MYSQL_ROOT_PASSWORD -n $DATABASE
+
+cd /opt/hooks/amqp && make
+cd /opt/hooks/mysql && make
+
+supervisord --configuration /etc/supervisord/supervisor.conf  --nodaemon

+ 26 - 0
1.3.0/kea-oss/Dockerfile

@@ -0,0 +1,26 @@
+FROM ubuntu:16.04
+
+RUN apt-get update && apt-get install -yq git vim build-essential dhcping
+
+RUN apt-get update && apt-get install -yq dh-autoreconf automake
+RUN apt-get update && apt-get install -yq libssl-dev liblog4cplus-dev libboost-dev libmysqlclient-dev libboost-all-dev mysql-client wget python-pip supervisor
+
+RUN pip install superfsmon
+
+RUN wget -O kea-1.3.0.tar.gz https://www.isc.org/downloads/file/kea-1-3-0/?version=tar-gz
+RUN tar -zxvf kea-1.3.0.tar.gz
+RUN mv kea-1.3.0 /opt/kea
+
+RUN cd /opt/kea && autoreconf --install && ./configure --with-dhcp-mysql --enable-shell && make && make install && ldconfig
+
+EXPOSE 67/udp
+EXPOSE 68/udp
+
+ENV KEA_MSG_COMPILER=/usr/local/bin/kea-msg-compiler
+ENV KEA_LIB=/opt/kea/src/lib
+ENV KEA_INCLUDE=/opt/kea/src/lib
+
+COPY script.sh /opt/script.sh
+RUN chmod +x /opt/script.sh
+
+CMD /opt/script.sh

+ 0 - 1
1.3.0/script.sh

@@ -9,5 +9,4 @@ fi
 
 kea-admin lease-init mysql -h mysql -u $MYSQL_USER -p $MYSQL_ROOT_PASSWORD -n $DATABASE
 
-
 supervisord --configuration /etc/supervisord/supervisor.conf  --nodaemon

+ 7 - 0
1.3.0/kea-premium/Dockerfile

@@ -0,0 +1,7 @@
+FROM docker.infra.flowdat.com/fd3/kea-oss-1.3.0:latest
+
+WORKDIR /opt/kea
+
+RUN wget -O kea-subscription-1.3.0.tar.gz https://ftp.isc.org/isc/kea/private/47481ef775c232ef/kea-subscription-1.3.0.tar.gz && tar xvzf kea-subscription-1.3.0.tar.gz
+
+RUN autoreconf --install && ./configure --with-dhcp-mysql --enable-shell --with-tier2=yes && make && make install && ldconfig

+ 75 - 0
hooks/README.md

@@ -0,0 +1,75 @@
+# KEA HOOKS
+
+Configuración (/usr/local/etc/kea/kea-dhcp4.conf):
+
+
+
+```
+{
+    "Dhcp4": {
+        "control-socket": {
+            "socket-name": "\/tmp\/kea-dhcp4-ctrl.sock",
+            "socket-type": "unix"
+        },
+        "lease-database": {
+            "host": "mysql",
+            "name": "kea",
+            "user": "root",
+            "password": "235r2342gtfsw",
+            "type": "mysql"
+        },
+        "hosts-database": {
+            "host": "mysql",
+            "name": "kea",
+            "user": "root",
+            "password": "235r2342gtfsw",
+            "type": "mysql"
+        },
+        "subnet4": [
+            {
+                "subnet": "10.42.0.0\/16",
+                "pools": [
+                    {
+                        "pool": "10.42.40.150 - 10.42.40.250"
+                    }
+                ],
+                "next-server": "200.50.168.111",
+                "client-class": "cm-active"
+            }
+        ],
+        "hooks-libraries": [
+            {
+                "library": "\/opt/hooks\/amqp\/kea-hook-flowdat3.so",
+                "parameters": ""
+            },
+            {
+                "library": "\/opt/hooks\/mysql\/kea-hook-flowdat3.so",
+                "parameters": ""
+            },
+            {
+                "library": "\/kea-cm-hook\/kea-hook-flowdat.so",
+                "parameters": {
+                    "option122": {
+                        "200.50.168.111": [
+                            "0005ca9d1160",
+                            "001311836bea"
+                        ]
+                    },
+                    "remote-id-map": {
+                        "active": [
+                            "0005ca9d1160",
+                            "001311836bea"
+                        ]
+                    }
+                }
+            }
+        ]
+    }
+}
+```
+
+Archivos hooks: 
+
+/opt/hooks/amqp/kea-hook-flowdat3.so: Hook para enviar por AMQP los mensajes recibidos y enviados por el kea
+
+/opt/hooks/mysql/kea-hook-flowdat3.so: Hook que consulta por MySQL la class a asignar de la mac que envía un packet al kea

1.3.0/hook/amqp/Makefile → hooks/amqp/Makefile


BIN
hooks/amqp/kea-hook-flowdat3.so


+ 0 - 0
hooks/amqp/s-messages


1.3.0/hook/amqp/src/amqppublisher.cc → hooks/amqp/src/amqppublisher.cc


+ 3 - 0
hooks/amqp/src/amqppublisher.d

@@ -0,0 +1,3 @@
+src/amqppublisher.o: src/amqppublisher.cc src/amqppublisher.h
+
+src/amqppublisher.h:

1.3.0/hook/amqp/src/amqppublisher.h → hooks/amqp/src/amqppublisher.h


BIN
hooks/amqp/src/amqppublisher.o


1.3.0/hook/amqp/src/callouts.cc → hooks/amqp/src/callouts.cc


+ 133 - 0
hooks/amqp/src/callouts.d

@@ -0,0 +1,133 @@
+src/callouts.o: src/callouts.cc /opt/kea/src/lib/hooks/hooks.h \
+ /opt/kea/src/lib/hooks/callout_handle.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/hooks/library_handle.h /opt/kea/src/lib/cc/data.h \
+ /opt/kea/src/lib/dhcp/pkt4.h /opt/kea/src/lib/asiolink/io_address.h \
+ /opt/kea/src/lib/dhcp/option.h /opt/kea/src/lib/util/buffer.h \
+ /opt/kea/src/lib/dhcp/duid.h /opt/kea/src/lib/dhcp/classify.h \
+ /opt/kea/src/lib/dhcp/pkt.h /opt/kea/src/lib/dhcp/hwaddr.h \
+ /opt/kea/src/lib/dhcp/dhcp4.h /opt/kea/src/lib/dhcpsrv/subnet.h \
+ /opt/kea/src/lib/dhcp/option_space_container.h \
+ /opt/kea/src/lib/dhcpsrv/assignable_network.h \
+ /opt/kea/src/lib/dhcpsrv/network.h /opt/kea/src/lib/cc/cfg_to_element.h \
+ /opt/kea/src/lib/dhcpsrv/cfg_option.h \
+ /opt/kea/src/lib/dhcpsrv/key_from_key.h \
+ /opt/kea/src/lib/dhcpsrv/cfg_4o6.h /opt/kea/src/lib/dhcpsrv/triplet.h \
+ /opt/kea/src/lib/dhcpsrv/lease.h /opt/kea/src/lib/dhcpsrv/pool.h \
+ /opt/kea/src/lib/dhcp/option6_pdexclude.h \
+ /opt/kea/src/lib/dhcpsrv/subnet_id.h /opt/kea/src/lib/util/strutil.h \
+ /opt/kea/src/lib/dhcp/option_string.h \
+ /opt/kea/src/lib/dhcp/option4_addrlst.h \
+ /opt/kea/src/lib/dhcp/docsis3_option_defs.h \
+ /opt/kea/src/lib/dhcp/std_option_defs.h \
+ /opt/kea/src/lib/dhcp/option_data_types.h \
+ /opt/kea/src/lib/dhcp/opaque_data_tuple.h \
+ /opt/kea/src/lib/util/io_utilities.h /opt/kea/src/lib/dhcp/dhcp6.h \
+ /opt/kea/src/lib/dhcp/option_space.h /opt/kea/src/lib/dhcp/pkt6.h \
+ /opt/kea/src/lib/dhcp/option6_ia.h src/logger.h \
+ /opt/kea/src/lib/log/logger.h /opt/kea/src/lib/log/logger_level.h \
+ /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/log_formatter.h \
+ /opt/kea/src/lib/log/message_initializer.h /opt/kea/src/lib/log/macros.h \
+ /opt/kea/src/lib/log/log_dbglevels.h src/messages.h src/common.h \
+ src/amqppublisher.h
+
+/opt/kea/src/lib/hooks/hooks.h:
+
+/opt/kea/src/lib/hooks/callout_handle.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/hooks/library_handle.h:
+
+/opt/kea/src/lib/cc/data.h:
+
+/opt/kea/src/lib/dhcp/pkt4.h:
+
+/opt/kea/src/lib/asiolink/io_address.h:
+
+/opt/kea/src/lib/dhcp/option.h:
+
+/opt/kea/src/lib/util/buffer.h:
+
+/opt/kea/src/lib/dhcp/duid.h:
+
+/opt/kea/src/lib/dhcp/classify.h:
+
+/opt/kea/src/lib/dhcp/pkt.h:
+
+/opt/kea/src/lib/dhcp/hwaddr.h:
+
+/opt/kea/src/lib/dhcp/dhcp4.h:
+
+/opt/kea/src/lib/dhcpsrv/subnet.h:
+
+/opt/kea/src/lib/dhcp/option_space_container.h:
+
+/opt/kea/src/lib/dhcpsrv/assignable_network.h:
+
+/opt/kea/src/lib/dhcpsrv/network.h:
+
+/opt/kea/src/lib/cc/cfg_to_element.h:
+
+/opt/kea/src/lib/dhcpsrv/cfg_option.h:
+
+/opt/kea/src/lib/dhcpsrv/key_from_key.h:
+
+/opt/kea/src/lib/dhcpsrv/cfg_4o6.h:
+
+/opt/kea/src/lib/dhcpsrv/triplet.h:
+
+/opt/kea/src/lib/dhcpsrv/lease.h:
+
+/opt/kea/src/lib/dhcpsrv/pool.h:
+
+/opt/kea/src/lib/dhcp/option6_pdexclude.h:
+
+/opt/kea/src/lib/dhcpsrv/subnet_id.h:
+
+/opt/kea/src/lib/util/strutil.h:
+
+/opt/kea/src/lib/dhcp/option_string.h:
+
+/opt/kea/src/lib/dhcp/option4_addrlst.h:
+
+/opt/kea/src/lib/dhcp/docsis3_option_defs.h:
+
+/opt/kea/src/lib/dhcp/std_option_defs.h:
+
+/opt/kea/src/lib/dhcp/option_data_types.h:
+
+/opt/kea/src/lib/dhcp/opaque_data_tuple.h:
+
+/opt/kea/src/lib/util/io_utilities.h:
+
+/opt/kea/src/lib/dhcp/dhcp6.h:
+
+/opt/kea/src/lib/dhcp/option_space.h:
+
+/opt/kea/src/lib/dhcp/pkt6.h:
+
+/opt/kea/src/lib/dhcp/option6_ia.h:
+
+src/logger.h:
+
+/opt/kea/src/lib/log/logger.h:
+
+/opt/kea/src/lib/log/logger_level.h:
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/log_formatter.h:
+
+/opt/kea/src/lib/log/message_initializer.h:
+
+/opt/kea/src/lib/log/macros.h:
+
+/opt/kea/src/lib/log/log_dbglevels.h:
+
+src/messages.h:
+
+src/common.h:
+
+src/amqppublisher.h:

BIN
hooks/amqp/src/callouts.o


1.3.0/hook/amqp/src/common.h → hooks/amqp/src/common.h


1.3.0/hook/amqp/src/load.cc → hooks/amqp/src/load.cc


+ 39 - 0
hooks/amqp/src/load.d

@@ -0,0 +1,39 @@
+src/load.o: src/load.cc /opt/kea/src/lib/hooks/hooks.h \
+ /opt/kea/src/lib/hooks/callout_handle.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/hooks/library_handle.h /opt/kea/src/lib/cc/data.h \
+ src/logger.h /opt/kea/src/lib/log/logger.h \
+ /opt/kea/src/lib/log/logger_level.h /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/log_formatter.h \
+ /opt/kea/src/lib/log/message_initializer.h /opt/kea/src/lib/log/macros.h \
+ /opt/kea/src/lib/log/log_dbglevels.h src/messages.h src/common.h
+
+/opt/kea/src/lib/hooks/hooks.h:
+
+/opt/kea/src/lib/hooks/callout_handle.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/hooks/library_handle.h:
+
+/opt/kea/src/lib/cc/data.h:
+
+src/logger.h:
+
+/opt/kea/src/lib/log/logger.h:
+
+/opt/kea/src/lib/log/logger_level.h:
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/log_formatter.h:
+
+/opt/kea/src/lib/log/message_initializer.h:
+
+/opt/kea/src/lib/log/macros.h:
+
+/opt/kea/src/lib/log/log_dbglevels.h:
+
+src/messages.h:
+
+src/common.h:

BIN
hooks/amqp/src/load.o


1.3.0/hook/amqp/src/logger.cc → hooks/amqp/src/logger.cc


+ 26 - 0
hooks/amqp/src/logger.d

@@ -0,0 +1,26 @@
+src/logger.o: src/logger.cc src/logger.h /opt/kea/src/lib/log/logger.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/log/logger_level.h /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/log_formatter.h \
+ /opt/kea/src/lib/log/message_initializer.h /opt/kea/src/lib/log/macros.h \
+ /opt/kea/src/lib/log/log_dbglevels.h src/messages.h
+
+src/logger.h:
+
+/opt/kea/src/lib/log/logger.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/log/logger_level.h:
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/log_formatter.h:
+
+/opt/kea/src/lib/log/message_initializer.h:
+
+/opt/kea/src/lib/log/macros.h:
+
+/opt/kea/src/lib/log/log_dbglevels.h:
+
+src/messages.h:

1.3.0/hook/amqp/src/logger.h → hooks/amqp/src/logger.h


BIN
hooks/amqp/src/logger.o


+ 33 - 0
hooks/amqp/src/messages.cc

@@ -0,0 +1,33 @@
+// File created from src/messages.mes on Wed Jul 25 2018 17:39
+
+#include <cstddef>
+#include <log/message_types.h>
+#include <log/message_initializer.h>
+
+extern const isc::log::MessageID FLOWDAT_DEBUG_STRING = "FLOWDAT_DEBUG_STRING";
+extern const isc::log::MessageID RUNSCRIPT_DEBUG_STRING = "RUNSCRIPT_DEBUG_STRING";
+extern const isc::log::MessageID RUNSCRIPT_EXEC_FAILED = "RUNSCRIPT_EXEC_FAILED";
+extern const isc::log::MessageID RUNSCRIPT_FORK_FAILED = "RUNSCRIPT_FORK_FAILED";
+extern const isc::log::MessageID RUNSCRIPT_MISSING_PARAM = "RUNSCRIPT_MISSING_PARAM";
+extern const isc::log::MessageID RUNSCRIPT_MISTYPED_PARAM = "RUNSCRIPT_MISTYPED_PARAM";
+extern const isc::log::MessageID RUNSCRIPT_WAITING_SCRIPT = "RUNSCRIPT_WAITING_SCRIPT";
+extern const isc::log::MessageID RUNSCRIPT_WAITPID_FAILED = "RUNSCRIPT_WAITPID_FAILED";
+
+namespace {
+
+const char* values[] = {
+    "FLOWDAT_DEBUG_STRING", "%1",
+    "RUNSCRIPT_DEBUG_STRING", "%1",
+    "RUNSCRIPT_EXEC_FAILED", "exec() failed, please check that the script exists and is executable. Error: %1",
+    "RUNSCRIPT_FORK_FAILED", "fork() failed with error: %1",
+    "RUNSCRIPT_MISSING_PARAM", "required parameter \"%1\" missing in configuration",
+    "RUNSCRIPT_MISTYPED_PARAM", "parameter \"%1\" in configuration has wrong type",
+    "RUNSCRIPT_WAITING_SCRIPT", "the user-defined script is running, and the main process is currently waiting",
+    "RUNSCRIPT_WAITPID_FAILED", "waitpid() failed with error: %1",
+    NULL
+};
+
+const isc::log::MessageInitializer initializer(values);
+
+} // Anonymous namespace
+

+ 6 - 0
hooks/amqp/src/messages.d

@@ -0,0 +1,6 @@
+src/messages.o: src/messages.cc /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/message_initializer.h
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/message_initializer.h:

+ 17 - 0
hooks/amqp/src/messages.h

@@ -0,0 +1,17 @@
+// File created from src/messages.mes on Wed Jul 25 2018 17:39
+
+#ifndef MESSAGES_H
+#define MESSAGES_H
+
+#include <log/message_types.h>
+
+extern const isc::log::MessageID FLOWDAT_DEBUG_STRING;
+extern const isc::log::MessageID RUNSCRIPT_DEBUG_STRING;
+extern const isc::log::MessageID RUNSCRIPT_EXEC_FAILED;
+extern const isc::log::MessageID RUNSCRIPT_FORK_FAILED;
+extern const isc::log::MessageID RUNSCRIPT_MISSING_PARAM;
+extern const isc::log::MessageID RUNSCRIPT_MISTYPED_PARAM;
+extern const isc::log::MessageID RUNSCRIPT_WAITING_SCRIPT;
+extern const isc::log::MessageID RUNSCRIPT_WAITPID_FAILED;
+
+#endif // MESSAGES_H

1.3.0/hook/amqp/src/messages.mes → hooks/amqp/src/messages.mes


BIN
hooks/amqp/src/messages.o


1.3.0/hook/amqp/src/version.cc → hooks/amqp/src/version.cc


+ 14 - 0
hooks/amqp/src/version.d

@@ -0,0 +1,14 @@
+src/version.o: src/version.cc /opt/kea/src/lib/hooks/hooks.h \
+ /opt/kea/src/lib/hooks/callout_handle.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/hooks/library_handle.h /opt/kea/src/lib/cc/data.h
+
+/opt/kea/src/lib/hooks/hooks.h:
+
+/opt/kea/src/lib/hooks/callout_handle.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/hooks/library_handle.h:
+
+/opt/kea/src/lib/cc/data.h:

BIN
hooks/amqp/src/version.o


1.3.0/hook/mysql/Makefile → hooks/mysql/Makefile


BIN
hooks/mysql/kea-hook-flowdat3-mysql.so


+ 0 - 0
hooks/mysql/s-messages


1.3.0/hook/mysql/src/amqppublisher.h → hooks/mysql/src/amqppublisher.h


1.3.0/hook/mysql/src/callouts.cc → hooks/mysql/src/callouts.cc


+ 133 - 0
hooks/mysql/src/callouts.d

@@ -0,0 +1,133 @@
+src/callouts.o: src/callouts.cc /opt/kea/src/lib/hooks/hooks.h \
+ /opt/kea/src/lib/hooks/callout_handle.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/hooks/library_handle.h /opt/kea/src/lib/cc/data.h \
+ /opt/kea/src/lib/dhcp/pkt4.h /opt/kea/src/lib/asiolink/io_address.h \
+ /opt/kea/src/lib/dhcp/option.h /opt/kea/src/lib/util/buffer.h \
+ /opt/kea/src/lib/dhcp/duid.h /opt/kea/src/lib/dhcp/classify.h \
+ /opt/kea/src/lib/dhcp/pkt.h /opt/kea/src/lib/dhcp/hwaddr.h \
+ /opt/kea/src/lib/dhcp/dhcp4.h /opt/kea/src/lib/dhcpsrv/subnet.h \
+ /opt/kea/src/lib/dhcp/option_space_container.h \
+ /opt/kea/src/lib/dhcpsrv/assignable_network.h \
+ /opt/kea/src/lib/dhcpsrv/network.h /opt/kea/src/lib/cc/cfg_to_element.h \
+ /opt/kea/src/lib/dhcpsrv/cfg_option.h \
+ /opt/kea/src/lib/dhcpsrv/key_from_key.h \
+ /opt/kea/src/lib/dhcpsrv/cfg_4o6.h /opt/kea/src/lib/dhcpsrv/triplet.h \
+ /opt/kea/src/lib/dhcpsrv/lease.h /opt/kea/src/lib/dhcpsrv/pool.h \
+ /opt/kea/src/lib/dhcp/option6_pdexclude.h \
+ /opt/kea/src/lib/dhcpsrv/subnet_id.h /opt/kea/src/lib/util/strutil.h \
+ /opt/kea/src/lib/dhcp/option_string.h \
+ /opt/kea/src/lib/dhcp/option4_addrlst.h \
+ /opt/kea/src/lib/dhcp/docsis3_option_defs.h \
+ /opt/kea/src/lib/dhcp/std_option_defs.h \
+ /opt/kea/src/lib/dhcp/option_data_types.h \
+ /opt/kea/src/lib/dhcp/opaque_data_tuple.h \
+ /opt/kea/src/lib/util/io_utilities.h /opt/kea/src/lib/dhcp/dhcp6.h \
+ /opt/kea/src/lib/dhcp/option_space.h /opt/kea/src/lib/dhcp/pkt6.h \
+ /opt/kea/src/lib/dhcp/option6_ia.h src/logger.h \
+ /opt/kea/src/lib/log/logger.h /opt/kea/src/lib/log/logger_level.h \
+ /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/log_formatter.h \
+ /opt/kea/src/lib/log/message_initializer.h /opt/kea/src/lib/log/macros.h \
+ /opt/kea/src/lib/log/log_dbglevels.h src/messages.h src/common.h \
+ src/mysql_connection.h
+
+/opt/kea/src/lib/hooks/hooks.h:
+
+/opt/kea/src/lib/hooks/callout_handle.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/hooks/library_handle.h:
+
+/opt/kea/src/lib/cc/data.h:
+
+/opt/kea/src/lib/dhcp/pkt4.h:
+
+/opt/kea/src/lib/asiolink/io_address.h:
+
+/opt/kea/src/lib/dhcp/option.h:
+
+/opt/kea/src/lib/util/buffer.h:
+
+/opt/kea/src/lib/dhcp/duid.h:
+
+/opt/kea/src/lib/dhcp/classify.h:
+
+/opt/kea/src/lib/dhcp/pkt.h:
+
+/opt/kea/src/lib/dhcp/hwaddr.h:
+
+/opt/kea/src/lib/dhcp/dhcp4.h:
+
+/opt/kea/src/lib/dhcpsrv/subnet.h:
+
+/opt/kea/src/lib/dhcp/option_space_container.h:
+
+/opt/kea/src/lib/dhcpsrv/assignable_network.h:
+
+/opt/kea/src/lib/dhcpsrv/network.h:
+
+/opt/kea/src/lib/cc/cfg_to_element.h:
+
+/opt/kea/src/lib/dhcpsrv/cfg_option.h:
+
+/opt/kea/src/lib/dhcpsrv/key_from_key.h:
+
+/opt/kea/src/lib/dhcpsrv/cfg_4o6.h:
+
+/opt/kea/src/lib/dhcpsrv/triplet.h:
+
+/opt/kea/src/lib/dhcpsrv/lease.h:
+
+/opt/kea/src/lib/dhcpsrv/pool.h:
+
+/opt/kea/src/lib/dhcp/option6_pdexclude.h:
+
+/opt/kea/src/lib/dhcpsrv/subnet_id.h:
+
+/opt/kea/src/lib/util/strutil.h:
+
+/opt/kea/src/lib/dhcp/option_string.h:
+
+/opt/kea/src/lib/dhcp/option4_addrlst.h:
+
+/opt/kea/src/lib/dhcp/docsis3_option_defs.h:
+
+/opt/kea/src/lib/dhcp/std_option_defs.h:
+
+/opt/kea/src/lib/dhcp/option_data_types.h:
+
+/opt/kea/src/lib/dhcp/opaque_data_tuple.h:
+
+/opt/kea/src/lib/util/io_utilities.h:
+
+/opt/kea/src/lib/dhcp/dhcp6.h:
+
+/opt/kea/src/lib/dhcp/option_space.h:
+
+/opt/kea/src/lib/dhcp/pkt6.h:
+
+/opt/kea/src/lib/dhcp/option6_ia.h:
+
+src/logger.h:
+
+/opt/kea/src/lib/log/logger.h:
+
+/opt/kea/src/lib/log/logger_level.h:
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/log_formatter.h:
+
+/opt/kea/src/lib/log/message_initializer.h:
+
+/opt/kea/src/lib/log/macros.h:
+
+/opt/kea/src/lib/log/log_dbglevels.h:
+
+src/messages.h:
+
+src/common.h:
+
+src/mysql_connection.h:

BIN
hooks/mysql/src/callouts.o


1.3.0/hook/mysql/src/common.h → hooks/mysql/src/common.h


1.3.0/hook/mysql/src/load.cc → hooks/mysql/src/load.cc


+ 39 - 0
hooks/mysql/src/load.d

@@ -0,0 +1,39 @@
+src/load.o: src/load.cc /opt/kea/src/lib/hooks/hooks.h \
+ /opt/kea/src/lib/hooks/callout_handle.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/hooks/library_handle.h /opt/kea/src/lib/cc/data.h \
+ src/logger.h /opt/kea/src/lib/log/logger.h \
+ /opt/kea/src/lib/log/logger_level.h /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/log_formatter.h \
+ /opt/kea/src/lib/log/message_initializer.h /opt/kea/src/lib/log/macros.h \
+ /opt/kea/src/lib/log/log_dbglevels.h src/messages.h src/common.h
+
+/opt/kea/src/lib/hooks/hooks.h:
+
+/opt/kea/src/lib/hooks/callout_handle.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/hooks/library_handle.h:
+
+/opt/kea/src/lib/cc/data.h:
+
+src/logger.h:
+
+/opt/kea/src/lib/log/logger.h:
+
+/opt/kea/src/lib/log/logger_level.h:
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/log_formatter.h:
+
+/opt/kea/src/lib/log/message_initializer.h:
+
+/opt/kea/src/lib/log/macros.h:
+
+/opt/kea/src/lib/log/log_dbglevels.h:
+
+src/messages.h:
+
+src/common.h:

BIN
hooks/mysql/src/load.o


1.3.0/hook/mysql/src/logger.cc → hooks/mysql/src/logger.cc


+ 26 - 0
hooks/mysql/src/logger.d

@@ -0,0 +1,26 @@
+src/logger.o: src/logger.cc src/logger.h /opt/kea/src/lib/log/logger.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/log/logger_level.h /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/log_formatter.h \
+ /opt/kea/src/lib/log/message_initializer.h /opt/kea/src/lib/log/macros.h \
+ /opt/kea/src/lib/log/log_dbglevels.h src/messages.h
+
+src/logger.h:
+
+/opt/kea/src/lib/log/logger.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/log/logger_level.h:
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/log_formatter.h:
+
+/opt/kea/src/lib/log/message_initializer.h:
+
+/opt/kea/src/lib/log/macros.h:
+
+/opt/kea/src/lib/log/log_dbglevels.h:
+
+src/messages.h:

1.3.0/hook/mysql/src/logger.h → hooks/mysql/src/logger.h


BIN
hooks/mysql/src/logger.o


+ 33 - 0
hooks/mysql/src/messages.cc

@@ -0,0 +1,33 @@
+// File created from src/messages.mes on Wed Jul 25 2018 17:39
+
+#include <cstddef>
+#include <log/message_types.h>
+#include <log/message_initializer.h>
+
+extern const isc::log::MessageID FLOWDAT_DEBUG_STRING = "FLOWDAT_DEBUG_STRING";
+extern const isc::log::MessageID RUNSCRIPT_DEBUG_STRING = "RUNSCRIPT_DEBUG_STRING";
+extern const isc::log::MessageID RUNSCRIPT_EXEC_FAILED = "RUNSCRIPT_EXEC_FAILED";
+extern const isc::log::MessageID RUNSCRIPT_FORK_FAILED = "RUNSCRIPT_FORK_FAILED";
+extern const isc::log::MessageID RUNSCRIPT_MISSING_PARAM = "RUNSCRIPT_MISSING_PARAM";
+extern const isc::log::MessageID RUNSCRIPT_MISTYPED_PARAM = "RUNSCRIPT_MISTYPED_PARAM";
+extern const isc::log::MessageID RUNSCRIPT_WAITING_SCRIPT = "RUNSCRIPT_WAITING_SCRIPT";
+extern const isc::log::MessageID RUNSCRIPT_WAITPID_FAILED = "RUNSCRIPT_WAITPID_FAILED";
+
+namespace {
+
+const char* values[] = {
+    "FLOWDAT_DEBUG_STRING", "%1",
+    "RUNSCRIPT_DEBUG_STRING", "%1",
+    "RUNSCRIPT_EXEC_FAILED", "exec() failed, please check that the script exists and is executable. Error: %1",
+    "RUNSCRIPT_FORK_FAILED", "fork() failed with error: %1",
+    "RUNSCRIPT_MISSING_PARAM", "required parameter \"%1\" missing in configuration",
+    "RUNSCRIPT_MISTYPED_PARAM", "parameter \"%1\" in configuration has wrong type",
+    "RUNSCRIPT_WAITING_SCRIPT", "the user-defined script is running, and the main process is currently waiting",
+    "RUNSCRIPT_WAITPID_FAILED", "waitpid() failed with error: %1",
+    NULL
+};
+
+const isc::log::MessageInitializer initializer(values);
+
+} // Anonymous namespace
+

+ 6 - 0
hooks/mysql/src/messages.d

@@ -0,0 +1,6 @@
+src/messages.o: src/messages.cc /opt/kea/src/lib/log/message_types.h \
+ /opt/kea/src/lib/log/message_initializer.h
+
+/opt/kea/src/lib/log/message_types.h:
+
+/opt/kea/src/lib/log/message_initializer.h:

+ 17 - 0
hooks/mysql/src/messages.h

@@ -0,0 +1,17 @@
+// File created from src/messages.mes on Wed Jul 25 2018 17:39
+
+#ifndef MESSAGES_H
+#define MESSAGES_H
+
+#include <log/message_types.h>
+
+extern const isc::log::MessageID FLOWDAT_DEBUG_STRING;
+extern const isc::log::MessageID RUNSCRIPT_DEBUG_STRING;
+extern const isc::log::MessageID RUNSCRIPT_EXEC_FAILED;
+extern const isc::log::MessageID RUNSCRIPT_FORK_FAILED;
+extern const isc::log::MessageID RUNSCRIPT_MISSING_PARAM;
+extern const isc::log::MessageID RUNSCRIPT_MISTYPED_PARAM;
+extern const isc::log::MessageID RUNSCRIPT_WAITING_SCRIPT;
+extern const isc::log::MessageID RUNSCRIPT_WAITPID_FAILED;
+
+#endif // MESSAGES_H

1.3.0/hook/mysql/src/messages.mes → hooks/mysql/src/messages.mes


BIN
hooks/mysql/src/messages.o


1.3.0/hook/mysql/src/mysql_connection.cc → hooks/mysql/src/mysql_connection.cc


+ 25 - 0
hooks/mysql/src/mysql_connection.d

@@ -0,0 +1,25 @@
+src/mysql_connection.o: src/mysql_connection.cc \
+ /usr/local/include/zdb/zdb.h /usr/local/include/zdb/SQLException.h \
+ /usr/local/include/zdb/Exception.h /usr/local/include/zdb/URL.h \
+ /usr/local/include/zdb/ResultSet.h \
+ /usr/local/include/zdb/PreparedStatement.h \
+ /usr/local/include/zdb/Connection.h \
+ /usr/local/include/zdb/ConnectionPool.h src/mysql_connection.h
+
+/usr/local/include/zdb/zdb.h:
+
+/usr/local/include/zdb/SQLException.h:
+
+/usr/local/include/zdb/Exception.h:
+
+/usr/local/include/zdb/URL.h:
+
+/usr/local/include/zdb/ResultSet.h:
+
+/usr/local/include/zdb/PreparedStatement.h:
+
+/usr/local/include/zdb/Connection.h:
+
+/usr/local/include/zdb/ConnectionPool.h:
+
+src/mysql_connection.h:

1.3.0/hook/mysql/src/mysql_connection.h → hooks/mysql/src/mysql_connection.h


BIN
hooks/mysql/src/mysql_connection.o


1.3.0/hook/mysql/src/version.cc → hooks/mysql/src/version.cc


+ 14 - 0
hooks/mysql/src/version.d

@@ -0,0 +1,14 @@
+src/version.o: src/version.cc /opt/kea/src/lib/hooks/hooks.h \
+ /opt/kea/src/lib/hooks/callout_handle.h \
+ /opt/kea/src/lib/exceptions/exceptions.h \
+ /opt/kea/src/lib/hooks/library_handle.h /opt/kea/src/lib/cc/data.h
+
+/opt/kea/src/lib/hooks/hooks.h:
+
+/opt/kea/src/lib/hooks/callout_handle.h:
+
+/opt/kea/src/lib/exceptions/exceptions.h:
+
+/opt/kea/src/lib/hooks/library_handle.h:
+
+/opt/kea/src/lib/cc/data.h:

BIN
hooks/mysql/src/version.o