Osmocom Open Build Service

libgtpnl.spec Changed

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

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/objects/pack/pack-9befdd950859eac7a31e31cf54398f5182cc786b.idx Deleted

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/objects/pack/pack-9befdd950859eac7a31e31cf54398f5182cc786b.pack Deleted

libgtpnl_1.2.5.21.d489.202402202026.dsc -> libgtpnl_1.2.5.22.7928.202402212026.dsc Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/HEAD -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/HEAD Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/ORIG_HEAD -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/ORIG_HEAD Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/index -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/index Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/logs/HEAD -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/logs/HEAD Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/logs/refs/heads/master -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/logs/refs/heads/master Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/logs/refs/remotes/origin/HEAD -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/objects/pack/pack-8d1e0a57da07b75351224a9fdc9a8a9ed4bcf2f1.idx Added

libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/objects/pack/pack-8d1e0a57da07b75351224a9fdc9a8a9ed4bcf2f1.pack Added

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/packed-refs -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/packed-refs Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.git/refs/heads/master -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.git/refs/heads/master Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/.tarball-version -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/.tarball-version Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/contrib/libgtpnl.spec.in -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/contrib/libgtpnl.spec.in Changed

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

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/debian/changelog -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/debian/changelog Changed

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/debian/control -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/debian/control Changed

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

libgtpnl_1.2.5.21.d489.202402202026.tar.gz/tools/gtp-link.c -> libgtpnl_1.2.5.22.7928.202402212026.tar.gz/tools/gtp-link.c Changed

@@ -80,16 +80,15 @@
 
 static int setup_socket(struct gtp_server_sock *gtp_sock, int family)
 {
-	int fd1 = socket(family, SOCK_DGRAM, 0);
-	int fd2 = socket(family, SOCK_DGRAM, 0);
 	int one = 1;
 
-	if (fd1 < 0 || fd2 < 0)
+	gtp_sock->fd1 = socket(family, SOCK_DGRAM, 0);
+	gtp_sock->fd2 = socket(family, SOCK_DGRAM, 0);
+
+	if (gtp_sock->fd1 < 0 || gtp_sock->fd2 < 0)
 		return -1;
 
 	gtp_sock->family = family;
-	gtp_sock->fd1 = fd1;
-	gtp_sock->fd2 = fd2;
 
 	switch (family) {
 	case AF_INET:
@@ -105,9 +104,9 @@
 				   &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)
+		if (setsockopt(gtp_sock->fd1, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0)
 			perror("setsockopt IPV6_V6ONLY: ");
-		if (setsockopt(fd2, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0)
+		if (setsockopt(gtp_sock->fd2, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)) < 0)
 			perror("setsockopt IPV6_V6ONLY: ");
 		break;
 	}
@@ -115,6 +114,19 @@
 	return 0;
 }
 
+static void close_socket(struct gtp_server_sock *gtp_sock)
+{
+	if (gtp_sock->fd1 != -1) {
+		close(gtp_sock->fd1);
+		gtp_sock->fd1 = -1;
+	}
+
+	if (gtp_sock->fd2 != -1) {
+		close(gtp_sock->fd2);
+		gtp_sock->fd2 = -1;
+	}
+}
+
 int main(int argc, char *argv)
 {
 	char bufMNL_SOCKET_BUFFER_SIZE;
@@ -186,15 +198,18 @@
 
 	if (setup_socket(&gtp_sock, family) < 0) {
 		perror("socket");
+		close_socket(&gtp_sock);
 		exit(EXIT_FAILURE);
 	}
 
 	if (bind(gtp_sock.fd1, (struct sockaddr *) &gtp_sock.sockaddr.fd1, gtp_sock.len) < 0) {
 		perror("bind");
+		close_socket(&gtp_sock);
 		exit(EXIT_FAILURE);
 	}
 	if (bind(gtp_sock.fd2, (struct sockaddr *) &gtp_sock.sockaddr.fd2, gtp_sock.len) < 0) {
 		perror("bind");
+		close_socket(&gtp_sock);
 		exit(EXIT_FAILURE);
 	}
 
@@ -204,6 +219,7 @@
 		ret = gtp_dev_create(-1, argv2, gtp_sock.fd1, gtp_sock.fd2);
 	if (ret < 0) {
 		perror("cannot create GTP device\n");
+		close_socket(&gtp_sock);
 		exit(EXIT_FAILURE);
 	}

Changes of Revision 613