<p>Jan Hrach has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10265">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">allow dumping GSMTAP to PCAP file<br><br>When lots of packets are streamed to loopback, some of them get mixed up and<br>lost.<br><br>Add an option to write GSMTAP frames to a file (or a pipe for realtime<br>processing). Also add an option to disable streaming them via network.<br><br>Change-Id: I955589a1d576f180fc4b80dba8ed8dc364e43d8b<br>---<br>A src/pcap.h<br>M src/tetra-rx-tests.sh<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>6 files changed, 132 insertions(+), 7 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/65/10265/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/pcap.h b/src/pcap.h</span><br><span>new file mode 100644</span><br><span>index 0000000..f3efe07</span><br><span>--- /dev/null</span><br><span>+++ b/src/pcap.h</span><br><span>@@ -0,0 +1,51 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#ifndef PCAP_H</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCAP_H</span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+typedef uint32_t guint32;</span><br><span style="color: hsl(120, 100%, 40%);">+typedef uint16_t guint16;</span><br><span style="color: hsl(120, 100%, 40%);">+typedef int32_t gint32;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+typedef struct __attribute__ ((__packed__)) pcap_hdr_s {</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 magic_number; /* magic number */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint16 version_major; /* major version number */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint16 version_minor; /* minor version number */</span><br><span style="color: hsl(120, 100%, 40%);">+ gint32 thiszone; /* GMT to local correction */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 sigfigs; /* accuracy of timestamps */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 snaplen; /* max length of captured packets, in octets */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 network; /* data link type */</span><br><span style="color: hsl(120, 100%, 40%);">+} pcap_hdr_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+typedef struct __attribute__ ((__packed__)) pcaprec_hdr_s {</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 ts_sec; /* timestamp seconds */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 ts_usec; /* timestamp microseconds */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 incl_len; /* number of octets of packet saved in file */</span><br><span style="color: hsl(120, 100%, 40%);">+ guint32 orig_len; /* actual length of packet */</span><br><span style="color: hsl(120, 100%, 40%);">+} pcaprec_hdr_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCAP_MAGIC 0xa1b2c3d4</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCAP_MAJOR 2</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCAP_MINOR 4</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCAP_SNAPLEN 65535</span><br><span style="color: hsl(120, 100%, 40%);">+#define PCAP_ETHERNET 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned char fake_frame_header[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // Ethernet frame, dst and src MAC</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x08, 0x00, // EtherType 0800 = IPv4</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x45, // IPv4 (0x4_), 20B header (0x_5)</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, // no diffserv</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0xff, // length</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xc6, 0xd1, // some random frag</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x40, 0x00, // don't frag</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x3f, // TTL</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x11, // IP proto = UDP</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x00, // checksum</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x7f, 0x00, 0x00, 0x01, // src = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x7f, 0x00, 0x00, 0x01, // dst = 127.0.0.1</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xbb, 0x13, // source port</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x12, 0x79, // dst port = 4729</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0xeb, // length = iplen-20</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x00, 0x00 // checksum</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/src/tetra-rx-tests.sh b/src/tetra-rx-tests.sh</span><br><span>index f84a1ad..d841f0c 100755</span><br><span>--- a/src/tetra-rx-tests.sh</span><br><span>+++ b/src/tetra-rx-tests.sh</span><br><span>@@ -53,7 +53,7 @@</span><br><span> tmpdir=`mktemp -d /tmp/tetraXXX`</span><br><span> </span><br><span> for f in $@; do</span><br><span style="color: hsl(0, 100%, 40%);">- corrects=`"time" -o "$tmpdir/time" ./tetra-rx "$f" $t 2>/dev/null | grep -E "^CRC COMP: 0x.+ OK" | wc -l`</span><br><span style="color: hsl(120, 100%, 40%);">+ corrects=`"time" -o "$tmpdir/time" ./tetra-rx -n "$f" $t 2>/dev/null | grep -E "^CRC COMP: 0x.+ OK" | wc -l`</span><br><span> tt=`grep user "$tmpdir/time" | head -n 1 | cut -d u -f 1`</span><br><span> echo "$f: $corrects frames, $tt s"</span><br><span> hash=`sha256sum "$f" | cut -c 1-20`</span><br><span>diff --git a/src/tetra-rx.c b/src/tetra-rx.c</span><br><span>index ed4d252..8498f8c 100644</span><br><span>--- a/src/tetra-rx.c</span><br><span>+++ b/src/tetra-rx.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 <stdbool.h></span><br><span> </span><br><span> #include <fcntl.h></span><br><span> #include <sys/stat.h></span><br><span>@@ -43,24 +44,42 @@</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(120, 100%, 40%);">+ char *pcap_file_path = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool no_udp_tap = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool err = false;</span><br><span style="color: hsl(120, 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(0, 100%, 40%);">- while ((opt = getopt(argc, argv, "d:")) != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ while ((opt = getopt(argc, argv, "a:t:d:n")) != -1) {</span><br><span> switch (opt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'a':</span><br><span style="color: hsl(120, 100%, 40%);">+ tms->arfcn = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 't':</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_file_path = strdup(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'd':</span><br><span> tms->dumpdir = strdup(optarg);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'n':</span><br><span style="color: hsl(120, 100%, 40%);">+ no_udp_tap = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> fprintf(stderr, "Unknown option %c\n", opt);</span><br><span style="color: hsl(120, 100%, 40%);">+ err = true;</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (argc <= optind) {</span><br><span style="color: hsl(0, 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%);">+ if (argc <= optind || err) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Usage: %s [params] <file_with_1_byte_per_bit>\n", argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " -a arfcn .. set ARFCN used in GSMTAP\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " -t filename .. output PCAP to file\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " -d directory .. dump traffic channel to directory\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, " -n .. disable GSMTAP over UDP\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span>@@ -70,7 +89,11 @@</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tetra_gsmtap_init("localhost", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!no_udp_tap)</span><br><span style="color: hsl(120, 100%, 40%);">+ tetra_gsmtap_init_network("localhost", 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcap_file_path)</span><br><span style="color: hsl(120, 100%, 40%);">+ tetra_gsmtap_init_file(pcap_file_path);</span><br><span> </span><br><span> while (1) {</span><br><span> uint8_t buf[64];</span><br><span>diff --git a/src/tetra_common.h b/src/tetra_common.h</span><br><span>index d141e9b..a270a26 100644</span><br><span>--- a/src/tetra_common.h</span><br><span>+++ b/src/tetra_common.h</span><br><span>@@ -52,6 +52,7 @@</span><br><span> char *dumpdir; /* Where to save traffic channel dump */</span><br><span> int ssi; /* SSI */</span><br><span> int tsn; /* Timeslon number */</span><br><span style="color: hsl(120, 100%, 40%);">+ int arfcn;</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 79b48a7..b656ff6 100644</span><br><span>--- a/src/tetra_gsmtap.c</span><br><span>+++ b/src/tetra_gsmtap.c</span><br><span>@@ -4,6 +4,7 @@</span><br><span> #include <unistd.h></span><br><span> #include <stdio.h></span><br><span> #include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <time.h></span><br><span> </span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/gsmtap.h></span><br><span>@@ -13,6 +14,9 @@</span><br><span> </span><br><span> #include "tetra_common.h"</span><br><span> #include "tetra_tdma.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "pcap.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static FILE * pcap_file;</span><br><span> </span><br><span> static struct gsmtap_inst *g_gti = NULL;</span><br><span> </span><br><span>@@ -62,15 +66,38 @@</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void pcap_file_write(void *buf, size_t n)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pcap_file) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fwrite(buf, n, 1, pcap_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ fflush(pcap_file);</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> int tetra_gsmtap_sendmsg(struct msgb *msg)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ pcaprec_hdr_t hdr = {0};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timespec now;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ clock_gettime(CLOCK_REALTIME, &now);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.ts_sec = now.tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.ts_usec = now.tv_nsec/1000;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.incl_len = msg->len + sizeof(fake_frame_header);</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.orig_len = hdr.incl_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_file_write(&hdr, sizeof(hdr));</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_file_write(&fake_frame_header, sizeof(fake_frame_header));</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_file_write(msg->data, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (g_gti)</span><br><span> return gsmtap_sendmsg(g_gti, msg);</span><br><span> else</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int tetra_gsmtap_init(const char *host, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+int tetra_gsmtap_init_network(const char *host, uint16_t port)</span><br><span> {</span><br><span> g_gti = gsmtap_source_init(host, port, 0);</span><br><span> if (!g_gti)</span><br><span>@@ -79,3 +106,25 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int tetra_gsmtap_init_file(const char *filename)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_hdr_t hdr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&hdr, 0, sizeof(hdr));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.magic_number = PCAP_MAGIC;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.version_major = PCAP_MAJOR;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.version_minor = PCAP_MINOR;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.snaplen = PCAP_SNAPLEN;</span><br><span style="color: hsl(120, 100%, 40%);">+ hdr.network = PCAP_ETHERNET;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pcap_file = fopen(filename, "wb");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pcap_file) {</span><br><span style="color: hsl(120, 100%, 40%);">+ perror("pcap file open");</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%);">+ pcap_file_write(&hdr, sizeof(pcap_hdr_t));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/tetra_gsmtap.h b/src/tetra_gsmtap.h</span><br><span>index 34963d0..6f77240 100644</span><br><span>--- a/src/tetra_gsmtap.h</span><br><span>+++ b/src/tetra_gsmtap.h</span><br><span>@@ -8,6 +8,7 @@</span><br><span> </span><br><span> int tetra_gsmtap_sendmsg(struct msgb *msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int tetra_gsmtap_init(const char *host, uint16_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+int tetra_gsmtap_init_network(const char *host, uint16_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+int tetra_gsmtap_init_file(const char *filename);</span><br><span> </span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10265">change 10265</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/10265"/><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: I955589a1d576f180fc4b80dba8ed8dc364e43d8b </div>
<div style="display:none"> Gerrit-Change-Number: 10265 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jan Hrach <jenda.2vf9h@hrach.eu> </div>