From 1c8ae666548d350701c3645a97792776203ff200 Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Thu, 9 Apr 2020 18:51:05 +0200
Subject: [PATCH] Move icmpv6 and checksum files from ggsn/ dir to lib/

They will be required by sgsnemu to implement ICMPv6 Router
Soliciations.

Change-Id: Ie878604f0fc0169cc98a1e9eee64b14d76be2c45
---
 ggsn/Makefile.am         | 2 +-
 ggsn/ggsn.c              | 2 +-
 lib/Makefile.am          | 4 ++--
 {ggsn => lib}/checksum.c | 0
 {ggsn => lib}/checksum.h | 0
 {ggsn => lib}/icmpv6.c   | 4 ++--
 {ggsn => lib}/icmpv6.h   | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename {ggsn => lib}/checksum.c (100%)
 rename {ggsn => lib}/checksum.h (100%)
 rename {ggsn => lib}/icmpv6.c (99%)
 rename {ggsn => lib}/icmpv6.h (100%)

diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index ca389f0..eea7c6e 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -12,4 +12,4 @@ osmo_ggsn_LDADD += $(LIBGTPNL_LIBS)
 endif
 
 osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
-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
+osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.h pco.c pco.h
diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c
index c710984..3b10f70 100644
--- a/ggsn/ggsn.c
+++ b/ggsn/ggsn.c
@@ -54,7 +54,7 @@
 #include "../lib/util.h"
 #include "../gtp/pdp.h"
 #include "../gtp/gtp.h"
-#include "icmpv6.h"
+#include "../lib/icmpv6.h"
 #include "pco.h"
 #include "ggsn.h"
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f2c5dc9..5bd9443 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,10 @@
 noinst_LIBRARIES = libmisc.a
 
-noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h netns.h util.h
+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
 
 AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
 
-libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c netns.c util.c
+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
 
 if ENABLE_GTP_KERNEL
 AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
diff --git a/ggsn/checksum.c b/lib/checksum.c
similarity index 100%
rename from ggsn/checksum.c
rename to lib/checksum.c
diff --git a/ggsn/checksum.h b/lib/checksum.h
similarity index 100%
rename from ggsn/checksum.h
rename to lib/checksum.h
diff --git a/ggsn/icmpv6.c b/lib/icmpv6.c
similarity index 99%
rename from ggsn/icmpv6.c
rename to lib/icmpv6.c
index 12119b8..a6545fd 100644
--- a/ggsn/icmpv6.c
+++ b/lib/icmpv6.c
@@ -25,8 +25,8 @@
 
 #include "../gtp/gtp.h"
 #include "../gtp/pdp.h"
-#include "../lib/ippool.h"
-#include "../lib/syserr.h"
+#include "ippool.h"
+#include "syserr.h"
 #include "config.h"
 
 /* 29.061 11.2.1.3.4 IPv6 Router Configuration Variables in GGSN */
diff --git a/ggsn/icmpv6.h b/lib/icmpv6.h
similarity index 100%
rename from ggsn/icmpv6.h
rename to lib/icmpv6.h