Merge remote-tracking branch 'sm0svx/master'

dl1hrc · Feb 4, 2025 · e2bd0d8 · e2bd0d8
2 parents 4f0a6b9 + f9bd8c6
commit e2bd0d8
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 18 deletions.
diff --git a/src/async/core/CMakeLists.txt b/src/async/core/CMakeLists.txt
@@ -27,7 +27,10 @@ foreach(incfile ${EXPINC})
   expinc(${incfile})
 endforeach(incfile)
 
-set(LIBS ${LIBS} -lcrypto -lssl)
+# Find OpenSSL
+#set(LIBS ${LIBS} -lcrypto -lssl)
+find_package(OpenSSL REQUIRED)
+set(LIBS ${LIBS} ${OPENSSL_LIBRARIES})
 
 # Find pthreads
 find_package(Threads)

diff --git a/src/doc/man/svxlink.conf.5 b/src/doc/man/svxlink.conf.5
@@ -2836,7 +2836,7 @@ changed according to local requirements. Please contact your local APRS sysop
 for further information. Changes should be made only according to the NEWn-N
 paradigm. Leave this variable untouched if you are unsure of its setting.
 No spaces or control characters are allowed. PATH has no influence on the
-propagation on non-RF networks.
+propagation on non-RF networks. Default is PATH=WIDE1-1.
 
 Examples:
 .br

diff --git a/src/locationinfo/AprsTcpClient.cpp b/src/locationinfo/AprsTcpClient.cpp
@@ -6,7 +6,7 @@
 
 \verbatim
 SvxLink - A Multi Purpose Voice Services System for Ham Radio Use
