[access lists] use better name for fd_tracker structure

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

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/libknet/internals.h b/libknet/internals.h
@@ -130,11 +130,11 @@ struct knet_sock {
 };
 
 struct knet_fd_trackers {
-	uint8_t transport; /* transport type (UDP/SCTP...) */
-	uint8_t data_type; /* internal use for transport to define what data are associated
-			    * to this fd */
-	void *data;	   /* pointer to the data */
-	void *match_entry; /* pointer to access list match_entry list head */
+	uint8_t transport;		    /* transport type (UDP/SCTP...) */
+	uint8_t data_type;		    /* internal use for transport to define what data are associated
+					     * to this fd */
+	void *data;			    /* pointer to the data */
+	void *access_list_match_entry_head; /* pointer to access list match_entry list head */
 };
 
 #define KNET_MAX_FDS KNET_MAX_HOST * KNET_MAX_LINK * 4

diff --git a/libknet/links_acl.c b/libknet/links_acl.c
@@ -37,7 +37,7 @@ int check_add(knet_handle_t knet_h, int sock, uint8_t transport,
 			err = 0;
 			break;
 		case IP_PROTO:
-			err = ipcheck_addip(&knet_h->knet_transport_fd_tracker[sock].match_entry,
+			err = ipcheck_addip(&knet_h->knet_transport_fd_tracker[sock].access_list_match_entry_head,
 					    ip1, ip2, type, acceptreject);
 			break;
 		default:
@@ -58,7 +58,7 @@ int check_rm(knet_handle_t knet_h, int sock, uint8_t transport,
 			err = 0;
 			break;
 		case IP_PROTO:
-			err = ipcheck_rmip(&knet_h->knet_transport_fd_tracker[sock].match_entry,
+			err = ipcheck_rmip(&knet_h->knet_transport_fd_tracker[sock].access_list_match_entry_head,
 					   ip1, ip2, type, acceptreject);
 			break;
 		default:
@@ -74,7 +74,7 @@ void check_rmall(knet_handle_t knet_h, int sock, uint8_t transport)
 			return;
 			break;
 		case IP_PROTO:
-			ipcheck_rmall(&knet_h->knet_transport_fd_tracker[sock].match_entry);
+			ipcheck_rmall(&knet_h->knet_transport_fd_tracker[sock].access_list_match_entry_head);
 			break;
 		default:
 			break;
@@ -92,7 +92,7 @@ int check_validate(knet_handle_t knet_h, int sock, uint8_t transport, struct soc
 			return 1;
 			break;
 		case IP_PROTO:
-			return ipcheck_validate(&knet_h->knet_transport_fd_tracker[sock].match_entry, checkip);
+			return ipcheck_validate(&knet_h->knet_transport_fd_tracker[sock].access_list_match_entry_head, checkip);
 			break;
 		default:
 			break;

diff --git a/libknet/tests/api_knet_link_set_config.c b/libknet/tests/api_knet_link_set_config.c
@@ -145,7 +145,7 @@ static void test(void)
 	host = knet_h->host_index[1];
 	link = &host->link[0];
 
-	if (knet_h->knet_transport_fd_tracker[link->outsock].match_entry) {
+	if (knet_h->knet_transport_fd_tracker[link->outsock].access_list_match_entry_head) {
 		printf("found access lists for dynamic dst_addr!\n");
 		knet_link_clear_config(knet_h, 1, 0);
 		knet_host_remove(knet_h, 1);
@@ -262,7 +262,7 @@ static void test(void)
 	host = knet_h->host_index[1];
 	link = &host->link[0];
 
-	if (!knet_h->knet_transport_fd_tracker[link->outsock].match_entry) {
+	if (!knet_h->knet_transport_fd_tracker[link->outsock].access_list_match_entry_head) {
 		printf("Unable to find default access lists for static dst_addr!\n");
 		knet_link_clear_config(knet_h, 1, 0);
 		knet_host_remove(knet_h, 1);