Browse Source

Merge branch '1' into 'master'

1

See merge request interlink-sa/flowdat3/vendors/kea!4
Markson Marcolino 6 years ago
parent
commit
8da58d2146
71 changed files with 826 additions and 54 deletions
  1. 45 32
      1.4.0/kea-ik/Dockerfile
  2. 0 0
      1.4.0/kea-ik/conf/kea-ctrl-agent.conf
  3. 0 0
      1.4.0/kea-ik/conf/kea-dhcp4.conf
  4. 34 0
      1.4.0/kea-ik/conf/kea-dhcp4.conf.dist
  5. 15 0
      1.4.0/kea-ik/execute.sh
  6. 0 0
      1.4.0/kea-ik/hooks/README.md
  7. 0 0
      1.4.0/kea-ik/hooks/amqp/Makefile
  8. BIN
      1.4.0/kea-ik/hooks/amqp/kea-hook-flowdat3.so
  9. 0 0
      1.4.0/kea-ik/hooks/amqp/s-messages
  10. 0 0
      1.4.0/kea-ik/hooks/amqp/src/amqppublisher.cc
  11. 48 0
      1.4.0/kea-ik/hooks/amqp/src/amqppublisher.d
  12. 0 0
      1.4.0/kea-ik/hooks/amqp/src/amqppublisher.h
  13. BIN
      1.4.0/kea-ik/hooks/amqp/src/amqppublisher.o
  14. 0 0
      1.4.0/kea-ik/hooks/amqp/src/callouts.cc
  15. 141 0
      1.4.0/kea-ik/hooks/amqp/src/callouts.d
  16. BIN
      1.4.0/kea-ik/hooks/amqp/src/callouts.o
  17. 0 0
      1.4.0/kea-ik/hooks/amqp/src/common.h
  18. 0 0
      1.4.0/kea-ik/hooks/amqp/src/load.cc
  19. 42 0
      1.4.0/kea-ik/hooks/amqp/src/load.d
  20. BIN
      1.4.0/kea-ik/hooks/amqp/src/load.o
  21. 0 0
      1.4.0/kea-ik/hooks/amqp/src/logger.cc
  22. 26 0
      1.4.0/kea-ik/hooks/amqp/src/logger.d
  23. 0 0
      1.4.0/kea-ik/hooks/amqp/src/logger.h
  24. BIN
      1.4.0/kea-ik/hooks/amqp/src/logger.o
  25. 33 0
      1.4.0/kea-ik/hooks/amqp/src/messages.cc
  26. 6 0
      1.4.0/kea-ik/hooks/amqp/src/messages.d
  27. 17 0
      1.4.0/kea-ik/hooks/amqp/src/messages.h
  28. 0 0
      1.4.0/kea-ik/hooks/amqp/src/messages.mes
  29. BIN
      1.4.0/kea-ik/hooks/amqp/src/messages.o
  30. 0 0
      1.4.0/kea-ik/hooks/amqp/src/version.cc
  31. 17 0
      1.4.0/kea-ik/hooks/amqp/src/version.d
  32. BIN
      1.4.0/kea-ik/hooks/amqp/src/version.o
  33. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/Makefile
  34. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/kea4-dhcp.conf
  35. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/callouts.cc
  36. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/common.h
  37. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/load.cc
  38. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/logger.cc
  39. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/logger.h
  40. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/messages.mes
  41. 0 0
      1.4.0/kea-ik/hooks/kea-cm-hook/src/version.cc
  42. 0 0
      1.4.0/kea-ik/hooks/mysql/Makefile
  43. BIN
      1.4.0/kea-ik/hooks/mysql/kea-hook-flowdat3-mysql.so
  44. 0 0
      1.4.0/kea-ik/hooks/mysql/s-messages
  45. 0 0
      1.4.0/kea-ik/hooks/mysql/src/callouts.cc
  46. 146 0
      1.4.0/kea-ik/hooks/mysql/src/callouts.d
  47. BIN
      1.4.0/kea-ik/hooks/mysql/src/callouts.o
  48. 0 0
      1.4.0/kea-ik/hooks/mysql/src/common.h
  49. 0 0
      1.4.0/kea-ik/hooks/mysql/src/load.cc
  50. 42 0
      1.4.0/kea-ik/hooks/mysql/src/load.d
  51. BIN
      1.4.0/kea-ik/hooks/mysql/src/load.o
  52. 0 0
      1.4.0/kea-ik/hooks/mysql/src/logger.cc
  53. 26 0
      1.4.0/kea-ik/hooks/mysql/src/logger.d
  54. 0 0
      1.4.0/kea-ik/hooks/mysql/src/logger.h
  55. BIN
      1.4.0/kea-ik/hooks/mysql/src/logger.o
  56. 33 0
      1.4.0/kea-ik/hooks/mysql/src/messages.cc
  57. 6 0
      1.4.0/kea-ik/hooks/mysql/src/messages.d
  58. 17 0
      1.4.0/kea-ik/hooks/mysql/src/messages.h
  59. 0 0
      1.4.0/kea-ik/hooks/mysql/src/messages.mes
  60. BIN
      1.4.0/kea-ik/hooks/mysql/src/messages.o
  61. 0 0
      1.4.0/kea-ik/hooks/mysql/src/mysql_connection.cc
  62. 28 0
      1.4.0/kea-ik/hooks/mysql/src/mysql_connection.d
  63. 0 0
      1.4.0/kea-ik/hooks/mysql/src/mysql_connection.h
  64. BIN
      1.4.0/kea-ik/hooks/mysql/src/mysql_connection.o
  65. 0 0
      1.4.0/kea-ik/hooks/mysql/src/version.cc
  66. 17 0
      1.4.0/kea-ik/hooks/mysql/src/version.d
  67. BIN
      1.4.0/kea-ik/hooks/mysql/src/version.o
  68. 25 0
      1.4.0/kea-ik/supervisord/conf.d/kea.conf
  69. 34 0
      1.4.0/kea-ik/supervisord/supervisor.conf
  70. 20 19
      1.4.0/kea-oss/Dockerfile
  71. 8 3
      1.4.0/kea-premium/Dockerfile

