Rename packages to knet-bindings & nozzle-bindings

Also fix ACL bug in the test. Well, work around it - it seems that having a static & dynamic UDP link to the same host doesn't really work well if one has ACLs
kronosnet · Jun 21, 2021 · 5e3bf4e · 5e3bf4e
1 parent fbd7ed1
commit 5e3bf4e
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 31 deletions.
diff --git a/libknet/bindings/rust/Cargo.toml b/libknet/bindings/rust/Cargo.toml
@@ -5,7 +5,7 @@
 # This software licensed under LGPL-2.1+
 
 [package]
-name = "kronosnet"
+name = "knet-bindings"
 version = "0.1.0"
 authors = ["Christine Caulfield <ccaulfie@redhat.com>"]
 edition = "2018"

diff --git a/libknet/bindings/rust/Makefile.am b/libknet/bindings/rust/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST		= \
 			  README
 
 RUST_SHIP_SRCS		= \
-			  src/libknet.rs \
+			  src/knet_bindings.rs \
 			  src/lib.rs \
 			  src/sys/mod.rs
 
@@ -29,6 +29,6 @@ RUST_BUILT_SRCS		= \
 src/sys/libknet.rs: ../../libknet.h
 	$(top_srcdir)/build-aux/rust-regen.sh $^ $@ KNET
 
-all-local: cargo-tree-prep target/$(RUST_TARGET_DIR)/libkronosnet.rlib
+all-local: cargo-tree-prep target/$(RUST_TARGET_DIR)/knet_bindings.rlib
 
 clean-local: cargo-clean
diff --git a/libknet/bindings/rust/src/libknet.rs → libknet/bindings/rust/src/knet_bindings.rs b/libknet/bindings/rust/src/libknet.rs → libknet/bindings/rust/src/knet_bindings.rs
diff --git a/libknet/bindings/rust/src/lib.rs b/libknet/bindings/rust/src/lib.rs
@@ -5,17 +5,16 @@
 // This software licensed under LGPL-2.0+
 //
 
-//! This crate provides access to the kronosnet libknet
+//! This crate provides access to the kronosnet library 'libknet'
 //! from Rust. They are a fairly thin layer around the actual API calls but with Rust data types
 //! and iterators.
 //!
 //! No more information about knet itself will be provided here, it is expected that if
 //! you feel you need access to the knet API calls, you know what they do :)
 //!
 //! # Example
-//! extern crate rust_kronosnet as kronosnet;
-//! use kronosnet::libknet as knet;
-//! use std::net::{SocketAddr, IpAddr,Ipv4Addr};
+//! use knet_bindings::knet_bindings as knet;
+//! use std::net::{SocketAddr, IpAddr, Ipv4Addr};
 //! use std::thread::spawn;
 //! use std::sync::mpsc::Receiver;
 //! use std::sync::mpsc::channel;
@@ -72,7 +71,7 @@
 
 
 mod sys;
-pub mod libknet;
+pub mod knet_bindings;
 
 #[macro_use]
 extern crate lazy_static;

diff --git a/libknet/bindings/rust/tests/Cargo.toml b/libknet/bindings/rust/tests/Cargo.toml
@@ -5,7 +5,7 @@
 # This software licensed under GPL-2.0+
 
 [package]
-name = "rust-kronosnet-tests"
+name = "knet-bindings-tests"
 version = "0.1.0"
 authors = ["Christine Caulfield <ccaulfie@redhat.com>"]
 edition = "2018"
@@ -14,7 +14,7 @@ edition = "2018"
 cc = "1.0"
 
 [dependencies]
-kronosnet = { path = ".." }
+knet-bindings = { path = ".." }
 libc = "0.2.97"
 
 [[bin]]

diff --git a/libknet/bindings/rust/tests/src/bin/knet-test.rs b/libknet/bindings/rust/tests/src/bin/knet-test.rs
@@ -7,8 +7,8 @@
 // Author: Christine Caulfield (ccaulfi@redhat.com)
 //
 
-use kronosnet::libknet as knet;
-use std::net::{SocketAddr, IpAddr,Ipv4Addr};
+use knet_bindings::knet_bindings as knet;
+use std::net::{SocketAddr, IpAddr, Ipv4Addr};
 use std::thread::spawn;
 use std::sync::mpsc::Receiver;
 use std::sync::mpsc::channel;
@@ -302,8 +302,6 @@ fn configure_link(knet_handle: knet::Handle, our_hostid: &knet::HostId, other_ho
 	}
     }
 
-
-
     match knet::link_get_enable(knet_handle, other_hostid, 0) {
 	Ok(b) => if !b {
 	    println!("link not enabled (according to link_get_enable()");
@@ -751,22 +749,22 @@ fn test_acl(handle: knet::Handle, host: &knet::HostId) -> Result<()>
     if let Err(e) = knet::link_add_acl(handle, host, 1,
 				       &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8003_u16),
 				       &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8003_u16),
-				       knet::AclCheckType::Address, knet::AclAcceptReject::Accept) {
+				       knet::AclCheckType::Address, knet::AclAcceptReject::Reject) {
 	println!("Error from link_add_acl: {:?}", e);
 	return Err(e);
     }
     if let Err(e) = knet::link_insert_acl(handle, host, 1,
 					  0,
-					  &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 8003_u16),
-					  &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 8003_u16),
-					  knet::AclCheckType::Address, knet::AclAcceptReject::Accept) {
+					  &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 8004_u16),
+					  &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 2)), 8004_u16),
+					  knet::AclCheckType::Address, knet::AclAcceptReject::Reject) {
 	println!("Error from link_add_acl: {:?}", e);
 	return Err(e);
     }
     if let Err(e) = knet::link_rm_acl(handle, host, 1,
 				      &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8003_u16),
 				      &SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8003_u16),
