daxvena/elemeld - Change 42CBEYZTGKPTDFNBTNCBUWWCABZOMBY3FCWWHUILQIGO2M54OJXQC

ip

Created by daxvena on August 28, 2020

42CBEYZTGKPTDFNBTNCBUWWCABZOMBY3FCWWHUILQIGO2M54OJXQC

Dependencies

In channels

main

Change contents

Insertion in Cargo.lock at line 25 [3.34]

[3.805]

[4.532]

name = "async-trait"
version = "0.1.39"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a973ceb857cff7575b825fe4c5fae998a797bc51be8bff06922e4762ac80ab46"
dependencies = [
 "proc-macro2",
 "quote",
 "syn",
]
[[package]]

Insertion in Cargo.lock at line 57 [3.34]

[4.916]

[5.612]


[[package]]
name = "bincode"
version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f30d3a39baa26f9651f17b375061f3233dde33424a8b72b0dbe93a68a0bc896d"
dependencies = [
 "byteorder",
 "serde",
]
[[package]]
name = "bitflags"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"

Insertion in Cargo.lock at line 86 [3.34]

[3.1144]

[4.1104]

name = "byteorder"
version = "1.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
[[package]]
name = "bytes"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
[[package]]

Insertion in Cargo.lock at line 159 [3.34]
[4.1964]
[4.1964]
```
 "async-trait",
 "bincode",
```
Insertion in Cargo.lock at line 168 [3.34]
[4.2051]
[2.218]
```
 "tokio",
```

Insertion in Cargo.lock at line 186 [3.34]

[3.1947]

[4.2228]

name = "fuchsia-zircon"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
dependencies = [
 "bitflags",
 "fuchsia-zircon-sys",
]
[[package]]
name = "fuchsia-zircon-sys"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "futures-core"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399"
[[package]]

Insertion in Cargo.lock at line 273 [3.34]

[4.3235]

