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

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

commit 1a934a4da076fe7b50485e62b058b34ba0415933
Author: xuxingliang <[email protected]>
AuthorDate: Sat Aug 31 18:29:31 2024 +0800

    tools/gdb: fix older version gdb compatibility issue
    
    Prebuilt arm-none-eabi-gdb may have not socket module available.
    
    Signed-off-by: xuxingliang <[email protected]>
---
 tools/gdb/net.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/gdb/net.py b/tools/gdb/net.py
index 3f2e23fd5f..7de874680e 100644
--- a/tools/gdb/net.py
+++ b/tools/gdb/net.py
@@ -18,18 +18,19 @@
 #
 ############################################################################
 
-import socket
-
 import gdb
 import utils
 from lists import dq_for_every, sq_for_every
 
+socket = utils.import_check(
+    "socket", errmsg="No socket module found, please try gdb-multiarch 
instead."
+)
+
 NET_IPv4 = utils.get_symbol_value("CONFIG_NET_IPv4")
 NET_IPv6 = utils.get_symbol_value("CONFIG_NET_IPv6")
 
-# NuttX's AF_INET and AF_INET6 have same value as Linux's
-AF_INET = socket.AF_INET
-AF_INET6 = socket.AF_INET6
+AF_INET = utils.get_symbol_value("AF_INET")
+AF_INET6 = utils.get_symbol_value("AF_INET6")
 
 
 def ntohs(val):
@@ -247,5 +248,5 @@ class NetStats(gdb.Command):
             gdb.write("\n")
 
 
-if utils.get_symbol_value("CONFIG_NET"):
+if utils.get_symbol_value("CONFIG_NET") and socket:
     NetStats()

Reply via email to