<p>Jan Hrach has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10264">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add traffic dumping patch, use getopt to parse arguments<br><br>Enable the user to specify a directory, where contents of traffic channel will<br>be saved. Together with this dump, a text file with SSIs of the engaged<br>stations is saved too.<br><br>Based on 0004-HACK-Quick-hack-to-save-the-speech-data-from-TCH.patch available at<br>https://build.opensuse.org/package/view_file/home:mnhauke:sdr/osmo-tetra/0004-HACK-Quick-hack-to-save-the-speech-data-from-TCH.patch<br><br>Change-Id: I94135753a76cadfa373167ffca18e89bee5bcff8<br>---<br>M src/lower_mac/tetra_lower_mac.c<br>M src/tetra-rx.c<br>M src/tetra_common.h<br>M src/tetra_gsmtap.c<br>M src/tetra_gsmtap.h<br>M src/tetra_upper_mac.c<br>6 files changed, 84 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-tetra refs/changes/64/10264/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c</span><br><span>index 7b62bb4..81832bc 100644</span><br><span>--- a/src/lower_mac/tetra_lower_mac.c</span><br><span>+++ b/src/lower_mac/tetra_lower_mac.c</span><br><span>@@ -22,6 +22,7 @@</span><br><span> #include <stdlib.h></span><br><span> #include <string.h></span><br><span> #include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <linux/limits.h></span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span>@@ -184,6 +185,48 @@</span><br><span> DEBUGP("%s %s type4: %s\n", tbp->name, time_str,</span><br><span> osmo_ubit_dump(type4, tbp->type345_bits));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* If this is a traffic channel, dump. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((type == TPSAP_T_SCH_F) && tms->cur_burst.is_traffic && tms->dumpdir) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char fname[PATH_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+ int16_t block[690];</span><br><span style="color: hsl(120, 100%, 40%);">+ FILE *f;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Open target file */</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(fname, sizeof(fname), "%s/traffic_%d_%d.out", tms->dumpdir,</span><br><span style="color: hsl(120, 100%, 40%);">+ tms->cur_burst.is_traffic, tms->tsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ f = fopen(fname, "ab");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Generate a block */</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(block, 0x00, sizeof(int16_t) * 690);</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 6; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ block[115*i] = 0x6b21 + i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 114; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ block[1+i] = type4[i] ? -127 : 127;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 114; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ block[116+i] = type4[114+i] ? -127 : 127;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 114; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ block[231+i] = type4[228+i] ? -127 : 127;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 90; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ block[346+i] = type4[342+i] ? -127 : 127;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Write it */</span><br><span style="color: hsl(120, 100%, 40%);">+ fwrite(block, sizeof(int16_t), 690, f);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fclose(f);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Write used ssi */</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(fname, sizeof(fname), "%s/traffic_%d_%d.txt", tms->dumpdir,</span><br><span style="color: hsl(120, 100%, 40%);">+ tms->cur_burst.is_traffic, tms->tsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ f = fopen(fname, "a");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(f, "%d\n", tms->ssi);</span><br><span style="color: hsl(120, 100%, 40%);">+ fclose(f);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (tbp->interleave_a) {</span><br><span> /* Run block deinterleaving: type-3 bits */</span><br><span> block_deinterleave(tbp->type345_bits, tbp->interleave_a, type4, type3);</span><br><span>diff --git a/src/tetra-rx.c b/src/tetra-rx.c</span><br><span>index c751772..ed4d252 100644</span><br><span>--- a/src/tetra-rx.c</span><br><span>+++ b/src/tetra-rx.c</span><br><span>@@ -39,28 +39,39 @@</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> int fd;</span><br><span style="color: hsl(120, 100%, 40%);">+ int opt;</span><br><span> struct tetra_rx_state *trs;</span><br><span> struct tetra_mac_state *tms;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (argc < 2) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Usage: %s <file_with_1_byte_per_bit>\n", argv[0]);</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- fd = open(argv[1], O_RDONLY);</span><br><span style="color: hsl(0, 100%, 40%);">- if (fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- perror("open");</span><br><span style="color: hsl(0, 100%, 40%);">- exit(2);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- tetra_gsmtap_init("localhost", 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> tms = talloc_zero(tetra_tall_ctx, struct tetra_mac_state);</span><br><span> tetra_mac_state_init(tms);</span><br><span> </span><br><span> trs = talloc_zero(tetra_tall_ctx, struct tetra_rx_state);</span><br><span> trs->burst_cb_priv = tms;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ while ((opt = getopt(argc, argv, "d:")) != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (opt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'd':</span><br><span style="color: hsl(120, 100%, 40%);">+ tms->dumpdir = strdup(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Unknown option %c\n", opt);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc <= optind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Usage: %s [-d DUMPDIR] <file_with_1_byte_per_bit>\n", argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ fd = open(argv[optind], O_RDONLY);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fd < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("open");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ tetra_gsmtap_init("localhost", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> while (1) {</span><br><span> uint8_t buf[64];</span><br><span> int len;</span><br><span>@@ -76,6 +87,7 @@</span><br><span> tetra_burst_sync_in(trs, buf, len);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ free(tms->dumpdir);</span><br><span> talloc_free(trs);</span><br><span> talloc_free(tms);</span><br><span> </span><br><span>diff --git a/src/tetra_common.h b/src/tetra_common.h</span><br><span>index 3207c0d..d141e9b 100644</span><br><span>--- a/src/tetra_common.h</span><br><span>+++ b/src/tetra_common.h</span><br><span>@@ -47,7 +47,11 @@</span><br><span> struct {</span><br><span> int is_traffic;</span><br><span> } cur_burst;</span><br><span style="color: hsl(0, 100%, 40%);">- struct tetra_si_decoded last_sid;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tetra_si_decoded last_sid;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ char *dumpdir; /* Where to save traffic channel dump */</span><br><span style="color: hsl(120, 100%, 40%);">+ int ssi; /* SSI */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsn; /* Timeslon number */</span><br><span> };</span><br><span> </span><br><span> void tetra_mac_state_init(struct tetra_mac_state *tms);</span><br><span>diff --git a/src/tetra_gsmtap.c b/src/tetra_gsmtap.c</span><br><span>index f575c20..79b48a7 100644</span><br><span>--- a/src/tetra_gsmtap.c</span><br><span>+++ b/src/tetra_gsmtap.c</span><br><span>@@ -28,9 +28,9 @@</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts, uint8_t ss, int8_t signal_dbm,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t snr, const ubit_t *bitdata, unsigned int bitlen)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan, uint8_t ts, uint8_t ss,</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t signal_dbm, uint8_t snr, const ubit_t *bitdata, unsigned int bitlen,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tetra_mac_state *tms)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span> struct gsmtap_hdr *gh;</span><br><span>@@ -47,6 +47,7 @@</span><br><span> gh->hdr_len = sizeof(*gh)/4;</span><br><span> gh->type = GSMTAP_TYPE_TETRA_I1;</span><br><span> gh->timeslot = ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ tms->tsn = ts;</span><br><span> gh->sub_slot = ss;</span><br><span> gh->snr_db = snr;</span><br><span> gh->signal_dbm = signal_dbm;</span><br><span>diff --git a/src/tetra_gsmtap.h b/src/tetra_gsmtap.h</span><br><span>index b62a4c5..34963d0 100644</span><br><span>--- a/src/tetra_gsmtap.h</span><br><span>+++ b/src/tetra_gsmtap.h</span><br><span>@@ -2,9 +2,9 @@</span><br><span> #define TETRA_GSMTAP_H</span><br><span> #include "tetra_common.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts, uint8_t ss, int8_t signal_dbm,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t snr, const uint8_t *data, unsigned int len);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *tetra_gsmtap_makemsg(struct tetra_tdma_time *tm, enum tetra_log_chan lchan, uint8_t ts, uint8_t ss,</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t signal_dbm, uint8_t snr, const uint8_t *bitdata, unsigned int bitlen,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tetra_mac_state *tms);</span><br><span> </span><br><span> int tetra_gsmtap_sendmsg(struct msgb *msg);</span><br><span> </span><br><span>diff --git a/src/tetra_upper_mac.c b/src/tetra_upper_mac.c</span><br><span>index fdc8c73..a4c7e59 100644</span><br><span>--- a/src/tetra_upper_mac.c</span><br><span>+++ b/src/tetra_upper_mac.c</span><br><span>@@ -181,6 +181,8 @@</span><br><span> rx_tm_sdu(tms, msg, len_bits);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ tms->ssi = rsd.addr.ssi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> out:</span><br><span> printf("\n");</span><br><span> }</span><br><span>@@ -241,7 +243,7 @@</span><br><span> </span><br><span> /* save the state whether the current burst is traffic or not */</span><br><span> if (aad.dl_usage > 3)</span><br><span style="color: hsl(0, 100%, 40%);">- tms->cur_burst.is_traffic = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ tms->cur_burst.is_traffic = aad.dl_usage;</span><br><span> else</span><br><span> tms->cur_burst.is_traffic = 0;</span><br><span> </span><br><span>@@ -276,7 +278,7 @@</span><br><span> gsmtap_msg = tetra_gsmtap_makemsg(&tup->tdma_time, tup->lchan,</span><br><span> tup->tdma_time.tn,</span><br><span> /* FIXME: */ 0, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- msg->l1h, msgb_l1len(msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l1h, msgb_l1len(msg), tms);</span><br><span> if (gsmtap_msg)</span><br><span> tetra_gsmtap_sendmsg(gsmtap_msg);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10264">change 10264</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10264"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-tetra </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I94135753a76cadfa373167ffca18e89bee5bcff8 </div>
<div style="display:none"> Gerrit-Change-Number: 10264 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jan Hrach <jenda.2vf9h@hrach.eu> </div>