daxvena/elemeld - Change RPECDMZ4O7MMU32H6Z7EW75GRVEQ6IJYNPWSV54HUPTCX5H7I26QC

Fixed locally focused logic

Created by daxvena on March 6, 2016

RPECDMZ4O7MMU32H6Z7EW75GRVEQ6IJYNPWSV54HUPTCX5H7I26QC

Dependencies

In channels

main

Change contents

Replacement in Cargo.toml at line 12 [3.18912]
B:BD[3.19044] → [3.19044:19055]
```
dylib = "*"
```
[3.19044]
```
dylib = "*"
nix = "*"
```
Insertion in src/cluster.rs at line 3 [4.13]
[4.44]
[4.44]
```
use util;
```
Insertion in src/cluster.rs at line 13 [4.13]
[4.188]
[4.188]
```
    local: Index,
```
Insertion in src/cluster.rs at line 22 [4.13]
[4.384]
[4.384]
```
            local: 0,
```

Replacement in src/cluster.rs at line 32 [4.13]

B:BD[4.624] → [4.624:676]

            Some(io::HostEvent::Motion(event)) => {

[4.624]

[4.676]

            Some(io::HostEvent::Motion(event)) =>

Replacement in src/cluster.rs at line 44 [4.13]

B:BD[4.1036] → [4.1036:1148]

                } else {
                    None
                }
            },
            Some(event) => {

[4.1036]

[4.1148]

                } else { None },
            Some(event) =>

Replacement in src/cluster.rs at line 52 [4.13]

B:BD[4.1460] → [4.1460:1542]

[4.1460]

[4.1542]

                } else { None },

Replacement in src/cluster.rs at line 64 [4.13]

B:BD[4.1935] → [4.1935:1986]

        } else {
            return None
        }

[4.1935]

[4.1986]

        } else { None }

Replacement in src/cluster.rs at line 68 [4.13]
∅:D[2.368] → [4.2033:2086]
B:BD[4.2033] → [4.2033:2086]
```
        self.screens[self.focus as usize].is_local()
```
[2.368]
[4.2086]
```
        self.focus == self.local
```

Deletion in src/cluster.rs at line 81 [4.13]

B:BD[4.2484] → [4.2484:2632]

                host.send_event(io::HostEvent::Position(io::PositionEvent {
                    x: self.pos.x, y: self.pos.y,
                }));

Insertion in src/cluster.rs at line 84 [4.13]

[4.2724]

            
            host.send_event(io::HostEvent::Position(io::PositionEvent {
                x: self.pos.x, y: self.pos.y,
            }));

Replacement in src/cluster.rs at line 106 [4.13]

B:BD[4.3255] → [4.3255:3306]

        let screen = self.screens[focus as usize];

[4.3255]

[4.3306]

        let screen = &self.screens[focus as usize];

Replacement in src/cluster.rs at line 123 [4.13]

B:BD[4.3826] → [4.3826:3877]

        let screen = self.screens[focus as usize];

[4.3826]

[4.3877]

        let screen = &self.screens[focus as usize];

Replacement in src/cluster.rs at line 164 [4.13]

