pool/osmo-ggsn
SHA256
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: pool:factory
Branches Tags
pool:factory
jengelh:master
jengelh:factory
..
compare: jengelh:master
Branches Tags
jengelh:master
jengelh:factory
pool:factory

2 Commits
factory ... master

Author SHA256 Message Date
Jan Engelhardt
84ef1b5144 osmo-ggsn 1.13.0 2025-02-13 15:06:06 +01:00
Jan Engelhardt
0a8f8d6d73 osmo-ggsn 1.12.0 2024-10-26 16:06:20 +02:00
5 changed files with 121 additions and 64 deletions
Show Stats Expand all files Collapse all files

3
1.11.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3b942513d062f19811a686dd33473d98e1c23978e276259da945986b11d3f51
size 478258

BIN
1.13.0.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

143
build-fixes.diff
View File

@ -9,28 +9,36 @@
* remove AC_PROG_CXX, the C++ is never used * remove AC_PROG_CXX, the C++ is never used
--- ---
ggsn/Makefile.am | 11 ++++++----- ggsn/Makefile.am | 15 +++++----------
gtp/Makefile.am | 3 ++- gtp/Makefile.am | 4 +---
lib/Makefile.am | 8 ++++---- lib/Makefile.am | 12 +++++-------
lib/gtp-kernel.c | 1 + lib/gtp-kernel.c | 1 +
sgsnemu/Makefile.am | 11 ++++++----- sgsnemu/Makefile.am | 13 +++++--------
tests/gtp/Makefile.am | 2 +- tests/gtp/Makefile.am | 2 +-
tests/lib/Makefile.am | 4 ++-- tests/lib/Makefile.am | 4 ++--
7 files changed, 22 insertions(+), 18 deletions(-) 7 files changed, 20 insertions(+), 31 deletions(-)
Index: osmo-ggsn-1.10.2/ggsn/Makefile.am Index: osmo-ggsn-1.12.0/ggsn/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/ggsn/Makefile.am --- osmo-ggsn-1.12.0.orig/ggsn/Makefile.am
+++ osmo-ggsn-1.10.2/ggsn/Makefile.am +++ osmo-ggsn-1.12.0/ggsn/Makefile.am
@@ -1,15 +1,16 @@ @@ -1,24 +1,19 @@
-bin_PROGRAMS = osmo-ggsn -bin_PROGRAMS = osmo-ggsn
+sbin_PROGRAMS = osmo-ggsn +sbin_PROGRAMS = osmo-ggsn
AM_LDFLAGS = @EXEC_LDFLAGS@ AM_LDFLAGS = @EXEC_LDFLAGS@
-AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) +AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) AM_CFLAGS = \
+AM_CFLAGS = -fno-builtin -Wall - -D_GNU_SOURCE \
-fno-builtin \
-Wall \
- -DSBINDIR='"$(sbindir)"' \
- -I$(top_srcdir)/include \
- $(LIBOSMOCORE_CFLAGS) \
- $(LIBOSMOCTRL_CFLAGS) \
- $(LIBOSMOVTY_CFLAGS) \
$(NULL)
-osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) -osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
+osmo_ggsn_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS) +osmo_ggsn_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
@ -44,46 +52,66 @@ Index: osmo-ggsn-1.10.2/ggsn/Makefile.am
-osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
+osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.la +osmo_ggsn_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.la
osmo_ggsn_SOURCES = ggsn_main.c ggsn_vty.c ggsn.c ggsn.h sgsn.c sgsn.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
Index: osmo-ggsn-1.10.2/gtp/Makefile.am Index: osmo-ggsn-1.12.0/gtp/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/gtp/Makefile.am --- osmo-ggsn-1.12.0.orig/gtp/Makefile.am
+++ osmo-ggsn-1.10.2/gtp/Makefile.am +++ osmo-ggsn-1.12.0/gtp/Makefile.am
@@ -8,7 +8,8 @@ lib_LTLIBRARIES = libgtp.la @@ -6,12 +6,10 @@ LIBVERSION=10:0:0
include_HEADERS = gtp.h gsn.h pdp.h gtpie.h lib_LTLIBRARIES = libgtp.la
-AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS)
+AM_CFLAGS = -fno-builtin -Wall AM_CFLAGS = \
+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) -fno-builtin \
-Wall \
- -DSBINDIR='"$(sbindir)"' \
- -I$(top_srcdir)/include \
- $(LIBOSMOCORE_CFLAGS) \
$(NULL)
libgtp_la_SOURCES = gtp.c gtp.h gsn.c gsn.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h libgtp_la_SOURCES = \
libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined Index: osmo-ggsn-1.12.0/lib/Makefile.am
Index: osmo-ggsn-1.10.2/lib/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/lib/Makefile.am --- osmo-ggsn-1.12.0.orig/lib/Makefile.am
+++ osmo-ggsn-1.10.2/lib/Makefile.am +++ osmo-ggsn-1.12.0/lib/Makefile.am
@@ -1,12 +1,12 @@ @@ -1,4 +1,4 @@
-noinst_LIBRARIES = libmisc.a -noinst_LIBRARIES = libmisc.a
+noinst_LTLIBRARIES = libmisc.la +noinst_LTLIBRARIES = libmisc.la
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 noinst_HEADERS = \
checksum.h \
@@ -15,15 +15,13 @@ noinst_HEADERS = \
util.h \
$(NULL)
AM_CFLAGS = -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS)
AM_CFLAGS = \
-fno-builtin \
-Wall \
- -DSBINDIR='"$(sbindir)"' \
- -I$(top_srcdir)/include \
- $(LIBOSMOCORE_CFLAGS) \
$(NULL)
-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 -libmisc_a_SOURCES = \
+libmisc_la_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 +libmisc_la_SOURCES = \
checksum.c \
debug.c \
getopt.c \
@@ -39,6 +37,6 @@ libmisc_a_SOURCES = \
$(NULL)
if ENABLE_GTP_KERNEL if ENABLE_GTP_KERNEL
-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) -AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
-libmisc_a_SOURCES += gtp-kernel.c -libmisc_a_SOURCES += gtp-kernel.c
+AM_CPPFLAGS = -DGTP_KERNEL $(LIBGTPNL_CFLAGS) +AM_CPPFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)
+libmisc_la_SOURCES += gtp-kernel.c +libmisc_la_SOURCES += gtp-kernel.c
endif endif
Index: osmo-ggsn-1.10.2/lib/gtp-kernel.c Index: osmo-ggsn-1.12.0/lib/gtp-kernel.c
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/lib/gtp-kernel.c --- osmo-ggsn-1.12.0.orig/lib/gtp-kernel.c
+++ osmo-ggsn-1.10.2/lib/gtp-kernel.c +++ osmo-ggsn-1.12.0/lib/gtp-kernel.c
@@ -53,6 +53,7 @@ static void pdp_debug(const char *prefix @@ -54,6 +54,7 @@ static void pdp_debug(const char *prefix
buf4, buf6, inet_ntoa(ia)); buf4, buf6, inet_ntoa(ia));
} }
@ -91,37 +119,46 @@ Index: osmo-ggsn-1.10.2/lib/gtp-kernel.c
static struct { static struct {
int genl_id; int genl_id;
struct mnl_socket *nl; struct mnl_socket *nl;
Index: osmo-ggsn-1.10.2/sgsnemu/Makefile.am Index: osmo-ggsn-1.12.0/sgsnemu/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/sgsnemu/Makefile.am --- osmo-ggsn-1.12.0.orig/sgsnemu/Makefile.am
+++ osmo-ggsn-1.10.2/sgsnemu/Makefile.am +++ osmo-ggsn-1.12.0/sgsnemu/Makefile.am
@@ -1,15 +1,16 @@ @@ -1,25 +1,22 @@
-bin_PROGRAMS = sgsnemu -bin_PROGRAMS = sgsnemu
+sbin_PROGRAMS = sgsnemu +sbin_PROGRAMS = sgsnemu
AM_LDFLAGS = @EXEC_LDFLAGS@ AM_LDFLAGS = @EXEC_LDFLAGS@
-AM_CFLAGS = -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) +AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS)
+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS) AM_CFLAGS = \
+AM_CFLAGS = -fno-builtin -Wall - -D_GNU_SOURCE \
-fno-builtin \
-Wall \
- -DSBINDIR='"$(sbindir)"' \
- -I$(top_srcdir)/include \
- $(LIBOSMOCORE_CFLAGS) \
$(NULL)
-sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) -sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
+sgsnemu_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS) +sgsnemu_LDADD = @EXEC_LDADD@ ../gtp/libgtp.la ../lib/libmisc.la $(LIBOSMOCORE_LIBS)
if ENABLE_GTP_KERNEL if ENABLE_GTP_KERNEL
-AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) -AM_CFLAGS += \
+AM_CPPFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS) +AM_CPPFLAGS += \
-DGTP_KERNEL \
$(LIBGTPNL_CFLAGS) \
$(NULL)
sgsnemu_LDADD += $(LIBGTPNL_LIBS) sgsnemu_LDADD += $(LIBGTPNL_LIBS)
endif endif
-sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a -sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
+sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.la +sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.la
sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h sgsnemu_SOURCES = sgsnemu.c cmdline.c cmdline.h
Index: osmo-ggsn-1.10.2/tests/gtp/Makefile.am Index: osmo-ggsn-1.12.0/tests/gtp/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/tests/gtp/Makefile.am --- osmo-ggsn-1.12.0.orig/tests/gtp/Makefile.am
+++ osmo-ggsn-1.10.2/tests/gtp/Makefile.am +++ osmo-ggsn-1.12.0/tests/gtp/Makefile.am
@@ -20,7 +20,7 @@ queue_test_SOURCES = \ @@ -24,7 +24,7 @@ queue_test_SOURCES = \
$(NULL) $(NULL)
gtpie_test_LDADD = \ gtpie_test_LDADD = \
@ -130,11 +167,11 @@ Index: osmo-ggsn-1.10.2/tests/gtp/Makefile.am
$(top_builddir)/gtp/libgtp.la \ $(top_builddir)/gtp/libgtp.la \
$(LIBOSMOCORE_LIBS) \ $(LIBOSMOCORE_LIBS) \
$(NULL) $(NULL)
Index: osmo-ggsn-1.10.2/tests/lib/Makefile.am Index: osmo-ggsn-1.12.0/tests/lib/Makefile.am
=================================================================== ===================================================================
--- osmo-ggsn-1.10.2.orig/tests/lib/Makefile.am --- osmo-ggsn-1.12.0.orig/tests/lib/Makefile.am
+++ osmo-ggsn-1.10.2/tests/lib/Makefile.am +++ osmo-ggsn-1.12.0/tests/lib/Makefile.am
@@ -15,7 +15,7 @@ ippool_test_SOURCES = \ @@ -19,7 +19,7 @@ ippool_test_SOURCES = \
$(NULL) $(NULL)
ippool_test_LDADD = \ ippool_test_LDADD = \
@ -143,7 +180,7 @@ Index: osmo-ggsn-1.10.2/tests/lib/Makefile.am
$(LIBOSMOCORE_LIBS) \ $(LIBOSMOCORE_LIBS) \
$(NULL) $(NULL)
@@ -24,6 +24,6 @@ in46a_test_SOURCES = \ @@ -28,6 +28,6 @@ in46a_test_SOURCES = \
$(NULL) $(NULL)
in46a_test_LDADD = \ in46a_test_LDADD = \

