Roman Dmitriev 2 лет назад
Родитель
Сommit
6f4dd03e20
3 измененных файлов с 7 добавлено и 3 удалено
  1. 1 1
      docs/Readme.en.md
  2. 1 1
      docs/Readme.ru.md
  3. 5 1
      scripts/dnsmasq-hook.sh

+ 1 - 1
docs/Readme.en.md

@@ -3,7 +3,7 @@ Installation
 1. Install the packages
 
 apt install apache2 git fping perl mariadb-server php php-mysql php-bcmath php-intl \
-php-mbstring php-date php-mail php-snmp php-zip \
+php-mbstring php-date php-mail php-snmp php-zip xxd \
 libnet-patricia-perl libnetaddr-ip-perl libconfig-tiny-perl libnet-dns-perl libdatetime-perl \
 libnet-netmask-perl libtext-iconv-perl libnet-snmp-perl libnet-telnet-perl libdbi-perl \
 libdbd-mysql-perl libparallel-forkmanager-perl libproc-daemon-perl libdatetime-format-dateparse-perl \

+ 1 - 1
docs/Readme.ru.md

@@ -3,7 +3,7 @@
 1. Ставим пакеты
 
 apt install apache2 git fping perl mariadb-server php php-mysql php-bcmath php-intl \
-php-mbstring php-date php-mail php-snmp php-zip \
+php-mbstring php-date php-mail php-snmp php-zip xxd \
 libnet-patricia-perl libnetaddr-ip-perl libconfig-tiny-perl libnet-dns-perl libdatetime-perl \
 libnet-netmask-perl libtext-iconv-perl libnet-snmp-perl libnet-telnet-perl libdbi-perl \
 libdbd-mysql-perl libparallel-forkmanager-perl libproc-daemon-perl libdatetime-format-dateparse-perl \

+ 5 - 1
scripts/dnsmasq-hook.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 time=$(date +%s)
-echo "$1;$2;$3;$4;${time};${DNSMASQ_TAGS};${DNSMASQ_SUPPLIED_HOSTNAME};${DNSMASQ_OLD_HOSTNAME};${DNSMASQ_CIRCUIT_ID};${DNSMASQ_REMOTE_ID};${DNSMASQ_CLIENT_ID}" >>/var/log/dhcp.log &
+
+CIRCUIT_ID=$(echo ${DNSMASQ_CIRCUIT_ID}  | /usr/bin/xxd -l 16 -p )
+REMOTE_ID=$(echo ${DNSMASQ_REMOTE_ID} | /usr/bin/xxd -l 16 -p )
+
+echo "$1;$2;$3;$4;${time};${DNSMASQ_TAGS};${DNSMASQ_SUPPLIED_HOSTNAME};${DNSMASQ_OLD_HOSTNAME};${CIRCUIT_ID};${REMOTE_ID};${DNSMASQ_CLIENT_ID}" >>/var/log/dhcp.log &
 
 exit