Merge pull request #9 from farsightsec/release/3.0.2

Release 3.0.2
farsightsec · Dec 8, 2023 · de8103e · de8103e
2 parents 1d493fa + b487759
commit de8103e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -82,7 +82,7 @@ DISTCLEANFILES += $(man_MANS)
 #
 
 LIBAXA_CURRENT=3
-LIBAXA_REVISION=0
+LIBAXA_REVISION=1
 LIBAXA_AGE=0
 
 nobase_include_HEADERS = \
@@ -159,6 +159,7 @@ axa_libaxa_la_LDFLAGS = $(AM_LDFLAGS) \
 	${libnmsg_LIBS} \
 	${strlcpy_LIBS} \
 	${yajl_LIBS}
+
 axa_libaxa_la_CFLAGS = \
 	${AM_CFLAGS} \
 	${libssl_CFLAGS} \
@@ -191,6 +192,7 @@ sratool_sratool_SOURCES = \
 	sratool/print.c \
 	sratool/time.c \
 	sratool/sratool.h
+
 sratool_sratool_LDADD = \
 	axa/libaxa.la \
 	${libssl_LIBS} \
@@ -228,6 +230,7 @@ sratunnel_sratunnel_SOURCES = \
 	sratunnel/server.c \
 	sratunnel/signal.c \
 	sratunnel/sratunnel.h
+
 sratunnel_sratunnel_LDADD = \
 	axa/libaxa.la \
 	${libnmsg_LIBS} \

diff --git a/axalib/socket.c b/axalib/socket.c
@@ -1,6 +1,7 @@
 /*
  * Socket utilities
  *
+ *  Copyright (c) 2023 DomainTools LLC
  *  Copyright (c) 2014-2018 by Farsight Security, Inc.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -388,7 +389,13 @@ axa_get_srvr(axa_emsg_t *emsg, const char *addr_port,
 	return (true);
 }
 
-/* Set socket or other communications file descriptor options */
+/*
+ * Set socket or other communications file descriptor options.
+ *
+ * WARNING: It is strongly recommended that callers pass only a value of zero
+ * for req_bufsize and defer to the wisdom of the kernel, rather than risk
+ * inadvertently clamping auto-sizing and hurting performance.
+  */
 bool					/* false=emsg has an error message */
 axa_set_sock(axa_emsg_t *emsg, int s, const char *label,
 	     int req_bufsize, bool nonblock)

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.60)
 
 m4_define(axa_major_version, 3)
 m4_define(axa_minor_version, 0)
-m4_define(axa_patchlevel_version, 1)
+m4_define(axa_patchlevel_version, 2)
 m4_define(axa_version,
           axa_major_version.axa_minor_version.axa_patchlevel_version)
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+axa (3.0.2-1) debian-fsi; urgency=medium
+
+  * Remove default explicit setting of socket snd/rcv buffers resulting in network performance degradation.
+  * Fix MacOS compilation on Apple silicon using brew
+
+ -- Farsight Security, Inc. <software@farsightsecurity.com>  Mon, 04 Dec 2023 15:30:32 -0500
+
 axa (3.0.1-1) debian-fsi; urgency=medium
 
   * Miscellaneous updates to README and manpages.

diff --git a/sratool/cmd.c b/sratool/cmd.c
@@ -1,7 +1,7 @@
 /*
  * SIE Remote Access (SRA) ASCII tool
  *
- *  Copyright (c) 2022 DomainTools LLC
+ *  Copyright (c) 2022-2023 DomainTools LLC
  *  Copyright (c) 2014-2018,2021 by Farsight Security, Inc.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -1126,8 +1126,7 @@ connect_cmd(axa_tag_t tag AXA_UNUSED, const char *arg0,
 		disconnect(false);
 
 	axa_client_backoff_reset(&client);
-	switch (axa_client_open(&emsg, &client, arg, mode == RAD,
-				256*1024, true)) {
+	switch (axa_client_open(&emsg, &client, arg, mode == RAD, 0, true)) {
 	case AXA_CONNECT_ERR:
 	case AXA_CONNECT_TEMP:
 		error_msg("%s", emsg.c);

diff --git a/sratunnel/server.c b/sratunnel/server.c
@@ -1,6 +1,7 @@
 /*
  * Tunnel SIE data from an SRA or RAD server.
  *
+ *  Copyright (c) 2023 DomainTools LLC
  *  Copyright (c) 2014-2018,2021 by Farsight Security, Inc.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -230,7 +231,7 @@ srvr_connect(void)
 	if (axa_debug != 0)
 		axa_trace_msg("connecting to %s", srvr_addr);
 	switch (axa_client_open(&emsg, &client, srvr_addr, mode == RAD,
-				256*1024, false)) {
+				0, false)) {
 	case AXA_CONNECT_ERR:
 		if (axa_debug != 0 || first_time)
 			axa_error_msg("%s", emsg.c);