[PATCH iproute2 REGRESSION] ss: Dont show netlink and packet sockets by default

[PATCH iproute2 REGRESSION] ss: Dont show netlink and packet sockets by default

[Vadim Kochan]

From: Vadim Kochan <vadim4j@gmail.com>

Checking by SS_CLOSE state was remowed in:

    (45a4770bc0) ss: Remove checking SS_CLOSE state for packet and netlink

which is not really correct because now by default all sockets are seen
when do 'ss'.

Here is most correct fix which considers specified family.

To see netlink sockets:
    ss -A netlink

To see packet sockets:
    ss -A packet

And ss by default will show only connected/established sockets as it
was before all the time.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
---
 misc/ss.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/misc/ss.c b/misc/ss.c
index e9927a5..6050ab6 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -2801,6 +2801,9 @@ static int packet_show(struct filter *f)
 	int ino;
 	unsigned long long sk;
 
+	if (preferred_family != AF_PACKET && !(f->states & (1<<SS_CLOSE)))
+		return 0;
+
 	if (packet_show_netlink(f, NULL) == 0)
 		return 0;
 
@@ -3028,6 +3031,9 @@ static int netlink_show(struct filter *f)
 	int rq, wq, rc;
 	unsigned long long sk, cb;
 
+	if (preferred_family != AF_NETLINK && !(f->states & (1<<SS_CLOSE)))
+		return 0;
+
 	if (!getenv("PROC_NET_NETLINK") && !getenv("PROC_ROOT") &&
 		netlink_show_netlink(f, NULL) == 0)
 		return 0;
-- 
2.1.3

Re: [PATCH iproute2 REGRESSION] ss: Dont show netlink and packet sockets by default

[Sergei Shtylyov]

Hello.

On 12/14/2014 12:36 PM, Vadim Kochan wrote:

> From: Vadim Kochan <vadim4j@gmail.com>

> Checking by SS_CLOSE state was remowed in:

>      (45a4770bc0) ss: Remove checking SS_CLOSE state for packet and netlink

> which is not really correct because now by default all sockets are seen
> when do 'ss'.

> Here is most correct fix which considers specified family.

> To see netlink sockets:
>      ss -A netlink

> To see packet sockets:
>      ss -A packet

> And ss by default will show only connected/established sockets as it
> was before all the time.
>
> Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
> ---
>   misc/ss.c | 6 ++++++
>   1 file changed, 6 insertions(+)

> diff --git a/misc/ss.c b/misc/ss.c
> index e9927a5..6050ab6 100644
> --- a/misc/ss.c
> +++ b/misc/ss.c
> @@ -2801,6 +2801,9 @@ static int packet_show(struct filter *f)
>   	int ino;
>   	unsigned long long sk;
>
> +	if (preferred_family != AF_PACKET && !(f->states & (1<<SS_CLOSE)))

   Please surround << with spaces, to be consistent with other operators and 
general kernel coding style.

> +		return 0;
> +
>   	if (packet_show_netlink(f, NULL) == 0)
>   		return 0;
>
> @@ -3028,6 +3031,9 @@ static int netlink_show(struct filter *f)
>   	int rq, wq, rc;
>   	unsigned long long sk, cb;
>
> +	if (preferred_family != AF_NETLINK && !(f->states & (1<<SS_CLOSE)))

    Likewise.

> +		return 0;
> +
[...]

WBR, Sergei

Re: [PATCH iproute2 REGRESSION] ss: Dont show netlink and packet sockets by default

[vadim4j]

On Sun, Dec 14, 2014 at 05:26:45PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 12/14/2014 12:36 PM, Vadim Kochan wrote:
> 
> >From: Vadim Kochan <vadim4j@gmail.com>
> 
> >Checking by SS_CLOSE state was remowed in:
> 
> >     (45a4770bc0) ss: Remove checking SS_CLOSE state for packet and netlink
> 
> >which is not really correct because now by default all sockets are seen
> >when do 'ss'.
> 
> >Here is most correct fix which considers specified family.
> 
> >To see netlink sockets:
> >     ss -A netlink
> 
> >To see packet sockets:
> >     ss -A packet
> 
> >And ss by default will show only connected/established sockets as it
> >was before all the time.
> >
> >Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
> >---
> >  misc/ss.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> 
> >diff --git a/misc/ss.c b/misc/ss.c
> >index e9927a5..6050ab6 100644
> >--- a/misc/ss.c
> >+++ b/misc/ss.c
> >@@ -2801,6 +2801,9 @@ static int packet_show(struct filter *f)
> >  	int ino;
> >  	unsigned long long sk;
> >
> >+	if (preferred_family != AF_PACKET && !(f->states & (1<<SS_CLOSE)))
> 
>   Please surround << with spaces, to be consistent with other operators and
> general kernel coding style.
> 
> >+		return 0;
> >+
> >  	if (packet_show_netlink(f, NULL) == 0)
> >  		return 0;
> >
> >@@ -3028,6 +3031,9 @@ static int netlink_show(struct filter *f)
> >  	int rq, wq, rc;
> >  	unsigned long long sk, cb;
> >
> >+	if (preferred_family != AF_NETLINK && !(f->states & (1<<SS_CLOSE)))
> 
>    Likewise.
> 
> >+		return 0;
> >+
> [...]
> 
> WBR, Sergei
> 
OK, I just returned removed code, but I agree to correct it, thanks.