Development discussion of WireGuard
 help / color / mirror / Atom feed
From: Simon Ruderich <simon@ruderich.org>
To: wireguard@lists.zx2c4.com
Subject: [PATCH 6/7] tun_darwin: adapt to TUNDevice interface change
Date: Sun, 31 Dec 2017 17:16:53 +0100	[thread overview]
Message-ID: <9c1d560f51ab084a65c5aee11c770f7885672ea8.1514726309.git.simon@ruderich.org> (raw)
In-Reply-To: <cover.1514726309.git.simon@ruderich.org>
In-Reply-To: <cover.1514726309.git.simon@ruderich.org>

Broken in 996c7c4 ("Removed IFF_NO_PI from TUN linux", 2017-12-04).

Untested!
---
 src/tun_darwin.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/tun_darwin.go b/src/tun_darwin.go
index 87f6af6..a984e94 100644
--- a/src/tun_darwin.go
+++ b/src/tun_darwin.go
@@ -184,10 +184,14 @@ func (t *NativeTUN) Events() chan TUNEvent {
 	return t.events
 }
 
-func (t *NativeTUN) Read(to []byte) (int, error) {
+func (t *NativeTUN) Read(to []byte, offset int) (int, error) {
+	to = to[offset:]
+
 	t.rMu.Lock()
 	defer t.rMu.Unlock()
 
+	// TODO: implement in-place read
+
 	if cap(t.rBuf) < len(to)+4 {
 		t.rBuf = make([]byte, len(to)+4)
 	}
@@ -198,15 +202,18 @@ func (t *NativeTUN) Read(to []byte) (int, error) {
 	return n - 4, err
 }
 
-func (t *NativeTUN) Write(from []byte) (int, error) {
+func (t *NativeTUN) Write(from []byte, offset int) (int, error) {
 
-	if len(from) == 0 {
+	if len(from) < offset {
 		return 0, unix.EIO
 	}
+	from := from[offset:]
 
 	t.wMu.Lock()
 	defer t.wMu.Unlock()
 
+	// TODO: implement in-place write
+
 	if cap(t.wBuf) < len(from)+4 {
 		t.wBuf = make([]byte, len(from)+4)
 	}
-- 
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 ` [PATCH 2/7] tun_linux: add PIHeaderSize constant instead of magic value Simon Ruderich
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 ` Simon Ruderich [this message]
2017-12-31 16:16 ` [PATCH 7/7] tun_darwin: " 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=9c1d560f51ab084a65c5aee11c770f7885672ea8.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).