<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/15996">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">dahdi: Use ioctl(DAHDI_SPECIFY) instead of legacy /dev/dahdi/%u<br><br>It appears that opening "/dev/dahdi/channel" and using<br>ioctl(DAHDI_SPECIFY) is possible at least since dahdi 2.4 (from 2010),<br>and opening "/dev/dahdi/%u" has been deprecated ever since. One<br>advantage of the new interface is that you can use channel numbers<br>larger than 250, which is quite easily possible if you have more than<br>eight E1 lines on a system. It also makes libosmo-abis work on systems<br>where there are no udev rules for creating the legacy device nodes.<br><br>Change-Id: Id6c8f27d7ae948b50e9cf5a38f039d782ff78e1d<br>---<br>M src/input/dahdi.c<br>1 file changed, 35 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/96/15996/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/dahdi.c b/src/input/dahdi.c</span><br><span>index 47276a7..6594eea 100644</span><br><span>--- a/src/input/dahdi.c</span><br><span>+++ b/src/input/dahdi.c</span><br><span>@@ -1,6 +1,6 @@</span><br><span> /* OpenBSC Abis input driver for DAHDI */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2008-2011 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2008-2019 by Harald Welte <laforge@gnumonks.org></span><br><span> * (C) 2009 by Holger Hans Peter Freyther <zecke@selfish.org></span><br><span> * (C) 2010 by Digium and Matthew Fredrickson <creslin@digium.com></span><br><span> *</span><br><span>@@ -603,6 +603,33 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int dahdi_open_slot(int dahdi_chan_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc, fd;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifndef DAHDI_SPECIFY</span><br><span style="color: hsl(120, 100%, 40%);">+ char openstr[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(openstr, sizeof(openstr), "/dev/dahdi/%d", dev_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *openstr = "/dev/dahdi/channel";</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = open(openstr, O_RDWR | O_NONBLOCK);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "DAHDI: could not open %s %s\n", openstr, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ fd = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef DAHDI_SPECIFY</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = ioctl(fd, DAHDI_SPECIFY, &dahdi_chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ close(fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_ERROR, "DAHDI: could not DAHDI_SPECIFY %d: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ dahdi_chan_nr, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+ return fd;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int dahdi_e1_setup(struct e1inp_line *line)</span><br><span> {</span><br><span> struct span_cfg *scfg;</span><br><span>@@ -623,7 +650,6 @@</span><br><span> /* TS0 is CRC4, don't need any fd for it */</span><br><span> for (ts = 1; ts <= scfg->chan_num; ts++) {</span><br><span> unsigned int idx = ts-1;</span><br><span style="color: hsl(0, 100%, 40%);">- char openstr[128];</span><br><span> struct e1inp_ts *e1i_ts = &line->ts[idx];</span><br><span> struct osmo_fd *bfd = &e1i_ts->driver.dahdi.fd;</span><br><span> int dev_nr;</span><br><span>@@ -640,7 +666,6 @@</span><br><span> bfd->data = line;</span><br><span> bfd->priv_nr = ts;</span><br><span> bfd->cb = dahdi_fd_cb;</span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(openstr, sizeof(openstr), "/dev/dahdi/%d", dev_nr);</span><br><span> </span><br><span> switch (e1i_ts->type) {</span><br><span> case E1INP_TS_TYPE_NONE:</span><br><span>@@ -657,13 +682,9 @@</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_SIGN:</span><br><span> if (!bfd->fd)</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->fd = open(openstr, O_RDWR | O_NONBLOCK);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bfd->fd == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s could not open %s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, openstr, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->fd = dahdi_open_slot(dev_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bfd->fd < 0)</span><br><span> return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> bfd->when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span> ret = dahdi_set_bufinfo(bfd->fd, 1);</span><br><span> if (ret < 0)</span><br><span>@@ -676,13 +697,9 @@</span><br><span> break;</span><br><span> case E1INP_TS_TYPE_HDLC:</span><br><span> if (!bfd->fd)</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->fd = open(openstr, O_RDWR | O_NONBLOCK);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bfd->fd == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s could not open %s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, openstr, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->fd = dahdi_open_slot(dev_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bfd->fd < 0)</span><br><span> return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> bfd->when = BSC_FD_READ | BSC_FD_EXCEPT;</span><br><span> ret = dahdi_set_bufinfo(bfd->fd, 1);</span><br><span> if (ret < 0)</span><br><span>@@ -696,13 +713,9 @@</span><br><span> e1i_ts->lapd = NULL;</span><br><span> }</span><br><span> if (!bfd->fd)</span><br><span style="color: hsl(0, 100%, 40%);">- bfd->fd = open(openstr, O_RDWR | O_NONBLOCK);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bfd->fd == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s could not open %s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, openstr, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ bfd->fd = dahdi_open_slot(dev_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bfd->fd < 0)</span><br><span> return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> ret = dahdi_set_bufinfo(bfd->fd, 0);</span><br><span> if (ret < 0)</span><br><span> return -EIO;</span><br><span>@@ -713,12 +726,8 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bfd->fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "%s could not open %s %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- __func__, openstr, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bfd->fd < 0)</span><br><span> return bfd->fd;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> ret = osmo_fd_register(bfd);</span><br><span> if (ret < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/15996">change 15996</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-abis/+/15996"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id6c8f27d7ae948b50e9cf5a38f039d782ff78e1d </div>
<div style="display:none"> Gerrit-Change-Number: 15996 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>