Compare commits
No commits in common. "c10s" and "c8" have entirely different histories.
@ -1 +0,0 @@
|
|||||||
1
|
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1 @@
|
|||||||
/net-tools-2.0.20150915git.tar.xz
|
SOURCES/net-tools-2.0.20160912git.tar.xz
|
||||||
/net-tools-2.0.20160329git.tar.xz
|
|
||||||
/net-tools-2.0.20160912git.tar.xz
|
|
||||||
|
1
.net-tools.metadata
Normal file
1
.net-tools.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
da8a1810b0999f267208075e73a2cc0d8acaa546 SOURCES/net-tools-2.0.20160912git.tar.xz
|
@ -150,7 +150,7 @@ index e4ed41d..c45b62a 100644
|
|||||||
if (ifr.ifr_name[0])
|
if (ifr.ifr_name[0])
|
||||||
- usage();
|
- usage();
|
||||||
+ usage(E_OPTERR);
|
+ usage(E_OPTERR);
|
||||||
strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
|
strncpy(ifr.ifr_name, *argv, IFNAMSIZ-1);
|
||||||
} else {
|
} else {
|
||||||
if (ifr.ifr_hwaddr.sa_data[0])
|
if (ifr.ifr_hwaddr.sa_data[0])
|
||||||
- usage();
|
- usage();
|
92
SOURCES/net-tools-covscan.patch
Normal file
92
SOURCES/net-tools-covscan.patch
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
diff --git a/ifconfig.c.old b/ifconfig.c
|
||||||
|
index 2b8cbbb..6505e07 100644
|
||||||
|
--- a/ifconfig.c.old
|
||||||
|
+++ b/ifconfig.c
|
||||||
|
@@ -967,8 +967,9 @@ int main(int argc, char **argv)
|
||||||
|
if (ap->herror)
|
||||||
|
ap->herror(host);
|
||||||
|
else
|
||||||
|
- fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
|
||||||
|
- _("ifconfig: `--help' gives usage information.\n")); exit(1);
|
||||||
|
+ fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name);
|
||||||
|
+
|
||||||
|
+ fprintf(stderr,_("ifconfig: `--help' gives usage information.\n")); exit(1);
|
||||||
|
}
|
||||||
|
memcpy(&ifr.ifr_addr, sa, sizeof(struct sockaddr));
|
||||||
|
{
|
||||||
|
diff --git a/ipmaddr.c.old b/ipmaddr.c
|
||||||
|
index 2bfaf98..7a313c7 100644
|
||||||
|
--- a/ipmaddr.c.old
|
||||||
|
+++ b/ipmaddr.c
|
||||||
|
@@ -336,7 +336,7 @@ int multiaddr_modify(int cmd, int argc, char **argv)
|
||||||
|
NEXT_ARG();
|
||||||
|
if (ifr.ifr_name[0])
|
||||||
|
usage();
|
||||||
|
- strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
|
||||||
|
+ strncpy(ifr.ifr_name, *argv, IFNAMSIZ-1);
|
||||||
|
} else {
|
||||||
|
if (ifr.ifr_hwaddr.sa_data[0])
|
||||||
|
usage();
|
||||||
|
diff --git a/lib/inet_gr.c.old b/lib/inet_gr.c
|
||||||
|
index b172d65..75ac240 100644
|
||||||
|
--- a/lib/inet_gr.c.old
|
||||||
|
+++ b/lib/inet_gr.c
|
||||||
|
@@ -292,6 +292,7 @@ int rprint_cache(int ext, int numeric)
|
||||||
|
printf(_("Source Destination Gateway "
|
||||||
|
"Flags Metric Ref Use Iface "
|
||||||
|
"MSS Window irtt TOS HHRef HHUptod SpecDst\n"));
|
||||||
|
+
|
||||||
|
fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
|
||||||
|
"Iface", "%15s",
|
||||||
|
"Destination", "%127s",
|
||||||
|
diff --git a/lib/ipx_gr.c.old b/lib/ipx_gr.c
|
||||||
|
index 2fa717c..b98c09c 100644
|
||||||
|
--- a/lib/ipx_gr.c.old
|
||||||
|
+++ b/lib/ipx_gr.c
|
||||||
|
@@ -57,6 +57,7 @@ int IPX_rprint(int options)
|
||||||
|
|
||||||
|
if ((ap = get_afntype(AF_IPX)) == NULL) {
|
||||||
|
EINTERN("lib/ipx_rt.c", "AF_IPX missing");
|
||||||
|
+ fclose(fp);
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/lib/netrom_gr.c.old b/lib/netrom_gr.c
|
||||||
|
index ec82fe8..7c3349f 100644
|
||||||
|
--- a/lib/netrom_gr.c.old
|
||||||
|
+++ b/lib/netrom_gr.c
|
||||||
|
@@ -43,8 +43,14 @@ int NETROM_rprint(int options)
|
||||||
|
if (!f2) perror(_PATH_PROCNET_NR_NEIGH);
|
||||||
|
|
||||||
|
if (f1 == NULL || f2 == NULL) {
|
||||||
|
- printf(_("NET/ROM not configured in this system.\n"));
|
||||||
|
- return 1;
|
||||||
|
+ printf(_("NET/ROM not configured in this system.\n"));
|
||||||
|
+ if(f1 != NULL)
|
||||||
|
+ fclose(f1);
|
||||||
|
+
|
||||||
|
+ if(f2 != NULL)
|
||||||
|
+ fclose(f2);
|
||||||
|
+
|
||||||
|
+ return 1;
|
||||||
|
}
|
||||||
|
printf(_("Kernel NET/ROM routing table\n"));
|
||||||
|
printf(_("Destination Mnemonic Quality Neighbour Iface\n"));
|
||||||
|
diff --git a/statistics.c.old b/statistics.c
|
||||||
|
index 02791ed..8c2e18e 100644
|
||||||
|
--- a/statistics.c.old
|
||||||
|
+++ b/statistics.c
|
||||||
|
@@ -568,10 +568,10 @@ int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
|
||||||
|
f = proc_fopen("/proc/net/sctp/snmp");
|
||||||
|
if (f) {
|
||||||
|
process_fd2(f,"/proc/net/sctp/snmp");
|
||||||
|
- if (ferror(f)) {
|
||||||
|
+ if (ferror(f))
|
||||||
|
perror("/proc/net/sctp/snmp");
|
||||||
|
- fclose(f);
|
||||||
|
- }
|
||||||
|
+
|
||||||
|
+ fclose(f);
|
||||||
|
}
|
||||||
|
return(0);
|
||||||
|
}
|
@ -1,6 +1,8 @@
|
|||||||
--- a/lib/inet6_gr.c
|
diff --git a/lib/inet6_gr.c.old b/lib/inet6_gr.c
|
||||||
|
index 4e26d30..2ff53a2 100644
|
||||||
|
--- a/lib/inet6_gr.c.old
|
||||||
+++ b/lib/inet6_gr.c
|
+++ b/lib/inet6_gr.c
|
||||||
@@ -146,7 +146,7 @@
|
@@ -146,7 +146,7 @@ int rprint_fib6(int ext, int numeric)
|
||||||
strcat(flags, "f");
|
strcat(flags, "f");
|
||||||
|
|
||||||
/* Print the info. */
|
/* Print the info. */
|
||||||
@ -8,3 +10,4 @@
|
|||||||
+ printf("%-30s %-26s %-4s %-3d %-1d %6d %s\n",
|
+ printf("%-30s %-26s %-4s %-3d %-1d %6d %s\n",
|
||||||
addr6, naddr6, flags, metric, refcnt, use, iface);
|
addr6, naddr6, flags, metric, refcnt, use, iface);
|
||||||
}
|
}
|
||||||
|
|
@ -3,8 +3,9 @@
|
|||||||
Summary: Basic networking tools
|
Summary: Basic networking tools
|
||||||
Name: net-tools
|
Name: net-tools
|
||||||
Version: 2.0
|
Version: 2.0
|
||||||
Release: 0.73.%{checkout}%{?dist}
|
Release: 0.52.%{checkout}%{?dist}
|
||||||
License: GPL-2.0-or-later
|
License: GPLv2+
|
||||||
|
Group: System Environment/Base
|
||||||
URL: http://sourceforge.net/projects/net-tools/
|
URL: http://sourceforge.net/projects/net-tools/
|
||||||
|
|
||||||
# git archive --format=tar --remote=git://git.code.sf.net/p/net-tools/code master | xz > net-tools-%%{version}.%%{checkout}.tar.xz
|
# git archive --format=tar --remote=git://git.code.sf.net/p/net-tools/code master | xz > net-tools-%%{version}.%%{checkout}.tar.xz
|
||||||
@ -35,18 +36,15 @@ Patch20: ether-wake-interfaces.patch
|
|||||||
Patch21: net-tools-ifconfig-EiB.patch
|
Patch21: net-tools-ifconfig-EiB.patch
|
||||||
Patch22: net-tools-timer-man.patch
|
Patch22: net-tools-timer-man.patch
|
||||||
Patch23: net-tools-interface-name-len.patch
|
Patch23: net-tools-interface-name-len.patch
|
||||||
Patch24: net-tools-correct-exit-code.patch
|
Patch24: net-tools-covscan.patch
|
||||||
Patch25: net-tools-spelling-error.patch
|
Patch25: net-tools-spelling-error.patch
|
||||||
Patch26: net-tools-route-inet6-output.patch
|
Patch26: net-tools-correct-exit-code.patch
|
||||||
Patch27: net-tools-iface-name-too-long.patch
|
Patch27: net-tools-inet6-output.patch
|
||||||
Patch28: net-tools-sast-findings.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: bluez-libs-devel
|
BuildRequires: bluez-libs-devel
|
||||||
BuildRequires: gettext, libselinux
|
BuildRequires: gettext, libselinux
|
||||||
BuildRequires: libselinux-devel
|
BuildRequires: libselinux-devel
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: gcc
|
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -73,11 +71,10 @@ cp %SOURCE8 ./man/en_US
|
|||||||
%patch21 -p1 -b .ifconfig-EiB
|
%patch21 -p1 -b .ifconfig-EiB
|
||||||
%patch22 -p1 -b .timer-man
|
%patch22 -p1 -b .timer-man
|
||||||
%patch23 -p1 -b .interface-name-len
|
%patch23 -p1 -b .interface-name-len
|
||||||
%patch24 -p1 -b .exit-codes
|
%patch24 -p1 -b .covscan
|
||||||
%patch25 -p1 -b .spelling
|
%patch25 -p1 -b .spelling
|
||||||
%patch26 -p1 -b .inet6-output
|
%patch26 -p1 -b .exit-codes
|
||||||
%patch27 -p1 -b .iface-name-too-long
|
%patch27 -p1 -b .inet6-output
|
||||||
%patch28 -p1 -b .sast-findings
|
|
||||||
|
|
||||||
touch ./config.h
|
touch ./config.h
|
||||||
|
|
||||||
@ -150,75 +147,13 @@ install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/arp-ethers.service
|
|||||||
%attr(0644,root,root) %{_unitdir}/arp-ethers.service
|
%attr(0644,root,root) %{_unitdir}/arp-ethers.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.0-0.73.20160912git
|
* Tue Mar 17 2020 Michal Ruprich <michalruprich@gmail.com> - 2.0-0.52.20160912git
|
||||||
- Bump release for October 2024 mass rebuild:
|
- Resolves: #1711119 - netstat says "packetes" instead of "packets"
|
||||||
Resolves: RHEL-64018
|
- Resolves: #1670355 - Exit code on wrong parameter is zero for many net-tools binaries
|
||||||
|
- Resolves: #1807989 - The output of `route -A inet6` does not display properly when the 'Use' column output is over 6 digits
|
||||||
|
|
||||||
* Wed Jun 26 2024 Michal Ruprich <mruprich@redhat.com> - 2.0-0.72.20160912git
|
* Wed Sep 26 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.51.20160912git
|
||||||
- Adding rpminspect.yaml
|
- Resolves: #1607010 - Please review important issues found by covscan
|
||||||
|
|
||||||
* Tue Jun 25 2024 Michal Ruprich <mruprich@redhat.com> - 2.0-0.71.20160912git
|
|
||||||
- Resolves: RHEL-38773 - Addressing findings from static application security testing
|
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0-0.70.20160912git
|
|
||||||
- Bump release for June 2024 mass rebuild
|
|
||||||
|
|
||||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.69.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.68.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.67.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Mar 20 2023 Michal Ruprich <mruprich@redhat.com> - 2.0-0.66.20160912git
|
|
||||||
- SPDX migration
|
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.65.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Dec 23 2022 Michal Ruprich <mruprich@redhat.com> - 2.0-0.64.20160912git
|
|
||||||
- Resolves: #2077846 - net-tools utilities display incorrect statistics for interfaces with 15-character names
|
|
||||||
|
|
||||||
* Wed Aug 03 2022 Michal Ruprich <mruprich@redhat.com> - 2.0-0.63.20160912git
|
|
||||||
- Resolves: #2114821 - The output of `route -A inet6` does not display properly when the 'Use' column output is over 6 digits
|
|
||||||
|
|
||||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.62.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.61.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.60.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.59.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Aug 06 2020 Michal Ruprich <michalruprich@gmail.com> - 2.0-0.58.20160912git
|
|
||||||
- Resolves: #1835155 - netstat says "packetes" instead of "packets"
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.57.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.56.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.55.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Mar 06 2019 Michal Ruprich <mruprich@redhat.com> - 2.0-0.54.20160912git
|
|
||||||
- Resolves: #1670779 - Exit code on wrong parameter is zero for many net-tools binaries
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.53.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Jul 23 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.52.20160912git
|
|
||||||
- Resolves: #1604937 - net-tools: FTBFS in Fedora rawhide
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-0.51.20160912git
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Apr 25 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.50.20160912git
|
* Wed Apr 25 2018 Michal Ruprich <mruprich@redhat.com> - 2.0-0.50.20160912git
|
||||||
- Resolves: 1557470 - netstat -i cut's interface names
|
- Resolves: 1557470 - netstat -i cut's interface names
|
25
gating.yaml
25
gating.yaml
@ -1,25 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_testing
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
|
||||||
|
|
||||||
#Rawhide
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- fedora-*
|
|
||||||
decision_context: bodhi_update_push_stable
|
|
||||||
subject_type: koji_build
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
|
|
||||||
|
|
||||||
#gating rhel
|
|
||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-*
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
|
|
||||||
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
|
|
@ -1,15 +0,0 @@
|
|||||||
diff --git a/lib/interface.c.old b/lib/interface.c
|
|
||||||
index 998830a..d35329f 100644
|
|
||||||
--- a/lib/interface.c.old
|
|
||||||
+++ b/lib/interface.c
|
|
||||||
@@ -249,7 +249,10 @@ static const char *get_name(char **namep, const char *p)
|
|
||||||
*name++ = *p++;
|
|
||||||
count++;
|
|
||||||
if (count == (IFNAMSIZ-1))
|
|
||||||
+ {
|
|
||||||
+ p++;
|
|
||||||
break;
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
*name++ = '\0';
|
|
||||||
return p;
|
|
@ -1,188 +0,0 @@
|
|||||||
diff --git a/netstat.c b/netstat.c
|
|
||||||
index d04f0ff..17f680a 100644
|
|
||||||
--- a/netstat.c
|
|
||||||
+++ b/netstat.c
|
|
||||||
@@ -359,7 +359,7 @@ static int extract_type_1_socket_inode(const char lname[], unsigned long * inode
|
|
||||||
if (lname[strlen(lname)-1] != ']') return(-1);
|
|
||||||
|
|
||||||
{
|
|
||||||
- char inode_str[strlen(lname + 1)]; /* e.g. "12345" */
|
|
||||||
+ char inode_str[strlen(lname) + 1]; /* e.g. "12345" */
|
|
||||||
const int inode_str_len = strlen(lname) - PRG_SOCKET_PFXl - 1;
|
|
||||||
char *serr;
|
|
||||||
|
|
||||||
diff --git a/lib/ipx_gr.c b/lib/ipx_gr.c
|
|
||||||
index 2fa717c..fe9dd13 100644
|
|
||||||
--- a/lib/ipx_gr.c
|
|
||||||
+++ b/lib/ipx_gr.c
|
|
||||||
@@ -57,6 +57,7 @@ int IPX_rprint(int options)
|
|
||||||
|
|
||||||
if ((ap = get_afntype(AF_IPX)) == NULL) {
|
|
||||||
EINTERN("lib/ipx_rt.c", "AF_IPX missing");
|
|
||||||
+ fclose(fp);
|
|
||||||
return (-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/lib/unix.c b/lib/unix.c
|
|
||||||
index 8e5dbd1..47a93e6 100644
|
|
||||||
--- a/lib/unix.c
|
|
||||||
+++ b/lib/unix.c
|
|
||||||
@@ -39,7 +39,7 @@ static const char *UNSPEC_print(const char *ptr)
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
pos = buff;
|
|
||||||
- for (i = 0; i < sizeof(struct sockaddr); i++) {
|
|
||||||
+ for (i = 0; i < sizeof(((struct sockaddr *)0)->sa_data); i++) {
|
|
||||||
pos += sprintf(pos, "%02X-", (*ptr++ & 0377));
|
|
||||||
}
|
|
||||||
buff[strlen(buff) - 1] = '\0';
|
|
||||||
diff --git a/lib/netrom.c b/lib/netrom.c
|
|
||||||
index 6bcde2d..f76811a 100644
|
|
||||||
--- a/lib/netrom.c
|
|
||||||
+++ b/lib/netrom.c
|
|
||||||
@@ -75,7 +75,7 @@ static const char *NETROM_sprint(const struct sockaddr_storage *sasp, int numeri
|
|
||||||
{
|
|
||||||
const struct sockaddr_ax25 *ax25_sap = (const struct sockaddr_ax25 *)sasp;
|
|
||||||
const struct sockaddr *sap = (const struct sockaddr *)sasp;
|
|
||||||
- char buf[64];
|
|
||||||
+ static char buf[64];
|
|
||||||
if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
|
|
||||||
return safe_strncpy(buf, _("[NONE SET]"), sizeof(buf));
|
|
||||||
return NETROM_print(ax25_sap->sax25_call.ax25_call);
|
|
||||||
diff --git a/lib/masq_info.c b/lib/masq_info.c
|
|
||||||
index cbfb2be..4224fe1 100644
|
|
||||||
--- a/lib/masq_info.c
|
|
||||||
+++ b/lib/masq_info.c
|
|
||||||
@@ -105,7 +105,7 @@ static int read_masqinfo(FILE * f, struct masq *mslist, int nmslist)
|
|
||||||
for (nread = 0; nread < nmslist; nread++) {
|
|
||||||
ms = &mslist[nread];
|
|
||||||
if (has_pdelta) {
|
|
||||||
- if ((n = fscanf(f, " %s %"PRIx32":%hX %"PRIx32":%hX %hX %lX %hd %hd %lu",
|
|
||||||
+ if ((n = fscanf(f, " %255s %"PRIx32":%hX %"PRIx32":%hX %hX %lX %hd %hd %lu",
|
|
||||||
buf,
|
|
||||||
&src_addr, &ms->sport,
|
|
||||||
&dst_addr, &ms->dport,
|
|
||||||
@@ -115,7 +115,7 @@ static int read_masqinfo(FILE * f, struct masq *mslist, int nmslist)
|
|
||||||
memcpy(&ms->src.sin_addr.s_addr, &src_addr, 4);
|
|
||||||
memcpy(&ms->dst.sin_addr.s_addr, &dst_addr, 4);
|
|
||||||
} else {
|
|
||||||
- if ((n = fscanf(f, " %s %"PRIx32":%hX %"PRIx32":%hX %hX %lX %hd %lu",
|
|
||||||
+ if ((n = fscanf(f, " %255s %"PRIx32":%hX %"PRIx32":%hX %hX %lX %hd %lu",
|
|
||||||
buf,
|
|
||||||
&src_addr, &ms->sport,
|
|
||||||
&dst_addr, &ms->dport,
|
|
||||||
diff --git a/ifconfig.c b/ifconfig.c
|
|
||||||
index 2b8cbbb..9a64f9a 100644
|
|
||||||
--- a/ifconfig.c
|
|
||||||
+++ b/ifconfig.c
|
|
||||||
@@ -964,12 +964,15 @@ int main(int argc, char **argv)
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
if (ap->input(0, host, &_sa) < 0) {
|
|
||||||
- if (ap->herror)
|
|
||||||
- ap->herror(host);
|
|
||||||
- else
|
|
||||||
- fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name); fprintf(stderr,
|
|
||||||
- _("ifconfig: `--help' gives usage information.\n")); exit(1);
|
|
||||||
+ if (ap->herror)
|
|
||||||
+ ap->herror(host);
|
|
||||||
+ else
|
|
||||||
+ fprintf(stderr,_("ifconfig: error resolving '%s' to set address for af=%s\n"), host, ap->name);
|
|
||||||
+
|
|
||||||
+ fprintf(stderr, _("ifconfig: `--help' gives usage information.\n"));
|
|
||||||
+ exit(1);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
memcpy(&ifr.ifr_addr, sa, sizeof(struct sockaddr));
|
|
||||||
{
|
|
||||||
int r = 0; /* to shut gcc up */
|
|
||||||
diff --git a/lib/netrom_gr.c b/lib/netrom_gr.c
|
|
||||||
index ec82fe8..bd532fb 100644
|
|
||||||
--- a/lib/netrom_gr.c
|
|
||||||
+++ b/lib/netrom_gr.c
|
|
||||||
@@ -43,8 +43,14 @@ int NETROM_rprint(int options)
|
|
||||||
if (!f2) perror(_PATH_PROCNET_NR_NEIGH);
|
|
||||||
|
|
||||||
if (f1 == NULL || f2 == NULL) {
|
|
||||||
- printf(_("NET/ROM not configured in this system.\n"));
|
|
||||||
- return 1;
|
|
||||||
+ printf(_("NET/ROM not configured in this system.\n"));
|
|
||||||
+ if (f1)
|
|
||||||
+ fclose(f1);
|
|
||||||
+
|
|
||||||
+ if (f2)
|
|
||||||
+ fclose(f2);
|
|
||||||
+
|
|
||||||
+ return 1;
|
|
||||||
}
|
|
||||||
printf(_("Kernel NET/ROM routing table\n"));
|
|
||||||
printf(_("Destination Mnemonic Quality Neighbour Iface\n"));
|
|
||||||
diff --git a/statistics.c.old b/statistics.c
|
|
||||||
index 0b5a6f3..0e50f8d 100644
|
|
||||||
--- a/statistics.c.old
|
|
||||||
+++ b/statistics.c
|
|
||||||
@@ -571,8 +571,12 @@ int parsesnmp(int flag_raw, int flag_tcp, int flag_udp, int flag_sctp)
|
|
||||||
if (ferror(f)) {
|
|
||||||
perror("/proc/net/sctp/snmp");
|
|
||||||
fclose(f);
|
|
||||||
+ return(1);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ fclose(f);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
return(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/lib/inet_gr.c b/lib/inet_gr.c
|
|
||||||
index b172d65..5dcab82 100644
|
|
||||||
--- a/lib/inet_gr.c
|
|
||||||
+++ b/lib/inet_gr.c
|
|
||||||
@@ -289,27 +289,28 @@ int rprint_cache(int ext, int numeric)
|
|
||||||
|
|
||||||
if (format == 2) {
|
|
||||||
if (ext >= 3)
|
|
||||||
- printf(_("Source Destination Gateway "
|
|
||||||
- "Flags Metric Ref Use Iface "
|
|
||||||
- "MSS Window irtt TOS HHRef HHUptod SpecDst\n"));
|
|
||||||
- fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
|
|
||||||
- "Iface", "%15s",
|
|
||||||
- "Destination", "%127s",
|
|
||||||
- "Gateway", "%127s",
|
|
||||||
- "Flags", "%X",
|
|
||||||
- "RefCnt", "%d",
|
|
||||||
- "Use", "%d",
|
|
||||||
- "Metric", "%d",
|
|
||||||
- "Source", "%127s",
|
|
||||||
- "MTU", "%d",
|
|
||||||
- "Window", "%d",
|
|
||||||
- "IRTT", "%d",
|
|
||||||
- "TOS", "%d",
|
|
||||||
- "HHRef", "%d",
|
|
||||||
- "HHUptod", "%d",
|
|
||||||
- "SpecDst", "%127s",
|
|
||||||
- NULL);
|
|
||||||
- /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d %127s\n" */
|
|
||||||
+ printf(_("Source Destination Gateway "
|
|
||||||
+ "Flags Metric Ref Use Iface "
|
|
||||||
+ "MSS Window irtt TOS HHRef HHUptod SpecDst\n"));
|
|
||||||
+
|
|
||||||
+ fmt = proc_gen_fmt(_PATH_PROCNET_RTCACHE, 0, fp,
|
|
||||||
+ "Iface", "%15s",
|
|
||||||
+ "Destination", "%127s",
|
|
||||||
+ "Gateway", "%127s",
|
|
||||||
+ "Flags", "%X",
|
|
||||||
+ "RefCnt", "%d",
|
|
||||||
+ "Use", "%d",
|
|
||||||
+ "Metric", "%d",
|
|
||||||
+ "Source", "%127s",
|
|
||||||
+ "MTU", "%d",
|
|
||||||
+ "Window", "%d",
|
|
||||||
+ "IRTT", "%d",
|
|
||||||
+ "TOS", "%d",
|
|
||||||
+ "HHRef", "%d",
|
|
||||||
+ "HHUptod", "%d",
|
|
||||||
+ "SpecDst", "%127s",
|
|
||||||
+ NULL);
|
|
||||||
+ /* "%15s %127s %127s %X %d %d %d %127s %d %d %d %d %d %127s\n" */
|
|
||||||
}
|
|
36
plans.fmf
36
plans.fmf
@ -1,36 +0,0 @@
|
|||||||
/tier1-internal:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/net-tools.git
|
|
||||||
name: /plans/tier1/internal
|
|
||||||
|
|
||||||
/tier1-public:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/net-tools.git
|
|
||||||
name: /plans/tier1/public
|
|
||||||
|
|
||||||
/tier2-tier3-internal:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/net-tools.git
|
|
||||||
name: /plans/tier2-tier3/internal
|
|
||||||
|
|
||||||
/tier2-tier3-public:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/net-tools.git
|
|
||||||
name: /plans/tier2-tier3/public
|
|
||||||
|
|
||||||
/others-internal:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/net-tools.git
|
|
||||||
name: /plans/others/internal
|
|
||||||
|
|
||||||
/others-public:
|
|
||||||
plan:
|
|
||||||
import:
|
|
||||||
url: https://src.fedoraproject.org/tests/net-tools.git
|
|
||||||
name: /plans/others/public
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
---
|
|
||||||
inspections:
|
|
||||||
badfuncs: off
|
|
Loading…
Reference in New Issue
Block a user