- gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[master]: rtp_extensions.h: update for TW-TS-003 version 1.1.0
by falconia 23 Sep '25

23 Sep '25

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/41144?usp=email ) Change subject: rtp_extensions.h: update for TW-TS-003 version 1.1.0 ...................................................................... rtp_extensions.h: update for TW-TS-003 version 1.1.0 Themyscira Wireless released new specs for enhanced RTP formats on AoIP interface user plane: * TW-TS-006 for AMR, allowing RTP transport between an E1 BTS and a CN transcoder that implements both regular transcoding and TFO functions as specified in 3GPP Rel4 for TDM-based GSM; * TW-TS-007 for compressed CSD, making CSD in RTP much more efficient; * An updated version of TW-TS-003 adds two new bits to RTPext IE (GSM0808_IE_THEMWI_RTP_EXTENSIONS) for MSC to request the use of TW-TS-006 and TW-TS-007 extensions, and for BSS to acknowledge the necessary support. All TW-TS for RTP extensions are summarized here: https://osmocom.org/projects/retro-gsm/wiki/ThemWi_RTP_Extensions Change-Id: I2cc2c9340f9fa5c7111447a6beef49c335fa1107 --- M include/osmocom/gsm/rtp_extensions.h 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/41144/1 diff --git a/include/osmocom/gsm/rtp_extensions.h b/include/osmocom/gsm/rtp_extensions.h index edea431..e397a3f 100644 --- a/include/osmocom/gsm/rtp_extensions.h +++ b/include/osmocom/gsm/rtp_extensions.h @@ -11,7 +11,7 @@ * namely, GSM0808_IE_THEMWI_RTP_EXTENSIONS and RSL_IE_OSMO_RTP_EXTENSIONS. * It is based on this authoritative definition: * - * https://www.freecalypso.org/specs/tw-ts-003-v010002.txt + * https://www.freecalypso.org/specs/tw-ts-003-v010100.txt * * Section 5.3 in the above specification defines the assignment of * individual bits in the single value octet. @@ -21,3 +21,5 @@ #define OSMO_RTP_EXT_TWTS001 0x01 #define OSMO_RTP_EXT_TWTS002 0x02 +#define OSMO_RTP_EXT_TWTS006 0x04 +#define OSMO_RTP_EXT_TWTS007 0x08 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2cc2c9340f9fa5c7111447a6beef49c335fa1107 Gerrit-Change-Number: 41144 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in osmo-e1d[master]: Add Channel-Associated Signalling (CAS) support
by jolly 23 Sep '25

23 Sep '25

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-e1d/+/41139?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Add Channel-Associated Signalling (CAS) support ...................................................................... Add Channel-Associated Signalling (CAS) support CAS frames are sent and received repeatedly. They consist of 16 frames (octets) on time slot 16. This is a CAS multi frame. This multiframe carries 30 individual CAS signaling channels. Whenever a CAS frame is received, the included 30 CAS channels are forwarded to the application with a message of 30 octets, one octet for each CAS channel. The application requests to transmit a CAS frame by sending a message with 30 octets, one for each CAS channel. Most recent CAS frame will be transmitted repeatedly until the application sends a new message. The 30 octets in the message correspond to the signaling channels of these 30 time slots: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 The lower 4 bits of each octet in the message represent the signaling sub-channels: A, B, C and D. They are packed like this: '0000ABCD' Change-Id: Ib4f5e6ef02c9b0d1eec2a86d9c48376112805972 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/mux_demux.c M src/proto.c M src/vty.c 6 files changed, 178 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/39/41139/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/41139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib4f5e6ef02c9b0d1eec2a86d9c48376112805972 Gerrit-Change-Number: 41139 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[S] Change in osmo-ttcn3-hacks[master]: buildsystem/gen_links: catch file not found errors
by osmith 22 Sep '25

22 Sep '25

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41142?usp=email ) Change subject: buildsystem/gen_links: catch file not found errors ...................................................................... Abandoned https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41143/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b0440dda7d5b37a4baa4b16f3979f7fb32b7b15 Gerrit-Change-Number: 41142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

1 0

[S] Change in osmo-ttcn3-hacks[master]: buildsystem/gen_links: catch file not found errors
by osmith 22 Sep '25

