Change in libosmo-abis[master]: ipaccess_rcvmsg: Fix bug introduced in previous commit

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Thu Aug 23 12:48:09 UTC 2018


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10574 )

Change subject: ipaccess_rcvmsg: Fix bug introduced in previous commit
......................................................................

ipaccess_rcvmsg: Fix bug introduced in previous commit

Commit 56ae85fd524d5c9e8b61ccb19e81b16fbc726bb0 modified code in
ipaccess_rcvmsg to use osmo_fd_setup. During this change, a "|="
operator was converted to "=". Fix this change by manually ORing old and
new values passed to osmo_fd_setup.

Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76
---
M src/input/ipaccess.c
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  Pau Espin Pedrol: Looks good to me, approved



diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 6f41c97..ac61e14 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -190,7 +190,7 @@
 
 			/* get rid of our old temporary bfd */
 			/* preserve 'newbfd->when' flags potentially set by sign_link_up() */
-			osmo_fd_setup(newbfd, bfd->fd, bfd->when, bfd->cb,
+			osmo_fd_setup(newbfd, bfd->fd, newbfd->when | bfd->when, bfd->cb,
 				      bfd->data, E1INP_SIGN_RSL + unit_data.trx_id);
 			osmo_fd_unregister(bfd);
 			bfd->fd = -1;

-- 
To view, visit https://gerrit.osmocom.org/10574
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie59072f07ca50d853c413fa038e447dcdee30a76
Gerrit-Change-Number: 10574
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180823/d0196955/attachment.htm>


More information about the gerrit-log mailing list