<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/20081">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make sure a given timeslot can only be opened once (by default)<br><br>Align the behavior of osmo-e1d with that of DAHDI: If a timeslot is<br>opened once, it cannot be opened again by anyone until it is closed<br>by the current owner. This way we'd have the same failure semantics<br>in DAHDI vs. osmo-e1d, which is very useful in case of misconfiguration<br>when osmo-bsc + osmo-mgw would "fight" over a timeslot.<br><br>Add a osmo_e1dp_client_ts_open_force() function that allows to override<br>and get back the original behavior.<br><br>Closes: OS#4654<br>Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58<br>---<br>A TODO-RELEASE<br>M include/osmocom/e1d/proto.h<br>M include/osmocom/e1d/proto_clnt.h<br>M src/ctl.c<br>M src/proto_clnt.c<br>5 files changed, 37 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>new file mode 100644</span><br><span>index 0000000..27e2d93</span><br><span>--- /dev/null</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+* bump protocol version as 'flags' member was added to osmo_d1dp_ts_config</span><br><span>diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h</span><br><span>index 5628e31..6457f14 100644</span><br><span>--- a/include/osmocom/e1d/proto.h</span><br><span>+++ b/include/osmocom/e1d/proto.h</span><br><span>@@ -81,6 +81,8 @@</span><br><span> E1DP_TSMODE_HDLCFCS = 0x11,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* osmo_e1dp_ts_config.flags */</span><br><span style="color: hsl(120, 100%, 40%);">+#define E1DP_TS_OPEN_F_FORCE 0x80</span><br><span> </span><br><span> /* the idea here is to use the first byte as a version number, to prevent incompatible</span><br><span> * clients from connecting to e1d */</span><br><span>@@ -118,6 +120,7 @@</span><br><span> </span><br><span> struct osmo_e1dp_ts_config {</span><br><span> uint8_t mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t flags;</span><br><span> uint16_t read_bufsize;</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>diff --git a/include/osmocom/e1d/proto_clnt.h b/include/osmocom/e1d/proto_clnt.h</span><br><span>index 5a4f965..1473716 100644</span><br><span>--- a/include/osmocom/e1d/proto_clnt.h</span><br><span>+++ b/include/osmocom/e1d/proto_clnt.h</span><br><span>@@ -46,3 +46,6 @@</span><br><span> int osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt,</span><br><span> uint8_t intf, uint8_t line, uint8_t ts,</span><br><span> enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_e1dp_client_ts_open_force(struct osmo_e1dp_client *clnt,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t intf, uint8_t line, uint8_t ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize);</span><br><span>diff --git a/src/ctl.c b/src/ctl.c</span><br><span>index 8da21fd..8a0e339 100644</span><br><span>--- a/src/ctl.c</span><br><span>+++ b/src/ctl.c</span><br><span>@@ -395,8 +395,16 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* If already open, close previous */</span><br><span style="color: hsl(0, 100%, 40%);">- e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->fd >= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we only force-reopen a busy timeslot if the flag is set */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cfg->flags & E1DP_TS_OPEN_F_FORCE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Timeslot already open, rejecting re-open without F_FORCE\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Init */</span><br><span> ret = _e1d_ts_start(ts, mode, cfg->read_bufsize);</span><br><span>diff --git a/src/proto_clnt.c b/src/proto_clnt.c</span><br><span>index 69c7234..0f6e367 100644</span><br><span>--- a/src/proto_clnt.c</span><br><span>+++ b/src/proto_clnt.c</span><br><span>@@ -315,10 +315,10 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt,</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_client_ts_open(struct osmo_e1dp_client *clnt,</span><br><span> uint8_t intf, uint8_t line, uint8_t ts,</span><br><span style="color: hsl(0, 100%, 40%);">- enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize)</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize, uint8_t flags)</span><br><span> {</span><br><span> struct msgb *msgb;</span><br><span> struct osmo_e1dp_msg_hdr hdr;</span><br><span>@@ -333,6 +333,7 @@</span><br><span> </span><br><span> memset(&cfg, 0x00, sizeof(struct osmo_e1dp_ts_config));</span><br><span> cfg.mode = mode;</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg.flags = flags;</span><br><span> cfg.read_bufsize = read_bufsize;</span><br><span> </span><br><span> tsfd = -1;</span><br><span>@@ -348,3 +349,19 @@</span><br><span> </span><br><span> return tsfd;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_e1dp_client_ts_open(struct osmo_e1dp_client *clnt,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t intf, uint8_t line, uint8_t ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return _client_ts_open(clnt, intf, line, ts, mode, read_bufsize, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_e1dp_client_ts_open_force(struct osmo_e1dp_client *clnt,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t intf, uint8_t line, uint8_t ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_e1dp_ts_mode mode, uint16_t read_bufsize)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return _client_ts_open(clnt, intf, line, ts, mode, read_bufsize, E1DP_TS_OPEN_F_FORCE);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/20081">change 20081</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/osmo-e1d/+/20081"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib25adf827ec41e74de15e0e4fdcfc9bcc9a32e58 </div>
<div style="display:none"> Gerrit-Change-Number: 20081 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>