refactor(userspace/libsinsp): remove any ref to old accept{,4} evts

Signed-off-by: Leonardo Di Giovanna <[email protected]>

Author: ekoops

userspace/libsinsp/event.cpp

@@ -1705,14 +1705,10 @@ bool sinsp_evt::is_file_error() const {
 
 bool sinsp_evt::is_network_error() const {
 	if(m_fdinfo != nullptr) {
-		return (m_fdinfo->m_type == SCAP_FD_IPV4_SOCK) || (m_fdinfo->m_type == SCAP_FD_IPV6_SOCK);
-	} else {
-		return (m_pevt->type == PPME_SOCKET_ACCEPT_X) || (m_pevt->type == PPME_SOCKET_ACCEPT4_X) ||
-		       (m_pevt->type == PPME_SOCKET_ACCEPT_5_X) ||
-		       (m_pevt->type == PPME_SOCKET_ACCEPT4_5_X) ||
-		       (m_pevt->type == PPME_SOCKET_ACCEPT4_6_X) ||
-		       (m_pevt->type == PPME_SOCKET_CONNECT_X) || (m_pevt->type == PPME_SOCKET_BIND_X);
+		return m_fdinfo->m_type == SCAP_FD_IPV4_SOCK || m_fdinfo->m_type == SCAP_FD_IPV6_SOCK;
 	}
+	return m_pevt->type == PPME_SOCKET_ACCEPT_5_X || m_pevt->type == PPME_SOCKET_ACCEPT4_6_X ||
+	       m_pevt->type == PPME_SOCKET_CONNECT_X || m_pevt->type == PPME_SOCKET_BIND_X;
 }
 
 uint64_t sinsp_evt::get_lastevent_ts() const {

userspace/libsinsp/parsers.cpp

@@ -184,10 +184,7 @@ void sinsp_parser::process_event(sinsp_evt &evt, sinsp_parser_verdict &verdict)
 	case PPME_SOCKET_CONNECT_X:
 		parse_connect_exit(evt, verdict);
 		break;
-	case PPME_SOCKET_ACCEPT_X:
 	case PPME_SOCKET_ACCEPT_5_X:
-	case PPME_SOCKET_ACCEPT4_X:
-	case PPME_SOCKET_ACCEPT4_5_X:
 	case PPME_SOCKET_ACCEPT4_6_X:
 		parse_accept_exit(evt, verdict);
 		break;

userspace/libsinsp/sinsp_filtercheck_event.cpp

@@ -1430,9 +1430,8 @@ uint8_t* sinsp_filter_check_event::extract_single(sinsp_evt* evt,
 		} else {
 			uint16_t etype = evt->get_type();
 
-			if(etype == PPME_SOCKET_ACCEPT_X || etype == PPME_SOCKET_ACCEPT_5_X ||
-			   etype == PPME_SOCKET_ACCEPT4_X || etype == PPME_SOCKET_ACCEPT4_5_X ||
-			   etype == PPME_SOCKET_ACCEPT4_6_X || etype == PPME_SOCKET_CONNECT_X) {
+			if(etype == PPME_SOCKET_ACCEPT_5_X || etype == PPME_SOCKET_ACCEPT4_6_X ||
+			   etype == PPME_SOCKET_CONNECT_X) {
 				return extract_error_count(evt, len);
 			}
 		}
@@ -1460,10 +1459,9 @@ uint8_t* sinsp_filter_check_event::extract_single(sinsp_evt* evt,
 			if(const auto etype = evt->get_type();
 			   !(etype == PPME_SYSCALL_OPEN_X || etype == PPME_SYSCALL_CREAT_X ||
 			     etype == PPME_SYSCALL_OPENAT_2_X || etype == PPME_SYSCALL_OPENAT2_X ||
-			     etype == PPME_SYSCALL_OPEN_BY_HANDLE_AT_X || etype == PPME_SOCKET_ACCEPT_X ||
-			     etype == PPME_SOCKET_ACCEPT_5_X || etype == PPME_SOCKET_ACCEPT4_X ||
-			     etype == PPME_SOCKET_ACCEPT4_5_X || etype == PPME_SOCKET_ACCEPT4_6_X ||
-			     etype == PPME_SOCKET_CONNECT_X || evt->get_category() == EC_MEMORY)) {
+			     etype == PPME_SYSCALL_OPEN_BY_HANDLE_AT_X || etype == PPME_SOCKET_ACCEPT_5_X ||
+			     etype == PPME_SOCKET_ACCEPT4_6_X || etype == PPME_SOCKET_CONNECT_X ||
+			     evt->get_category() == EC_MEMORY)) {
 				return extract_error_count(evt, len);
 			}
 		}

userspace/libsinsp/sinsp_filtercheck_fd.cpp

@@ -387,10 +387,7 @@ bool sinsp_filter_check_fd::extract_fdname_from_event(sinsp_evt *evt,
 
 	switch(etype) {
 	case PPME_SYSCALL_OPEN_X:
-	case PPME_SOCKET_ACCEPT_X:
 	case PPME_SOCKET_ACCEPT_5_X:
-	case PPME_SOCKET_ACCEPT4_X:
-	case PPME_SOCKET_ACCEPT4_5_X:
 	case PPME_SOCKET_ACCEPT4_6_X:
 	case PPME_SYSCALL_CREAT_X: {
 		const char *argstr =

userspace/libsinsp/test/public_sinsp_API/events_set.cpp

@@ -339,7 +339,7 @@ TEST(events_set, all_non_sc_event_set) {
 	/* No sc events at all expected. */
 	ASSERT_FALSE(event_set.contains(PPME_GENERIC_E));
 	ASSERT_FALSE(event_set.contains(PPME_GENERIC_X));
-	ASSERT_FALSE(event_set.contains(PPME_SOCKET_ACCEPT_X));
+	ASSERT_FALSE(event_set.contains(PPME_SOCKET_ACCEPT_5_X));
 	ASSERT_FALSE(event_set.contains(PPME_SYSCALL_OPENAT2_E));
 	ASSERT_FALSE(event_set.contains(PPME_SYSCALL_OPENAT2_X));
 	/* Some critical expected non sc events. */