No need to keep static port boundaries global, they are not used
directly. Keeping them local also allows to safely reduce their names to
the minimum. Assign hardcoded fallback values also if fscanf() fails.
Get rid of unnecessary braces around return parameter.
Instead of more or less duplicating is_ephemeral() in run_ssfilter(),
simply call the function instead.
Signed-off-by: Phil Sutter <p...@nwl.cc>
---
misc/ss.c | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/misc/ss.c b/misc/ss.c
index 4988d34e18c78..7928573285e4e 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -904,8 +904,6 @@ static void init_service_resolver(void)
pclose(fp);
}
-static int ip_local_port_min, ip_local_port_max;
-
/* Even do not try default linux ephemeral port ranges:
* default /etc/services contains so much of useless crap
* wouldbe "allocated" to this area that resolution
@@ -914,19 +912,18 @@ static int ip_local_port_min, ip_local_port_max;
*/
static int is_ephemeral(int port)
{
- if (!ip_local_port_min) {
+ static int min = 0, max = 0;
+
+ if (!min) {
FILE *f = ephemeral_ports_open();
- if (f) {
- fscanf(f, "%d %d",
- &ip_local_port_min, &ip_local_port_max);
- fclose(f);
- } else {
- ip_local_port_min = 1024;
- ip_local_port_max = 4999;
+ if (!f || fscanf(f, "%d %d", &min, &max) < 2) {
+ min = 1024;
+ max = 4999;
}
+ if (f)
+ fclose(f);
}
-
- return (port >= ip_local_port_min && port<= ip_local_port_max);
+ return port >= min && port <= max;
}
@@ -1081,8 +1078,6 @@ static int run_ssfilter(struct ssfilter *f, struct
sockstat *s)
switch (f->type) {
case SSF_S_AUTO:
{
- static int low, high=65535;
-
if (s->local.family == AF_UNIX) {
char *p;
memcpy(&p, s->local.data, sizeof(p));
@@ -1094,14 +1089,7 @@ static int run_ssfilter(struct ssfilter *f, struct
sockstat *s)
if (s->local.family == AF_NETLINK)
return s->lport < 0;
- if (!low) {
- FILE *fp = ephemeral_ports_open();
- if (fp) {
- fscanf(fp, "%d%d", &low, &high);
- fclose(fp);
- }
- }
- return s->lport >= low && s->lport <= high;
+ return is_ephemeral(s->lport);
}
case SSF_DCOND:
{
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
