leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #123 from ikatson/dev

Browse source 
Bugfix: on 32 bit systems files > 4gb
This commit is contained in:
Igor Katson 2024-04-24 02:04:49 +04:00 • committed by GitHub
commit 0fd7b42367
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -69,7 +69,7 @@ release-linux-current-target:
cargo build --profile release-github --target=$(TARGET) --features=openssl-vendored cargo build --profile release-github --target=$(TARGET) --features=openssl-vendored
@PHONY: release-linux @PHONY: release-linux
release-linux: release-linux-x86_64 release-linux-aarch64 release-linux-armv6 release-linux-armv7 release-linux: release-linux-x86_64 release-linux-aarch64 release-linux-armv6 release-linux-armv7 release-linux-armv7-musl
@PHONY: release-linux-x86_64 @PHONY: release-linux-x86_64
release-linux-x86_64: release-linux-x86_64:
@ -105,6 +105,14 @@ release-linux-armv7:
CROSS_COMPILE_PREFIX=armv7-linux-gnueabihf \ CROSS_COMPILE_PREFIX=armv7-linux-gnueabihf \
$(MAKE) release-linux-current-target $(MAKE) release-linux-current-target
@PHONY: release-linux-armv7-musl
release-linux-armv7-musl:
TARGET=armv7-unknown-linux-musleabihf \
TARGET_SNAKE_CASE=armv7_unknown_linux_musleabihf \
TARGET_SNAKE_UPPER_CASE=ARMV7_UNKNOWN_LINUX_MUSLEABIHF \
CROSS_COMPILE_PREFIX=armv7-linux-musleabihf \
$(MAKE) release-linux-current-target
@PHONY: release-all @PHONY: release-all
release-all: release-windows release-linux release-macos-universal release-all: release-windows release-linux release-macos-universal

2
crates/librqbit/src/file_ops.rs
View file

@ -385,7 +385,7 @@ impl<'a> FileOps<'a> {
} }
let remaining_len = file_len - absolute_offset; let remaining_len = file_len - absolute_offset;
let to_write = std::cmp::min(buf.len(), remaining_len as usize); let to_write = std::cmp::min(buf.len() as u64, remaining_len) as usize;
let mut file_g = self.files[file_idx].file.lock(); let mut file_g = self.files[file_idx].file.lock();
trace!( trace!(

12
crates/librqbit/src/session.rs
View file

@ -828,7 +828,11 @@ impl Session {
let peer_rx = self.make_peer_rx( let peer_rx = self.make_peer_rx(
info_hash, info_hash,
magnet.trackers.clone(), if opts.disable_trackers {
Default::default()
} else {
magnet.trackers.clone()
},
announce_port, announce_port,
opts.force_tracker_interval, opts.force_tracker_interval,
)?; )?;
@ -897,7 +901,11 @@ impl Session {
} else { } else {
self.make_peer_rx( self.make_peer_rx(
torrent.info_hash, torrent.info_hash,
trackers.clone(), if opts.disable_trackers {
Default::default()
} else {
trackers.clone()
},
announce_port, announce_port,
opts.force_tracker_interval, opts.force_tracker_interval,
)? )?