+ 45 - 32
1.4.0/kea-ik/Dockerfile

@@ -1,39 +1,52 @@
 FROM docker.infra.flowdat.com/fd3/kea-oss-1.4.0:latest
 
-# C++ LIBRARIES
-
-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 git clone https://github.com/alanxz/SimpleAmqpClient
-RUN cd SimpleAmqpClient && mkdir simpleamqpclient-build && cd simpleamqpclient-build && cmake .. && 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
-
 COPY inotify.sh /usr/local/etc/kea/inotify.sh
-
 COPY script.sh /opt/script.sh
-RUN chmod +x /opt/script.sh
+COPY execute.sh /opt/execute.sh
+COPY hooks /opt/hooks
+COPY conf /opt/conf
+COPY supervisord /etc/supervisord
+
+# C++ LIBRARIES
+RUN chmod +x /opt/execute.sh; \
+    git clone git://github.com/alanxz/rabbitmq-c.git; \
+    cd rabbitmq-c; \
+    mkdir build; \
+    cd build; \
+    cmake ..; \
+    cmake --build .; \
+    cd rabbitmq-c/build; \
+    make; \
+    make install; \
+    git clone https://github.com/akalend/amqpcpp; \
+    cd amqpcpp; \
+    make; \
+    make install; \
+    cp -P /usr/local/lib/x86_64-linux-gnu/librabbitmq.* /usr/local/lib/; \
+    cp amqpcpp/libamqpcpp.a /usr/local/lib/libamqpcpp.a; \
+    cp amqpcpp/libamqpcpp.so /usr/local/lib/libamqpcpp.so; \
+    wget -O libzdb-3.1.tar.gz http://www.tildeslash.com/libzdb/dist/libzdb-3.1.tar.gz; \
+    tar xvzf libzdb-3.1.tar.gz; \
+    cd libzdb-3.1; \
+    ./configure --without-postgresql --without-sqlite; \
+    make; \
+    make install; \
+    git clone https://github.com/alanxz/SimpleAmqpClient; \
+    cd SimpleAmqpClient; \
+    mkdir simpleamqpclient-build; \
+    cd simpleamqpclient-build; \
+    cmake ..; \
+    make; \
+    make install; \
+    ldconfig; \
+    mkdir ~/.ssh; \
+    ssh-keyscan -H -p 22  gitlag.com >> ~/.ssh/known_hosts; \
+    ssh-keyscan -H -p 22  bitbucket.org >> ~/.ssh/known_hosts; \
+    chmod 0600 /opt/keys/bitbucket.id_rsa; \
+    chmod +x /opt/script.sh; \
+    rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["/opt/execute.sh"]
 
