[access lists] remove 2 unnecessary wrappers

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · Mar 1, 2019 · 27a53e2 · 27a53e2
1 parent fa54d64
commit 27a53e2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/libknet/links.c b/libknet/links.c
@@ -258,7 +258,9 @@ int knet_link_set_config(knet_handle_t knet_h, knet_node_id_t host_id, uint8_t l
 	    (link->dynamic == KNET_LINK_STATIC)) {
 		log_debug(knet_h, KNET_SUB_LINK, "Configuring default access lists for host: %u link: %u socket: %d",
 			  host_id, link_id, link->outsock);
-		if (_link_add_default_acl(knet_h, link) < 0) {
+		if (check_add(knet_h, link->outsock, transport,
+			      &link->dst_addr, &link->dst_addr,
+			      CHECK_TYPE_ADDRESS, CHECK_ACCEPT) < 0) {
 			log_warn(knet_h, KNET_SUB_LINK, "Failed to configure default access lists for host: %u link: %u", host_id, link_id);
 			savederrno = errno;
 			err = -1;
@@ -439,7 +441,9 @@ int knet_link_clear_config(knet_handle_t knet_h, knet_node_id_t host_id, uint8_t
 	 */
 	if ((transport_get_acl_type(knet_h, link->transport_type) == USE_GENERIC_ACL) &&
 	    (link->dynamic == KNET_LINK_STATIC)) {
-		if (_link_rm_default_acl(knet_h, link) < 0) {
+		if (check_rm(knet_h, link->outsock, link->transport_type,
+			     &link->dst_addr, &link->dst_addr,
+			     CHECK_TYPE_ADDRESS, CHECK_ACCEPT) < 0) {
 			err = -1;
 			savederrno = EBUSY;
 			log_err(knet_h, KNET_SUB_LINK, "Host %u link %u: unable to remove default access list",

diff --git a/libknet/links_acl.c b/libknet/links_acl.c
@@ -91,15 +91,3 @@ int check_validate(knet_handle_t knet_h, int sockfd, struct sockaddr_storage *ch
 	 */
 	return 0;
 }
-
-int _link_add_default_acl(knet_handle_t knet_h, struct knet_link *kh_link)
-{
-	return check_add(knet_h, kh_link->outsock, kh_link->transport_type,
-			&kh_link->dst_addr, &kh_link->dst_addr, CHECK_TYPE_ADDRESS, CHECK_ACCEPT);
-}
-
-int _link_rm_default_acl(knet_handle_t knet_h, struct knet_link *kh_link)
-{
-	return check_rm(knet_h, kh_link->outsock, kh_link->transport_type,
-			&kh_link->dst_addr, &kh_link->dst_addr, CHECK_TYPE_ADDRESS, CHECK_ACCEPT);
-}
diff --git a/libknet/links_acl.h b/libknet/links_acl.h
@@ -39,7 +39,4 @@ int check_rm(knet_handle_t knet_h, int sock, uint8_t transport,
 void check_rmall(knet_handle_t knet_h, int sock, uint8_t transport);
 int check_validate(knet_handle_t knet_h, int sockfd, struct sockaddr_storage *checkip);
 
-int _link_add_default_acl(knet_handle_t knet_h, struct knet_link *kh_link);
-int _link_rm_default_acl(knet_handle_t knet_h, struct knet_link *kh_link);
-
 #endif