22 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41143?usp=email ) Change subject: buildsystem/gen_links: catch file not found errors ...................................................................... buildsystem/gen_links: catch file not found errors Tweak gen_links() to sequentially iterate over the files for which symlinks shall be created, and verify that each symlink target exists. If the target does not exist, abort with an error: ERROR in bsc/gen_links.sh: file not found File (from FILES): SDP_EncDec.cc DIR: ../deps/titan.Libraries.TCCUsefulFunctions/src This is slightly slower than the parallel approach from before, but it prevents adding subtle bugs that don't trigger every time so IMHO the trade-off is worth it. Adjust the Makefile to ensure dependencies are fetched before running gen_links.sh, so the targets are not missing when running this from a fresh git clone without deps. Change-Id: I0da0ec30e5eaf65d0348e22900a5ee006dee9e44 --- M Makefile M _buildsystem/gen_links.inc.sh 2 files changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/41143/1 diff --git a/Makefile b/Makefile index 2724dec..1ad357b 100644 --- a/Makefile +++ b/Makefile @@ -95,13 +95,13 @@ all: $(foreach dir,$(SUBDIRS),$(dir)/all) define DIR_Makefile_template -$(BUILDDIR)/$(1)/Makefile: $(1)/gen_links.sh $(1)/regen_makefile.sh +$(BUILDDIR)/$(1)/Makefile: $(1)/gen_links.sh $(1)/regen_makefile.sh .make.deps (cd $(1) && ./gen_links.sh && ./regen_makefile.sh) endef define DIR_compile_template .PHONY: $(1)/compile -$(1)/compile: deps $(BUILDDIR)/$(1)/Makefile +$(1)/compile: $(BUILDDIR)/$(1)/Makefile $(MAKE) -C $(BUILDDIR)/$(1) compile endef diff --git a/_buildsystem/gen_links.inc.sh b/_buildsystem/gen_links.inc.sh index 161754c..b7272e2 100644 --- a/_buildsystem/gen_links.inc.sh +++ b/_buildsystem/gen_links.inc.sh @@ -27,9 +27,20 @@ local files="$*" for f in $files; do - (ln -sf \ - "$(realpath "$TOPDIR/$PROJECTDIR/$dir/$f")" \ - "$BUILDDIR/$PROJECTDIR/$f") & + local target="$(realpath "$TOPDIR/$PROJECTDIR/$dir/$f")" + if ! [ -e "$target" ]; then + echo + echo "ERROR in $PROJECTDIR/gen_links.sh: file not found" + echo " File (from FILES):" + echo " $f" + echo " DIR:" + echo " $dir" + echo + exit 1 + fi + ln -sf \ + "$target" \ + "$BUILDDIR/$PROJECTDIR/$f" done } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0da0ec30e5eaf65d0348e22900a5ee006dee9e44 Gerrit-Change-Number: 41143 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: buildsystem/gen_links: catch file not found errors
by osmith 22 Sep '25

22 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41142?usp=email ) Change subject: buildsystem/gen_links: catch file not found errors ...................................................................... buildsystem/gen_links: catch file not found errors Tweak gen_links() to sequentially iterate over the files for which symlinks shall be created, and verify that each symlink target exists. If the target does not exist, abort with an error: ERROR in bsc/gen_links.sh: file not found File (from FILES): SDP_EncDec.cc DIR: ../deps/titan.Libraries.TCCUsefulFunctions/src This is slightly slower than the parallel approach from before, but it prevents adding subtle bugs that don't trigger every time so IMHO the trade-off is worth it. Change-Id: I6b0440dda7d5b37a4baa4b16f3979f7fb32b7b15 --- M _buildsystem/gen_links.inc.sh 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/42/41142/1 diff --git a/_buildsystem/gen_links.inc.sh b/_buildsystem/gen_links.inc.sh index 161754c..b7272e2 100644 --- a/_buildsystem/gen_links.inc.sh +++ b/_buildsystem/gen_links.inc.sh @@ -27,9 +27,20 @@ local files="$*" for f in $files; do - (ln -sf \ - "$(realpath "$TOPDIR/$PROJECTDIR/$dir/$f")" \ - "$BUILDDIR/$PROJECTDIR/$f") & + local target="$(realpath "$TOPDIR/$PROJECTDIR/$dir/$f")" + if ! [ -e "$target" ]; then + echo + echo "ERROR in $PROJECTDIR/gen_links.sh: file not found" + echo " File (from FILES):" + echo " $f" + echo " DIR:" + echo " $dir" + echo + exit 1 + fi + ln -sf \ + "$target" \ + "$BUILDDIR/$PROJECTDIR/$f" done } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41142?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b0440dda7d5b37a4baa4b16f3979f7fb32b7b15 Gerrit-Change-Number: 41142 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: */gen_links.sh: fix wrong SDP_EncDec.cc symlink
by osmith 22 Sep '25

