Change in osmo-ggsn[master]: Move icmpv6 and checksum files from ggsn/ dir to lib/

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Tue Apr 14 13:18:24 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/17768 )

Change subject: Move icmpv6 and checksum files from ggsn/ dir to lib/
......................................................................

Move icmpv6 and checksum files from ggsn/ dir to lib/

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

Change-Id: Ie878604f0fc0169cc98a1e9eee64b14d76be2c45
---
M ggsn/Makefile.am
M ggsn/ggsn.c
M lib/Makefile.am
R lib/checksum.c
R lib/checksum.h
R lib/icmpv6.c
R lib/icmpv6.h
7 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified



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 @@
 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 98%
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

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/17768
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Ie878604f0fc0169cc98a1e9eee64b14d76be2c45
Gerrit-Change-Number: 17768
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200414/b17243eb/attachment.htm>


More information about the gerrit-log mailing list