[X.25]: Adds /proc/sys/net/x25/x25_forward to control forwarding.

echo "1" > /proc/sys/net/x25/x25_forward 
To turn on x25_forwarding, defaults to off
Requires the previous patch.

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 14 insertions, 2 deletions

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 81480e613467..665412c4f4b9 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -699,7 +699,8 @@ enum {
         NET_X25_CALL_REQUEST_TIMEOUT=2,
         NET_X25_RESET_REQUEST_TIMEOUT=3,
         NET_X25_CLEAR_REQUEST_TIMEOUT=4,
-        NET_X25_ACK_HOLD_BACK_TIMEOUT=5
+        NET_X25_ACK_HOLD_BACK_TIMEOUT=5,
+        NET_X25_FORWARD=6
 };
 
 /* /proc/sys/net/token-ring */
diff --git a/include/net/x25.h b/include/net/x25.h
index 3b1190514d92..fc3f03d976f8 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -180,6 +180,7 @@ extern int  sysctl_x25_call_request_timeout;
 extern int  sysctl_x25_reset_request_timeout;
 extern int  sysctl_x25_clear_request_timeout;
 extern int  sysctl_x25_ack_holdback_timeout;
+extern int  sysctl_x25_forward;
 
 extern int  x25_addr_ntoa(unsigned char *, struct x25_address *,
                           struct x25_address *);
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 0872025821c5..b37d894358ec 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -63,6 +63,7 @@ int sysctl_x25_call_request_timeout    = X25_DEFAULT_T21;
 int sysctl_x25_reset_request_timeout   = X25_DEFAULT_T22;
 int sysctl_x25_clear_request_timeout   = X25_DEFAULT_T23;
 int sysctl_x25_ack_holdback_timeout    = X25_DEFAULT_T2;
+int sysctl_x25_forward                 = 0;
 
 HLIST_HEAD(x25_list);
 DEFINE_RWLOCK(x25_list_lock);
@@ -884,7 +885,8 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb,
          */
         if (sk == NULL) {
                 skb_push(skb, addr_len + X25_STD_MIN_LEN);
-                if (x25_forward_call(&dest_addr, nb, skb, lci) > 0)
+                if (sysctl_x25_forward &&
+                                x25_forward_call(&dest_addr, nb, skb, lci) > 0)
                 {
                         /* Call was forwarded, dont process it any more */
                         kfree_skb(skb);
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index aabda59c824e..2b2e7fd689f3 100644
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -73,6 +73,14 @@ static struct ctl_table x25_table[] = {
                 .extra1 =       &min_timer,
                 .extra2 =       &max_timer,
         },
+        {
+                .ctl_name =     NET_X25_FORWARD,
+                .procname =     "x25_forward",
+                .data =         &sysctl_x25_forward,
+                .maxlen =       sizeof(int),
+                .mode =         0644,
+                .proc_handler = &proc_dointvec,
+        },
         { 0, },
 };