- (dtucker) [clientloop.c serverloop.c] channel_register_filter now

    takes 2 more args.  with djm@

diff --git a/ChangeLog b/ChangeLog
index f4c9426dc9350cf35217e9694eba62998ba4fb1e..b5806b17545c188ef6bfffc0afd4227f4866f1f5 100644 (file)
--- 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]

diff --git a/clientloop.c b/clientloop.c
index d2407ed7e62fb40919a4111e70b4f1e42ad119f0..62adbb78ec624d7f3a30661fff99a65a795ae7e1 100644 (file)
--- 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 76d76bab9e160b702b85f37887183c9f9d247528..ab4bf84aff1a70b850f700349feb86db4f488c3f 100644 (file)
--- 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: