Osmocom Open Build Service

libgtpnl.spec Changed

@@ -13,14 +13,14 @@
 # published by the Open Source Initiative.
 
 Name:           libgtpnl
-Requires: osmocom-nightly = 202310232026
-Version: 1.2.5.8.2db5.202310232026
+Requires: osmocom-nightly = 202310242026
+Version: 1.2.5.10.a295.202310242026
 Release:        0
 Summary:        GPRS tunnel configuration library
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://osmocom.org/projects/linux-kernel-gtp-u/wiki
-Source: libgtpnl_1.2.5.8.2db5.202310232026.tar.gz
+Source: libgtpnl_1.2.5.10.a295.202310242026.tar.gz
 Source1: rpmlintrc
 BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig
@@ -32,7 +32,7 @@
 Linux kernel into a C API.
 
 %package -n libgtpnl0
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Summary:        GPRS tunnel configuration library
 License:        LGPL-2.1-or-later
 Group:          System/Libraries
@@ -42,7 +42,7 @@
 Linux kernel into a C API.
 
 %package devel
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Summary:        Development files for the GPRS tunnel config library
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
@@ -56,7 +56,7 @@
 applications that want to make use of libgtpnl.
 
 %package tools
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Summary:        Libgtpnl user tools
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Applications/System

libgtpnl_1.2.5.10.a295.202310242026.dsc Added

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/HEAD -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/HEAD Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/ORIG_HEAD -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/ORIG_HEAD Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/index -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/index Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/logs/HEAD -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/logs/HEAD Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/logs/refs/heads/master -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/logs/refs/heads/master Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/logs/refs/remotes/origin/HEAD -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/objects/pack/pack-28cead619631fcb0d849b66aac82b7fcc7c4bee9.idx Added

libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/objects/pack/pack-28cead619631fcb0d849b66aac82b7fcc7c4bee9.pack Added

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/packed-refs -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/packed-refs Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/refs/heads/master -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.git/refs/heads/master Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.tarball-version -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/.tarball-version Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/contrib/libgtpnl.spec.in -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/contrib/libgtpnl.spec.in Changed

@@ -13,7 +13,7 @@
 # published by the Open Source Initiative.
 
 Name:           libgtpnl
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Version:        @VERSION@
 Release:        0
 Summary:        GPRS tunnel configuration library
@@ -31,7 +31,7 @@
 Linux kernel into a C API.
 
 %package -n libgtpnl0
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Summary:        GPRS tunnel configuration library
 License:        LGPL-2.1-or-later
 Group:          System/Libraries
@@ -41,7 +41,7 @@
 Linux kernel into a C API.
 
 %package devel
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Summary:        Development files for the GPRS tunnel config library
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
@@ -55,7 +55,7 @@
 applications that want to make use of libgtpnl.
 
 %package tools
-Requires: osmocom-nightly = 202310232026
+Requires: osmocom-nightly = 202310242026
 Summary:        Libgtpnl user tools
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Applications/System

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/debian/changelog -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/debian/changelog Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/debian/control -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/debian/control Changed

@@ -20,7 +20,7 @@
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 202310232026), ${shlibs:Depends},
+Depends: osmocom-nightly (= 202310242026), ${shlibs:Depends},
          ${misc:Depends}
 Description: Linux kernel GTP-U netlink library
 
@@ -28,7 +28,7 @@
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: osmocom-nightly (= 202310232026), libmnl-dev,
+Depends: osmocom-nightly (= 202310242026), libmnl-dev,
          libgtpnl0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Development headers for Linux kernel GTP-U netlink library
@@ -40,7 +40,7 @@
 Multi-Arch: same
 Section: debug
 Priority: extra
-Depends: osmocom-nightly (= 202310232026), libgtpnl0 (= ${binary:Version}),
+Depends: osmocom-nightly (= 202310242026), libgtpnl0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Debug symbols for Linux kernel GTP-U netlink library
 
@@ -49,6 +49,6 @@
 Multi-Arch: same
 Section: net
 Priority: extra
-Depends: osmocom-nightly (= 202310232026), libgtpnl0 (= ${binary:Version}),
+Depends: osmocom-nightly (= 202310242026), libgtpnl0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Tools to manage gtp interfaces and tunnels.

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/include/libgtpnl/gtp.h -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/include/libgtpnl/gtp.h Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/include/linux/gtp.h -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/include/linux/gtp.h Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/src/gtp-genl.c -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/src/gtp-genl.c Changed

