VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-16 07:45:22 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #987 from ChiefGokhlayeh/pr/#986

Browse Source 
Random bytes appended to rescuesdriq output and wrong timestamp
This commit is contained in:
Edouard Griffiths 2021-08-19 01:46:15 +02:00 committed by GitHub
commit 7bd741ab3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rescuesdriq/rescuesdriq.go
View File

@ -84,18 +84,15 @@ func copyContent(reader *bufio.Reader, writer *bufio.Writer, blockSize uint) {
for { for {
n, err := reader.Read(p) n, err := reader.Read(p)
if err != nil { if err == nil || err == io.EOF {
if err == io.EOF {
writer.Write(p[0:n]) writer.Write(p[0:n])
sz += int64(n) sz += int64(n)
break if err == io.EOF {
} else {
fmt.Println("An error occurred during content copy. Aborting")
break break
} }
} else { } else {
writer.Write(p) fmt.Println("An error occurred during content copy. Aborting")
sz += int64(blockSize) * 4096 break
} }
fmt.Printf("Wrote %d bytes\r", sz) fmt.Printf("Wrote %d bytes\r", sz)
@ -133,6 +130,11 @@ func main() {
// make a read buffer // make a read buffer
reader := bufio.NewReader(fi) reader := bufio.NewReader(fi)
var headerOrigin HeaderStd = analyze(reader) var headerOrigin HeaderStd = analyze(reader)
if !*assumeMilliseconds {
headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Second) / int64(time.Millisecond))
}
printHeader(&headerOrigin) printHeader(&headerOrigin)
if flagSeen["out"] { if flagSeen["out"] {
@ -160,8 +162,6 @@ func main() {
} }
} else if *timeNow { } else if *timeNow {
headerOrigin.StartTimestamp = int64(time.Now().UnixNano() / int64(time.Millisecond)) headerOrigin.StartTimestamp = int64(time.Now().UnixNano() / int64(time.Millisecond))
} else if !*assumeMilliseconds {
headerOrigin.StartTimestamp = headerOrigin.StartTimestamp * (int64(time.Millisecond) / int64(time.Second))
} }
fmt.Println("\nHeader is now") fmt.Println("\nHeader is now")