22 Sep '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41141?usp=email ) Change subject: */gen_links.sh: fix wrong SDP_EncDec.cc symlink ...................................................................... */gen_links.sh: fix wrong SDP_EncDec.cc symlink SDP_EncDec.cc is not in titan.Libraries.TCCUsefulFunctions, it is in titan.ProtocolModules.SDP. The gen_links.sh scripts had instructions to symlink both the wrong and right location of SDP_EncDec.cc, and most of the time the right location would be symlinked. When the wrong location was symlinked, the next command regen_makefile.sh would fail with: ttcn3_makefilegen: error: Cannot find any source file for argument `SDP_EncDec.cc'. Change-Id: I5799ee04b9897fb58a92cf222bcffbf97275d7c1 --- M bsc-nat/gen_links.sh M bsc/gen_links.sh M smlc/gen_links.sh 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/41/41141/1 diff --git a/bsc-nat/gen_links.sh b/bsc-nat/gen_links.sh index fa7e868..da40ecb 100755 --- a/bsc-nat/gen_links.sh +++ b/bsc-nat/gen_links.sh @@ -9,7 +9,7 @@ #gen_links $DIR $FILES DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/bsc/gen_links.sh b/bsc/gen_links.sh index 7e31117..8b70c9b 100755 --- a/bsc/gen_links.sh +++ b/bsc/gen_links.sh @@ -9,7 +9,7 @@ #gen_links $DIR $FILES DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/smlc/gen_links.sh b/smlc/gen_links.sh index 2c8bca3..fe09145 100755 --- a/smlc/gen_links.sh +++ b/smlc/gen_links.sh @@ -9,7 +9,7 @@ #gen_links $DIR $FILES DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src -FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h SDP_EncDec.cc" +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41141?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5799ee04b9897fb58a92cf222bcffbf97275d7c1 Gerrit-Change-Number: 41141 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: Correctly calculate size iofd_msgb_alloc2()
by jolly 22 Sep '25

