dexter submitted this change.

View Change



5 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

Approvals: pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified
e1d: initialize file descriptor numbers to -1 on startup

The file descriptor numbers (bfd->fd) are not initialized, this means
they are set to 0 in the beginning. This technically also means that
the file descriptors point to STDIN, which is wrong. Let's use the
line_create callback of driver to initialize them to -1.

Change-Id: I2de8fccad56279748ed9cc035aebf4e2d3935172
Related: OS#5983
---
M src/input/e1d.c
1 file changed, 31 insertions(+), 0 deletions(-)

diff --git a/src/input/e1d.c b/src/input/e1d.c
index 01da96d..88b4548 100644
--- a/src/input/e1d.c
+++ b/src/input/e1d.c
@@ -519,10 +519,26 @@
return 0;
}

+static int e1d_line_create(struct e1inp_line *line)
+{
+ int ts;
+
+ for (ts = 1; ts < line->num_ts; ts++) {
+ unsigned int idx = ts - 1;
+ struct e1inp_ts *e1i_ts = &line->ts[idx];
+ struct osmo_fd *bfd = &e1i_ts->driver.e1d.fd;
+
+ bfd->fd = -1;
+ }
+
+ return 0;
+}
+
struct e1inp_driver e1d_driver = {
.name = "e1d",
.want_write = e1d_want_write,
.line_update = e1d_line_update,
+ .line_create = e1d_line_create,
};

int e1inp_e1d_init(void)

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

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I2de8fccad56279748ed9cc035aebf4e2d3935172
Gerrit-Change-Number: 32401
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: msuraev <msuraev@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged