|
@@ -1,13 +1,14 @@
|
|
|
+from __future__ import print_function
|
|
|
import willie
|
|
|
|
|
|
import netaddr
|
|
|
-import urllib3
|
|
|
+import urllib2
|
|
|
import re
|
|
|
import os
|
|
|
import subprocess
|
|
|
|
|
|
import socket
|
|
|
-import socketserver
|
|
|
+import SocketServer
|
|
|
import threading
|
|
|
|
|
|
msgserver = None
|
|
@@ -21,7 +22,7 @@ msgserver_known_senders = {
|
|
|
"10.132.254.80": "public"
|
|
|
}
|
|
|
|
|
|
-class MsgHandler(socketserver.BaseRequestHandler):
|
|
|
+class MsgHandler(SocketServer.BaseRequestHandler):
|
|
|
def handle(self):
|
|
|
data = self.request.recv(2048).strip()
|
|
|
sender = self.client_address[0]
|
|
@@ -37,9 +38,9 @@ class MsgHandler(socketserver.BaseRequestHandler):
|
|
|
if bot.config.has_section('ffpb') and not (bot.config.ffpb.msg_target is None):
|
|
|
target = bot.config.ffpb.msg_target
|
|
|
|
|
|
- bot.msg(target, "[{0}] {1}".format(sender,str(data, "utf-8")))
|
|
|
+ bot.msg(target, "[{0}] {1}".format(sender, str(data, "utf-8"))
|
|
|
|
|
|
-class ThreadingTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
|
|
|
+class ThreadingTCPServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
|
|
|
pass
|
|
|
|
|
|
def setup(bot):
|
|
@@ -71,7 +72,7 @@ def shutdown(bot):
|
|
|
@willie.module.commands('status')
|
|
|
def ffpb_status(bot, trigger):
|
|
|
"""Status des FFPB-Netzes: Anzahl (aktiver) Knoten + Clients"""
|
|
|
- response = urllib3.urlopen('http://nodecount.paderborn.freifunk.net/')
|
|
|
+ response = urllib2.urlopen('http://nodecount.paderborn.freifunk.net/')
|
|
|
html = response.read()
|
|
|
m = re.search('<div id="nodecount">\s*(\d+)\s*</div>', html)
|
|
|
nodecount = int(m.group(1))
|