Skip to content

L
linux
Commit ff5704f6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files
Options

o ipv4: convert /proc/net/udp to seq_file 

Also make some functions and structs static, as they're only used in
ip_proc.c
parent 5f2e4b03
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 66 deletions
net/ipv4/ip_proc.c
View file @ ff5704f6
......@@ -18,6 +18,7 @@
#include <linux/netdevice.h>
#include <net/neighbour.h>
#include <net/arp.h>
#include <net/udp.h>
#include <linux/rtnetlink.h>
#include <linux/route.h>
#include <net/ip_fib.h>
......@@ -29,7 +30,6 @@ extern int snmp_get_info(char *, char **, off_t, int);
extern int netstat_get_info(char *, char **, off_t, int);
extern int afinet_get_info(char *, char **, off_t, int);
extern int tcp_get_info(char *, char **, off_t, int);
extern int udp_get_info(char *, char **, off_t, int);
#ifdef CONFIG_PROC_FS
#ifdef CONFIG_AX25
......@@ -38,7 +38,7 @@ extern int udp_get_info(char *, char **, off_t, int);
/*
* ax25 -> ASCII conversion
*/
char *ax2asc2(ax25_address *a, char *buf)
static char *ax2asc2(ax25_address *a, char *buf)
{
char c, *s;
int n;
......@@ -198,20 +198,81 @@ static int fib_seq_show(struct seq_file *seq, void *v)
/* ------------------------------------------------------------------------ */
struct seq_operations arp_seq_ops = {
static void *udp_seq_start(struct seq_file *seq, loff_t *pos)
{
read_lock(&udp_hash_lock);
return (void *)(unsigned long)++*pos;
}
static void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
return (void *)(unsigned long)((++*pos) >=
(UDP_HTABLE_SIZE - 1) ? 0 : *pos);
}
static void udp_seq_stop(struct seq_file *seq, void *v)
{
read_unlock(&udp_hash_lock);
}
static void udp_format_sock(struct sock *sp, char *tmpbuf, int i)
{
struct inet_opt *inet = inet_sk(sp);
unsigned int dest = inet->daddr;
unsigned int src = inet->rcv_saddr;
__u16 destp = ntohs(inet->dport);
__u16 srcp = ntohs(inet->sport);
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p",
i, src, srcp, dest, destp, sp->state,
atomic_read(&sp->wmem_alloc), atomic_read(&sp->rmem_alloc),
0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
atomic_read(&sp->refcnt), sp);
}
static int udp_seq_show(struct seq_file *seq, void *v)
{
char tmpbuf[129];
struct sock *sk;
unsigned long l = (unsigned long)v - 1;
if (!l)
seq_printf(seq, "%-127s\n",
" sl local_address rem_address st tx_queue "
"rx_queue tr tm->when retrnsmt uid timeout inode");
for (sk = udp_hash[l]; sk; sk = sk->next) {
if (sk->family != PF_INET)
continue;
udp_format_sock(sk, tmpbuf, l);
seq_printf(seq, "%-127s\n", tmpbuf);
}
return 0;
}
/* ------------------------------------------------------------------------ */
static struct seq_operations arp_seq_ops = {
.start = arp_seq_start,
.next = arp_seq_next,
.stop = arp_seq_stop,
.show = arp_seq_show,
};
struct seq_operations fib_seq_ops = {
static struct seq_operations fib_seq_ops = {
.start = fib_seq_start,
.next = fib_seq_next,
.stop = fib_seq_stop,
.show = fib_seq_show,
};
static struct seq_operations udp_seq_ops = {
.start = udp_seq_start,
.next = udp_seq_next,
.stop = udp_seq_stop,
.show = udp_seq_show,
};
static int arp_seq_open(struct inode *inode, struct file *file)
{
return seq_open(file, &arp_seq_ops);
......@@ -222,6 +283,11 @@ static int fib_seq_open(struct inode *inode, struct file *file)
return seq_open(file, &fib_seq_ops);
}
static int udp_seq_open(struct inode *inode, struct file *file)
{
return seq_open(file, &udp_seq_ops);
}
static struct file_operations arp_seq_fops = {
.open = arp_seq_open,
.read = seq_read,
......@@ -236,6 +302,13 @@ static struct file_operations fib_seq_fops = {
.release = seq_release,
};
static struct file_operations udp_seq_fops = {
.open = udp_seq_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
/* ------------------------------------------------------------------------ */
int __init ipv4_proc_init(void)
......@@ -258,8 +331,10 @@ int __init ipv4_proc_init(void)
if (!proc_net_create("tcp", 0, tcp_get_info))
goto out_tcp;
if (!proc_net_create("udp", 0, udp_get_info))
p = create_proc_entry("udp", S_IRUGO, proc_net);
if (!p)
goto out_udp;
p->proc_fops = &udp_seq_fops;
p = create_proc_entry("arp", S_IRUGO, proc_net);
if (!p)
......@@ -275,7 +350,7 @@ int __init ipv4_proc_init(void)
out_route:
remove_proc_entry("route", proc_net);
out_arp:
proc_net_remove("udp");
remove_proc_entry("udp", proc_net);
out_udp:
proc_net_remove("tcp");
out_tcp:
......
net/ipv4/udp.c
View file @ ff5704f6
......@@ -61,6 +61,7 @@
* return ENOTCONN for unconnected sockets (POSIX)
* Janos Farkas : don't deliver multi/broadcasts to a different
* bound-to-device socket
* Arnaldo C. Melo : move proc routines to ip_proc.c.
*
*
* This program is free software; you can redistribute it and/or
......@@ -984,66 +985,6 @@ int udp_rcv(struct sk_buff *skb)
return(0);
}
static void get_udp_sock(struct sock *sp, char *tmpbuf, int i)
{
struct inet_opt *inet = inet_sk(sp);
unsigned int dest, src;
__u16 destp, srcp;
dest = inet->daddr;
src = inet->rcv_saddr;
destp = ntohs(inet->dport);
srcp = ntohs(inet->sport);
sprintf(tmpbuf, "%4d: %08X:%04X %08X:%04X"
" %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p",
i, src, srcp, dest, destp, sp->state,
atomic_read(&sp->wmem_alloc), atomic_read(&sp->rmem_alloc),
0, 0L, 0,
sock_i_uid(sp), 0,
sock_i_ino(sp),
atomic_read(&sp->refcnt), sp);
}
int udp_get_info(char *buffer, char **start, off_t offset, int length)
{
int len = 0, num = 0, i;
off_t pos = 0;
off_t begin;
char tmpbuf[129];
if (offset < 128)
len += sprintf(buffer, "%-127s\n",
" sl local_address rem_address st tx_queue "
"rx_queue tr tm->when retrnsmt uid timeout inode");
pos = 128;
read_lock(&udp_hash_lock);
for (i = 0; i < UDP_HTABLE_SIZE; i++) {
struct sock *sk;
for (sk = udp_hash[i]; sk; sk = sk->next, num++) {
if (sk->family != PF_INET)
continue;
pos += 128;
if (pos <= offset)
continue;
get_udp_sock(sk, tmpbuf, i);
len += sprintf(buffer+len, "%-127s\n", tmpbuf);
if(len >= length)
goto out;
}
}
out:
read_unlock(&udp_hash_lock);
begin = len - (pos - offset);
*start = buffer + begin;
len -= begin;
if(len > length)
len = length;
if (len < 0)
len = 0;
return len;
}
struct proto udp_prot = {
.name = "UDP",
.close = udp_close,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7