<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5015188a40b3d5c03f92a5ddc872346722a2b5a1">https://github.com/macports/macports-ports/commit/5015188a40b3d5c03f92a5ddc872346722a2b5a1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5015188a40b nrg: Fix compilation on modern systems
</span>5015188a40b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5015188a40b3d5c03f92a5ddc872346722a2b5a1
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Nov 24 11:46:24 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> nrg: Fix compilation on modern systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add a patch I developed to fix implicit declaration of functions,
</span><span style='display:block; white-space:pre;color:#404040;'> modernize how function arguments are specified, specify function return
</span><span style='display:block; white-space:pre;color:#404040;'> values, fix a few mistakes in function return types, and fix the debug
</span><span style='display:block; white-space:pre;color:#404040;'> and verbose functions to use variadic arguments.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix Portfile and configure script not to override MacPorts CFLAGS,
</span><span style='display:block; white-space:pre;color:#404040;'> therefore revbump since we now build for the right architectures and
</span><span style='display:block; white-space:pre;color:#404040;'> optimization flags.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Attempt to better support macOS on ARM and potentially non-Darwin
</span><span style='display:block; white-space:pre;color:#404040;'> systems by adjusting how --build is specified.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specify license.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use archived homepage since original doesn't exist anymore.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add size to checksums.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use leading 0 for octal values for clarity.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adjust notes to fix formatting and to mention the possibility of using
</span><span style='display:block; white-space:pre;color:#404040;'> launchd instead of cron.
</span>---
net/nrg/Portfile | 48 +--
net/nrg/files/CFLAGS.patch | 55 +++
.../implicit-functions-args-and-return-types.patch | 371 +++++++++++++++++++++
net/nrg/files/patch-roverpingd-send.c.diff | 21 --
4 files changed, 453 insertions(+), 42 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nrg/Portfile b/net/nrg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4108d5af6de..0dd0490263e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nrg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nrg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,13 @@ PortGroup perl5 1.0
</span>
name nrg
version 0.99.27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> categories net
maintainers nomaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# The source includes the GPL-2 LICENSE file but does not specify
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# whether it is GPL-2.0-only or GPL-2.0-or-later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2
</span>
description Network Resource Grapher
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +21,12 @@ long_description NRG is an RRDtool front-end tool to monitor traffic and load
</span> while providing short and long-term graph web pages just like MRTG.
# website no longer exists
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://ginseng.hep.wisc.edu/NRG/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://web.archive.org/web/20090307054951/http://nrg.hep.wisc.edu/
</span> master_sites macports_distfiles:${name}
checksums rmd160 1192ce02d14447abdcff994671693eeb4ca67e28 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ef851705f9ebd2bf55892823f258c7cffc079ae0276df4f40860c520262971c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef851705f9ebd2bf55892823f258c7cffc079ae0276df4f40860c520262971c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 213776
</span>
perl5.branches 5.28
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +35,8 @@ depends_lib port:perl${perl5.major} \
</span> port:rrdtool
patchfiles patch-nrg-discover-tcp.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-roverpingd-send.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit-functions-args-and-return-types.patch
</span>
configure.perl ${perl5.bin}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,12 +45,12 @@ configure.pre_args --prefix=${prefix}/var/${name}
</span> configure.args --bindir=${prefix}/bin \
--sysconfdir=${prefix}/etc/${name} \
--datadir=${prefix}/share \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --build=powerpc-unknown-freebsd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="-D__FreeBSD__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=${os.arch}-unknown-${os.platform}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --build=powerpc-unknown-freebsd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --build=i386-unknown-freebsd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=${os.arch}-unknown-${os.platform} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --build=${os.arch}-unknown-freebsd
</span> }
variant pingd_server description {pingd daemon to graph network latency with NRG} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,26 +60,23 @@ variant pingd_server description {pingd daemon to graph network latency with NRG
</span> }
build.target pingd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install.pingd install
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Maintain empty directories
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${prefix}/var/${name}/archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install.pingd install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.keepdirs ${destroot}${prefix}/var/${name}/archive
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ### Path fixes ###
reinplace "s|@prefix@/bin|@bindir@|g" \
${worksrcpath}/examples/NRG.mconf.in \
${worksrcpath}/src/nrg-spiketrimmer.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@prefix@/bin|@bindir@|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "s|@prefix@/bin|@bindir@|g" \
</span> {*}[glob ${worksrcpath}/templates/*.in]
#### Make NRG page title the way I want it ####
reinplace "s|Somesite's NRG Home Page|NRG Home Page|g" \
"${worksrcpath}/examples/Makefile.ops.in"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #### Fix paths for proper destrooting ####
reinplace "s|exec_prefix = @prefix@|exec_prefix = ${destroot}@prefix@|g" \
${worksrcpath}/Makefile.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,8 +100,8 @@ post-patch {
</span>
post-destroot {
# Install images to \${prefix}/var/nrg/web/icons
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/var/${name}/web/icons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 {*}[glob ${worksrcpath}/images/*.*] ${destroot}${prefix}/var/${name}/web/icons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/var/${name}/web/icons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 {*}[glob ${worksrcpath}/images/*.*] ${destroot}${prefix}/var/${name}/web/icons
</span>
# Rename Site.mconf so graphed devices won't get rewritten on port upgrades
move ${destroot}${prefix}/var/${name}/Site.mconf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,11 +119,15 @@ notes \
</span>
2) Modify your httpd.conf file for NRG graph pages:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Uncomment lines: AddHandler cgi-script .cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Uncomment lines:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AddHandler cgi-script .cgi
</span> LoadModule expires_module libexec/httpd/mod_expires.so
AddModule mod_expires.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Add directives: <Directory /my-Apache-document-root/nrg>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add directives:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <Directory /my-Apache-document-root/nrg>
</span> Options ExecCGI
</Directory>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,8 +164,8 @@ have permissions to create graphs when you click an RRD file link.
</span> make rediscover
make notify
<span style='display:block; white-space:pre;background:#ffe0e0;'>-3) Schedule the script ${prefix}/var/${name}/run-nrg to run via cron every five
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minutes to poll your data sources and update the rrd files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3) Schedule the script ${prefix}/var/${name}/run-nrg to run via launchd or cron
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ every five minutes to poll your data sources and update the rrd files.
</span>
Be sure to read the documentation in ${prefix}/share/doc/${name}/html for
creating custom graphs or for more information."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nrg/files/CFLAGS.patch b/net/nrg/files/CFLAGS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..2c16de16fbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nrg/files/CFLAGS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override CFLAGS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-11-23 06:09:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3402,44 +3402,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case $host_os in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *bsd*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__FreeBSD__" # danger! danger! danger!?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__FreeBSD__" # danger! danger! danger!?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL='56 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... bsd... $PING host 56 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *linux*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__LINUX__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__LINUX__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD='-c 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... linux... $PING -c 1 host"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *solaris*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__SOLARIS__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__SOLARIS__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="-lsocket -lnsl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD='-s'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL='56 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... solaris... $PING -s host 56 1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *osf*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__OSF1__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__OSF1__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD='-c 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... osf1... $PING -c 1 host"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *sysv4*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__OSF1__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__OSF1__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD='-c 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... svr4... $PING -c 1 host"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *aix*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__AIX__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__AIX__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD='-c 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... aix... $PING -c 1 host"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *sunos*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="-D__SUNOS__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CFLAGS+=" -D__SUNOS__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_HEAD='-c'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PING_TAIL='56 1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "checking for ping once syntax... *unknown os*... $PING -c host 56 1"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nrg/files/implicit-functions-args-and-return-types.patch b/net/nrg/files/implicit-functions-args-and-return-types.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..47a58e80cbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nrg/files/implicit-functions-args-and-return-types.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,371 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions by including required system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+headers and forward-declaring functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Modernize function arguments and specify function return types.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix verbose and debug functions to use a va_list.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Change send_pings to accept an int parameter because it is used as a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+signal handler and that's how signal handlers are defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/packet.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/packet.c 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/file.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +29,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-malloc_ping_packet()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void malloc_ping_packet(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug("mallocing %d bytes for packet\n", packet_size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ping_packet = (u_char *)malloc((unsigned) packet_size)) == NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,7 +41,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_icmp_identifer()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void set_icmp_identifer(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ icmp_ident = getpid() & 0xffff;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ debug("setting icmp identifer to %d\n", icmp_ident);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,9 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static unsigned int calc_checksum(addr,len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-u_short *addr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static unsigned int calc_checksum(u_short *addr, int len)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int nleft = len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register u_short *w = addr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,11 +71,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-create_icmp_header(address,header,sock,seq)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *address;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct icmp *header;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct sockaddr *sock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int seq;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int create_icmp_header(char *address, struct icmp *header, struct sockaddr *sock, int seq)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct sockaddr_in *to;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/pingd.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/pingd.c 2021-11-23 06:12:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,9 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main(argc,argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ process_args(argc,argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ write_pid_file();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,15 +42,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ malloc_ping_packet();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_icmp_identifer();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ read_ping_list();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- send_pings();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ send_pings(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ receive_pings();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-process_args(argc,argv)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int argc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *argv[];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void process_args(int argc, char *argv[])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int flag;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char *optarg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -98,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-usage()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void usage(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("usage: nrg-pingd [args]\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf(" -p num set polling interval to num (default %d secs)\n", polling_interval * NUM_DATA_POINTS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,37 +110,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-debug(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *a,*b,*c,*d,*e,*f,*g,*h,*i,*j,*k,*l,*m,*n,*o;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debug(const char* format, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ va_list arglist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( debuggin ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ va_start(arglist, format);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfprintf(stderr, format, arglist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ va_end(arglist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fflush(stderr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-verbose(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *a,*b,*c,*d,*e,*f,*g,*h,*i,*j,*k,*l,*m,*n,*o;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void verbose(const char* format, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char time_str[27];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_t now_t = time(&now_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ va_list arglist;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( verbosin && ! debuggin ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcpy(time_str,(char *)ctime(&now_t));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ len = strlen(time_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_str[len - 6] = '\0';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr,"%s ",time_str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fprintf(stderr,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ va_start(arglist, format);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vfprintf(stderr, format, arglist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ va_end(arglist);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fflush(stderr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-debug_ctime(t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-time_t t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debug_ctime(time_t t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char time_str[27];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int len;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,8 +158,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dump_list_entry(i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void dump_list_entry(int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr,"list entry %d...\n",i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr," n_addr is \"%s\"\n",ping_list[i]->n_addr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,7 +169,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-write_pid_file()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void write_pid_file(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/pingd.h.in.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/pingd.h.in 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,3 +48,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int n_next_data_point;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void process_args(int argc, char *argv[]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void usage(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debug(const char* format, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void verbose(const char* format, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void debug_ctime(time_t t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void write_pid_file(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void create_ping_socket(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void malloc_ping_packet(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void set_icmp_identifer(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void read_ping_list(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void send_pings(int sig);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void receive_pings(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int create_icmp_header(char *address, struct icmp *header, struct sockaddr *sock, int seq);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/read_list.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/read_list.c 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-read_ping_list()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void read_ping_list(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat buf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/receive.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/receive.c 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,11 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-parse_icmp_seq(packet,packetlen,from)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-char *packet;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int packetlen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct sockaddr_in *from;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int parse_icmp_seq(char *packet, int packetlen, struct sockaddr_in *from)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct in_addr temp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct ip *ip;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,9 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-calc_latency(idx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int idx;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int calc_latency(int idx)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timeval now;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int e_secs, e_usecs, rtt, ave_rtt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +114,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-receive_pings()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void receive_pings(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct sockaddr_in from_sock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int from_len, byte_count, idx, l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/send.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/send.c 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,9 +33,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int nodes_pinged = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static time_t ping_list_start_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void mark_node_as_down(int i);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void set_alarm_itimer(time_t when_sec, time_t delta_ms);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void write_stats_file(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void send_pings()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void send_pings(int sig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i, rc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_t now;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,8 +130,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mark_node_as_down(i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void mark_node_as_down(int i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ping_list[i]->n_state = NOT_PINGING;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ping_list[i]->n_latency = NOT_RESPONDING;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,9 +171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_alarm_itimer(when_sec,delta_ms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-time_t when_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-time_t delta_ms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void set_alarm_itimer(time_t when_sec, time_t delta_ms)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_t now;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct itimerval timer_time, old_timer_time;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -197,7 +198,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __DUMP_PACKETS__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dump_packet()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void dump_packet(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ register int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr,"\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/sock.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/sock.c 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-create_ping_socket()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void create_ping_socket(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct protoent *proto;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- roverpingd/write_stats.c.orig 2006-01-30 06:12:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ roverpingd/write_stats.c 2021-11-23 05:52:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,6 +3,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <signal.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <limits.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,9 +29,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char pingstats_file[MAX_PATH_LENGTH];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void dataprintf(FILE *fp, int arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-write_stats_file()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void write_stats_file(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time_t now = time(&now);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,9 +115,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dataprintf(fp, arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-int arg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void dataprintf(FILE *fp, int arg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch (arg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case NOT_RESPONDING: {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nrg/files/patch-roverpingd-send.c.diff b/net/nrg/files/patch-roverpingd-send.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 690cd93e603..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nrg/files/patch-roverpingd-send.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- roverpingd/send.c.orig 2006-01-30 04:12:24.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ roverpingd/send.c 2014-12-01 22:26:52.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int nodes_pinged = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static time_t ping_list_start_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void set_alarm_itimer(time_t when_sec, time_t delta_ms);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void send_pings()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,9 +169,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*------------------------------------------------------------------*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--set_alarm_itimer(when_sec,delta_ms)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--time_t when_sec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--time_t delta_ms;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void set_alarm_itimer(time_t when_sec, time_t delta_ms)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- time_t now;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct itimerval timer_time, old_timer_time;
</span></pre><pre style='margin:0'>
</pre>