[MERGED] libosmo-abis[master]: e1_input: Add E1 timeslot number to input_signal_data

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: e1_input: Add E1 timeslot number to input_signal_data
......................................................................


e1_input: Add E1 timeslot number to input_signal_data

It is quite useful for the signal receiver to know on which of the many
E1/T1 timeslots a given event (like a 'link down' event) has happened.
The line number, TEI and SAPI are isnuficcient in case there are
multiple signalling TS in the line.

Change-Id: I07f0f79e0cda09766f357032ffb4e7ad643d448a
---
M TODO-RELEASE
M include/osmocom/abis/e1_input.h
M src/e1_input.c
M src/input/dahdi.c
4 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/TODO-RELEASE b/TODO-RELEASE
index 7ea65b6..3af993e 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -1,2 +1,3 @@
 #library	what		description / commit summary line
 libosmo-abis	API change	major: add parameter to rx_cb() callack in osmo_ortp.h
+libosmo-abis	API change	major: add parameter to struct input_signal_data
diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index 7cfb3a2..c175649 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -288,6 +288,7 @@
 	int link_type;
 	uint8_t tei;
 	uint8_t sapi;
+	uint8_t ts_nr;
 	struct gsm_bts_trx *trx;
 	struct e1inp_line *line;
 };
diff --git a/src/e1_input.c b/src/e1_input.c
index 4ba991e..c9ae8e6 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -667,6 +667,7 @@
 {
 	struct input_signal_data isd;
 	isd.line = ts->line;
+	isd.ts_nr = ts->num;
 	isd.link_type = link->type;
 	isd.trx = link->trx;
 	isd.tei = link->tei;
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index 9f1f2bb..ab06908 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -139,6 +139,7 @@
 		get_value_string(dahdi_evt_names, evt));
 
 	isd.line = ts->line;
+	isd.ts_nr = ts->num;
 
 	switch (evt) {
 	case DAHDI_EVENT_ALARM:

-- 
To view, visit https://gerrit.osmocom.org/1078
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I07f0f79e0cda09766f357032ffb4e7ad643d448a
Gerrit-PatchSet: 3
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder