output sctp endpoints without -a parameter (#1063913)

This commit is contained in:
Jaromír Končický 2014-03-31 10:47:59 +02:00
parent a648b7bff8
commit 0ccb3b8f4e
2 changed files with 10 additions and 13 deletions

View File

@ -10,7 +10,7 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c
void inittab(void); void inittab(void);
int parsesnmp6(int, int, int); int parsesnmp6(int, int, int);
void inittab6(void); void inittab6(void);
@@ -888,161 +888,271 @@ static int igmp_info(void) @@ -888,159 +888,269 @@ static int igmp_info(void)
igmp_do_one, "igmp", "igmp6"); igmp_do_one, "igmp", "igmp6");
} }
@ -409,19 +409,13 @@ diff -up net-tools-2.0/netstat.c.sctp net-tools-2.0/netstat.c
+ sctp_assoc_do_one, "sctp", "sctp6"); + sctp_assoc_do_one, "sctp", "sctp6");
} }
-static int sctp_info(void) { static int sctp_info(void) {
- int res; int res;
- res = sctp_info_epts(); - res = sctp_info_epts();
- if(res) return res; + res = sctp_info_eps();
- return sctp_info_assocs(); if(res) return res;
+static int sctp_info(void) return sctp_info_assocs();
+{
+ if(flag_all)
+ sctp_info_eps();
+ return sctp_info_assocs();
} }
static void addr_do_one(char *buf, size_t buf_len, size_t short_len, struct aftype *ap,
@@ -2234,7 +2344,7 @@ int main @@ -2234,7 +2344,7 @@ int main
if (!strcmp(afname, "inet")) { if (!strcmp(afname, "inet")) {
#if HAVE_AFINET #if HAVE_AFINET

View File

@ -3,7 +3,7 @@
Summary: Basic networking tools Summary: Basic networking tools
Name: net-tools Name: net-tools
Version: 2.0 Version: 2.0
Release: 0.21.%{checkout}%{?dist} Release: 0.22.%{checkout}%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
URL: http://sourceforge.net/projects/net-tools/ URL: http://sourceforge.net/projects/net-tools/
@ -166,6 +166,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_unitdir}
%attr(0644,root,root) %{_unitdir}/arp-ethers.service %attr(0644,root,root) %{_unitdir}/arp-ethers.service
%changelog %changelog
* Mon Mar 31 2014 Jaromír Končický <jkoncick@redhat.com> - 2.0-0.22.20131119git
- output sctp endpoints without -a parameter (#1063913)
* Fri Feb 14 2014 Jaromír Končický <jkoncick@redhat.com> - 2.0-0.21.20131119git * Fri Feb 14 2014 Jaromír Končický <jkoncick@redhat.com> - 2.0-0.21.20131119git
- remake sctp-quiet.patch (#1063906#c7) - remake sctp-quiet.patch (#1063906#c7)