<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/15250">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move pdp_get_peer_ipv() to lib/util.*<br><br>Preparation for next commit, where this function will be needed inside<br>libmisc (lib/*).<br><br>Change-Id: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5<br>---<br>M ggsn/ggsn.c<br>M ggsn/ggsn.h<br>M ggsn/ggsn_vty.c<br>M ggsn/pco.c<br>M lib/Makefile.am<br>A lib/util.c<br>A lib/util.h<br>7 files changed, 60 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index c7756d9..4e13151 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -51,6 +51,7 @@</span><br><span> #include "../lib/syserr.h"</span><br><span> #include "../lib/in46_addr.h"</span><br><span> #include "../lib/gtp-kernel.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "../lib/util.h"</span><br><span> #include "../gtp/pdp.h"</span><br><span> #include "../gtp/gtp.h"</span><br><span> #include "icmpv6.h"</span><br><span>@@ -365,26 +366,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Get the peer of pdp based on IP version used.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] pdp PDP context to select the peer from.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] v4v6 IP version to select. Valid values are 4 and 6.</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns The selected peer matching the given IP version. NULL if not present.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 2; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct ippoolm_t * ippool = pdp->peer[i];</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ippool)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (is_ipv6 && in46a_is_v6(&ippool->addr))</span><br><span style="color: hsl(0, 100%, 40%);">- return ippool;</span><br><span style="color: hsl(0, 100%, 40%);">- else if (!is_ipv6 && in46a_is_v4(&ippool->addr))</span><br><span style="color: hsl(0, 100%, 40%);">- return ippool;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static bool apn_supports_ipv4(const struct apn_ctx *apn)</span><br><span> {</span><br><span> if (apn->v4.cfg.static_prefix.addr.len || apn->v4.cfg.dynamic_prefix.addr.len)</span><br><span>diff --git a/ggsn/ggsn.h b/ggsn/ggsn.h</span><br><span>index 1bd067e..88fd8b9 100644</span><br><span>--- a/ggsn/ggsn.h</span><br><span>+++ b/ggsn/ggsn.h</span><br><span>@@ -145,7 +145,6 @@</span><br><span> extern int ggsn_stop(struct ggsn_ctx *ggsn);</span><br><span> extern int apn_start(struct apn_ctx *apn);</span><br><span> extern int apn_stop(struct apn_ctx *apn);</span><br><span style="color: hsl(0, 100%, 40%);">-extern struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6);</span><br><span> </span><br><span> #define LOGPAPN(level, apn, fmt, args...) \</span><br><span> LOGP(DGGSN, level, "APN(%s): " fmt, (apn)->cfg.name, ## args)</span><br><span>diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c</span><br><span>index 0a86f49..b85df77 100644</span><br><span>--- a/ggsn/ggsn_vty.c</span><br><span>+++ b/ggsn/ggsn_vty.c</span><br><span>@@ -37,6 +37,8 @@</span><br><span> #include "../gtp/gtp.h"</span><br><span> #include "../gtp/pdp.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "../lib/util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "ggsn.h"</span><br><span> </span><br><span> #define PREFIX_STR "Prefix (Network/Netmask)\n"</span><br><span>diff --git a/ggsn/pco.c b/ggsn/pco.c</span><br><span>index 5715865..e2181e1 100644</span><br><span>--- a/ggsn/pco.c</span><br><span>+++ b/ggsn/pco.c</span><br><span>@@ -17,6 +17,8 @@</span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/gsm/tlv.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "../lib/util.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "pco.h"</span><br><span> #include "ggsn.h"</span><br><span> </span><br><span>diff --git a/lib/Makefile.am b/lib/Makefile.am</span><br><span>index b6e7aba..533d777 100644</span><br><span>--- a/lib/Makefile.am</span><br><span>+++ b/lib/Makefile.am</span><br><span>@@ -1,10 +1,10 @@</span><br><span> noinst_LIBRARIES = libmisc.a</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h util.h</span><br><span> </span><br><span> AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c</span><br><span style="color: hsl(120, 100%, 40%);">+libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c util.c</span><br><span> </span><br><span> if ENABLE_GTP_KERNEL</span><br><span> AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)</span><br><span>diff --git a/lib/util.c b/lib/util.c</span><br><span>new file mode 100644</span><br><span>index 0000000..6bb0d85</span><br><span>--- /dev/null</span><br><span>+++ b/lib/util.c</span><br><span>@@ -0,0 +1,35 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * misc helpers</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright 2019 sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The contents of this file may be used under the terms of the GNU</span><br><span style="color: hsl(120, 100%, 40%);">+ * General Public License Version 2, provided that the above copyright</span><br><span style="color: hsl(120, 100%, 40%);">+ * notice and this permission notice is included in all copies or</span><br><span style="color: hsl(120, 100%, 40%);">+ * substantial portions of the software.</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%);">+#include "../gtp/pdp.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "ippool.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "in46_addr.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Get the peer of pdp based on IP version used.</span><br><span style="color: hsl(120, 100%, 40%);">+* \param[in] pdp PDP context to select the peer from.</span><br><span style="color: hsl(120, 100%, 40%);">+* \param[in] v4v6 IP version to select. Valid values are 4 and 6.</span><br><span style="color: hsl(120, 100%, 40%);">+* \returns The selected peer matching the given IP version. NULL if not present.</span><br><span style="color: hsl(120, 100%, 40%);">+*/</span><br><span style="color: hsl(120, 100%, 40%);">+struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 2; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ippoolm_t * ippool = pdp->peer[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ippool)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_ipv6 && in46a_is_v6(&ippool->addr))</span><br><span style="color: hsl(120, 100%, 40%);">+ return ippool;</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (!is_ipv6 && in46a_is_v4(&ippool->addr))</span><br><span style="color: hsl(120, 100%, 40%);">+ return ippool;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/lib/util.h b/lib/util.h</span><br><span>new file mode 100644</span><br><span>index 0000000..bc9674d</span><br><span>--- /dev/null</span><br><span>+++ b/lib/util.h</span><br><span>@@ -0,0 +1,18 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * misc helpers</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright 2019 sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * The contents of this file may be used under the terms of the GNU</span><br><span style="color: hsl(120, 100%, 40%);">+ * General Public License Version 2, provided that the above copyright</span><br><span style="color: hsl(120, 100%, 40%);">+ * notice and this permission notice is included in all copies or</span><br><span style="color: hsl(120, 100%, 40%);">+ * substantial portions of the software.</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%);">+#include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct ippoolm_t;</span><br><span style="color: hsl(120, 100%, 40%);">+struct pdp_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct ippoolm_t *pdp_get_peer_ipv(struct pdp_t *pdp, bool is_ipv6);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/15250">change 15250</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/+/15250"/><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: Ibab4f6c09d1e5f0e9cfaea28ae1e7ab5b5c219b5 </div>
<div style="display:none"> Gerrit-Change-Number: 15250 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>