Merge branch 'release/jakarta' into build/jakarta/2020.330

Author: gempa-jabe

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Jakarta
 
+## Release 2020.330 patch2
+
+* seedlink
+
+  * Fixed data continuation bug with seedlink sources,
+    e.g. chain_plugin, slarchive, slinktool
+  * Add `composed_station_id` global setup parameter which can be used by
+    3rd-party plugins in their setup script to decide whether to composed
+    station ids or just the station code.
+
 ## Release 2020.330 patch1
 
 * cmake

src/seedlink/apps/3rd-party/slarchive/src/slarchive.c

@@ -102,6 +102,10 @@ int main (int argc, char **argv) {
 
 	/* Allocate and initialize a new connection description */
 	slconn = sl_newslcd();
+	if ( slconn ) {
+		// Change default from libslink >= 2.6
+		slconn->lastpkttime = 0;
+	}
 
 	/* Process given parameters (command line and parameter file) */
 	if ( parameter_proc (argc, argv) < 0 ) {

src/seedlink/apps/3rd-party/slinktool/src/slinktool.c

@@ -106,6 +106,9 @@ main (int argc, char **argv)
 
   /* Allocate and initialize a new connection description */
   slconn = sl_newslcd();
+  if ( slconn ) {
+    slconn->lastpkttime = 0;
+  }
 
   /* Process given parameters (command line and parameter file) */
   if ( parameter_proc (argc, argv) < 0 )

src/seedlink/apps/seedlink/config/seedlink.py

@@ -593,6 +593,9 @@ def updateConfig(self):
         self._set_default("connections_per_ip", "20", False)
         self._set_default("bytespersec", "0", False)
 
+        # This seedlink version expectes composed station ids: net.sta
+        self._set("composed_station_id", "true", False)
+
         ## Expand the @Variables@
         if hasSystem:
             e = seiscomp3.System.Environment.Instance()

src/seedlink/apps/utils/load_timetable.cc

@@ -282,6 +282,7 @@ int main(int argc, char **argv)
     slcd->netdly = 1;
     slcd->keepalive = 0;
     slcd->sladdr = address;
+    slcd->lastpkttime = 0;
 
     /* If no host is given for the SeedLink server, add 'localhost' */
     if(*slcd->sladdr == ':')

src/seedlink/plugins/chain_plugin/chain_plugin.cc

@@ -1028,6 +1028,7 @@ StationGroup::StationGroup(const string &address, bool multi_init, bool batch_in
     slcd->keepalive = keepalive;
     slcd->netto = netto;
     slcd->netdly = netdly;
+    slcd->lastpkttime = 0;
   }
 
 StationGroup::~StationGroup()