20
osmo-ggsn.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Feb 13 13:44:06 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.13.0
* gtp: Allow TX/Store RX Direct Tunnel Flags
* gtp: Allow UpdatePDPContext initiated by GGSN
* ggsn: Support announcing APN MTU over PCO and over ICMPv6 RA
* ggsn: use libosmocore tundev API to create APN TUN device
* ggsn: Avoid forwarding IPv6 solicited-node multicast addr to
TUN device
* doc: Document MTU features in User Manual and example
config files
* gtp.h: add more GTP cause code from 29.060 v15.3.30
-------------------------------------------------------------------
Sat Oct 26 14:00:13 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Update to release 1.12.0
* kernel-gtp: support IPv6 on inner layer
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 18 08:39:58 UTC 2024 - Jan Engelhardt <jengelh@inai.de> Tue Jun 18 08:39:58 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

16
osmo-ggsn.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package osmo-ggsn # spec file for package osmo-ggsn
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -18,8 +18,8 @@
%define _lto_cflags %nil %define _lto_cflags %nil
Name: osmo-ggsn Name: osmo-ggsn
%define lname libgtp6 %define lname libgtp11
Version: 1.11.0 Version: 1.13.0
Release: 0 Release: 0
Summary: GPRS Support Node Summary: GPRS Support Node
License: GPL-2.0-only AND LGPL-2.1-or-later License: GPL-2.0-only AND LGPL-2.1-or-later
@ -32,10 +32,10 @@ BuildRequires: libtool >= 2
BuildRequires: pkgconfig >= 0.20 BuildRequires: pkgconfig >= 0.20
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(libgtpnl) >= 1.2.0 BuildRequires: pkgconfig(libgtpnl) >= 1.3.0
BuildRequires: pkgconfig(libosmocore) >= 1.9.0 BuildRequires: pkgconfig(libosmocore) >= 1.11.0
BuildRequires: pkgconfig(libosmoctrl) >= 1.9.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.11.0
BuildRequires: pkgconfig(libosmovty) >= 1.9.0 BuildRequires: pkgconfig(libosmovty) >= 1.11.0
Obsoletes: openggsn Obsoletes: openggsn
%description %description
@ -126,7 +126,7 @@ install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf"
%config(noreplace) %_sysconfdir/osmocom/sgsnemu.conf %config(noreplace) %_sysconfdir/osmocom/sgsnemu.conf
%files -n %lname %files -n %lname
%_libdir/libgtp.so.6* %_libdir/libgtp.so.*
%files -n libgtp-devel %files -n libgtp-devel
%_includedir/%name/ %_includedir/%name/