Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-op into jenner

11 files changed, 203 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 44675de..8dcb700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,175 @@
+vyatta-op (0.13.2) unstable; urgency=low
+
+  [ Justin Fletcher ]
+  * Move tcp and udp commands under system/connections
+
+ -- An-Cheng Huang <ancheng@build-vm.localdomain>  Tue, 13 Jan 2009 18:15:06 -0800
+
+vyatta-op (0.13.1) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Add commands to display open sockets
+  * Need full path to ss command
+
+  [ An-Cheng Huang ]
+  * correct package dependency
+
+  [ Mohit Mehta ]
+  * add bond interfaces to list of allowed interfaces for dhcp
+    release/renew
+
+  [ An-Cheng Huang ]
+  * add support for development build
+
+  [ Mohit Mehta ]
+  * make changes for submodule moved to VyattaMisc
+
+  [ Stephen Hemminger ]
+  * Decode bonding modes
+  * Convert to Vyatta::
+
+  [ Stig Thormodsrud ]
+  * "show interfaces" broken.  Use new perl hierarchy.
+
+  [ Stephen Hemminger ]
+  * Get rid of reference to OFR
+
+  [ Stig Thormodsrud ]
+  * Add option to show counters for multiple interfaces.
+
+  [ An-Cheng Huang ]
+  * update maintainer information
+  * "files" file should be removed before package build
+
+  [ Mohit Mehta ]
+  * Fix Bug 4022 dynamic dns config fails during system boot if
+    interface does not exist
+
+  [ An-Cheng Huang ]
+
+ -- An-Cheng Huang <ancheng@vyatta.com>  Thu, 08 Jan 2009 09:42:49 -0800
+
+vyatta-op (0.13) unstable; urgency=low
+
+	  3.2.0
+  [ Mark O'Brien ]
+
+
+  [ Mohit Mehta ]
+  * add 'ppp interface-name' to output of 'show dns forwarding
+    nameserver'
+  * add wirelessmodem to interface hash to pick up description from CLI
+
+  [ Stephen Hemminger ]
+  * Sort interfaces in bonding operational mode commands
+  * Show correct statistics on slaves
+
+  [ Stig Thormodsrud ]
+  * Rename "show arp6" to "show ipv6 neighbors".
+
+  [ Stephen Hemminger ]
+  * need sudo before ethtool -S
+  * Save/restore command history in configure
+
+  [ Bob Gilligan ]
+  * Bugfix: 3841:  Allow admin level users to run the RAID op mode
+    commands.
+
+  [ Stephen Hemminger ]
+  * fix 'show history N'
+  * Fix references to ethtool
+  * Better format of output
+  * Show command history
+
+  [ Robert Bays ]
+  * move show system usb to vyatta-op
+
+  [ Bob Gilligan ]
+  * Bugfix: 3744
+
+  [ Stephen Hemminger ]
+  * Revert insecure method of displaying configuration
+
+  [ Mohit Mehta ]
+  * Fix Bug 3763 Configuration is not available to operator in "show
+    tech-support"
+  * make sure file has been written to before extracting
+
+  [ Rick Balocca ]
+  * Recognize aufs
+
+  [ Mohit Mehta ]
+  * Fix Bug 3609 "show tech-support" does not display open file
+    information for operator level user
+
+  [ Stig Thormodsrud ]
+  * Fix 2881: "show tech-support" should limit the output of "show ip
+    route"
+
+  [ Bob Gilligan ]
+  * Bugfix: 3333
+  * Bugfix: 1725
+
+  [ Mohit Mehta ]
+  * Fix Bug 3716 - Dynamic DNS status may incorrectly indicate lack of
+    configuration
+
+  [ Stig Thormodsrud ]
+  * Revert "Fix less prompt."
+  * Fix less prompt.
+
+  [ Stephen Hemminger ]
+  * remove debug code
+  * Fix script for bond with no slaves
+  * Show all interfaces
+  * Add preliminary operational mode support for bonding
+  * Add operational mode template for ethtool statistics
+
+  [ Mohit Mehta ]
+  * change op-mode command 'clear dns forwarding statistics' to 'clear
+    dns forwarding all'
+  * add code for op-mode Dynamic DNS commands
+
+  [ Bob Gilligan ]
+  * Add operational mode commands for RAID.
+
+  [ Mohit Mehta ]
+  * change command 'clear dns forwarding process' to 'clear dns
+    forwarding statistics'
+  * allowed values for dhcp release/renew should show bridges as well if
+    configured to use dhcp
+  * add command 'clear dns forwarding process' to restart dnsmasq and
+    clear all statistics
+
+  [ Stig Thormodsrud ]
+  * Fix 3540: ssmtp complaining that it's unable to locate mail
+
+  [ Mohit Mehta ]
+  * better wording for output of 'show dns forwarding nameservers'
+
+  [ Stig Thormodsrud ]
+  * Fix "show interfaces ethernet" after "clear interfaces counters"
+
+  [ Mohit Mehta ]
+  * use active config directory base to get config values from op-mode
+  * code for op-mode command: 'show dns forwarding nameservers'
+  * dns-forwarding op-mode commands:
+  * add 'clear dns forwarding cache' command
+
+  [ Stig Thormodsrud ]
+  * Fix IPv6 help string.
+  * Add some ipv6 op mode commands.
+  * The at package pulls in citadel-mta, use small mta.
+  * Add missing "show reboot".
+  * Enable "reload at|cancel".
+
+  [ An-Cheng Huang ]
+  * add openvpn interfaces to "show interfaces"
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@firebolt.vyatta.com>  Tue, 25 Nov 2008 19:10:16 -0800
+
 vyatta-op (0.12) unstable; urgency=low
 
 	  3.1.2
diff --git a/debian/control b/debian/control
index 80e26d6..22f83b1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: vyatta-op
 Section: contrib/net
 Priority: extra
-Maintainer: Tom Grennan <tgrennan@vyatta.com>
+Maintainer: Vyatta Package Maintainers <maintainers@vyatta.com>
 Build-Depends: debhelper (>= 5), autotools-dev
 Standards-Version: 3.7.2
 
diff --git a/debian/rules b/debian/rules
index 3277be8..4a5a50e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@ install: build
 
 # Build architecture-independent files here.
 binary-indep: build install
+	rm -f debian/files
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
diff --git a/scripts/vyatta-op-dynamic-dns.pl b/scripts/vyatta-op-dynamic-dns.pl
index d1197c2..3d24c38 100644
--- a/scripts/vyatta-op-dynamic-dns.pl
+++ b/scripts/vyatta-op-dynamic-dns.pl
@@ -35,12 +35,15 @@ sub print_ddns_stats {
 
     if (@ddns_interfaces > 0){
      foreach my $configuredinterface (@ddns_interfaces) {
+       my $no_interface = `ip addr show dev $configuredinterface 2>/dev/null`;
        my $no_ip = `ip addr show dev $configuredinterface 2>/dev/null | grep "inet "`;
        my @all_cached_entries = `grep "^atime" $ddclient_cache_dir/ddclient_$configuredinterface.cache 2>/dev/null`;
        if (@all_cached_entries > 0) {
         foreach my $each_entry (@all_cached_entries) {
          print "interface    : $configuredinterface";
-         if ($no_ip eq ""){
+         if ($no_interface eq ""){
+          print " [ Interface does not exist ]";
+         } elsif ($no_ip eq ""){
           print " [ Currently no IP address ]";
          }
          print "\n";
@@ -63,7 +66,9 @@ sub print_ddns_stats {
         }
        } else {
          print "interface    : $configuredinterface";
-         if ($no_ip eq ""){
+         if ($no_interface eq ""){
+          print " [ Interface does not exist ]";
+         } elsif ($no_ip eq ""){
           print " [ Currently no IP address ]";
          } else {
           print " \n[ Status will be updated within 60 seconds ]";
diff --git a/scripts/vyatta-show-interfaces.pl b/scripts/vyatta-show-interfaces.pl
index 02ad8e0..529684f 100755
--- a/scripts/vyatta-show-interfaces.pl
+++ b/scripts/vyatta-show-interfaces.pl
@@ -56,6 +56,7 @@ my %intf_hash = (
 my %action_hash = (
     'show'       => \&run_show_intf,
     'show-brief' => \&run_show_intf_brief,
+    'show-count' => \&run_show_counters,
     'clear'      => \&run_clear_intf,
     'reset'      => \&run_reset_intf,
     );
@@ -312,6 +313,25 @@ sub run_show_intf_brief {
     }
 }
 
+sub run_show_counters {
+    my @intfs = @_;
+
+    my $format = "%-12s %10s %10s     %10s %10s\n";
+    printf($format, "Interface","Rx Packets","Rx Bytes","Tx Packets","Tx Bytes");
+    foreach my $intf (@intfs) {
+	my ($state, $link) = get_state_link($intf);
+	next if $state ne 'up';
+	my %clear = get_clear_stats($intf);
+	my %stats = get_intf_stats($intf);
+	printf($format, $intf,  
+	       get_counter_val($clear{rx_packets}, $stats{rx_packets}),
+	       get_counter_val($clear{rx_bytes},   $stats{rx_bytes}),
+	       get_counter_val($clear{tx_packets}, $stats{tx_packets}),
+	       get_counter_val($clear{tx_bytes},   $stats{tx_bytes})
+	    );
+    }
+}
+
 sub run_clear_intf {
     my @intfs = @_;
 
diff --git a/templates/show/interfaces/counters/node.def b/templates/show/interfaces/counters/node.def
new file mode 100644
index 0000000..1cef3ee
--- /dev/null
+++ b/templates/show/interfaces/counters/node.def
@@ -0,0 +1,2 @@
+help: Show network interface counters
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --action=show-count
diff --git a/templates/show/tcp/all/node.def b/templates/show/system/connections/tcp/all/node.def
index 6aa1cae..6aa1cae 100644
--- a/templates/show/tcp/all/node.def
+++ b/templates/show/system/connections/tcp/all/node.def
diff --git a/templates/show/tcp/node.def b/templates/show/system/connections/tcp/node.def
index 8b6c99b..8b6c99b 100644
--- a/templates/show/tcp/node.def
+++ b/templates/show/system/connections/tcp/node.def
diff --git a/templates/show/tcp/numeric/node.def b/templates/show/system/connections/tcp/numeric/node.def
index 7df9efe..7df9efe 100644
--- a/templates/show/tcp/numeric/node.def
+++ b/templates/show/system/connections/tcp/numeric/node.def
diff --git a/templates/show/udp/node.def b/templates/show/system/connections/udp/node.def
index ef9e55f..ef9e55f 100644
--- a/templates/show/udp/node.def
+++ b/templates/show/system/connections/udp/node.def
diff --git a/templates/show/udp/numeric/node.def b/templates/show/system/connections/udp/numeric/node.def
index cb43a91..cb43a91 100644
--- a/templates/show/udp/numeric/node.def
+++ b/templates/show/system/connections/udp/numeric/node.def