22 Sep '25

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/41138?usp=email to look at the new patch set (#2). Change subject: Correctly calculate size iofd_msgb_alloc2() ...................................................................... Correctly calculate size iofd_msgb_alloc2() The storage size of 'headroom' must be larger than 16 bits. Otherwise a value above 65535 cannot be stored correctly and cause wrong calculation of msgb size. Related: Coverity CID#548925 Change-Id: I16c1e08fb64a1fafaeee1844fd8c00ecc2861d12 --- M src/core/osmo_io.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/38/41138/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I16c1e08fb64a1fafaeee1844fd8c00ecc2861d12 Gerrit-Change-Number: 41138 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in libosmo-abis[master]: Add CAS channel support
by jolly 21 Sep '25

21 Sep '25

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/41140?usp=email ) Change subject: Add CAS channel support ...................................................................... Add CAS channel support CAS is currently supported by e1d driver only. Change-Id: I81cc89e01bb4207dc899ab28f24a131f24b61c9c --- M include/osmocom/abis/e1_input.h M src/e1_input.c M src/input/dahdi.c M src/input/e1d.c M src/input/misdn.c 5 files changed, 154 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/40/41140/1 diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h index 66985ea..ccf6926 100644 --- a/include/osmocom/abis/e1_input.h +++ b/include/osmocom/abis/e1_input.h @@ -77,6 +77,7 @@ E1INP_TS_TYPE_RAW, E1INP_TS_TYPE_HDLC, E1INP_TS_TYPE_I460, + E1INP_TS_TYPE_CAS, }; const char *e1inp_tstype_name(enum e1inp_ts_type tp); extern const struct value_string e1inp_ts_type_names[]; @@ -120,6 +121,12 @@ struct llist_head tx_queue; } hdlc; struct { + /* call-back for every received frame */ + void (*recv_cb)(struct e1inp_ts *ts, struct msgb *msg); + /* pending to-be-transmitted msgb */ + struct msgb *tx_msg; + } cas; + struct { struct osmo_i460_timeslot i460_ts; } i460; }; @@ -335,6 +342,11 @@ void (*hdlc_recv_cb)(struct e1inp_ts *ts, struct msgb *msg)); +/* configure and initialize one timeslot dedicated to CAS frames */ +int e1inp_ts_config_cas(struct e1inp_ts *ts, struct e1inp_line *line, + void (*cas_recv_cb)(struct e1inp_ts *ts, + struct msgb *msg)); + /* configure and initialize one timeslot dedicated to nothing */ int e1inp_ts_config_none(struct e1inp_ts *ts, struct e1inp_line *line); @@ -410,5 +422,6 @@ int e1inp_ts_send_raw(struct e1inp_ts *ts, struct msgb *msg); int e1inp_ts_send_hdlc(struct e1inp_ts *ts, struct msgb *msg); +int e1inp_ts_send_cas(struct e1inp_ts *ts, struct msgb *msg); #endif /* _E1_INPUT_H */ diff --git a/src/e1_input.c b/src/e1_input.c index 066a572..656d657 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -283,6 +283,7 @@ { E1INP_TS_TYPE_RAW, "RAW" }, { E1INP_TS_TYPE_HDLC, "HDLC" }, { E1INP_TS_TYPE_I460, "I460" }, + { E1INP_TS_TYPE_CAS, "CAS" }, { 0, NULL } }; @@ -361,6 +362,23 @@ return 0; } +int e1inp_ts_send_cas(struct e1inp_ts *ts, struct msgb *msg) +{ + struct e1inp_driver *driver; + + OSMO_ASSERT(ts->type == E1INP_TS_TYPE_CAS); + + /* notify the driver we have something to write */ + driver = ts->line->driver; + driver->want_write(ts); + + /* update CAS message */ + msgb_free(ts->cas.tx_msg); + ts->cas.tx_msg = msg; + + return 0; +} + /* Depending on its typ a timeslot may hold resources which must be cleaned up * or reset before the type of the timeslot type may be changed. */ static int cleanup_e1inp_ts(struct e1inp_ts *e1i_ts) @@ -390,6 +408,10 @@ case E1INP_TS_TYPE_HDLC: msgb_queue_free(&e1i_ts->hdlc.tx_queue); return 0; + case E1INP_TS_TYPE_CAS: + msgb_free(e1i_ts->cas.tx_msg); + e1i_ts->cas.tx_msg = NULL; + return 0; case E1INP_TS_TYPE_I460: /* The caller is responsible for removing all I.460 subchannels * first. */ @@ -504,6 +526,23 @@ return 0; } +int e1inp_ts_config_cas(struct e1inp_ts *ts, struct e1inp_line *line, + void (*cas_recv_cb)(struct e1inp_ts *ts, + struct msgb *msg)) +{ + if (ts->type == E1INP_TS_TYPE_CAS && ts->line && line) + return 0; + + cleanup_e1inp_ts(ts); + + ts->type = E1INP_TS_TYPE_CAS; + ts->line = line; + ts->cas.recv_cb = cas_recv_cb; + ts->cas.tx_msg = NULL; + + return 0; +} + int e1inp_ts_config_none(struct e1inp_ts *ts, struct e1inp_line *line) { if (ts->type == E1INP_TS_TYPE_NONE && ts->line && line) @@ -879,6 +918,9 @@ case E1INP_TS_TYPE_HDLC: ts->hdlc.recv_cb(ts, msg); break; + case E1INP_TS_TYPE_CAS: + ts->cas.recv_cb(ts, msg); + break; case E1INP_TS_TYPE_I460: osmo_i460_demux_in(&ts->i460.i460_ts, msg->l2h, msgb_l2len(msg)); msgb_free(msg); @@ -1013,6 +1055,10 @@ /* Get msgb from tx_queue */ msg = msgb_dequeue(&e1i_ts->hdlc.tx_queue); break; + case E1INP_TS_TYPE_CAS: + /* Get msgb from tx_msg, but don't remove it. */ + msg = e1i_ts->cas.tx_msg; + break; case E1INP_TS_TYPE_I460: msg = msgb_alloc(TSX_ALLOC_SIZE, "I460_TX"); if (!msg) diff --git a/src/input/dahdi.c b/src/input/dahdi.c index b9a3fcf..1e6df31 100644 --- a/src/input/dahdi.c +++ b/src/input/dahdi.c @@ -718,6 +718,9 @@ * write flow control */ bfd->when = OSMO_FD_READ | OSMO_FD_EXCEPT;// | OSMO_FD_WRITE; break; + case E1INP_TS_TYPE_CAS: + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "CAS not supported by dahdi driver.\n"); + return -ENOTSUP; } if (bfd->fd < 0) diff --git a/src/input/e1d.c b/src/input/e1d.c index dd4e9fe..9d48bbb 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -542,6 +542,35 @@ return ret; } +/* write to a CAS channel TS */ +static int handle_ts_cas_write(struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct msgb *msg; + int ret; + + /* Disable write, as there can be only one CAS message. */ + osmo_fd_write_disable(bfd); + + /* Get the msg, but don't free it. When the application is restarted, + * it will be sent again, so the application gets the latest CAS message. */ + msg = e1inp_tx_ts(e1i_ts, NULL); + if (!msg) + return 0; + + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "CAS CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len)); + + ret = write(bfd->fd, msg->data, msg->len); + if (ret < msg->len) { + LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "write returns %d instead of %d\n", ret, msg->len); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); + } + + return ret; +} + #define TSX_ALLOC_SIZE 4096 /* read from a hdlc channel TS */ @@ -573,6 +602,35 @@ return ret; } +/* read from a CAS channel TS */ +static int handle_ts_cas_read(struct osmo_fd *bfd) +{ + struct e1inp_line *line = bfd->data; + unsigned int ts_nr = bfd->priv_nr; + struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1]; + struct msgb *msg = msgb_alloc(TSX_ALLOC_SIZE, "E1D CAS TS"); + int ret; + + if (!msg) + return -ENOMEM; + + ret = read(bfd->fd, msg->data, TSX_ALLOC_SIZE); + if (ret <= 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "%s read error: %d %s\n", __func__, ret, strerror(errno)); + msgb_free(msg); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, line); + return ret; + } + + msgb_put(msg, ret); + + msg->l2h = msg->data; + LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "CAS CHAN RX: %s\n", msgb_hexdump_l2(msg)); + ret = e1inp_rx_ts(e1i_ts, msg, 0, 0); + + return ret; +} + static void e1d_write_msg(struct msgb *msg, void *cbdata) { struct osmo_fd *bfd = cbdata; @@ -631,6 +689,12 @@ if (what & OSMO_FD_WRITE) ret = handle_ts_hdlc_write(bfd); break; + case E1INP_TS_TYPE_CAS: + if (what & OSMO_FD_READ) + ret = handle_ts_cas_read(bfd); + if (what & OSMO_FD_WRITE) + ret = handle_ts_cas_write(bfd); + break; default: LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown/unsupported E1 TS type %u\n", e1i_ts->type); break; @@ -777,6 +841,30 @@ } bfd->when = OSMO_FD_READ; break; + case E1INP_TS_TYPE_CAS: + /* close/release LAPD instance, if any */ + if (e1i_ts->lapd) { + lapd_instance_free(e1i_ts->lapd); + e1i_ts->lapd = NULL; + } + /* close, if old timeslot mode doesn't match new config */ + if (bfd->fd >= 0 && ts_info[ts].cfg.mode != E1DP_TSMODE_CAS) { + close(bfd->fd); + bfd->fd = -1; + } + if (bfd->fd < 0) { + bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts, + E1DP_TSMODE_CAS, D_BCHAN_TX_GRAN); + } + if (bfd->fd < 0) { + LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts); + talloc_free(ts_info); + osmo_fsm_inst_dispatch(g_e1d_fsm_inst, EV_CONN_LOST, NULL); + return -EIO; + } + /* Also trigger one write, so latest CAS frame will be sent, if any. */ + bfd->when = OSMO_FD_READ | OSMO_FD_WRITE; + break; case E1INP_TS_TYPE_TRAU: case E1INP_TS_TYPE_I460: case E1INP_TS_TYPE_RAW: diff --git a/src/input/misdn.c b/src/input/misdn.c index 8f04567..3172ee4 100644 --- a/src/input/misdn.c +++ b/src/input/misdn.c @@ -866,6 +866,9 @@ /* open raw socket */ bfd->fd = socket(PF_ISDN, SOCK_DGRAM, ISDN_P_B_RAW); break; + case E1INP_TS_TYPE_CAS: + LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "CAS not supported by mISDN\n"); + return -ENOTSUP; } /* failed to open? */ @@ -901,6 +904,7 @@ /* TS 16 is D-channel, so we use channel 0 */ addr.channel = (ts == 16) ? 0 : ts; break; + case E1INP_TS_TYPE_CAS: default: LOGPITS(e1i_ts, DLMI, LOGL_ERROR, "unsupported E1 TS type: %u\n", e1i_ts->type); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/41140?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I81cc89e01bb4207dc899ab28f24a131f24b61c9c Gerrit-Change-Number: 41140 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-e1d[master]: Add Channel-Associated Signalling (CAS) support
by Jenkins Builder 21 Sep '25