-				      knet::AclCheckType::Address, knet::AclAcceptReject::Accept) {
+				      knet::AclCheckType::Address, knet::AclAcceptReject::Reject) {
 	println!("Error from link_rm_acl: {:?}", e);
 	return Err(e);
     }
@@ -781,7 +779,6 @@ fn test_acl(handle: knet::Handle, host: &knet::HostId) -> Result<()>
 	return Err(e);
     }
 
-
     Ok(())
 }
 

diff --git a/libknet/tests/api-test-coverage b/libknet/tests/api-test-coverage
@@ -85,7 +85,7 @@ deliberately_missing="knet_strtoaddr knet_addrtostr knet_get_transport_name_by_i
 rustapicalls=$numapicalls
 for i in $headerapicalls; do
     rustcall=`echo $i|awk '{print substr($0, 6)}'`
-    grep "^pub fn ${rustcall}(" $1/libknet/bindings/rust/src/libknet.rs > /dev/null 2>/dev/null
+    grep "^pub fn ${rustcall}(" $1/libknet/bindings/rust/src/knet_bindings.rs > /dev/null 2>/dev/null
     if [ $? = 0 ]
     then
 	rust_found=$((rust_found+1))

diff --git a/libnozzle/bindings/rust/Cargo.toml b/libnozzle/bindings/rust/Cargo.toml
@@ -5,7 +5,7 @@
 # This software licensed under LGPL-2.1+
 
 [package]
-name = "nozzle"
+name = "nozzle-bindings"
 version = "0.1.0"
 authors = ["Christine Caulfield <ccaulfie@redhat.com>"]
 edition = "2018"

diff --git a/libnozzle/bindings/rust/Makefile.am b/libnozzle/bindings/rust/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST		= \
 			  README
 
 RUST_SHIP_SRCS		= \
-			  src/libnozzle.rs \
+			  src/nozzle_bindings.rs \
 			  src/lib.rs \
 			  src/sys/mod.rs
 
@@ -29,6 +29,6 @@ RUST_BUILT_SRCS		= \
 src/sys/libnozzle.rs: ../../libnozzle.h
 	$(top_srcdir)/build-aux/rust-regen.sh $^ $@ NOZZLE
 
-all-local: cargo-tree-prep target/$(RUST_TARGET_DIR)/libnozzle.rlib
+all-local: cargo-tree-prep target/$(RUST_TARGET_DIR)/nozzle_bindings.rlib
 
 clean-local: cargo-clean
diff --git a/libnozzle/bindings/rust/src/lib.rs b/libnozzle/bindings/rust/src/lib.rs
@@ -13,8 +13,7 @@
 //! you feel you need access to the knet API calls, you know what they do :)
 //!
 //! # Example
-//! extern crate rust_kronosnet as kronosnet;
-//! use kronosnet::libnozzle as nozzle;
+//! use nozzle_bindings::nozzle_bindings as nozzle;
 //! use std::io::{Result};
 //! use std::env;
 //! use std::{thread, time};
@@ -48,7 +47,7 @@
 
 
 mod sys;
-pub mod libnozzle;
+pub mod nozzle_bindings;
 
 use std::os::raw::c_char;
 use std::ptr::copy_nonoverlapping;

diff --git a/libnozzle/bindings/rust/src/libnozzle.rs → ...zzle/bindings/rust/src/nozzle_bindings.rs b/libnozzle/bindings/rust/src/libnozzle.rs → ...zzle/bindings/rust/src/nozzle_bindings.rs
diff --git a/libnozzle/bindings/rust/tests/Cargo.toml b/libnozzle/bindings/rust/tests/Cargo.toml
@@ -5,15 +5,15 @@
 # This software licensed under GPL-2.0+
 
 [package]
-name = "rust-kronosnet-tests"
+name = "nozzle-bindings-tests"
 version = "0.1.0"
 authors = ["Christine Caulfield <ccaulfie@redhat.com>"]
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-nozzle = { path = ".." }
+nozzle-bindings = { path = ".." }
 libc = "0.2.93"
 tempfile = "3"
 

diff --git a/libnozzle/bindings/rust/tests/src/bin/nozzle-test.rs b/libnozzle/bindings/rust/tests/src/bin/nozzle-test.rs
@@ -7,7 +7,7 @@
 // Author: Christine Caulfield (ccaulfi@redhat.com)
 //
 
-use nozzle::libnozzle as nozzle;
+use nozzle_bindings::nozzle_bindings as nozzle;
 use std::io::{Result, Error, ErrorKind, BufWriter, Write};
 use std::fmt::Write as fmtwrite;
 use std::{thread, time};

diff --git a/libnozzle/tests/api-test-coverage b/libnozzle/tests/api-test-coverage
@@ -87,7 +87,7 @@ deliberately_missing=""
 rustapicalls=$numapicalls
 for i in $headerapicalls; do
     rustcall=`echo $i|awk '{print substr($0, 8)}'`
-    grep "^pub fn ${rustcall}(" $1/libnozzle/bindings/rust/src/libnozzle.rs > /dev/null 2>/dev/null
+    grep "^pub fn ${rustcall}(" $1/libnozzle/bindings/rust/src/nozzle_bindings.rs > /dev/null 2>/dev/null
     if [ $? = 0 ]
     then
 	rust_found=$((rust_found+1))