SHA256 #792

Merged
Atheros1 merged 2 commits from sha256 into master 2015-03-27 20:45:37 +01:00
2 changed files with 3 additions and 8 deletions
Showing only changes of commit ba27f6e8a6 - Show all commits

View File

@ -20,6 +20,8 @@ import socket
import ctypes import ctypes
from struct import pack from struct import pack
import sys import sys
from subprocess import call
import time
from SimpleXMLRPCServer import SimpleXMLRPCServer from SimpleXMLRPCServer import SimpleXMLRPCServer
from api import MySimpleXMLRPCRequestHandler from api import MySimpleXMLRPCRequestHandler
@ -30,25 +32,18 @@ from helper_sql import sqlQuery
import threading import threading
# Classes # Classes
#from helper_sql import *
#from class_sqlThread import *
from class_sqlThread import sqlThread from class_sqlThread import sqlThread
from class_singleCleaner import singleCleaner from class_singleCleaner import singleCleaner
#from class_singleWorker import *
from class_objectProcessor import objectProcessor from class_objectProcessor import objectProcessor
from class_outgoingSynSender import outgoingSynSender from class_outgoingSynSender import outgoingSynSender
from class_singleListener import singleListener from class_singleListener import singleListener
from class_singleWorker import singleWorker from class_singleWorker import singleWorker
#from class_addressGenerator import *
from class_addressGenerator import addressGenerator from class_addressGenerator import addressGenerator
from debug import logger from debug import logger
# Helper Functions # Helper Functions
import helper_bootstrap import helper_bootstrap
import helper_generic import helper_generic
from subprocess import call
import time
def connectToStream(streamNumber): def connectToStream(streamNumber):

View File

@ -145,5 +145,5 @@ def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
return False return False
except Exception as err: except Exception as err:
print 'An Exception occurred within isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections:', err print "Info: we could not tell whether your OS is limited to having very view half open connections because we couldn't interpret the platform version. Don't worry; we'll assume that it is not limited. This tends to occur on Raspberry Pis. :", err
return False return False