Change in libosmo-abis[master]: ipaccess: Fix log error printed on wrong conditional branch

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/21281 )

Change subject: ipaccess: Fix log error printed on wrong conditional branch
......................................................................

ipaccess: Fix log error printed on wrong conditional branch

The signal link is set if fd is established (see osmo_fd_setup in
ipaccess.c).

This log message was introduced in 466c5467e2e95c04260cb6b933181a38d1d97bd5,
where the lifecycle worked a bit different than nowadays:
line->ops->sign_link_down() was called before the log line, so the code
expected by that time that the socket should have been freed by
sign_link_down(). That's no longer the case. In ipaccess_drop, we force
dropping so we release lower layers and then signal upper layers. Hence,
the log lines are misleading nowadays.

Change-Id: Ibc6554e6cacc9c71232238b4e6a17d749dfdd30a
---
M src/input/ipaccess.c
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved



diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 593f9f0..48a427c 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -88,8 +88,7 @@
 
 	/* Error case: we did not see any ID_RESP yet for this socket. */
 	if (bfd->fd != -1) {
-		LOGP(DLINP, LOGL_ERROR, "Forcing socket shutdown with "
-					"no signal link set\n");
+		LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "Forcing socket shutdown\n");
 		osmo_fd_unregister(bfd);
 		close(bfd->fd);
 		bfd->fd = -1;
@@ -101,6 +100,9 @@
 		e1inp_line_put2(line, "ipa_bfd");
 
 		ret = -ENOENT;
+	} else {
+		LOGPITS(e1i_ts, DLINP, LOGL_ERROR,
+			"Forcing socket shutdown with no signal link set\n");
 	}
 
 	msgb_free(e1i_ts->pending_msg);

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/21281
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: Ibc6554e6cacc9c71232238b4e6a17d749dfdd30a
Gerrit-Change-Number: 21281
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201125/dcd38a67/attachment.htm>