o IPX: use seq_file for proc stuff

Also move the lenghty ChangeLog to a separate file.

It also tidies a tiny bit of LLC.
parent aad31b6e
#ifndef _NET_INET_IPX_H_
#define _NET_INET_IPX_H_
/* /*
* The following information is in its entirety obtained from: * The following information is in its entirety obtained from:
* *
...@@ -7,9 +9,6 @@ ...@@ -7,9 +9,6 @@
* Which is available from ftp.novell.com * Which is available from ftp.novell.com
*/ */
#ifndef _NET_INET_IPX_H_
#define _NET_INET_IPX_H_
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <net/datalink.h> #include <net/datalink.h>
#include <linux/ipx.h> #include <linux/ipx.h>
...@@ -25,8 +24,7 @@ struct ipx_address { ...@@ -25,8 +24,7 @@ struct ipx_address {
#define IPX_MAX_PPROP_HOPS 8 #define IPX_MAX_PPROP_HOPS 8
struct ipxhdr struct ipxhdr {
{
__u16 ipx_checksum __attribute__ ((packed)); __u16 ipx_checksum __attribute__ ((packed));
#define IPX_NO_CHECKSUM 0xFFFF #define IPX_NO_CHECKSUM 0xFFFF
__u16 ipx_pktsize __attribute__ ((packed)); __u16 ipx_pktsize __attribute__ ((packed));
...@@ -110,4 +108,17 @@ struct ipx_opt { ...@@ -110,4 +108,17 @@ struct ipx_opt {
#define IPX_MIN_EPHEMERAL_SOCKET 0x4000 #define IPX_MIN_EPHEMERAL_SOCKET 0x4000
#define IPX_MAX_EPHEMERAL_SOCKET 0x7fff #define IPX_MAX_EPHEMERAL_SOCKET 0x7fff
extern struct ipx_route *ipx_routes;
extern rwlock_t ipx_routes_lock;
extern struct ipx_interface *ipx_interfaces;
extern spinlock_t ipx_interfaces_lock;
extern struct ipx_interface *ipx_primary_net;
extern int ipx_proc_init(void);
extern void ipx_proc_exit(void);
extern const char *ipx_frame_name(unsigned short);
extern const char *ipx_device_name(struct ipx_interface *intrfc);
#endif /* def _NET_INET_IPX_H_ */ #endif /* def _NET_INET_IPX_H_ */
Revision 0.21: Uses the new generic socket option code.
Revision 0.22: Gcc clean ups and drop out device registration. Use the
new multi-protocol edition of hard_header
Revision 0.23: IPX /proc by Mark Evans. Adding a route will
will overwrite any existing route to the same network.
Revision 0.24: Supports new /proc with no 4K limit
Revision 0.25: Add ephemeral sockets, passive local network
identification, support for local net 0 and
multiple datalinks <Greg Page>
Revision 0.26: Device drop kills IPX routes via it. (needed for module)
Revision 0.27: Autobind <Mark Evans>
Revision 0.28: Small fix for multiple local networks <Thomas Winder>
Revision 0.29: Assorted major errors removed <Mark Evans>
Small correction to promisc mode error fix <Alan Cox>
Asynchronous I/O support. Changed to use notifiers
and the newer packet_type stuff. Assorted major
fixes <Alejandro Liu>
Revision 0.30: Moved to net/ipx/... <Alan Cox>
Don't set address length on recvfrom that errors.
Incorrect verify_area.
Revision 0.31: New sk_buffs. This still needs a lot of
testing. <Alan Cox>
Revision 0.32: Using sock_alloc_send_skb, firewall hooks. <Alan Cox>
Supports sendmsg/recvmsg
Revision 0.33: Internal network support, routing changes, uses a
protocol private area for ipx data.
Revision 0.34: Module support. <Jim Freeman>
Revision 0.35: Checksum support. <Neil Turton>, hooked in by <Alan Cox>
Handles WIN95 discovery packets <Volker Lendecke>
Revision 0.36: Internal bump up for 2.1
Revision 0.37: Began adding POSIXisms.
Revision 0.38: Asynchronous socket stuff made current.
Revision 0.39: SPX interfaces
Revision 0.40: Tiny SIOCGSTAMP fix (chris@cybernet.co.nz)
Revision 0.41: 802.2TR removed (p.norton@computer.org)
Fixed connecting to primary net,
Automatic binding on send & receive,
Martijn van Oosterhout <kleptogimp@geocities.com>
Revision 042: Multithreading - use spinlocks and refcounting to
protect some structures: ipx_interface sock list, list
of ipx interfaces, etc.
Bugfixes - do refcounting on net_devices, check function
results, etc. Thanks to davem and freitag for
suggestions and guidance.
Arnaldo Carvalho de Melo <acme@conectiva.com.br>,
November, 2000
Revision 043: Shared SKBs, don't mangle packets, some cleanups
Arnaldo Carvalho de Melo <acme@conectiva.com.br>,
December, 2000
Revision 044: Call ipxitf_hold on NETDEV_UP - acme
Revision 045: fix PPROP routing bug - acme
Revision 046: Further fixes to PPROP, ipxitf_create_internal was
doing an unneeded MOD_INC_USE_COUNT, implement
sysctl for ipx_pprop_broacasting, fix the ipx sysctl
handling, making it dynamic, some cleanups, thanks to
Petr Vandrovec for review and good suggestions. (acme)
Revision 047: Cleanups, CodingStyle changes, move the ncp connection
hack out of line - acme
Revision 048: Use sk->protinfo to store the pointer to IPX private
area, remove af_ipx from sk->protinfo and move ipx_opt
to include/net/ipx.h, use IPX_SK like DecNET, etc - acme
Revision 049: SPX support dropped, see comment in ipx_create - acme
Revision 050: Use seq_file for proc stuff, moving it to ipx_proc.c - acme
Other fixes:
Protect the module by a MOD_INC_USE_COUNT/MOD_DEC_USE_COUNT pair. Also, now
usage count is managed this way:
-Count one if the auto_interface mode is on
-Count one per configured interface
Jacques Gelinas (jacques@solucorp.qc.ca)
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
obj-$(CONFIG_IPX) += ipx.o obj-$(CONFIG_IPX) += ipx.o
ipx-y := af_ipx.o ipx-y := af_ipx.o ipx_proc.o
ipx-$(CONFIG_SYSCTL) += sysctl_net_ipx.o ipx-$(CONFIG_SYSCTL) += sysctl_net_ipx.o
ipx-objs := $(ipx-y) ipx-objs := $(ipx-y)
......
This diff is collapsed.
/*
* IPX proc routines
*
* Copyright(C) Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2002
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/spinlock.h>
#include <linux/seq_file.h>
#include <linux/tcp.h>
#include <net/ipx.h>
#ifdef CONFIG_PROC_FS
static __inline__ struct ipx_interface *ipx_get_interface_idx(loff_t pos)
{
struct ipx_interface *i;
for (i = ipx_interfaces; pos && i; i = i->if_next)
--pos;
return i;
}
static void *ipx_seq_interface_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
spin_lock_bh(&ipx_interfaces_lock);
return l ? ipx_get_interface_idx(--l) : (void *)1;
}
static void *ipx_seq_interface_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct ipx_interface *i;
++*pos;
if (v == (void *)1) {
i = NULL;
if (ipx_interfaces)
i = ipx_interfaces;
goto out;
}
i = v;
i = i->if_next;
out:
return i;
}
static void ipx_seq_interface_stop(struct seq_file *seq, void *v)
{
spin_unlock_bh(&ipx_interfaces_lock);
}
static int ipx_seq_interface_show(struct seq_file *seq, void *v)
{
struct ipx_interface *i;
if (v == (void *)1) {
seq_puts(seq, "Network Node_Address Primary Device "
"Frame_Type");
#ifdef IPX_REFCNT_DEBUG
seq_puts(seq, " refcnt");
#endif
seq_puts(seq, "\n");
goto out;
}
i = v;
seq_printf(seq, "%08lX ", (unsigned long int)ntohl(i->if_netnum));
seq_printf(seq, "%02X%02X%02X%02X%02X%02X ",
i->if_node[0], i->if_node[1], i->if_node[2],
i->if_node[3], i->if_node[4], i->if_node[5]);
seq_printf(seq, "%-9s", i == ipx_primary_net ? "Yes" : "No");
seq_printf(seq, "%-11s", ipx_device_name(i));
seq_printf(seq, "%-9s", ipx_frame_name(i->if_dlink_type));
#ifdef IPX_REFCNT_DEBUG
seq_printf(seq, "%6d", atomic_read(&i->refcnt));
#endif
seq_puts(seq, "\n");
out:
return 0;
}
static __inline__ struct ipx_route *ipx_get_route_idx(loff_t pos)
{
struct ipx_route *r;
for (r = ipx_routes; pos && r; r = r->ir_next)
--pos;
return r;
}
static void *ipx_seq_route_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
read_lock_bh(&ipx_routes_lock);
return l ? ipx_get_route_idx(--l) : (void *)1;
}
static void *ipx_seq_route_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct ipx_route *r;
++*pos;
if (v == (void *)1) {
r = NULL;
if (ipx_routes)
r = ipx_routes;
goto out;
}
r = v;
r = r->ir_next;
out:
return r;
}
static void ipx_seq_route_stop(struct seq_file *seq, void *v)
{
read_unlock_bh(&ipx_routes_lock);
}
static int ipx_seq_route_show(struct seq_file *seq, void *v)
{
struct ipx_route *rt;
if (v == (void *)1) {
seq_puts(seq, "Network Router_Net Router_Node\n");
goto out;
}
rt = v;
seq_printf(seq, "%08lX ", (unsigned long int)ntohl(rt->ir_net));
if (rt->ir_routed)
seq_printf(seq, "%08lX %02X%02X%02X%02X%02X%02X\n",
(long unsigned int)ntohl(rt->ir_intrfc->if_netnum),
rt->ir_router_node[0], rt->ir_router_node[1],
rt->ir_router_node[2], rt->ir_router_node[3],
rt->ir_router_node[4], rt->ir_router_node[5]);
else
seq_puts(seq, "Directly Connected\n");
out:
return 0;
}
static __inline__ struct sock *ipx_get_socket_idx(loff_t pos)
{
struct sock *s = NULL;
struct ipx_interface *i;
for (i = ipx_interfaces; pos && i; i = i->if_next) {
spin_lock_bh(&i->if_sklist_lock);
for (s = i->if_sklist; pos && s; s = s->next)
--pos;
if (!pos) {
if (!s)
spin_unlock_bh(&i->if_sklist_lock);
break;
}
spin_unlock_bh(&i->if_sklist_lock);
}
return s;
}
static void *ipx_seq_socket_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
spin_lock_bh(&ipx_interfaces_lock);
return l ? ipx_get_socket_idx(--l) : (void *)1;
}
static void *ipx_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock* sk;
struct ipx_interface *i;
struct ipx_opt *ipxs;
++*pos;
if (v == (void *)1) {
sk = NULL;
if (!ipx_interfaces)
goto out;
sk = ipx_interfaces->if_sklist;
if (sk)
spin_lock_bh(&ipx_interfaces->if_sklist_lock);
goto out;
}
sk = v;
if (sk->next) {
sk = sk->next;
goto out;
}
ipxs = ipx_sk(sk);
i = ipxs->intrfc;
spin_unlock_bh(&i->if_sklist_lock);
sk = NULL;
for (;;) {
if (!i->if_next)
break;
i = i->if_next;
spin_lock_bh(&i->if_sklist_lock);
if (i->if_sklist) {
sk = i->if_sklist;
break;
}
spin_unlock_bh(&i->if_sklist_lock);
}
out:
return sk;
}
static int ipx_seq_socket_show(struct seq_file *seq, void *v)
{
struct sock *s;
struct ipx_opt *ipxs;
if (v == (void *)1) {
#ifdef CONFIG_IPX_INTERN
seq_puts(seq, "Local_Address "
"Remote_Address Tx_Queue "
"Rx_Queue State Uid\n");
#else
seq_puts(seq, "Local_Address Remote_Address "
"Tx_Queue Rx_Queue State Uid\n");
#endif
goto out;
}
s = v;
ipxs = ipx_sk(s);
#ifdef CONFIG_IPX_INTERN
seq_printf(seq, "%08lX:%02X%02X%02X%02X%02X%02X:%04X ",
(unsigned long)htonl(ipxs->intrfc->if_netnum),
ipxs->node[0], ipxs->node[1], ipxs->node[2], ipxs->node[3],
ipxs->node[4], ipxs->node[5], htons(ipxs->port));
#else
seq_printf(seq, "%08lX:%04X ", (unsigned long) htonl(ipxs->intrfc->if_netnum),
htons(ipxs->port));
#endif /* CONFIG_IPX_INTERN */
if (s->state != TCP_ESTABLISHED)
seq_printf(seq, "%-28s", "Not_Connected");
else {
seq_printf(seq, "%08lX:%02X%02X%02X%02X%02X%02X:%04X ",
(unsigned long)htonl(ipxs->dest_addr.net),
ipxs->dest_addr.node[0], ipxs->dest_addr.node[1],
ipxs->dest_addr.node[2], ipxs->dest_addr.node[3],
ipxs->dest_addr.node[4], ipxs->dest_addr.node[5],
htons(ipxs->dest_addr.sock));
}
seq_printf(seq, "%08X %08X %02X %03d\n",
atomic_read(&s->wmem_alloc), atomic_read(&s->rmem_alloc),
s->state, SOCK_INODE(s->socket)->i_uid);
out:
return 0;
}
struct seq_operations ipx_seq_interface_ops = {
.start = ipx_seq_interface_start,
.next = ipx_seq_interface_next,
.stop = ipx_seq_interface_stop,
.show = ipx_seq_interface_show,
};
struct seq_operations ipx_seq_route_ops = {
.start = ipx_seq_route_start,
.next = ipx_seq_route_next,
.stop = ipx_seq_route_stop,
.show = ipx_seq_route_show,
};
struct seq_operations ipx_seq_socket_ops = {
.start = ipx_seq_socket_start,
.next = ipx_seq_socket_next,
.stop = ipx_seq_interface_stop,
.show = ipx_seq_socket_show,
};
static int ipx_seq_route_open(struct inode *inode, struct file *file)
{
return seq_open(file, &ipx_seq_route_ops);
}
static int ipx_seq_interface_open(struct inode *inode, struct file *file)
{
return seq_open(file, &ipx_seq_interface_ops);
}
static int ipx_seq_socket_open(struct inode *inode, struct file *file)
{
return seq_open(file, &ipx_seq_socket_ops);
}
static struct file_operations ipx_seq_interface_fops = {
.open = ipx_seq_interface_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations ipx_seq_route_fops = {
.open = ipx_seq_route_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations ipx_seq_socket_fops = {
.open = ipx_seq_socket_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int ipx_proc_perms(struct inode* inode, int op)
{
return 0;
}
static struct inode_operations ipx_seq_inode = {
.permission = ipx_proc_perms,
};
static struct proc_dir_entry *ipx_proc_dir;
int __init ipx_proc_init(void)
{
struct proc_dir_entry *p;
int rc = -ENOMEM;
ipx_proc_dir = proc_mkdir("ipx", proc_net);
if (!ipx_proc_dir)
goto out;
p = create_proc_entry("interface", 0, ipx_proc_dir);
if (!p)
goto out_interface;
p->proc_fops = &ipx_seq_interface_fops;
p->proc_iops = &ipx_seq_inode;
p = create_proc_entry("route", 0, ipx_proc_dir);
if (!p)
goto out_route;
p->proc_fops = &ipx_seq_route_fops;
p->proc_iops = &ipx_seq_inode;
p = create_proc_entry("socket", 0, ipx_proc_dir);
if (!p)
goto out_socket;
p->proc_fops = &ipx_seq_socket_fops;
p->proc_iops = &ipx_seq_inode;
rc = 0;
out:
return rc;
out_socket:
remove_proc_entry("route", ipx_proc_dir);
out_route:
remove_proc_entry("interface", ipx_proc_dir);
out_interface:
remove_proc_entry("ipx", proc_net);
goto out;
}
void __exit ipx_proc_exit(void)
{
remove_proc_entry("interface", ipx_proc_dir);
remove_proc_entry("route", ipx_proc_dir);
remove_proc_entry("socket", ipx_proc_dir);
remove_proc_entry("ipx", proc_net);
}
#else /* CONFIG_PROC_FS */
int __init ipx_proc_init(void)
{
return 0;
}
void __exit ipx_proc_exit(void)
{
}
#endif /* CONFIG_PROC_FS */
...@@ -61,9 +61,7 @@ static void *llc_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -61,9 +61,7 @@ static void *llc_seq_start(struct seq_file *seq, loff_t *pos)
loff_t l = *pos; loff_t l = *pos;
read_lock_bh(&llc_main_station.sap_list.lock); read_lock_bh(&llc_main_station.sap_list.lock);
if (!l) return l ? llc_get_sk_idx(--l) : (void *)1;
return (void *)1;
return llc_get_sk_idx(--l);
} }
static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void *llc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
......
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