@@ -44,14 +44,36 @@
 
 static void gtp_build_payload(struct nlmsghdr *nlh, struct gtp_tunnel *t)
 {
+	mnl_attr_put_u8(nlh, GTPA_FAMILY, t->ms_addr.family);
 	mnl_attr_put_u32(nlh, GTPA_VERSION, t->gtp_version);
 	if (t->ifns >= 0)
 		mnl_attr_put_u32(nlh, GTPA_NET_NS_FD, t->ifns);
 	mnl_attr_put_u32(nlh, GTPA_LINK, t->ifidx);
-	if (t->sgsn_addr.s_addr)
-		mnl_attr_put_u32(nlh, GTPA_PEER_ADDRESS, t->sgsn_addr.s_addr);
-	if (t->ms_addr.s_addr)
-		mnl_attr_put_u32(nlh, GTPA_MS_ADDRESS, t->ms_addr.s_addr);
+
+	switch (t->ms_addr.family) {
+	case AF_INET:
+		mnl_attr_put_u32(nlh, GTPA_MS_ADDRESS, t->ms_addr.ip4.s_addr);
+		break;
+	case AF_INET6:
+		mnl_attr_put(nlh, GTPA_MS_ADDR6, sizeof(t->ms_addr.ip6), &t->ms_addr.ip6);
+		break;
+	default:
+		/* No addr is set when deleting a tunnel */
+		break;
+	}
+
+	switch (t->sgsn_addr.family) {
+	case AF_INET:
+		mnl_attr_put_u32(nlh, GTPA_PEER_ADDRESS, t->sgsn_addr.ip4.s_addr);
+		break;
+	case AF_INET6:
+		mnl_attr_put(nlh, GTPA_PEER_ADDR6, sizeof(t->sgsn_addr.ip6), &t->sgsn_addr.ip6);
+		break;
+	default:
+		/* No addr is set when deleting a tunnel */
+		break;
+	}
+
 	if (t->gtp_version == GTP_V0) {
 		mnl_attr_put_u64(nlh, GTPA_TID, t->u.v0.tid);
 		mnl_attr_put_u16(nlh, GTPA_FLOW, t->u.v0.flowid);
@@ -116,8 +138,8 @@
 			uint32_t o_tei;
 		} v1;
 	} u;
-	struct in_addr	sgsn_addr;
-	struct in_addr	ms_addr;
+	struct gtp_addr sgsn_addr;
+	struct gtp_addr ms_addr;
 };
 
 static int genl_gtp_validate_cb(const struct nlattr *attr, void *data)
@@ -129,6 +151,12 @@
 		return MNL_CB_OK;
 
 	switch(type) {
+	case GTPA_FAMILY:
+		if (mnl_attr_validate(attr, MNL_TYPE_U8) < 0) {
+			perror("mnl_attr_validate");
+			return MNL_CB_ERROR;
+		}
+		break;
 	case GTPA_TID:
 		if (mnl_attr_validate(attr, MNL_TYPE_U64) < 0) {
 			perror("mnl_attr_validate");
@@ -145,6 +173,14 @@
 			return MNL_CB_ERROR;
 		}
 		break;
+	case GTPA_PEER_ADDR6:
+	case GTPA_MS_ADDR6:
+		if (mnl_attr_validate2(attr, MNL_TYPE_BINARY,
+				       sizeof(struct in6_addr)) < 0) {
+			perror("mnl_attr_validate");
+			return MNL_CB_ERROR;
+		}
+		break;
 	default:
 		break;
 	}
@@ -160,34 +196,56 @@
 	struct genlmsghdr *genl;
 
 	mnl_attr_parse(nlh, sizeof(*genl), genl_gtp_validate_cb, tb);
+
 	if (tbGTPA_TID)
 		pdp.u.v0.tid = mnl_attr_get_u64(tbGTPA_TID);
 	if (tbGTPA_I_TEI)
 		pdp.u.v1.i_tei = mnl_attr_get_u32(tbGTPA_I_TEI);
 	if (tbGTPA_O_TEI)
 		pdp.u.v1.o_tei = mnl_attr_get_u32(tbGTPA_O_TEI);
