*** empty log message ***

Author: Chad Trabant

ChangeLog

@@ -1,4 +1,4 @@
-2010.069: version 4.2
+2010.075: version 4.2
 	- Update libslink to 2.3 with batch mode support.
 	- Add support for batch mode, patch by Andres Heinloo/GFZ.
 

libslink/ChangeLog

@@ -1,6 +1,8 @@
-2010.069: version 2.3
+2010.075: version 2.3
 	- Add BATCH mode support, patch from Andres Heinloo/GFZ.
+	- Add protocol version check for BATCH command >= 3.1.
 	- Increase header search length and hostname resolution buffer (GFZ).
+	- Set protocol version to 3.1.
 
 2009.318: version 2.2c
 	- Add proper string limit for snprintf() call in sl_msr_print().

libslink/Makefile

@@ -12,8 +12,8 @@ LIB_OBJS = gswap.o unpack.o msrecord.o genutils.o strutils.o \
            logging.o network.o statefile.o config.o \
            globmatch.o slplatform.o slutils.o
 
-CURRENT_VER = 1.1
-COMPAT_VER = 1.0
+CURRENT_VER = 2.3
+COMPAT_VER = 2.0
 
 LIB_A = libslink.a
 LIB_SO = libslink.so.$(CURRENT_VER)

libslink/libslink.h

@@ -33,7 +33,7 @@ extern "C" {
 #include "slplatform.h"
 
 #define LIBSLINK_VERSION "2.3"
-#define LIBSLINK_RELEASE "2010.069"
+#define LIBSLINK_RELEASE "2010.075"
 
 #define SLRECSIZE           512      /* Mini-SEED record size */
 #define MAX_HEADER_SIZE     512      /* Max record header size */

libslink/network.c

@@ -11,7 +11,7 @@
  * Originally based on the SeedLink interface of the modified Comserv in
  * SeisComP written by Andres Heinloo
  *
- * Version: 2010.069
+ * Version: 2010.075
  ***************************************************************************/
 
 #include <stdio.h>
@@ -938,13 +938,13 @@ sl_sayhello (SLCD * slconn)
       char *extreply = 0;
 
       /* Current capabilities:
-       *   SLPROTO:3.0 = SeedLink protocol version 3.0
+       *   SLPROTO:3.1 = SeedLink protocol version
        *   CAP         = CAPABILITIES command support
        *   EXTREPLY    = Extended reply message handling
        *   NSWILDCARD  = Network and station code wildcard support
        *   BATCH       = BATCH command mode support
        */
-      sprintf (sendstr, "CAPABILITIES SLPROTO:3.0 CAP EXTREPLY NSWILDCARD BATCH\r");
+      sprintf (sendstr, "CAPABILITIES SLPROTO:3.1 CAP EXTREPLY NSWILDCARD BATCH\r");
 
       /* Send CAPABILITIES and recv response */
       sl_log_r (slconn, 1, 2, "[%s] sending: %s\n", slconn->sladdr, sendstr);
@@ -995,22 +995,33 @@ sl_sayhello (SLCD * slconn)
 /***************************************************************************
  * sl_batchmode:
  *
- * Send the BATCH command
+ * Send the BATCH command to switch the connection to batch command
+ * mode, in this mode the server will not send acknowledgments (OK or
+ * ERROR) after recognized commands are submitted.
  *
  * Returns -1 on errors, 0 on success (regardless if the command was accepted).
  * Sets slconn->batchmode accordingly.
  ***************************************************************************/
 int
 sl_batchmode (SLCD * slconn)
 {
-  /* Enter batchmode if supported by server */
-  char sendstr[100];		/* A buffer for command strings */
-  char readbuf[100];
+  char sendstr[100];    /* A buffer for command strings */
+  char readbuf[100];    /* A buffer for server reply */
   int bytesread = 0;
 
-  sprintf (sendstr, "BATCH\r");
+  if ( ! slconn )
+    return -1;
+  
+  if (sl_checkversion (slconn, 3.1) < 0)
+    {
+      sl_log_r (slconn, 2, 0,
+		"[%s] detected SeedLink version (%.3f) does not support the BATCH command\n",
+		slconn->sladdr, slconn->protocol_ver);
+      return -1;
+    }
 
   /* Send BATCH and recv response */
+  sprintf (sendstr, "BATCH\r");
   sl_log_r (slconn, 1, 2, "[%s] sending: %s\n", slconn->sladdr, sendstr);
   bytesread = sl_senddata (slconn, (void *) sendstr, strlen (sendstr), slconn->sladdr,
 			   readbuf, sizeof (readbuf));

libslink/slutils.c

@@ -5,7 +5,7 @@
  *
  * Written by Chad Trabant, ORFEUS/EC-Project MEREDIAN
  *
- * modified: 2007.169
+ * modified: 2010.075
  ***************************************************************************/
 
 #include <stdlib.h>
@@ -765,7 +765,7 @@ update_stream (SLCD * slconn, SLpacket * slpack)
 
   if ( (seqnum = sl_sequence (slpack)) == -1 )
     {
-      sl_log_r (slconn, 2, 0, "update_stream(): could not determine sequence number\b");
+      sl_log_r (slconn, 2, 0, "update_stream(): could not determine sequence number\n");
       return -1;
     }