laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/34452?usp=email )

Change subject: dahdi: Log context (e1inpt_ts name) when opening timeslot devices ......................................................................

dahdi: Log context (e1inpt_ts name) when opening timeslot devices

This will provide us more context about what was attempted to open at the time we print an error message. Also, log a debug message in the successful case.

Change-Id: Iaebe83e608a618264c42d57584089e92847d2448 --- M src/input/dahdi.c 1 file changed, 23 insertions(+), 6 deletions(-)

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

diff --git a/src/input/dahdi.c b/src/input/dahdi.c index 7838866..adae121 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -594,18 +594,21 @@ return 0; }

-static int dahdi_open_slot(int dahdi_chan_nr) +static int dahdi_open_slot(const struct e1inp_ts *e1i_ts, int dahdi_chan_nr) { int rc, fd; + char name[32]; #ifndef DAHDI_SPECIFY char openstr[128]; snprintf(openstr, sizeof(openstr), "/dev/dahdi/%d", dev_nr); #else const char *openstr = "/dev/dahdi/channel"; #endif + e1inp_ts_name(name, sizeof(name), e1i_ts); + rc = open(openstr, O_RDWR | O_NONBLOCK); if (rc < 0) { - LOGP(DLINP, LOGL_ERROR, "DAHDI: could not open %s %s\n", openstr, strerror(errno)); + LOGP(DLINP, LOGL_ERROR, "%s: DAHDI: could not open %s %s\n", name, openstr, strerror(errno)); return -EIO; } fd = rc; @@ -613,11 +616,12 @@ rc = ioctl(fd, DAHDI_SPECIFY, &dahdi_chan_nr); if (rc < 0) { close(fd); - LOGP(DLINP, LOGL_ERROR, "DAHDI: could not DAHDI_SPECIFY %d: %s\n", + LOGP(DLINP, LOGL_ERROR, "%s: DAHDI: could not DAHDI_SPECIFY %d: %s\n", name, dahdi_chan_nr, strerror(errno)); return -EIO; } #endif + LOGP(DLINP, LOGL_DEBUG, "%s: DAHDI: opened dahdi_chan_nr=%d\n", name, dahdi_chan_nr); return fd; }

@@ -668,7 +672,7 @@ break; case E1INP_TS_TYPE_SIGN: if (!bfd->fd) - bfd->fd = dahdi_open_slot(dev_nr); + bfd->fd = dahdi_open_slot(e1i_ts, dev_nr); if (bfd->fd < 0) return -EIO; bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT; @@ -686,7 +690,7 @@ break; case E1INP_TS_TYPE_HDLC: if (!bfd->fd) - bfd->fd = dahdi_open_slot(dev_nr); + bfd->fd = dahdi_open_slot(e1i_ts, dev_nr); if (bfd->fd < 0) return -EIO; bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT; @@ -703,7 +707,7 @@ e1i_ts->lapd = NULL; } if (!bfd->fd) - bfd->fd = dahdi_open_slot(dev_nr); + bfd->fd = dahdi_open_slot(e1i_ts, dev_nr); if (bfd->fd < 0) return -EIO; ret = dahdi_set_bufinfo(bfd->fd, 0);