Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icmptunnel for openSUSE:Factory checked in at 2022-12-07 17:35:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icmptunnel (Old) and /work/SRC/openSUSE:Factory/.icmptunnel.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icmptunnel" Wed Dec 7 17:35:22 2022 rev:2 rq:1040824 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/icmptunnel/icmptunnel.changes 2019-04-04 14:13:18.497324906 +0200 +++ /work/SRC/openSUSE:Factory/.icmptunnel.new.1835/icmptunnel.changes 2022-12-07 17:36:42.449111587 +0100 @@ -1,0 +2,9 @@ +Tue Dec 6 21:27:55 UTC 2022 - Dirk Müller <dmuel...@suse.com> + +- update to 1.0.0: + * no real modification as everything was included as patches before +- drop 0003-Free-the-unfree-heap.patch, + 0001-Typo-fix.patch, + 0002-Change-the-MTU-size-of-tunnel-23.patch: upstream + +------------------------------------------------------------------- Old: ---- 0001-Typo-fix.patch 0002-Change-the-MTU-size-of-tunnel-23.patch 0003-Free-the-unfree-heap.patch icmptunnel-1.0.0-alpha.tar.gz New: ---- icmptunnel-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icmptunnel.spec ++++++ --- /var/tmp/diff_new_pack.4PgCUu/_old 2022-12-07 17:36:43.157115464 +0100 +++ /var/tmp/diff_new_pack.4PgCUu/_new 2022-12-07 17:36:43.173115552 +0100 @@ -1,6 +1,7 @@ # # spec file for package icmptunnel # +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2019, Martin Hauke <mar...@gmx.de> # # All modifications and additions to the file contributed by third parties @@ -12,37 +13,30 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define realver 1.0.0-alpha Name: icmptunnel -Version: 1.0.0~alpha +Version: 1.0.0 Release: 0 Summary: A tunnel for wrapping IP traffic in ICMP License: MIT Group: Productivity/Networking/Security URL: https://dhavalkapil.com/icmptunnel/ -Source: https://github.com/DhavalKapil/icmptunnel/archive/%{realver}.tar.gz#/%{name}-%{realver}.tar.gz -Patch0: 0001-Typo-fix.patch -Patch1: 0002-Change-the-MTU-size-of-tunnel-23.patch -Patch2: 0003-Free-the-unfree-heap.patch -Patch3: icmptunnel-obey-cflags.patch +Source: https://github.com/DhavalKapil/icmptunnel/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: icmptunnel-obey-cflags.patch %description This program transparently tunnels IP traffic through ICMP echo and reply packets. %prep -%setup -q -n %{name}-%{realver} +%setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build export CFLAGS="%{optflags}" -make %{?_smp_mflags} +%make_build %install install -D -m 0755 icmptunnel %{buildroot}%{_bindir}/icmptunnel ++++++ icmptunnel-1.0.0-alpha.tar.gz -> icmptunnel-1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icmptunnel-1.0.0-alpha/Makefile new/icmptunnel-1.0.0/Makefile --- old/icmptunnel-1.0.0-alpha/Makefile 2015-12-18 13:05:16.000000000 +0100 +++ new/icmptunnel-1.0.0/Makefile 2017-04-22 14:44:44.000000000 +0200 @@ -1,5 +1,5 @@ CC=gcc -CFLAGS=-I. +CFLAGS=-I. -O3 -Wall DEPS = icmp.h tunnel.h %.o: %.c $(DEPS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icmptunnel-1.0.0-alpha/client.sh new/icmptunnel-1.0.0/client.sh --- old/icmptunnel-1.0.0-alpha/client.sh 2015-12-18 13:05:16.000000000 +0100 +++ new/icmptunnel-1.0.0/client.sh 2017-04-22 14:44:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # Assigining an IP address and mask to 'tun0' interface -ifconfig tun0 mtu 1500 up 10.0.1.2 netmask 255.255.255.0 +ifconfig tun0 mtu 1472 up 10.0.1.2 netmask 255.255.255.0 # Modifying IP routing tables route del default diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icmptunnel-1.0.0-alpha/icmp.c new/icmptunnel-1.0.0/icmp.c --- old/icmptunnel-1.0.0-alpha/icmp.c 2015-12-18 13:05:16.000000000 +0100 +++ new/icmptunnel-1.0.0/icmp.c 2017-04-22 14:44:44.000000000 +0200 @@ -142,7 +142,7 @@ void receive_icmp_packet(int sock_fd, struct icmp_packet *packet_details) { struct sockaddr_in src_addr; - struct sockaddr_in dest_addr; + //struct sockaddr_in dest_addr; struct iphdr *ip; struct icmphdr *icmp; @@ -151,9 +151,12 @@ int packet_size; char *packet; - int src_addr_size; + socklen_t src_addr_size; + int enc_MTU; //encapsulated MTU - packet = calloc(MTU, sizeof(uint8_t)); + enc_MTU = MTU + sizeof(struct iphdr) + sizeof(struct icmphdr); + + packet = calloc(enc_MTU, sizeof(uint8_t)); if (packet == NULL) { perror("No memory available\n"); close_icmp_socket(sock_fd); @@ -163,7 +166,7 @@ src_addr_size = sizeof(struct sockaddr_in); // Receiving packet - packet_size = recvfrom(sock_fd, packet, MTU, 0, (struct sockaddr *)&(src_addr), &src_addr_size); + packet_size = recvfrom(sock_fd, packet, enc_MTU, 0, (struct sockaddr *)&(src_addr), &src_addr_size); ip = (struct iphdr *)packet; icmp = (struct icmphdr *)(packet + sizeof(struct iphdr)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icmptunnel-1.0.0-alpha/icmp.h new/icmptunnel-1.0.0/icmp.h --- old/icmptunnel-1.0.0-alpha/icmp.h 2015-12-18 13:05:16.000000000 +0100 +++ new/icmptunnel-1.0.0/icmp.h 2017-04-22 14:44:44.000000000 +0200 @@ -2,11 +2,11 @@ * icmp.h */ -#ifndef icmp_gaurd -#define icmp_gaurd +#ifndef icmp_guard +#define icmp_guard // Maximum transmission unit -#define MTU 1500 +#define MTU 1472 struct icmp_packet { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icmptunnel-1.0.0-alpha/server.sh new/icmptunnel-1.0.0/server.sh --- old/icmptunnel-1.0.0-alpha/server.sh 2015-12-18 13:05:16.000000000 +0100 +++ new/icmptunnel-1.0.0/server.sh 2017-04-22 14:44:44.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh # Assigining an IP address and mask to 'tun0' interface -ifconfig tun0 mtu 1500 up 10.0.1.1 netmask 255.255.255.0 +ifconfig tun0 mtu 1472 up 10.0.1.1 netmask 255.255.255.0 # Preventing the kernel to reply to any ICMP pings echo 1 | dd of=/proc/sys/net/ipv4/icmp_echo_ignore_all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icmptunnel-1.0.0-alpha/tunnel.c new/icmptunnel-1.0.0/tunnel.c --- old/icmptunnel-1.0.0-alpha/tunnel.c 2015-12-18 13:05:16.000000000 +0100 +++ new/icmptunnel-1.0.0/tunnel.c 2017-04-22 14:44:44.000000000 +0200 @@ -243,6 +243,7 @@ printf("[DEBUG] Src address being copied: %s\n", packet.src_addr); strncpy(dest, packet.src_addr, strlen(packet.src_addr) + 1); + free(packet.payload); } }
