retronetworking
/
osmo-e1d
mirror of https://gerrit.osmocom.org/osmo-e1d
13
0
Fork 0
Code Issues Releases Wiki Activity

e1d-ts-pipe: Don't write more HDLC bytes than e1d supports 

This avoids truncation and the following error message when operating
in HDLC-FCS mode:

<0001> mux_demux.c:91 (I0:L0:T16) Truncated message: Client tried to send 320 bytes but our buffer is limited to 264

Change-Id: I836d8b98ce5b831b0498c4650263ec3b3d4f2c45
This commit is contained in:
Harald Welte 2021-12-31 16:24:18 +01:00
parent 50b121cfc4
commit d4700da1e8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/e1d-ts-pipe.c
View File

@ -39,6 +39,7 @@
static void *g_ctx;
static struct osmo_e1dp_client *g_client;
static struct osmo_fd ts_ofd;
static enum osmo_e1dp_ts_mode g_mode = E1DP_TSMODE_RAW;
static int outfd = 1;
static int infd = 0;
@ -70,7 +71,11 @@ static int ts_fd_cb(struct osmo_fd *ofd, unsigned int what)
}
if (what & OSMO_FD_WRITE) {
rc = read(infd, buf, sizeof(buf));
unsigned int read_len = sizeof(buf);
if (g_mode == E1DP_TSMODE_HDLCFCS)
read_len = E1DP_MAX_SIZE_HDLC;
rc = read(infd, buf, read_len);
if (rc < 0 && errno != EAGAIN)
exit(4);
else if (rc == 0) { /* EOF */
@ -120,7 +125,6 @@ static void print_help(void)
int main(int argc, char **argv)
{
int intf_nr = -1, line_nr = -1, ts_nr = -1;
enum osmo_e1dp_ts_mode mode = E1DP_TSMODE_RAW;
char *path = E1DP_DEFAULT_SOCKET;
int bufsize = 160;
int tsfd;
@ -172,7 +176,7 @@ int main(int argc, char **argv)
fprintf(stderr, "Unknown mode '%s'\n", optarg);
exit(2);
}
mode = rc;
g_mode = rc;
break;
case 'r':
rc = open(optarg, 0, O_RDONLY);
@ -199,7 +203,7 @@ int main(int argc, char **argv)
exit(1);
}
tsfd = ts_open(intf_nr, line_nr, ts_nr, mode, bufsize);
tsfd = ts_open(intf_nr, line_nr, ts_nr, g_mode, bufsize);
if (tsfd < 0)
exit(2);