laforge submitted this change.

View Change


Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved
[cosmetic] Don't break lines shorter than 120 chars

Change-Id: I0595ee899639d0eb798eb8d9372793db36f05b7a
---
M src/input/ipaccess.c
1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 41e8b89..04244a6 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -603,8 +603,7 @@
val = line->keepalive_idle_timeout > 0 ?
line->keepalive_idle_timeout :
DEFAULT_TCP_KEEPALIVE_IDLE_TIMEOUT;
- ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE,
- &val, sizeof(val));
+ ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val));
if (ret < 0) {
LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive idle time: %s\n",
strerror(errno));
@@ -612,8 +611,7 @@
val = line->keepalive_probe_interval > -1 ?
line->keepalive_probe_interval :
DEFAULT_TCP_KEEPALIVE_INTERVAL;
- ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL,
- &val, sizeof(val));
+ ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val));
if (ret < 0) {
LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP keepalive interval: %s\n",
strerror(errno));
@@ -621,15 +619,13 @@
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));
+ ret = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val));
if (ret < 0)
LOGPIL(line, DLINP, LOGL_ERROR, "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));
+ ret = setsockopt(fd, IPPROTO_TCP, TCP_USER_TIMEOUT, &val, sizeof(val));
if (ret < 0)
LOGPIL(line, DLINP, LOGL_ERROR, "Failed to set TCP user timeout: %s\n", strerror(errno));
}

To view, visit change 36039. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I0595ee899639d0eb798eb8d9372793db36f05b7a
Gerrit-Change-Number: 36039
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge@osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged