Merge pull request #11 from ahaitoute/helium

Bug #195: Added feature to send log message to remote syslog server over UDP or TCP.

2 files changed, 16 insertions, 1 deletions

diff --git a/scripts/snmp/vyatta-snmp.pl b/scripts/snmp/vyatta-snmp.pl
index 09ed84b8..7d00be97 100755
--- a/scripts/snmp/vyatta-snmp.pl
+++ b/scripts/snmp/vyatta-snmp.pl
@@ -215,6 +215,12 @@ sub snmp_get_values {
 	print_community($config, $community);
     }
 
+    $config->setLevel("service snmp smuxpeer");
+    my @smuxpeers = $config->returnValues();
+    foreach my $smuxpeer (@smuxpeers) {
+        print "smuxpeer $smuxpeer \n";
+    }
+
     $config->setLevel($snmp_level);
     my $contact = $config->returnValue("contact");
     if (defined $contact) {
diff --git a/scripts/system/vyatta_update_syslog.pl b/scripts/system/vyatta_update_syslog.pl
index 3421d61a..dd834c92 100755
--- a/scripts/system/vyatta_update_syslog.pl
+++ b/scripts/system/vyatta_update_syslog.pl
@@ -110,7 +110,16 @@ unless (%entries) {
 read_config( $config, 'console', $CONSOLE );
 
 foreach my $host ( $config->listNodes('host') ) {
-    read_config( $config, "host $host", '@'. $host );
+    my $host_protocol;
+    foreach my $facility ( $config->listNodes("host $host facility") ) {
+        my $protocol = $config->returnValue("host $host facility $facility protocol");
+        if ($protocol eq "tcp") {
+            $host_protocol = "@@";
+        } else {
+            $host_protocol = "@";
+        }
+        read_config( $config, "host $host", $host_protocol. $host );
+    }
 }
 
 foreach my $file ( $config->listNodes('file') ) {