-CMD /opt/script.sh
 HEALTHCHECK --interval=5s --timeout=3s CMD pgrep kea-dhcp4

conf/kea-ctrl-agent.conf → 1.4.0/kea-ik/conf/kea-ctrl-agent.conf


conf/kea-dhcp4.conf.dist → 1.4.0/kea-ik/conf/kea-dhcp4.conf


+ 34 - 0
1.4.0/kea-ik/conf/kea-dhcp4.conf.dist

@@ -0,0 +1,34 @@
+{
+            "Dhcp4": {
+                "control-socket": {
+                    "socket-name": "\/tmp\/kea-dhcp4-ctrl.sock",
+                    "socket-type": "unix"
+                },
+                "subnet4": [
+                ],
+                "hooks-libraries": [
+                ],
+                "interfaces-config": {
+                    "interfaces": [
+                        "*"
+                    ]
+                }
+            },
+            "Logging": {
+                "loggers": [
+                    {
+                        "debuglevel": 99,
+                        "name": "kea-dhcp4",
+                        "output_options": [
+                            {
+                                "flush": true,
+                                "maxsize": 10240000,
+                                "maxver": 1,
+                                "output": "stdout"
+                            }
+                        ],
+                        "severity": "DEBUG"
+                    }
+                ]
+            }
+}

+ 15 - 0
1.4.0/kea-ik/execute.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+if [ "$1" == "copy" ];
+then
+    echo "Argument $1"
+	sleep 360
+    echo "SALIO"
+else
+    if [ "$1" == "bash" ];
+    then
+        bash
+    else
+        sh /opt/script.sh
+    fi
+fi

hooks/README.md → 1.4.0/kea-ik/hooks/README.md


hooks/amqp/Makefile → 1.4.0/kea-ik/hooks/amqp/Makefile


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


+ 0 - 0
1.4.0/kea-ik/hooks/amqp/s-messages


hooks/amqp/src/amqppublisher.cc → 1.4.0/kea-ik/hooks/amqp/src/amqppublisher.cc


+ 48 - 0
1.4.0/kea-ik/hooks/amqp/src/amqppublisher.d

@@ -0,0 +1,48 @@
+src/amqppublisher.o: src/amqppublisher.cc src/common.h \
+ src/amqppublisher.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/SimpleAmqpClient.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/AmqpException.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/Util.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/AmqpResponseLibraryException.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/Util.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/BasicMessage.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/Table.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/Channel.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/Envelope.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/ConnectionClosedException.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/ConsumerCancelledException.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/ConsumerTagNotFoundException.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/MessageReturnedException.h \
+ /SimpleAmqpClient/src/SimpleAmqpClient/Version.h
+
+src/common.h:
+
+src/amqppublisher.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/SimpleAmqpClient.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/AmqpException.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/Util.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/AmqpResponseLibraryException.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/Util.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/BasicMessage.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/Table.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/Channel.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/Envelope.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/ConnectionClosedException.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/ConsumerCancelledException.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/ConsumerTagNotFoundException.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/MessageReturnedException.h:
+
+/SimpleAmqpClient/src/SimpleAmqpClient/Version.h:

