Skip to content

L
linux
Commit 254addf4 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge master.kernel.org:/home/acme/BK/llc-2.5 

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents a87706c2 102f0733
Show whitespace changes
Inline Side-by-side
Showing with 385 additions and 223 deletions
include/linux/atalk.h
View file @ 254addf4
...@@ -198,5 +198,19 @@ extern void aarp_cleanup_module(void); ...@@ -198,5 +198,19 @@ extern void aarp_cleanup_module(void);
#define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo) #define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo)
extern struct sock *atalk_sockets;
extern spinlock_t atalk_sockets_lock;
extern struct atalk_route *atalk_routes;
extern rwlock_t atalk_routes_lock;
extern struct atalk_iface *atalk_interfaces;
extern spinlock_t atalk_interfaces_lock;
extern struct atalk_route atrtr_default;
extern int atalk_proc_init(void);
extern void atalk_proc_exit(void);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __LINUX_ATALK_H__ */ #endif /* __LINUX_ATALK_H__ */
net/appletalk/Makefile
View file @ 254addf4
...@@ -6,7 +6,7 @@ export-objs = ddp.o ...@@ -6,7 +6,7 @@ export-objs = ddp.o
obj-$(CONFIG_ATALK) += appletalk.o obj-$(CONFIG_ATALK) += appletalk.o
appletalk-y := aarp.o ddp.o appletalk-y := aarp.o ddp.o atalk_proc.o
appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o appletalk-$(CONFIG_SYSCTL) += sysctl_net_atalk.o
appletalk-objs := $(appletalk-y) appletalk-objs := $(appletalk-y)
......
net/appletalk/aarp.c
View file @ 254addf4
...@@ -30,34 +30,13 @@ ...@@ -30,34 +30,13 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/in.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/if_ether.h>
#include <linux/inet.h>
#include <linux/notifier.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/datalink.h> #include <net/datalink.h>
#include <net/psnap.h> #include <net/psnap.h>
#include <linux/atalk.h> #include <linux/atalk.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/module.h>
int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME; int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME;
int sysctl_aarp_tick_time = AARP_TICK_TIME; int sysctl_aarp_tick_time = AARP_TICK_TIME;
...@@ -995,4 +974,3 @@ void aarp_unregister_proc_fs(void) ...@@ -995,4 +974,3 @@ void aarp_unregister_proc_fs(void)
proc_net_remove("aarp"); proc_net_remove("aarp");
} }
#endif #endif
MODULE_LICENSE("GPL");
net/appletalk/atalk_proc.c 0 → 100644
View file @ 254addf4
/*
* atalk_proc.c - proc support for Appletalk
*
* Copyright(c) Arnaldo Carvalho de Melo <acme@conectiva.com.br>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, version 2.
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <net/sock.h>
#include <linux/atalk.h>
#ifdef CONFIG_PROC_FS
static __inline__ struct atalk_iface *atalk_get_interface_idx(loff_t pos)
{
struct atalk_iface *i;
for (i = atalk_interfaces; pos && i; i = i->next)
--pos;
return i;
}
static void *atalk_seq_interface_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
spin_lock_bh(&atalk_interfaces_lock);
return l ? atalk_get_interface_idx(--l) : (void *)1;
}
static void *atalk_seq_interface_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct atalk_iface *i;
++*pos;
if (v == (void *)1) {
i = NULL;
if (atalk_interfaces)
i = atalk_interfaces;
goto out;
}
i = v;
i = i->next;
out:
return i;
}
static void atalk_seq_interface_stop(struct seq_file *seq, void *v)
{
spin_unlock_bh(&atalk_interfaces_lock);
}
static int atalk_seq_interface_show(struct seq_file *seq, void *v)
{
struct atalk_iface *iface;
if (v == (void *)1) {
seq_puts(seq, "Interface Address Networks "
"Status\n");
goto out;
}
iface = v;
seq_printf(seq, "%-16s %04X:%02X %04X-%04X %d\n",
iface->dev->name, ntohs(iface->address.s_net),
iface->address.s_node, ntohs(iface->nets.nr_firstnet),
ntohs(iface->nets.nr_lastnet), iface->status);
out:
return 0;
}
static __inline__ struct atalk_route *atalk_get_route_idx(loff_t pos)
{
struct atalk_route *r;
for (r = atalk_routes; pos && r; r = r->next)
--pos;
return r;
}
static void *atalk_seq_route_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
read_lock_bh(&atalk_routes_lock);
return l ? atalk_get_route_idx(--l) : (void *)1;
}
static void *atalk_seq_route_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct atalk_route *r;
++*pos;
if (v == (void *)1) {
r = NULL;
if (atalk_routes)
r = atalk_routes;
goto out;
}
r = v;
r = r->next;
out:
return r;
}
static void atalk_seq_route_stop(struct seq_file *seq, void *v)
{
read_unlock_bh(&atalk_routes_lock);
}
static int atalk_seq_route_show(struct seq_file *seq, void *v)
{
struct atalk_route *rt;
if (v == (void *)1) {
seq_puts(seq, "Target Router Flags Dev\n");
goto out;
}
if (atrtr_default.dev) {
rt = &atrtr_default;
seq_printf(seq, "Default %04X:%02X %-4d %s\n",
ntohs(rt->gateway.s_net), rt->gateway.s_node,
rt->flags, rt->dev->name);
}
rt = v;
seq_printf(seq, "%04X:%02X %04X:%02X %-4d %s\n",
ntohs(rt->target.s_net), rt->target.s_node,
ntohs(rt->gateway.s_net), rt->gateway.s_node,
rt->flags, rt->dev->name);
out:
return 0;
}
static __inline__ struct sock *atalk_get_socket_idx(loff_t pos)
{
struct sock *s;
for (s = atalk_sockets; pos && s; s = s->next)
--pos;
return s;
}
static void *atalk_seq_socket_start(struct seq_file *seq, loff_t *pos)
{
loff_t l = *pos;
spin_lock_bh(&atalk_sockets_lock);
return l ? atalk_get_socket_idx(--l) : (void *)1;
}
static void *atalk_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *i;
++*pos;
if (v == (void *)1) {
i = NULL;
if (atalk_sockets)
i = atalk_sockets;
goto out;
}
i = v;
i = i->next;
out:
return i;
}
static void atalk_seq_socket_stop(struct seq_file *seq, void *v)
{
spin_unlock_bh(&atalk_sockets_lock);
}
static int atalk_seq_socket_show(struct seq_file *seq, void *v)
{
struct sock *s;
struct atalk_sock *at;
if (v == (void *)1) {
seq_printf(seq, "Type Local_addr Remote_addr Tx_queue "
"Rx_queue St UID\n");
goto out;
}
s = v;
at = at_sk(s);
seq_printf(seq, "%02X %04X:%02X:%02X %04X:%02X:%02X %08X:%08X "
"%02X %d\n",
s->type, ntohs(at->src_net), at->src_node, at->src_port,
ntohs(at->dest_net), at->dest_node, at->dest_port,
atomic_read(&s->wmem_alloc), atomic_read(&s->rmem_alloc),
s->state, SOCK_INODE(s->socket)->i_uid);
out:
return 0;
}
struct seq_operations atalk_seq_interface_ops = {
.start = atalk_seq_interface_start,
.next = atalk_seq_interface_next,
.stop = atalk_seq_interface_stop,
.show = atalk_seq_interface_show,
};
struct seq_operations atalk_seq_route_ops = {
.start = atalk_seq_route_start,
.next = atalk_seq_route_next,
.stop = atalk_seq_route_stop,
.show = atalk_seq_route_show,
};
struct seq_operations atalk_seq_socket_ops = {
.start = atalk_seq_socket_start,
.next = atalk_seq_socket_next,
.stop = atalk_seq_socket_stop,
.show = atalk_seq_socket_show,
};
static int atalk_seq_interface_open(struct inode *inode, struct file *file)
{
return seq_open(file, &atalk_seq_interface_ops);
}
static int atalk_seq_route_open(struct inode *inode, struct file *file)
{
return seq_open(file, &atalk_seq_route_ops);
}
static int atalk_seq_socket_open(struct inode *inode, struct file *file)
{
return seq_open(file, &atalk_seq_socket_ops);
}
static struct file_operations atalk_seq_interface_fops = {
.open = atalk_seq_interface_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations atalk_seq_route_fops = {
.open = atalk_seq_route_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct file_operations atalk_seq_socket_fops = {
.open = atalk_seq_socket_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static struct proc_dir_entry *atalk_proc_dir;
int __init atalk_proc_init(void)
{
struct proc_dir_entry *p;
int rc = -ENOMEM;
atalk_proc_dir = proc_mkdir("atalk", proc_net);
if (!atalk_proc_dir)
goto out;
p = create_proc_entry("interface", S_IRUGO, atalk_proc_dir);
if (!p)
goto out_interface;
p->proc_fops = &atalk_seq_interface_fops;
p = create_proc_entry("route", S_IRUGO, atalk_proc_dir);
if (!p)
goto out_route;
p->proc_fops = &atalk_seq_route_fops;
p = create_proc_entry("socket", S_IRUGO, atalk_proc_dir);
if (!p)
goto out_socket;
p->proc_fops = &atalk_seq_socket_fops;
rc = 0;
out:
return rc;
out_socket:
remove_proc_entry("route", atalk_proc_dir);
out_route:
remove_proc_entry("interface", atalk_proc_dir);
out_interface:
remove_proc_entry("atalk", proc_net);
goto out;
}
void __exit atalk_proc_exit(void)
{
remove_proc_entry("interface", atalk_proc_dir);
remove_proc_entry("route", atalk_proc_dir);
remove_proc_entry("socket", atalk_proc_dir);
remove_proc_entry("atalk", proc_net);
}
#else /* CONFIG_PROC_FS */
int __init atalk_proc_init(void)
{
return 0;
}
void __exit atalk_proc_exit(void)
{
}
#endif /* CONFIG_PROC_FS */
net/appletalk/ddp.c
View file @ 254addf4
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
* result. * result.
* Arnaldo C. de Melo : Cleanup, in preparation for * Arnaldo C. de Melo : Cleanup, in preparation for
* shared skb support 8) * shared skb support 8)
* Arnaldo C. de Melo : Move proc stuff to atalk_proc.c,
* use seq_file
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -50,41 +52,14 @@ ...@@ -50,41 +52,14 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <asm/bitops.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/in.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/if_ether.h>
#include <linux/notifier.h>
#include <linux/netdevice.h>
#include <linux/inetdevice.h>
#include <linux/route.h>
#include <linux/inet.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/termios.h> /* For TIOCOUTQ/INQ */ #include <linux/termios.h> /* For TIOCOUTQ/INQ */
#include <net/datalink.h> #include <net/datalink.h>
#include <net/p8022.h>
#include <net/psnap.h> #include <net/psnap.h>
#include <net/sock.h> #include <net/sock.h>
#include <linux/ip.h>
#include <net/route.h> #include <net/route.h>
#include <linux/atalk.h> #include <linux/atalk.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
#include <linux/init.h>
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern void aarp_register_proc_fs(void); extern void aarp_register_proc_fs(void);
...@@ -112,8 +87,8 @@ static struct proto_ops atalk_dgram_ops; ...@@ -112,8 +87,8 @@ static struct proto_ops atalk_dgram_ops;
* * * *
\**************************************************************************/ \**************************************************************************/
static struct sock *atalk_sockets; struct sock *atalk_sockets;
static spinlock_t atalk_sockets_lock = SPIN_LOCK_UNLOCKED; spinlock_t atalk_sockets_lock = SPIN_LOCK_UNLOCKED;
extern inline void atalk_insert_socket(struct sock *sk) extern inline void atalk_insert_socket(struct sock *sk)
{ {
...@@ -244,53 +219,6 @@ extern inline void atalk_destroy_socket(struct sock *sk) ...@@ -244,53 +219,6 @@ extern inline void atalk_destroy_socket(struct sock *sk)
} }
} }
/* Called from proc fs */
static int atalk_get_info(char *buffer, char **start, off_t offset, int length)
{
off_t pos = 0;
off_t begin = 0;
int len = sprintf(buffer, "Type local_addr remote_addr tx_queue "
"rx_queue st uid\n");
struct sock *s;
/* Output the AppleTalk data for the /proc filesystem */
spin_lock_bh(&atalk_sockets_lock);
for (s = atalk_sockets; s; s = s->next) {
struct atalk_sock *at = at_sk(s);
len += sprintf(buffer + len, "%02X ", s->type);
len += sprintf(buffer + len, "%04X:%02X:%02X ",
ntohs(at->src_net), at->src_node, at->src_port);
len += sprintf(buffer + len, "%04X:%02X:%02X ",
ntohs(at->dest_net), at->dest_node,
at->dest_port);
len += sprintf(buffer + len, "%08X:%08X ",
atomic_read(&s->wmem_alloc),
atomic_read(&s->rmem_alloc));
len += sprintf(buffer + len, "%02X %d\n", s->state,
SOCK_INODE(s->socket)->i_uid);
/* Are we still dumping unwanted data then discard the record */
pos = begin + len;
if (pos < offset) {
len = 0; /* Keep dumping into the buffer start */
begin = pos;
}
if (pos > offset + length) /* We have dumped enough */
break;
}
spin_unlock_bh(&atalk_sockets_lock);
/* The data in question runs from begin to begin + len */
*start = buffer + offset - begin; /* Start of wanted data */
len -= offset - begin; /* Remove unwanted header data from length */
if (len > length)
len = length; /* Remove unwanted tail data from length */
return len;
}
/**************************************************************************\ /**************************************************************************\
* * * *
* Routing tables for the AppleTalk socket layer. * * Routing tables for the AppleTalk socket layer. *
...@@ -298,14 +226,14 @@ static int atalk_get_info(char *buffer, char **start, off_t offset, int length) ...@@ -298,14 +226,14 @@ static int atalk_get_info(char *buffer, char **start, off_t offset, int length)
\**************************************************************************/ \**************************************************************************/
/* Anti-deadlock ordering is router_lock --> iface_lock -DaveM */ /* Anti-deadlock ordering is router_lock --> iface_lock -DaveM */
static struct atalk_route *atalk_router_list; struct atalk_route *atalk_routes;
static rwlock_t atalk_router_lock = RW_LOCK_UNLOCKED; rwlock_t atalk_routes_lock = RW_LOCK_UNLOCKED;
static struct atalk_iface *atalk_iface_list; struct atalk_iface *atalk_interfaces;
static spinlock_t atalk_iface_lock = SPIN_LOCK_UNLOCKED; spinlock_t atalk_interfaces_lock = SPIN_LOCK_UNLOCKED;
/* For probing devices or in a routerless network */ /* For probing devices or in a routerless network */
static struct atalk_route atrtr_default; struct atalk_route atrtr_default;
/* AppleTalk interface control */ /* AppleTalk interface control */
/* /*
...@@ -314,10 +242,10 @@ static struct atalk_route atrtr_default; ...@@ -314,10 +242,10 @@ static struct atalk_route atrtr_default;
*/ */
static void atif_drop_device(struct net_device *dev) static void atif_drop_device(struct net_device *dev)
{ {
struct atalk_iface **iface = &atalk_iface_list; struct atalk_iface **iface = &atalk_interfaces;
struct atalk_iface *tmp; struct atalk_iface *tmp;
spin_lock_bh(&atalk_iface_lock); spin_lock_bh(&atalk_interfaces_lock);
while ((tmp = *iface) != NULL) { while ((tmp = *iface) != NULL) {
if (tmp->dev == dev) { if (tmp->dev == dev) {
*iface = tmp->next; *iface = tmp->next;
...@@ -327,7 +255,7 @@ static void atif_drop_device(struct net_device *dev) ...@@ -327,7 +255,7 @@ static void atif_drop_device(struct net_device *dev)
} else } else
iface = &tmp->next; iface = &tmp->next;
} }
spin_unlock_bh(&atalk_iface_lock); spin_unlock_bh(&atalk_interfaces_lock);
} }
static struct atalk_iface *atif_add_device(struct net_device *dev, static struct atalk_iface *atif_add_device(struct net_device *dev,
...@@ -346,10 +274,10 @@ static struct atalk_iface *atif_add_device(struct net_device *dev, ...@@ -346,10 +274,10 @@ static struct atalk_iface *atif_add_device(struct net_device *dev,
iface->address = *sa; iface->address = *sa;
iface->status = 0; iface->status = 0;
spin_lock_bh(&atalk_iface_lock); spin_lock_bh(&atalk_interfaces_lock);
iface->next = atalk_iface_list; iface->next = atalk_interfaces;
atalk_iface_list = iface; atalk_interfaces = iface;
spin_unlock_bh(&atalk_iface_lock); spin_unlock_bh(&atalk_interfaces_lock);
out: out:
return iface; return iface;
out_mem: out_mem:
...@@ -466,8 +394,8 @@ static struct atalk_addr *atalk_find_primary(void) ...@@ -466,8 +394,8 @@ static struct atalk_addr *atalk_find_primary(void)
* Return a point-to-point interface only if * Return a point-to-point interface only if
* there is no non-ptp interface available. * there is no non-ptp interface available.
*/ */
spin_lock_bh(&atalk_iface_lock); spin_lock_bh(&atalk_interfaces_lock);
for (iface = atalk_iface_list; iface; iface = iface->next) { for (iface = atalk_interfaces; iface; iface = iface->next) {
if (!fiface && !(iface->dev->flags & IFF_LOOPBACK)) if (!fiface && !(iface->dev->flags & IFF_LOOPBACK))
fiface = iface; fiface = iface;
if (!(iface->dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) { if (!(iface->dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))) {
...@@ -478,12 +406,12 @@ static struct atalk_addr *atalk_find_primary(void) ...@@ -478,12 +406,12 @@ static struct atalk_addr *atalk_find_primary(void)
if (fiface) if (fiface)
retval = &fiface->address; retval = &fiface->address;
else if (atalk_iface_list) else if (atalk_interfaces)
retval = &atalk_iface_list->address; retval = &atalk_interfaces->address;
else else
retval = NULL; retval = NULL;
out: out:
spin_unlock_bh(&atalk_iface_lock); spin_unlock_bh(&atalk_interfaces_lock);
return retval; return retval;
} }
...@@ -514,8 +442,8 @@ static struct atalk_iface *atalk_find_interface(int net, int node) ...@@ -514,8 +442,8 @@ static struct atalk_iface *atalk_find_interface(int net, int node)
{ {
struct atalk_iface *iface; struct atalk_iface *iface;
spin_lock_bh(&atalk_iface_lock); spin_lock_bh(&atalk_interfaces_lock);
for (iface = atalk_iface_list; iface; iface = iface->next) { for (iface = atalk_interfaces; iface; iface = iface->next) {
if ((node == ATADDR_BCAST || if ((node == ATADDR_BCAST ||
node == ATADDR_ANYNODE || node == ATADDR_ANYNODE ||
iface->address.s_node == node) && iface->address.s_node == node) &&
...@@ -529,7 +457,7 @@ static struct atalk_iface *atalk_find_interface(int net, int node) ...@@ -529,7 +457,7 @@ static struct atalk_iface *atalk_find_interface(int net, int node)
ntohs(net) <= ntohs(iface->nets.nr_lastnet)) ntohs(net) <= ntohs(iface->nets.nr_lastnet))
break; break;
} }
spin_unlock_bh(&atalk_iface_lock); spin_unlock_bh(&atalk_interfaces_lock);
return iface; return iface;
} }
...@@ -549,8 +477,8 @@ static struct atalk_route *atrtr_find(struct atalk_addr *target) ...@@ -549,8 +477,8 @@ static struct atalk_route *atrtr_find(struct atalk_addr *target)
struct atalk_route *net_route = NULL; struct atalk_route *net_route = NULL;
struct atalk_route *r; struct atalk_route *r;
read_lock_bh(&atalk_router_lock); read_lock_bh(&atalk_routes_lock);
for (r = atalk_router_list; r; r = r->next) { for (r = atalk_routes; r; r = r->next) {
if (!(r->flags & RTF_UP)) if (!(r->flags & RTF_UP))
continue; continue;
...@@ -582,7 +510,7 @@ static struct atalk_route *atrtr_find(struct atalk_addr *target) ...@@ -582,7 +510,7 @@ static struct atalk_route *atrtr_find(struct atalk_addr *target)
else /* No route can be found */ else /* No route can be found */
r = NULL; r = NULL;
out: out:
read_unlock_bh(&atalk_router_lock); read_unlock_bh(&atalk_routes_lock);
return r; return r;
} }
...@@ -630,8 +558,8 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint) ...@@ -630,8 +558,8 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)
goto out; goto out;
/* Now walk the routing table and make our decisions */ /* Now walk the routing table and make our decisions */
write_lock_bh(&atalk_router_lock); write_lock_bh(&atalk_routes_lock);
for (rt = atalk_router_list; rt; rt = rt->next) { for (rt = atalk_routes; rt; rt = rt->next) {
if (r->rt_flags != rt->flags) if (r->rt_flags != rt->flags)
continue; continue;
...@@ -646,8 +574,8 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint) ...@@ -646,8 +574,8 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)
if (!devhint) { if (!devhint) {
riface = NULL; riface = NULL;
spin_lock_bh(&atalk_iface_lock); spin_lock_bh(&atalk_interfaces_lock);
for (iface = atalk_iface_list; iface; iface = iface->next) { for (iface = atalk_interfaces; iface; iface = iface->next) {
if (!riface && if (!riface &&
ntohs(ga->sat_addr.s_net) >= ntohs(ga->sat_addr.s_net) >=
ntohs(iface->nets.nr_firstnet) && ntohs(iface->nets.nr_firstnet) &&
...@@ -659,7 +587,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint) ...@@ -659,7 +587,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)
ga->sat_addr.s_node == iface->address.s_node) ga->sat_addr.s_node == iface->address.s_node)
riface = iface; riface = iface;
} }
spin_unlock_bh(&atalk_iface_lock); spin_unlock_bh(&atalk_interfaces_lock);
retval = -ENETUNREACH; retval = -ENETUNREACH;
if (!riface) if (!riface)
...@@ -675,8 +603,8 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint) ...@@ -675,8 +603,8 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)
if (!rt) if (!rt)
goto out; goto out;
rt->next = atalk_router_list; rt->next = atalk_routes;
atalk_router_list = rt; atalk_routes = rt;
} }
/* Fill in the routing entry */ /* Fill in the routing entry */
...@@ -687,7 +615,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint) ...@@ -687,7 +615,7 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)
retval = 0; retval = 0;
out_unlock: out_unlock:
write_unlock_bh(&atalk_router_lock); write_unlock_bh(&atalk_routes_lock);
out: out:
return retval; return retval;
} }
...@@ -695,11 +623,11 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint) ...@@ -695,11 +623,11 @@ static int atrtr_create(struct rtentry *r, struct net_device *devhint)
/* Delete a route. Find it and discard it */ /* Delete a route. Find it and discard it */
static int atrtr_delete(struct atalk_addr * addr) static int atrtr_delete(struct atalk_addr * addr)
{ {
struct atalk_route **r = &atalk_router_list; struct atalk_route **r = &atalk_routes;
int retval = 0; int retval = 0;
struct atalk_route *tmp; struct atalk_route *tmp;
write_lock_bh(&atalk_router_lock); write_lock_bh(&atalk_routes_lock);
while ((tmp = *r) != NULL) { while ((tmp = *r) != NULL) {
if (tmp->target.s_net == addr->s_net && if (tmp->target.s_net == addr->s_net &&
(!(tmp->flags&RTF_GATEWAY) || (!(tmp->flags&RTF_GATEWAY) ||
...@@ -712,7 +640,7 @@ static int atrtr_delete(struct atalk_addr * addr) ...@@ -712,7 +640,7 @@ static int atrtr_delete(struct atalk_addr * addr)
} }
retval = -ENOENT; retval = -ENOENT;
out: out:
write_unlock_bh(&atalk_router_lock); write_unlock_bh(&atalk_routes_lock);
return retval; return retval;
} }
...@@ -722,10 +650,10 @@ static int atrtr_delete(struct atalk_addr * addr) ...@@ -722,10 +650,10 @@ static int atrtr_delete(struct atalk_addr * addr)
*/ */
void atrtr_device_down(struct net_device *dev) void atrtr_device_down(struct net_device *dev)
{ {
struct atalk_route **r = &atalk_router_list; struct atalk_route **r = &atalk_routes;
struct atalk_route *tmp; struct atalk_route *tmp;
write_lock_bh(&atalk_router_lock); write_lock_bh(&atalk_routes_lock);
while ((tmp = *r) != NULL) { while ((tmp = *r) != NULL) {
if (tmp->dev == dev) { if (tmp->dev == dev) {
*r = tmp->next; *r = tmp->next;
...@@ -733,7 +661,7 @@ void atrtr_device_down(struct net_device *dev) ...@@ -733,7 +661,7 @@ void atrtr_device_down(struct net_device *dev)
} else } else
r = &tmp->next; r = &tmp->next;
} }
write_unlock_bh(&atalk_router_lock); write_unlock_bh(&atalk_routes_lock);
if (atrtr_default.dev == dev) if (atrtr_default.dev == dev)
atrtr_set_default(NULL); atrtr_set_default(NULL);
...@@ -1013,81 +941,6 @@ static int atrtr_ioctl(unsigned int cmd, void *arg) ...@@ -1013,81 +941,6 @@ static int atrtr_ioctl(unsigned int cmd, void *arg)
return -EINVAL; return -EINVAL;
} }
/* Called from proc fs - just make it print the ifaces neatly */
static int atalk_if_get_info(char *buffer, char **start, off_t offset,
int length)
{
off_t pos = 0;
off_t begin = 0;
struct atalk_iface *iface;
int len = sprintf(buffer, "Interface Address "
"Networks Status\n");
spin_lock_bh(&atalk_iface_lock);
for (iface = atalk_iface_list; iface; iface = iface->next) {
len += sprintf(buffer + len, "%-16s %04X:%02X %04X-%04X %d\n",
iface->dev->name, ntohs(iface->address.s_net),
iface->address.s_node,
ntohs(iface->nets.nr_firstnet),
ntohs(iface->nets.nr_lastnet), iface->status);
pos = begin + len;
if (pos < offset) {
len = 0;
begin = pos;
}
if (pos > offset + length)
break;
}
spin_unlock_bh(&atalk_iface_lock);
*start = buffer + (offset - begin);
len -= (offset - begin);
if (len > length)
len = length;
return len;
}
/* Called from proc fs - just make it print the routes neatly */
static int atalk_rt_get_info(char *buffer, char **start, off_t offset,
int length)
{
off_t pos = 0;
off_t begin = 0;
int len = sprintf(buffer, "Target Router Flags Dev\n");
struct atalk_route *rt;
if (atrtr_default.dev) {
rt = &atrtr_default;
len += sprintf(buffer + len,
"Default %04X:%02X %-4d %s\n",
ntohs(rt->gateway.s_net), rt->gateway.s_node,
rt->flags, rt->dev->name);
}
read_lock_bh(&atalk_router_lock);
for (rt = atalk_router_list; rt; rt = rt->next) {
len += sprintf(buffer + len,
"%04X:%02X %04X:%02X %-4d %s\n",
ntohs(rt->target.s_net), rt->target.s_node,
ntohs(rt->gateway.s_net), rt->gateway.s_node,
rt->flags, rt->dev->name);
pos = begin + len;
if (pos < offset) {
len = 0;
begin = pos;
}
if (pos > offset + length)
break;
}
read_unlock_bh(&atalk_router_lock);
*start = buffer + (offset - begin);
len -= (offset - begin);
if (len > length)
len = length;
return len;
}
/**************************************************************************\ /**************************************************************************\
* * * *
* Handling for system calls applied via the various interfaces to an * * Handling for system calls applied via the various interfaces to an *
...@@ -1991,17 +1844,14 @@ static int __init atalk_init(void) ...@@ -1991,17 +1844,14 @@ static int __init atalk_init(void)
register_netdevice_notifier(&ddp_notifier); register_netdevice_notifier(&ddp_notifier);
aarp_proto_init(); aarp_proto_init();
atalk_proc_init();
proc_net_create("appletalk", 0, atalk_get_info);
proc_net_create("atalk_route", 0, atalk_rt_get_info);
proc_net_create("atalk_iface", 0, atalk_if_get_info);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
aarp_register_proc_fs(); aarp_register_proc_fs();
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
atalk_register_sysctl(); atalk_register_sysctl();
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
printk(KERN_INFO "NET4: AppleTalk 0.18a for Linux NET4.0\n"); printk(KERN_INFO "NET4: AppleTalk 0.20 for Linux NET4.0\n");
return 0; return 0;
} }
module_init(atalk_init); module_init(atalk_init);
...@@ -2024,9 +1874,7 @@ static void __exit atalk_exit(void) ...@@ -2024,9 +1874,7 @@ static void __exit atalk_exit(void)
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
atalk_unregister_sysctl(); atalk_unregister_sysctl();
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
proc_net_remove("appletalk"); atalk_proc_exit();
proc_net_remove("atalk_route");
proc_net_remove("atalk_iface");
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
aarp_unregister_proc_fs(); aarp_unregister_proc_fs();
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
...@@ -2039,3 +1887,7 @@ static void __exit atalk_exit(void) ...@@ -2039,3 +1887,7 @@ static void __exit atalk_exit(void)
} }
module_exit(atalk_exit); module_exit(atalk_exit);
#endif /* MODULE */ #endif /* MODULE */
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Alan Cox <Alan.Cox@linux.org>");
MODULE_DESCRIPTION("AppleTalk 0.20 for Linux NET4.0\n");
net/appletalk/sysctl_net_atalk.c
View file @ 254addf4
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/mm.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
extern int sysctl_aarp_expiry_time; extern int sysctl_aarp_expiry_time;
...@@ -16,7 +15,7 @@ extern int sysctl_aarp_retransmit_limit; ...@@ -16,7 +15,7 @@ extern int sysctl_aarp_retransmit_limit;
extern int sysctl_aarp_resolve_time; extern int sysctl_aarp_resolve_time;
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
static ctl_table atalk_table[] = { static struct ctl_table atalk_table[] = {
{ {
.ctl_name = NET_ATALK_AARP_EXPIRY_TIME, .ctl_name = NET_ATALK_AARP_EXPIRY_TIME,
.procname = "aarp-expiry-time", .procname = "aarp-expiry-time",
...@@ -52,7 +51,7 @@ static ctl_table atalk_table[] = { ...@@ -52,7 +51,7 @@ static ctl_table atalk_table[] = {
{ 0 }, { 0 },
}; };
static ctl_table atalk_dir_table[] = { static struct ctl_table atalk_dir_table[] = {
{ {
.ctl_name = NET_ATALK, .ctl_name = NET_ATALK,
.procname = "appletalk", .procname = "appletalk",
...@@ -62,7 +61,7 @@ static ctl_table atalk_dir_table[] = { ...@@ -62,7 +61,7 @@ static ctl_table atalk_dir_table[] = {
{ 0 }, { 0 },
}; };
static ctl_table atalk_root_table[] = { static struct ctl_table atalk_root_table[] = {
{ {
.ctl_name = CTL_NET, .ctl_name = CTL_NET,
.procname = "net", .procname = "net",
......
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