Merge pull request #21 from hollie/master

Master merge
hollie · Jul 5, 2020 · f334b1c · f334b1c
2 parents 754ddc7 + ec395d3
commit f334b1c
Show file tree

Hide file tree

Showing 917 changed files with 5,389 additions and 675 deletions.
diff --git a/bin/alpha_page b/bin/alpha_page
@@ -31,7 +31,7 @@ BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;

diff --git a/bin/get_earthquakes b/bin/get_earthquakes
@@ -55,7 +55,7 @@ eof
 }
 
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";
 }                                # Use BEGIN eval to keep perl2exe happy
 require 'handy_utilities.pl';    # For read_mh_opts funcion
 

diff --git a/bin/get_email b/bin/get_email
@@ -31,7 +31,7 @@ BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
     $Pgm_Root = "$Pgm_Path/..";
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 use Getopt::Long;

diff --git a/bin/get_tcp b/bin/get_tcp
@@ -0,0 +1,124 @@
+#!/usr/bin/env perl
+# -*- Perl -*-
+
+use strict;
+use IO::Socket;
+
+# Similar to get_url, open a socket and then get the data. Useful to spawn off as a process_item to avoid pauses
+
+my ( $Pgm_Path, $Pgm_Name );
+
+BEGIN {
+    ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
+    ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
+}
+
+my ( %config_parms, %parms );
+
+use Getopt::Long;
+
+if (
+    !&GetOptions( \%parms, 'h', 'help', 'quiet', 'timeout=s', 'rn')
+    or !@ARGV
+    or $parms{h}
+    or $parms{help}
+  )
+{
+
+    print <<eof;
+
+    $Pgm_Name similar to get_url, opens a socket to host and echos response to STDOUT or a local file.
+
+Usage:
+
+    $Pgm_Name [-quiet] host:post data [local_file]
+
+    -quiet: no output on stdout
+    -timeout: in seconds. Defaults is 3 seconds
+    -rn: send \r\n to the data
+    
+    If local_file is specified, data is stored there.
+    If local_file = /dev/null, data is not returned.
+    Otherwise, data is echoed to STDOUT.
+
+
+eof
+    exit;
+}
+
+my $timeout = 3;
+$timeout = $parms{timeout} if ($parms{timeout});
+
+my $location = shift;
+
+my ($host, $port) = $location =~ /^(\S+)(:\d+)/;
+
+$port =~ s/://g;
+
+my $data = shift;
+
+$data .= "\r\n" if ($parms{rn});
+
+unless ($host and $port and $data) {
+    print "get_tcp_error: missing parameters: ";
+    print "host " unless ($host);
+    print "port " unless ($port);
+    print "data " unless ($data);
+    print "\n";
+    exit;
+}
+
+
+# Get parms from mh.ini
+require 'handy_utilities.pl';
+&main::read_mh_opts( \%config_parms, $Pgm_Path );
+
+my $file = shift;
+my $response = "";
+my $error = 1;
+
+my $tcp = new IO::Socket::INET(
+PeerHost => $host,
+PeerPort => $port,
+Timeout  => $timeout,
+Proto => "tcp") or $response = "get_tcp_error: opening socket: $!.\n";
+#print "error $host:$port\n" if ($tcp->connected());
+
+unless ($response) {
+    $error = 0;
+    print "Sending data to $location " unless $parms{quiet}; 
+    print "into $file" unless ($parms{quiet} or !$file);
+    print "..." unless $parms{quiet};
+
+    $tcp->send($data) or $response = "get_tcp_error: Couldn't send: $!";
+
+    unless ($response) {
+        $tcp->recv($response, 1024);
+        print " data retrieved\n" unless $parms{quiet};
+    } else {
+        $error = 1;
+    }
+}
+    if ($file) {
+        #       print $data;
+        unless ( $file eq '/dev/null' ) {
+            if ($response) {
+                open( OUT, ">$file" )
+                  or die "get_tcp_error: could not open file '$file' for output: $!\n";
+                binmode OUT;
+                print OUT $response;
+                close OUT;
+            }
+            else {
+                print " empty data response\n";
+            }
+        }
+    } else {
+        print $response;
+    }
+
+
+$tcp->close() unless ($error);
+
+
diff --git a/bin/get_tv_grid b/bin/get_tv_grid
@@ -45,7 +45,7 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 require "RedirAgent.pm";

