This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 706f1fd0e91e2f93b5d8f055c7609c3b0835480a
Author: gaohedong <[email protected]>
AuthorDate: Sun Sep 21 18:55:09 2025 +0800

    net/pkt: deliver data into multiple pkt conn bound to same protocol
    
    deliver data into multiple pkt conn bound to same protocol
    
    Signed-off-by: gaohedong <[email protected]>
---
 net/pkt/pkt.h       |  3 ++-
 net/pkt/pkt_conn.c  | 58 ++++++++++++++++++++++++-----------------------------
 net/pkt/pkt_input.c | 34 ++++++++++++++-----------------
 3 files changed, 43 insertions(+), 52 deletions(-)

diff --git a/net/pkt/pkt.h b/net/pkt/pkt.h
index 29db4661f93..46170ca8407 100644
--- a/net/pkt/pkt.h
+++ b/net/pkt/pkt.h
@@ -174,7 +174,8 @@ void pkt_free(FAR struct pkt_conn_s *conn);
  *
  ****************************************************************************/
 
-FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s *dev);
+FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s *dev,
+                                  FAR struct pkt_conn_s *conn);
 
 /****************************************************************************
  * Name: pkt_nextconn()
diff --git a/net/pkt/pkt_conn.c b/net/pkt/pkt_conn.c
index 1949b97950a..6dc75bd3c0b 100644
--- a/net/pkt/pkt_conn.c
+++ b/net/pkt/pkt_conn.c
@@ -142,6 +142,29 @@ void pkt_free(FAR struct pkt_conn_s *conn)
   NET_BUFPOOL_UNLOCK(g_pkt_connections);
 }
 
+/****************************************************************************
+ * Name: pkt_nextconn()
+ *
+ * Description:
+ *   Traverse the list of allocated packet connections
+ *
+ * Assumptions:
+ *   This function is called from network logic at with the network locked.
+ *
+ ****************************************************************************/
+
+FAR struct pkt_conn_s *pkt_nextconn(FAR struct pkt_conn_s *conn)
+{
+  if (!conn)
+    {
+      return (FAR struct pkt_conn_s *)g_active_pkt_connections.head;
+    }
+  else
+    {
+      return (FAR struct pkt_conn_s *)conn->sconn.s_node.flink;
+    }
+}
+
 /****************************************************************************
  * Name: pkt_active()
  *
@@ -154,20 +177,18 @@ void pkt_free(FAR struct pkt_conn_s *conn)
  *
  ****************************************************************************/
 
-FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s *dev)
+FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s *dev,
+                                  FAR struct pkt_conn_s *conn)
 {
-  FAR struct pkt_conn_s *conn =
-    (FAR struct pkt_conn_s *)g_active_pkt_connections.head;
   uint16_t ethertype = 0;
 
   if (dev->d_lltype == NET_LL_ETHERNET || dev->d_lltype == NET_LL_IEEE80211)
     {
       FAR struct eth_hdr_s *ethhdr = NETLLBUF;
-
       ethertype = ethhdr->type;
     }
 
-  while (conn)
+  while ((conn = pkt_nextconn(conn)) != NULL)
     {
       if (dev->d_ifindex == conn->ifindex &&
           (conn->type == HTONS(ETH_P_ALL) || conn->type == ethertype))
@@ -176,38 +197,11 @@ FAR struct pkt_conn_s *pkt_active(FAR struct net_driver_s 
*dev)
 
           break;
         }
-
-      /* Look at the next active connection */
-
-      conn = (FAR struct pkt_conn_s *)conn->sconn.s_node.flink;
     }
 
   return conn;
 }
 
-/****************************************************************************
- * Name: pkt_nextconn()
- *
- * Description:
- *   Traverse the list of allocated packet connections
- *
- * Assumptions:
- *   This function is called from network logic at with the network locked.
- *
- ****************************************************************************/
-
-FAR struct pkt_conn_s *pkt_nextconn(FAR struct pkt_conn_s *conn)
-{
-  if (!conn)
-    {
-      return (FAR struct pkt_conn_s *)g_active_pkt_connections.head;
-    }
-  else
-    {
-      return (FAR struct pkt_conn_s *)conn->sconn.s_node.flink;
-    }
-}
-
 /****************************************************************************
  * Name: pkt_sendmsg_is_valid
  *
diff --git a/net/pkt/pkt_input.c b/net/pkt/pkt_input.c
index e64550900e9..f7ded2d8c06 100644
--- a/net/pkt/pkt_input.c
+++ b/net/pkt/pkt_input.c
@@ -139,15 +139,19 @@ errout:
 
 static int pkt_in(FAR struct net_driver_s *dev)
 {
-  FAR struct pkt_conn_s *conn;
+  FAR struct pkt_conn_s *conn = NULL;
+  uint16_t flags;
   int ret = OK;
 
+  /* Setup for the application callback */
+
+  dev->d_appdata = dev->d_buf;
+  dev->d_sndlen  = 0;
+
   pkt_conn_list_lock();
-  conn = pkt_active(dev);
-  if (conn)
-    {
-      uint32_t flags;
 
+  while ((conn = pkt_active(dev, conn)) != NULL)
+    {
       if (conn->pendiob == dev->d_iob)
         {
           /* Do not read back the packet sent by oneself.  pendiob is
@@ -155,8 +159,7 @@ static int pkt_in(FAR struct net_driver_s *dev)
            * completes, so it is always a live reference here.
            */
 
-          pkt_conn_list_unlock();
-          return OK;
+          continue;
         }
 
 #ifdef CONFIG_NET_TIMESTAMP
@@ -198,11 +201,6 @@ static int pkt_in(FAR struct net_driver_s *dev)
         }
 #endif /* CONFIG_NET_TIMESTAMP */
 
-      /* Setup for the application callback */
-
-      dev->d_appdata = dev->d_buf;
-      dev->d_sndlen  = 0;
-
       /* Perform the application callback */
 
       flags = pkt_callback(dev, conn, PKT_NEWDATA);
@@ -232,15 +230,13 @@ static int pkt_in(FAR struct net_driver_s *dev)
 
               nwarn("WARNING: Packet not processed\n");
               ret = -EAGAIN;
+              break;
             }
         }
     }
-  else
-    {
-      ninfo("No PKT listener\n");
-    }
 
   pkt_conn_list_unlock();
+
   return ret;
 }
 
@@ -259,9 +255,9 @@ static int pkt_in(FAR struct net_driver_s *dev)
  *
  * Returned Value:
  *   OK     The packet has been processed  and can be deleted
- *  -EAGAIN There is a matching connection, but could not dispatch the packet
- *          yet.  Useful when a packet arrives before a recv call is in
- *          place.
+ *  -EAGAIN There is a matching connection, but could not dispatch the
+ *          packet yet.  Useful when a packet arrives before a recv call
+ *          is in place.
  *
  * Assumptions:
  *   The network is locked.

Reply via email to