+
 	if (tbGTPA_PEER_ADDRESS) {
-		pdp.sgsn_addr.s_addr =
-			mnl_attr_get_u32(tbGTPA_PEER_ADDRESS);
+		pdp.sgsn_addr.family = AF_INET;
+		pdp.sgsn_addr.ip4.s_addr = mnl_attr_get_u32(tbGTPA_PEER_ADDRESS);
+	} else if (tbGTPA_PEER_ADDR6) {
+		pdp.sgsn_addr.family = AF_INET6;
+		memcpy(&pdp.sgsn_addr.ip6, mnl_attr_get_payload(tbGTPA_PEER_ADDR6),
+		       sizeof(struct in6_addr));
+	} else {
+		fprintf(stderr, "sgsn_addr: no IPv4 nor IPv6 set\n");
+		return MNL_CB_ERROR;
 	}
+
 	if (tbGTPA_MS_ADDRESS) {
-		pdp.ms_addr.s_addr = mnl_attr_get_u32(tbGTPA_MS_ADDRESS);
+		pdp.ms_addr.family = AF_INET;
+		pdp.ms_addr.ip4.s_addr = mnl_attr_get_u32(tbGTPA_MS_ADDRESS);
+	} else if (tbGTPA_MS_ADDR6) {
+		pdp.ms_addr.family = AF_INET6;
+		memcpy(&pdp.ms_addr.ip6, mnl_attr_get_payload(tbGTPA_MS_ADDR6), sizeof(struct in6_addr));
+	} else {
+		fprintf(stderr, "ms_addr: no IPv4 nor IPv6 set\n");
+		return MNL_CB_ERROR;
+	}
+
+	if (tbGTPA_FAMILY && mnl_attr_get_u32(tbGTPA_FAMILY) != pdp.ms_addr.family) {
+		fprintf(stderr, "ms_addr family does not match GTPA_FAMILY\n");
+		return MNL_CB_ERROR;
 	}
-	if (tbGTPA_VERSION) {
+
+	if (tbGTPA_VERSION)
 		pdp.version = mnl_attr_get_u32(tbGTPA_VERSION);
-	}
 
 	printf("version %u ", pdp.version);
-	if (pdp.version == GTP_V0) {
-		inet_ntop(AF_INET, &pdp.ms_addr, buf, sizeof(buf));
-		printf("tid %"PRIu64" ms_addr %s ",
-		       pdp.u.v0.tid, buf);
-	} else if (pdp.version == GTP_V1) {
-		inet_ntop(AF_INET, &pdp.ms_addr, buf, sizeof(buf));
-		printf("tei %u/%u ms_addr %s ", pdp.u.v1.i_tei,
-		       pdp.u.v1.o_tei, buf);
-	}
-	inet_ntop(AF_INET, &pdp.sgsn_addr, buf, sizeof(buf));
+
+	if (pdp.version == GTP_V0)
+		printf("tid %"PRIu64" ", pdp.u.v0.tid);
+	else if (pdp.version == GTP_V1)
+		printf("tei %u/%u ", pdp.u.v1.i_tei, pdp.u.v1.o_tei);
+
+	inet_ntop(pdp.ms_addr.family, &pdp.ms_addr.ip4, buf, sizeof(buf));
+	printf("ms_addr %s ", buf);
+
+	inet_ntop(pdp.sgsn_addr.family, &pdp.sgsn_addr.ip4, buf, sizeof(buf));
 	printf("sgsn_addr %s\n", buf);
 
 	return MNL_CB_OK;

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/src/gtp.c -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/src/gtp.c Changed

@@ -60,16 +60,32 @@
 
 void gtp_tunnel_set_ms_ip4(struct gtp_tunnel *t, struct in_addr *ms_addr)
 {
-	t->ms_addr = *ms_addr;
+	t->ms_addr.family = AF_INET;
+	t->ms_addr.ip4 = *ms_addr;
 }
 EXPORT_SYMBOL(gtp_tunnel_set_ms_ip4);
 
 void gtp_tunnel_set_sgsn_ip4(struct gtp_tunnel *t, struct in_addr *sgsn_addr)
 {
-	t->sgsn_addr = *sgsn_addr;
+	t->sgsn_addr.family = AF_INET;
+	t->sgsn_addr.ip4 = *sgsn_addr;
 }
 EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip4);
 
