<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/26703">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;">e1d-ts-pipe: Don't write more HDLC bytes than e1d supports<br><br>This avoids truncation and the following error message when operating<br>in HDLC-FCS mode:<br><br><0001> mux_demux.c:91 (I0:L0:T16) Truncated message: Client tried to send 320 bytes but our buffer is limited to 264<br><br>Change-Id: I836d8b98ce5b831b0498c4650263ec3b3d4f2c45<br>---<br>M src/e1d-ts-pipe.c<br>1 file changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1d-ts-pipe.c b/src/e1d-ts-pipe.c</span><br><span>index bae45de..2928e85 100644</span><br><span>--- a/src/e1d-ts-pipe.c</span><br><span>+++ b/src/e1d-ts-pipe.c</span><br><span>@@ -39,6 +39,7 @@</span><br><span> static void *g_ctx;</span><br><span> static struct osmo_e1dp_client *g_client;</span><br><span> static struct osmo_fd ts_ofd;</span><br><span style="color: hsl(120, 100%, 40%);">+static enum osmo_e1dp_ts_mode g_mode = E1DP_TSMODE_RAW;</span><br><span> static int outfd = 1;</span><br><span> static int infd = 0;</span><br><span> </span><br><span>@@ -70,7 +71,11 @@</span><br><span>    }</span><br><span> </span><br><span>        if (what & OSMO_FD_WRITE) {</span><br><span style="color: hsl(0, 100%, 40%);">-         rc = read(infd, buf, sizeof(buf));</span><br><span style="color: hsl(120, 100%, 40%);">+            unsigned int read_len = sizeof(buf);</span><br><span style="color: hsl(120, 100%, 40%);">+          if (g_mode == E1DP_TSMODE_HDLCFCS)</span><br><span style="color: hsl(120, 100%, 40%);">+                    read_len = E1DP_MAX_SIZE_HDLC;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+              rc = read(infd, buf, read_len);</span><br><span>              if (rc < 0 && errno != EAGAIN)</span><br><span>                    exit(4);</span><br><span>             else if (rc == 0) { /* EOF */</span><br><span>@@ -120,7 +125,6 @@</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span>  int intf_nr = -1, line_nr = -1, ts_nr = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-     enum osmo_e1dp_ts_mode mode = E1DP_TSMODE_RAW;</span><br><span>       char *path = E1DP_DEFAULT_SOCKET;</span><br><span>    int bufsize = 160;</span><br><span>   int tsfd;</span><br><span>@@ -172,7 +176,7 @@</span><br><span>                              fprintf(stderr, "Unknown mode '%s'\n", optarg);</span><br><span>                            exit(2);</span><br><span>                     }</span><br><span style="color: hsl(0, 100%, 40%);">-                       mode = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+                    g_mode = rc;</span><br><span>                         break;</span><br><span>               case 'r':</span><br><span>                    rc = open(optarg, 0, O_RDONLY);</span><br><span>@@ -199,7 +203,7 @@</span><br><span>                exit(1);</span><br><span>     }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   tsfd = ts_open(intf_nr, line_nr, ts_nr, mode, bufsize);</span><br><span style="color: hsl(120, 100%, 40%);">+       tsfd = ts_open(intf_nr, line_nr, ts_nr, g_mode, bufsize);</span><br><span>    if (tsfd < 0)</span><br><span>             exit(2);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/26703">change 26703</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/+/26703"/><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: I836d8b98ce5b831b0498c4650263ec3b3d4f2c45 </div>
<div style="display:none"> Gerrit-Change-Number: 26703 </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-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>