From 9f38101205c21a4523228c9b41571d26f9adcaec Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Tue, 28 Mar 2017 15:58:09 +0100 Subject: [PATCH] set DXVar.pm defaults into console.pl as well as cluster.pl. Remove mention of the defaults in DXVars.pm.issue --- perl/DXVars.pm.issue | 39 ++++++++------------------------------- perl/cluster.pl | 22 ++++++++++++++-------- perl/console.pl | 3 +++ perl/rbn.pl | 4 ++-- 4 files changed, 27 insertions(+), 41 deletions(-) diff --git a/perl/DXVars.pm.issue b/perl/DXVars.pm.issue index b4058cf0..ed19470c 100644 --- a/perl/DXVars.pm.issue +++ b/perl/DXVars.pm.issue @@ -10,34 +10,28 @@ package main; # this really does need to change for your system!!!! # use CAPITAL LETTERS -$mycall = "GB7DJK"; +$mycall = "Q1QQQ-2"; # your name -$myname = "Dirk"; +$myname = "Fred"; # Your 'normal' callsign (in CAPTTAL LETTERS) -$myalias = "G1TLH"; +$myalias = "Q1QQQ"; # Your latitude (+)ve = North (-)ve = South in degrees and decimal degrees -$mylatitude = +52.68584579; +$mylatitude = +52.0; # Your Longtitude (+)ve = East, (-)ve = West in degrees and decimal degrees -$mylongitude = +0.94518260; +$mylongitude = +0.0; # Your locator (USE CAPITAL LETTERS) -$mylocator = "JO02LQ"; +$mylocator = "JO02AA"; # Your QTH (roughly) -$myqth = "East Dereham, Norfolk"; +$myqth = "SomeTown, SomeState"; # Your e-mail address -$myemail = "djk\@tobit.co.uk"; - -# Your BBS addr -$mybbsaddr = "G1TLH\@GB7TLH.#35.GBR.EU"; - -# the default language (the key used must match the one in the Messages file) -$lang = 'en'; +$myemail = "qqq@gmail.com"; # the country codes that my node is located in # @@ -48,23 +42,6 @@ $lang = 'en'; @my_cc = qw(); -# the tcp address of the cluster this can be an address of an ethernet port -# but this is more secure. For normal use this will be fine. -$clusteraddr = "localhost"; - -# the port number of the cluster (just leave this, unless it REALLY matters to you) -$clusterport = 27754; - -# your favorite way to say 'Yes' -$yes = 'Yes'; - -# your favorite way to say 'No' -$no = 'No'; - -# the interval between unsolicited prompts if not traffic -$user_interval = 11*60; - - # are we debugging ? @debug = qw(chan state msg cron connect); diff --git a/perl/cluster.pl b/perl/cluster.pl index 092a01e0..6495027b 100755 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@ -15,7 +15,20 @@ package main; require 5.10.1; use warnings; -use vars qw($root $is_win $systime $lockfn); +use vars qw($root $is_win $systime $lockfn @inqueue $starttime $lockfn @outstanding_connects + $zombies @listeners $lang $myalias @debug $userfn $clusteraddr + $clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting + $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart + $can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval + $broadcast_debug + ); + +$lang = 'en'; # default language +$clusteraddr = '127.0.0.1'; # cluster tcp host address - used for things like console.pl +$clusterport = 27754; # cluster tcp port +$yes = 'Yes'; # visual representation of yes +$no = 'No'; # ditto for no +$user_interval = 11*60; # the interval between unsolicited prompts if no traffic # make sure that modules are searched in the order local then perl BEGIN { @@ -140,13 +153,6 @@ use Web; use Local; -use vars qw(@inqueue $starttime $lockfn @outstanding_connects - $zombies @listeners $lang $myalias @debug $userfn $clusteraddr - $clusterport $mycall $decease $routeroot $me $reqreg $bumpexisting - $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart - $can_encode $maxconnect_user $maxconnect_node $idle_interval $log_flush_interval - $broadcast_debug - ); @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) diff --git a/perl/console.pl b/perl/console.pl index 854f3835..66361808 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -27,6 +27,9 @@ BEGIN { $is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows? } +$clusteraddr = '127.0.0.1'; +$clusterport = 27754; + use Mojo::IOLoop; use DXVars; diff --git a/perl/rbn.pl b/perl/rbn.pl index 773564c2..ee8f0ed3 100755 --- a/perl/rbn.pl +++ b/perl/rbn.pl @@ -93,8 +93,8 @@ while (<$sock>) { say "RAW,$_" if $wantraw; if (/call:/) { -print $sock "$mycall\r\n"; -say "ADMIN,call $mycall sent" if $dbg; + print $sock "$mycall\r\n"; + say "ADMIN,call $mycall sent" if $dbg; } my (undef, undef, $origin, $qrg, $call, $mode, $s, $m, $spd, $u, $sort, $t, $tx) = split /[:\s]+/; -- 2.43.0