Arav/dwelling-upload
1
0
Fork 0
Code Releases 12 Activity

ParseAddrPort replaced with ParseAddr. Removed !ap.IsValid() since it is already done in ParseAddr. Also there is no need to additionally check if an address is IPv6. If address is neither v4 or v6, then ParseAddr will return an error.

Browse Source
This commit is contained in:
Alexander Andreev 2023-05-26 17:25:36 +04:00
parent d94030a4e8
commit 345869608e
Signed by: Arav
GPG Key ID: D22A817D95815393
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/dwelling-upload/main.go
View File

@ -45,16 +45,14 @@ func main() {
network = "unix" network = "unix"
defer os.Remove(*listenAddress) defer os.Remove(*listenAddress)
} else { } else {
ap, err := netip.ParseAddrPort(*listenAddress) ap, err := netip.ParseAddr(*listenAddress)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)
} else if !ap.IsValid() {
log.Fatalln(*listenAddress, "is not valid")
} }
if ap.Addr().Is4() { if ap.Is4() {
network = "tcp4" network = "tcp4"
} else if ap.Addr().Is6() { } else {
network = "tcp6" network = "tcp6"
} }
} }
@ -90,7 +88,7 @@ func main() {
log.Fatalf("failed to get initial size of %s: %s", *uploadDir, err) log.Fatalf("failed to get initial size of %s: %s", *uploadDir, err)
} }
watcha.WatchForMask(uploadDirNotify, watcher.CrDelMask) go watcha.WatchForMask(uploadDirNotify, watcher.CrDelMask)
hand := http.NewUploadHandlers(logFile, *uploadDir, &uploadDirSize, string(hashSalt), hand := http.NewUploadHandlers(logFile, *uploadDir, &uploadDirSize, string(hashSalt),
*keepForHours, *storageSize, *fileSizeLimit) *keepForHours, *storageSize, *fileSizeLimit)