diff --git a/bin/get_tv_grid_ge b/bin/get_tv_grid_ge
@@ -40,7 +40,7 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 my %parms;
 use Getopt::Long;

diff --git a/bin/get_tv_grid_xmltv b/bin/get_tv_grid_xmltv
@@ -57,7 +57,7 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 use XMLTV::Version '$Id$ ';

diff --git a/bin/get_tv_info b/bin/get_tv_info
@@ -26,7 +26,7 @@ BEGIN {
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 my %parms;

diff --git a/bin/get_tv_info_ge b/bin/get_tv_info_ge
@@ -23,7 +23,7 @@ BEGIN {
 
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 my %parms;

diff --git a/bin/get_url b/bin/get_url
@@ -9,7 +9,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback' ";    # So perl2exe works
 }
 
 my ( %config_parms, %parms );
@@ -19,7 +19,7 @@ use Getopt::Long;
 #print "get_url: @ARGV\n";
 if (
     !&GetOptions( \%parms, 'h', 'help', 'quiet', 'cookies=s', 'cookie_file_in=s', 'cookie_file_out=s', 'post=s', 'header=s', 'userid=s', 'password=s', 'ua',
-        'put=s', 'json', 'response_code' )
+        'put=s', 'timeout=s', 'json', 'response_code' )
     or !@ARGV
     or $parms{h}
     or $parms{help}
@@ -32,7 +32,7 @@ if (
 
 Usage:
 
-    $Pgm_Name [-quiet] [-cookies 'cookiestr'] [-post 'poststr'] [-header header_file] url [local_file]
+    $Pgm_Name [-quiet] [-cookies 'cookiestr'] [-post 'poststr'] [-header header_file] [-timeout X] url [local_file]
 
     -quiet: no output on stdout
 
@@ -59,6 +59,7 @@ Usage:
     
     -response_code: STDOUT only: Prepend output with RESPONSECODE: <response code>\n
 
+    -timeout: XX : number of seconds to wait for command to complete
 
     If local_file is specified, data is stored there.
     If local_file = /dev/null, data is not returned.
@@ -113,6 +114,8 @@ sub use_ua {
       if $config_parms{proxy};
 
     $ua->timeout(30);                 # Time out after 30 seconds
+    $ua->timeout($parms{timeout} ) if $parms{timeout};
+
     $ua->env_proxy();
     $ua->agent( $config_parms{get_url_ua} ) if $config_parms{get_url_ua};
 

diff --git a/bin/get_weather b/bin/get_weather
@@ -81,9 +81,9 @@ $opt_v++ if $parms{v};    # Geo::Weather looks at this
 my $caller = caller;
 my $return_flag = ( $caller and $caller ne 'main' ) ? 1 : 0;
 
-#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
+#use my_lib "$Pgm_Path/../lib/site", "$Pgm_Path/../lib/fallback"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";
 }                         # Use BEGIN eval to keep perl2exe happy
 
 require 'handy_utilities.pl';    # For read_mh_opts funcion

diff --git a/bin/get_weather_ca b/bin/get_weather_ca
@@ -75,9 +75,9 @@ use vars qw(%Weather @Weather_Forecast);
 my $caller = caller;
 my $return_flag = ( $caller and $caller ne 'main' ) ? 1 : 0;
 
-#use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
+#use my_lib "$Pgm_Path/../lib/site", "$Pgm_Path/../lib/fallback"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";
 }    # Use BEGIN eval to keep perl2exe happy
 
 require 'handy_utilities.pl';    # For read_mh_opts funcion

diff --git a/bin/ical2vsdb b/bin/ical2vsdb
@@ -30,7 +30,7 @@ use strict;
 ##    Sometimes icals are unchanged, but the order is different when downloading. Add option to sort the ical to ensure
 ##    Data hasn't changed even if the order did. Added option sort_before_md5 = 1 to enable globally or to the specific ical
 
-use lib '../lib', '../lib/site';
+use lib '../lib', '../lib/site', '../lib/fallback';
 use iCal::Parser;
 use DateTime;
 use Digest::MD5 qw(md5 md5_hex);

diff --git a/bin/ical_load b/bin/ical_load
@@ -27,7 +27,7 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 use Getopt::Long;

diff --git a/bin/mh b/bin/mh
@@ -209,6 +209,10 @@ BEGIN {
         # Pick local mh modules first, over any site install ones
         unshift( @INC, "${Pgm_Path}/../lib", "${Pgm_Path}/../lib/site", '.' );
 
+	# Keep fallback versions of CPAN modules, in case they're not present on the system.  Place them last
+	# so the sysadmin can install more current versions in the normal Perl places if they wish.
+	push @INC,"${Pgm_Path}/../lib/fallback";
+
         #       my $pwd=cwd(); print "pwd=$pwd inc=@INC\n";
         #       push (@INC, './../lib', './../lib/site', '.');
         #       push (@INC, './../lib');
@@ -797,6 +801,10 @@ sub setup {
     }
     else {
         require 'json_server.pl';
+
+	# Actions on Google HTTP helper
+	require 'http_server_aog.pl';
+	http_server_aog_startup();
     }
 
     if ($OS_win) {
@@ -2685,8 +2693,14 @@ sub check_for_socket_data {
             $data = <$sock>;
         }
         else {
-            # 1500 is ethernet packet size
-            my $from_saddr = recv( $sock, $data, 1500, 0 );
+            # We used to read 1500 bytes here because that is the default
+	    # MTU for Ethernet. However, larger MTUs can be in use. In fact,
+	    # the MTU of the loopback interface is set in a modern Linux
+	    # distribution at 65535 bytes. Reading only 1500 can break
+	    # things when the traffic comes to the MisterHouse HTTP server
+	    # via the loopback interface and in packets larger than 1500
+	    # bytes.
+            my $from_saddr = recv( $sock, $data, 65535, 0 );
 
             # Store udp from_* data
             if (    $Socket_Ports{$port_name}{protocol}

diff --git a/bin/net_ftp b/bin/net_ftp
@@ -7,7 +7,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 my %parms;

diff --git a/bin/outlook_read b/bin/outlook_read
@@ -40,7 +40,7 @@ BEGIN {
     ($Version) = q$Revision$ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 use Getopt::Long;

diff --git a/bin/pocketsphinx b/bin/pocketsphinx
@@ -39,7 +39,7 @@ BEGIN {
     ($Version) = q$Revision: 1084 $ =~ /: (\S+)/;    # Note: revision number is auto-updated by cvs
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # So perl2exe works
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # So perl2exe works
 }
 
 use Getopt::Long;

diff --git a/bin/print_socket_fork_memmap.pl b/bin/print_socket_fork_memmap.pl
@@ -53,6 +53,7 @@ BEGIN
     }
     push @INC, './../lib/site';
     push @INC, './../lib';
+    push @INC, './../lib/fallback';
 }
 
 require "$Pgm_Path/../lib/handy_utilities.pl";

diff --git a/bin/read_email b/bin/read_email
@@ -7,7 +7,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 my %parms;

diff --git a/bin/report_weblog b/bin/report_weblog
@@ -32,7 +32,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.*)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";
 }
 
 my %parms;

diff --git a/bin/send_email b/bin/send_email
@@ -7,7 +7,7 @@ my ( $Pgm_Path, $Pgm_Name );
 BEGIN {
     ( $Pgm_Path, $Pgm_Name ) = $0 =~ /(.*)[\\\/](.+)\.?/;
     ($Pgm_Name) = $0 =~ /([^.]+)/, $Pgm_Path = '.' unless $Pgm_Name;
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";    # Use BEGIN eval to keep perl2exe happy
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";    # Use BEGIN eval to keep perl2exe happy
 }
 
 my %parms;

diff --git a/bin/set_clock b/bin/set_clock
@@ -89,7 +89,7 @@ print "Requesting the time from $parms{server} using $parms{method} method\n";
 #use my_lib "$Pgm_Path/../lib";      # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
 #use my_lib "$Pgm_Path/../lib/site"; # See note in lib/mh_perl2exe.pl for lib -> my_lib explaination
 BEGIN {
-    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site'";
+    eval "use lib '$Pgm_Path/../lib', '$Pgm_Path/../lib/site', '$Pgm_Path/../lib/fallback'";
 }    # Use BEGIN eval to keep perl2exe happy
 
 my $time_record;