diff --git a/syncplay/server.py b/syncplay/server.py index 3996311..39538dc 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -11,7 +11,7 @@ import codecs import os from string import Template import argparse -from syncplay.utils import RoomPasswordProvider, NotControlledRoom, RandomStringGenerator, meetsMinVersion +from syncplay.utils import RoomPasswordProvider, NotControlledRoom, RandomStringGenerator, meetsMinVersion,displayIP class SyncFactory(Factory): def __init__(self, password='', motdFilePath=None, isolateRooms=False, salt=None, disableReady=False): @@ -22,6 +22,7 @@ class SyncFactory(Factory): if salt is None: salt = RandomStringGenerator.generate_server_salt() print getMessage("no-salt-notification").format(salt) + displayIP() self._salt = salt self._motdFilePath = motdFilePath self.disableReady = disableReady diff --git a/syncplay/utils.py b/syncplay/utils.py index fb629df..44ea122 100644 --- a/syncplay/utils.py +++ b/syncplay/utils.py @@ -115,6 +115,33 @@ def formatSize (bytes, precise=False): def isASCII(s): return all(ord(c) < 128 for c in s) +def displayIP(): + print "---------------------------" + print "Your Local IP's are:" + displayLocalIPs() + print "---------------------------" + print "Your active network IP is." + displayNetworkIP() + print "---------------------------" + + +def displayLocalIPs(): + from netifaces import interfaces, ifaddresses, AF_INET + addresses=[] + for ifaceName in interfaces(): + for i in ifaddresses(ifaceName).setdefault(AF_INET, [{'addr':'No IP addr'}] ): + if i['addr'] not in ('127.0.0.1','No IP addr') and not i['addr'].startswith('169.254') : + addresses.append(i['addr']) + for j in addresses: + print j + +def displayNetworkIP(): + import socket + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.connect(("syncplay.pl",80)) + print(s.getsockname()[0]) + s.close() + def findWorkingDir(): frozen = getattr(sys, 'frozen', '') if not frozen: diff --git a/syncplayServer.py b/syncplayServer.py index b4456d7..159df2a 100755 --- a/syncplayServer.py +++ b/syncplayServer.py @@ -21,4 +21,5 @@ if __name__ == '__main__': args = argsGetter.getConfiguration() reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.isolate_rooms, args.salt, args.disable_ready)) + print "Your Port is.\n" + str(args.port) reactor.run()