Archive/rdio-scanner
1
0
Fork 0
mirror of https://github.com/chuot/rdio-scanner.git synced 2026-08-16 01:43:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Version 6.2.2

Browse source
This commit is contained in:
Chrystian Huot 2022-03-25 14:40:12 -04:00
parent dd169d83a4
commit 5921f2fb96
11 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -11,6 +11,10 @@ _v6.2.1_
- Fix SIGSEGV error in Units.Merge (issue #151). - Fix SIGSEGV error in Units.Merge (issue #151).
_v6.2.2_
- Fix another SIGSEGV error in Units.Merge (issue #151).
## Version 6.1 ## Version 6.1
- Calls now support patched talkgroups. - Calls now support patched talkgroups.

16
COMPILING.md
View file

@ -26,13 +26,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. When finished, you will find the precompiled versions for various platforms in the `dist` folder.
rdio-scanner-darwin-amd64-v6.2.1.zip rdio-scanner-darwin-amd64-v6.2.2.zip
rdio-scanner-darwin-arm64-v6.2.1.zip rdio-scanner-darwin-arm64-v6.2.2.zip
rdio-scanner-freebsd-amd64-v6.2.1.zip rdio-scanner-freebsd-amd64-v6.2.2.zip
rdio-scanner-linux-386-v6.2.1.zip rdio-scanner-linux-386-v6.2.2.zip
rdio-scanner-linux-amd64-v6.2.1.zip rdio-scanner-linux-amd64-v6.2.2.zip
rdio-scanner-linux-arm64-v6.2.1.zip rdio-scanner-linux-arm64-v6.2.2.zip
rdio-scanner-linux-arm-v6.2.1.zip rdio-scanner-linux-arm-v6.2.2.zip
rdio-scanner-windows-amd64-v6.2.1.zip rdio-scanner-windows-amd64-v6.2.2.zip
**Happy Rdio scanning !** **Happy Rdio scanning !**

2
Makefile
View file

@ -17,7 +17,7 @@
app := rdio-scanner app := rdio-scanner
date := 2022/03/25 date := 2022/03/25
ver := 6.2.1 ver := 6.2.2
client := $(wildcard client/*.json client/*.ts) client := $(wildcard client/*.json client/*.ts)
server := $(wildcard server/*.go) server := $(wildcard server/*.go)

2
client/package.json
View file

@ -38,5 +38,5 @@
"build": "ng build --base-href ./ --configuration production", "build": "ng build --base-href ./ --configuration production",
"start": "ng serve" "start": "ng serve"
}, },
"version": "6.2.1" "version": "6.2.2"
} }

12
docs/platforms/darwin.md
View file

@ -42,8 +42,8 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
rdio@macos ~ % mkdir rdio-scanner rdio@macos ~ % mkdir rdio-scanner
rdio@macos ~ % cd rdio-scanner rdio@macos ~ % cd rdio-scanner
rdio@macos rdio-scanner % unzip \ rdio@macos rdio-scanner % unzip \
> ~/Downloads/rdio-scanner-darwin-arm64-v6.2.1.zip > ~/Downloads/rdio-scanner-darwin-arm64-v6.2.2.zip
Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.2.1.zip Archive: /Users/rdio/Downloads/rdio-scanner-darwin-arm64-v6.2.2.zip
inflating: rdio-scanner inflating: rdio-scanner
inflating: rdio-scanner.pdf inflating: rdio-scanner.pdf
@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
rdio@macos rdio-scanner % ./rdio-scanner rdio@macos rdio-scanner % ./rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 08:38:06 server started 2022/03/25 08:38:06 server started
2022/03/25 08:38:06 main interface at http://macos.local:3000 2022/03/25 08:38:06 main interface at http://macos.local:3000
@ -77,7 +77,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
rdio@macos rdio-scanner % ./rdio-scanner --listen :80 rdio@macos rdio-scanner % ./rdio-scanner --listen :80
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 08:48:03 server started 2022/03/25 08:48:03 server started
2022/03/25 08:48:03 main interface at http://macos.local 2022/03/25 08:48:03 main interface at http://macos.local
@ -95,7 +95,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
> -ssl_key_file mykey.key \ > -ssl_key_file mykey.key \
> -ssl_listen :443 > -ssl_listen :443
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 08:50:58 server started 2022/03/25 08:50:58 server started
2022/03/25 08:50:58 main interface at http://macos.local 2022/03/25 08:50:58 main interface at http://macos.local
@ -132,7 +132,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
rdio@macos rdio-scanner % ./rdio-scanner rdio@macos rdio-scanner % ./rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 08:54:08 server started 2022/03/25 08:54:08 server started
2022/03/25 08:54:08 main interface at http://macos.local 2022/03/25 08:54:08 main interface at http://macos.local

12
docs/platforms/freebsd.md
View file

@ -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:~ $ mkdir rdio-scanner
rdio@pc-freebsd:~ $ cd rdio-scanner rdio@pc-freebsd:~ $ cd rdio-scanner
rdio@pc-freebsd:~/rdio-scanner $ unzip \ rdio@pc-freebsd:~/rdio-scanner $ unzip \
> ~/rdio-scanner-freebsd-amd64-v6.2.1.zip > ~/rdio-scanner-freebsd-amd64-v6.2.2.zip
Archive: ../rdio-scanner-freebsd-amd64-v6.2.1.zip Archive: ../rdio-scanner-freebsd-amd64-v6.2.2.zip
extracting: rdio-scanner extracting: rdio-scanner
extracting: rdio-scanner.pdf extracting: rdio-scanner.pdf
@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner rdio@pc-freebsd:~/rdio-scanner $ ./rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 08:16:36 server started 2022/03/25 08:16:36 server started
2022/03/25 08:16:36 main interface at http://pc-freebsd:3000 2022/03/25 08:16:36 main interface at http://pc-freebsd:3000
@ -81,7 +81,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
Password: Password:
root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner -listen :80 root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner -listen :80
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 08:19:38 server started 2022/03/25 08:19:38 server started
2022/03/25 08:19:38 main interface at http://pc-freebsd 2022/03/25 08:19:38 main interface at http://pc-freebsd
@ -101,7 +101,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
> -ssl_key_file mykey.key \ > -ssl_key_file mykey.key \
> -ssl_listen :443 > -ssl_listen :443
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 10:34:29 server started 2022/03/25 10:34:29 server started
2022/03/25 10:34:29 main interface at http://pc-freebsd 2022/03/25 10:34:29 main interface at http://pc-freebsd
@ -142,7 +142,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
Password: Password:
root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner root@pc-freebsd:/home/rdio/rdio-scanner # ./rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 10:38:28 server started 2022/03/25 10:38:28 server started
2022/03/25 10:38:29 main interface at http://pc-freebsd 2022/03/25 10:38:29 main interface at http://pc-freebsd

12
docs/platforms/linux.md
View file

@ -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 ~]$ mkdir rdio-scanner
[rdio@pc-linux ~]$ cd rdio-scanner [rdio@pc-linux ~]$ cd rdio-scanner
[rdio@pc-linux rdio-scanner]$ unzip \ [rdio@pc-linux rdio-scanner]$ unzip \
> ~/Downloads/rdio-scanner-linux-amd64-v6.2.1.zip > ~/Downloads/rdio-scanner-linux-amd64-v6.2.2.zip
Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.2.1.zip Archive: /home/rdio/Downloads/rdio-scanner-linux-amd64-v6.2.2.zip
inflating: rdio-scanner inflating: rdio-scanner
inflating: rdio-scanner.pdf inflating: rdio-scanner.pdf
@ -51,7 +51,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
[rdio@pc-linux rdio-scanner]$ ./rdio-scanner [rdio@pc-linux rdio-scanner]$ ./rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 09:11:48 server started 2022/03/25 09:11:48 server started
2022/03/25 09:11:48 main interface at http://pc-linux:3000 2022/03/25 09:11:48 main interface at http://pc-linux:3000
@ -78,7 +78,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
[rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner -listen :80 [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner -listen :80
[sudo] password for rdio: [sudo] password for rdio:
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 09:14:00 server started 2022/03/25 09:14:00 server started
2022/03/25 09:14:00 main interface at http://pc-linux 2022/03/25 09:14:00 main interface at http://pc-linux
@ -97,7 +97,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
> -ssl_listen :443 > -ssl_listen :443
[sudo] password for rdio: [sudo] password for rdio:
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 09:16:47 server started 2022/03/25 09:16:47 server started
2022/03/25 09:16:47 main interface at http://pc-linux 2022/03/25 09:16:47 main interface at http://pc-linux
@ -135,7 +135,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
[rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner [rdio@pc-linux rdio-scanner]$ sudo ./rdio-scanner
[sudo] Mot de passe de rdio : [sudo] Mot de passe de rdio :
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 09:20:40 server started 2022/03/25 09:20:40 server started
2022/03/25 09:20:40 main interface at http://pc-linux 2022/03/25 09:20:40 main interface at http://pc-linux

10
docs/platforms/windows.md
View file

@ -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> cd rdio-scanner
C:\Users\rdio\rdio-scanner> tar -xvf ^ C:\Users\rdio\rdio-scanner> tar -xvf ^
..\downloads\rdio-scanner-windows-amd64-v6.2.1.zip ..\downloads\rdio-scanner-windows-amd64-v6.2.2.zip
x rdio-scanner.exe x rdio-scanner.exe
x rdio-scanner.pdf x rdio-scanner.pdf
@ -52,7 +52,7 @@ ALWAYS DOWNLOAD THE LATEST VERSION OF [RDIO SCANNER](https://github.com/chuot/rd
C:\Users\rdio\rdio-scanner>rdio-scanner C:\Users\rdio\rdio-scanner>rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 13:48:48 server started 2022/03/25 13:48:48 server started
2022/03/25 13:48:48 main interface at http://pc-windows:3000 2022/03/25 13:48:48 main interface at http://pc-windows:3000
@ -78,7 +78,7 @@ Here we want our [Rdio Scanner](https://guthub.com/chuot/rdio-scanner) instance
C:\Users\rdio\rdio-scanner>rdio-scanner -listen :80 C:\Users\rdio\rdio-scanner>rdio-scanner -listen :80
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 10:53:31 server started 2022/03/25 10:53:31 server started
2022/03/25 10:53:31 main interface at http://pc-windows 2022/03/25 10:53:31 main interface at http://pc-windows
@ -96,7 +96,7 @@ You can use your own SSL certificates that match your domain name with `-ssl_cer
-ssl_key_file meykey.key ^ -ssl_key_file meykey.key ^
-ssl_listen :443 -ssl_listen :443
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 11:05:43 server started 2022/03/25 11:05:43 server started
2022/03/25 11:05:43 main interface at http://pc-windows 2022/03/25 11:05:43 main interface at http://pc-windows
@ -133,7 +133,7 @@ Then simply run [Rdio Scanner](https://github.com/chuot/rdio-scanner) without an
C:\Users\rdio\rdio-scanner>rdio-scanner C:\Users\rdio\rdio-scanner>rdio-scanner
Rdio Scanner v6.2.1 Rdio Scanner v6.2.2
---------------------------------- ----------------------------------
2022/03/25 11:11:28 server started 2022/03/25 11:11:28 server started
2022/03/25 11:11:28 main interface at http://pc-windows 2022/03/25 11:11:28 main interface at http://pc-windows

5
server/controller.go
View file

@ -314,10 +314,9 @@ func (controller *Controller) IngestCall(call *Call) {
switch v := call.units.(type) { switch v := call.units.(type) {
case *Units: case *Units:
populated = true populated = true
if system.Units == nil { if v != nil {
system.Units = NewUnits() system.Units.Merge(v)
} }
system.Units.Merge(v)
} }
} }

14
server/parsers.go
View file

@ -49,7 +49,7 @@ func ParseSdrTrunkMeta(call *Call, controller *Controller) error {
if i > 0 { if i > 0 {
call.Source = uint(i) call.Source = uint(i)
if len(s) == 3 { if len(s) == 3 && len(s[2]) > 0 {
if call.units == nil { if call.units == nil {
call.units = NewUnits() call.units = NewUnits()
} }
@ -255,7 +255,10 @@ func ParseMultipartContent(call *Call, p *multipart.Part, b []byte) {
if units == nil { if units == nil {
units = NewUnits() units = NewUnits()
} }
units.Add(uint(s), t) switch units := call.units.(type) {
case *Units:
units.Add(uint(s), t)
}
} }
} }
} }
@ -400,13 +403,12 @@ func ParseTrunkRecorderMeta(call *Call, b []byte) error {
switch t := v["tag"].(type) { switch t := v["tag"].(type) {
case string: case string:
if len(t) > 0 { if len(t) > 0 {
if call.units == nil {
call.units = NewUnits()
}
switch v := call.units.(type) { switch v := call.units.(type) {
case *Units: case *Units:
v.Add(uint(s), t) v.Add(uint(s), t)
default:
var u = NewUnits()
u.Add(uint(s), t)
call.units = u
} }
} }
} }

2
server/version.go
View file

@ -15,4 +15,4 @@
package main package main
const Version = "6.2.1" const Version = "6.2.2"