Osmocom Open Build Service

libgtpnl.spec Changed

@@ -13,14 +13,14 @@
 # published by the Open Source Initiative.
 
 Name:           libgtpnl
-Requires: osmocom-nightly = 202402182026
-Version: 1.2.5.20.72dd.202402182026
+Requires: osmocom-nightly = 202402192026
+Version: 1.2.5.21.d489.202402192026
 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.20.72dd.202402182026.tar.gz
+Source: libgtpnl_1.2.5.21.d489.202402192026.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 = 202402182026
+Requires: osmocom-nightly = 202402192026
 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 = 202402182026
+Requires: osmocom-nightly = 202402192026
 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 = 202402182026
+Requires: osmocom-nightly = 202402192026
 Summary:        Libgtpnl user tools
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Applications/System

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/objects/pack/pack-394e1d3bebeb5ead61175763d51081a5b7cfea35.idx Deleted

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/objects/pack/pack-394e1d3bebeb5ead61175763d51081a5b7cfea35.pack Deleted

libgtpnl_1.2.5.20.72dd.202402182026.dsc -> libgtpnl_1.2.5.21.d489.202402192026.dsc Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/HEAD -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/HEAD Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/ORIG_HEAD -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/ORIG_HEAD Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/index -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/index Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/logs/HEAD -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/logs/HEAD Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/logs/refs/heads/master -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/logs/refs/heads/master Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/logs/refs/remotes/origin/HEAD -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/objects/pack/pack-9befdd950859eac7a31e31cf54398f5182cc786b.idx Added

libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/objects/pack/pack-9befdd950859eac7a31e31cf54398f5182cc786b.pack Added

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/packed-refs -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/packed-refs Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.git/refs/heads/master -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.git/refs/heads/master Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/.tarball-version -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/.tarball-version Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/contrib/libgtpnl.spec.in -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/contrib/libgtpnl.spec.in Changed

@@ -13,7 +13,7 @@
 # published by the Open Source Initiative.
 
 Name:           libgtpnl
-Requires: osmocom-nightly = 202402182026
+Requires: osmocom-nightly = 202402192026
 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 = 202402182026
+Requires: osmocom-nightly = 202402192026
 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 = 202402182026
+Requires: osmocom-nightly = 202402192026
 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 = 202402182026
+Requires: osmocom-nightly = 202402192026
 Summary:        Libgtpnl user tools
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          Applications/System

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/debian/changelog -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/debian/changelog Changed

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/debian/control -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/debian/control Changed

@@ -20,7 +20,7 @@
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: osmocom-nightly (= 202402182026), ${shlibs:Depends},
+Depends: osmocom-nightly (= 202402192026), ${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 (= 202402182026), libmnl-dev,
+Depends: osmocom-nightly (= 202402192026), 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 (= 202402182026), libgtpnl0 (= ${binary:Version}),
+Depends: osmocom-nightly (= 202402192026), 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 (= 202402182026), libgtpnl0 (= ${binary:Version}),
+Depends: osmocom-nightly (= 202402192026), libgtpnl0 (= ${binary:Version}),
          ${misc:Depends}
 Description: Tools to manage gtp interfaces and tunnels.

libgtpnl_1.2.5.20.72dd.202402182026.tar.gz/tools/gtp-link.c -> libgtpnl_1.2.5.21.d489.202402192026.tar.gz/tools/gtp-link.c Changed

@@ -39,6 +39,7 @@
 #include <linux/if_link.h>
 
 #include <libgtpnl/gtpnl.h>
+#include <errno.h>
 
 struct gtp_server_sock {
 	int			family;
@@ -55,20 +56,26 @@
 			struct sockaddr_in6	in6;
 		} fd2;
 	} sockaddr;
+	union {
+		struct in_addr v4;
+		struct in6_addr v6;
+	} addr;
 };
 
-static void setup_sockaddr_in(struct sockaddr_in *sockaddr, uint16_t port)
+static void setup_sockaddr_in(struct sockaddr_in *sockaddr, struct in_addr *in,
+			      uint16_t port)
 {
 	sockaddr->sin_family = AF_INET;
 	sockaddr->sin_port = htons(port);
-	sockaddr->sin_addr.s_addr = INADDR_ANY;
+	sockaddr->sin_addr = *in;
 }
 
