Skip to content

Commit 0ad14a8

Browse files
zx2c4zx2c4
committed
global: buff -> buf
This always struck me as kind of weird and non-standard. Signed-off-by: Jason A. Donenfeld <[email protected]>
1 parent 7d327ed commit 0ad14a8

18 files changed

+189
-189
lines changed

‎conn/bind_std.go

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ again:
204204
}
205205

206206
func (s *StdNetBind) makeReceiveIPv4(pc *ipv4.PacketConn, conn *net.UDPConn) ReceiveFunc {
207-
return func(buffs [][]byte, sizes []int, eps []Endpoint) (n int, err error) {
207+
return func(bufs [][]byte, sizes []int, eps []Endpoint) (n int, err error) {
208208
msgs := s.ipv4MsgsPool.Get().(*[]ipv4.Message)
209209
defer s.ipv4MsgsPool.Put(msgs)
210-
for i := range buffs {
211-
(*msgs)[i].Buffers[0] = buffs[i]
210+
for i := range bufs {
211+
(*msgs)[i].Buffers[0] = bufs[i]
212212
}
213213
var numMsgs int
214214
if runtime.GOOS == "linux" {
@@ -237,11 +237,11 @@ func (s *StdNetBind) makeReceiveIPv4(pc *ipv4.PacketConn, conn *net.UDPConn) Rec
237237
}
238238

239239
func (s *StdNetBind) makeReceiveIPv6(pc *ipv6.PacketConn, conn *net.UDPConn) ReceiveFunc {
240-
return func(buffs [][]byte, sizes []int, eps []Endpoint) (n int, err error) {
240+
return func(bufs [][]byte, sizes []int, eps []Endpoint) (n int, err error) {
241241
msgs := s.ipv4MsgsPool.Get().(*[]ipv6.Message)
242242
defer s.ipv4MsgsPool.Put(msgs)
243-
for i := range buffs {
244-
(*msgs)[i].Buffers[0] = buffs[i]
243+
for i := range bufs {
244+
(*msgs)[i].Buffers[0] = bufs[i]
245245
}
246246
var numMsgs int
247247
if runtime.GOOS == "linux" {
@@ -301,7 +301,7 @@ func (s *StdNetBind) Close() error {
301301
return err2
302302
}
303303

304-
func (s *StdNetBind) Send(buffs [][]byte, endpoint Endpoint) error {
304+
func (s *StdNetBind) Send(bufs [][]byte, endpoint Endpoint) error {
305305
s.mu.Lock()
306306
blackhole := s.blackhole4
307307
conn := s.ipv4
@@ -327,21 +327,21 @@ func (s *StdNetBind) Send(buffs [][]byte, endpoint Endpoint) error {
327327
return syscall.EAFNOSUPPORT
328328
}
329329
if is6 {
330-
return s.send6(conn, pc6, endpoint, buffs)
330+
return s.send6(conn, pc6, endpoint, bufs)
331331
} else {
332-
return s.send4(conn, pc4, endpoint, buffs)
332+
return s.send4(conn, pc4, endpoint, bufs)
333333
}
334334
}
335335

336-
func (s *StdNetBind) send4(conn *net.UDPConn, pc *ipv4.PacketConn, ep Endpoint, buffs [][]byte) error {
336+
func (s *StdNetBind) send4(conn *net.UDPConn, pc *ipv4.PacketConn, ep Endpoint, bufs [][]byte) error {
337337
ua := s.udpAddrPool.Get().(*net.UDPAddr)
338338
as4 := ep.DstIP().As4()
339339
copy(ua.IP, as4[:])
340340
ua.IP = ua.IP[:4]
341341
ua.Port = int(ep.(*StdNetEndpoint).Port())
342342
msgs := s.ipv4MsgsPool.Get().(*[]ipv4.Message)
343-
for i, buff := range buffs {
344-
(*msgs)[i].Buffers[0] = buff
343+
for i, buf := range bufs {
344+
(*msgs)[i].Buffers[0] = buf
345345
(*msgs)[i].Addr = ua
346346
setSrcControl(&(*msgs)[i].OOB, ep.(*StdNetEndpoint))
347347
}
@@ -352,15 +352,15 @@ func (s *StdNetBind) send4(conn *net.UDPConn, pc *ipv4.PacketConn, ep Endpoint,
352352
)
353353
if runtime.GOOS == "linux" {
354354
for {
355-
n, err = pc.WriteBatch((*msgs)[start:len(buffs)], 0)
356-
if err != nil || n == len((*msgs)[start:len(buffs)]) {
355+
n, err = pc.WriteBatch((*msgs)[start:len(bufs)], 0)
356+
if err != nil || n == len((*msgs)[start:len(bufs)]) {
357357
break
358358
}
359359
start += n
360360
}
361361
} else {
362-
for i, buff := range buffs {
363-
_, _, err = conn.WriteMsgUDP(buff, (*msgs)[i].OOB, ua)
362+
for i, buf := range bufs {
363+
_, _, err = conn.WriteMsgUDP(buf, (*msgs)[i].OOB, ua)
364364
if err != nil {
365365
break
366366
}
@@ -371,15 +371,15 @@ func (s *StdNetBind) send4(conn *net.UDPConn, pc *ipv4.PacketConn, ep Endpoint,
371371
return err
372372
}
373373

374-
func (s *StdNetBind) send6(conn *net.UDPConn, pc *ipv6.PacketConn, ep Endpoint, buffs [][]byte) error {
374+
func (s *StdNetBind) send6(conn *net.UDPConn, pc *ipv6.PacketConn, ep Endpoint, bufs [][]byte) error {
375375
ua := s.udpAddrPool.Get().(*net.UDPAddr)
376376
as16 := ep.DstIP().As16()
377377
copy(ua.IP, as16[:])
378378
ua.IP = ua.IP[:16]
379379
ua.Port = int(ep.(*StdNetEndpoint).Port())
380380
msgs := s.ipv6MsgsPool.Get().(*[]ipv6.Message)
381-
for i, buff := range buffs {
382-
(*msgs)[i].Buffers[0] = buff
381+
for i, buf := range bufs {
382+
(*msgs)[i].Buffers[0] = buf
383383
(*msgs)[i].Addr = ua
384384
setSrcControl(&(*msgs)[i].OOB, ep.(*StdNetEndpoint))
385385
}
@@ -390,15 +390,15 @@ func (s *StdNetBind) send6(conn *net.UDPConn, pc *ipv6.PacketConn, ep Endpoint,
390390
)
391391
if runtime.GOOS == "linux" {
392392
for {
393-
n, err = pc.WriteBatch((*msgs)[start:len(buffs)], 0)
394-
if err != nil || n == len((*msgs)[start:len(buffs)]) {
393+
n, err = pc.WriteBatch((*msgs)[start:len(bufs)], 0)
394+
if err != nil || n == len((*msgs)[start:len(bufs)]) {
395395
break
396396
}
397397
start += n
398398
}
399399
} else {
400-
for i, buff := range buffs {
401-
_, _, err = conn.WriteMsgUDP(buff, (*msgs)[i].OOB, ua)
400+
for i, buf := range bufs {
401+
_, _, err = conn.WriteMsgUDP(buf, (*msgs)[i].OOB, ua)
402402
if err != nil {
403403
break
404404
}

‎conn/bind_std_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ func TestStdNetBindReceiveFuncAfterClose(t *testing.T) {
99
t.Fatal(err)
1010
}
1111
bind.Close()
12-
buffs := make([][]byte, 1)
13-
buffs[0] = make([]byte, 1)
12+
bufs := make([][]byte, 1)
13+
bufs[0] = make([]byte, 1)
1414
sizes := make([]int, 1)
1515
eps := make([]Endpoint, 1)
1616
for _, fn := range fns {
1717
// The ReceiveFuncs must not access conn-related fields on StdNetBind
1818
// unguarded. Close() nils the conn-related fields resulting in a panic
1919
// if they violate the mutex.
20-
fn(buffs, sizes, eps)
20+
fn(bufs, sizes, eps)
2121
}
2222
}

‎conn/bind_windows.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -416,19 +416,19 @@ retry:
416416
return n, &ep, nil
417417
}
418418

419-
func (bind *WinRingBind) receiveIPv4(buffs [][]byte, sizes []int, eps []Endpoint) (int, error) {
419+
func (bind *WinRingBind) receiveIPv4(bufs [][]byte, sizes []int, eps []Endpoint) (int, error) {
420420
bind.mu.RLock()
421421
defer bind.mu.RUnlock()
422-
n, ep, err := bind.v4.Receive(buffs[0], &bind.isOpen)
422+
n, ep, err := bind.v4.Receive(bufs[0], &bind.isOpen)
423423
sizes[0] = n
424424
eps[0] = ep
425425
return 1, err
426426
}
427427

428-
func (bind *WinRingBind) receiveIPv6(buffs [][]byte, sizes []int, eps []Endpoint) (int, error) {
428+
func (bind *WinRingBind) receiveIPv6(bufs [][]byte, sizes []int, eps []Endpoint) (int, error) {
429429
bind.mu.RLock()
430430
defer bind.mu.RUnlock()
431-
n, ep, err := bind.v6.Receive(buffs[0], &bind.isOpen)
431+
n, ep, err := bind.v6.Receive(bufs[0], &bind.isOpen)
432432
sizes[0] = n
433433
eps[0] = ep
434434
return 1, err
@@ -486,14 +486,14 @@ func (bind *afWinRingBind) Send(buf []byte, nend *WinRingEndpoint, isOpen *atomi
486486
return winrio.SendEx(bind.rq, dataBuffer, 1, nil, addressBuffer, nil, nil, 0, 0)
487487
}
488488

489-
func (bind *WinRingBind) Send(buffs [][]byte, endpoint Endpoint) error {
489+
func (bind *WinRingBind) Send(bufs [][]byte, endpoint Endpoint) error {
490490
nend, ok := endpoint.(*WinRingEndpoint)
491491
if !ok {
492492
return ErrWrongEndpointType
493493
}
494494
bind.mu.RLock()
495495
defer bind.mu.RUnlock()
496-
for _, buf := range buffs {
496+
for _, buf := range bufs {
497497
switch nend.family {
498498
case windows.AF_INET:
499499
if bind.v4.blackhole {

‎conn/bindtest/bindtest.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,21 @@ func (c *ChannelBind) BatchSize() int { return 1 }
9494
func (c *ChannelBind) SetMark(mark uint32) error { return nil }
9595

9696
func (c *ChannelBind) makeReceiveFunc(ch chan []byte) conn.ReceiveFunc {
97-
return func(buffs [][]byte, sizes []int, eps []conn.Endpoint) (n int, err error) {
97+
return func(bufs [][]byte, sizes []int, eps []conn.Endpoint) (n int, err error) {
9898
select {
9999
case <-c.closeSignal:
100100
return 0, net.ErrClosed
101101
case rx := <-ch:
102-
copied := copy(buffs[0], rx)
102+
copied := copy(bufs[0], rx)
103103
sizes[0] = copied
104104
eps[0] = c.target6
105105
return 1, nil
106106
}
107107
}
108108
}
109109

110-
func (c *ChannelBind) Send(buffs [][]byte, ep conn.Endpoint) error {
111-
for _, b := range buffs {
110+
func (c *ChannelBind) Send(bufs [][]byte, ep conn.Endpoint) error {
111+
for _, b := range bufs {
112112
select {
113113
case <-c.closeSignal:
114114
return net.ErrClosed

‎conn/conn.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ type Bind interface {
4545
// This mark is passed to the kernel as the socket option SO_MARK.
4646
SetMark(mark uint32) error
4747

48-
// Send writes one or more packets in buffs to address ep. The length of
49-
// buffs must not exceed BatchSize().
50-
Send(buffs [][]byte, ep Endpoint) error
48+
// Send writes one or more packets in bufs to address ep. The length of
49+
// bufs must not exceed BatchSize().
50+
Send(bufs [][]byte, ep Endpoint) error
5151

5252
// ParseEndpoint creates a new endpoint from a string.
5353
ParseEndpoint(s string) (Endpoint, error)

‎conn/conn_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func TestPrettyName(t *testing.T) {
1313
var (
14-
recvFunc ReceiveFunc = func(buffs [][]byte, sizes []int, eps []Endpoint) (n int, err error) { return }
14+
recvFunc ReceiveFunc = func(bufs [][]byte, sizes []int, eps []Endpoint) (n int, err error) { return }
1515
)
1616

1717
const want = "TestPrettyName"

‎device/bind_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,21 @@ func (b *DummyBind) SetMark(v uint32) error {
2626
return nil
2727
}
2828

29-
func (b *DummyBind) ReceiveIPv6(buff []byte) (int, conn.Endpoint, error) {
29+
func (b *DummyBind) ReceiveIPv6(buf []byte) (int, conn.Endpoint, error) {
3030
datagram, ok := <-b.in6
3131
if !ok {
3232
return 0, nil, errors.New("closed")
3333
}
34-
copy(buff, datagram.msg)
34+
copy(buf, datagram.msg)
3535
return len(datagram.msg), datagram.endpoint, nil
3636
}
3737

38-
func (b *DummyBind) ReceiveIPv4(buff []byte) (int, conn.Endpoint, error) {
38+
func (b *DummyBind) ReceiveIPv4(buf []byte) (int, conn.Endpoint, error) {
3939
datagram, ok := <-b.in4
4040
if !ok {
4141
return 0, nil, errors.New("closed")
4242
}
43-
copy(buff, datagram.msg)
43+
copy(buf, datagram.msg)
4444
return len(datagram.msg), datagram.endpoint, nil
4545
}
4646

@@ -51,6 +51,6 @@ func (b *DummyBind) Close() error {
5151
return nil
5252
}
5353

54-
func (b *DummyBind) Send(buff []byte, end conn.Endpoint) error {
54+
func (b *DummyBind) Send(buf []byte, end conn.Endpoint) error {
5555
return nil
5656
}

‎device/device_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ func (b *fakeBindSized) Open(port uint16) (fns []conn.ReceiveFunc, actualPort ui
428428
}
429429
func (b *fakeBindSized) Close() error { return nil }
430430
func (b *fakeBindSized) SetMark(mark uint32) error { return nil }
431-
func (b *fakeBindSized) Send(buffs [][]byte, ep conn.Endpoint) error { return nil }
431+
func (b *fakeBindSized) Send(bufs [][]byte, ep conn.Endpoint) error { return nil }
432432
func (b *fakeBindSized) ParseEndpoint(s string) (conn.Endpoint, error) { return nil, nil }
433433
func (b *fakeBindSized) BatchSize() int { return b.size }
434434

@@ -437,15 +437,15 @@ type fakeTUNDeviceSized struct {
437437
}
438438

439439
func (t *fakeTUNDeviceSized) File() *os.File { return nil }
440-
func (t *fakeTUNDeviceSized) Read(buffs [][]byte, sizes []int, offset int) (n int, err error) {
440+
func (t *fakeTUNDeviceSized) Read(bufs [][]byte, sizes []int, offset int) (n int, err error) {
441441
return 0, nil
442442
}
443-
func (t *fakeTUNDeviceSized) Write(buffs [][]byte, offset int) (int, error) { return 0, nil }
444-
func (t *fakeTUNDeviceSized) MTU() (int, error) { return 0, nil }
445-
func (t *fakeTUNDeviceSized) Name() (string, error) { return "", nil }
446-
func (t *fakeTUNDeviceSized) Events() <-chan tun.Event { return nil }
447-
func (t *fakeTUNDeviceSized) Close() error { return nil }
448-
func (t *fakeTUNDeviceSized) BatchSize() int { return t.size }
443+
func (t *fakeTUNDeviceSized) Write(bufs [][]byte, offset int) (int, error) { return 0, nil }
444+
func (t *fakeTUNDeviceSized) MTU() (int, error) { return 0, nil }
445+
func (t *fakeTUNDeviceSized) Name() (string, error) { return "", nil }
446+
func (t *fakeTUNDeviceSized) Events() <-chan tun.Event { return nil }
447+
func (t *fakeTUNDeviceSized) Close() error { return nil }
448+
func (t *fakeTUNDeviceSized) BatchSize() int { return t.size }
449449

450450
func TestBatchSize(t *testing.T) {
451451
d := Device{}

0 commit comments

Comments
 (0)