[3.4605]

]
[[package]]
name = "iovec"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
dependencies = [
 "libc",

Insertion in Cargo.lock at line 289 [3.34]

[4.3347]

[3.4717]


[[package]]
name = "kernel32-sys"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
dependencies = [
 "winapi 0.2.8",
 "winapi-build",
]

Insertion in Cargo.lock at line 332 [3.34]

[4.3934]

[6.846]


[[package]]
name = "mio"
version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430"
dependencies = [
 "cfg-if",
 "fuchsia-zircon",
 "fuchsia-zircon-sys",
 "iovec",
 "kernel32-sys",
 "libc",
 "log",
 "miow",
 "net2",
 "slab",
 "winapi 0.2.8",
]
[[package]]
name = "miow"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
dependencies = [
 "kernel32-sys",
 "net2",
 "winapi 0.2.8",
 "ws2_32-sys",
]

Insertion in Cargo.lock at line 365 [3.34]

[6.859]

[4.3935]

name = "net2"
version = "0.2.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
dependencies = [
 "cfg-if",
 "libc",
 "winapi 0.3.9",
]
[[package]]
name = "pin-project-lite"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "282adbf10f2698a7a77f8e983a74b2d18176c19a7fd32a45446139ae7b02b715"
[[package]]

Insertion in Cargo.lock at line 490 [3.34]

[7.1647]

[4.5663]

name = "slab"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
[[package]]

Insertion in Cargo.lock at line 525 [3.34]

[6.1418]

[4.6107]

name = "tokio"
version = "0.2.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd"
dependencies = [
 "bytes",
 "futures-core",
 "lazy_static",
 "mio",
 "pin-project-lite",
]
[[package]]

Insertion in Cargo.lock at line 564 [3.34]

[4.6655]

[3.6917]


[[package]]
name = "winapi-build"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"

Insertion in Cargo.lock at line 591 [3.34]

[4.7126]

[2.230]


[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
dependencies = [
 "winapi 0.2.8",
 "winapi-build",
]

Insertion in Cargo.toml at line 8 [8.18912]
[8.19021]
[4.7145]
```
async-trait = "0.1"
bincode = "1.3"
```

Insertion in Cargo.toml at line 17 [8.18912]

[4.7297]

[2.411]

tokio = { version = "0.2", features = ["udp", "stream"] }

Insertion in src/io.rs at line 3 [9.11]
[4.8213]
[4.8213]
```
use async_trait::async_trait;
```
Deletion in src/io.rs at line 7 [9.11]
∅:D[10.3915] → [11.10899:10925]
B:BD[11.10899] → [11.10899:10925]
```
use std::net::SocketAddr;
```
Insertion in src/io.rs at line 19 [9.11]
[9.314]
[11.11019]
```
#[async_trait]
```

Replacement in src/io.rs at line 21 [9.11]

B:BD[11.11044] → [7.7619:7776]

∅:D[7.7776] → [10.4071:4142]

B:BD[10.4071] → [10.4071:4142]

    fn send_to(&self, event: &NetEvent, addr: &SocketAddr) -> io::Result<Option<()>>;
    fn send_to_all(&self, event: &NetEvent) -> io::Result<Option<()>>;
    fn recv_from(&self) -> io::Result<Option<(NetEvent, SocketAddr)>>;

[11.11044]

[12.356]

    type Addr;
    async fn send_to(&mut self, event: &NetEvent, addr: &Self::Addr) -> io::Result<()>;
    async fn send_to_all(&mut self, event: &NetEvent) -> io::Result<()>;
    async fn recv_from(&mut self) -> io::Result<(NetEvent, Self::Addr)>;

Replacement in src/ip.rs at line 1 [11.11607]
B:BD[11.11607] → [10.4206:4217]
```
use io::*;
```
[11.11607]
[11.11638]
```
use crate::io::*;
```

Replacement in src/ip.rs at line 3 [11.11607]

B:BD[11.11639] → [10.4218:4255]

B:BD[10.4255] → [5.1101:1151]

use mio::*;
use mio::udp::UdpSocket;
use bincode::{serde as bincode_serde, SizeLimit};

[11.11639]

[11.11664]

use async_trait::async_trait;
use log::debug;
use tokio::net::UdpSocket;

Replacement in src/ip.rs at line 8 [11.11607]

B:BD[10.4269] → [10.4269:4325]

use std::net::{SocketAddr, SocketAddrV4, SocketAddrV6};

[10.4269]

[11.11752]

use std::net::{IpAddr, Ipv4Addr, SocketAddr};

Replacement in src/ip.rs at line 17 [11.11607]
∅:D[13.6672] → [10.4326:4354]
B:BD[14.4791] → [10.4326:4354]
```
    socket: udp::UdpSocket,
```
[13.6672]
[13.6673]
```
    socket: UdpSocket,
```

Replacement in src/ip.rs at line 22 [11.11607]

B:BD[13.6713] → [13.6713:6767]

∅:D[13.6767] → [10.4413:4814]

B:BD[10.4413] → [10.4413:4814]

    pub fn open(config: Config) -> io::Result<Self> {
        let socket = try!(UdpSocket::v4());
        try!(socket.set_multicast_loop(false));
        try!(socket.join_multicast(&config.multicast_addr));
        try!(socket.bind(&match config.server_addr {
            IpAddr::V4(addr) => SocketAddr::V4((SocketAddrV4::new(addr, config.port))),
            IpAddr::V6(addr) => SocketAddr::V6((SocketAddrV6::new(addr, config.port, 0, 0))),
        }));

[13.6713]

[11.12370]

    pub async fn open(config: Config) -> io::Result<Self> {
        let addr = SocketAddr::new(config.server_addr, config.port);
        let socket = UdpSocket::bind(addr).await?;
        match config.multicast_addr {
            IpAddr::V4(addr) => {
                socket.set_multicast_loop_v4(false)?;
                socket.join_multicast_v4(addr, Ipv4Addr::UNSPECIFIED)?;
            },
            IpAddr::V6(addr) => {
                socket.set_multicast_loop_v6(false)?;
                socket.join_multicast_v6(&addr, 0)?;
            }
        }

Replacement in src/ip.rs at line 36 [11.11607]

B:BD[11.12371] → [10.4815:4840]

∅:D[10.4840] → [11.12393:12449]

B:BD[11.12393] → [11.12393:12449]

        Ok(IpInterface {
            config: config,
            socket: socket,

[11.12371]

[10.4841]

        Ok(Self {
            config,
            socket,

Insertion in src/ip.rs at line 43 [11.11607]
[11.12545]
[13.6768]
```
#[async_trait]
```

Replacement in src/ip.rs at line 45 [11.11607]

∅:D[13.6804] → [7.7825:8001]

B:BD[14.5256] → [7.7825:8001]

    fn send_to(&self, event: &NetEvent, addr: &SocketAddr) -> io::Result<Option<()>> {
        let packet = bincode_serde::serialize(event, SizeLimit::Bounded(1024)).unwrap();

[13.6804]

[5.1242]

    type Addr = SocketAddr;
    async fn send_to(&mut self, event: &NetEvent, addr: &Self::Addr) -> io::Result<()> {
        let packet = bincode::serialize(event).unwrap();

Replacement in src/ip.rs at line 50 [11.11607]

∅:D[5.1314] → [10.5044:5329]

B:BD[10.5044] → [10.5044:5329]

∅:D[10.5329] → [11.13099:13109]

B:BD[11.13099] → [11.13099:13109]

        match self.socket.send_to(&packet, addr) {
            Ok(Some(_)) => Ok(Some(())),
            Ok(None) => Err(io::Error::new(
                io::ErrorKind::WouldBlock,
                "The OS socket buffer is probably full"
            )),
            Err(err) => Err(err),
        }

[5.1314]

[11.13109]

        self.socket.send_to(&packet, addr).await?;
        Ok(())

Replacement in src/ip.rs at line 54 [11.11607]

B:BD[11.13116] → [7.8002:8074]

∅:D[7.8074] → [14.5347:5401]

∅:D[10.5401] → [14.5347:5401]

B:BD[11.13186] → [14.5347:5401]

B:BD[14.5401] → [10.5402:5594]

∅:D[10.5594] → [14.5623:5634]

B:BD[14.5623] → [14.5623:5634]

B:BD[14.5634] → [10.5595:5639]

    fn send_to_all(&self, event: &NetEvent) -> io::Result<Option<()>> {
        let addr = match self.config.multicast_addr {
            IpAddr::V4(addr) => SocketAddr::V4((SocketAddrV4::new(addr, self.config.port))),
            IpAddr::V6(addr) => SocketAddr::V6((SocketAddrV6::new(addr, self.config.port, 0, 0))),
        };
        
        self.send_to(event, &addr)

[11.13116]

[11.13342]

    async fn send_to_all(&mut self, event: &NetEvent) -> io::Result<()> {
        let addr = SocketAddr::new(self.config.multicast_addr, self.config.port);
        self.send_to(event, &addr).await?;
        Ok(())

Replacement in src/ip.rs at line 60 [11.11607]

B:BD[11.13349] → [10.5640:5712]

    fn recv_from(&self) -> io::Result<Option<(NetEvent, SocketAddr)>> {

[11.13349]

[11.13418]

    async fn recv_from(&mut self) -> io::Result<(NetEvent, Self::Addr)> {

Replacement in src/ip.rs at line 62 [11.11607]

B:BD[11.13451] → [15.1882:1976]

∅:D[15.1976] → [5.1354:1515]

B:BD[5.1354] → [5.1354:1515]

B:BD[5.1515] → [15.1977:2033]

∅:D[15.2033] → [11.14230:14330]

B:BD[11.14230] → [11.14230:14330]

B:BD[11.14330] → [13.6805:6836]

∅:D[13.6836] → [10.6186:6303]

B:BD[10.6186] → [10.6186:6303]

∅:D[10.6303] → [11.14510:14579]

B:BD[11.14510] → [11.14510:14579]

B:BD[11.14579] → [10.6304:6423]

∅:D[10.6423] → [11.14725:14796]

B:BD[11.14725] → [11.14725:14796]

B:BD[11.14796] → [10.6424:6494]

∅:D[10.6494] → [11.14878:14919]

B:BD[11.14878] → [11.14878:14919]

        self.socket.recv_from(&mut buf).map(|result| {
            result.map(|(len, addr)| {
                let event = bincode_serde::deserialize::<NetEvent>(&buf[..len]).unwrap();
                debug!("<= {} => ({} bytes) {:#?}", addr, len, event);
                (event, addr)
            })
        })
    }
}
/*
 * FIXME(Future):
 * Method delegation: https://github.com/rust-lang/rfcs/pull/1406
 */
impl Evented for IpInterface {
    fn register(&self, selector: &mut Selector, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
        self.socket.register(selector, token, interest, opts)
    }
    fn reregister(&self, selector: &mut Selector, token: Token, interest: EventSet, opts: PollOpt) -> io::Result<()> {
        self.socket.reregister(selector, token, interest, opts)
    }
    fn deregister(&self, selector: &mut Selector) -> io::Result<()> {
        self.socket.deregister(selector)

[11.13451]

[11.14919]

        let (len, addr) = self.socket.recv_from(&mut buf).await?;
        let event = bincode::deserialize(&buf[..len]).unwrap();
        debug!("<= {} => ({} bytes) {:#?}", addr, len, event);
        Ok((event, addr))

Insertion in src/main.rs at line 3 [8.10002]
[12.1006]
[16.2843]
```
mod ip;
```

ip