aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2016-10-17 22:13:36 +0200
committerHarald Welte <laforge@gnumonks.org>2016-10-19 10:54:59 +0200
commit13351138e2081c5d02de11eef1050b17ffa199a1 (patch)
treed126a3a4751a69c62a564f9aad0820ffdd9bd0e3
parent525af1832e92864258c190c5145c2faf8e0f5dd9 (diff)
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.
-rw-r--r--src/e1_recorder.c2
-rw-r--r--src/vty.c6
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);