more cccluster changes, new bands.pl

Also change max user range in mrtg.pl from 500 to 1800.

diff --git a/Changes b/Changes
index 51cac450e96f1b59545cc49c774aad26033174fe..3c52892dce9bddb7f5c8cdbd24fa3c1f5a5357be 100644 (file)
--- a/Changes
+++ b/Changes
@@ -4,6 +4,8 @@
    node is either currently known as a node (probably automagickly marked as
    dxspider previously by receiving PC92 K record) or doing it explicitly
    with a 'set/ccluster' command. 
+3. New bands.pl courtesy of Keith G6NHU.
+4. Increased max users to 1800 as requested by Keith as well. 
 27Jan25======================================================================
 1. Make SURE that spot dupe checks do not add yet more dupe (dupe) records
    to the dupe file. 

diff --git a/cmd/mrtg.pl b/cmd/mrtg.pl
index f60e06655ba950e577fa16e995ece4ba67814ea8..323709f9221bcd2e80d28f7d77f0ddc855b633d6 100644 (file)
--- a/cmd/mrtg.pl
+++ b/cmd/mrtg.pl
@@ -89,7 +89,7 @@ sub do_it
        my $users = DXChannel::get_all_users();
        my $nodes = DXChannel::get_all_nodes();
 
-       $mc->cfgprint('users', [qw(unknaszero gauge integer)], 500, 
+       $mc->cfgprint('users', [qw(unknaszero gauge integer)], 1800, 
                                  "<font color=#00cc00>Users</font> and <font color=#0000ff>Nodes</font> on $main::mycall",
                                  'Users / Nodes', 'Users', 'Nodes') unless $want{dataonly};
        $mc->data('users', $users, $nodes, 'Users / Nodes') unless $want{cfgonly};

diff --git a/data/bands.pl b/data/bands.pl
index 0b73cf2a1d6eaaba8ad56a10495bb00efd989980..acdc335d71cbc82a1d4d62c48baadd39a75bac27 100644 (file)
--- a/data/bands.pl
+++ b/data/bands.pl
@@ -37,6 +37,7 @@
                                                          cw => [ 1800, 1840 ],
                                                          rtty => [ 1838, 1841 ],
                                                          data => [ 1838, 1843],
+                                                         ft8 => [ 1840, 1843],
                                                          ssb => [ 1831, 2000]
                                                    }, 'Bands'),
 
@@ -45,6 +46,8 @@
                                                         data => [ 3570, 3619 ],
                                                         rtty => [ 3580, 3619 ],
                                                         sstv => [ 3730, 3740 ],
+                                                        ft8 => [ 3573, 3576 ],
+                                                        ft4 => [ 3575, 3578 ],
                                                         ssb => [ 3601, 4000 ]
                                                   }, 'Bands'),
 
@@ -62,12 +65,16 @@
                                                         cw => [ 7000, 7040 ],
                                                         data => [ 7040, 7100],
                                                         rtty => [ 7040, 7060],
-                                                        ssb => [ 7050, 7300 ]
+                                                        ft8 => [ 7074, 7077 ],
+                                                        ft4 => [ 7047, 7051 ],
+                                                        ssb => [ 7080, 7300 ]
                                                   }, 'Bands'),
 
                   '30m' => bless( { band => [ 10100, 10150 ],
-                                                        cw => [ 10000, 10140 ],
-                                                        data => [ 10141, 10149 ] ,
+                                                        cw => [ 10100, 10130 ],
+                                                        data => [ 10141, 10149, 10131, 10134, 10140, 10143 ] ,
+                                                        ft8 => [ 10131, 10134 ],
+                                                        ft4 => [ 10140, 10143 ],
                                                         rtty => [ 10141, 10149 ]
                                                   }, 'Bands'),
 
@@ -77,6 +84,8 @@
 # Modify range
                                                         beacon => [ 14099, 14101 ],
                                                         sstv => [ 14225, 14235 ],
+                                                                     ft8 => [ 14074, 14077 ],
+                                                        ft4 => [ 14080, 14083 ],
                                                         data => [ 14070, 14098, 14101, 14111 ],
                                                         rtty => [ 14070, 14098, 14101, 14111 ]
                                                   }, 'Bands'),
