Skip to content

Commit a2872b4

Browse files
author
rstade
committed
Support of Virtio interfaces, FlowSteeringMode and network definition part of port specification, physical ports may specify associated KNI or Virtio interfaces
1 parent 8636c44 commit a2872b4

36 files changed

Lines changed: 4044 additions & 573 deletions

.idea/NetBricks.iml

Lines changed: 95 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

framework/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "e2d2"
3-
version = "1.0.1"
3+
version = "1.0.2"
44
authors = ["Aurojit Panda <apanda@cs.berkeley.edu>", "rainer <rainer@spacebandit.de>"]
55
build = "build.rs"
66

@@ -29,7 +29,7 @@ toml = "~0.4"
2929
uuid= { version = ">=0.7", features=["v4"] }
3030
tokio-core=">=0.1.8"
3131
futures=">=0.1.14"
32-
eui48 = { version= ">=0.3" }
32+
eui48 = { version= ">=0.4" }
3333
separator = ">= 0.3"
3434
serde_derive = "1.0"
3535
serde = "1.0"

framework/src/common/errors.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
use std::fmt::{ Display, Formatter};
1+
use ipnet;
2+
use std::fmt::{Display, Formatter};
23
use std::net::AddrParseError;
34
use std::string::String;
4-
use ipnet;
5-
65

76
/*
87
error_chain! {
@@ -121,7 +120,7 @@ pub enum ErrorKind {
121120
FailedToInitializePort(u16),
122121
FailedToInitializeOvsPort(i32),
123122
FailedToInitializeBessPort(i32),
124-
FailedToInitializeKni(u16),
123+
FailedToInitializeKni(String),
125124
BadQueue,
126125
CannotSend,
127126
BadDev(String),
@@ -140,10 +139,9 @@ pub enum ErrorKind {
140139
HeaderMismatch,
141140
FailedErrorFormat,
142141
ConfigParseError(String),
142+
TryFromNetSpecError,
143143
}
144144

145-
146-
147145
impl From<AddrParseError> for ErrorKind {
148146
fn from(err: AddrParseError) -> Self {
149147
ErrorKind::ConfigParseError(format!("{}", err))
@@ -176,4 +174,4 @@ impl Display for ErrorKind {
176174
}
177175
}
178176

179-
pub type Result<T> = std::result::Result<T, ErrorKind>;
177+
pub type Result<T> = std::result::Result<T, ErrorKind>;

framework/src/common/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pub mod errors;
22
pub use self::errors::Result;
33
//pub use self::errors::ResultExt;
4-
pub use self::errors::{ ErrorKind};
4+
pub use self::errors::ErrorKind;
55

66
/// Null metadata associated with packets initially.
77
pub struct EmptyMetadata;
@@ -16,4 +16,4 @@ pub fn print_error(e: &Error) {
1616
error!("Backtrace: {:?}", backtrace);
1717
}
1818
}
19-
*/
19+
*/

0 commit comments

Comments
 (0)