<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16186">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix recording of timestamp and make e1cap format portable<br><br>The original format included a 'struct timeval' into the packet header,<br>which unfortunately is non-potrable between e.g. i386 and amd64.<br><br>Furthermore, the code acutally writing the timveal into the header<br>was broken, resulting in invalid timestamps in all e1cap taken so far.<br><br>Change-Id: I0d22ad8f772d173c2252c2f6c562faee2e578806<br>---<br>M src/e1cap_dump.c<br>M src/storage.c<br>M src/storage.h<br>3 files changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1-recorder refs/changes/86/16186/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c</span><br><span>index 232769c..027aa82 100644</span><br><span>--- a/src/e1cap_dump.c</span><br><span>+++ b/src/e1cap_dump.c</span><br><span>@@ -174,7 +174,8 @@</span><br><span> </span><br><span>  switch (g_mode) {</span><br><span>    case MODE_PRINT:</span><br><span style="color: hsl(0, 100%, 40%);">-                tv = pkt->ts;</span><br><span style="color: hsl(120, 100%, 40%);">+              tv.tv_sec = pkt->ts.tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+                tv.tv_usec = pkt->ts.tv_usec;</span><br><span>             printf("%s %02u/%02u %u (%u): %s\n",</span><br><span>                       timeval2str(&tv),</span><br><span>                        pkt->line_nr, pkt->ts_nr, pkt->capture_mode,</span><br><span>diff --git a/src/storage.c b/src/storage.c</span><br><span>index ddbadd0..a084535 100644</span><br><span>--- a/src/storage.c</span><br><span>+++ b/src/storage.c</span><br><span>@@ -79,8 +79,9 @@</span><br><span>   };</span><br><span> </span><br><span>       h->len = htonl(msg->len);</span><br><span style="color: hsl(0, 100%, 40%);">- tv = h->ts;</span><br><span>       gettimeofday(&tv, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+  h->ts.tv_sec = tv.tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+  h->ts.tv_usec = tv.tv_usec;</span><br><span>       h->line_nr = ts->line->num;</span><br><span>         h->ts_nr = ts->num;</span><br><span>    h->capture_mode = mode;</span><br><span>diff --git a/src/storage.h b/src/storage.h</span><br><span>index c7c1890..0ea9937 100644</span><br><span>--- a/src/storage.h</span><br><span>+++ b/src/storage.h</span><br><span>@@ -11,7 +11,10 @@</span><br><span> /* header for each frame we store */</span><br><span> struct osmo_e1cap_pkthdr {</span><br><span>       /* Timestamp at which frame was received */</span><br><span style="color: hsl(0, 100%, 40%);">-     struct timeval ts;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct {</span><br><span style="color: hsl(120, 100%, 40%);">+              uint32_t tv_sec;</span><br><span style="color: hsl(120, 100%, 40%);">+              uint32_t tv_usec;</span><br><span style="color: hsl(120, 100%, 40%);">+     } ts;</span><br><span>        /* length of frame data after this header */</span><br><span>         uint32_t len;</span><br><span>        /* line/span number on which frame was received */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/16186">change 16186</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/c/osmo-e1-recorder/+/16186"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1-recorder </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0d22ad8f772d173c2252c2f6c562faee2e578806 </div>
<div style="display:none"> Gerrit-Change-Number: 16186 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>