+void gtp_tunnel_set_ms_ip6(struct gtp_tunnel *t, const struct in6_addr *ms_addr)
+{
+	t->ms_addr.family = AF_INET6;
+	t->ms_addr.ip6 = *ms_addr;
+}
+EXPORT_SYMBOL(gtp_tunnel_set_ms_ip6);
+
+void gtp_tunnel_set_sgsn_ip6(struct gtp_tunnel *t, const struct in6_addr *sgsn_addr)
+{
+	t->sgsn_addr.family = AF_INET6;
+	t->sgsn_addr.ip6 = *sgsn_addr;
+}
+EXPORT_SYMBOL(gtp_tunnel_set_sgsn_ip6);
+
 void gtp_tunnel_set_version(struct gtp_tunnel *t, uint32_t version)
 {
 	t->gtp_version = version;
@@ -114,13 +130,13 @@
 
 const struct in_addr *gtp_tunnel_get_ms_ip4(struct gtp_tunnel *t)
 {
-	return &t->ms_addr;
+	return &t->ms_addr.ip4;
 }
 EXPORT_SYMBOL(gtp_tunnel_get_ms_ip4);
 
 const struct in_addr *gtp_tunnel_get_sgsn_ip4(struct gtp_tunnel *t)
 {
-	return &t->sgsn_addr;
+	return &t->sgsn_addr.ip4;
 }
 EXPORT_SYMBOL(gtp_tunnel_get_sgsn_ip4);

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/src/internal.h -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/src/internal.h Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/src/libgtpnl.map -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/src/libgtpnl.map Changed

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/tools/gtp-tunnel.c -> libgtpnl_1.2.5.10.a295.202310242026.tar.gz/tools/gtp-tunnel.c Changed

@@ -49,12 +49,32 @@
 	       name);
 }
 
+static void set_addr(const char *addr, bool is_ms, struct gtp_tunnel *t)
+{
+	struct in_addr ip4;
+	struct in6_addr ip6;
+
+	if (inet_pton(AF_INET, addr, &ip4) == 1) {
+		if (is_ms)
+			return gtp_tunnel_set_ms_ip4(t, &ip4);
+		return gtp_tunnel_set_sgsn_ip4(t, &ip4);
+	}
+
+	if (inet_pton(AF_INET6, addr, &ip6) == 1) {
+		if (is_ms)
+			return gtp_tunnel_set_ms_ip6(t, &ip6);
+		return gtp_tunnel_set_sgsn_ip6(t, &ip6);
+	}
+
+	fprintf(stderr, "bad address: %s\n", addr);
+	exit(EXIT_FAILURE);
+}
+
 static int
 add_tunnel(int argc, char *argv, int genl_id, struct mnl_socket *nl)
 {
 	struct gtp_tunnel *t;
 	uint32_t gtp_ifidx;
-	struct in_addr ms, sgsn;
 	uint32_t gtp_version;
 	int optidx;
 
@@ -95,17 +115,8 @@
 		gtp_tunnel_set_o_tei(t, atoi(argvoptidx++));
 	}
 
-	if (inet_aton(argvoptidx++, &ms) < 0) {
-		perror("bad address for ms");
-		exit(EXIT_FAILURE);
-	}
-	gtp_tunnel_set_ms_ip4(t, &ms);
-
-	if (inet_aton(argvoptidx++, &sgsn) < 0) {
-		perror("bad address for sgsn");
-		exit(EXIT_FAILURE);
-	}
-	gtp_tunnel_set_sgsn_ip4(t, &sgsn);
+	set_addr(argvoptidx++, true, t);
+	set_addr(argvoptidx++, false, t);
 
 	gtp_add_tunnel(genl_id, nl, t);

libgtpnl_1.2.5.8.2db5.202310232026.dsc Deleted

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/objects/pack/pack-3bb2deb2a784079ec8e5557b502b841adc158b76.idx Deleted

libgtpnl_1.2.5.8.2db5.202310232026.tar.gz/.git/objects/pack/pack-3bb2deb2a784079ec8e5557b502b841adc158b76.pack Deleted

Changes of Revision 493