From: dirk Date: Thu, 14 Jun 2007 22:03:30 +0000 (+0200) Subject: Merge /scm/spider into SIMPLEROUTE X-Git-Tag: 1.55~160^2~12^2~1 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;hp=-c;p=spider.git Merge /scm/spider into SIMPLEROUTE Conflicts: .gitignore Changes cmd/Aliases data/.gitignore filter/.gitignore msg/.gitignore perl/DXChannel.pm perl/DXProt.pm perl/DXSql/SQLite.pm perl/DXSql/mysql.pm perl/DXXml.pm perl/DXXml/Cmd.pm perl/DXXml/IM.pm perl/DXXml/Text.pm perl/Msg.pm perl/Route/Node.pm perl/Version.pm Fix merge into existing tree --- d7dbb7fe3680afb068ffc585b1f95690008a9a7d diff --combined Changes index 899cc366,b1cbb1c9..edf2bfe3 --- a/Changes +++ b/Changes @@@ -1,11 -1,38 +1,41 @@@ +13Jun06======================================================================= +1. start using git. +2. change all the version / build numbering. - 15Jan06======================================================================= + 14Jun07======================================================================= -1. prepare for git repository and moving of anon cvs repository to ++1. prepare for git repository and moving of anon cvs repository to + scm.tobit.co.uk. + 11Jun07======================================================================= + 1. Change the frequency normalisation for DX Spot dupe checks so that any + decimal part is thrown away (in other words: truncate the freq to integer khz) + 20May07======================================================================= + 1. add 1704 cty.dat + 08Apr07======================================================================= + 1. add CTY-1703 cty.dat + 2. alter the way the dupefile deletion is done. + 18Mar07======================================================================= + 1. change URL in show/425. + 04Mar07======================================================================= + 1. add CTY 1702 prefix data files + 22Feb07======================================================================= -1. add show/myfdx to Aliases. ++1. add show/myfdx to Aliases. + 15Feb07======================================================================= + 1. allow convkeps.pl to parse NORAD keps files. + 22Jan07======================================================================= + 1. disable default propagation of PC9x sentences -2. simplify PC17 handling ++2. simplify PC17 handling + 16Jan07======================================================================= + 1. back ported a change to PC16 handling so that a locally connected node's + info clears out and generally overrides any residual PC16 info gathered from + elsewhere. + 15Jan07======================================================================= 1. added CTY-1701 - 07Jan06======================================================================= + 07Jan07======================================================================= -1. use IO::Socket blocking where available and switch off or ignore all +1. use IO::Socket blocking where available and switch off or ignore all attempts to block. + 05Jan07======================================================================= + 1. increase default ephemeral deduping on PC15 to 6 minutes (from 2). + 23Nov06======================================================================= + 1. added wrapping to over length lines in console.pl. 03Nov06======================================================================= 1. add CTY-1609 changes 2. add back Geo::Taf code with submitted mods diff --combined perl/DXChannel.pm index e386d084,699e87a8..8ab5a6fb --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@@ -119,11 -119,9 +119,10 @@@ $count = 0 lastmsgpoll => '0,Last Msg Poll,atime', inscript => '9,In a script,yesno', handle_xml => '9,Handles XML,yesno', + do_pc9x => '9,Handles PC9x,yesno', inqueue => '9,Input Queue,parray', ); - # object destruction sub DESTROY { @@@ -468,7 -466,7 +467,7 @@@ sub disconnec my $user = $self->{user}; $user->close() if defined $user; - $self->{conn}->disconnect; + $self->{conn}->disconnect if $self->{conn}; $self->del(); } diff --combined perl/Version.pm index 92136f57,42a2c0f4..230b4a83 --- a/perl/Version.pm +++ b/perl/Version.pm @@@ -1,10 -1,15 +1,15 @@@ # - # $Id$ + # Version information for DXSpider + # + # DO NOT ALTER THIS FILE. It is generated automatically + # and will be overwritten # package main; use vars qw($version $build); - $version = "1.54"; - $build = 467; -$version = '1.53'; -$build = '10'; ++$version = '1.54'; ++$build = '3'; + + 1; diff --combined perl/cluster.pl index c517a231,37ace021..3c4548b6 --- a/perl/cluster.pl +++ b/perl/cluster.pl @@@ -114,16 -114,16 +114,16 @@@ use Local package main; use strict; -use vars qw(@inqueue $systime $version $starttime $lockfn @outstanding_connects +use vars qw(@inqueue $systime $starttime $lockfn @outstanding_connects $zombies $root @listeners $lang $myalias @debug $userfn $clusteraddr $clusterport $mycall $decease $is_win $routeroot $me $reqreg $bumpexisting - $allowdxby $dbh $dsn $dbuser $dbpass $do_xml + $allowdxby $dbh $dsn $dbuser $dbpass $do_xml $systime_days $systime_daystart ); @inqueue = (); # the main input queue, an array of hashes $systime = 0; # the time now (in seconds) $starttime = 0; # the starting time of the cluster - #@outstanding_connects = (); # list of outstanding connects + @outstanding_connects = (); # list of outstanding connects @listeners = (); # list of listeners $reqreg = 0; # 1 = registration required, 2 = deregister people $bumpexisting = 1; # 1 = allow new connection to disconnect old, 0 - don't allow it @@@ -323,8 -323,6 +323,8 @@@ sub AGWrestar ############################################################# $starttime = $systime = time; +$systime_days = int ($systime / 86400); +$systime_daystart = $systime_days * 86400; $lang = 'en' unless $lang; unless ($DB::VERSION) { @@@ -452,8 -450,6 +452,8 @@@ DXProt->init() # put in a DXCluster node for us here so we can add users and take them away $routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf)); +$routeroot->do_pc9x(1); +$routeroot->via_pc92(1); # make sure that there is a routing OUTPUT node default file #unless (Filter::read_in('route', 'node_default', 0)) { @@@ -502,13 -498,7 +502,13 @@@ for (;;) # do timed stuff, ongoing processing happens one a second if ($timenow != $systime) { reap() if $zombies; - IsoTime::update($systime = $timenow); + $systime = $timenow; + my $days = int ($systime / 86400); + if ($systime_days != $days) { + $systime_days = $days; + $systime_daystart = $days * 86400; + } + IsoTime::update($systime); DXCron::process(); # do cron jobs DXCommandmode::process(); # process ongoing command mode stuff DXXml::process();