YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp protocol: implement write_bytes for individual request types

Browse source
This commit is contained in:
Joakim Frostegård 2024-01-29 19:42:56 +01:00
parent 1c59972834
commit 41efa151af
1 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/udp_protocol/src/request.rs
View file

@ -19,27 +19,12 @@ pub enum Request {
} }
impl Request { impl Request {
pub fn write_bytes(self, bytes: &mut impl Write) -> Result<(), io::Error> { pub fn write_bytes(&self, bytes: &mut impl Write) -> Result<(), io::Error> {
match self { match self {
Request::Connect(r) => { Request::Connect(r) => r.write_bytes(bytes),
bytes.write_i64::<NetworkEndian>(PROTOCOL_IDENTIFIER)?; Request::Announce(r) => r.write_bytes(bytes),
bytes.write_i32::<NetworkEndian>(0)?; Request::Scrape(r) => r.write_bytes(bytes),
bytes.write_all(r.transaction_id.as_bytes())?;
} }
Request::Announce(r) => {
bytes.write_all(r.as_bytes())?;
}
Request::Scrape(r) => {
bytes.write_all(r.connection_id.as_bytes())?;
bytes.write_i32::<NetworkEndian>(2)?;
bytes.write_all(r.transaction_id.as_bytes())?;
bytes.write_all((*r.info_hashes.as_slice()).as_bytes())?;
}
}
Ok(())
} }
pub fn parse_bytes(bytes: &[u8], max_scrape_torrents: u8) -> Result<Self, RequestParseError> { pub fn parse_bytes(bytes: &[u8], max_scrape_torrents: u8) -> Result<Self, RequestParseError> {
@ -150,6 +135,16 @@ pub struct ConnectRequest {
pub transaction_id: TransactionId, pub transaction_id: TransactionId,
} }
impl ConnectRequest {
pub fn write_bytes(&self, bytes: &mut impl Write) -> Result<(), io::Error> {
bytes.write_i64::<NetworkEndian>(PROTOCOL_IDENTIFIER)?;
bytes.write_i32::<NetworkEndian>(0)?;
bytes.write_all(self.transaction_id.as_bytes())?;
Ok(())
}
}
#[derive(PartialEq, Eq, Clone, Debug, AsBytes, FromBytes, FromZeroes)] #[derive(PartialEq, Eq, Clone, Debug, AsBytes, FromBytes, FromZeroes)]
#[repr(C, packed)] #[repr(C, packed)]
pub struct AnnounceRequest { pub struct AnnounceRequest {
@ -170,6 +165,12 @@ pub struct AnnounceRequest {
pub port: Port, pub port: Port,
} }
impl AnnounceRequest {
pub fn write_bytes(&self, bytes: &mut impl Write) -> Result<(), io::Error> {
bytes.write_all(self.as_bytes())
}
}
/// Note: Request::from_bytes only creates this struct with value 1 /// Note: Request::from_bytes only creates this struct with value 1
#[derive(PartialEq, Eq, Clone, Copy, Debug, AsBytes, FromBytes, FromZeroes)] #[derive(PartialEq, Eq, Clone, Copy, Debug, AsBytes, FromBytes, FromZeroes)]
#[repr(transparent)] #[repr(transparent)]
@ -223,6 +224,17 @@ pub struct ScrapeRequest {
pub info_hashes: Vec<InfoHash>, pub info_hashes: Vec<InfoHash>,
} }
impl ScrapeRequest {
pub fn write_bytes(&self, bytes: &mut impl Write) -> Result<(), io::Error> {
bytes.write_all(self.connection_id.as_bytes())?;
bytes.write_i32::<NetworkEndian>(2)?;
bytes.write_all(self.transaction_id.as_bytes())?;
bytes.write_all((*self.info_hashes.as_slice()).as_bytes())?;
Ok(())
}
}
#[derive(Debug)] #[derive(Debug)]
pub enum RequestParseError { pub enum RequestParseError {
Sendable { Sendable {