From fd255fe92ff63534dd8a61df0466f8c52abe6fdd Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Sat, 9 Aug 2008 11:52:33 +0000 Subject: dns-forwarding op-mode commands: 'clear dns forwarding cache' 'show dns forwarding statistics' --- scripts/vyatta-op-dns-forwarding.pl | 117 ++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 scripts/vyatta-op-dns-forwarding.pl (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl new file mode 100644 index 0000000..d23ae7f --- /dev/null +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -0,0 +1,117 @@ +#!/usr/bin/perl +# +# Module: vyatta-op-dns-forwarding.pl +# +# **** License **** +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# This code was originally developed by Vyatta, Inc. +# Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc. +# All Rights Reserved. +# +# Author: Mohit Mehta +# Date: August 2008 +# Description: Script to execute op-mode commands for DNS forwarding +# +# **** End License **** +# + +use lib "/opt/vyatta/share/perl5/"; +use Getopt::Long; +use VyattaConfig; +use strict; +use warnings; + +my $show_stats_output=""; +my $show_nameservers_output=""; +my $dnsmasq_log='/var/log/dnsmasq.log'; + +sub get_cache_stats { + my ($cache_size, $queries_forwarded, $queries_answered_locally, $entries_inserted, $entries_removed); + + my $grepped_line = `grep 'cache size' $dnsmasq_log`; + my @split_line = split(/\s+/, $grepped_line); + my @temp_split = split(/,/, $split_line[6]); + $cache_size = $temp_split[0]; + @temp_split = split(/\//, $split_line[7]); + $entries_removed = $temp_split[0]; + $entries_inserted = $temp_split[1]; + + $grepped_line = `grep 'queries forwarded' $dnsmasq_log`; + @split_line = split(/\s+/, $grepped_line); + @temp_split = split(/,/, $split_line[6]); + $queries_forwarded = $temp_split[0]; + $queries_answered_locally = $split_line[10]; + + $show_stats_output .= "----------------\n"; + $show_stats_output .= "Cache statistics\n"; + $show_stats_output .= "----------------\n"; + $show_stats_output .= "Cache size: $cache_size\n"; + $show_stats_output .= "Queries forwarded: $queries_forwarded\n"; + $show_stats_output .= "Queries answered locally: $queries_answered_locally\n"; + $show_stats_output .= "Total DNS entries inserted into cache: $entries_inserted\n"; + $show_stats_output .= "DNS entries removed from cache before expiry: $entries_removed\n"; + +} + +sub get_nameserver_stats { + + $show_stats_output .= "\n---------------------\n"; + $show_stats_output .= "Nameserver statistics\n"; + $show_stats_output .= "---------------------\n"; + + my @grepped_lines = `grep 'server' $dnsmasq_log`; + + foreach my $lines (@grepped_lines) { + my @each_line = split(/\s+/, $lines); + my $nameserver_word = $each_line[5]; + my @nameserver_split = split(/#/, $nameserver_word); + my $nameserver = $nameserver_split[0]; + my $queries_sent_word = $each_line[8]; + my @queries_sent_split = split(/,/, $queries_sent_word); + my $queries_sent = $queries_sent_split[0]; + my $queries_retried_failed = $each_line[12]; + + $show_stats_output .= "Server: $nameserver\nQueries sent: $queries_sent\nQueries retried or failed: $queries_retried_failed\n\n"; + + } +} + +sub print_stats { + print $show_stats_output; +} + +# +# main +# +my ($clear_cache, $show_statistics, $show_nameservers); + +GetOptions("clear-cache!" => \$clear_cache, + "show-statistics!" => \$show_statistics, + "show-nameservers!" => \$show_nameservers); + +if (defined $clear_cache) { + system("kill -1 `pidof dnsmasq`"); +} + +if (defined $show_statistics) { + system("echo > /var/log/dnsmasq.log; kill -10 `pidof dnsmasq`"); + get_cache_stats; + get_nameserver_stats; + print_stats; +} + +if (defined $show_nameservers) { + +} + +exit 0; + +# end of file -- cgit v1.2.3 From d7202b8de5f2dc0d815cafb64c86ec25df782e70 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Sun, 10 Aug 2008 02:48:21 +0000 Subject: code for op-mode command: 'show dns forwarding nameservers' --- scripts/vyatta-op-dns-forwarding.pl | 126 +++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index d23ae7f..46f0897 100644 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -67,7 +67,7 @@ sub get_nameserver_stats { $show_stats_output .= "Nameserver statistics\n"; $show_stats_output .= "---------------------\n"; - my @grepped_lines = `grep 'server' $dnsmasq_log`; + my @grepped_lines = `grep ': server' $dnsmasq_log`; foreach my $lines (@grepped_lines) { my @each_line = split(/\s+/, $lines); @@ -88,6 +88,127 @@ sub print_stats { print $show_stats_output; } +sub get_dns_nameservers { + my $vyatta_config = new VyattaConfig; + + $vyatta_config->setLevel("service dns forwarding"); + my $use_system_nameservers = $vyatta_config->exists("system"); + my @use_dhcp_nameservers = $vyatta_config->returnValues("dhcp"); + my @use_nameservers = $vyatta_config->returnValues("name-server"); + my @resolv_conf_nameservers = `grep "^nameserver" /etc/resolv.conf`; + my @dnsmasq_conf_nameservers = `grep "server=" /etc/dnsmasq.conf`; + my @dnsmasq_running = `ps ax | grep dnsmasq | grep -v grep`; + + if (!(defined $use_system_nameservers) && (@use_dhcp_nameservers == 0) && (@use_nameservers == 0)) { + + # no specific nameservers specified under DNS forwarding, so dnsmasq is getting nameservers from /etc/resolv.conf + + if (! @resolv_conf_nameservers > 0){ + $show_nameservers_output .= "No DNS servers present to forward queries to.\n"; + if (! @dnsmasq_running > 0){ + $show_nameservers_output .= "DNS forwarding has not been configured either.\n"; + } + } else { + if (! @dnsmasq_running > 0){ + $show_nameservers_output .= "\n***DNS forwarding has not been configured***\n\n"; + } + $show_nameservers_output .= "----------------------\n"; + if ( @dnsmasq_running > 0){ + $show_nameservers_output .= " Active Nameservers\n"; + } else { + $show_nameservers_output .= " Inactive Nameservers\n"; + } + $show_nameservers_output .= "----------------------\n"; + foreach my $line (@resolv_conf_nameservers) { + my @split_line = split(/\s+/, $line); + my $nameserver = $split_line[1]; + my $nameserver_via = "system"; + if (@split_line > 2) { + my @dhclient_resolv_files = `ls /etc/resolv.conf.dhclient-new-*`; + foreach my $each_dhcp_resolv_conf (@dhclient_resolv_files) { + my @ns_dhclient_resolv=`grep "$nameserver\$" $each_dhcp_resolv_conf`; + if ( @ns_dhclient_resolv > 0) { + my @dhclient_file_array = split(/-/, $each_dhcp_resolv_conf); + $nameserver_via = $dhclient_file_array[2]; + chomp $nameserver_via; + $nameserver_via = 'dhcp ' . $nameserver_via; + } + } + } + $show_nameservers_output .= "$nameserver available via '$nameserver_via'\n"; + } + } + $show_nameservers_output .= "\n"; + } else { + + # nameservers specified under DNS forwarding, so dnsmasq getting nameservers from /etc/dnsmasq.conf + + my @active_nameservers; + my $active_nameserver_count = 0; + $show_nameservers_output .= "----------------------\n"; + $show_nameservers_output .= " Active Nameservers\n"; + $show_nameservers_output .= "----------------------\n"; + foreach my $line (@dnsmasq_conf_nameservers) { + my @split_line = split(/=/, $line); + my @nameserver_array = split(/\s+/, $split_line[1]); + my $nameserver = $nameserver_array[0]; + $active_nameservers[$active_nameserver_count] = $nameserver; + $active_nameserver_count++; + my $nameserver_via = $nameserver_array[2]; + if (@nameserver_array > 3){ + my $dhcp_interface = $nameserver_array[3]; + $show_nameservers_output .= "$nameserver available via '$nameserver_via $dhcp_interface'\n"; + } else { + $show_nameservers_output .= "$nameserver available via '$nameserver_via'\n"; + } + } + + # then you need to get nameservers from /etc/resolv.conf that are not in dnsmasq.conf to show them as inactive + + my $active_dnsmasq_nameserver; + my $output_inactive_nameservers = 0; + foreach my $resolv_conf_line (@resolv_conf_nameservers) { + my @resolv_conf_split_line = split(/\s+/, $resolv_conf_line); + my $resolv_conf_nameserver = $resolv_conf_split_line[1]; + $active_dnsmasq_nameserver = 0; + my $resolv_nameserver_via = "system"; + foreach my $dnsmasq_nameserver (@active_nameservers) { + if ($dnsmasq_nameserver eq $resolv_conf_nameserver) { + $active_dnsmasq_nameserver = 1; + } + } + if ($active_dnsmasq_nameserver == 0) { + if ($output_inactive_nameservers == 0){ + $output_inactive_nameservers = 1; + $show_nameservers_output .= "\n----------------------\n"; + $show_nameservers_output .= " Inactive Nameservers\n"; + $show_nameservers_output .= "----------------------\n"; + } + if (@resolv_conf_split_line > 2) { + my @dhclient_resolv_files = `ls /etc/resolv.conf.dhclient-new-*`; + foreach my $each_dhcp_resolv_conf (@dhclient_resolv_files) { + chomp $each_dhcp_resolv_conf; + my @ns_dhclient_resolv=`grep "$resolv_conf_nameserver\$" $each_dhcp_resolv_conf`; + if ( @ns_dhclient_resolv > 0) { + my @dhclient_file_array = split(/-/, $each_dhcp_resolv_conf); + $resolv_nameserver_via = $dhclient_file_array[2]; + chomp $resolv_nameserver_via; + $resolv_nameserver_via = 'dhcp ' . $resolv_nameserver_via; + } + } + } + + $show_nameservers_output .= "$resolv_conf_nameserver available via '$resolv_nameserver_via'\n"; + } + } + $show_nameservers_output .= "\n"; + } +} + +sub print_nameservers { + print $show_nameservers_output; +} + # # main # @@ -109,7 +230,8 @@ if (defined $show_statistics) { } if (defined $show_nameservers) { - + get_dns_nameservers; + print_nameservers; } exit 0; -- cgit v1.2.3 From 68410c9702c1e04f25bfe84739aed463c3c92101 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Sun, 10 Aug 2008 04:11:06 +0000 Subject: use active config directory base to get config values from op-mode --- scripts/vyatta-op-dns-forwarding.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index 46f0897..e785eed 100644 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -92,9 +92,10 @@ sub get_dns_nameservers { my $vyatta_config = new VyattaConfig; $vyatta_config->setLevel("service dns forwarding"); - my $use_system_nameservers = $vyatta_config->exists("system"); - my @use_dhcp_nameservers = $vyatta_config->returnValues("dhcp"); - my @use_nameservers = $vyatta_config->returnValues("name-server"); + $vyatta_config->{_active_dir_base} = "/opt/vyatta/config/active/"; + my $use_system_nameservers = $vyatta_config->existsOrig("system"); + my @use_dhcp_nameservers = $vyatta_config->returnOrigValues("dhcp"); + my @use_nameservers = $vyatta_config->returnOrigValues("name-server"); my @resolv_conf_nameservers = `grep "^nameserver" /etc/resolv.conf`; my @dnsmasq_conf_nameservers = `grep "server=" /etc/dnsmasq.conf`; my @dnsmasq_running = `ps ax | grep dnsmasq | grep -v grep`; -- cgit v1.2.3 From d48778faae8df9897668d567219872ccb0b43119 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 26 Aug 2008 11:02:09 -0700 Subject: Fix "show interfaces ethernet" after "clear interfaces counters" command. --- scripts/vyatta-show-interfaces.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/vyatta-show-interfaces.pl b/scripts/vyatta-show-interfaces.pl index 7e76fa6..1e4038c 100755 --- a/scripts/vyatta-show-interfaces.pl +++ b/scripts/vyatta-show-interfaces.pl @@ -333,7 +333,7 @@ sub run_clear_intf { print $FILE $clear_file_magic, "\n", time(), "\n"; my ($var, $val); while (($var, $val) = each (%stats)) { - print $FILE $var, ",", $val; + print $FILE $var, ",", $val, "\n"; } close($FILE); } -- cgit v1.2.3 From 9981edbf6ee6c88e80d61fca4a8a86b5e7750b5b Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Tue, 12 Aug 2008 00:10:01 +0000 Subject: better wording for output of 'show dns forwarding nameservers' --- scripts/vyatta-op-dns-forwarding.pl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index e785eed..c53c7a0 100644 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -64,8 +64,8 @@ sub get_cache_stats { sub get_nameserver_stats { $show_stats_output .= "\n---------------------\n"; - $show_stats_output .= "Nameserver statistics\n"; - $show_stats_output .= "---------------------\n"; + $show_stats_output .= "Nameserver statistics\n"; + $show_stats_output .= "---------------------\n"; my @grepped_lines = `grep ': server' $dnsmasq_log`; @@ -111,15 +111,15 @@ sub get_dns_nameservers { } } else { if (! @dnsmasq_running > 0){ - $show_nameservers_output .= "\n***DNS forwarding has not been configured***\n\n"; + $show_nameservers_output .= "\n**DNS forwarding has not been configured**\n\n"; } - $show_nameservers_output .= "----------------------\n"; + $show_nameservers_output .= "-----------------------------------------------\n"; if ( @dnsmasq_running > 0){ - $show_nameservers_output .= " Active Nameservers\n"; + $show_nameservers_output .= " Nameservers configured for DNS forwarding\n"; } else { - $show_nameservers_output .= " Inactive Nameservers\n"; + $show_nameservers_output .= " Nameservers NOT configured for DNS forwarding\n"; } - $show_nameservers_output .= "----------------------\n"; + $show_nameservers_output .= "-----------------------------------------------\n"; foreach my $line (@resolv_conf_nameservers) { my @split_line = split(/\s+/, $line); my $nameserver = $split_line[1]; @@ -146,9 +146,9 @@ sub get_dns_nameservers { my @active_nameservers; my $active_nameserver_count = 0; - $show_nameservers_output .= "----------------------\n"; - $show_nameservers_output .= " Active Nameservers\n"; - $show_nameservers_output .= "----------------------\n"; + $show_nameservers_output .= "-----------------------------------------------\n"; + $show_nameservers_output .= " Nameservers configured for DNS forwarding\n"; + $show_nameservers_output .= "-----------------------------------------------\n"; foreach my $line (@dnsmasq_conf_nameservers) { my @split_line = split(/=/, $line); my @nameserver_array = split(/\s+/, $split_line[1]); @@ -181,9 +181,9 @@ sub get_dns_nameservers { if ($active_dnsmasq_nameserver == 0) { if ($output_inactive_nameservers == 0){ $output_inactive_nameservers = 1; - $show_nameservers_output .= "\n----------------------\n"; - $show_nameservers_output .= " Inactive Nameservers\n"; - $show_nameservers_output .= "----------------------\n"; + $show_nameservers_output .= "\n-----------------------------------------------\n"; + $show_nameservers_output .= " Nameservers NOT configured for DNS forwarding\n"; + $show_nameservers_output .= "-----------------------------------------------\n"; } if (@resolv_conf_split_line > 2) { my @dhclient_resolv_files = `ls /etc/resolv.conf.dhclient-new-*`; -- cgit v1.2.3 From c620e1128d8c6a48d74467e671575c1c55b3a608 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Sat, 30 Aug 2008 07:52:40 +0000 Subject: add command 'clear dns forwarding process' to restart dnsmasq and clear all statistics --- scripts/vyatta-op-dns-forwarding.pl | 7 ++++++- templates/clear/dns/forwarding/process/node.def | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 templates/clear/dns/forwarding/process/node.def (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index c53c7a0..6ef8ebb 100644 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -213,9 +213,10 @@ sub print_nameservers { # # main # -my ($clear_cache, $show_statistics, $show_nameservers); +my ($clear_cache, $clear_process, $show_statistics, $show_nameservers); GetOptions("clear-cache!" => \$clear_cache, + "clear-process!" => \$clear_process, "show-statistics!" => \$show_statistics, "show-nameservers!" => \$show_nameservers); @@ -223,6 +224,10 @@ if (defined $clear_cache) { system("kill -1 `pidof dnsmasq`"); } +if (defined $clear_process) { + system("/etc/init.d/dnsmasq restart >&/dev/null"); +} + if (defined $show_statistics) { system("echo > /var/log/dnsmasq.log; kill -10 `pidof dnsmasq`"); get_cache_stats; diff --git a/templates/clear/dns/forwarding/process/node.def b/templates/clear/dns/forwarding/process/node.def new file mode 100644 index 0000000..20427cb --- /dev/null +++ b/templates/clear/dns/forwarding/process/node.def @@ -0,0 +1,8 @@ +help: Clear DNS forwarding process +run: + if ps ax | grep dnsmasq | grep -v grep > /dev/null + then + sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-process + else + echo "DNS forwarding not configured" + fi -- cgit v1.2.3 From 39ef568ad5da594f92ea445bfd1190aa54ff0fb8 Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Sun, 31 Aug 2008 03:52:58 +0000 Subject: change command 'clear dns forwarding process' to 'clear dns forwarding statistics' --- scripts/vyatta-op-dns-forwarding.pl | 6 +++--- templates/clear/dns/forwarding/process/node.def | 8 -------- templates/clear/dns/forwarding/statistics/node.def | 8 ++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 templates/clear/dns/forwarding/process/node.def create mode 100644 templates/clear/dns/forwarding/statistics/node.def (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index 6ef8ebb..978ed33 100644 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -213,10 +213,10 @@ sub print_nameservers { # # main # -my ($clear_cache, $clear_process, $show_statistics, $show_nameservers); +my ($clear_cache, $clear_statistics, $show_statistics, $show_nameservers); GetOptions("clear-cache!" => \$clear_cache, - "clear-process!" => \$clear_process, + "clear-statistics!" => \$clear_statistics, "show-statistics!" => \$show_statistics, "show-nameservers!" => \$show_nameservers); @@ -224,7 +224,7 @@ if (defined $clear_cache) { system("kill -1 `pidof dnsmasq`"); } -if (defined $clear_process) { +if (defined $clear_statistics) { system("/etc/init.d/dnsmasq restart >&/dev/null"); } diff --git a/templates/clear/dns/forwarding/process/node.def b/templates/clear/dns/forwarding/process/node.def deleted file mode 100644 index 20427cb..0000000 --- a/templates/clear/dns/forwarding/process/node.def +++ /dev/null @@ -1,8 +0,0 @@ -help: Clear DNS forwarding process -run: - if ps ax | grep dnsmasq | grep -v grep > /dev/null - then - sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-process - else - echo "DNS forwarding not configured" - fi diff --git a/templates/clear/dns/forwarding/statistics/node.def b/templates/clear/dns/forwarding/statistics/node.def new file mode 100644 index 0000000..6441e12 --- /dev/null +++ b/templates/clear/dns/forwarding/statistics/node.def @@ -0,0 +1,8 @@ +help: Clear DNS forwarding statistics +run: + if ps ax | grep dnsmasq | grep -v grep > /dev/null + then + sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-statistics + else + echo "DNS forwarding not configured" + fi -- cgit v1.2.3 From 7e5b2d590d663c40b6d1a1c4a370b0c0bb770f8c Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Sun, 7 Sep 2008 04:15:58 +0000 Subject: add code for op-mode Dynamic DNS commands --- Makefile.am | 1 + scripts/vyatta-op-dynamic-dns.pl | 119 +++++++++++++++++++++ templates/show/dns/dynamic/node.def | 1 + templates/show/dns/dynamic/status/node.def | 3 + templates/update/dns/dynamic/interface/node.def | 1 + .../update/dns/dynamic/interface/node.tag/node.def | 6 ++ templates/update/dns/dynamic/node.def | 1 + templates/update/dns/node.def | 1 + 8 files changed, 133 insertions(+) create mode 100644 scripts/vyatta-op-dynamic-dns.pl create mode 100644 templates/show/dns/dynamic/node.def create mode 100644 templates/show/dns/dynamic/status/node.def create mode 100644 templates/update/dns/dynamic/interface/node.def create mode 100644 templates/update/dns/dynamic/interface/node.tag/node.def create mode 100644 templates/update/dns/dynamic/node.def create mode 100644 templates/update/dns/node.def (limited to 'scripts') diff --git a/Makefile.am b/Makefile.am index 1063b78..627ed32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ bin_sudo_users_SCRIPTS = scripts/vyatta-identify-interface.pl bin_sudo_users_SCRIPTS += scripts/vyatta-delete-log-file.sh bin_sudo_users_SCRIPTS += scripts/vyatta-reboot.pl bin_sudo_users_SCRIPTS += scripts/vyatta-op-dns-forwarding.pl +bin_sudo_users_SCRIPTS += scripts/vyatta-op-dynamic-dns.pl cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/scripts/vyatta-op-dynamic-dns.pl b/scripts/vyatta-op-dynamic-dns.pl new file mode 100644 index 0000000..b6460f5 --- /dev/null +++ b/scripts/vyatta-op-dynamic-dns.pl @@ -0,0 +1,119 @@ +#!/usr/bin/perl +# +# Module: vyatta-op-dynamic-dns.pl +# +# **** License **** +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# This code was originally developed by Vyatta, Inc. +# Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc. +# All Rights Reserved. +# +# Author: Mohit Mehta +# Date: September 2008 +# Description: Script to execute op-mode commands for Dynamic DNS +# +# **** End License **** +# + +use lib "/opt/vyatta/share/perl5/"; +use Getopt::Long; +use VyattaConfig; +use strict; +use warnings; + +sub print_ddns_stats { + my $ddclient_cache_files = '/var/cache/ddclient/*'; + my @all_cached_entries = `grep "^atime" $ddclient_cache_files 2>/dev/null`; + if (@all_cached_entries > 0){ + foreach my $each_entry (@all_cached_entries) { + my $interface = undef; + if (`ls $ddclient_cache_files | wc -l` == 1) { + my $interface_file = `ls $ddclient_cache_files`; + my @split_on_cache = split(/.cache/, $interface_file); + my @interface_split = split(/_/, $split_on_cache[1]); + $interface = $interface_split[1]; + } else { + my @split_on_cache = split(/.cache:/, $each_entry); + my @interface_split = split(/_/, $split_on_cache[0]); + $interface=$interface_split[1]; + } + print "interface : $interface\n"; + my @split_on_ip = split(/ip=/, $each_entry); + if (@split_on_ip > 1){ + my @ip = split(/,/, $split_on_ip[1]); + print "ip address : $ip[0]\n"; + } + my @split_on_host = split(/host=/, $each_entry); + my @host = split(/,/, $split_on_host[1]); + print "host-name : $host[0]\n"; + my @split_on_atime = split(/atime=/, $each_entry); + my @atime = split(/,/, $split_on_atime[1]); + my $prettytime = scalar(localtime($atime[0])); + print "last update : $prettytime\n"; + my @split_on_status = split(/status=/, $each_entry); + my @status = split(/,/, $split_on_status[1]); + print "update-status: $status[0]\n"; + print "\n"; + } + } else { + print "Dynamic DNS not configured\n"; + } +} + +sub get_ddns_interfaces { + + my $vyatta_config = new VyattaConfig; + $vyatta_config->setLevel("service dns dynamic"); + $vyatta_config->{_active_dir_base} = "/opt/vyatta/config/active/"; + my @ddns_interfaces = $vyatta_config->listOrigNodes("interface"); + @ddns_interfaces = sort(@ddns_interfaces); + return (@ddns_interfaces); + +} + +# +# main +# + +my ($show_status, $update_ddns, $interface, $show_interfaces); + +GetOptions("show-status!" => \$show_status, + "update-ddns!" => \$update_ddns, + "interface=s" => \$interface, + "show-interfaces!" => \$show_interfaces); + +if (defined $show_status) { + print_ddns_stats; +} + +if (defined $update_ddns && defined $interface) { + my @ddns_interfaces = get_ddns_interfaces(); + my $interface_configured = 0; + foreach my $ddns_interface (@ddns_interfaces) { + if ($ddns_interface eq $interface) { + $interface_configured = 1; + } + } + if ($interface_configured == 1) { + system("sudo /opt/vyatta/sbin/vyatta-dynamic-dns.pl --op-mode-update-dynamicdns --interface $interface"); + } else { + print "$interface has not been configured to send Dynamic DNS updates\n"; + } +} + +if (defined $show_interfaces) { + my @ddns_interfaces = get_ddns_interfaces(); + print "@ddns_interfaces\n"; +} + +exit 0; + +# end of file diff --git a/templates/show/dns/dynamic/node.def b/templates/show/dns/dynamic/node.def new file mode 100644 index 0000000..9a06b38 --- /dev/null +++ b/templates/show/dns/dynamic/node.def @@ -0,0 +1 @@ +help: Show Dynamic DNS information diff --git a/templates/show/dns/dynamic/status/node.def b/templates/show/dns/dynamic/status/node.def new file mode 100644 index 0000000..870c883 --- /dev/null +++ b/templates/show/dns/dynamic/status/node.def @@ -0,0 +1,3 @@ +help: Show Dynamic DNS status +run: + sudo /opt/vyatta/bin/sudo-users/vyatta-op-dynamic-dns.pl --show-status diff --git a/templates/update/dns/dynamic/interface/node.def b/templates/update/dns/dynamic/interface/node.def new file mode 100644 index 0000000..c0ef660 --- /dev/null +++ b/templates/update/dns/dynamic/interface/node.def @@ -0,0 +1 @@ +help: Update Dynamic DNS for specified interface diff --git a/templates/update/dns/dynamic/interface/node.tag/node.def b/templates/update/dns/dynamic/interface/node.tag/node.def new file mode 100644 index 0000000..60fb67d --- /dev/null +++ b/templates/update/dns/dynamic/interface/node.tag/node.def @@ -0,0 +1,6 @@ +help: Update Dynamic DNS for specified interface +allowed: + sudo /opt/vyatta/bin/sudo-users/vyatta-op-dynamic-dns.pl --show-interfaces +run: + IFNAME=${5} + sudo /opt/vyatta/bin/sudo-users/vyatta-op-dynamic-dns.pl --update-ddns --interface "$IFNAME" diff --git a/templates/update/dns/dynamic/node.def b/templates/update/dns/dynamic/node.def new file mode 100644 index 0000000..447fcb5 --- /dev/null +++ b/templates/update/dns/dynamic/node.def @@ -0,0 +1 @@ +help: Update Dynamic DNS information diff --git a/templates/update/dns/node.def b/templates/update/dns/node.def new file mode 100644 index 0000000..b8217f6 --- /dev/null +++ b/templates/update/dns/node.def @@ -0,0 +1 @@ +help: Update DNS information -- cgit v1.2.3 From 93f7c1c4d0ec76d81f093b2fc966cf56c17b372b Mon Sep 17 00:00:00 2001 From: Mohit Mehta Date: Mon, 15 Sep 2008 12:06:07 -0700 Subject: change op-mode command 'clear dns forwarding statistics' to 'clear dns forwarding all' --- scripts/vyatta-op-dns-forwarding.pl | 6 +++--- templates/clear/dns/forwarding/all/node.def | 8 ++++++++ templates/clear/dns/forwarding/statistics/node.def | 8 -------- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 templates/clear/dns/forwarding/all/node.def delete mode 100644 templates/clear/dns/forwarding/statistics/node.def (limited to 'scripts') diff --git a/scripts/vyatta-op-dns-forwarding.pl b/scripts/vyatta-op-dns-forwarding.pl index 978ed33..24a64e6 100644 --- a/scripts/vyatta-op-dns-forwarding.pl +++ b/scripts/vyatta-op-dns-forwarding.pl @@ -213,10 +213,10 @@ sub print_nameservers { # # main # -my ($clear_cache, $clear_statistics, $show_statistics, $show_nameservers); +my ($clear_cache, $clear_all, $show_statistics, $show_nameservers); GetOptions("clear-cache!" => \$clear_cache, - "clear-statistics!" => \$clear_statistics, + "clear-all!" => \$clear_all, "show-statistics!" => \$show_statistics, "show-nameservers!" => \$show_nameservers); @@ -224,7 +224,7 @@ if (defined $clear_cache) { system("kill -1 `pidof dnsmasq`"); } -if (defined $clear_statistics) { +if (defined $clear_all) { system("/etc/init.d/dnsmasq restart >&/dev/null"); } diff --git a/templates/clear/dns/forwarding/all/node.def b/templates/clear/dns/forwarding/all/node.def new file mode 100644 index 0000000..b439b78 --- /dev/null +++ b/templates/clear/dns/forwarding/all/node.def @@ -0,0 +1,8 @@ +help: Clear DNS forwarding cache and counters +run: + if ps ax | grep dnsmasq | grep -v grep > /dev/null + then + sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-all + else + echo "DNS forwarding not configured" + fi diff --git a/templates/clear/dns/forwarding/statistics/node.def b/templates/clear/dns/forwarding/statistics/node.def deleted file mode 100644 index 6441e12..0000000 --- a/templates/clear/dns/forwarding/statistics/node.def +++ /dev/null @@ -1,8 +0,0 @@ -help: Clear DNS forwarding statistics -run: - if ps ax | grep dnsmasq | grep -v grep > /dev/null - then - sudo /opt/vyatta/bin/sudo-users/vyatta-op-dns-forwarding.pl --clear-statistics - else - echo "DNS forwarding not configured" - fi -- cgit v1.2.3