Commit c29d3792 authored by Phil Sutter's avatar Phil Sutter Committed by Stephen Hemminger

ss: review is_ephemeral()

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: default avatarPhil Sutter <phil@nwl.cc>
parent 596307ea
...@@ -904,8 +904,6 @@ static void init_service_resolver(void) ...@@ -904,8 +904,6 @@ static void init_service_resolver(void)
pclose(fp); pclose(fp);
} }
static int ip_local_port_min, ip_local_port_max;
/* Even do not try default linux ephemeral port ranges: /* Even do not try default linux ephemeral port ranges:
* default /etc/services contains so much of useless crap * default /etc/services contains so much of useless crap
* wouldbe "allocated" to this area that resolution * wouldbe "allocated" to this area that resolution
...@@ -914,19 +912,18 @@ static int ip_local_port_min, ip_local_port_max; ...@@ -914,19 +912,18 @@ static int ip_local_port_min, ip_local_port_max;
*/ */
static int is_ephemeral(int port) static int is_ephemeral(int port)
{ {
if (!ip_local_port_min) { static int min = 0, max = 0;
if (!min) {
FILE *f = ephemeral_ports_open(); FILE *f = ephemeral_ports_open();
if (f) { if (!f || fscanf(f, "%d %d", &min, &max) < 2) {
fscanf(f, "%d %d", min = 1024;
&ip_local_port_min, &ip_local_port_max); max = 4999;
fclose(f);
} else {
ip_local_port_min = 1024;
ip_local_port_max = 4999;
} }
if (f)
fclose(f);
} }
return port >= min && port <= max;
return (port >= ip_local_port_min && port<= ip_local_port_max);
} }
...@@ -1081,8 +1078,6 @@ static int run_ssfilter(struct ssfilter *f, struct sockstat *s) ...@@ -1081,8 +1078,6 @@ static int run_ssfilter(struct ssfilter *f, struct sockstat *s)
switch (f->type) { switch (f->type) {
case SSF_S_AUTO: case SSF_S_AUTO:
{ {
static int low, high=65535;
if (s->local.family == AF_UNIX) { if (s->local.family == AF_UNIX) {
char *p; char *p;
memcpy(&p, s->local.data, sizeof(p)); memcpy(&p, s->local.data, sizeof(p));
...@@ -1094,14 +1089,7 @@ static int run_ssfilter(struct ssfilter *f, struct sockstat *s) ...@@ -1094,14 +1089,7 @@ static int run_ssfilter(struct ssfilter *f, struct sockstat *s)
if (s->local.family == AF_NETLINK) if (s->local.family == AF_NETLINK)
return s->lport < 0; return s->lport < 0;
if (!low) { return is_ephemeral(s->lport);
FILE *fp = ephemeral_ports_open();
if (fp) {
fscanf(fp, "%d%d", &low, &high);
fclose(fp);
}
}
return s->lport >= low && s->lport <= high;
} }
case SSF_DCOND: case SSF_DCOND:
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment