korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-15 05:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

iproute2: move generic_proc_open into lib

Browse Source 
the function has the same definition in ifstat and ss

v2: fix the typo in the chagelog
v3: rebase on master

Signed-off-by: Denis Kirjanov <dkirjanov@suse.de>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Denis Kirjanov 2024-03-04 09:13:40 -05:00 committed by David Ahern
parent 2558ab97c0
commit a9fce55334
4 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/utils.h
View File

@ -393,4 +393,6 @@ int proto_a2n(unsigned short *id, const char *buf,
const char *proto_n2a(unsigned short id, char *buf, int len,
const struct proto *proto_tb, size_t tb_len);
FILE *generic_proc_open(const char *env, const char *name);
#endif /* __UTILS_H__ */

14
lib/utils.c
View File

@ -2003,3 +2003,17 @@ int proto_a2n(unsigned short *id, const char *buf,
return 0;
}
FILE *generic_proc_open(const char *env, const char *name)
{
const char *p = getenv(env);
char store[128];
if (!p) {
p = getenv("PROC_ROOT") ? : "/proc";
snprintf(store, sizeof(store) - 1, "%s/%s", p, name);
p = store;
}
return fopen(p, "r");
}

29
misc/nstat.c
View File

@ -43,35 +43,22 @@ int npatterns;
char info_source[128];
int source_mismatch;
static int generic_proc_open(const char *env, const char *name)
{
char store[128];
char *p = getenv(env);
if (!p) {
p = getenv("PROC_ROOT") ? : "/proc";
snprintf(store, sizeof(store)-1, "%s/%s", p, name);
p = store;
}
return open(p, O_RDONLY);
}
static int net_netstat_open(void)
static FILE *net_netstat_open(void)
{
return generic_proc_open("PROC_NET_NETSTAT", "net/netstat");
}
static int net_snmp_open(void)
static FILE *net_snmp_open(void)
{
return generic_proc_open("PROC_NET_SNMP", "net/snmp");
}
static int net_snmp6_open(void)
static FILE *net_snmp6_open(void)
{
return generic_proc_open("PROC_NET_SNMP6", "net/snmp6");
}
static int net_sctp_snmp_open(void)
static FILE *net_sctp_snmp_open(void)
{
return generic_proc_open("PROC_NET_SCTP_SNMP", "net/sctp/snmp");
}
@ -277,7 +264,7 @@ static void load_ugly_table(FILE *fp)
static void load_sctp_snmp(void)
{
FILE *fp = fdopen(net_sctp_snmp_open(), "r");
FILE *fp = net_sctp_snmp_open();
if (fp) {
load_good_table(fp);
@ -287,7 +274,7 @@ static void load_sctp_snmp(void)
static void load_snmp(void)
{
FILE *fp = fdopen(net_snmp_open(), "r");
FILE *fp = net_snmp_open();
if (fp) {
load_ugly_table(fp);
@ -297,7 +284,7 @@ static void load_snmp(void)
static void load_snmp6(void)
{
FILE *fp = fdopen(net_snmp6_open(), "r");
FILE *fp = net_snmp6_open();
if (fp) {
load_good_table(fp);
@ -307,7 +294,7 @@ static void load_snmp6(void)
static void load_netstat(void)
{
FILE *fp = fdopen(net_netstat_open(), "r");
FILE *fp = net_netstat_open();
if (fp) {
load_ugly_table(fp);

13
misc/ss.c
View File

@ -478,19 +478,6 @@ static void filter_merge_defaults(struct filter *f)
}
}
static FILE *generic_proc_open(const char *env, const char *name)
{
const char *p = getenv(env);
char store[128];
if (!p) {
p = getenv("PROC_ROOT") ? : "/proc";
snprintf(store, sizeof(store)-1, "%s/%s", p, name);
p = store;
}
return fopen(p, "r");
}
#define net_tcp_open() generic_proc_open("PROC_NET_TCP", "net/tcp")
#define net_tcp6_open() generic_proc_open("PROC_NET_TCP6", "net/tcp6")
#define net_udp_open() generic_proc_open("PROC_NET_UDP", "net/udp")