fix: tcp poll没有正确处理posix socket的listen状态的问题 (DragonOS-Community#859)

Author: fslongjin

kernel/src/net/event_poll/mod.rs

@@ -436,6 +436,7 @@ impl EventPoll {
             }
             // 判断epoll上有没有就绪事件
             let mut available = epoll_guard.ep_events_available();
+
             drop(epoll_guard);
             loop {
                 if available {
@@ -759,6 +760,7 @@ impl EventPoll {
 /// 与C兼容的Epoll事件结构体
 #[derive(Copy, Clone, Default)]
 #[repr(packed)]
+#[repr(C)]
 pub struct EPollEvent {
     /// 表示触发的事件
     events: u32,
@@ -870,5 +872,8 @@ bitflags! {
 
         /// 表示epoll已经被释放，但是在目前的设计中未用到
         const POLLFREE = 0x4000;
+
+        /// listen状态的socket可以接受连接
+        const EPOLL_LISTEN_CAN_ACCEPT = Self::EPOLLIN.bits | Self::EPOLLRDNORM.bits;
     }
 }

kernel/src/net/net_core.rs

@@ -191,25 +191,25 @@ fn send_event(sockets: &smoltcp::iface::SocketSet) -> Result<(), SystemError> {
     for (handle, socket_type) in sockets.iter() {
         let handle_guard = HANDLE_MAP.read_irqsave();
         let global_handle = GlobalSocketHandle::new_smoltcp_handle(handle);
-        let item = handle_guard.get(&global_handle);
+        let item: Option<&super::socket::SocketHandleItem> = handle_guard.get(&global_handle);
         if item.is_none() {
             continue;
         }
 
         let handle_item = item.unwrap();
+        let posix_item = handle_item.posix_item();
+        if posix_item.is_none() {
+            continue;
+        }
+        let posix_item = posix_item.unwrap();
 
         // 获取socket上的事件
-        let mut events =
-            SocketPollMethod::poll(socket_type, handle_item.shutdown_type()).bits() as u64;
+        let mut events = SocketPollMethod::poll(socket_type, handle_item).bits() as u64;
 
         // 分发到相应类型socket处理
         match socket_type {
             smoltcp::socket::Socket::Raw(_) | smoltcp::socket::Socket::Udp(_) => {
-                handle_guard
-                    .get(&global_handle)
-                    .unwrap()
-                    .wait_queue
-                    .wakeup_any(events);
+                posix_item.wakeup_any(events);
             }
             smoltcp::socket::Socket::Icmp(_) => unimplemented!("Icmp socket hasn't unimplemented"),
             smoltcp::socket::Socket::Tcp(inner_socket) => {
@@ -222,17 +222,14 @@ fn send_event(sockets: &smoltcp::iface::SocketSet) -> Result<(), SystemError> {
                 if inner_socket.state() == smoltcp::socket::tcp::State::CloseWait {
                     events |= EPollEventType::EPOLLHUP.bits() as u64;
                 }
-                handle_guard
-                    .get(&global_handle)
-                    .unwrap()
-                    .wait_queue
-                    .wakeup_any(events);
+
+                posix_item.wakeup_any(events);
             }
             smoltcp::socket::Socket::Dhcpv4(_) => {}
             smoltcp::socket::Socket::Dns(_) => unimplemented!("Dns socket hasn't unimplemented"),
         }
         EventPoll::wakeup_epoll(
-            &handle_item.epitems,
+            &posix_item.epitems,
             EPollEventType::from_bits_truncate(events as u32),
         )?;
         drop(handle_guard);