Fixes to previous commit

neilalexander · Oct 21, 2017 · afd1f90 · afd1f90
1 parent e1fd1fc
commit afd1f90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/vyatta-cjdns/opt/vyatta/sbin/vyatta-cjdns-readconf b/vyatta-cjdns/opt/vyatta/sbin/vyatta-cjdns-readconf
@@ -65,18 +65,23 @@ def showConnectionUsernames():
 		print block['user']
 
 def showConnectionDetails(user):
+	listedPorts = []
 	for block in data['authorizedPasswords']:
 		if block['user'] == user:
 			for bind in data['interfaces']['UDPInterface']:
 				if bind['bind'] == "": continue
-				print '"{}":'.format(bind['bind']), '{'
+				tokens = bind['bind'].split(":")
+				if len(tokens) < 2: continue
+				if tokens[1] in listedPorts: continue
+				listedPorts += tokens[1]
+				print '"ip-address:{}":'.format(tokens[-1]),  '{'
 				print '    "publicKey": "{}",'.format(data['publicKey'])
 				print '    "login": "{}",'.format(block['user'])
 				print '    "password": "{}"'.format(block['password'])
 				print '}'
 			return
 	print "No such user found"
-	
+
 try:
     if sys.argv[2] == "getAdminAddress": getAdminAddress()
     if sys.argv[2] == "getAdminPassword": getAdminPassword()

diff --git a/...jdns/node.tag/connection-details/node.def → ....tag/connection-details/node.tag/node.def b/...jdns/node.tag/connection-details/node.def → ....tag/connection-details/node.tag/node.def
@@ -1,3 +1,4 @@
+tag:
 allowed: /opt/vyatta/sbin/vyatta-cjdns-readconf $4 showConnectionUsernames
 run: /opt/vyatta/sbin/vyatta-cjdns-readconf $4 showConnectionDetails $6
 help: Show connection details for a given username