diff -Nru hipercontracer-1.6.5/AUTHORS hipercontracer-1.6.7/AUTHORS --- hipercontracer-1.6.5/AUTHORS 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/AUTHORS 2023-01-05 23:42:40.000000000 +0000 @@ -1 +1 @@ -Thomas Dreibholz +Thomas Dreibholz diff -Nru hipercontracer-1.6.5/autogen.sh hipercontracer-1.6.7/autogen.sh --- hipercontracer-1.6.5/autogen.sh 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/autogen.sh 2023-01-05 23:42:40.000000000 +0000 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/build-rpm hipercontracer-1.6.7/build-rpm --- hipercontracer-1.6.5/build-rpm 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/build-rpm 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2017-2022 by Thomas Dreibholz +# Copyright (C) 2017-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/ChangeLog hipercontracer-1.6.7/ChangeLog --- hipercontracer-1.6.5/ChangeLog 2022-02-16 11:47:39.000000000 +0000 +++ hipercontracer-1.6.7/ChangeLog 2023-01-22 11:44:09.000000000 +0000 @@ -1,9 +1,103 @@ +commit f8b71215a297c026c707578944fb61840332b89a +Author: Thomas Dreibholz +Date: Sat Jan 21 22:02:47 2023 +1100 + + Updated build scripts + +commit d0ee4cf7acc292db730de921cec22bf4f6cab0e1 +Author: Thomas Dreibholz +Date: Fri Jan 6 21:38:01 2023 +1100 + + URL change from UDE to NNTB. + +commit 63f3498fd452ea6c75a61b2f1d94f08424892256 +Author: Thomas Dreibholz +Date: Fri Jan 6 10:41:55 2023 +1100 + + Updated CI scripts + +commit cc513442b608861ffa044540ea92ede2b8031f71 +Author: Thomas Dreibholz +Date: Fri Jan 6 10:41:54 2023 +1100 + + Updated build scripts + +commit 8ac6a97597db38b5f08580601b0ca0d0964b49b4 +Author: Thomas Dreibholz +Date: Sun Sep 11 13:05:12 2022 +0200 + + New release hipercontracer-1.6.6. + +commit 1ef81a3ad6c957e1882e31eda1950f45c3e80a41 +Merge: 0642920 acba95d +Author: Thomas Dreibholz +Date: Wed Aug 31 21:39:48 2022 +0200 + + Merge branch 'master' of github.com:dreibh/hipercontracer + +commit acba95d30a1c8acfa267ee534ac5746253eeb5c5 +Author: Thomas Dreibholz +Date: Wed Aug 31 11:47:06 2022 +0200 + + Removed Vcs-* fields from debian/control. + +commit 9181aa25cdbd9d22b9605bc39f974464e9c48dee +Author: Thomas Dreibholz +Date: Wed Aug 31 11:18:43 2022 +0200 + + Updated CI scripts + +commit bc03f2c22a6d245e020e1a94e231ed719836e06f +Author: Thomas Dreibholz +Date: Wed Aug 31 11:18:41 2022 +0200 + + Updated build scripts + +commit 06429201189cc21e420f51ad75ebf8f221696ef0 +Merge: 63a2933 36d9438 +Author: Thomas Dreibholz +Date: Tue Aug 30 09:07:41 2022 +0200 + + Merge branch 'master' of github.com:dreibh/hipercontracer + +commit 36d94382155b5df13b63696c84c6b22808e4072c +Author: Thomas Dreibholz +Date: Fri Aug 26 15:10:43 2022 +0200 + + Some clean-ups. + +commit 63a29337520b446e4c5a53377c099e8de8200f1a +Merge: bd3e1fa bca8c9b +Author: Thomas Dreibholz +Date: Wed Feb 16 18:57:26 2022 +0100 + + Merge branch 'master' of github.com:dreibh/hipercontracer + +commit bca8c9ba333099af523a5b702899749600a66019 +Author: Thomas Dreibholz +Date: Wed Feb 16 12:56:41 2022 +0100 + + Updated LSM entry. + +commit fa9ba87de153b1c92f0546858782a8b56296d578 +Author: Thomas Dreibholz +Date: Wed Feb 16 12:47:40 2022 +0100 + + New release hipercontracer-1.6.5. + commit d2f6d55910b8960f283a84d33428f13d87209173 Author: Thomas Dreibholz Date: Wed Feb 16 12:21:37 2022 +0100 Updated build scripts +commit bd3e1fa41c49697acb7b7584dff2286f4b3a3ff7 +Merge: 69d9ccc 6cba709 +Author: Thomas Dreibholz +Date: Fri Jan 21 15:06:30 2022 +0100 + + Merge remote-tracking branch 'origin/master' into dreibh/name-resolving + commit 6cba709fe12ca7a53ba0f4d9c9ce03e9f6a19dce Author: Thomas Dreibholz Date: Thu Jan 20 16:04:17 2022 +0100 @@ -22,6 +116,30 @@ CMakeLists.txt fix for reproducible Debian build. +commit 69d9ccc8cfccca5beeff8278084e21099330dad3 +Author: Thomas Dreibholz +Date: Fri Dec 17 16:16:59 2021 +0100 + + Some clean-ups. + +commit 54594966287a4cc730f01a878c6ca6cac556755f +Author: Thomas Dreibholz +Date: Fri Dec 17 16:16:31 2021 +0100 + + Updated manpage. + +commit 447207c7c4946e0af838eff849c3014a8552c08e +Author: Thomas Dreibholz +Date: Fri Dec 17 16:13:18 2021 +0100 + + Added support to specify source and destination by hostname (DNS resolution). + +commit adb86b47a4b932b2a613a9bfd7d1cc753e6a6ad7 +Author: Thomas Dreibholz +Date: Fri Dec 17 15:55:47 2021 +0100 + + Some testing. + commit 4631a6355d233375121d9ffe871bae20df8123db Author: Thomas Dreibholz Date: Tue Dec 14 19:27:47 2021 +0100 diff -Nru hipercontracer-1.6.5/ci/ci-build hipercontracer-1.6.7/ci/ci-build --- hipercontracer-1.6.5/ci/ci-build 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/ci/ci-build 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2022 by Thomas Dreibholz +# Copyright (C) 2021-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/ci/ci-install hipercontracer-1.6.7/ci/ci-install --- hipercontracer-1.6.5/ci/ci-install 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/ci/ci-install 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2022 by Thomas Dreibholz +# Copyright (C) 2021-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/ci/ci-setup hipercontracer-1.6.7/ci/ci-setup --- hipercontracer-1.6.5/ci/ci-setup 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/ci/ci-setup 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2022 by Thomas Dreibholz +# Copyright (C) 2021-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/ci/ci-test hipercontracer-1.6.7/ci/ci-test --- hipercontracer-1.6.5/ci/ci-test 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/ci/ci-test 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # GitHub Actions Scripts -# Copyright (C) 2021-2022 by Thomas Dreibholz +# Copyright (C) 2021-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/ci/get-dependencies hipercontracer-1.6.7/ci/get-dependencies --- hipercontracer-1.6.5/ci/get-dependencies 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/ci/get-dependencies 2023-01-21 11:02:47.000000000 +0000 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Travis CI Scripts -# Copyright (C) 2018-2022 by Thomas Dreibholz +# Copyright (C) 2018-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com import glob @@ -83,7 +83,7 @@ dependencies = [ ] if ((system == 'debian') or (system == 'ubuntu')): if os.path.exists('debian/control'): - with open('debian/control', 'r') as fp: + with open('debian/control', 'r', encoding='utf-8') as fp: inside = False for line in fp: if not line: @@ -116,7 +116,7 @@ elif system == 'fedora': specFiles = glob.glob('rpm/*.spec') if len(specFiles) == 1: - with open(specFiles[0], 'r') as fp: + with open(specFiles[0], 'r', encoding='utf-8') as fp: inside = False for line in fp: if not line: diff -Nru hipercontracer-1.6.5/CMakeLists.txt hipercontracer-1.6.7/CMakeLists.txt --- hipercontracer-1.6.5/CMakeLists.txt 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/CMakeLists.txt 2023-01-22 11:44:08.000000000 +0000 @@ -35,7 +35,7 @@ SET(BUILD_MAJOR "1") SET(BUILD_MINOR "6") -SET(BUILD_PATCH "5") +SET(BUILD_PATCH "7") SET(BUILD_VERSION ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_PATCH}) SET(CMAKE_CXX_STANDARD 14) diff -Nru hipercontracer-1.6.5/cmake_uninstall.cmake.in hipercontracer-1.6.7/cmake_uninstall.cmake.in --- hipercontracer-1.6.5/cmake_uninstall.cmake.in 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/cmake_uninstall.cmake.in 2023-01-05 23:42:40.000000000 +0000 @@ -1,21 +1,21 @@ -if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") - message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt") -endif(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") +IF(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") + MESSAGE(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt") +ENDIF(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") -file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) -string(REGEX REPLACE "\n" ";" files "${files}") -foreach(file ${files}) - message(STATUS "Uninstalling $ENV{DESTDIR}${file}") - if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") - exec_program( - "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval +FILE(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) +STRING(REGEX REPLACE "\n" ";" files "${files}") +FOREACH(file ${files}) + MESSAGE(STATUS "Uninstalling $ENV{DESTDIR}${file}") + IF(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + EXEC_PROGRAM( + "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" + OUTPUT_VARIABLE rm_out + RETURN_VALUE rm_retval ) - if(NOT "${rm_retval}" STREQUAL 0) - message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") - endif(NOT "${rm_retval}" STREQUAL 0) - else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") - message(STATUS "File $ENV{DESTDIR}${file} does not exist.") - endif(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") -endforeach(file) + IF(NOT "${rm_retval}" STREQUAL 0) + MESSAGE(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") + ENDIF(NOT "${rm_retval}" STREQUAL 0) + ELSE(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") + MESSAGE(STATUS "File $ENV{DESTDIR}${file} does not exist.") + ENDIF(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") +ENDFOREACH(file) diff -Nru hipercontracer-1.6.5/debian/changelog hipercontracer-1.6.7/debian/changelog --- hipercontracer-1.6.5/debian/changelog 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/debian/changelog 2023-01-22 11:44:08.000000000 +0000 @@ -1,3 +1,10 @@ +hipercontracer (1.6.7-1) unstable; urgency=medium + + * New upstream release. + * debian/control: Updated standards version to 4.6.2. + + -- Thomas Dreibholz Sun, 22 Jan 2023 22:44:08 +1100 + hipercontracer (1.6.5-1) unstable; urgency=medium * New upstream release. diff -Nru hipercontracer-1.6.5/debian/control hipercontracer-1.6.7/debian/control --- hipercontracer-1.6.5/debian/control 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/debian/control 2023-01-22 11:44:08.000000000 +0000 @@ -1,8 +1,8 @@ Source: hipercontracer Section: net Priority: optional -Maintainer: Thomas Dreibholz -Homepage: https://www.uni-due.de/~be0001/hipercontracer/ +Maintainer: Thomas Dreibholz +Homepage: https://www.nntb.no/~dreibh/hipercontracer/ Build-Depends: cmake (>= 3.0.2), debhelper-compat (= 13), libboost-date-time-dev, @@ -14,10 +14,8 @@ libboost-thread-dev, pkg-config, python3 -Standards-Version: 4.6.0.1 +Standards-Version: 4.6.2 Rules-Requires-Root: no -Vcs-Git: https://github.com/dreibh/hipercontracer.git -Vcs-Browser: https://github.com/dreibh/hipercontracer Package: libhipercontracer1 Section: libs diff -Nru hipercontracer-1.6.5/debian/copyright hipercontracer-1.6.7/debian/copyright --- hipercontracer-1.6.5/debian/copyright 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/debian/copyright 2023-01-22 11:44:08.000000000 +0000 @@ -1,7 +1,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: HiPerConTracer -Upstream-Contact: Thomas Dreibholz -Source: https://www.uni-due.de/~be0001/hipercontracer +Upstream-Contact: Thomas Dreibholz +Source: https://www.nntb.no/~dreibh/hipercontracer Files: * Copyright: 2015-2022 Thomas Dreibholz diff -Nru hipercontracer-1.6.5/debian/upstream/metadata hipercontracer-1.6.7/debian/upstream/metadata --- hipercontracer-1.6.5/debian/upstream/metadata 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/debian/upstream/metadata 2023-01-22 11:44:08.000000000 +0000 @@ -2,5 +2,5 @@ Repository: https://github.com/dreibh/hipercontracer.git Repository-Browse: https://github.com/dreibh/hipercontracer Bug-Submit: https://github.com/dreibh/hipercontracer/issues -Contact: Thomas Dreibholz -Security-Contact: Thomas Dreibholz +Contact: Thomas Dreibholz +Security-Contact: Thomas Dreibholz diff -Nru hipercontracer-1.6.5/debian/watch hipercontracer-1.6.7/debian/watch --- hipercontracer-1.6.5/debian/watch 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/debian/watch 2023-01-22 11:44:08.000000000 +0000 @@ -1,3 +1,3 @@ version=4 opts=pgpsigurlmangle=s/$/.asc/ \ -https://www.uni-due.de/~be0001/hipercontracer/index.html download/hipercontracer-(.*)\.tar\.xz +https://www.nntb.no/~dreibh/hipercontracer/index.html download/hipercontracer-(.*)\.tar\.xz diff -Nru hipercontracer-1.6.5/fetch-debian-changelog hipercontracer-1.6.7/fetch-debian-changelog --- hipercontracer-1.6.5/fetch-debian-changelog 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/fetch-debian-changelog 2023-01-21 11:02:47.000000000 +0000 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Packaging Scripts -# Copyright (C) 2021-2022 by Thomas Dreibholz +# Copyright (C) 2021-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru hipercontracer-1.6.5/filter-debian-changelog hipercontracer-1.6.7/filter-debian-changelog --- hipercontracer-1.6.5/filter-debian-changelog 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/filter-debian-changelog 2023-01-21 11:02:47.000000000 +0000 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Debian/Ubuntu Packaging Scripts -# Copyright (C) 2002-2022 by Thomas Dreibholz +# Copyright (C) 2002-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # This script filters debian/changelog entries: diff -Nru hipercontracer-1.6.5/freebsd/hipercontracer/pkg-descr hipercontracer-1.6.7/freebsd/hipercontracer/pkg-descr --- hipercontracer-1.6.5/freebsd/hipercontracer/pkg-descr 2022-01-20 15:03:30.000000000 +0000 +++ hipercontracer-1.6.7/freebsd/hipercontracer/pkg-descr 2023-01-05 23:42:40.000000000 +0000 @@ -3,4 +3,4 @@ traceroute runs among sites and can export the results into an SQL database. -WWW: https://www.uni-due.de/~be0001/hipercontracer/ +WWW: https://www.nntb.no/~dreibh/hipercontracer/ diff -Nru hipercontracer-1.6.5/freebsd/hipercontracer/test-packaging hipercontracer-1.6.7/freebsd/hipercontracer/test-packaging --- hipercontracer-1.6.5/freebsd/hipercontracer/test-packaging 2022-01-20 15:03:30.000000000 +0000 +++ hipercontracer-1.6.7/freebsd/hipercontracer/test-packaging 2023-01-05 23:42:40.000000000 +0000 @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com PACKAGE=`cat Makefile | grep "^PORTNAME=" | sed -e "s/^PORTNAME=//g" | tr -d " \t"` UPSTREAM_VERSION=`cat Makefile | grep "^PORTVERSION=" | sed -e "s/^PORTVERSION=//g" | tr -d " \t"` diff -Nru hipercontracer-1.6.5/make-srpm hipercontracer-1.6.7/make-srpm --- hipercontracer-1.6.5/make-srpm 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/make-srpm 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2017-2022 by Thomas Dreibholz +# Copyright (C) 2017-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/make-upstream-package hipercontracer-1.6.7/make-upstream-package --- hipercontracer-1.6.5/make-upstream-package 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/make-upstream-package 2023-01-21 11:02:47.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # # Packaging Scripts -# Copyright (C) 2017-2022 by Thomas Dreibholz +# Copyright (C) 2017-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -# Contact: dreibh@iem.uni-due.de +# Contact: thomas.dreibholz@gmail.com # Bash options: set -e diff -Nru hipercontracer-1.6.5/merge-debian-changelogs hipercontracer-1.6.7/merge-debian-changelogs --- hipercontracer-1.6.5/merge-debian-changelogs 2022-02-16 11:21:37.000000000 +0000 +++ hipercontracer-1.6.7/merge-debian-changelogs 2023-01-21 11:02:47.000000000 +0000 @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Packaging Scripts -# Copyright (C) 2021-2022 by Thomas Dreibholz +# Copyright (C) 2021-2023 by Thomas Dreibholz # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru hipercontracer-1.6.5/packaging.conf hipercontracer-1.6.7/packaging.conf --- hipercontracer-1.6.5/packaging.conf 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/packaging.conf 2023-01-05 23:42:40.000000000 +0000 @@ -3,7 +3,7 @@ # --------------------------------------------------------- MAKE_DIST="cmake -DCMAKE_INSTALL_PREFIX=/usr . && make dist" NOT_TARGET_DISTRIBUTIONS="lucid precise trusty" # <<-- Distrubutions which are *not* supported! -MAINTAINER="Thomas Dreibholz " +MAINTAINER="Thomas Dreibholz " MAINTAINER_KEY="21412672518D8B2D1862EFEF5CD5D12AA0877B49" DEBIAN_LAST_ENTRY="FIRST" UBUNTU_LAST_ENTRY="" diff -Nru hipercontracer-1.6.5/rpm/hipercontracer.spec hipercontracer-1.6.7/rpm/hipercontracer.spec --- hipercontracer-1.6.5/rpm/hipercontracer.spec 2022-02-16 11:47:38.000000000 +0000 +++ hipercontracer-1.6.7/rpm/hipercontracer.spec 2023-01-22 11:44:08.000000000 +0000 @@ -1,11 +1,11 @@ Name: hipercontracer -Version: 1.6.5 +Version: 1.6.7 Release: 1 Summary: High-Performance Connectivity Tracer (HiPerConTracer) Group: Applications/Internet License: GPL-3+ -URL: https://www.uni-due.de/~be0001/hipercontracer/ -Source: https://www.uni-due.de/~be0001/hipercontracer/download/%{name}-%{version}.tar.xz +URL: https://www.nntb.no/~dreibh/hipercontracer/ +Source: https://www.nntb.no/~dreibh/hipercontracer/download/%{name}-%{version}.tar.xz AutoReqProv: on BuildRequires: cmake @@ -144,6 +144,10 @@ %changelog +* Sun Jan 22 2023 Thomas Dreibholz - 1.6.7 +- New upstream release. +* Sun Sep 11 2022 Thomas Dreibholz - 1.6.6 +- New upstream release. * Wed Feb 16 2022 Thomas Dreibholz - 1.6.5 - New upstream release. * Fri Dec 03 2021 Thomas Dreibholz - 1.6.4 diff -Nru hipercontracer-1.6.5/src/addressinfogenerator.1 hipercontracer-1.6.7/src/addressinfogenerator.1 --- hipercontracer-1.6.5/src/addressinfogenerator.1 2022-01-20 15:03:30.000000000 +0000 +++ hipercontracer-1.6.7/src/addressinfogenerator.1 2023-01-05 23:42:40.000000000 +0000 @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . .\" -.\" Contact: dreibh@iem.uni-due.de +.\" Contact: thomas.dreibholz@gmail.com .\" .\" ###### Setup ############################################################ .Dd September 25, 2015 @@ -53,7 +53,7 @@ .Sh AUTHORS Thomas Dreibholz .br -https://www.uni-due.de/~be0001/addressinfogenerator +https://www.nntb.no/~dreibh/addressinfogenerator .br -mailto://dreibh@iem.uni-due.de +mailto://thomas.dreibholz@gmail.com .br diff -Nru hipercontracer-1.6.5/src/CMakeLists.txt hipercontracer-1.6.7/src/CMakeLists.txt --- hipercontracer-1.6.5/src/CMakeLists.txt 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/src/CMakeLists.txt 2023-01-05 23:42:40.000000000 +0000 @@ -93,6 +93,7 @@ # Test only: # ADD_EXECUTABLE(t1 t1.cc) +# TARGET_LINK_LIBRARIES(t1 ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) # ADD_EXECUTABLE(t2 t2.cc) # ADD_EXECUTABLE(t3 t3.cc) diff -Nru hipercontracer-1.6.5/src/get-default-ips.1 hipercontracer-1.6.7/src/get-default-ips.1 --- hipercontracer-1.6.5/src/get-default-ips.1 2022-01-20 15:03:30.000000000 +0000 +++ hipercontracer-1.6.7/src/get-default-ips.1 2023-01-05 23:42:40.000000000 +0000 @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . .\" -.\" Contact: dreibh@iem.uni-due.de +.\" Contact: thomas.dreibholz@gmail.com .\" .\" ###### Setup ############################################################ .Dd July 31, 2019 @@ -51,7 +51,7 @@ .Sh AUTHORS Thomas Dreibholz .br -https://www.uni-due.de/~be0001/hipercontracer +https://www.nntb.no/~dreibh/hipercontracer .br -mailto://dreibh@iem.uni-due.de +mailto://thomas.dreibholz@gmail.com .br diff -Nru hipercontracer-1.6.5/src/hipercontracer.1 hipercontracer-1.6.7/src/hipercontracer.1 --- hipercontracer-1.6.5/src/hipercontracer.1 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/src/hipercontracer.1 2023-01-05 23:42:40.000000000 +0000 @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . .\" -.\" Contact: dreibh@iem.uni-due.de +.\" Contact: thomas.dreibholz@gmail.com .\" .\" ###### Setup ############################################################ .Dd February 26, 2021 @@ -33,8 +33,8 @@ .Op \-q|--quiet .Op \-v|--verbose .Op \-U|--user=user|uid -.Op \-S|--source=address[,traffic_class[,...]] -.Op \-D|--destination address +.Op \-S|--source=address|hostname[,traffic_class[,...]] +.Op \-D|--destination address|hostname .Op \--iterations number_of_iterations .Op \--tracerouteinterval milliseconds .Op \--tracerouteduration milliseconds @@ -74,12 +74,14 @@ After startup, HiPerConTracer uses UID and GID of the given user (by name or GID). The output directory's ownership as well as the ownership of the created results files will be set accordingly. -.It \-S|\--source address[,traffic_class[,...]] -Adds the given source address. It is possible to use the ANY address (0.0.0.0 or ::), in order to just use the default route. +.It \-S|\--source address|hostname[,traffic_class[,...]] +Adds the given source address or hostname. It is possible to use the ANY address (0.0.0.0 or ::), in order to just use the default route. If no traffic class is given, Best Effort (00) is used. Otherwise, the list of given traffic classes (in hexadecimal) is used. Alternatively, a traffic class can be specified by PHB name (BE, EF, AF11, AF12, AF13, AF21, AF22, AF23, AF31, AF32, AF33, AF41, AF42, AF43, CS1, CS2, CS3, CS4, CS5, CS6, CS7). In this case, the corresponding traffic class with ECN bits set to 0 is used. Note: use lower-case hexadecimal letters to avoid ambiguities with PHB name (e.g. be for 0xbe instead of BE PHB)! -.It \-D|\--destination address -Adds the given destination address. +If a hostname is provided, a DNS resolution is performed and all returned addresses are added. +.It \-D|\--destination address|hostname +Adds the given destination address or hostname. +If a hostname is provided, a DNS resolution is performed and all returned addresses are added. .It \--iterations number_of_iterations Limit the number of measurement iterations (measurement for all source/destination pairs) to the given number of iterations. The default 0 lets HiPerConTracer run @@ -195,12 +197,13 @@ .It hipercontracer \--source=0.0.0.0,00,AF11 \--source=::,BE,EF,AF11 \--destination=8.8.8.8 \--destination=2606:4700:10::6814:155 \--ping \--traceroute \--tracerouteduration=1000 \--tracerouteinitialmaxttl=4 \--traceroutefinalmaxttl=32 \--tracerouteincrementmaxttl=4 \--pinginterval=1000 \--pingexpiration=7500 \--pingttl=56 \--resultsdirectory=/storage/hpct-results \--resultstransactionlength=20 \--quiet .It hipercontracer \--user=hipercontracer \--source=10.1.1.51 \--destination=10.1.1.6 \--destination=10.1.1.7 \--destination=10.1.1.8 \--traceroute \--tracerouteinterval=10000 \--tracerouteduration=1000 .It hipercontracer \--user=hipercontracer \--source=0.0.0.0 \--destination=8.8.8.8 \--ping \--verbose +.It hipercontracer \--user=hipercontracer \--source=0.0.0.0 \--source=::\--destination=www.ietf.org \--ping \--verbose .El .\" ###### Authors ########################################################## .Sh AUTHORS Thomas Dreibholz .br -https://www.uni-due.de/~be0001/hipercontracer +https://www.nntb.no/~dreibh/hipercontracer .br -mailto://dreibh@iem.uni-due.de +mailto://thomas.dreibholz@gmail.com .br diff -Nru hipercontracer-1.6.5/src/hpcttrigger.1 hipercontracer-1.6.7/src/hpcttrigger.1 --- hipercontracer-1.6.5/src/hpcttrigger.1 2022-01-20 15:03:30.000000000 +0000 +++ hipercontracer-1.6.7/src/hpcttrigger.1 2023-01-05 23:42:40.000000000 +0000 @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . .\" -.\" Contact: dreibh@iem.uni-due.de +.\" Contact: thomas.dreibholz@gmail.com .\" .\" ###### Setup ############################################################ .Dd June 6, 2019 @@ -83,7 +83,7 @@ .Sh AUTHORS Thomas Dreibholz .br -https://www.uni-due.de/~be0001/hipercontracer +https://www.nntb.no/~dreibh/hipercontracer .br -mailto://dreibh@iem.uni-due.de +mailto://thomas.dreibholz@gmail.com .br diff -Nru hipercontracer-1.6.5/src/t1.cc hipercontracer-1.6.7/src/t1.cc --- hipercontracer-1.6.5/src/t1.cc 2022-01-20 15:03:30.000000000 +0000 +++ hipercontracer-1.6.7/src/t1.cc 2023-01-05 23:42:40.000000000 +0000 @@ -8,6 +8,7 @@ #include #include +#include #include @@ -28,25 +29,42 @@ // ###### Main program ###################################################### int main(int argc, char** argv) { + boost::asio::io_service ios; - std::cout << "A=" << boost::posix_time::to_iso_string(boost::posix_time::microsec_clock::universal_time()) << std::endl; - - - const std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); - - std::time_t tt = std::chrono::system_clock::to_time_t(now); - std::cout << "B=" << std::put_time(std::localtime(&tt), "%Y/%m/%d %T") << std::endl; - - std::cout << "C1=" << getTimeString(now) << std::endl; - std::cout << "C2=" << getTimeString(now, "%Y%m%dT%H%M%S") << std::endl; - - - const std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now(); - usleep(1234567); - const std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now(); - unsigned long long diff = std::chrono::duration_cast(t2 - t1).count(); - - std::cout << "d=" << diff << std::endl; + boost::asio::ip::tcp::resolver::query resolver_query( + "www.ietf.org", "0", boost::asio::ip::tcp::resolver::query::numeric_service); + boost::asio::ip::tcp::resolver resolver(ios); + boost::system::error_code ec; + const boost::asio::ip::tcp::resolver::results_type endpoints = + resolver.resolve(resolver_query, ec); + if(ec) { + std::cerr << "Failed to resolve a DNS name." << "Error code = " << ec.value() << ". Message = " << ec.message(); + exit(1); + } + + for (boost::asio::ip::tcp::resolver::iterator it = endpoints.cbegin(); it != endpoints.cend(); it++) { + const boost::asio::ip::tcp::endpoint endpoint = *it; + std::cout << endpoint << '\n'; + } + +// std::cout << "A=" << boost::posix_time::to_iso_string(boost::posix_time::microsec_clock::universal_time()) << std::endl; +// +// +// const std::chrono::system_clock::time_point now = std::chrono::system_clock::now(); +// +// std::time_t tt = std::chrono::system_clock::to_time_t(now); +// std::cout << "B=" << std::put_time(std::localtime(&tt), "%Y/%m/%d %T") << std::endl; +// +// std::cout << "C1=" << getTimeString(now) << std::endl; +// std::cout << "C2=" << getTimeString(now, "%Y%m%dT%H%M%S") << std::endl; +// +// +// const std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now(); +// usleep(1234567); +// const std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now(); +// unsigned long long diff = std::chrono::duration_cast(t2 - t1).count(); +// +// std::cout << "d=" << diff << std::endl; return(0); } diff -Nru hipercontracer-1.6.5/src/tools.cc hipercontracer-1.6.7/src/tools.cc --- hipercontracer-1.6.5/src/tools.cc 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/src/tools.cc 2023-01-05 23:42:40.000000000 +0000 @@ -131,7 +131,8 @@ // ###### Add source address to set ######################################### bool addSourceAddress(std::map>& array, - const std::string& addressString) + const std::string& addressString, + bool tryToResolve) { boost::system::error_code errorCode; std::vector addressParameters; @@ -140,6 +141,25 @@ if(addressParameters.size() > 0) { const boost::asio::ip::address address = boost::asio::ip::address::from_string(addressParameters[0], errorCode); if(errorCode != boost::system::errc::success) { + if(tryToResolve) { + boost::asio::io_service ios; + boost::asio::ip::tcp::resolver::query resolver_query( + addressString, "0", boost::asio::ip::tcp::resolver::query::numeric_service); + boost::asio::ip::tcp::resolver resolver(ios); + boost::system::error_code ec; + const boost::asio::ip::tcp::resolver::results_type endpoints = + resolver.resolve(resolver_query, ec); + if(ec) { + std::cerr << "Failed to resolve a DNS name " << addressString << ": " << ec.message() << std::endl; + exit(1); + } + for (boost::asio::ip::tcp::resolver::iterator it = endpoints.cbegin(); it != endpoints.cend(); it++) { + const boost::asio::ip::tcp::endpoint endpoint = *it; + HPCT_LOG(info) << addressString << " -> " << endpoint.address().to_string(); + addSourceAddress(array, endpoint.address().to_string(), false); + } + return true; + } std::cerr << "ERROR: Bad source address " << addressParameters[0] << "!" << std::endl; return false; } @@ -183,11 +203,31 @@ // ###### Add destination address to set #################################### bool addDestinationAddress(std::set& array, - const std::string& addressString) + const std::string& addressString, + bool tryToResolve) { boost::system::error_code errorCode; boost::asio::ip::address address = boost::asio::ip::address::from_string(addressString, errorCode); if(errorCode != boost::system::errc::success) { + if(tryToResolve) { + boost::asio::io_service ios; + boost::asio::ip::tcp::resolver::query resolver_query( + addressString, "0", boost::asio::ip::tcp::resolver::query::numeric_service); + boost::asio::ip::tcp::resolver resolver(ios); + boost::system::error_code ec; + const boost::asio::ip::tcp::resolver::results_type endpoints = + resolver.resolve(resolver_query, ec); + if(ec) { + std::cerr << "Failed to resolve a DNS name " << addressString << ": " << ec.message() << std::endl; + exit(1); + } + for (boost::asio::ip::tcp::resolver::iterator it = endpoints.cbegin(); it != endpoints.cend(); it++) { + const boost::asio::ip::tcp::endpoint endpoint = *it; + HPCT_LOG(info) << addressString << " -> " << endpoint.address().to_string(); + addDestinationAddress(array, endpoint.address().to_string(), false); + } + return true; + } std::cerr << "ERROR: Bad destination address " << addressString << "!" << std::endl; return false; } diff -Nru hipercontracer-1.6.5/src/tools.h hipercontracer-1.6.7/src/tools.h --- hipercontracer-1.6.5/src/tools.h 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/src/tools.h 2023-01-05 23:42:40.000000000 +0000 @@ -45,8 +45,10 @@ bool reducePrivileges(const passwd* pw); bool addSourceAddress(std::map>& array, - const std::string& addressString); + const std::string& addressString, + bool tryToResolve = true); bool addDestinationAddress(std::set& array, - const std::string& addressString); + const std::string& addressString, + bool tryToResolve = true); #endif diff -Nru hipercontracer-1.6.5/src/tracedataimporter.1 hipercontracer-1.6.7/src/tracedataimporter.1 --- hipercontracer-1.6.5/src/tracedataimporter.1 2022-01-20 15:03:31.000000000 +0000 +++ hipercontracer-1.6.7/src/tracedataimporter.1 2023-01-05 23:43:16.000000000 +0000 @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with this program. If not, see . .\" -.\" Contact: dreibh@iem.uni-due.de +.\" Contact: thomas.dreibholz@gmail.com .\" .\" ###### Setup ############################################################ .Dd September 25, 2015 @@ -56,7 +56,7 @@ .Sh AUTHORS Thomas Dreibholz .br -https://www.uni-due.de/~be0001/tracedataimporter +https://www.nntb.no/~dreibh/hipercontracer .br -mailto://dreibh@iem.uni-due.de +mailto://thomas.dreibholz@gmail.com .br