diff options
Diffstat (limited to 'rustables/src/expr')
-rw-r--r-- | rustables/src/expr/bitwise.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/cmp.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/counter.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/ct.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/immediate.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/log.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/lookup.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/masquerade.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/meta.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/mod.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/nat.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/payload.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/register.rs | 2 | ||||
-rw-r--r-- | rustables/src/expr/reject.rs | 5 | ||||
-rw-r--r-- | rustables/src/expr/verdict.rs | 5 | ||||
-rw-r--r-- | rustables/src/expr/wrapper.rs | 6 |
16 files changed, 17 insertions, 25 deletions
diff --git a/rustables/src/expr/bitwise.rs b/rustables/src/expr/bitwise.rs index a5d9343..59ef41b 100644 --- a/rustables/src/expr/bitwise.rs +++ b/rustables/src/expr/bitwise.rs @@ -1,5 +1,5 @@ use super::{Expression, Rule, ToSlice}; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::ffi::c_void; use std::os::raw::c_char; diff --git a/rustables/src/expr/cmp.rs b/rustables/src/expr/cmp.rs index 747974d..384f0b4 100644 --- a/rustables/src/expr/cmp.rs +++ b/rustables/src/expr/cmp.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule, ToSlice}; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::{ borrow::Cow, ffi::{c_void, CString}, diff --git a/rustables/src/expr/counter.rs b/rustables/src/expr/counter.rs index 099e7fa..71064df 100644 --- a/rustables/src/expr/counter.rs +++ b/rustables/src/expr/counter.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys as sys; +use crate::sys; use std::os::raw::c_char; /// A counter expression adds a counter to the rule that is incremented to count number of packets diff --git a/rustables/src/expr/ct.rs b/rustables/src/expr/ct.rs index 001aef8..7d6614c 100644 --- a/rustables/src/expr/ct.rs +++ b/rustables/src/expr/ct.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::os::raw::c_char; bitflags::bitflags! { diff --git a/rustables/src/expr/immediate.rs b/rustables/src/expr/immediate.rs index ff4ad04..0787e06 100644 --- a/rustables/src/expr/immediate.rs +++ b/rustables/src/expr/immediate.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Register, Rule, ToSlice}; -use rustables_sys as sys; +use crate::sys; use std::ffi::c_void; use std::os::raw::c_char; diff --git a/rustables/src/expr/log.rs b/rustables/src/expr/log.rs index db96ba9..5c06897 100644 --- a/rustables/src/expr/log.rs +++ b/rustables/src/expr/log.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys as sys; +use crate::sys; use std::ffi::{CStr, CString}; use std::os::raw::c_char; use thiserror::Error; diff --git a/rustables/src/expr/lookup.rs b/rustables/src/expr/lookup.rs index 7796b29..8e288a0 100644 --- a/rustables/src/expr/lookup.rs +++ b/rustables/src/expr/lookup.rs @@ -1,6 +1,6 @@ use super::{DeserializationError, Expression, Rule}; use crate::set::Set; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::ffi::{CStr, CString}; use std::os::raw::c_char; diff --git a/rustables/src/expr/masquerade.rs b/rustables/src/expr/masquerade.rs index 40565d5..c1a06de 100644 --- a/rustables/src/expr/masquerade.rs +++ b/rustables/src/expr/masquerade.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys as sys; +use crate::sys; use std::os::raw::c_char; /// Sets the source IP to that of the output interface. diff --git a/rustables/src/expr/meta.rs b/rustables/src/expr/meta.rs index 199f3d3..bf77774 100644 --- a/rustables/src/expr/meta.rs +++ b/rustables/src/expr/meta.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::os::raw::c_char; /// A meta expression refers to meta data associated with a packet. diff --git a/rustables/src/expr/mod.rs b/rustables/src/expr/mod.rs index b20a752..fbf49d6 100644 --- a/rustables/src/expr/mod.rs +++ b/rustables/src/expr/mod.rs @@ -9,7 +9,7 @@ use std::net::Ipv4Addr; use std::net::Ipv6Addr; use super::rule::Rule; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use thiserror::Error; mod bitwise; diff --git a/rustables/src/expr/nat.rs b/rustables/src/expr/nat.rs index 51f439f..8beaa30 100644 --- a/rustables/src/expr/nat.rs +++ b/rustables/src/expr/nat.rs @@ -1,6 +1,6 @@ use super::{DeserializationError, Expression, Register, Rule}; use crate::ProtoFamily; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::{convert::TryFrom, os::raw::c_char}; #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] diff --git a/rustables/src/expr/payload.rs b/rustables/src/expr/payload.rs index 334c939..7612fd9 100644 --- a/rustables/src/expr/payload.rs +++ b/rustables/src/expr/payload.rs @@ -1,5 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys::{self as sys, libc}; +use crate::sys::{self, libc}; use std::os::raw::c_char; pub trait HeaderField { diff --git a/rustables/src/expr/register.rs b/rustables/src/expr/register.rs index 2cfcc3b..f0aed94 100644 --- a/rustables/src/expr/register.rs +++ b/rustables/src/expr/register.rs @@ -1,6 +1,6 @@ use std::fmt::Debug; -use rustables_sys::libc; +use crate::sys::libc; use super::DeserializationError; diff --git a/rustables/src/expr/reject.rs b/rustables/src/expr/reject.rs index 550a287..2ea0cbf 100644 --- a/rustables/src/expr/reject.rs +++ b/rustables/src/expr/reject.rs @@ -1,9 +1,6 @@ use super::{DeserializationError, Expression, Rule}; use crate::ProtoFamily; -use rustables_sys::{ - self as sys, - libc::{self, c_char}, -}; +use crate::sys::{self, libc::{self, c_char}}; /// A reject expression that defines the type of rejection message sent /// when discarding a packet. diff --git a/rustables/src/expr/verdict.rs b/rustables/src/expr/verdict.rs index 6a6b802..3c4c374 100644 --- a/rustables/src/expr/verdict.rs +++ b/rustables/src/expr/verdict.rs @@ -1,8 +1,5 @@ use super::{DeserializationError, Expression, Rule}; -use rustables_sys::{ - self as sys, - libc::{self, c_char}, -}; +use crate::sys::{self, libc::{self, c_char}}; use std::ffi::{CStr, CString}; /// A verdict expression. In the background, this is usually an "Immediate" expression in nftnl diff --git a/rustables/src/expr/wrapper.rs b/rustables/src/expr/wrapper.rs index 5162c21..1bcc520 100644 --- a/rustables/src/expr/wrapper.rs +++ b/rustables/src/expr/wrapper.rs @@ -3,10 +3,8 @@ use std::ffi::CString; use std::fmt::Debug; use std::rc::Rc; -use super::DeserializationError; -use super::Expression; -use crate::Rule; -use rustables_sys as sys; +use super::{DeserializationError, Expression}; +use crate::{sys, Rule}; pub struct ExpressionWrapper { pub(crate) expr: *const sys::nftnl_expr, |