-Copyright (C) 2003-2008 Tobias Blomberg / SM0SVX
+Copyright (C) 2003-2025 Tobias Blomberg / SM0SVX
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -124,8 +124,6 @@ AprsTcpClient::AprsTcpClient(LocationInfo::Cfg &loc_cfg,
 {
    StrList str_list;
 
-   destination = "APRS";
-
    el_call = loc_cfg.mycall;  // the EchoLink callsign
    el_prefix = "E" + loc_cfg.prefix + "-"; // the EchoLink prefix ER- od EL-
 
@@ -189,12 +187,12 @@ void AprsTcpClient::updateQsoStatus(int action, const string& call,
     // APRS message
   char aprsmsg[256];
   sprintf(aprsmsg, "%s>%s,%s:;%s%-6.6s*111111z%s%s\r\n",
-          el_call.c_str(), destination.c_str(), loc_cfg.path.c_str(),
+          el_call.c_str(), loc_cfg.destination.c_str(), loc_cfg.path.c_str(),
           el_prefix.c_str(), el_call.c_str(), pos, msg);
   sendMsg(aprsmsg);
 
   // APRS status message, connected calls
-  string status = el_prefix + el_call+">"+destination+","+loc_cfg.path+":>";
+  string status = el_prefix + el_call+">"+loc_cfg.destination+","+loc_cfg.path+":>";
 
   list<string>::const_iterator it;
   for (it = call_list.begin(); it != call_list.end(); ++it)
@@ -270,7 +268,7 @@ void AprsTcpClient::sendAprsBeacon(Timer *t)
     // APRS message
   char aprsmsg[150 + loc_cfg.comment.length()];
   sprintf(aprsmsg, "%s>%s,%s:;%s%-6.6s*111111z%s%03d.%03dMHz %s R%02d%c %s\r\n",
-            el_call.c_str(), destination.c_str(), loc_cfg.path.c_str(),
+            el_call.c_str(), loc_cfg.destination.c_str(), loc_cfg.path.c_str(),
             el_prefix.c_str(), el_call.c_str(), pos, loc_cfg.frequency / 1000,
             loc_cfg.frequency % 1000, tone, loc_cfg.range,
             loc_cfg.range_unit, loc_cfg.comment.c_str());
@@ -283,7 +281,7 @@ void AprsTcpClient::sendAprsBeacon(Timer *t)
 
 void AprsTcpClient::sendMsg(const char *aprsmsg)
 {
-   //cout << aprsmsg << endl;
+  //std::cout << "### AprsTcpClient::sendMsg: aprsmsg=" << aprsmsg;
 
   if (!con->isConnected())
   {

diff --git a/src/locationinfo/AprsTcpClient.h b/src/locationinfo/AprsTcpClient.h
@@ -6,7 +6,7 @@
 
 \verbatim
 SvxLink - A Multi Purpose Voice Services System for Ham Radio Use
-Copyright (C) 2003-2009 Tobias Blomberg / SM0SVX
+Copyright (C) 2003-2025 Tobias Blomberg / SM0SVX
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -142,7 +142,6 @@ class AprsTcpClient : public AprsClient, public sigc::trackable
 
     std::string		el_call;
     std::string		el_prefix;
-    std::string		destination;
 
     void  sendMsg(const char *aprsmsg);
     void  posStr(char *pos);

diff --git a/src/locationinfo/AprsUdpClient.cpp b/src/locationinfo/AprsUdpClient.cpp
@@ -223,6 +223,7 @@ void AprsUdpClient::sendLocationInfo(Timer *t)
     char sdes_packet[256];
     int sdes_len = buildSdesPacket(sdes_packet);
 
+    std::cout << "### AprsUdpClient::sendLocationInfo" << std::endl;
     sock.write(ip_addr, port, sdes_packet, sdes_len);
   }
 } /* AprsUdpClient::sendLocationInfo */

diff --git a/src/locationinfo/LocationInfo.cpp b/src/locationinfo/LocationInfo.cpp
@@ -6,7 +6,7 @@
 
 \verbatim
 SvxLink - A Multi Purpose Voice Services System for Ham Radio Use
-Copyright (C) 2003-2015 Tobias Blomberg / SM0SVX
+Copyright (C) 2003-2025 Tobias Blomberg / SM0SVX
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -167,7 +167,13 @@ bool LocationInfo::initialize(const Async::Config &cfg, const std::string &cfg_n
   }
 
   LocationInfo::_instance->loc_cfg.mycall  = value;
-  LocationInfo::_instance->loc_cfg.comment = cfg.getValue(cfg_name, "COMMENT");
+  cfg.getValue(cfg_name, "COMMENT", LocationInfo::_instance->loc_cfg.comment);
+
+  unsigned dest_num = 1;
+  //cfg.getValue(cfg_name, "DESTINATION_NUM", 1U, 9U, dest_num);
+  std::stringstream dest_ss;
+  dest_ss << "APSVX" << hex << dest_num;
+  LocationInfo::_instance->loc_cfg.destination = dest_ss.str();
 
   init_ok &= LocationInfo::_instance->parsePosition(cfg, cfg_name);
   init_ok &= LocationInfo::_instance->parseStationHW(cfg, cfg_name);
@@ -468,7 +474,9 @@ bool LocationInfo::parseStationHW(const Async::Config &cfg, const string &name)
 bool LocationInfo::parsePath(const Async::Config &cfg, const string &name)
 {
     // FIXME: Verify the path syntax!
-  loc_cfg.path = cfg.getValue(name, "PATH");
+    //        http://www.aprs.org/newN/new-eu-paradigm.txt
+  loc_cfg.path = "WIDE1-1";
+  cfg.getValue(name, "PATH", loc_cfg.path);
   return true;
 } /* LocationInfo::parsePath */
 

diff --git a/src/locationinfo/LocationInfo.h b/src/locationinfo/LocationInfo.h
@@ -6,7 +6,7 @@
 
 \verbatim
 SvxLink - A Multi Purpose Voice Services System for Ham Radio Use
-Copyright (C) 2003-2015 Tobias Blomberg / SM0SVX
+Copyright (C) 2003-2025 Tobias Blomberg / SM0SVX
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -192,6 +192,7 @@ class LocationInfo
       std::string prefix;
       std::string path;
       std::string comment;
+      std::string destination;
     };
 
     static bool initialize(const Async::Config &cfg, const std::string &cfg_name);

diff --git a/src/svxlink/ChangeLog b/src/svxlink/ChangeLog
@@ -50,6 +50,9 @@
   The node will be blocked until it has been silent for the number of
   specified seconds.
 
+* APRS beacon and status packets changed destination to the SvxLink specific
+  one, "APSVX1".
+
 
 
  1.8.0 -- 25 Feb 2024

diff --git a/src/svxlink/svxlink/svxlink.conf.in b/src/svxlink/svxlink/svxlink.conf.in
@@ -347,8 +347,9 @@ APRS_SERVER_LIST=euro.aprs2.net:14580
 #ANTENNA_GAIN=6
 #ANTENNA_HEIGHT=20m
 #ANTENNA_DIR=-1
-PATH=WIDE1-1
-BEACON_INTERVAL=10
+#PATH=WIDE1-1
+#BEACON_INTERVAL=10
+#STATISTICS_INTERVAL=10
 #TONE=136
 COMMENT=SvxLink by SM0SVX (www.svxlink.org)
 
diff --git a/src/versions b/src/versions
@@ -11,7 +11,7 @@ LIBECHOLIB=1.3.4
 LIBASYNC=1.7.99.8
 
 # SvxLink versions
-SVXLINK=1.8.99.13
+SVXLINK=1.8.99.14
 MODULE_HELP=1.0.0
 MODULE_PARROT=1.1.1
 MODULE_ECHO_LINK=1.6.0