<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19220">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
tnt: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use SOCK_STREAM sockets for E1_TS_MODE_RAW<br><br>SEQPACKET is great for preserving message boundaries on signaling<br>channels that use HDLC. However, its semantics, particularly regarding<br>truncation, are sub-optimal for RAW slots containing raw user<br>bitstreams (typically TRAU frames or PCM audio data).<br><br>So let's use SOCK_STREAM for RAW and keep SEQPACKET for HDLCFCS.<br><br>Closes: OS#4663<br>Change-Id: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1<br>---<br>M src/ctl.c<br>M src/intf_line.c<br>2 files changed, 15 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ctl.c b/src/ctl.c</span><br><span>index ee5066f..482366f 100644</span><br><span>--- a/src/ctl.c</span><br><span>+++ b/src/ctl.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span> #include <fcntl.h></span><br><span> #include <unistd.h></span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span> #include <sys/types.h></span><br><span> #include <sys/stat.h></span><br><span> #include <sys/socket.h></span><br><span>@@ -110,10 +111,22 @@</span><br><span> _e1d_ts_start(struct e1_ts *ts, enum e1_ts_mode mode)</span><br><span> {</span><br><span> int ret, sd[2];</span><br><span style="color: hsl(120, 100%, 40%);">+ int sock_type;</span><br><span> </span><br><span> LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %s\n", get_value_string(e1_ts_mode_names, mode));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ret = socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sd);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(120, 100%, 40%);">+ sock_type = SOCK_SEQPACKET;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_RAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ sock_type = SOCK_STREAM;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</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%);">+ ret = socketpair(AF_UNIX, sock_type, 0, sd);</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span> </span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index fe9edbb..5994805 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -251,12 +251,7 @@</span><br><span> </span><br><span> switch (ts->mode) {</span><br><span> case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">- l = recv(ts->fd, buf_ts, fts, MSG_TRUNC);</span><br><span style="color: hsl(0, 100%, 40%);">- if (l > fts) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to "</span><br><span style="color: hsl(0, 100%, 40%);">- "send %d bytes but our buffer is limited to %d\n", l, fts);</span><br><span style="color: hsl(0, 100%, 40%);">- l = fts;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ l = read(ts->fd, buf_ts, fts);</span><br><span> break;</span><br><span> case E1_TS_MODE_HDLCFCS:</span><br><span> l = _e1_tx_hdlcfs(ts, buf_ts, fts);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19220">change 19220</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/+/19220"/><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: I1767ceaa5d2a008db0009b8027667a71c0fdc0f1 </div>
<div style="display:none"> Gerrit-Change-Number: 19220 </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-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>