[access lists] cleanup API a bit

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
kronosnet · May 9, 2019 · 34d87fa · 34d87fa
1 parent be01691
commit 34d87fa
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/libknet/links_acl.c b/libknet/links_acl.c
@@ -71,22 +71,10 @@ void check_rmall(knet_handle_t knet_h, int sock, uint8_t transport)
 	}
 }
 
-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);
-}
-
 /*
  * return 0 to reject and 1 to accept a packet
  */
-int _generic_filter_packet_by_acl(knet_handle_t knet_h, int sockfd, struct sockaddr_storage *checkip)
+int check_validate(knet_handle_t knet_h, int sockfd, struct sockaddr_storage *checkip)
 {
 	switch(transport_get_proto(knet_h, knet_h->knet_transport_fd_tracker[sockfd].transport)) {
 		case LOOPBACK:
@@ -103,3 +91,15 @@ int _generic_filter_packet_by_acl(knet_handle_t knet_h, int sockfd, struct socka
 	 */
 	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
@@ -37,8 +37,9 @@ int check_rm(knet_handle_t knet_h, int sock, uint8_t transport,
 	     struct sockaddr_storage *ip1, struct sockaddr_storage *ip2,
 	     check_type_t type, check_acceptreject_t acceptreject);
 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);
-int _generic_filter_packet_by_acl(knet_handle_t knet_h, int sockfd, struct sockaddr_storage *checkip);
 
 #endif
diff --git a/libknet/threads_rx.c b/libknet/threads_rx.c
@@ -808,7 +808,7 @@ static void _handle_recv_from_links(knet_handle_t knet_h, int sockfd, struct kne
 				 */
 				if ((knet_h->use_access_lists) &&
 				    (transport_get_acl_type(knet_h, transport) == USE_GENERIC_ACL)) {
-					if (!_generic_filter_packet_by_acl(knet_h, sockfd, msg[i].msg_hdr.msg_name)) {
+					if (!check_validate(knet_h, sockfd, msg[i].msg_hdr.msg_name)) {
 						char src_ipaddr[KNET_MAX_HOST_LEN];
 						char src_port[KNET_MAX_PORT_LEN];
 

diff --git a/libknet/transport_sctp.c b/libknet/transport_sctp.c
@@ -731,7 +731,7 @@ static void _handle_incoming_sctp(knet_handle_t knet_h, int listen_sock)
 	log_debug(knet_h, KNET_SUB_TRANSP_SCTP, "Incoming: received connection from: %s port: %s",
 						addr_str, port_str);
 	if (knet_h->use_access_lists) {
-		if (!_generic_filter_packet_by_acl(knet_h, listen_sock, &ss)) {
+		if (!check_validate(knet_h, listen_sock, &ss)) {
 			savederrno = EINVAL;
 			err = -1;
 			log_debug(knet_h, KNET_SUB_TRANSP_SCTP, "Connection rejected from %s/%s", addr_str, port_str);