Merge pull request #3 from rusty-bolt/bolt/cta-mark

Fix Mark and SecMark Attribute Parsing

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "conntrack"
-version = "0.1.0"
-authors = [ "Matt Bolt <mbolt35@gmail.com" ]
+version = "0.1.1"
+authors = ["Matt Bolt <mbolt35@gmail.com>"]
 repository = "https://github.com/rusty-bolt/conntrack-rs"
 description = "Netfilter Conntrack"
 categories = ["network-programming"]
@@ -24,4 +24,4 @@ env_logger = "0.10.0"
 
 [[example]]
 name = "conntrack-dump"
-path = "examples/conntrack_dump.rs"
+path = "examples/conntrack_dump.rs"

src/attributes.rs

@@ -1,3 +1,7 @@
+//! # Attributes
+//! This module contains neli compatible attributes used to read and decode
+//! conntrack subsystem responses.
+
 use neli::{
     attr::AttrHandle,
     consts::genl::NlAttrType,

src/connection.rs

@@ -1,3 +1,6 @@
+//! # Connection
+//! This module contains the general API for the conntrack library.
+
 use neli::{
     consts::{nl::*, socket::*},
     genl::Genlmsghdr,

src/decoders.rs

@@ -1,3 +1,7 @@
+//! # Decoders
+//! This module contains decoder traits and implementations capable of extracting
+//! conntrack table data from neli attributes.
+
 use std::net::IpAddr;
 use std::net::Ipv4Addr;
 use std::net::Ipv6Addr;
@@ -143,6 +147,9 @@ impl<'a> AttrDecoder<'a, ConntrackAttr, Flow> for Flow {
                 ConntrackAttr::CtaTimeout => {
                     flow.timeout = Some(Duration::from_secs((u32::decode(attr)?) as u64));
                 }
+                ConntrackAttr::CtaMark => {
+                    flow.mark = Some(u32::decode(attr)?);
+                }
                 ConntrackAttr::CtaSeqAdjOrig => {
                     let seq_adj_orig_attr = attr.get_attr_handle::<SeqAdjAttr>()?;
 
@@ -162,7 +169,7 @@ impl<'a> AttrDecoder<'a, ConntrackAttr, Flow> for Flow {
                     flow.sec_ctx = Some(SecCtx::decode(sec_ctx_attr)?);
                 }
                 ConntrackAttr::CtaSecMark => {
-                    flow.mark = Some(u32::decode(attr)?);
+                    flow.sec_mark = Some(u32::decode(attr)?);
                 }
                 ConntrackAttr::CtaMarkMask => {
                     flow.mark_mask = Some(u32::decode(attr)?);

src/error.rs

@@ -1,3 +1,7 @@
+//! # Error
+//! This module contains all the potential error types that can come from
+//! the `conntrack` library.
+
 use std::fmt::Debug;
 
 /// Error consolidates and propagates all underlying error types.

src/message.rs

@@ -1,3 +1,6 @@
+//! # Message
+//! This module contains neli compatible subsystem messages.
+
 use neli::neli_enum;
 
 #[inline]

src/model.rs

@@ -1,3 +1,6 @@
+//! # Model
+//! This module contains rust model structs for the decoded conntrack data.
+
 use bitflags::bitflags;
 use chrono::prelude::*;
 use neli::neli_enum;
@@ -43,6 +46,7 @@ pub struct Flow {
     pub seq_adj_orig: Option<SeqAdj>,
     pub seq_adj_repl: Option<SeqAdj>,
     pub sec_ctx: Option<SecCtx>,
+    pub sec_mark: Option<u32>,
     pub exp: Option<Exp>,
 }
 #[neli_enum(serialized_type = "u8")]

src/result.rs

@@ -1,3 +1,6 @@
+//! # Result
+//! This module contains the result alias and a module reimport for the error types.
+
 pub use crate::error::Error;
 
 /// Result is an alias for `core::result::Result<T, conntrack::error::Error>`