From 1cf65ae61d1148cb031798657ac514a479c78382 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 13 Jun 2008 05:09:18 +1000
Subject: [PATCH]   - (dtucker) [clientloop.c serverloop.c] 
 channel_register_filter now     takes 2 more args.  with djm@

---
 ChangeLog    | 4 +++-
 clientloop.c | 2 +-
 serverloop.c | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cbf5a0851..f38985992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,8 @@
    - dtucker@cvs.openbsd.org 2008/06/12 16:35:31
      [ssh_config.5 ssh.c]
      keyword expansion for localcommand.  ok djm@
+  - (dtucker) [clientloop.c serverloop.c]  channel_register_filter now
+    takes 2 more args.  with djm@
 
 20080611
  - (djm) [channels.c configure.ac]
@@ -4277,4 +4279,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4985 2008/06/12 18:56:37 dtucker Exp $
+$Id: ChangeLog,v 1.4986 2008/06/12 19:09:18 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index d2407ed7e..62adbb78e 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1745,7 +1745,7 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun)
 #if defined(SSH_TUN_FILTER)
 	if (options.tun_open == SSH_TUNMODE_POINTOPOINT)
 		channel_register_filter(c->self, sys_tun_infilter,
-		    sys_tun_outfilter);
+		    sys_tun_outfilter, NULL, NULL);
 #endif
 
 	packet_start(SSH2_MSG_CHANNEL_OPEN);
diff --git a/serverloop.c b/serverloop.c
index 76d76bab9..ab4bf84af 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -998,7 +998,7 @@ server_request_tun(void)
 #if defined(SSH_TUN_FILTER)
 	if (mode == SSH_TUNMODE_POINTOPOINT)
 		channel_register_filter(c->self, sys_tun_infilter,
-		    sys_tun_outfilter);
+		    sys_tun_outfilter, NULL, NULL);
 #endif
 
  done: