diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f9e474..26dd78c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,11 @@ _v6.4.2_ - Revert the last changes to the SDR Trunk parser (issue #206). +_v6.4.3_ + +- Add a note on the dirwatch admin screen about sdr-trunk. +- Starts client read/write pumps before registering with the controller (issue #181, #212). + ## Version 6.3 - Change scroll speed when drag droping talkgroups or units in a system (discussion #170). diff --git a/COMPILING.md b/COMPILING.md index 6b380b4..5f5477d 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -27,13 +27,13 @@ Clone the official repository on your computer and start the build process. When finished, you will find the precompiled versions for various platforms in the `dist` folder. - rdio-scanner-darwin-amd64-v6.4.2.zip - rdio-scanner-darwin-arm64-v6.4.2.zip - rdio-scanner-freebsd-amd64-v6.4.2.zip - rdio-scanner-linux-386-v6.4.2.zip - rdio-scanner-linux-amd64-v6.4.2.zip - rdio-scanner-linux-arm64-v6.4.2.zip - rdio-scanner-linux-arm-v6.4.2.zip - rdio-scanner-windows-amd64-v6.4.2.zip + rdio-scanner-darwin-amd64-v6.4.3.zip + rdio-scanner-darwin-arm64-v6.4.3.zip + rdio-scanner-freebsd-amd64-v6.4.3.zip + rdio-scanner-linux-386-v6.4.3.zip + rdio-scanner-linux-amd64-v6.4.3.zip + rdio-scanner-linux-arm64-v6.4.3.zip + rdio-scanner-linux-arm-v6.4.3.zip + rdio-scanner-windows-amd64-v6.4.3.zip **Happy Rdio scanning !** \ No newline at end of file diff --git a/Makefile b/Makefile index b494d13..b320bb6 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ ################################################################################ app := rdio-scanner -date := 2022/06/09 -ver := 6.4.2 +date := 2022/06/14 +ver := 6.4.3 client := $(wildcard client/*.json client/*.ts) server := $(wildcard server/*.go) diff --git a/client/package-lock.json b/client/package-lock.json index ad922eb..94cf9b0 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "rdio-scanner", - "version": "6.4.2", + "version": "6.4.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rdio-scanner", - "version": "6.4.2", + "version": "6.4.3", "license": "LICENSE", "dependencies": { "@angular/animations": "^13.3.10", diff --git a/client/package.json b/client/package.json index dc0aa88..2e918d9 100644 --- a/client/package.json +++ b/client/package.json @@ -38,5 +38,5 @@ "build": "ng build --base-href ./ --configuration production", "start": "ng serve" }, - "version": "6.4.2" + "version": "6.4.3" } diff --git a/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html b/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html index 188c531..6f6459a 100644 --- a/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html +++ b/client/src/app/components/rdio-scanner/admin/config/dir-watch/dir-watch.component.html @@ -75,7 +75,7 @@ Default Trunk Recorder - SDR Trunk + SDR Trunk (aliases tab only) diff --git a/docs/platforms/darwin.md b/docs/platforms/darwin.md index dddf70f..b031734 100644 --- a/docs/platforms/darwin.md +++ b/docs/platforms/darwin.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@macos ~ % mkdir rdio-scanner rdio@macos ~ % cd rdio-scanner rdio@macos rdio-scanner % unzip \ - > ~/Downloads/rdio-scanner-darwin-arm64-v6.4.2.zip - Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.4.2.zip + > ~/Downloads/rdio-scanner-darwin-arm64-v6.4.3.zip + Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.4.3.zip inflating: rdio-scanner inflating: rdio-scanner.pdf @@ -51,11 +51,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@macos rdio-scanner % ./rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 08:38:06 server started - 2022/06/09 08:38:06 main interface at http://macos.local:3000 - 2022/06/09 08:38:06 admin interface at http://macos.local:3000/admin + 2022/06/14 08:38:06 server started + 2022/06/14 08:38:06 main interface at http://macos.local:3000 + 2022/06/14 08:38:06 admin interface at http://macos.local:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -77,11 +77,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance rdio@macos rdio-scanner % ./rdio-scanner --listen :80 - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 08:48:03 server started - 2022/06/09 08:48:03 main interface at http://macos.local - 2022/06/09 08:48:03 admin interface at http://macos.local/admin + 2022/06/14 08:48:03 server started + 2022/06/14 08:48:03 main interface at http://macos.local + 2022/06/14 08:48:03 admin interface at http://macos.local/admin ## Listening on a SSL port @@ -95,12 +95,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_key_file mykey.key \ > -ssl_listen :443 - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 08:50:58 server started - 2022/06/09 08:50:58 main interface at http://macos.local - 2022/06/09 08:50:58 main interface at https://macos.local - 2022/06/09 08:50:58 admin interface at https://macos.local/admin + 2022/06/14 08:50:58 server started + 2022/06/14 08:50:58 main interface at http://macos.local + 2022/06/14 08:50:58 main interface at https://macos.local + 2022/06/14 08:50:58 admin interface at https://macos.local/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -118,7 +118,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y > -ssl_auto_cert mydomain.com \ > -ssl_listen :443 \ > -config_save - 2022/06/09 08:52:24 rdio-scanner.ini file created + 2022/06/14 08:52:24 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -132,12 +132,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an rdio@macos rdio-scanner % ./rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 08:54:08 server started - 2022/06/09 08:54:08 main interface at http://macos.local - 2022/06/09 08:54:08 main interface at https://macos.local - 2022/06/09 08:54:08 admin interface at https://macos.local/admin + 2022/06/14 08:54:08 server started + 2022/06/14 08:54:08 main interface at http://macos.local + 2022/06/14 08:54:08 main interface at https://macos.local + 2022/06/14 08:54:08 admin interface at https://macos.local/admin ## Install Rdio Scanner as a service diff --git a/docs/platforms/freebsd.md b/docs/platforms/freebsd.md index bd4b661..34ad40b 100644 --- a/docs/platforms/freebsd.md +++ b/docs/platforms/freebsd.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@pc-freebsd:~ $ mkdir rdio-scanner rdio@pc-freebsd:~ $ cd rdio-scanner rdio@pc-freebsd:~/rdio-scanner $ unzip \ - > ~/rdio-scanner-freebsd-amd64-v6.4.2.zip - Archive: ../rdio-scanner-freebsd-amd64-v6.4.2.zip + > ~/rdio-scanner-freebsd-amd64-v6.4.3.zip + Archive: ../rdio-scanner-freebsd-amd64-v6.4.3.zip extracting: rdio-scanner extracting: rdio-scanner.pdf @@ -51,11 +51,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 08:16:36 server started - 2022/06/09 08:16:36 main interface at http://pc-freebsd:3000 - 2022/06/09 08:16:36 admin interface at http://pc-freebsd:3000/admin + 2022/06/14 08:16:36 server started + 2022/06/14 08:16:36 main interface at http://pc-freebsd:3000 + 2022/06/14 08:16:36 admin interface at http://pc-freebsd:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -81,11 +81,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance Password: root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner -listen :80 - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 08:19:38 server started - 2022/06/09 08:19:38 main interface at http://pc-freebsd - 2022/06/09 08:19:38 admin interface at http://pc-freebsd/admin + 2022/06/14 08:19:38 server started + 2022/06/14 08:19:38 main interface at http://pc-freebsd + 2022/06/14 08:19:38 admin interface at http://pc-freebsd/admin ## Listening on a SSL port @@ -101,12 +101,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_key_file mykey.key \ > -ssl_listen :443 - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 10:34:29 server started - 2022/06/09 10:34:29 main interface at http://pc-freebsd - 2022/06/09 10:34:29 main interface at https://pc-freebsd - 2022/06/09 10:34:29 admin interface at https://pc-freebsd/admin + 2022/06/14 10:34:29 server started + 2022/06/14 10:34:29 main interface at http://pc-freebsd + 2022/06/14 10:34:29 main interface at https://pc-freebsd + 2022/06/14 10:34:29 admin interface at https://pc-freebsd/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -126,7 +126,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y > -ssl_auto_cert mydomain.com \ > -ssl_listen :443 \ > -config_save - 2022/06/09 10:37:00 rdio-scanner.ini file created + 2022/06/14 10:37:00 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -142,12 +142,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an Password: root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 10:38:28 server started - 2022/06/09 10:38:29 main interface at http://pc-freebsd - 2022/06/09 10:38:29 main interface at https://pc-freebsd - 2022/06/09 10:38:29 admin interface at https://pc-freebsd/admin + 2022/06/14 10:38:28 server started + 2022/06/14 10:38:29 main interface at http://pc-freebsd + 2022/06/14 10:38:29 main interface at https://pc-freebsd + 2022/06/14 10:38:29 admin interface at https://pc-freebsd/admin ## Install Rdio Scanner as a service diff --git a/docs/platforms/linux.md b/docs/platforms/linux.md index 78c2ace..83c60cf 100644 --- a/docs/platforms/linux.md +++ b/docs/platforms/linux.md @@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd [rdio@pc-linux ~]$ mkdir rdio-scanner [rdio@pc-linux ~]$ cd rdio-scanner [rdio@pc-linux rdio-scanner]$ unzip \ - > ~/Downloads/rdio-scanner-linux-amd64-v6.4.2.zip - Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.4.2.zip + > ~/Downloads/rdio-scanner-linux-amd64-v6.4.3.zip + Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.4.3.zip inflating: rdio-scanner inflating: rdio-scanner.pdf @@ -51,11 +51,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd [rdio@pc-linux rdio-scanner]$ ./rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 09:11:48 server started - 2022/06/09 09:11:48 main interface at http://pc-linux:3000 - 2022/06/09 09:11:48 admin interface at http://pc-linux:3000/admin + 2022/06/14 09:11:48 server started + 2022/06/14 09:11:48 main interface at http://pc-linux:3000 + 2022/06/14 09:11:48 admin interface at http://pc-linux:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -78,11 +78,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner -listen :80 [sudo] password for rdio: - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 09:14:00 server started - 2022/06/09 09:14:00 main interface at http://pc-linux - 2022/06/09 09:14:00 admin interface at http://pc-linux/admin + 2022/06/14 09:14:00 server started + 2022/06/14 09:14:00 main interface at http://pc-linux + 2022/06/14 09:14:00 admin interface at http://pc-linux/admin ## Listening on a SSL port @@ -97,12 +97,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer > -ssl_listen :443 [sudo] password for rdio: - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 09:16:47 server started - 2022/06/09 09:16:47 main interface at http://pc-linux - 2022/06/09 09:16:47 main interface at https://pc-linux - 2022/06/09 09:16:47 admin interface at https://pc-linux/admin + 2022/06/14 09:16:47 server started + 2022/06/14 09:16:47 main interface at http://pc-linux + 2022/06/14 09:16:47 main interface at https://pc-linux + 2022/06/14 09:16:47 admin interface at https://pc-linux/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -120,7 +120,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y > -ssl_auto_cert mydomain.com \ > -ssl_listen :443 \ > -config_save - 2022/06/09 09:19:29 rdio-scanner.ini file created + 2022/06/14 09:19:29 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -135,12 +135,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner [sudo] Mot de passe de rdio : - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 09:20:40 server started - 2022/06/09 09:20:40 main interface at http://pc-linux - 2022/06/09 09:20:40 main interface at https://pc-linux - 2022/06/09 09:20:40 admin interface at https://pc-linux/admin + 2022/06/14 09:20:40 server started + 2022/06/14 09:20:40 main interface at http://pc-linux + 2022/06/14 09:20:40 main interface at https://pc-linux + 2022/06/14 09:20:40 admin interface at https://pc-linux/admin ## Install Rdio Scanner as a service diff --git a/docs/platforms/windows.md b/docs/platforms/windows.md index c95b553..36a03ed 100644 --- a/docs/platforms/windows.md +++ b/docs/platforms/windows.md @@ -44,7 +44,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd C:\Users\rdio> cd rdio-scanner C:\Users\rdio\rdio-scanner> tar -xvf ^ - ..\downloads\rdio-scanner-windows-amd64-v6.4.2.zip + ..\downloads\rdio-scanner-windows-amd64-v6.4.3.zip x rdio-scanner.exe x rdio-scanner.pdf @@ -52,11 +52,11 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd C:\Users\rdio\rdio-scanner>rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 13:48:48 server started - 2022/06/09 13:48:48 main interface at http://pc-windows:3000 - 2022/06/09 13:48:48 admin interface at http://pc-windows:3000/admin + 2022/06/14 13:48:48 server started + 2022/06/14 13:48:48 main interface at http://pc-windows:3000 + 2022/06/14 13:48:48 admin interface at http://pc-windows:3000/admin 4. Access the administrative dashboard to finalize the configuration. @@ -78,11 +78,11 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance C:\Users\rdio\rdio-scanner>rdio-scanner -listen :80 - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 10:53:31 server started - 2022/06/09 10:53:31 main interface at http://pc-windows - 2022/06/09 10:53:31 admin interface at http://pc-windows/admin + 2022/06/14 10:53:31 server started + 2022/06/14 10:53:31 main interface at http://pc-windows + 2022/06/14 10:53:31 admin interface at http://pc-windows/admin ## Listening on a SSL port @@ -96,12 +96,12 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer -ssl_key_file meykey.key ^ -ssl_listen :443 - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 11:05:43 server started - 2022/06/09 11:05:43 main interface at http://pc-windows - 2022/06/09 11:05:43 main interface at https://pc-windows - 2022/06/09 11:05:43 admin interface at https://pc-windows/admin + 2022/06/14 11:05:43 server started + 2022/06/14 11:05:43 main interface at http://pc-windows + 2022/06/14 11:05:43 main interface at https://pc-windows + 2022/06/14 11:05:43 admin interface at https://pc-windows/admin If you don't want to worry about SSL certificates, you can use the built-in Let's Encrypt auto-cert feature. This requires that you have both port 80 (HTTP) and port 443 (HTTPS) open to the world. Also, your domain name should point to your IP address where [Rdio Scanner](https://github.com/chuot/rdio-scanner/) is running. The advantage of this approach is that everything is done automatically, no certificate request, no certificate renewal. @@ -119,7 +119,7 @@ You don't want to have to type everytime a long list of arguments. No problem, y -ssl_auto_cert mydomain.com ^ -ssl_listen :443 ^ -config_save - 2022/06/09 11:08:28 rdio-scanner.ini file created + 2022/06/14 11:08:28 rdio-scanner.ini file created All of your parameters passed as arguments to [Rdio Scanner](https://github.com/chuot/rdio-scanner) have been saved to an INI file which has the same arguments/values list. @@ -133,12 +133,12 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an C:\Users\rdio\rdio-scanner>rdio-scanner - Rdio Scanner v6.4.2 + Rdio Scanner v6.4.3 ---------------------------------- - 2022/06/09 11:11:28 server started - 2022/06/09 11:11:28 main interface at http://pc-windows - 2022/06/09 11:11:28 main interface at https://pc-windows - 2022/06/09 11:11:28 admin interface at https://pc-windows/admin + 2022/06/14 11:11:28 server started + 2022/06/14 11:11:28 main interface at http://pc-windows + 2022/06/14 11:11:28 main interface at https://pc-windows + 2022/06/14 11:11:28 admin interface at https://pc-windows/admin \pagebreak{} diff --git a/server/client.go b/server/client.go index 7210af2..0db221a 100644 --- a/server/client.go +++ b/server/client.go @@ -63,10 +63,6 @@ func (client *Client) Init(controller *Controller, request *http.Request, conn * client.Send = make(chan *Message) client.request = request - controller.Register <- client - - controller.Logs.LogEvent(LogLevelInfo, fmt.Sprintf("new listener from ip %v", client.GetRemoteAddr())) - go func() { defer func() { recover() @@ -152,6 +148,10 @@ func (client *Client) Init(controller *Controller, request *http.Request, conn * } }() + controller.Register <- client + + controller.Logs.LogEvent(LogLevelInfo, fmt.Sprintf("new listener from ip %v", client.GetRemoteAddr())) + return nil } diff --git a/server/go.mod b/server/go.mod index 291bacc..68adfdc 100644 --- a/server/go.mod +++ b/server/go.mod @@ -20,16 +20,15 @@ require ( github.com/mattn/go-isatty v0.0.14 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/stretchr/testify v1.7.0 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect golang.org/x/text v0.3.7 // indirect - golang.org/x/tools v0.1.10 // indirect - golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect + golang.org/x/tools v0.1.11 // indirect lukechampine.com/uint128 v1.2.0 // indirect modernc.org/cc/v3 v3.36.0 // indirect modernc.org/ccgo/v3 v3.16.6 // indirect - modernc.org/libc v1.16.8 // indirect + modernc.org/libc v1.16.10 // indirect modernc.org/mathutil v1.4.1 // indirect modernc.org/memory v1.1.1 // indirect modernc.org/opt v0.1.3 // indirect diff --git a/server/go.sum b/server/go.sum index c5d0e96..c780b72 100644 --- a/server/go.sum +++ b/server/go.sum @@ -41,8 +41,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -66,8 +66,9 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -78,14 +79,12 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= +golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= -golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -109,8 +108,8 @@ modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwco modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= modernc.org/libc v1.16.7/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= -modernc.org/libc v1.16.8 h1:Ux98PaOMvolgoFX/YwusFOHBnanXdGRmWgI8ciI2z4o= -modernc.org/libc v1.16.8/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= +modernc.org/libc v1.16.10 h1:SRBpcdFf2eYY6B+MAJ4B5SbstLkd2y58ljZTLmAPLxU= +modernc.org/libc v1.16.10/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= diff --git a/server/version.go b/server/version.go index 85631fa..2044d08 100644 --- a/server/version.go +++ b/server/version.go @@ -15,4 +15,4 @@ package main -const Version = "6.4.2" +const Version = "6.4.3"