Commit a04a9398 authored by Joanne Hugé's avatar Joanne Hugé

xlte: fix password connection

parent 3a35162b
......@@ -56,7 +56,7 @@ def connect(ctx, wsuri, password=None): # -> Conn
ws.settimeout(5) # reasonable default
try:
# FIXME handle ctx cancel (but it won't stuck forever due to ._ws own timeout)
ws.connect(wsuri)
ws.connect(wsuri, password=password)
except Exception as ex:
raise ConnError("connect") from ex
return Conn(ws, wsuri, password)
......@@ -108,6 +108,7 @@ class Conn:
raise ConnError("handshake") from ex
conn.wsuri = wsuri
conn.password = password
conn._ws = ws
conn.srv_ready_msg = msg0
conn.t_srv_ready_msg = t_msg0
......
......@@ -971,7 +971,7 @@ def _x_stats_srv(ctx, reqch: chan, conn: amari.Conn):
# both ue_get and stats queries, due to overall 100Hz rate-limiting, ue_get
# would be retrieved at only 50Hz rate. With separate connection for stats
# we can retrieve both ue_get and stats each at 100Hz simultaneously.
conn_stats = amari.connect(ctx, conn.wsuri)
conn_stats = amari.connect(ctx, conn.wsuri, password=conn.password)
defer(conn_stats.close)
rtt_stats = _IncStats() # like rtt_ue_stats but for stats instead of ue_get
δt_stats = _IncStats() # δ(stats.timestamp)
......
......@@ -418,7 +418,7 @@ class _XMsgServer:
# main logger queries stats, and x.drb_stats server also queries stats
# internally, then data received by main logger will cover only small
# random period of time instead of full wanted period.
conn2 = amari.connect(ctx, conn.wsuri)
conn2 = amari.connect(ctx, conn.wsuri, password=conn.password)
defer(conn2.close)
xsrv._func(ctx, xsrv._reqch, conn2)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment