1 files changed, 98 insertions, 0 deletions

diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index a11837d361d2..e0470bd8c2f9 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -165,6 +165,75 @@ out:
         return 0;
 } 
 
+static __inline__ struct x25_forward *x25_get_forward_idx(loff_t pos)
+{
+        struct x25_forward *f;
+        struct list_head *entry;
+
+        list_for_each(entry, &x25_forward_list) {
+                f = list_entry(entry, struct x25_forward, node);
+                if (!pos--)
+                        goto found;
+        }
+
+        f = NULL;
+found:
+        return f;
+}
+
+static void *x25_seq_forward_start(struct seq_file *seq, loff_t *pos)
+{
+        loff_t l = *pos;
+
+        read_lock_bh(&x25_forward_list_lock);
+        return l ? x25_get_forward_idx(--l) : SEQ_START_TOKEN;
+}
+
+static void *x25_seq_forward_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+        struct x25_forward *f;
+
+        ++*pos;
+        if (v == SEQ_START_TOKEN) {
+                f = NULL;
+                if (!list_empty(&x25_forward_list))
+                        f = list_entry(x25_forward_list.next,
+                                        struct x25_forward, node);
+                goto out;
+        }
+        f = v;
+        if (f->node.next != &x25_forward_list)
+                f = list_entry(f->node.next, struct x25_forward, node);
+        else
+                f = NULL;
+out:
+        return f;
+
+}
+
+static void x25_seq_forward_stop(struct seq_file *seq, void *v)
+{
+        read_unlock_bh(&x25_forward_list_lock);
+}
+
+static int x25_seq_forward_show(struct seq_file *seq, void *v)
+{
+        struct x25_forward *f;
+
+        if (v == SEQ_START_TOKEN) {
+                seq_printf(seq, "lci dev1       dev2\n");
+                goto out;
+        }
+
+        f = v;
+
+        seq_printf(seq, "%d %-10s %-10s\n",
+                        f->lci, f->dev1->name, f->dev2->name);
+
+out:
+        return 0;
+}
+
 static struct seq_operations x25_seq_route_ops = {
         .start  = x25_seq_route_start,
         .next   = x25_seq_route_next,
@@ -179,6 +248,13 @@ static struct seq_operations x25_seq_socket_ops = {
         .show   = x25_seq_socket_show,
 };
 
+static struct seq_operations x25_seq_forward_ops = {
+        .start  = x25_seq_forward_start,
+        .next   = x25_seq_forward_next,
+        .stop   = x25_seq_forward_stop,
+        .show   = x25_seq_forward_show,
+};
+
 static int x25_seq_socket_open(struct inode *inode, struct file *file)
 {
         return seq_open(file, &x25_seq_socket_ops);
@@ -189,6 +265,11 @@ static int x25_seq_route_open(struct inode *inode, struct file *file)
         return seq_open(file, &x25_seq_route_ops);
 }
 
+static int x25_seq_forward_open(struct inode *inode, struct file *file)
+{
+        return seq_open(file, &x25_seq_forward_ops);
+}
+
 static struct file_operations x25_seq_socket_fops = {
         .owner          = THIS_MODULE,
         .open           = x25_seq_socket_open,
@@ -205,6 +286,14 @@ static struct file_operations x25_seq_route_fops = {
         .release        = seq_release,
 };
 
+static struct file_operations x25_seq_forward_fops = {
+        .owner          = THIS_MODULE,
+        .open           = x25_seq_forward_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
 static struct proc_dir_entry *x25_proc_dir;
 
 int __init x25_proc_init(void)
@@ -225,9 +314,17 @@ int __init x25_proc_init(void)
         if (!p)
                 goto out_socket;
         p->proc_fops = &x25_seq_socket_fops;
+
+        p = create_proc_entry("forward", S_IRUGO, x25_proc_dir);
+        if (!p)
+                goto out_forward;
+        p->proc_fops = &x25_seq_forward_fops;
         rc = 0;
+
 out:
         return rc;
+out_forward:
+        remove_proc_entry("socket", x25_proc_dir);
 out_socket:
         remove_proc_entry("route", x25_proc_dir);
 out_route:
@@ -237,6 +334,7 @@ out_route:
 
 void __exit x25_proc_exit(void)
 {
+        remove_proc_entry("forward", x25_proc_dir);
         remove_proc_entry("route", x25_proc_dir);
         remove_proc_entry("socket", x25_proc_dir);
         remove_proc_entry("x25", proc_net);