Преглед на файлове

ping/exec-on-peer: select first non-linklocal address of peer for connection

Helge Jung преди 9 години
родител
ревизия
5466f5e3c4
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      modules/ffpb.py

+ 2 - 2
modules/ffpb.py

@@ -531,7 +531,7 @@ def ffpb_ping(bot, trigger):
 	node = ffpb_findnode_from_botparam(bot, target_name, ensure_recent_alfreddata=False)
 	if node is None: return
 
-	target = node["network"]["addresses"][0]
+	target = [x for x in node["network"]["addresses"] if not x.lower().startswith("fe80:")][0]
 	target_alias = node["hostname"]
 
 	print("ping '", target , '"', sep='')
@@ -570,7 +570,7 @@ def ffpb_remoteexec(bot, trigger):
 	node = ffpb_findnode_from_botparam(bot, target_name, ensure_recent_alfreddata=False)
 	if node is None: return
 
-	target = node["network"]["addresses"][0]
+	target = [x for x in node["network"]["addresses"] if not x.lower().startswith("fe80:")][0]
 	target_alias = node["hostname"]
 
 	cmd = 'ssh -6 -l root ' + target + ' -- "' + target_cmd + '"'