From 18cd10be2b1b2e10fa3971d48ff1c9b0e637d90c Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Sat, 19 Nov 2016 21:13:00 +0100
Subject: [PATCH] revert buffer api change

---
 common/alloc/buffer.go      | 22 ++++++++++------------
 common/alloc/buffer_pool.go |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/common/alloc/buffer.go b/common/alloc/buffer.go
index d20dd01f..9f4be27f 100644
--- a/common/alloc/buffer.go
+++ b/common/alloc/buffer.go
@@ -16,20 +16,18 @@ const (
 // the buffer into an internal buffer pool, in order to recreate a buffer more
 // quickly.
 type Buffer struct {
-	head           []byte
-	pool           Pool
-	Value          []byte
-	offset         int
-	startingOffset int
+	head   []byte
+	pool   Pool
+	Value  []byte
+	offset int
 }
 
-func CreateBuffer(container []byte, offset int, parent Pool) *Buffer {
+func CreateBuffer(container []byte, parent Pool) *Buffer {
 	b := new(Buffer)
 	b.head = container
 	b.pool = parent
-	b.Value = b.head[offset:]
-	b.offset = offset
-	b.startingOffset = offset
+	b.Value = b.head[defaultOffset:]
+	b.offset = defaultOffset
 	return b
 }
 
@@ -49,14 +47,14 @@ func (b *Buffer) Release() {
 // Clear clears the content of the buffer, results an empty buffer with
 // Len() = 0.
 func (b *Buffer) Clear() *Buffer {
-	b.offset = b.startingOffset
+	b.offset = defaultOffset
 	b.Value = b.head[b.offset:b.offset]
 	return b
 }
 
 // Reset resets this Buffer into its original state.
 func (b *Buffer) Reset() *Buffer {
-	b.offset = b.startingOffset
+	b.offset = defaultOffset
 	b.Value = b.head[b.offset:]
 	return b
 }
@@ -221,5 +219,5 @@ func NewBuffer() *Buffer {
 //}
 
 func NewLocalBuffer(size int) *Buffer {
-	return CreateBuffer(make([]byte, size), defaultOffset, nil)
+	return CreateBuffer(make([]byte, size), nil)
 }
diff --git a/common/alloc/buffer_pool.go b/common/alloc/buffer_pool.go
index 11aed888..808e32bd 100644
--- a/common/alloc/buffer_pool.go
+++ b/common/alloc/buffer_pool.go
@@ -36,7 +36,7 @@ func (p *BufferPool) Allocate() *Buffer {
 	default:
 		b = p.allocator.Get().([]byte)
 	}
-	return CreateBuffer(b, defaultOffset, p)
+	return CreateBuffer(b, p)
 }
 
 func (p *BufferPool) Free(buffer *Buffer) {