From 13351138e2081c5d02de11eef1050b17ffa199a1 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 17 Oct 2016 22:13:36 +0200 Subject: [PATCH] e1_inp: Use HDLC mode for signalling, not SIGN The SIGN mode implies that LAPD instances are bound to the timeslots, which is of course not what we want in a pure capturing/recording scenario. Instead, use the new E1INP_TS_TYPE_HDLC mode, which allows us to capture any HDLC framed messages on E1/T1 timeslots, whether LAPD or e.g. MTP. --- src/e1_recorder.c | 2 +- src/vty.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/e1_recorder.c b/src/e1_recorder.c index 868d95d..703a67e 100644 --- a/src/e1_recorder.c +++ b/src/e1_recorder.c @@ -16,7 +16,7 @@ static enum osmo_e1cap_capture_mode ts2cap_mode(struct e1inp_ts *ts) switch (ts->type) { case E1INP_TS_TYPE_RAW: return OSMO_E1CAP_MODE_RAW; - case E1INP_TS_TYPE_SIGN: + case E1INP_TS_TYPE_HDLC: return OSMO_E1CAP_MODE_HDLC; case E1INP_TS_TYPE_TRAU: return OSMO_E1CAP_MODE_TRAU; diff --git a/src/vty.c b/src/vty.c index ae032fb..f0c8287 100644 --- a/src/vty.c +++ b/src/vty.c @@ -22,7 +22,7 @@ static const struct e1inp_line_ops dummy_e1i_line_ops = { }; DEFUN(cfg_rec_line_ts_mode, cfg_rec_line_ts_mode_cmd, - "line <0-255> ts <1-31> mode (none|signalling|trau|raw)", + "line <0-255> ts <1-31> mode (none|hdlc|trau|raw)", LINE_STR "E1/T1 Timeslot Number\n" "E1/T1 Timeslot Number\n" @@ -61,8 +61,8 @@ DEFUN(cfg_rec_line_ts_mode, cfg_rec_line_ts_mode_cmd, /* TOOD: have eqinp_ts_config_none ? */ ts->type = E1INP_TS_TYPE_NONE; break; - case E1INP_TS_TYPE_SIGN: - e1inp_ts_config_sign(ts, line); + case E1INP_TS_TYPE_HDLC: + e1inp_ts_config_hdlc(ts, line, &e1ts_raw_recv); break; case E1INP_TS_TYPE_RAW: e1inp_ts_config_raw(ts, line, &e1ts_raw_recv);