<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17768">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move icmpv6 and checksum files from ggsn/ dir to lib/<br><br>They will be required by sgsnemu to implement ICMPv6 Router<br>Soliciations.<br><br>Change-Id: Ie878604f0fc0169cc98a1e9eee64b14d76be2c45<br>---<br>M ggsn/Makefile.am<br>M ggsn/ggsn.c<br>M lib/Makefile.am<br>R lib/checksum.c<br>R lib/checksum.h<br>R lib/icmpv6.c<br>R lib/icmpv6.h<br>7 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am</span><br><span>index ca389f0..eea7c6e 100644</span><br><span>--- a/ggsn/Makefile.am</span><br><span>+++ b/ggsn/Makefile.am</span><br><span>@@ -12,4 +12,4 @@</span><br><span> endif</span><br><span> </span><br><span> osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.h icmpv6.c icmpv6.h checksum.c checksum.h pco.c pco.h</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.h pco.c pco.h</span><br><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index c710984..3b10f70 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -54,7 +54,7 @@</span><br><span> #include "../lib/util.h"</span><br><span> #include "../gtp/pdp.h"</span><br><span> #include "../gtp/gtp.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "icmpv6.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "../lib/icmpv6.h"</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 f2c5dc9..5bd9443 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 netns.h util.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 netns.h util.h icmpv6.h checksum.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 netns.c util.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 netns.c util.c icmpv6.c checksum.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/ggsn/checksum.c b/lib/checksum.c</span><br><span>similarity index 100%</span><br><span>rename from ggsn/checksum.c</span><br><span>rename to lib/checksum.c</span><br><span>diff --git a/ggsn/checksum.h b/lib/checksum.h</span><br><span>similarity index 100%</span><br><span>rename from ggsn/checksum.h</span><br><span>rename to lib/checksum.h</span><br><span>diff --git a/ggsn/icmpv6.c b/lib/icmpv6.c</span><br><span>similarity index 98%</span><br><span>rename from ggsn/icmpv6.c</span><br><span>rename to lib/icmpv6.c</span><br><span>index 12119b8..a6545fd 100644</span><br><span>--- a/ggsn/icmpv6.c</span><br><span>+++ b/lib/icmpv6.c</span><br><span>@@ -25,8 +25,8 @@</span><br><span> </span><br><span> #include "../gtp/gtp.h"</span><br><span> #include "../gtp/pdp.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "../lib/ippool.h"</span><br><span style="color: hsl(0, 100%, 40%);">-#include "../lib/syserr.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "ippool.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "syserr.h"</span><br><span> #include "config.h"</span><br><span> </span><br><span> /* 29.061 11.2.1.3.4 IPv6 Router Configuration Variables in GGSN */</span><br><span>diff --git a/ggsn/icmpv6.h b/lib/icmpv6.h</span><br><span>similarity index 100%</span><br><span>rename from ggsn/icmpv6.h</span><br><span>rename to lib/icmpv6.h</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/17768">change 17768</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/+/17768"/><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: Ie878604f0fc0169cc98a1e9eee64b14d76be2c45 </div>
<div style="display:none"> Gerrit-Change-Number: 17768 </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@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>