[Pkg-privacy-commits] [onioncat] 98/241: serious framesize buf with TAP device fixed

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch upstream-master
in repository onioncat.

commit f5548c5c232e927cfd2142ddbf9549b73864f6c1
Author: eagle <eagle at 58e1ccc2-750e-0410-8d0d-f93ca75ab447>
Date:   Fri Dec 12 09:59:35 2008 +0000

    serious framesize buf with TAP device fixed
    
    git-svn-id: https://www.cypherpunk.at/svn/onioncat/trunk@391 58e1ccc2-750e-0410-8d0d-f93ca75ab447
---
 ChangeLog       | 1 +
 src/ocatroute.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1c8abe8..570223e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 * version 
+ - serious framesize bug with TAP device fixed
  - seems to run on Darwin yet ;)
  - consolidated header files
  - compiles on FreeBSD and OpenBSD
diff --git a/src/ocatroute.c b/src/ocatroute.c
index f80da8c..72e8c6f 100644
--- a/src/ocatroute.c
+++ b/src/ocatroute.c
@@ -780,7 +780,8 @@ void packet_forwarder(void)
 
          // removing ethernet header
          // FIXME: it would be better to adjust pointers instead of moving data
-         memmove(eh, eh + 1, rlen - 4 - sizeof(struct ether_header));
+         rlen -= sizeof(struct ether_header);
+         memmove(eh, eh + 1, rlen - 4);
       }
 
       if (*((uint32_t*) buf) == CNF(fhd_key[IPV6_KEY]))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git