-static void setup_sockaddr_in6(struct sockaddr_in6 *sockaddr, uint16_t port)
+static void setup_sockaddr_in6(struct sockaddr_in6 *sockaddr, struct in6_addr *in6,
+			       uint16_t port)
 {
 	sockaddr->sin6_family = AF_INET6;
 	sockaddr->sin6_port = htons(port);
-	sockaddr->sin6_addr = in6addr_any;
+	sockaddr->sin6_addr = *in6;
 }
 
 static int setup_socket(struct gtp_server_sock *gtp_sock, int family)
@@ -80,8 +87,6 @@
 	if (fd1 < 0 || fd2 < 0)
 		return -1;
 
-	memset(gtp_sock, 0, sizeof(*gtp_sock));
-
 	gtp_sock->family = family;
 	gtp_sock->fd1 = fd1;
 	gtp_sock->fd2 = fd2;
@@ -89,13 +94,17 @@
 	switch (family) {
 	case AF_INET:
 		gtp_sock->len = sizeof(struct sockaddr_in);
-		setup_sockaddr_in(&gtp_sock->sockaddr.fd1.in, 3386);
-		setup_sockaddr_in(&gtp_sock->sockaddr.fd2.in, 2152);
+		setup_sockaddr_in(&gtp_sock->sockaddr.fd1.in,
+				  &gtp_sock->addr.v4, 3386);
+		setup_sockaddr_in(&gtp_sock->sockaddr.fd2.in,
+				  &gtp_sock->addr.v4, 2152);
 		break;
 	case AF_INET6:
 		gtp_sock->len = sizeof(struct sockaddr_in6);
-		setup_sockaddr_in6(&gtp_sock->sockaddr.fd1.in6, 3386);
-		setup_sockaddr_in6(&gtp_sock->sockaddr.fd2.in6, 2152);
+		setup_sockaddr_in6(&gtp_sock->sockaddr.fd1.in6,
+				   &gtp_sock->addr.v6, 3386);
+		setup_sockaddr_in6(&gtp_sock->sockaddr.fd2.in6,
+				   &gtp_sock->addr.v6, 2152);
 		if (setsockopt(fd1, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0)
 			perror("setsockopt IPV6_V6ONLY: ");
 		if (setsockopt(fd2, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0)
@@ -111,9 +120,12 @@
 	char bufMNL_SOCKET_BUFFER_SIZE;
 	struct gtp_server_sock gtp_sock;
 	int ret, sgsn_mode = 0, family;
+	const char *addr = NULL;
+
+	memset(&gtp_sock, 0, sizeof(gtp_sock));
 
 	if (argc < 3) {
-		printf("Usage: %s add <device> <family> --sgsn\n", argv0);
+		printf("Usage: %s add <device> <family> --sgsn <address>\n", argv0);
 		printf("       %s del <device>\n", argv0);
 		exit(EXIT_FAILURE);
 	}
@@ -126,12 +138,23 @@
 		return 0;
 	} else if (!strcmp(argv1, "add")) {
 		if (argc < 4) {
-			printf("Usage: %s add <device> <family> --sgsn\n", argv0);
+			printf("Usage: %s add <device> <family> --sgsn <address>\n", argv0);
 			exit(EXIT_FAILURE);
 		}
 
-		if (argc == 5 && !strcmp(argv4, "--sgsn"))
-			sgsn_mode = 1;
+		if (argc == 5) {
+			if (!strcmp(argv4, "--sgsn"))
+				sgsn_mode = 1;
+			else
+				addr = argv4;
+		}
+
+		if (argc == 6) {
+			if (!strcmp(argv4, "--sgsn"))
+				sgsn_mode = 1;
+
+			addr = argv5;
+		}
 	}
 
 	if (!strcmp(argv3, "ip"))
@@ -144,6 +167,23 @@
 		exit(EXIT_FAILURE);
 	}
 
+	if (addr) {
+		if (!inet_pton(family, addr, &gtp_sock.addr)) {
+			fprintf(stderr, "invalid listener address: %s\n",
+				strerror(errno));
+			exit(EXIT_FAILURE);
+		}
+	} else {
+		switch (family) {
+		case AF_INET:
+			gtp_sock.addr.v4.s_addr = INADDR_ANY;
+			break;
+		case AF_INET6:
+			gtp_sock.addr.v6 = in6addr_any;
+			break;
+		}
+	}
+
 	if (setup_socket(&gtp_sock, family) < 0) {
 		perror("socket");
 		exit(EXIT_FAILURE);

Changes of Revision 611