B:BD[4.5036] → [4.5036:5102]

    pub fn merge(&mut self, other: &Self, src: net::SocketAddr) {

[4.5036]

[4.5102]

    pub fn merge(&mut self, other: &Self) {

Replacement in src/cluster.rs at line 166 [4.13]

B:BD[4.5155] → [4.5155:6030]

            // Interpret other's None addresses as the src address
            let other_addr = match other_screen.addr {
                Some(addr) => addr.0,
                None => src,
            };
            for screen in &mut self.screens {
                // Interpret self's None addresses as a null address
                // TODO: Use getifaddrs to lookup matching interface address
                let screen_addr = match screen.addr {
                    Some(addr) => addr.0,
                    None => net::SocketAddr::V4(net::SocketAddrV4::new(net::Ipv4Addr::new(0, 0, 0, 0), 0)),
                };
                // If same address, replace screen with other_screen
                if screen_addr == other_addr {
                    // TODO: Merge screen properties
                    // *screen = *other_screen;
                    continue 'outer;

[4.5155]

[4.6030]

            for other_addr in &other_screen.addrs {
                for screen in &self.screens {
                    for addr in &screen.addrs {
                        if addr.0.ip() == other_addr.0.ip() {
                            // TODO: Merge screens
                            continue 'outer;
                        }
                    }

Replacement in src/cluster.rs at line 178 [4.13]

B:BD[4.6110] → [4.6110:6245]

            let mut new_screen = *other_screen;
            new_screen.addr = Some(SocketAddr(src));
            self.add(new_screen);

[4.6110]

[4.6245]

            self.add(other_screen.clone());

Insertion in src/cluster.rs at line 190 [4.13]
[4.6409]
[2.915]
```
        self.reset_local();
        
```

Insertion in src/cluster.rs at line 198 [4.13]

[2.1082]

[4.6409]

    }
    pub fn reset_local(&mut self) {
        'outer: for ip in util::my_ips().unwrap() {
            for (i, screen) in self.screens.iter().enumerate() {
                for addr in &screen.addrs {
                    if addr.0.ip() == ip {
                        println!("Local screen at {}", i);
                        self.local = i as Index;
                        return;
                    }
                }
            }
        }
        panic!("Local IP was not found in cluster");

Replacement in src/cluster.rs at line 217 [4.13]

B:BD[4.6418] → [4.6418:6472]

#[derive(Copy, Clone, Serialize, Deserialize, Debug)]

[4.6418]

[4.6472]

#[derive(Clone, Serialize, Deserialize, Debug)]

Replacement in src/cluster.rs at line 221 [4.13]
B:BD[4.6528] → [4.6528:6558]
```
    addr: Option<SocketAddr>,
```
[4.6528]
[4.6558]
```
    addrs: Vec<Addr>,
```
Insertion in src/cluster.rs at line 226 [4.13]
[4.6625]
[4.6625]
```
        let port = 8080; // FIXME: Get from config
```

Replacement in src/cluster.rs at line 228 [4.13]

B:BD[4.6642] → [4.6642:6696]

            addr: None, // None implies local machine

[4.6642]

[4.6696]

            addrs: util::my_ips().unwrap().into_iter()
                .filter_map(|addr| match addr {
                    net::IpAddr::V4(addr) =>
                        if !addr.is_loopback() {
                            Some(net::SocketAddr::V4(net::SocketAddrV4::new(addr, port)))
                        } else { None },
                    net::IpAddr::V6(addr) =>
                        if !addr.is_loopback() {
                            Some(net::SocketAddr::V6(net::SocketAddrV6::new(addr, port, 0, 0)))
                        } else { None },
                })
                .map(|addr| Addr(addr))
                .collect::<Vec<_>>(),

Deletion in src/cluster.rs at line 250 [4.13]

B:BD[4.6914] → [4.6914:6986]

    }
    pub fn is_local(&self) -> bool {
        self.addr.is_none()

Replacement in src/cluster.rs at line 254 [4.13]
B:BD[4.7046] → [4.7046:7082]
```
struct SocketAddr(net::SocketAddr);
```
[4.7046]
[4.7082]
```
struct Addr(net::SocketAddr);
```
Replacement in src/cluster.rs at line 256 [4.13]
B:BD[4.7083] → [4.7083:7122]
```
impl serde::Serialize for SocketAddr {
```
[4.7083]
[4.7122]
```
impl serde::Serialize for Addr {
```
Replacement in src/cluster.rs at line 264 [4.13]
B:BD[4.7296] → [4.7296:7337]
```
impl serde::Deserialize for SocketAddr {
```
[4.7296]
[4.7337]
```
impl serde::Deserialize for Addr {
```
Replacement in src/cluster.rs at line 270 [4.13]
B:BD[4.7540] → [4.7540:7577]
```
            type Value = SocketAddr;
```
[4.7540]
[4.7577]
```
            type Value = Addr;
```

Replacement in src/cluster.rs at line 276 [4.13]

B:BD[4.7766] → [4.7766:7820]

                    Ok(addr) => Ok(SocketAddr(addr)),

[4.7766]

[4.7820]

                    Ok(addr) => Ok(Addr(addr)),

Replacement in src/elemeld.rs at line 53 [4.8294]

B:BD[4.9512] → [4.9512:9572]

                        self.cluster.merge(&cluster, addr);

[4.9512]

[4.9572]

                        self.cluster.merge(&cluster);

Deletion in src/elemeld.rs at line 66 [4.8294]

∅:D[2.1318] → [4.10108:10302]

B:BD[4.10108] → [4.10108:10302]

                        self.host.send_event(io::HostEvent::Position(io::PositionEvent {
                            x: pos.x,
                            y: pos.y,
                        }));

Replacement in src/elemeld.rs at line 67 [4.8294]

B:BD[4.10325] → [4.10325:10573]


                    // event => match self.cluster.filter_net_event(event) {
                    //     Some(event) => { self.host.send_event(event); },
                    //     None => (),
                    // },
                    _ => (),

[4.10325]

[4.10573]

                    event => match self.cluster.filter_net_event(event) {
                        Some(event) => { self.host.send_event(event); },
                        None => (),
                    },

Insertion in src/main.rs at line 2 [3.10002]
[5.997]
[6.712]

Insertion in src/main.rs at line 5 [3.10002]

[6.772]

[3.10058]


// Used for getifaddrs
#![feature(libc)]
extern crate libc;
extern crate nix;

Insertion in src/main.rs at line 22 [3.10002]
[4.14963]
[4.14963]
```
mod util;
```
Replacement in src/main.rs at line 32 [3.10002]
∅:D[7.710] → [3.10176:10188]
∅:D[4.15074] → [3.10176:10188]
B:BD[3.10176] → [3.10176:10188]
```
use mio::*;
```
[4.15074]
[6.840]
```
const HOST_EVENT: mio::Token = mio::Token(0);
const NET_EVENT: mio::Token = mio::Token(1);
```
Deletion in src/main.rs at line 35 [3.10002]
B:BD[6.841] → [4.15075:15111]
∅:D[4.15111] → [6.876:911]
B:BD[6.876] → [6.876:911]
∅:D[6.911] → [3.10340:10341]
B:BD[3.10340] → [3.10340:10341]
```
const HOST_EVENT: Token = Token(0);
const NET_EVENT: Token = Token(1);
```

Replacement in src/main.rs at line 36 [3.10002]

B:BD[3.10417] → [3.10417:10469]

    let mut event_loop = EventLoop::new().unwrap();

[3.10353]

[4.15112]

    let mut event_loop = mio::EventLoop::new().unwrap();

Replacement in src/main.rs at line 38 [3.10002]

B:BD[4.15178] → [4.15178:15283]

        server_addr: Ipv4Addr::new(0, 0, 0, 0),
        multicast_addr: Ipv4Addr::new(239, 255, 80, 80),

[4.15178]

[8.106]

        server_addr: mio::Ipv4Addr::new(0, 0, 0, 0),
        multicast_addr: mio::Ipv4Addr::new(239, 255, 80, 80),

Replacement in src/main.rs at line 51 [3.10002]

∅:D[4.15420] → [8.211:282]

B:BD[3.10852] → [8.211:282]

    fn new(event_loop: &mut EventLoop<Self>, config: Config) -> Self {

[4.15420]

[4.15421]

    fn new(event_loop: &mut mio::EventLoop<Self>, config: Config) -> Self {

Replacement in src/main.rs at line 56 [3.10002]

∅:D[4.15535] → [3.11548:11654]

∅:D[6.1016] → [3.11548:11654]

B:BD[3.11548] → [3.11548:11654]

                            EventSet::readable(),
                            PollOpt::level()).unwrap();

[4.15535]

[3.11720]

                            mio::EventSet::readable(),
                            mio::PollOpt::level()).unwrap();

Replacement in src/main.rs at line 63 [3.10002]

B:BD[6.1112] → [4.15613:15686]

∅:D[4.15686] → [5.1409:1465]

B:BD[3.12165] → [5.1409:1465]

                            EventSet::readable() | EventSet::writable(),
                            PollOpt::level()).unwrap();

[6.1112]

[9.496]

                            mio::EventSet::readable() |
                            mio::EventSet::writable(),
                            mio::PollOpt::level()).unwrap();

Replacement in src/main.rs at line 71 [3.10002]
B:BD[3.14601] → [4.15746:15778]
```
impl Handler for EventManager {
```
[3.14601]
[3.14627]
```
impl mio::Handler for EventManager {
```

Replacement in src/main.rs at line 75 [3.10002]

B:BD[3.14705] → [3.14705:14797]

    fn ready(&mut self, event_loop: &mut EventLoop<Self>, token: Token, events: EventSet) {

[3.14674]

[3.14797]

    fn ready(&mut self,
             event_loop: &mut mio::EventLoop<Self>,
             token: mio::Token, events: mio::EventSet)
    {

File addition: util.rs (-rw-r--r--)

[3.6]

use nix;
use nix::errno::Errno;
use nix::sys::socket::{Ipv4Addr, Ipv6Addr, sockaddr_in, sockaddr_in6};
use std::{net, ptr};
use libc::{getifaddrs, freeifaddrs, AF_INET, AF_INET6};
/*
 * Obtain a list of ip addresses for each interface
 */
pub fn my_ips() -> Result<Vec<net::IpAddr>, nix::Error> {
    let mut addrs = Vec::new();
    unsafe {
        let mut list = ptr::null_mut();
        if getifaddrs(&mut list) != 0 {
            return Err(nix::Error::Sys(Errno::last()));
        }
        let mut ptr = list;
        while !ptr.is_null() {
            if !(*ptr).ifa_addr.is_null() {
                match (*(*ptr).ifa_addr).sa_family as i32 {
                    AF_INET => {
                        let sa = (*ptr).ifa_addr as *const sockaddr_in;
                        addrs.push(net::IpAddr::V4(Ipv4Addr((*sa).sin_addr).to_std()));
                    },
                    AF_INET6 => {
                        let sa = (*ptr).ifa_addr as *const sockaddr_in6;
                        addrs.push(net::IpAddr::V6(Ipv6Addr((*sa).sin6_addr).to_std()));
                    },
                    _ => (),
                }
            }
            ptr = (*ptr).ifa_next;
        }
        freeifaddrs(list);
    };
    Ok(addrs)
}

Fixed locally focused logic

Dependencies

In channels

Change contents

Replacement in Cargo.toml at line 12 [3.18912]

Insertion in src/cluster.rs at line 3 [4.13]

Insertion in src/cluster.rs at line 13 [4.13]

Insertion in src/cluster.rs at line 22 [4.13]

Replacement in src/cluster.rs at line 32 [4.13]

Replacement in src/cluster.rs at line 44 [4.13]

Replacement in src/cluster.rs at line 52 [4.13]

Replacement in src/cluster.rs at line 64 [4.13]

Replacement in src/cluster.rs at line 68 [4.13]

Deletion in src/cluster.rs at line 81 [4.13]

Insertion in src/cluster.rs at line 84 [4.13]

Replacement in src/cluster.rs at line 106 [4.13]

Replacement in src/cluster.rs at line 123 [4.13]

Replacement in src/cluster.rs at line 164 [4.13]

Replacement in src/cluster.rs at line 166 [4.13]

Replacement in src/cluster.rs at line 178 [4.13]

Insertion in src/cluster.rs at line 190 [4.13]

Insertion in src/cluster.rs at line 198 [4.13]

Replacement in src/cluster.rs at line 217 [4.13]

Replacement in src/cluster.rs at line 221 [4.13]

Insertion in src/cluster.rs at line 226 [4.13]

Replacement in src/cluster.rs at line 228 [4.13]

Deletion in src/cluster.rs at line 250 [4.13]

Replacement in src/cluster.rs at line 254 [4.13]

Replacement in src/cluster.rs at line 256 [4.13]

Replacement in src/cluster.rs at line 264 [4.13]

Replacement in src/cluster.rs at line 270 [4.13]