21 Sep '25

Jenkins Builder has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-e1d/+/41139?usp=email ) Change subject: Add Channel-Associated Signalling (CAS) support ...................................................................... Patch Set 1: (1 comment) File src/mux_demux.c: Robot Comment from checkpatch (run ID ): https://gerrit.osmocom.org/c/osmo-e1d/+/41139/comment/e67a42b3_ef627bb6?usp… : PS1, Line 418: /* Forward mulitframe to application. Even if there is no change, the appliction 'appliction' may be misspelled - perhaps 'application'? -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/41139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib4f5e6ef02c9b0d1eec2a86d9c48376112805972 Gerrit-Change-Number: 41139 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 21 Sep 2025 09:57:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in osmo-e1d[master]: Add Channel-Associated Signalling (CAS) support
by jolly 21 Sep '25

21 Sep '25

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-e1d/+/41139?usp=email ) Change subject: Add Channel-Associated Signalling (CAS) support ...................................................................... Add Channel-Associated Signalling (CAS) support CAS frames are sent and received repeatedly. They consist of 16 frames (octets) on time slot 16. This is a CAS multi frame. This multiframe carries 30 individual CAS signaling channels. Whenever a CAS frame is received, the included 30 CAS channels are forwarded to the application with a message of 30 octets, one octet for each CAS channel. The application requests to transmit a CAS frame by sending a message with 30 octets, one for each CAS channel. Most recent CAS frame will be transmitted repeatedly until the application sends a new message. The 30 octets in the message correspond to the signaling channels of these 30 time slots: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 The lower 4 bits of each octet in the message represent the signaling sub-channels: A, B, C and D. They are packed like this: '0000ABCD' Change-Id: Ib4f5e6ef02c9b0d1eec2a86d9c48376112805972 --- M include/osmocom/e1d/proto.h M src/ctl.c M src/e1d.h M src/mux_demux.c M src/proto.c M src/vty.c 6 files changed, 178 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/39/41139/1 diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h index 6481b62..e4219df 100644 --- a/include/osmocom/e1d/proto.h +++ b/include/osmocom/e1d/proto.h @@ -118,6 +118,8 @@ E1DP_TSMODE_RAW = 0x10, /*! Timeslot is in HLDC-FCS mode; e1d will run software HDLC processor. */ E1DP_TSMODE_HDLCFCS = 0x11, + /*! Timeslot is in CAS mode; e1d will run software CAS processor. */ + E1DP_TSMODE_CAS = 0x12, }; /*! Flag that can be used as osmo_e1dp_ts_config.flags to force opening a TS. */ diff --git a/src/ctl.c b/src/ctl.c index a9818b3..d8f47ba 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -92,6 +92,9 @@ case E1_TS_MODE_HDLCFCS: ti->cfg.mode = E1DP_TSMODE_HDLCFCS; break; + case E1_TS_MODE_CAS: + ti->cfg.mode = E1DP_TSMODE_CAS; + break; case E1_TS_MODE_OFF: ti->cfg.mode = E1DP_TSMODE_OFF; break; @@ -141,6 +144,7 @@ switch (mode) { case E1_TS_MODE_HDLCFCS: + case E1_TS_MODE_CAS: sock_type = SOCK_SEQPACKET; break; case E1_TS_MODE_RAW: @@ -163,6 +167,11 @@ osmo_isdnhdlc_rcv_init(&ts->hdlc.rx, OSMO_HDLC_F_BITREVERSE); } + if (mode == E1_TS_MODE_CAS) { + memset(&ts->cas.tx, 0, sizeof(ts->cas.tx)); + memset(ts->cas.tx.buf, 0xff, sizeof(ts->cas.tx.buf)); + } + int flags = fcntl(ts->fd, F_GETFL); if (flags < 0) goto out_err; @@ -387,6 +396,14 @@ case E1DP_TSMODE_HDLCFCS: mode = E1_TS_MODE_HDLCFCS; break; + case E1DP_TSMODE_CAS: + if (hdr->ts != 16) { + LOGPTS(ts, DE1D, LOGL_NOTICE, "Client request CAS for timeslot %d, " + "only timeslot 16 is allowed.\n", hdr->ts); + return 0; + } + mode = E1_TS_MODE_CAS; + break; default: LOGPTS(ts, DE1D, LOGL_NOTICE, "Client request for unknown mode %u\n", cfg->mode); return 0; diff --git a/src/e1d.h b/src/e1d.h index 55e5415..0a2b265 100644 --- a/src/e1d.h +++ b/src/e1d.h @@ -75,6 +75,7 @@ E1_TS_MODE_OFF = 0, E1_TS_MODE_RAW, E1_TS_MODE_HDLCFCS, + E1_TS_MODE_CAS, }; extern const struct value_string e1_ts_mode_names[]; @@ -83,6 +84,26 @@ E1_FRAMING_MODE_NO_CRC4, }; +enum e1_cas_state { + E1_CAS_STATE_UNSYNC = 0, + E1_CAS_STATE_SYNC, +}; + +#define E1_CAS_SYNC_VALID 4 + +struct e1_cas_tx { + uint8_t frame_count; + uint8_t buf[30]; +}; + +struct e1_cas_rx { + enum e1_cas_state state; + uint8_t frame_count; + uint8_t sync_count; + uint8_t buf[30]; + bool new_data; +}; + struct e1_ts { struct e1_line *line; uint8_t id; @@ -101,6 +122,12 @@ int tx_len; } hdlc; + /* CAS handling */ + struct { + struct e1_cas_tx tx; + struct e1_cas_rx rx; + } cas; + /* RAW handling */ struct { uint8_t *rx_buf; /* actual buffer storage */ diff --git a/src/mux_demux.c b/src/mux_demux.c index 72379fe..f5bea91 100644 --- a/src/mux_demux.c +++ b/src/mux_demux.c @@ -118,6 +118,45 @@ return len; } +static int +_e1_tx_cas(struct e1_ts *ts, uint8_t *buf, int len) +{ + int rv, i; + bool got_update = false; + + /* Get most recent update of all the signaling bits, if any. */ + while ((rv = recv(ts->fd, ts->cas.tx.buf, sizeof(ts->cas.tx.buf), MSG_TRUNC)) > 0) { + if (rv > (int)sizeof(ts->cas.tx.buf)) { + LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tries to " + "send %d bytes but our buffer is limited to %zu\n", + rv, sizeof(ts->cas.tx.buf)); + rv = sizeof(ts->cas.tx.buf); + } + LOGPTS(ts, DXFR, LOGL_DEBUG, "TX CAS Message: %s\n", osmo_hexdump(ts->cas.tx.buf, rv)); + for (i = 0; i < ((rv < 15) ? rv : 15); i++) { + if ((ts->cas.tx.buf[i] & 0xf) == 0x0) { + LOGPTS(ts, DXFR, LOGL_ERROR, + "TX CAS ERROR: Channel %d/30 imitates frame alignment.\n", i + 1); + } + } + got_update = true; + } + if (!got_update && ((rv < 0 && errno != EAGAIN) || rv == 0)) + return rv; + + for (i = 0; i < len; i++) { + if ((ts->cas.tx.frame_count) == 0) { + buf[i] = 0x0b; + } else { + buf[i] = ts->cas.tx.buf[(ts->cas.tx.frame_count) - 1] << 4; + buf[i] |= ts->cas.tx.buf[(ts->cas.tx.frame_count) + 14]; + } + ts->cas.tx.frame_count = (ts->cas.tx.frame_count + 1) & 0xf; + } + + return len; +} + /* read from a timeslot-FD (direction application -> hardware) */ static int _e1_ts_read(struct e1_ts *ts, uint8_t *buf, size_t len) @@ -131,6 +170,9 @@ case E1_TS_MODE_HDLCFCS: l = _e1_tx_hdlcfs(ts, buf, len); break; + case E1_TS_MODE_CAS: + l = _e1_tx_cas(ts, buf, len); + break; default: OSMO_ASSERT(0); break; @@ -306,6 +348,91 @@ return len; } +static int +_e1_rx_cas(struct e1_ts *ts, const uint8_t *buf, int len) +{ + int rv = 1, i; + + for (i = 0; i < len; i++) { + switch (ts->cas.rx.state) { + case E1_CAS_STATE_UNSYNC: + /* Find sync mark '0000xxxx'. */ + if (!ts->cas.rx.sync_count) { + /* If we found our first sync mark, align with it. */ + if ((buf[i] & 0xf0) == 0x00) { + ts->cas.rx.sync_count = 1; + ts->cas.rx.frame_count = 0; + } + break; + } + /* This is not a sync mark. */ + if ((buf[i] & 0xf0) != 0x00) { + if (ts->cas.rx.frame_count != 0) + break; + /* If we expect a sync mark, reset sync counter. */ + ts->cas.rx.sync_count = 0; + break; + } + /* This is a sync mark. */ + if (ts->cas.rx.frame_count != 0) { + /* We got a sync mark at different frame count, align again. */ + ts->cas.rx.sync_count = 1; + ts->cas.rx.frame_count = 0; + break; + } + /* Count until the sync is valid. */ + if (++ts->cas.rx.sync_count < E1_CAS_SYNC_VALID) + break; + ts->cas.rx.state = E1_CAS_STATE_SYNC; + LOGPTS(ts, DE1D, LOGL_INFO, "CAS frame now in sync.\n"); + /* FALLTHRU */ + case E1_CAS_STATE_SYNC: + /* Check if we are still in sync. */ + if (ts->cas.rx.frame_count == 0) { + if ((buf[i] & 0xf0) == 0x00) { + /* Set valid-counter to upper limit. */ + ts->cas.rx.sync_count = E1_CAS_SYNC_VALID; + } else { + /* Count down until sync expires. */ + if (--ts->cas.rx.sync_count == 0) { + LOGPTS(ts, DE1D, LOGL_INFO, "CAS frame sync lost.\n"); + ts->cas.rx.sync_count = 0; + ts->cas.rx.state = E1_CAS_STATE_UNSYNC; + break; + } + } + break; + } + /* Skip frame, if sync was not found for this frame. */ + if (ts->cas.rx.sync_count < E1_CAS_SYNC_VALID) + break; + /* Store received subframe. */ + if (ts->cas.rx.buf[ts->cas.rx.frame_count - 1] != (buf[i] >> 4)) { + ts->cas.rx.buf[ts->cas.rx.frame_count - 1] = (buf[i] >> 4); + ts->cas.rx.new_data = true; + } + if (ts->cas.rx.buf[ts->cas.rx.frame_count + 14] != (buf[i] & 0x0f)) { + ts->cas.rx.buf[ts->cas.rx.frame_count + 14] = (buf[i] & 0x0f); + ts->cas.rx.new_data = true; + } + /* Forward mulitframe to application. Even if there is no change, the appliction + * may need it to clock a filter (for detecting stable signals). */ + if (ts->cas.rx.frame_count == 15) { + rv = write(ts->fd, ts->cas.rx.buf, sizeof(ts->cas.rx.buf)); + if (ts->cas.rx.new_data) { + LOGPTS(ts, DXFR, LOGL_DEBUG, "RX CAS Message: %s\n", + osmo_hexdump(ts->cas.rx.buf, sizeof(ts->cas.rx.buf))); + ts->cas.rx.new_data = false; + } + } + break; + } + ts->cas.rx.frame_count = (ts->cas.rx.frame_count + 1) % 16; + } + + return (rv <= 0) ? rv : i; +} + /* write data to a timeslot (hardware -> application direction) */ static int _e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len) @@ -319,6 +446,9 @@ case E1_TS_MODE_HDLCFCS: rv = _e1_rx_hdlcfs(ts, buf, len); break; + case E1_TS_MODE_CAS: + rv = _e1_rx_cas(ts, buf, len); + break; default: OSMO_ASSERT(0); break; diff --git a/src/proto.c b/src/proto.c index b7e50bc..acd7e8c 100644 --- a/src/proto.c +++ b/src/proto.c @@ -65,6 +65,7 @@ { E1DP_TSMODE_OFF, "OFF" }, { E1DP_TSMODE_RAW, "RAW" }, { E1DP_TSMODE_HDLCFCS, "HDLC-FCS" }, + { E1DP_TSMODE_CAS, "CAS" }, { 0, NULL } }; diff --git a/src/vty.c b/src/vty.c index 3e80204..77ed708 100644 --- a/src/vty.c +++ b/src/vty.c @@ -158,6 +158,7 @@ { E1_TS_MODE_OFF, "off" }, { E1_TS_MODE_RAW, "raw" }, { E1_TS_MODE_HDLCFCS, "hdlc-fcs" }, + { E1_TS_MODE_CAS, "cas" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/41139?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib4f5e6ef02c9b0d1eec2a86d9c48376112805972 Gerrit-Change-Number: 41139 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

2026

2025

2024

2023

2022

gerrit-log