hooks/amqp/src/amqppublisher.h → 1.4.0/kea-ik/hooks/amqp/src/amqppublisher.h


BIN
1.4.0/kea-ik/hooks/amqp/src/amqppublisher.o


hooks/amqp/src/callouts.cc → 1.4.0/kea-ik/hooks/amqp/src/callouts.cc


+ 141 - 0
1.4.0/kea-ik/hooks/amqp/src/callouts.d

@@ -0,0 +1,141 @@
+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/hooks/parking_lots.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/hooks/callout_handle_associate.h \
+ /opt/kea/src/lib/dhcpsrv/subnet.h /opt/kea/src/lib/cc/user_context.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/hooks/parking_lots.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/hooks/callout_handle_associate.h:
+
+/opt/kea/src/lib/dhcpsrv/subnet.h:
+
+/opt/kea/src/lib/cc/user_context.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
1.4.0/kea-ik/hooks/amqp/src/callouts.o


hooks/amqp/src/common.h → 1.4.0/kea-ik/hooks/amqp/src/common.h


hooks/amqp/src/load.cc → 1.4.0/kea-ik/hooks/amqp/src/load.cc


+ 42 - 0
1.4.0/kea-ik/hooks/amqp/src/load.d

@@ -0,0 +1,42 @@
+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 \
+ /opt/kea/src/lib/hooks/parking_lots.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:
+
+/opt/kea/src/lib/hooks/parking_lots.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
1.4.0/kea-ik/hooks/amqp/src/load.o


hooks/amqp/src/logger.cc → 1.4.0/kea-ik/hooks/amqp/src/logger.cc


+ 26 - 0
1.4.0/kea-ik/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:

hooks/amqp/src/logger.h → 1.4.0/kea-ik/hooks/amqp/src/logger.h


BIN
1.4.0/kea-ik/hooks/amqp/src/logger.o


+ 33 - 0
1.4.0/kea-ik/hooks/amqp/src/messages.cc

@@ -0,0 +1,33 @@
+// File created from src/messages.mes on Thu Mar 14 2019 13:42
+
+#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
1.4.0/kea-ik/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
1.4.0/kea-ik/hooks/amqp/src/messages.h

@@ -0,0 +1,17 @@
+// File created from src/messages.mes on Thu Mar 14 2019 13:42
+
+#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

hooks/amqp/src/messages.mes → 1.4.0/kea-ik/hooks/amqp/src/messages.mes


BIN
1.4.0/kea-ik/hooks/amqp/src/messages.o


hooks/amqp/src/version.cc → 1.4.0/kea-ik/hooks/amqp/src/version.cc


+ 17 - 0
1.4.0/kea-ik/hooks/amqp/src/version.d

@@ -0,0 +1,17 @@
+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/parking_lots.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/hooks/parking_lots.h:

BIN
1.4.0/kea-ik/hooks/amqp/src/version.o


hooks/kea-cm-hook/Makefile → 1.4.0/kea-ik/hooks/kea-cm-hook/Makefile


hooks/kea-cm-hook/kea4-dhcp.conf → 1.4.0/kea-ik/hooks/kea-cm-hook/kea4-dhcp.conf


hooks/kea-cm-hook/src/callouts.cc → 1.4.0/kea-ik/hooks/kea-cm-hook/src/callouts.cc


hooks/kea-cm-hook/src/common.h → 1.4.0/kea-ik/hooks/kea-cm-hook/src/common.h


hooks/kea-cm-hook/src/load.cc → 1.4.0/kea-ik/hooks/kea-cm-hook/src/load.cc


hooks/kea-cm-hook/src/logger.cc → 1.4.0/kea-ik/hooks/kea-cm-hook/src/logger.cc


hooks/kea-cm-hook/src/logger.h → 1.4.0/kea-ik/hooks/kea-cm-hook/src/logger.h


hooks/kea-cm-hook/src/messages.mes → 1.4.0/kea-ik/hooks/kea-cm-hook/src/messages.mes


