michaelh/zephyr
1
0
Fork 0
Code Releases Activity

soc: xtensa: tools: remove dependency of netifaces package

Browse source 
Because we use INADDR_ANY by default now, specifying a net interface
is no longer needed. Remove it and remove the dependency of the
netifaces python package.

Fixes. #48584

Signed-off-by: Enjia Mai <enjia.mai@intel.com>
This commit is contained in:
Enjia Mai 2022-08-04 09:12:03 +08:00 • committed by Marti Bolivar
commit a38f533278
2 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
scripts/requirements-run-test.txt
View file

@ -16,6 +16,3 @@ cbor>=1.0.0
# use for twister # use for twister
psutil psutil
# use for adsp runner
netifaces

30
soc/xtensa/intel_adsp/tools/cavstool.py
View file

@ -13,7 +13,6 @@ import mmap
import argparse import argparse
import socketserver import socketserver
import threading import threading
import netifaces
import hashlib import hashlib
from urllib.parse import urlparse from urllib.parse import urlparse
@ -831,28 +830,6 @@ def adsp_log(output, server):
sys.stdout.write(output) sys.stdout.write(output)
sys.stdout.flush() sys.stdout.flush()
def get_host_ip(net_iface):
"""
Helper tool use to detect host's serving ip address.
"""
interfaces = netifaces.interfaces()
for i in interfaces:
if i != "lo":
try:
netifaces.ifaddresses(i)
ip = netifaces.ifaddresses(i)[netifaces.AF_INET][0]['addr']
log.info (f"Found interface {i}, IP address: {ip}")
except Exception:
log.info(f"Ignore the interface {i} which is not activated.")
if i == net_iface:
log.info(f"Serve on interface {i} only, IP address: {ip}")
return ip
log.info("Serve on all found available interface.")
return None
ap = argparse.ArgumentParser(description="DSP loader/logger tool") ap = argparse.ArgumentParser(description="DSP loader/logger tool")
ap.add_argument("-q", "--quiet", action="store_true", ap.add_argument("-q", "--quiet", action="store_true",
@ -865,8 +842,6 @@ ap.add_argument("-n", "--no-history", action="store_true",
help="No current log buffer at start, just new output") help="No current log buffer at start, just new output")
ap.add_argument("-s", "--server-addr", ap.add_argument("-s", "--server-addr",
help="Specify the only IP address the log server will LISTEN on") help="Specify the only IP address the log server will LISTEN on")
ap.add_argument("-i", "--interface",
help="Specify the network interface the service will LISTEN to")
ap.add_argument("-p", "--log-port", ap.add_argument("-p", "--log-port",
help="Specify the PORT that the log server to active") help="Specify the PORT that the log server to active")
ap.add_argument("-r", "--req-port", ap.add_argument("-r", "--req-port",
@ -900,11 +875,6 @@ if args.log_port:
if args.req_port: if args.req_port:
PORT_REQ = int(args.req_port) PORT_REQ = int(args.req_port)
iface = get_host_ip(args.interface)
if args.interface:
HOST = iface
log.info(f"Serve on LOG PORT: {PORT_LOG} REQ PORT: {PORT_REQ}") log.info(f"Serve on LOG PORT: {PORT_LOG} REQ PORT: {PORT_REQ}")
if __name__ == "__main__": if __name__ == "__main__":