diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-08-23 14:35:08 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-08-23 14:36:51 +0200 |
| commit | 67902bbeb973b9da8a390bb5aacb3dba7ece1e15 (patch) | |
| tree | 42bfbf18077dbacfd3808c4e534ae929bf20b6d8 | |
| parent | 56ae85fd524d5c9e8b61ccb19e81b16fbc726bb0 (diff) | |
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
| -rw-r--r-- | src/input/ipaccess.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ static int ipaccess_rcvmsg(struct e1inp_line *line, struct msgb *msg, /* 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; |