ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-09-01 02:24:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update to go 1.19

Browse Source
This commit is contained in:
9seconds
2022-08-09 17:41:59 +03:00
parent 9d67414db6
commit f48156814b
60 changed files with 260 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrappers/stream/blockcipher.go
+3 -3
View File
@@ -26,7 +26,7 @@ func (w *wrapperBlockCipher) Write(p []byte) (int, error) {
return 0, err
}
return w.parent.Write(encrypted) // nolint: wrapcheck
return w.parent.Write(encrypted) //nolint: wrapcheck
}
func (w *wrapperBlockCipher) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
@@ -35,7 +35,7 @@ func (w *wrapperBlockCipher) WriteTimeout(p []byte, timeout time.Duration) (int,
return 0, err
}
return w.parent.WriteTimeout(encrypted, timeout) // nolint: wrapcheck
return w.parent.WriteTimeout(encrypted, timeout) //nolint: wrapcheck
}
func (w *wrapperBlockCipher) encrypt(p []byte) ([]byte, error) {
@@ -50,7 +50,7 @@ func (w *wrapperBlockCipher) encrypt(p []byte) ([]byte, error) {
}
func (w *wrapperBlockCipher) Close() error {
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func (w *wrapperBlockCipher) Conn() net.Conn {
wrappers/stream/buffered_reader.go
+1 -1
View File
@@ -33,7 +33,7 @@ func (b *bufferedReader) ReadTimeout(p []byte, _ time.Duration) (int, error) {
func (b *bufferedReader) flush(p []byte) (int, error) {
if b.buf.Len() > len(p) {
return b.buf.Read(p) // nolint: wrapcheck
return b.buf.Read(p) //nolint: wrapcheck
}
sizeToReturn := b.buf.Len()
wrappers/stream/conn.go
+6 -6
View File
@@ -43,7 +43,7 @@ func (w *wrapperConn) Write(p []byte) (int, error) {
w.Close()
}
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
func (w *wrapperConn) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
@@ -64,13 +64,13 @@ func (w *wrapperConn) Read(p []byte) (int, error) {
w.Close()
}
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
func (w *wrapperConn) Close() error {
w.logger.Debugw("Close connection")
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func (w *wrapperConn) Conn() net.Conn {
@@ -93,9 +93,9 @@ func newConn(parent net.Conn,
connID conntypes.ConnID,
purpose connPurpose,
) conntypes.StreamReadWriteCloser {
localAddr := *parent.LocalAddr().(*net.TCPAddr) // nolint: forcetypeassert
localAddr := *parent.LocalAddr().(*net.TCPAddr) //nolint: forcetypeassert
if parent.RemoteAddr().(*net.TCPAddr).IP.To4() != nil { // nolint: forcetypeassert
if parent.RemoteAddr().(*net.TCPAddr).IP.To4() != nil { //nolint: forcetypeassert
if config.C.PublicIPv4.IP != nil {
localAddr.IP = config.C.PublicIPv4.IP
}
@@ -118,7 +118,7 @@ func newConn(parent net.Conn,
parent: parent,
connID: connID,
logger: logger,
remoteAddr: parent.RemoteAddr().(*net.TCPAddr), // nolint: forcetypeassert
remoteAddr: parent.RemoteAddr().(*net.TCPAddr), //nolint: forcetypeassert
localAddr: &localAddr,
}
}
wrappers/stream/ctx.go
+5 -5
View File
@@ -23,7 +23,7 @@ func (w *wrapperCtx) WriteTimeout(p []byte, timeout time.Duration) (int, error)
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
return w.parent.WriteTimeout(p, timeout) //nolint: wrapcheck
}
}
@@ -34,7 +34,7 @@ func (w *wrapperCtx) Write(p []byte) (int, error) {
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.Write(p) // nolint: wrapcheck
return w.parent.Write(p) //nolint: wrapcheck
}
}
@@ -45,7 +45,7 @@ func (w *wrapperCtx) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.ReadTimeout(p, timeout) // nolint: wrapcheck
return w.parent.ReadTimeout(p, timeout) //nolint: wrapcheck
}
}
@@ -56,14 +56,14 @@ func (w *wrapperCtx) Read(p []byte) (int, error) {
return 0, fmt.Errorf("cannot write because context was closed: %w", w.ctx.Err())
default:
return w.parent.Read(p) // nolint: wrapcheck
return w.parent.Read(p) //nolint: wrapcheck
}
}
func (w *wrapperCtx) Close() error {
w.cancel()
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func (w *wrapperCtx) Conn() net.Conn {
wrappers/stream/faketls.go
+4 -4
View File
@@ -20,7 +20,7 @@ type wrapperFakeTLS struct {
func (w *wrapperFakeTLS) Write(p []byte) (int, error) {
return w.write(p, func(b []byte) (int, error) {
return w.parent.Write(b) // nolint: wrapcheck
return w.parent.Write(b) //nolint: wrapcheck
})
}
@@ -30,7 +30,7 @@ func (w *wrapperFakeTLS) WriteTimeout(p []byte, timeout time.Duration) (int, err
return w.write(p, func(b []byte) (int, error) {
elapsed := time.Since(startTime)
if elapsed > timeout {
return w.parent.WriteTimeout(b, timeout-elapsed) // nolint: wrapcheck
return w.parent.WriteTimeout(b, timeout-elapsed) //nolint: wrapcheck
}
return 0, errors.New("timeout")
@@ -73,7 +73,7 @@ func (w *wrapperFakeTLS) RemoteAddr() *net.TCPAddr {
}
func (w *wrapperFakeTLS) Close() error {
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func NewFakeTLS(socket conntypes.StreamReadWriteCloser) conntypes.StreamReadWriteCloser {
@@ -85,7 +85,7 @@ func NewFakeTLS(socket conntypes.StreamReadWriteCloser) conntypes.StreamReadWrit
for {
rec, err := tlstypes.ReadRecord(faketls.parent)
if err != nil {
return nil, err // nolint: wrapcheck
return nil, err //nolint: wrapcheck
}
switch rec.Type {
wrappers/stream/mtproto_cipher.go
+3 -3
View File
@@ -100,11 +100,11 @@ func mtprotoDeriveKeys(purpose mtprotoCipherPurpose,
message.Write(req.Nonce)
data := message.Bytes()
md5sum := md5.Sum(data[1:]) // nolint: gas
sha1sum := sha1.Sum(data) // nolint: gosec
md5sum := md5.Sum(data[1:]) //nolint: gas
sha1sum := sha1.Sum(data) //nolint: gosec
key := append(md5sum[:12], sha1sum[:]...)
iv := md5.Sum(data[2:]) // nolint: gas
iv := md5.Sum(data[2:]) //nolint: gas
return key, iv[:]
}
wrappers/stream/obfuscated2.go
+4 -4
View File
@@ -31,7 +31,7 @@ func (w *wrapperObfuscated2) ReadTimeout(p []byte, timeout time.Duration) (int,
func (w *wrapperObfuscated2) Read(p []byte) (int, error) {
n, err := w.parent.Read(p)
if err != nil {
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
w.decryptor.XORKeyStream(p, p[:n])
@@ -48,7 +48,7 @@ func (w *wrapperObfuscated2) WriteTimeout(p []byte, timeout time.Duration) (int,
w.encryptor.XORKeyStream(buf, buf)
return w.parent.WriteTimeout(buf, timeout) // nolint: wrapcheck
return w.parent.WriteTimeout(buf, timeout) //nolint: wrapcheck
}
func (w *wrapperObfuscated2) Write(p []byte) (int, error) {
@@ -60,7 +60,7 @@ func (w *wrapperObfuscated2) Write(p []byte) (int, error) {
w.encryptor.XORKeyStream(buf, buf)
return w.parent.Write(buf) // nolint: wrapcheck
return w.parent.Write(buf) //nolint: wrapcheck
}
func (w *wrapperObfuscated2) Conn() net.Conn {
@@ -80,7 +80,7 @@ func (w *wrapperObfuscated2) RemoteAddr() *net.TCPAddr {
}
func (w *wrapperObfuscated2) Close() error {
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func NewObfuscated2(socket conntypes.StreamReadWriteCloser,
wrappers/stream/rewind.go
+5 -5
View File
@@ -24,25 +24,25 @@ type wrapperRewind struct {
}
func (w *wrapperRewind) Write(p []byte) (int, error) {
return w.parent.Write(p) // nolint: wrapcheck
return w.parent.Write(p) //nolint: wrapcheck
}
func (w *wrapperRewind) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
return w.parent.WriteTimeout(p, timeout) //nolint: wrapcheck
}
func (w *wrapperRewind) Read(p []byte) (int, error) {
w.mutex.Lock()
defer w.mutex.Unlock()
return w.activeReader.Read(p) // nolint: wrapcheck
return w.activeReader.Read(p) //nolint: wrapcheck
}
func (w *wrapperRewind) ReadTimeout(p []byte, _ time.Duration) (int, error) {
w.mutex.Lock()
defer w.mutex.Unlock()
return w.activeReader.Read(p) // nolint: wrapcheck
return w.activeReader.Read(p) //nolint: wrapcheck
}
func (w *wrapperRewind) Conn() net.Conn {
@@ -64,7 +64,7 @@ func (w *wrapperRewind) RemoteAddr() *net.TCPAddr {
func (w *wrapperRewind) Close() error {
w.buf.Reset()
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func (w *wrapperRewind) Rewind() {
wrappers/stream/stats_telegram.go
+5 -5
View File
@@ -17,19 +17,19 @@ type wrapperTelegramStats struct {
}
func (w *wrapperTelegramStats) Write(p []byte) (int, error) {
return w.parent.Write(p) // nolint: wrapcheck
return w.parent.Write(p) //nolint: wrapcheck
}
func (w *wrapperTelegramStats) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
return w.parent.WriteTimeout(p, timeout) //nolint: wrapcheck
}
func (w *wrapperTelegramStats) Read(p []byte) (int, error) {
return w.parent.Read(p) // nolint: wrapcheck
return w.parent.Read(p) //nolint: wrapcheck
}
func (w *wrapperTelegramStats) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.ReadTimeout(p, timeout) // nolint: wrapcheck
return w.parent.ReadTimeout(p, timeout) //nolint: wrapcheck
}
func (w *wrapperTelegramStats) Conn() net.Conn {
@@ -56,7 +56,7 @@ func (w *wrapperTelegramStats) Close() error {
stats.Stats.TelegramDisconnected(w.dc, w.RemoteAddr())
})
return err // nolint: wrapcheck
return err //nolint: wrapcheck
}
func NewTelegramStats(dc conntypes.DC, parent conntypes.StreamReadWriteCloser) conntypes.StreamReadWriteCloser {
wrappers/stream/stats_traffic.go
+5 -5
View File
@@ -17,28 +17,28 @@ func (w *wrapperTrafficStats) Write(p []byte) (int, error) {
n, err := w.parent.Write(p)
stats.Stats.EgressTraffic(n)
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
func (w *wrapperTrafficStats) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
n, err := w.parent.WriteTimeout(p, timeout)
stats.Stats.EgressTraffic(n)
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
func (w *wrapperTrafficStats) Read(p []byte) (int, error) {
n, err := w.parent.Read(p)
stats.Stats.IngressTraffic(n)
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
func (w *wrapperTrafficStats) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
n, err := w.parent.ReadTimeout(p, timeout)
stats.Stats.IngressTraffic(n)
return n, err // nolint: wrapcheck
return n, err //nolint: wrapcheck
}
func (w *wrapperTrafficStats) Conn() net.Conn {
@@ -58,7 +58,7 @@ func (w *wrapperTrafficStats) RemoteAddr() *net.TCPAddr {
}
func (w *wrapperTrafficStats) Close() error {
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func NewTrafficStats(parent conntypes.StreamReadWriteCloser) conntypes.StreamReadWriteCloser {
wrappers/stream/timeout.go
+5 -5
View File
@@ -18,23 +18,23 @@ type wrapperTimeout struct {
}
func (w *wrapperTimeout) WriteTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.WriteTimeout(p, timeout) // nolint: wrapcheck
return w.parent.WriteTimeout(p, timeout) //nolint: wrapcheck
}
func (w *wrapperTimeout) Write(p []byte) (int, error) {
return w.parent.WriteTimeout(p, timeoutWrite) // nolint: wrapcheck
return w.parent.WriteTimeout(p, timeoutWrite) //nolint: wrapcheck
}
func (w *wrapperTimeout) ReadTimeout(p []byte, timeout time.Duration) (int, error) {
return w.parent.ReadTimeout(p, timeout) // nolint: wrapcheck
return w.parent.ReadTimeout(p, timeout) //nolint: wrapcheck
}
func (w *wrapperTimeout) Read(p []byte) (int, error) {
return w.parent.ReadTimeout(p, timeoutRead) // nolint: wrapcheck
return w.parent.ReadTimeout(p, timeoutRead) //nolint: wrapcheck
}
func (w *wrapperTimeout) Close() error {
return w.parent.Close() // nolint: wrapcheck
return w.parent.Close() //nolint: wrapcheck
}
func (w *wrapperTimeout) Conn() net.Conn {