Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
conectado committed Mar 14, 2024
1 parent 3d72270 commit a975ee5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
11 changes: 0 additions & 11 deletions rust/connlib/clients/android/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ use connlib_client_shared::{
file_logger, keypair, Callbacks, Cidrv4, Cidrv6, Error, LoginUrl, LoginUrlError,
ResourceDescription, Session,
};
use ip_network::{IpNetwork, Ipv4Network, Ipv6Network};
use jni::{
objects::{GlobalRef, JByteArray, JClass, JObject, JObjectArray, JString, JValue, JValueGen},
strings::JNIString,
JNIEnv, JavaVM,
};
use secrecy::SecretString;
use serde::Serialize;
use std::{io, net::IpAddr, path::Path};
use std::{
net::{Ipv4Addr, Ipv6Addr},
Expand All @@ -38,15 +36,6 @@ pub struct CallbackHandler {
handle: file_logger::Handle,
}

impl From<IpNetwork> for Cidr {
fn from(val: IpNetwork) -> Cidr {
Cidr {
address: val.network_address(),
prefix: val.netmask(),
}
}
}

impl Clone for CallbackHandler {
fn clone(&self) -> Self {
// This is essentially a `memcpy` to bypass redundant checks from
Expand Down
5 changes: 2 additions & 3 deletions rust/connlib/tunnel/src/device_channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ mod tun;
mod tun;

use crate::ip_packet::{IpPacket, MutableIpPacket};
use connlib_shared::error::ConnlibError;
use connlib_shared::messages::Interface;
use connlib_shared::{Callbacks, Cidrv4, Cidrv6, Error};
use connlib_shared::{error::ConnlibError, messages::Interface, Callbacks, Error};
use connlib_shared::{Cidrv4, Cidrv6};
use ip_network::IpNetwork;
use pnet_packet::Packet;
use std::collections::HashSet;
Expand Down

0 comments on commit a975ee5

Please sign in to comment.