Browse Source

Remove pools from faketls

tags/v1.0.6^2^2
9seconds 5 years ago
parent
commit
3996b9a6b8
3 changed files with 3 additions and 46 deletions
  1. 2
    3
      faketls/client_protocol.go
  2. 1
    4
      faketls/cloak.go
  3. 0
    39
      faketls/pools.go

+ 2
- 3
faketls/client_protocol.go View File

@@ -2,6 +2,7 @@ package faketls
2 2
 
3 3
 import (
4 4
 	"bufio"
5
+	"bytes"
5 6
 	"encoding/binary"
6 7
 	"errors"
7 8
 	"fmt"
@@ -63,9 +64,7 @@ func (c *ClientProtocol) tlsHandshake(conn io.ReadWriter) error {
63 64
 		return fmt.Errorf("cannot read initial record: %w", err)
64 65
 	}
65 66
 
66
-	buf := acquireBytesBuffer()
67
-	defer releaseBytesBuffer(buf)
68
-
67
+	buf := &bytes.Buffer{}
69 68
 	helloRecord.Data.WriteBytes(buf)
70 69
 
71 70
 	clientHello, err := tlstypes.ParseClientHello(buf.Bytes())

+ 1
- 4
faketls/cloak.go View File

@@ -67,8 +67,5 @@ func cloak(one, another io.ReadWriteCloser) {
67 67
 func cloakPipe(one io.Writer, another io.Reader, wg *sync.WaitGroup) {
68 68
 	defer wg.Done()
69 69
 
70
-	buf := acquireCloakBuffer()
71
-	defer releaseCloakBuffer(buf)
72
-
73
-	io.CopyBuffer(one, another, *buf) // nolint: errcheck
70
+	io.Copy(one, another) // nolint: errcheck
74 71
 }

+ 0
- 39
faketls/pools.go View File

@@ -1,39 +0,0 @@
1
-package faketls
2
-
3
-import (
4
-	"bytes"
5
-	"sync"
6
-)
7
-
8
-const cloakBufferSize = 1024
9
-
10
-var (
11
-	poolBytesBuffer = sync.Pool{
12
-		New: func() interface{} {
13
-			return &bytes.Buffer{}
14
-		},
15
-	}
16
-	poolCloakBuffer = sync.Pool{
17
-		New: func() interface{} {
18
-			rv := make([]byte, cloakBufferSize)
19
-			return &rv
20
-		},
21
-	}
22
-)
23
-
24
-func acquireBytesBuffer() *bytes.Buffer {
25
-	return poolBytesBuffer.Get().(*bytes.Buffer)
26
-}
27
-
28
-func acquireCloakBuffer() *[]byte {
29
-	return poolCloakBuffer.Get().(*[]byte)
30
-}
31
-
32
-func releaseBytesBuffer(buf *bytes.Buffer) {
33
-	buf.Reset()
34
-	poolBytesBuffer.Put(buf)
35
-}
36
-
37
-func releaseCloakBuffer(buf *[]byte) {
38
-	poolCloakBuffer.Put(buf)
39
-}

Loading…
Cancel
Save