Development discussion of WireGuard
 help / color / mirror / Atom feed
From: Simon Ruderich <simon@ruderich.org>
To: wireguard@lists.zx2c4.com
Subject: [PATCH 2/7] tun_linux: add PIHeaderSize constant instead of magic value
Date: Sun, 31 Dec 2017 17:16:49 +0100	[thread overview]
Message-ID: <f06b445c8ffa02db5e8ef5dfade456489c5a0f63.1514726309.git.simon@ruderich.org> (raw)
In-Reply-To: <cover.1514726309.git.simon@ruderich.org>
In-Reply-To: <cover.1514726309.git.simon@ruderich.org>

---
 src/tun_linux.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/tun_linux.go b/src/tun_linux.go
index daa2462..7fcbe00 100644
--- a/src/tun_linux.go
+++ b/src/tun_linux.go
@@ -48,6 +48,7 @@ import "C"
 const (
 	CloneDevicePath = "/dev/net/tun"
 	IFReqSize       = unix.IFNAMSIZ + 64
+	PIHeaderSize    = 4 // packet information of each frame (if IFF_NO_PI unset)
 )
 
 type NativeTun struct {
@@ -254,7 +255,7 @@ func (tun *NativeTun) Write(buff []byte, offset int) (int, error) {
 
 	// reserve space for header
 
-	buff = buff[offset-4:]
+	buff = buff[offset-PIHeaderSize:]
 
 	// add packet information header
 
@@ -279,12 +280,12 @@ func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
 	case err := <-tun.errors:
 		return 0, err
 	default:
-		buff := buff[offset-4:]
+		buff := buff[offset-PIHeaderSize:]
 		n, err := tun.fd.Read(buff[:])
-		if n < 4 {
+		if n < PIHeaderSize {
 			return 0, err
 		}
-		return n - 4, err
+		return n - PIHeaderSize, err
 	}
 }
 
-- 
2.15.1

  parent reply	other threads:[~2017-12-31 16:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-31 16:16 [PATCH 0/7] TUN fixes Simon Ruderich
2017-12-31 16:16 ` [PATCH 1/7] tun: TUNDevice: document behavior of offset parameter Simon Ruderich
2017-12-31 16:16 ` Simon Ruderich [this message]
2017-12-31 16:16 ` [PATCH 3/7] tun_linux: document packet information header values Simon Ruderich
2017-12-31 16:16 ` [PATCH 4/7] helper_test: reorder DummyTUN functions to follow interface order Simon Ruderich
2017-12-31 16:16 ` [PATCH 5/7] helper_test: adapt to TUNDevice interface change Simon Ruderich
2017-12-31 16:16 ` [PATCH 6/7] tun_darwin: " Simon Ruderich
2017-12-31 16:16 ` [PATCH 7/7] " Simon Ruderich
2017-12-31 19:17   ` Mathias Hall-Andersen
2018-01-01 11:14     ` Simon Ruderich
2018-01-01 11:36     ` Simon Ruderich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f06b445c8ffa02db5e8ef5dfade456489c5a0f63.1514726309.git.simon@ruderich.org \
    --to=simon@ruderich.org \
    --cc=wireguard@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).