hooks/kea-cm-hook/src/version.cc → 1.4.0/kea-ik/hooks/kea-cm-hook/src/version.cc


hooks/mysql/Makefile → 1.4.0/kea-ik/hooks/mysql/Makefile


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


+ 0 - 0
1.4.0/kea-ik/hooks/mysql/s-messages


hooks/mysql/src/callouts.cc → 1.4.0/kea-ik/hooks/mysql/src/callouts.cc


+ 146 - 0
1.4.0/kea-ik/hooks/mysql/src/callouts.d

@@ -0,0 +1,146 @@
+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/hooks/parking_lots.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/hooks/callout_handle_associate.h \
+ /opt/kea/src/lib/dhcpsrv/subnet.h /opt/kea/src/lib/cc/user_context.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/dhcpsrv/host.h \
+ /opt/kea/src/lib/util/strutil.h /opt/kea/src/lib/util/encode/hex.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/hooks/parking_lots.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/hooks/callout_handle_associate.h:
+
+/opt/kea/src/lib/dhcpsrv/subnet.h:
+
+/opt/kea/src/lib/cc/user_context.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/dhcpsrv/host.h:
+
+/opt/kea/src/lib/util/strutil.h:
+
+/opt/kea/src/lib/util/encode/hex.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
1.4.0/kea-ik/hooks/mysql/src/callouts.o


hooks/mysql/src/common.h → 1.4.0/kea-ik/hooks/mysql/src/common.h


hooks/mysql/src/load.cc → 1.4.0/kea-ik/hooks/mysql/src/load.cc


+ 42 - 0
1.4.0/kea-ik/hooks/mysql/src/load.d

@@ -0,0 +1,42 @@
+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 \
+ /opt/kea/src/lib/hooks/parking_lots.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:
+
+/opt/kea/src/lib/hooks/parking_lots.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
1.4.0/kea-ik/hooks/mysql/src/load.o


hooks/mysql/src/logger.cc → 1.4.0/kea-ik/hooks/mysql/src/logger.cc


+ 26 - 0
1.4.0/kea-ik/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:

hooks/mysql/src/logger.h → 1.4.0/kea-ik/hooks/mysql/src/logger.h


BIN
1.4.0/kea-ik/hooks/mysql/src/logger.o


+ 33 - 0
1.4.0/kea-ik/hooks/mysql/src/messages.cc

@@ -0,0 +1,33 @@
+// File created from src/messages.mes on Thu Mar 14 2019 13:45
+
+#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
1.4.0/kea-ik/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
1.4.0/kea-ik/hooks/mysql/src/messages.h

@@ -0,0 +1,17 @@
+// File created from src/messages.mes on Thu Mar 14 2019 13:45
+
+#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

hooks/mysql/src/messages.mes → 1.4.0/kea-ik/hooks/mysql/src/messages.mes


BIN
1.4.0/kea-ik/hooks/mysql/src/messages.o


hooks/mysql/src/mysql_connection.cc → 1.4.0/kea-ik/hooks/mysql/src/mysql_connection.cc


+ 28 - 0
1.4.0/kea-ik/hooks/mysql/src/mysql_connection.d

@@ -0,0 +1,28 @@
+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/common.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/common.h:
+
+src/mysql_connection.h:

hooks/mysql/src/mysql_connection.h → 1.4.0/kea-ik/hooks/mysql/src/mysql_connection.h


BIN
1.4.0/kea-ik/hooks/mysql/src/mysql_connection.o


hooks/mysql/src/version.cc → 1.4.0/kea-ik/hooks/mysql/src/version.cc


+ 17 - 0
1.4.0/kea-ik/hooks/mysql/src/version.d

@@ -0,0 +1,17 @@
+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/parking_lots.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/hooks/parking_lots.h:

BIN
1.4.0/kea-ik/hooks/mysql/src/version.o


+ 25 - 0
1.4.0/kea-ik/supervisord/conf.d/kea.conf

