fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmo-abis/+/36281?usp=email )
Change subject: input/ipaccess: Make sure to say "TCP keepalive"
......................................................................
input/ipaccess: Make sure to say "TCP keepalive"
We have TCP and IPA keepalive. Reading a message like
"input/ipaccess.c:612 Keepalive is set: 0" is misleading, as one might
assume it relates to IPA.
Be explicit.
Related: SYS#6801, OS#6375
Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4
(cherry picked from commit 715653778c33e31980452de86029720735cdcf4a)
---
M src/input/ipaccess.c
1 file changed, 32 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/81/36281/1
diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index d63c0d2..acbeda1 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -606,10 +606,10 @@
val = 1;
ret = setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &val,
sizeof(val));
if (ret < 0)
- LOGP(DLINP, LOGL_ERROR, "Failed to set keepalive: %s\n",
+ LOGP(DLINP, LOGL_ERROR, "Failed to enable TCP
keepalive: %s\n",
strerror(errno));
else
- LOGP(DLINP, LOGL_NOTICE, "Keepalive is set: %i\n", ret);
+ LOGP(DLINP, LOGL_NOTICE, "TCP Keepalive is enabled\n");
/* The following options are not portable! */
val = line->keepalive_idle_timeout > 0 ?
@@ -617,37 +617,41 @@
DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT;
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE,
&val, sizeof(val));
- if (ret < 0)
+ if (ret < 0) {
LOGP(DLINP, LOGL_ERROR,
- "Failed to set keepalive idle time: %s\n",
+ "Failed to set TCP keepalive idle time: %s\n",
strerror(errno));
+ }
val = line->keepalive_probe_interval > -1 ?
line->keepalive_probe_interval :
DEFAULT_TCP_KEEPALIVE_INTERVAL;
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL,
&val, sizeof(val));
- if (ret < 0)
+ if (ret < 0) {
LOGP(DLINP, LOGL_ERROR,
- "Failed to set keepalive interval: %s\n",
+ "Failed to set TCP keepalive interval: %s\n",
strerror(errno));
+ }
val = line->keepalive_num_probes > 0 ?
line->keepalive_num_probes :
DEFAULT_TCP_KEEPALIVE_RETRY_COUNT;
ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT,
&val, sizeof(val));
- if (ret < 0)
+ if (ret < 0) {
LOGP(DLINP, LOGL_ERROR,
- "Failed to set keepalive count: %s\n",
+ "Failed to set TCP keepalive count: %s\n",
strerror(errno));
+ }
val = 1000 * line->keepalive_num_probes *
line->keepalive_probe_interval +
line->keepalive_idle_timeout;
ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT,
&val, sizeof(val));
- if (ret < 0)
+ if (ret < 0) {
LOGP(DLINP, LOGL_ERROR,
- "Failed to set user timoeut: %s\n",
+ "Failed to set TCP user timeout: %s\n",
strerror(errno));
+ }
}
val = 1;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/36281?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-abis
Gerrit-Branch: rel-1.5.2
Gerrit-Change-Id: I01cbda27eb7826eb11f44e034d746b7c39b399a4
Gerrit-Change-Number: 36281
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanits...@sysmocom.de>
Gerrit-CC: laforge <lafo...@osmocom.org>
Gerrit-MessageType: newchange
