From 443875e9216b1ae09711c1bc5eea837301cc0f5d Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 7 Dec 2020 01:46:53 -0500 Subject: [PATCH 1/6] Set optimized I2P defaults --- assets/bindata.go | 108 +++++++++--------- go.mod | 3 + go.sum | 11 ++ server/irc.go | 21 +++- vendor/github.com/eyedeekay/goSam/accept.go | 2 +- vendor/github.com/eyedeekay/goSam/client.go | 44 ++++--- vendor/github.com/eyedeekay/goSam/dial.go | 58 +++++----- vendor/github.com/eyedeekay/goSam/go.mod | 3 +- vendor/github.com/eyedeekay/goSam/go.sum | 4 + vendor/github.com/eyedeekay/goSam/naming.go | 46 ++++---- vendor/github.com/eyedeekay/goSam/options.go | 33 ++++-- .../github.com/eyedeekay/goSam/replyParser.go | 24 +++- vendor/github.com/eyedeekay/goSam/stream.go | 3 + vendor/modules.txt | 6 +- 14 files changed, 229 insertions(+), 137 deletions(-) diff --git a/assets/bindata.go b/assets/bindata.go index 67281fe0..f5ba5aa8 100644 --- a/assets/bindata.go +++ b/assets/bindata.go @@ -718,35 +718,35 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "10.8d4e3eadb5bf393297d4.js.br": _108d4e3eadb5bf393297d4JsBr, - "6.927d29943814584bff4c.js.LICENSE.txt": _6927d29943814584bff4cJsLicenseTxt, - "6.dabc66d5e65984b4d1b8.js.br": _6Dabc66d5e65984b4d1b8JsBr, - "7.44423ff074b7ee9187c6.js.br": _744423ff074b7ee9187c6JsBr, - "8.bb4e76f2bbe2e0961488.js.br": _8Bb4e76f2bbe2e0961488JsBr, - "9.ce30b62587989503c1b1.js.br": _9Ce30b62587989503c1b1JsBr, - "boot.a9e9f667d5db067ec5ee.js.br": bootA9e9f667d5db067ec5eeJsBr, - "config.default.toml": configDefaultToml, - "connect.ebc4a0d419c384c3e282.js.br": connectEbc4a0d419c384c3e282JsBr, - "favicon.ico": faviconIco, - "font/Montserrat-Bold.woff": fontMontserratBoldWoff, - "font/Montserrat-Bold.woff2": fontMontserratBoldWoff2, - "font/Montserrat-Regular.woff": fontMontserratRegularWoff, - "font/Montserrat-Regular.woff2": fontMontserratRegularWoff2, - "font/RobotoMono-Bold.woff": fontRobotomonoBoldWoff, - "font/RobotoMono-Bold.woff2": fontRobotomonoBoldWoff2, - "font/RobotoMono-Regular.woff": fontRobotomonoRegularWoff, - "font/RobotoMono-Regular.woff2": fontRobotomonoRegularWoff2, - "icon_192.png": icon_192Png, - "icon_512.png": icon_512Png, - "main.1b2663ec4e3f90d36c9b.js.br": main1b2663ec4e3f90d36c9bJsBr, - "main.7a567880bf6424b9d73b.css.br": main7a567880bf6424b9d73bCssBr, - "manifest.json.br": manifestJsonBr, - "runtime.b976cc3431568cb71c47.js.br": runtimeB976cc3431568cb71c47JsBr, - "sw.js.br": swJsBr, - "vendors~connect.3ca0619eb76955d609ed.js.br": vendorsConnect3ca0619eb76955d609edJsBr, + "10.8d4e3eadb5bf393297d4.js.br": _108d4e3eadb5bf393297d4JsBr, + "6.927d29943814584bff4c.js.LICENSE.txt": _6927d29943814584bff4cJsLicenseTxt, + "6.dabc66d5e65984b4d1b8.js.br": _6Dabc66d5e65984b4d1b8JsBr, + "7.44423ff074b7ee9187c6.js.br": _744423ff074b7ee9187c6JsBr, + "8.bb4e76f2bbe2e0961488.js.br": _8Bb4e76f2bbe2e0961488JsBr, + "9.ce30b62587989503c1b1.js.br": _9Ce30b62587989503c1b1JsBr, + "boot.a9e9f667d5db067ec5ee.js.br": bootA9e9f667d5db067ec5eeJsBr, + "config.default.toml": configDefaultToml, + "connect.ebc4a0d419c384c3e282.js.br": connectEbc4a0d419c384c3e282JsBr, + "favicon.ico": faviconIco, + "font/Montserrat-Bold.woff": fontMontserratBoldWoff, + "font/Montserrat-Bold.woff2": fontMontserratBoldWoff2, + "font/Montserrat-Regular.woff": fontMontserratRegularWoff, + "font/Montserrat-Regular.woff2": fontMontserratRegularWoff2, + "font/RobotoMono-Bold.woff": fontRobotomonoBoldWoff, + "font/RobotoMono-Bold.woff2": fontRobotomonoBoldWoff2, + "font/RobotoMono-Regular.woff": fontRobotomonoRegularWoff, + "font/RobotoMono-Regular.woff2": fontRobotomonoRegularWoff2, + "icon_192.png": icon_192Png, + "icon_512.png": icon_512Png, + "main.1b2663ec4e3f90d36c9b.js.br": main1b2663ec4e3f90d36c9bJsBr, + "main.7a567880bf6424b9d73b.css.br": main7a567880bf6424b9d73bCssBr, + "manifest.json.br": manifestJsonBr, + "runtime.b976cc3431568cb71c47.js.br": runtimeB976cc3431568cb71c47JsBr, + "sw.js.br": swJsBr, + "vendors~connect.3ca0619eb76955d609ed.js.br": vendorsConnect3ca0619eb76955d609edJsBr, "vendors~connect.8ff8cf6237ae10adbdb1.js.LICENSE.txt": vendorsConnect8ff8cf6237ae10adbdb1JsLicenseTxt, - "vendors~main.ca3aa6cc261be8bc77a1.js.br": vendorsMainCa3aa6cc261be8bc77a1JsBr, - "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, + "vendors~main.ca3aa6cc261be8bc77a1.js.br": vendorsMainCa3aa6cc261be8bc77a1JsBr, + "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, } // AssetDir returns the file names below a certain @@ -788,38 +788,39 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } + var _bintree = &bintree{nil, map[string]*bintree{ - "10.8d4e3eadb5bf393297d4.js.br": &bintree{_108d4e3eadb5bf393297d4JsBr, map[string]*bintree{}}, + "10.8d4e3eadb5bf393297d4.js.br": &bintree{_108d4e3eadb5bf393297d4JsBr, map[string]*bintree{}}, "6.927d29943814584bff4c.js.LICENSE.txt": &bintree{_6927d29943814584bff4cJsLicenseTxt, map[string]*bintree{}}, - "6.dabc66d5e65984b4d1b8.js.br": &bintree{_6Dabc66d5e65984b4d1b8JsBr, map[string]*bintree{}}, - "7.44423ff074b7ee9187c6.js.br": &bintree{_744423ff074b7ee9187c6JsBr, map[string]*bintree{}}, - "8.bb4e76f2bbe2e0961488.js.br": &bintree{_8Bb4e76f2bbe2e0961488JsBr, map[string]*bintree{}}, - "9.ce30b62587989503c1b1.js.br": &bintree{_9Ce30b62587989503c1b1JsBr, map[string]*bintree{}}, - "boot.a9e9f667d5db067ec5ee.js.br": &bintree{bootA9e9f667d5db067ec5eeJsBr, map[string]*bintree{}}, - "config.default.toml": &bintree{configDefaultToml, map[string]*bintree{}}, - "connect.ebc4a0d419c384c3e282.js.br": &bintree{connectEbc4a0d419c384c3e282JsBr, map[string]*bintree{}}, - "favicon.ico": &bintree{faviconIco, map[string]*bintree{}}, + "6.dabc66d5e65984b4d1b8.js.br": &bintree{_6Dabc66d5e65984b4d1b8JsBr, map[string]*bintree{}}, + "7.44423ff074b7ee9187c6.js.br": &bintree{_744423ff074b7ee9187c6JsBr, map[string]*bintree{}}, + "8.bb4e76f2bbe2e0961488.js.br": &bintree{_8Bb4e76f2bbe2e0961488JsBr, map[string]*bintree{}}, + "9.ce30b62587989503c1b1.js.br": &bintree{_9Ce30b62587989503c1b1JsBr, map[string]*bintree{}}, + "boot.a9e9f667d5db067ec5ee.js.br": &bintree{bootA9e9f667d5db067ec5eeJsBr, map[string]*bintree{}}, + "config.default.toml": &bintree{configDefaultToml, map[string]*bintree{}}, + "connect.ebc4a0d419c384c3e282.js.br": &bintree{connectEbc4a0d419c384c3e282JsBr, map[string]*bintree{}}, + "favicon.ico": &bintree{faviconIco, map[string]*bintree{}}, "font": &bintree{nil, map[string]*bintree{ - "Montserrat-Bold.woff": &bintree{fontMontserratBoldWoff, map[string]*bintree{}}, - "Montserrat-Bold.woff2": &bintree{fontMontserratBoldWoff2, map[string]*bintree{}}, - "Montserrat-Regular.woff": &bintree{fontMontserratRegularWoff, map[string]*bintree{}}, + "Montserrat-Bold.woff": &bintree{fontMontserratBoldWoff, map[string]*bintree{}}, + "Montserrat-Bold.woff2": &bintree{fontMontserratBoldWoff2, map[string]*bintree{}}, + "Montserrat-Regular.woff": &bintree{fontMontserratRegularWoff, map[string]*bintree{}}, "Montserrat-Regular.woff2": &bintree{fontMontserratRegularWoff2, map[string]*bintree{}}, - "RobotoMono-Bold.woff": &bintree{fontRobotomonoBoldWoff, map[string]*bintree{}}, - "RobotoMono-Bold.woff2": &bintree{fontRobotomonoBoldWoff2, map[string]*bintree{}}, - "RobotoMono-Regular.woff": &bintree{fontRobotomonoRegularWoff, map[string]*bintree{}}, + "RobotoMono-Bold.woff": &bintree{fontRobotomonoBoldWoff, map[string]*bintree{}}, + "RobotoMono-Bold.woff2": &bintree{fontRobotomonoBoldWoff2, map[string]*bintree{}}, + "RobotoMono-Regular.woff": &bintree{fontRobotomonoRegularWoff, map[string]*bintree{}}, "RobotoMono-Regular.woff2": &bintree{fontRobotomonoRegularWoff2, map[string]*bintree{}}, }}, - "icon_192.png": &bintree{icon_192Png, map[string]*bintree{}}, - "icon_512.png": &bintree{icon_512Png, map[string]*bintree{}}, - "main.1b2663ec4e3f90d36c9b.js.br": &bintree{main1b2663ec4e3f90d36c9bJsBr, map[string]*bintree{}}, - "main.7a567880bf6424b9d73b.css.br": &bintree{main7a567880bf6424b9d73bCssBr, map[string]*bintree{}}, - "manifest.json.br": &bintree{manifestJsonBr, map[string]*bintree{}}, - "runtime.b976cc3431568cb71c47.js.br": &bintree{runtimeB976cc3431568cb71c47JsBr, map[string]*bintree{}}, - "sw.js.br": &bintree{swJsBr, map[string]*bintree{}}, - "vendors~connect.3ca0619eb76955d609ed.js.br": &bintree{vendorsConnect3ca0619eb76955d609edJsBr, map[string]*bintree{}}, + "icon_192.png": &bintree{icon_192Png, map[string]*bintree{}}, + "icon_512.png": &bintree{icon_512Png, map[string]*bintree{}}, + "main.1b2663ec4e3f90d36c9b.js.br": &bintree{main1b2663ec4e3f90d36c9bJsBr, map[string]*bintree{}}, + "main.7a567880bf6424b9d73b.css.br": &bintree{main7a567880bf6424b9d73bCssBr, map[string]*bintree{}}, + "manifest.json.br": &bintree{manifestJsonBr, map[string]*bintree{}}, + "runtime.b976cc3431568cb71c47.js.br": &bintree{runtimeB976cc3431568cb71c47JsBr, map[string]*bintree{}}, + "sw.js.br": &bintree{swJsBr, map[string]*bintree{}}, + "vendors~connect.3ca0619eb76955d609ed.js.br": &bintree{vendorsConnect3ca0619eb76955d609edJsBr, map[string]*bintree{}}, "vendors~connect.8ff8cf6237ae10adbdb1.js.LICENSE.txt": &bintree{vendorsConnect8ff8cf6237ae10adbdb1JsLicenseTxt, map[string]*bintree{}}, - "vendors~main.ca3aa6cc261be8bc77a1.js.br": &bintree{vendorsMainCa3aa6cc261be8bc77a1JsBr, map[string]*bintree{}}, - "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": &bintree{vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, map[string]*bintree{}}, + "vendors~main.ca3aa6cc261be8bc77a1.js.br": &bintree{vendorsMainCa3aa6cc261be8bc77a1JsBr, map[string]*bintree{}}, + "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": &bintree{vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, map[string]*bintree{}}, }} // RestoreAsset restores an asset under the given directory @@ -868,4 +869,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - diff --git a/go.mod b/go.mod index 9af4eee9..d473daed 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/blevesearch/bleve v1.0.9 github.com/caddyserver/certmagic v0.11.2 github.com/cenkalti/backoff/v4 v4.0.2 // indirect + github.com/cryptix/goSam v0.1.0 // indirect github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect @@ -52,3 +53,5 @@ require ( gopkg.in/ini.v1 v1.57.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect ) + +replace github.com/eyedeekay/goSam v0.32.29 => ../goSam diff --git a/go.sum b/go.sum index 42c6afac..7586460c 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,10 @@ github.com/cpu/goacmedns v0.0.2/go.mod h1:4MipLkI+qScwqtVxcNO6okBhbgRrr7/tKXUSgS github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cryptix/go v1.3.1 h1:I9opbROgEpldI0PwkMku0UY2DLFYgelZd9u0uaxmMgY= +github.com/cryptix/go v1.3.1/go.mod h1:mFQotm9rTzptzvNjJM+1vSIDa/rVOVqMu0889GIXg70= +github.com/cryptix/goSam v0.1.0 h1:lKXtrTv3Kd6+eIuNtcq3zPShJEVRqw+lQwmh49HmC7k= +github.com/cryptix/goSam v0.1.0/go.mod h1:7ewkjhXT8V5RG07pvWUOHHtMahvGbeKlEv8ukUyRiTA= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -152,6 +156,8 @@ github.com/eyedeekay/sam3 v0.32.3 h1:PW1vQoo2H7c3Q4l2DngJqpSdsdJprMCk9NOkUHtcdmM github.com/eyedeekay/sam3 v0.32.3/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350 h1:8R4zcaWsgANiZ4MKKBPUf9Isct2M1IFVUVZdAMqPCmU= github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= +github.com/eyedeekay/sam3 v0.32.32 h1:9Ea1Ere5O8Clx8zYxKnvhrWy7R96Q4FvxlPskYf8VW0= +github.com/eyedeekay/sam3 v0.32.32/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= @@ -168,6 +174,7 @@ github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwl github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA= github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd/go.mod h1:wKdY0ikOgzrWSeB9UyBVKPRhjXQ+vTb+BPeJuypUuNE= github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= +github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a h1:FQqoVvjbiUioBBFUL5up+h+GdCa/AnJsL/1bIs/veSI= @@ -180,10 +187,12 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.6.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.7.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -326,6 +335,8 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg= github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= +github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0 h1:clkDYGefEWUCwyCrwYn900sOaVGDpinPJgD0W6ebEjs= +github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0/go.mod h1:P6fDJzlxN+cWYR09KbE9/ta+Y6JofX9tAUhJpWkWPaM= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= diff --git a/server/irc.go b/server/irc.go index 63cb2ec0..881c929d 100644 --- a/server/irc.go +++ b/server/irc.go @@ -8,6 +8,7 @@ import ( "net" "strings" + // "github.com/cryptix/goSam" "github.com/eyedeekay/goSam" "github.com/khlieng/dispatch/pkg/irc" "github.com/khlieng/dispatch/storage" @@ -80,8 +81,24 @@ func connectIRC(network *storage.Network, state *State, srcIP []byte) *irc.Clien if cfg.Proxy.Enabled && strings.ToLower(cfg.Proxy.Protocol) == "i2p" { addr := net.JoinHostPort(cfg.Proxy.Host, cfg.Proxy.Port) - - client, err := goSam.NewClient(addr) + client, err := goSam.NewClientFromOptions( + goSam.SetAddr(addr), + goSam.SetUnpublished(false), + goSam.SetInQuantity(3), + goSam.SetOutQuantity(3), + goSam.SetInBackups(2), + goSam.SetOutBackups(2), + goSam.SetInLength(2), + goSam.SetOutLength(2), + goSam.SetInVariance(-1), + goSam.SetOutVariance(-1), + goSam.SetCloseIdle(false), + goSam.SetDebug(false), + goSam.SetLeaseSetEncType("4"), + goSam.SetMinSAMVersion(0), + goSam.SetMaxSAMVersion(1), + ) + //client, err := goSam.NewClient(addr) if err != nil { log.Println(err) } else { diff --git a/vendor/github.com/eyedeekay/goSam/accept.go b/vendor/github.com/eyedeekay/goSam/accept.go index 4c4dba3d..a93a7ad5 100644 --- a/vendor/github.com/eyedeekay/goSam/accept.go +++ b/vendor/github.com/eyedeekay/goSam/accept.go @@ -32,7 +32,7 @@ func (c *Client) ListenI2P(dest string) (net.Listener, error) { } fmt.Println("Listening on destination:", c.Base32()+".b32.i2p") - c, err = c.NewClient() + c, err = c.NewClient(c.id) if err != nil { return nil, err } diff --git a/vendor/github.com/eyedeekay/goSam/client.go b/vendor/github.com/eyedeekay/goSam/client.go index 1798bbdb..a535ac7c 100644 --- a/vendor/github.com/eyedeekay/goSam/client.go +++ b/vendor/github.com/eyedeekay/goSam/client.go @@ -11,7 +11,8 @@ import ( "math/rand" "net" "strings" - "sync" + // "sync" + "time" ) // A Client represents a single Connection to the SAM bridge @@ -52,10 +53,9 @@ type Client struct { debug bool //NEVER, EVER modify lastaddr or id yourself. They are used internally only. - lastaddr string - id int32 - ml sync.Mutex - oml sync.Mutex + id int32 + sammin int + sammax int } var SAMsigTypes = []string{ @@ -66,6 +66,12 @@ var SAMsigTypes = []string{ "SIGNATURE_TYPE=EdDSA_SHA512_Ed25519", } +var ValidSAMCommands = []string{ + "HELLO", + "SESSION", + "STREAM", +} + var ( i2pB64enc *base64.Encoding = base64.NewEncoding("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-~") i2pB32enc *base32.Encoding = base32.NewEncoding("abcdefghijklmnopqrstuvwxyz234567") @@ -83,7 +89,10 @@ func NewClient(addr string) (*Client, error) { // NewID generates a random number to use as an tunnel name func (c *Client) NewID() int32 { - return rand.Int31n(math.MaxInt32) + if c.id == 0 { + c.id = rand.Int31n(math.MaxInt32) + } + return c.id } // Destination returns the full destination of the local tunnel @@ -127,11 +136,11 @@ func NewClientFromOptions(opts ...func(*Client) error) (*Client, error) { c.port = "7656" c.inLength = 3 c.inVariance = 0 - c.inQuantity = 1 + c.inQuantity = 3 c.inBackups = 1 c.outLength = 3 c.outVariance = 0 - c.outQuantity = 1 + c.outQuantity = 3 c.outBackups = 1 c.dontPublishLease = true c.encryptLease = false @@ -140,20 +149,22 @@ func NewClientFromOptions(opts ...func(*Client) error) (*Client, error) { c.reduceIdleQuantity = 1 c.closeIdle = true c.closeIdleTime = 600000 - c.debug = true + c.debug = false c.sigType = SAMsigTypes[4] c.id = 0 - c.lastaddr = "invalid" c.destination = "" c.leaseSetEncType = "4,0" c.fromport = "" c.toport = "" + c.sammin = 0 + c.sammax = 1 for _, o := range opts { if err := o(&c); err != nil { return nil, err } } - conn, err := net.Dial("tcp", c.samaddr()) + c.id = c.NewID() + conn, err := net.DialTimeout("tcp", c.samaddr(), 15*time.Minute) if err != nil { return nil, err } @@ -180,7 +191,7 @@ func (c *Client) samaddr() string { // send the initial handshake command and check that the reply is ok func (c *Client) hello() error { - r, err := c.sendCmd("HELLO VERSION MIN=3.0 MAX=3.2\n") + r, err := c.sendCmd("HELLO VERSION MIN=3.%d MAX=3.%d\n", c.sammin, c.sammax) if err != nil { return err } @@ -216,8 +227,10 @@ func (c *Client) Close() error { return c.SamConn.Close() } -// NewClient generates an exact copy of the client with the same options -func (c *Client) NewClient() (*Client, error) { +// NewClient generates an exact copy of the client with the same options, but +// re-does all the handshaky business so that Dial can pick up right where it +// left off, should the need arise. +func (c *Client) NewClient(id int32) (*Client, error) { return NewClientFromOptions( SetHost(c.host), SetPort(c.port), @@ -238,7 +251,6 @@ func (c *Client) NewClient() (*Client, error) { SetCloseIdle(c.closeIdle), SetCloseIdleTime(c.closeIdleTime), SetCompression(c.compression), - setlastaddr(c.lastaddr), - setid(c.id), + setid(id), ) } diff --git a/vendor/github.com/eyedeekay/goSam/dial.go b/vendor/github.com/eyedeekay/goSam/dial.go index c820ce1c..058f71a3 100644 --- a/vendor/github.com/eyedeekay/goSam/dial.go +++ b/vendor/github.com/eyedeekay/goSam/dial.go @@ -2,35 +2,28 @@ package goSam import ( "context" - "fmt" + "log" "net" "strings" ) // DialContext implements the net.DialContext function and can be used for http.Transport func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Conn, error) { - c.oml.Lock() - defer c.oml.Unlock() errCh := make(chan error, 1) connCh := make(chan net.Conn, 1) go func() { - if conn, err := c.Dial(network, addr); err != nil { + if conn, err := c.DialContextFree(network, addr); err != nil { errCh <- err } else if ctx.Err() != nil { - var err error - c, err = c.NewClient() - if err != nil { - conn.Close() - } + log.Println(ctx) + errCh <- ctx.Err() } else { connCh <- conn } }() select { case err := <-errCh: - // var err error - c, err = c.NewClient() - return c.SamConn, err + return nil, err case conn := <-connCh: return conn, nil case <-ctx.Done(): @@ -38,42 +31,49 @@ func (c *Client) DialContext(ctx context.Context, network, addr string) (net.Con } } -func (c *Client) dialCheck(addr string) (int32, bool) { - if c.lastaddr == "invalid" { - fmt.Println("Preparing to dial new address.") - return c.NewID(), true - } else if c.lastaddr != addr { - fmt.Println("Preparing to dial next new address.") - } - return c.id, false +func (c *Client) Dial(network, addr string) (net.Conn, error) { + return c.DialContext(context.TODO(), network, addr) } // Dial implements the net.Dial function and can be used for http.Transport -func (c *Client) Dial(network, addr string) (net.Conn, error) { - c.ml.Lock() - defer c.ml.Unlock() +func (c *Client) DialContextFree(network, addr string) (net.Conn, error) { portIdx := strings.Index(addr, ":") if portIdx >= 0 { addr = addr[:portIdx] } addr, err := c.Lookup(addr) if err != nil { + log.Printf("LOOKUP DIALER ERROR %s %s", addr, err) return nil, err } - var test bool - if c.id, test = c.dialCheck(addr); test == true { - c.destination, err = c.CreateStreamSession(c.id, c.destination) + c.destination, err = c.CreateStreamSession(c.id, c.destination) + if err != nil { + c.Close() + d, err := c.NewClient(c.id + 1) /**/ if err != nil { return nil, err } - c.lastaddr = addr + d.destination, err = d.CreateStreamSession(d.id, c.destination) + if err != nil { + return nil, err + } + d, err = d.NewClient(d.id) + if err != nil { + return nil, err + } + // d.lastaddr = addr + err = d.StreamConnect(d.id, addr) + if err != nil { + return nil, err + } + c = d + return d.SamConn, nil } - c, err = c.NewClient() + c, err = c.NewClient(c.id) if err != nil { return nil, err } - err = c.StreamConnect(c.id, addr) if err != nil { return nil, err diff --git a/vendor/github.com/eyedeekay/goSam/go.mod b/vendor/github.com/eyedeekay/goSam/go.mod index cd436349..baeaa471 100644 --- a/vendor/github.com/eyedeekay/goSam/go.mod +++ b/vendor/github.com/eyedeekay/goSam/go.mod @@ -1,10 +1,11 @@ module github.com/eyedeekay/goSam require ( - github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350 + github.com/eyedeekay/sam3 v0.32.32 github.com/getlantern/go-socks5 v0.0.0-20171114193258-79d4dd3e2db5 github.com/getlantern/golog v0.0.0-20201105130739-9586b8bde3a9 // indirect github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd // indirect + github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 // indirect ) //replace github.com/eyedeekay/gosam v0.1.1-0.20190814195658-27e786578944 => github.com/eyedeekay/goSam ./ diff --git a/vendor/github.com/eyedeekay/goSam/go.sum b/vendor/github.com/eyedeekay/goSam/go.sum index effd6167..025b1603 100644 --- a/vendor/github.com/eyedeekay/goSam/go.sum +++ b/vendor/github.com/eyedeekay/goSam/go.sum @@ -6,6 +6,8 @@ github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORX github.com/eyedeekay/sam3 v0.32.31 h1:0fdDAupEQZSETHcyVQAsnFgpYArGJzU+lC2qN6f0GDk= github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350 h1:8R4zcaWsgANiZ4MKKBPUf9Isct2M1IFVUVZdAMqPCmU= github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= +github.com/eyedeekay/sam3 v0.32.32 h1:9Ea1Ere5O8Clx8zYxKnvhrWy7R96Q4FvxlPskYf8VW0= +github.com/eyedeekay/sam3 v0.32.32/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4= github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY= github.com/getlantern/errors v1.0.1 h1:XukU2whlh7OdpxnkXhNH9VTLVz0EVPGKDV5K0oWhvzw= @@ -22,6 +24,8 @@ github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd h1:mn98vs69Kqw56iK github.com/getlantern/netx v0.0.0-20190110220209-9912de6f94fd/go.mod h1:wKdY0ikOgzrWSeB9UyBVKPRhjXQ+vTb+BPeJuypUuNE= github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA= github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= +github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6 h1:QthAQCekS1YOeYWSvoHI6ZatlG4B+GBDLxV/2ZkBsTA= +github.com/getlantern/ops v0.0.0-20200403153110-8476b16edcd6/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= diff --git a/vendor/github.com/eyedeekay/goSam/naming.go b/vendor/github.com/eyedeekay/goSam/naming.go index e1d68e70..81e2a3d3 100644 --- a/vendor/github.com/eyedeekay/goSam/naming.go +++ b/vendor/github.com/eyedeekay/goSam/naming.go @@ -37,37 +37,39 @@ func (c *Client) Lookup(name string) (string, error) { } func (c *Client) forward(client, conn net.Conn) { + defer client.Close() + defer conn.Close() go func() { - defer client.Close() - defer conn.Close() + // defer client.Close() + // defer conn.Close() io.Copy(client, conn) }() go func() { - defer client.Close() - defer conn.Close() + // defer client.Close() + // defer conn.Close() io.Copy(conn, client) }() } func (c *Client) Resolve(ctx context.Context, name string) (context.Context, net.IP, error) { - if c.lastaddr == "invalid" || c.lastaddr != name { - client, err := c.DialContext(ctx, "", name) - if err != nil { - return ctx, nil, err - } - ln, err := net.Listen("tcp", "127.0.0.1:") - if err != nil { - return ctx, nil, err - } - go func() { - for { - conn, err := ln.Accept() - if err != nil { - fmt.Println(err.Error()) - } - go c.forward(client, conn) - } - }() + // if c.lastaddr == "invalid" || c.lastaddr != name { + client, err := c.DialContext(ctx, "", name) + if err != nil { + return ctx, nil, err } + ln, err := net.Listen("tcp", "127.0.0.1:") + if err != nil { + return ctx, nil, err + } + go func() { + for { + conn, err := ln.Accept() + if err != nil { + fmt.Println(err.Error()) + } + go c.forward(client, conn) + } + }() + // } return ctx, nil, nil } diff --git a/vendor/github.com/eyedeekay/goSam/options.go b/vendor/github.com/eyedeekay/goSam/options.go index 68f64448..593173ca 100644 --- a/vendor/github.com/eyedeekay/goSam/options.go +++ b/vendor/github.com/eyedeekay/goSam/options.go @@ -62,6 +62,32 @@ func SetHost(s string) func(*Client) error { } } +func SetSAMMinVersion(i int) func(*Client) error { + return func(c *Client) error { + if i < 0 { + return fmt.Errorf("SAM version must be greater than or equal to 0") + } + if i > 3 { + return fmt.Errorf("SAM version must be less than or equal to 3") + } + c.sammin = i + return nil + } +} + +func SetSAMMaxVersion(i int) func(*Client) error { + return func(c *Client) error { + if i < 0 { + return fmt.Errorf("SAM version must be greater than or equal to 0") + } + if i > 3 { + return fmt.Errorf("SAM version must be less than or equal to 3") + } + c.sammin = i + return nil + } +} + //SetLocalDestination sets the local destination of the tunnel from a private //key func SetLocalDestination(s string) func(*Client) error { @@ -71,13 +97,6 @@ func SetLocalDestination(s string) func(*Client) error { } } -func setlastaddr(s string) func(*Client) error { - return func(c *Client) error { - c.lastaddr = s - return nil - } -} - func setid(s int32) func(*Client) error { return func(c *Client) error { c.id = s diff --git a/vendor/github.com/eyedeekay/goSam/replyParser.go b/vendor/github.com/eyedeekay/goSam/replyParser.go index bc5b1332..d7e6d150 100644 --- a/vendor/github.com/eyedeekay/goSam/replyParser.go +++ b/vendor/github.com/eyedeekay/goSam/replyParser.go @@ -44,6 +44,25 @@ func parseReply(line string) (*Reply, error) { if len(parts) < 3 { return nil, fmt.Errorf("Malformed Reply.\n%s\n", line) } + preParseReply := func() []string { + val := "" + quote := false + for _, v := range parts { + if strings.Contains(v, "=\"") { + quote = true + } + if strings.Contains(v, "\"\n") || strings.Contains(v, "\" ") { + quote = false + } + if quote { + val += v + "_" + } else { + val += v + " " + } + } + return strings.Split(strings.TrimSuffix(strings.TrimSpace(val), "_"), " ") + } + parts = preParseReply() r := &Reply{ Topic: parts[0], @@ -63,9 +82,8 @@ func parseReply(line string) (*Reply, error) { } else { kvPair := strings.SplitN(v, "=", 2) if kvPair != nil { - if len(kvPair) == 1 { - } else if len(kvPair) != 2 { - return nil, fmt.Errorf("Malformed key-value-pair.\n%s\n", kvPair) + if len(kvPair) != 2 { + return nil, fmt.Errorf("Malformed key-value-pair len != 2.\n%s\n", kvPair) } } r.Pairs[kvPair[0]] = kvPair[len(kvPair)-1] diff --git a/vendor/github.com/eyedeekay/goSam/stream.go b/vendor/github.com/eyedeekay/goSam/stream.go index 517b2fae..79ddd8e8 100644 --- a/vendor/github.com/eyedeekay/goSam/stream.go +++ b/vendor/github.com/eyedeekay/goSam/stream.go @@ -6,6 +6,9 @@ import ( // StreamConnect asks SAM for a TCP-Like connection to dest, has to be called on a new Client func (c *Client) StreamConnect(id int32, dest string) error { + if dest == "" { + return nil + } r, err := c.sendCmd("STREAM CONNECT ID=%d DESTINATION=%s %s %s\n", id, dest, c.from(), c.to()) if err != nil { return err diff --git a/vendor/modules.txt b/vendor/modules.txt index 3487ae6a..cc1dff59 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -68,6 +68,8 @@ github.com/couchbase/vellum github.com/couchbase/vellum/levenshtein github.com/couchbase/vellum/regexp github.com/couchbase/vellum/utf8 +# github.com/cryptix/goSam v0.1.0 +## explicit # github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d ## explicit # github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 @@ -81,10 +83,10 @@ github.com/davecgh/go-spew/spew github.com/dsnet/compress/brotli github.com/dsnet/compress/internal github.com/dsnet/compress/internal/errors -# github.com/eyedeekay/goSam v0.32.29 +# github.com/eyedeekay/goSam v0.32.29 => ../goSam ## explicit github.com/eyedeekay/goSam -# github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350 +# github.com/eyedeekay/sam3 v0.32.32 github.com/eyedeekay/sam3/i2pkeys # github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 ## explicit From 065c86ccff7249c029a27547e47044c405142b7f Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 7 Dec 2020 01:49:03 -0500 Subject: [PATCH 2/6] Set optimized I2P defaults --- go.mod | 3 +-- go.sum | 2 ++ vendor/github.com/eyedeekay/goSam/Makefile | 2 +- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d473daed..ef97fc1d 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect github.com/dsnet/compress v0.0.1 - github.com/eyedeekay/goSam v0.32.29 + github.com/eyedeekay/goSam v0.32.30 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect @@ -54,4 +54,3 @@ require ( gopkg.in/square/go-jose.v2 v2.5.1 // indirect ) -replace github.com/eyedeekay/goSam v0.32.29 => ../goSam diff --git a/go.sum b/go.sum index 7586460c..87c10062 100644 --- a/go.sum +++ b/go.sum @@ -150,6 +150,8 @@ github.com/eyedeekay/goSam v0.32.28 h1:8O9aDGr45EIS82TRm4x0xAnGnz6ZHW0/8oyqziYiN github.com/eyedeekay/goSam v0.32.28/go.mod h1:YIklxqKiJ3I5JNRgb5pM7VCQOSNDGnVulHnrKBbbECM= github.com/eyedeekay/goSam v0.32.29 h1:LHDYz0rBCKk7hwmsu17xBLJmauwThzvU9/9WZ6lQDDQ= github.com/eyedeekay/goSam v0.32.29/go.mod h1:PNJAmTMvSmH10S0aEspgOovzGFph8qXBwjH/HgO2oJI= +github.com/eyedeekay/goSam v0.32.30 h1:mMlZNE2oISdjjjpgfN17W56tn9F8rD/Jc2tsjTDDFYg= +github.com/eyedeekay/goSam v0.32.30/go.mod h1:UgJnih/LpotwKriwVPOEa6yPDM2NDdVrKfLtS5DOLPE= github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab/go.mod h1:h7mvUAMgZ/rtRDUOkvKTK+8LnDMeUhJSoa5EPdB51fc= github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM= github.com/eyedeekay/sam3 v0.32.3 h1:PW1vQoo2H7c3Q4l2DngJqpSdsdJprMCk9NOkUHtcdmM= diff --git a/vendor/github.com/eyedeekay/goSam/Makefile b/vendor/github.com/eyedeekay/goSam/Makefile index 38ce64bb..aa109139 100644 --- a/vendor/github.com/eyedeekay/goSam/Makefile +++ b/vendor/github.com/eyedeekay/goSam/Makefile @@ -1,6 +1,6 @@ USER_GH=eyedeekay -VERSION=0.32.29 +VERSION=0.32.30 packagename=gosam echo: fmt diff --git a/vendor/modules.txt b/vendor/modules.txt index cc1dff59..48b04e02 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -83,7 +83,7 @@ github.com/davecgh/go-spew/spew github.com/dsnet/compress/brotli github.com/dsnet/compress/internal github.com/dsnet/compress/internal/errors -# github.com/eyedeekay/goSam v0.32.29 => ../goSam +# github.com/eyedeekay/goSam v0.32.30 ## explicit github.com/eyedeekay/goSam # github.com/eyedeekay/sam3 v0.32.32 From 25879ef498f9af15cf071f77156780c68f725b49 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 7 Dec 2020 01:50:07 -0500 Subject: [PATCH 3/6] Set optimized I2P defaults --- server/irc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/irc.go b/server/irc.go index 881c929d..2339991c 100644 --- a/server/irc.go +++ b/server/irc.go @@ -95,8 +95,8 @@ func connectIRC(network *storage.Network, state *State, srcIP []byte) *irc.Clien goSam.SetCloseIdle(false), goSam.SetDebug(false), goSam.SetLeaseSetEncType("4"), - goSam.SetMinSAMVersion(0), - goSam.SetMaxSAMVersion(1), + goSam.SetSAMMinVersion(0), + goSam.SetSAMMaxVersion(1), ) //client, err := goSam.NewClient(addr) if err != nil { From be64fe5aaec975bbd2e1ff34260710fc91864853 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 7 Dec 2020 12:14:46 -0500 Subject: [PATCH 4/6] remove cryptix/goSam --- go.mod | 2 -- go.sum | 47 ++++++++++++++++++++++++---------------------- server/irc.go | 4 ++-- vendor/modules.txt | 2 -- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index ef97fc1d..be9d37ec 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/blevesearch/bleve v1.0.9 github.com/caddyserver/certmagic v0.11.2 github.com/cenkalti/backoff/v4 v4.0.2 // indirect - github.com/cryptix/goSam v0.1.0 // indirect github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d // indirect github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 // indirect @@ -53,4 +52,3 @@ require ( gopkg.in/ini.v1 v1.57.0 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect ) - diff --git a/go.sum b/go.sum index 87c10062..a30e97ea 100644 --- a/go.sum +++ b/go.sum @@ -114,10 +114,6 @@ github.com/cpu/goacmedns v0.0.2/go.mod h1:4MipLkI+qScwqtVxcNO6okBhbgRrr7/tKXUSgS github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cryptix/go v1.3.1 h1:I9opbROgEpldI0PwkMku0UY2DLFYgelZd9u0uaxmMgY= -github.com/cryptix/go v1.3.1/go.mod h1:mFQotm9rTzptzvNjJM+1vSIDa/rVOVqMu0889GIXg70= -github.com/cryptix/goSam v0.1.0 h1:lKXtrTv3Kd6+eIuNtcq3zPShJEVRqw+lQwmh49HmC7k= -github.com/cryptix/goSam v0.1.0/go.mod h1:7ewkjhXT8V5RG07pvWUOHHtMahvGbeKlEv8ukUyRiTA= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso= @@ -142,26 +138,15 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/exoscale/egoscale v0.18.1/go.mod h1:Z7OOdzzTOz1Q1PjQXumlz9Wn/CddH0zSYdCF3rnBKXE= -github.com/eyedeekay/goSam v0.32.22 h1:SD0GEQ8MGJ1wZ4MepSa0mpZjiZAGMSTUhSwAZVrm2kg= -github.com/eyedeekay/goSam v0.32.22/go.mod h1:YIklxqKiJ3I5JNRgb5pM7VCQOSNDGnVulHnrKBbbECM= -github.com/eyedeekay/goSam v0.32.27 h1:yYdL384sLPge4K0vK7l7v4vBakrK/kf6qW9hQ7uyW/E= -github.com/eyedeekay/goSam v0.32.27/go.mod h1:YIklxqKiJ3I5JNRgb5pM7VCQOSNDGnVulHnrKBbbECM= -github.com/eyedeekay/goSam v0.32.28 h1:8O9aDGr45EIS82TRm4x0xAnGnz6ZHW0/8oyqziYiN9U= -github.com/eyedeekay/goSam v0.32.28/go.mod h1:YIklxqKiJ3I5JNRgb5pM7VCQOSNDGnVulHnrKBbbECM= -github.com/eyedeekay/goSam v0.32.29 h1:LHDYz0rBCKk7hwmsu17xBLJmauwThzvU9/9WZ6lQDDQ= -github.com/eyedeekay/goSam v0.32.29/go.mod h1:PNJAmTMvSmH10S0aEspgOovzGFph8qXBwjH/HgO2oJI= github.com/eyedeekay/goSam v0.32.30 h1:mMlZNE2oISdjjjpgfN17W56tn9F8rD/Jc2tsjTDDFYg= github.com/eyedeekay/goSam v0.32.30/go.mod h1:UgJnih/LpotwKriwVPOEa6yPDM2NDdVrKfLtS5DOLPE= -github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab/go.mod h1:h7mvUAMgZ/rtRDUOkvKTK+8LnDMeUhJSoa5EPdB51fc= -github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM= -github.com/eyedeekay/sam3 v0.32.3 h1:PW1vQoo2H7c3Q4l2DngJqpSdsdJprMCk9NOkUHtcdmM= -github.com/eyedeekay/sam3 v0.32.3/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= -github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350 h1:8R4zcaWsgANiZ4MKKBPUf9Isct2M1IFVUVZdAMqPCmU= -github.com/eyedeekay/sam3 v0.32.32-0.20201122050855-f464873c9350/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= github.com/eyedeekay/sam3 v0.32.32 h1:9Ea1Ere5O8Clx8zYxKnvhrWy7R96Q4FvxlPskYf8VW0= github.com/eyedeekay/sam3 v0.32.32/go.mod h1:qRA9KIIVxbrHlkj+ZB+OoxFGFgdKeGp1vSgPw26eOVU= +github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= +github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= @@ -181,6 +166,7 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a h1:FQqoVvjbiUioBBFUL5up+h+GdCa/AnJsL/1bIs/veSI= github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= +github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/go-acme/lego/v3 v3.7.0 h1:qC5/8/CbltyAE8fGLE6bGlqucj7pXc/vBxiLwLOsmAQ= github.com/go-acme/lego/v3 v3.7.0/go.mod h1:4eDjjYkAsDXyNcwN8IhhZAwxz9Ltiks1Zmpv0q20J7A= @@ -189,12 +175,10 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.6.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.7.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -232,6 +216,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -247,6 +232,7 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -280,6 +266,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df/go.mod h1:QMZY7/J/KSQEhKWFeDesPjMj+wCHReeknARU3wqlyN4= @@ -287,6 +274,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= +github.com/jmhodges/levigo v1.0.0 h1:q5EC36kV79HWeTBWsod3mG11EgStG3qArTKcvlksN1U= github.com/jmhodges/levigo v1.0.0/go.mod h1:Q6Qx+uH3RAqyK4rFQroq9RL7mdkABMcfhEI+nNuzMJQ= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -298,6 +286,7 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -314,8 +303,10 @@ github.com/kolo/xmlrpc v0.0.0-20190717152603-07c4ee3fd181/go.mod h1:o03bZfuBwAXH github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labbsr0x/bindman-dns-webhook v1.0.2/go.mod h1:p6b+VCXIR8NYKpDr8/dg1HKfQoRHCdcsROXKvmoehKA= github.com/labbsr0x/goh v1.0.1/go.mod h1:8K2UhVoaWXcCU7Lxoa2omWnC8gyW8px7/lmO61c027w= @@ -337,8 +328,6 @@ github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3N github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg= github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0 h1:clkDYGefEWUCwyCrwYn900sOaVGDpinPJgD0W6ebEjs= -github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0/go.mod h1:P6fDJzlxN+cWYR09KbE9/ta+Y6JofX9tAUhJpWkWPaM= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -369,8 +358,10 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888= @@ -412,6 +403,7 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rainycape/memcache v0.0.0-20150622160815-1031fa0ce2f2/go.mod h1:7tZKcyumwBO6qip7RNQ5r77yrssm9bfCowcLEBcU5IA= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7 h1:FUL3b97ZY2EPqg2NbXKuMHs5pXJB9hjj1fDHnF2vl28= github.com/remyoudompheng/bigfft v0.0.0-20190512091148-babf20351dd7/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -424,8 +416,10 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -459,12 +453,15 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tdewolff/minify/v2 v2.7.6 h1:b6UzNphZeDm3AVmk0a69orkNLPJzJx3k/AQ/W2xoMs8= github.com/tdewolff/minify/v2 v2.7.6/go.mod h1:Mt3hGbK/ETDplEP9EMNZo1lPkM3TZq0rDIVV76nFgY0= github.com/tdewolff/parse/v2 v2.4.3 h1:k24zHgTRGm7LkvbTEreuavyZTf0k8a/lIenggv62OiU= github.com/tdewolff/parse/v2 v2.4.3/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/test v1.0.6 h1:76mzYJQ83Op284kMT+63iCNCI7NEERsIN8dLM+RiKr4= github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= +github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= @@ -482,6 +479,7 @@ github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/xdg-go/scram v0.0.0-20180814205039-7eeb5667e42c h1:Wm21TPasVdeOUTg1m/uNkRdMuvI+jIeYfTIwq98Z2V0= github.com/xdg-go/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:FV1RpvYFmF8wnKtr3ArzkC0b+tAySCbw8eP7QSIvLKM= +github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= @@ -586,6 +584,7 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180622082034-63fc586f45fe/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -672,6 +671,7 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -730,8 +730,10 @@ google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEG google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -745,6 +747,7 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/server/irc.go b/server/irc.go index 2339991c..32e6c5c0 100644 --- a/server/irc.go +++ b/server/irc.go @@ -88,8 +88,8 @@ func connectIRC(network *storage.Network, state *State, srcIP []byte) *irc.Clien goSam.SetOutQuantity(3), goSam.SetInBackups(2), goSam.SetOutBackups(2), - goSam.SetInLength(2), - goSam.SetOutLength(2), + goSam.SetInLength(3), + goSam.SetOutLength(3), goSam.SetInVariance(-1), goSam.SetOutVariance(-1), goSam.SetCloseIdle(false), diff --git a/vendor/modules.txt b/vendor/modules.txt index 48b04e02..d97001db 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -68,8 +68,6 @@ github.com/couchbase/vellum github.com/couchbase/vellum/levenshtein github.com/couchbase/vellum/regexp github.com/couchbase/vellum/utf8 -# github.com/cryptix/goSam v0.1.0 -## explicit # github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d ## explicit # github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 From 5e5bbe826851aa1003fb3af22cd0c817411d6b31 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 7 Dec 2020 12:20:22 -0500 Subject: [PATCH 5/6] revert changes to assets/bindata.go --- assets/bindata.go | 108 +++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/assets/bindata.go b/assets/bindata.go index f5ba5aa8..67281fe0 100644 --- a/assets/bindata.go +++ b/assets/bindata.go @@ -718,35 +718,35 @@ func AssetNames() []string { // _bindata is a table, holding each asset generator, mapped to its name. var _bindata = map[string]func() (*asset, error){ - "10.8d4e3eadb5bf393297d4.js.br": _108d4e3eadb5bf393297d4JsBr, - "6.927d29943814584bff4c.js.LICENSE.txt": _6927d29943814584bff4cJsLicenseTxt, - "6.dabc66d5e65984b4d1b8.js.br": _6Dabc66d5e65984b4d1b8JsBr, - "7.44423ff074b7ee9187c6.js.br": _744423ff074b7ee9187c6JsBr, - "8.bb4e76f2bbe2e0961488.js.br": _8Bb4e76f2bbe2e0961488JsBr, - "9.ce30b62587989503c1b1.js.br": _9Ce30b62587989503c1b1JsBr, - "boot.a9e9f667d5db067ec5ee.js.br": bootA9e9f667d5db067ec5eeJsBr, - "config.default.toml": configDefaultToml, - "connect.ebc4a0d419c384c3e282.js.br": connectEbc4a0d419c384c3e282JsBr, - "favicon.ico": faviconIco, - "font/Montserrat-Bold.woff": fontMontserratBoldWoff, - "font/Montserrat-Bold.woff2": fontMontserratBoldWoff2, - "font/Montserrat-Regular.woff": fontMontserratRegularWoff, - "font/Montserrat-Regular.woff2": fontMontserratRegularWoff2, - "font/RobotoMono-Bold.woff": fontRobotomonoBoldWoff, - "font/RobotoMono-Bold.woff2": fontRobotomonoBoldWoff2, - "font/RobotoMono-Regular.woff": fontRobotomonoRegularWoff, - "font/RobotoMono-Regular.woff2": fontRobotomonoRegularWoff2, - "icon_192.png": icon_192Png, - "icon_512.png": icon_512Png, - "main.1b2663ec4e3f90d36c9b.js.br": main1b2663ec4e3f90d36c9bJsBr, - "main.7a567880bf6424b9d73b.css.br": main7a567880bf6424b9d73bCssBr, - "manifest.json.br": manifestJsonBr, - "runtime.b976cc3431568cb71c47.js.br": runtimeB976cc3431568cb71c47JsBr, - "sw.js.br": swJsBr, - "vendors~connect.3ca0619eb76955d609ed.js.br": vendorsConnect3ca0619eb76955d609edJsBr, + "10.8d4e3eadb5bf393297d4.js.br": _108d4e3eadb5bf393297d4JsBr, + "6.927d29943814584bff4c.js.LICENSE.txt": _6927d29943814584bff4cJsLicenseTxt, + "6.dabc66d5e65984b4d1b8.js.br": _6Dabc66d5e65984b4d1b8JsBr, + "7.44423ff074b7ee9187c6.js.br": _744423ff074b7ee9187c6JsBr, + "8.bb4e76f2bbe2e0961488.js.br": _8Bb4e76f2bbe2e0961488JsBr, + "9.ce30b62587989503c1b1.js.br": _9Ce30b62587989503c1b1JsBr, + "boot.a9e9f667d5db067ec5ee.js.br": bootA9e9f667d5db067ec5eeJsBr, + "config.default.toml": configDefaultToml, + "connect.ebc4a0d419c384c3e282.js.br": connectEbc4a0d419c384c3e282JsBr, + "favicon.ico": faviconIco, + "font/Montserrat-Bold.woff": fontMontserratBoldWoff, + "font/Montserrat-Bold.woff2": fontMontserratBoldWoff2, + "font/Montserrat-Regular.woff": fontMontserratRegularWoff, + "font/Montserrat-Regular.woff2": fontMontserratRegularWoff2, + "font/RobotoMono-Bold.woff": fontRobotomonoBoldWoff, + "font/RobotoMono-Bold.woff2": fontRobotomonoBoldWoff2, + "font/RobotoMono-Regular.woff": fontRobotomonoRegularWoff, + "font/RobotoMono-Regular.woff2": fontRobotomonoRegularWoff2, + "icon_192.png": icon_192Png, + "icon_512.png": icon_512Png, + "main.1b2663ec4e3f90d36c9b.js.br": main1b2663ec4e3f90d36c9bJsBr, + "main.7a567880bf6424b9d73b.css.br": main7a567880bf6424b9d73bCssBr, + "manifest.json.br": manifestJsonBr, + "runtime.b976cc3431568cb71c47.js.br": runtimeB976cc3431568cb71c47JsBr, + "sw.js.br": swJsBr, + "vendors~connect.3ca0619eb76955d609ed.js.br": vendorsConnect3ca0619eb76955d609edJsBr, "vendors~connect.8ff8cf6237ae10adbdb1.js.LICENSE.txt": vendorsConnect8ff8cf6237ae10adbdb1JsLicenseTxt, - "vendors~main.ca3aa6cc261be8bc77a1.js.br": vendorsMainCa3aa6cc261be8bc77a1JsBr, - "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, + "vendors~main.ca3aa6cc261be8bc77a1.js.br": vendorsMainCa3aa6cc261be8bc77a1JsBr, + "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, } // AssetDir returns the file names below a certain @@ -788,39 +788,38 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } - var _bintree = &bintree{nil, map[string]*bintree{ - "10.8d4e3eadb5bf393297d4.js.br": &bintree{_108d4e3eadb5bf393297d4JsBr, map[string]*bintree{}}, + "10.8d4e3eadb5bf393297d4.js.br": &bintree{_108d4e3eadb5bf393297d4JsBr, map[string]*bintree{}}, "6.927d29943814584bff4c.js.LICENSE.txt": &bintree{_6927d29943814584bff4cJsLicenseTxt, map[string]*bintree{}}, - "6.dabc66d5e65984b4d1b8.js.br": &bintree{_6Dabc66d5e65984b4d1b8JsBr, map[string]*bintree{}}, - "7.44423ff074b7ee9187c6.js.br": &bintree{_744423ff074b7ee9187c6JsBr, map[string]*bintree{}}, - "8.bb4e76f2bbe2e0961488.js.br": &bintree{_8Bb4e76f2bbe2e0961488JsBr, map[string]*bintree{}}, - "9.ce30b62587989503c1b1.js.br": &bintree{_9Ce30b62587989503c1b1JsBr, map[string]*bintree{}}, - "boot.a9e9f667d5db067ec5ee.js.br": &bintree{bootA9e9f667d5db067ec5eeJsBr, map[string]*bintree{}}, - "config.default.toml": &bintree{configDefaultToml, map[string]*bintree{}}, - "connect.ebc4a0d419c384c3e282.js.br": &bintree{connectEbc4a0d419c384c3e282JsBr, map[string]*bintree{}}, - "favicon.ico": &bintree{faviconIco, map[string]*bintree{}}, + "6.dabc66d5e65984b4d1b8.js.br": &bintree{_6Dabc66d5e65984b4d1b8JsBr, map[string]*bintree{}}, + "7.44423ff074b7ee9187c6.js.br": &bintree{_744423ff074b7ee9187c6JsBr, map[string]*bintree{}}, + "8.bb4e76f2bbe2e0961488.js.br": &bintree{_8Bb4e76f2bbe2e0961488JsBr, map[string]*bintree{}}, + "9.ce30b62587989503c1b1.js.br": &bintree{_9Ce30b62587989503c1b1JsBr, map[string]*bintree{}}, + "boot.a9e9f667d5db067ec5ee.js.br": &bintree{bootA9e9f667d5db067ec5eeJsBr, map[string]*bintree{}}, + "config.default.toml": &bintree{configDefaultToml, map[string]*bintree{}}, + "connect.ebc4a0d419c384c3e282.js.br": &bintree{connectEbc4a0d419c384c3e282JsBr, map[string]*bintree{}}, + "favicon.ico": &bintree{faviconIco, map[string]*bintree{}}, "font": &bintree{nil, map[string]*bintree{ - "Montserrat-Bold.woff": &bintree{fontMontserratBoldWoff, map[string]*bintree{}}, - "Montserrat-Bold.woff2": &bintree{fontMontserratBoldWoff2, map[string]*bintree{}}, - "Montserrat-Regular.woff": &bintree{fontMontserratRegularWoff, map[string]*bintree{}}, + "Montserrat-Bold.woff": &bintree{fontMontserratBoldWoff, map[string]*bintree{}}, + "Montserrat-Bold.woff2": &bintree{fontMontserratBoldWoff2, map[string]*bintree{}}, + "Montserrat-Regular.woff": &bintree{fontMontserratRegularWoff, map[string]*bintree{}}, "Montserrat-Regular.woff2": &bintree{fontMontserratRegularWoff2, map[string]*bintree{}}, - "RobotoMono-Bold.woff": &bintree{fontRobotomonoBoldWoff, map[string]*bintree{}}, - "RobotoMono-Bold.woff2": &bintree{fontRobotomonoBoldWoff2, map[string]*bintree{}}, - "RobotoMono-Regular.woff": &bintree{fontRobotomonoRegularWoff, map[string]*bintree{}}, + "RobotoMono-Bold.woff": &bintree{fontRobotomonoBoldWoff, map[string]*bintree{}}, + "RobotoMono-Bold.woff2": &bintree{fontRobotomonoBoldWoff2, map[string]*bintree{}}, + "RobotoMono-Regular.woff": &bintree{fontRobotomonoRegularWoff, map[string]*bintree{}}, "RobotoMono-Regular.woff2": &bintree{fontRobotomonoRegularWoff2, map[string]*bintree{}}, }}, - "icon_192.png": &bintree{icon_192Png, map[string]*bintree{}}, - "icon_512.png": &bintree{icon_512Png, map[string]*bintree{}}, - "main.1b2663ec4e3f90d36c9b.js.br": &bintree{main1b2663ec4e3f90d36c9bJsBr, map[string]*bintree{}}, - "main.7a567880bf6424b9d73b.css.br": &bintree{main7a567880bf6424b9d73bCssBr, map[string]*bintree{}}, - "manifest.json.br": &bintree{manifestJsonBr, map[string]*bintree{}}, - "runtime.b976cc3431568cb71c47.js.br": &bintree{runtimeB976cc3431568cb71c47JsBr, map[string]*bintree{}}, - "sw.js.br": &bintree{swJsBr, map[string]*bintree{}}, - "vendors~connect.3ca0619eb76955d609ed.js.br": &bintree{vendorsConnect3ca0619eb76955d609edJsBr, map[string]*bintree{}}, + "icon_192.png": &bintree{icon_192Png, map[string]*bintree{}}, + "icon_512.png": &bintree{icon_512Png, map[string]*bintree{}}, + "main.1b2663ec4e3f90d36c9b.js.br": &bintree{main1b2663ec4e3f90d36c9bJsBr, map[string]*bintree{}}, + "main.7a567880bf6424b9d73b.css.br": &bintree{main7a567880bf6424b9d73bCssBr, map[string]*bintree{}}, + "manifest.json.br": &bintree{manifestJsonBr, map[string]*bintree{}}, + "runtime.b976cc3431568cb71c47.js.br": &bintree{runtimeB976cc3431568cb71c47JsBr, map[string]*bintree{}}, + "sw.js.br": &bintree{swJsBr, map[string]*bintree{}}, + "vendors~connect.3ca0619eb76955d609ed.js.br": &bintree{vendorsConnect3ca0619eb76955d609edJsBr, map[string]*bintree{}}, "vendors~connect.8ff8cf6237ae10adbdb1.js.LICENSE.txt": &bintree{vendorsConnect8ff8cf6237ae10adbdb1JsLicenseTxt, map[string]*bintree{}}, - "vendors~main.ca3aa6cc261be8bc77a1.js.br": &bintree{vendorsMainCa3aa6cc261be8bc77a1JsBr, map[string]*bintree{}}, - "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": &bintree{vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, map[string]*bintree{}}, + "vendors~main.ca3aa6cc261be8bc77a1.js.br": &bintree{vendorsMainCa3aa6cc261be8bc77a1JsBr, map[string]*bintree{}}, + "vendors~main.d13b9f2abe9b978a5708.js.LICENSE.txt": &bintree{vendorsMainD13b9f2abe9b978a5708JsLicenseTxt, map[string]*bintree{}}, }} // RestoreAsset restores an asset under the given directory @@ -869,3 +868,4 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } + From 2e48554b26c32e9d3a8a4211786b0d57d8cea8d4 Mon Sep 17 00:00:00 2001 From: idk Date: Mon, 7 Dec 2020 12:21:33 -0500 Subject: [PATCH 6/6] remove commented-out cryptix branch --- server/irc.go | 1 - 1 file changed, 1 deletion(-) diff --git a/server/irc.go b/server/irc.go index 32e6c5c0..17c9f086 100644 --- a/server/irc.go +++ b/server/irc.go @@ -8,7 +8,6 @@ import ( "net" "strings" - // "github.com/cryptix/goSam" "github.com/eyedeekay/goSam" "github.com/khlieng/dispatch/pkg/irc" "github.com/khlieng/dispatch/storage"