@@ -0,0 +1,25 @@
+[program:kea-ctrl-agent]
+command=kea-ctrl-agent -c /usr/local/etc/kea/kea-ctrl-agent.conf
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+autorestart=true
+stopsignal = TERM
+stopwaitsecs = 10
+
+[program:kea-dhcp4]
+command=/usr/local/sbin/kea-dhcp4 -c /usr/local/etc/kea/kea-dhcp4.conf
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+autorestart=true
+stopsignal = TERM
+stopwaitsecs = 10
+
+[program:inotify]
+command=sh /usr/local/etc/kea/inotify.sh
+redirect_stderr=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+autorestart=true
+stopwaitsecs = 10

+ 34 - 0
1.4.0/kea-ik/supervisord/supervisor.conf

@@ -0,0 +1,34 @@
+; supervisor config file
+
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+
+[supervisord]
+logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/var/log/supervisor            ; ('AUTO' child log dir, default $TEMP)
+
+[inet_http_server]
+port = 0.0.0.0:9001
+username = iksop
+password = queRini6
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisord/conf.d/*.conf
+

+ 20 - 19
1.4.0/kea-oss/Dockerfile

@@ -1,30 +1,31 @@
 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 cmake
-
-RUN pip install superfsmon
-
-RUN wget -O kea-1.4.0-P1.tar.gz https://www.isc.org/downloads/file/kea-1-4-0-p1/?version=tar-gz
-RUN tar -zxvf kea-1.4.0-P1.tar.gz
-RUN mv kea-1.4.0-P1 /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
 
-RUN pip install watchdog
-RUN apt-get update && apt-get install -yq inotify-tools
+EXPOSE 67/udp 68/udp
 
 COPY script.sh /opt/script.sh
-RUN chmod +x /opt/script.sh
+
+RUN apt-get update; \ 
+    apt-get install -yq git vim build-essential dhcping dh-autoreconf automake \ 
+                        libssl-dev liblog4cplus-dev libboost-dev libmysqlclient-dev \
+                        libboost-all-dev mysql-client wget python-pip supervisor cmake \
+                        inotify-tools cmake; \
+    pip install superfsmon watchdog; \
+    wget -O kea-1.4.0-P1.tar.gz https://www.isc.org/downloads/file/kea-1-4-0-p1/?version=tar-gz; \
+    tar -zxvf kea-1.4.0-P1.tar.gz; \
+    mv kea-1.4.0-P1 /opt/kea; \
+    cd /opt/kea; \
+    autoreconf --install; \
+    ./configure --with-dhcp-mysql --enable-shell; \
+    make; \
+    make install; \
+    ldconfig; \
+    chmod +x /opt/script.sh; \
+    rm -rf /var/lib/apt/lists/*
 
 CMD /opt/script.sh
+
 HEALTHCHECK --interval=5s --timeout=3s CMD pgrep kea-dhcp4

+ 8 - 3
1.4.0/kea-premium/Dockerfile

@@ -2,6 +2,11 @@ FROM docker.infra.flowdat.com/fd3/kea-oss-1.4.0:latest
 
 WORKDIR /opt/kea
 
-RUN wget -O kea-subscription-1.4.0.tar.gz https://ftp.isc.org/isc/kea/private/f62aefe6b659324b/kea-subscription-1.4.0.tar.gz && tar xvzf kea-subscription-1.4.0.tar.gz
-
-RUN autoreconf --install && ./configure --with-dhcp-mysql --enable-shell && make && make install && ldconfig
+RUN wget -O kea-subscription-1.4.0.tar.gz https://ftp.isc.org/isc/kea/private/f62aefe6b659324b/kea-subscription-1.4.0.tar.gz; \
+    tar xvzf kea-subscription-1.4.0.tar.gz; \
+    autoreconf --install; \
+    ./configure --with-dhcp-mysql --enable-shell; \
+    make; \
+    make install; \
+    ldconfig; \
+    rm -rf /var/lib/apt/lists/*