@@ -84,7 +93,9 @@
                   '17m' => bless( { band => [ 18068, 18168 ],
                                                         cw => [ 18068, 18100 ],
                                                         ssb => [ 18111, 18168 ],
-                                                        data => [ 18101, 18108],
+                                                        data => [ 18100, 18108],
+                                                                     ft8 => [ 18100, 18103 ],
+                                                        ft4 => [ 18104, 18107 ],
                                                         rtty => [ 18101, 18108],
 # Modify range
                                                         beacon => [ 18109, 18111]
@@ -92,8 +103,10 @@
 
                   '15m' => bless( { band => [ 21000, 21450 ],
                                                         cw => [ 21000, 21150 ],
-                                                        data => [ 21070, 21119 ],
+                                                        data => [ 21070, 21119, 21140, 21143 ],
                                                         rtty => [ 21070, 21119 ],
+                                                        ft8 => [ 21074, 21077 ],
+                                                        ft4 => [ 21140, 21143 ],
                                                         ssb => [ 21151, 21450],
 # Add Beacon
                                                                                                                beacon => [ 21149, 21151]
@@ -103,17 +116,21 @@
                                                         cw => [ 24890, 24930 ],
                                                         ssb => [ 24931, 24990],
                                                         rtty => [ 24920, 24929],
-                                                        data => [ 24920, 24929],
+                                                        data => [ 24920, 24929, 24915, 24918 ],
+                                                        ft8 => [ 24915, 24918 ],
+                                                        ft4 => [ 24919, 24922 ],
 # Add Beacon
                                                                                                                beacon => [ 24929, 24931 ]
                                                   }, 'Bands'),
 
                   '10m' => bless( { band => [ 28000, 29700 ],
                                                         cw => [ 28000, 28198 ],
-                                                        data => [ 28050, 28149, 29200, 29299 ],
+                                                        data => [ 28050, 28149, 29200, 29299, 28180, 28183 ],
                                                         rtty => [ 28050, 28149 ],
                                                         space => [ 29200, 29300 ],
                                                         ssb => [ 28201, 29299, 29550, 29700],
+                                                        ft8 => [ 28074, 28077 ],
+                                                        ft4 => [ 28180, 28183 ],
 # Add Beacon
                                                                                                                beacon => [ 28190, 28225, 28225, 28300 ]
                                                   }, 'Bands'),
@@ -125,6 +142,8 @@
                                                    cw => [50000, 50100],
                                                    ssb => [50100, 50400],
                                                    data => [50300, 50500],
+                                                   ft8 => [ 50313, 50316 ],
+                                                   ft4 => [ 50318, 50321 ],
 # Add Beacon
                                                                                                   beacon => [ 50000, 50100, 50400, 50500 ]
                                                  }, 'Bands'),
@@ -163,7 +182,7 @@
 
                   '23cm' => bless( { band => [ 1240000, 1300000],
                                                    }, 'Bands'),
-                                                                                                  
+
                   '13cm' => bless( { band => [2300000, 2450000],
                                                    }, 'Bands'),
 
@@ -251,38 +270,38 @@
                                                           }, 'Bands'),
                    hf => bless ( { band => [1800, 29999], }, 'Bands'),
                    vhf => bless ( { band => [30000, 299999], }, 'Bands'),
-                                  
+
 # Bands according to IEEE standard:
 
                   'lband' => bless ( { band => [1000000, 2000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'sband' => bless ( { band => [2000000, 4000000],
-                                                          }, 'Bands'),                            
-                                
+                                                          }, 'Bands'),
+
                      'cband' => bless ( { band => [4000000, 8000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'xband' => bless ( { band => [8000000, 12000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'kuband' => bless ( { band => [12000000, 18000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'kband' => bless ( { band => [18000000, 27000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'kaband' => bless ( { band => [27000000, 40000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'vband' => bless ( { band => [40000000, 75000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'wband' => bless ( { band => [75000000, 110000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
 
                   'gband' => bless ( { band => [110000000, 3000000000],
-                                                          }, 'Bands'),                            
+                                                          }, 'Bands'),
                  );
 
 #
@@ -314,7 +333,7 @@ $bands{'76g'} = $bands{'4mm'};
                         vhfradio => [qw( band1 band2 )],
                         vhftv => [qw( band1 band3 )],
 
-# Add 13cm Band                                
+# Add 13cm Band
                         uhf => [qw( 70cm 902 23cm 13cm )],
                         uhftv => [qw( band4 band5 )],
 
@@ -331,4 +350,3 @@ $bands{'76g'} = $bands{'4mm'};
                                                dsn => [qw( 23cm 9cm 6cm 3cm 24g 47g 76g 121g 134g 241g )],
                         all => [qw( 73khz 136khz 630m 160m 80m 60m 40m 30m 20m 17m 15m 12m 10m 8m 6m 5m 4m 2m 220 70cm 902 23cm 9cm 6cm 3cm 24g 47g 76g 121g 134g 241g )],
                    );
-

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 5998d393e439033aeb860b127f3d861685a63443..ae6e7f863a23e2a06d11c4f740aeeb599e12d1f1 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -950,10 +950,10 @@ sub handle_18
                if ($self->is_ccluster) {
                        my @rout = $parent->del_nodes;
                        $self->route_pc21($origin, $line, @rout, $parent) if @rout;
-                       $self->send_local_config();
+#                      $self->send_local_config();
                        $self->state('normal');
                        $self->{lastping} = 0;
-                       $self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
+#                      $self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
                } else {
                        dbg("PC18 on startup an incoming connection from $self->{call} ignored as iappropriate");
                        return;
@@ -977,7 +977,7 @@ sub handle_18
                if ($self->is_ccluster) {
                        $self->state('normal');
                        $self->{lastping} = 0;
-                       $self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
+#                      $self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call}));
                } else {
                        dbg("PC18 on startup an incoming connection from $self->{call} ignored as iappropriate");
                        return;