<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/24494">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Log tun fd write errors<br><br>Change-Id: I5f681b5edcc4cf525629d2078ae0c0ffd7ebb72d<br>---<br>M ggsn/ggsn.h<br>M lib/tun.c<br>M lib/tun.h<br>3 files changed, 11 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/94/24494/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h</span><br><span>index 82984a0..132d059 100644</span><br><span>--- a/ggsn/ggsn.h</span><br><span>+++ b/ggsn/ggsn.h</span><br><span>@@ -167,6 +167,3 @@</span><br><span>    LOGP(DGGSN, level, "GGSN(%s): " fmt, (ggsn)->cfg.name, ## args)</span><br><span> </span><br><span> #define LOGPPDP(level, pdp, fmt, args...) LOGPDPX(DGGSN, level, pdp, fmt, ## args)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define LOGTUN(level, tun, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">-        LOGP(DTUN, level, "TUN(%s): " fmt, (tun)->devname, ## args)</span><br><span>diff --git a/lib/tun.c b/lib/tun.c</span><br><span>index c771b92..cb66fef 100644</span><br><span>--- a/lib/tun.c</span><br><span>+++ b/lib/tun.c</span><br><span>@@ -318,7 +318,14 @@</span><br><span> </span><br><span> int tun_encaps(struct tun_t *tun, void *pack, unsigned len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        return write(tun->fd, pack, len);</span><br><span style="color: hsl(120, 100%, 40%);">+  int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       rc = write(tun->fd, pack, len);</span><br><span style="color: hsl(120, 100%, 40%);">+    if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+              SYS_ERR(DTUN, LOGL_ERROR, errno, "TUN(%s): write() failed", tun->devname);</span><br><span style="color: hsl(120, 100%, 40%);">+       } else if (rc < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGTUN(LOGL_ERROR, tun, "short write() %d < %u\n", rc, len);</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+     return rc;</span><br><span> }</span><br><span> </span><br><span> int tun_runscript(struct tun_t *tun, char *script)</span><br><span>diff --git a/lib/tun.h b/lib/tun.h</span><br><span>index 07ca04a..36a4f7e 100644</span><br><span>--- a/lib/tun.h</span><br><span>+++ b/lib/tun.h</span><br><span>@@ -59,4 +59,7 @@</span><br><span> int tun_ip_local_get(const struct tun_t *tun, struct in46_prefix *prefix_list,</span><br><span>                  size_t prefix_size, int flags);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGTUN(level, tun, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+  LOGP(DTUN, level, "TUN(%s): " fmt, (tun)->devname, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* !_TUN_H */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/24494">change 24494</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-ggsn/+/24494"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5f681b5edcc4cf525629d2078ae0c0ffd7ebb72d </div>
<div style="display:none"> Gerrit-Change-Number: 24494 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>