AaronFiore/electrum
1
0
Fork 0
Code Activity

show hostnames

Browse Source
This commit is contained in:
ThomasV
2011-11-23 13:16:36 +03:00
parent f828d43c00
commit 52d8ed16de
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/electrum.php
View File

@@ -21,7 +21,7 @@
return $buf; return $buf;
} }
$pass=''; $pass = '';
$query = $_POST['q']; $query = $_POST['q'];
if( !$query ) { if( !$query ) {
@@ -31,14 +31,15 @@
echo "Server status:<br/>"; echo "Server status:<br/>";
echo "Number of blocks: ". do_query( "('b','')" ) ."<br/>"; echo "Number of blocks: ". do_query( "('b','')" ) ."<br/>";
echo "Current load: ". do_query( "('load',$pass)" ) ."<br/><br/>"; echo "Current load: ". do_query( "('load','$pass')" ) ."<br/><br/>";
echo "List of active servers:<br/>\n"; echo "List of active servers:<br/>\n";
$str = do_query( "('peers','')" ); $str = do_query( "('peers','')" );
preg_match_all("/(\d+\.\d+\.\d+\.\d+)/",$str,$matches,PREG_SET_ORDER); // preg_match_all("/\('(.*?)', '(\d+\.\d+\.\d+\.\d+)'\)/",$str,$matches,PREG_SET_ORDER);
preg_match_all("/\('(.*?)', '(.*?)'\)/", $str, $matches, PREG_SET_ORDER);
echo "<ul>"; echo "<ul>";
foreach( $matches as $ip){ foreach( $matches as $m){
echo "<li><a href=\"http://" . $ip[0] . "/electrum.php\">" . $ip[0] . "</a></li>"; echo "<li><a href=\"http://" . $m[2] . "/electrum.php\">" . $m[2]."</a> <small>[".$m[1]."]</small></li>";
} }
echo "</ul>"; echo "</ul>";

15
server/server.py
View File

@@ -22,7 +22,7 @@ Todo:
""" """
import time, socket, operator, thread, ast, sys import time, socket, operator, thread, ast, sys,re
import psycopg2, binascii import psycopg2, binascii
import bitcoinrpc import bitcoinrpc
@@ -435,8 +435,8 @@ def irc_thread():
try: try:
s = socket.socket() s = socket.socket()
s.connect(('irc.freenode.net', 6667)) s.connect(('irc.freenode.net', 6667))
s.send('USER '+NICK+' '+NICK+' bla :'+NICK+'\n') s.send('USER '+HOST+' '+NICK+' bla :'+NICK+'\n')
s.send('NICK '+NICK+'\n') s.send('NICK '+NICK+'\n')
s.send('JOIN #electrum\n') s.send('JOIN #electrum\n')
t = 0 t = 0
while not stopping: while not stopping:
@@ -456,9 +456,12 @@ def irc_thread():
s.send('USERHOST %s\n'%item) s.send('USERHOST %s\n'%item)
elif '302' in line: # answer to /userhost elif '302' in line: # answer to /userhost
k = line.index('302') k = line.index('302')
name = line[k+2].split('=')[0] m = re.match( "^:(.*?)=\+~(.*?)@(.*?)$", line[k+2] )
host = line[k+2].split('@')[1] if m:
peer_list[name] = host name = m.group(1)
host = m.group(2)
ip = m.group(3)
peer_list[name] = (ip,host)
elif time.time() - t > 5*60: elif time.time() - t > 5*60:
s.send('NAMES #electrum\n') s.send('NAMES #electrum\n')
t = time.time() t = time.time()