<![CDATA[%s]]>

+ + +""") + for x in imdb.im_list(): + if x[0]: + self.wfile.write((""\ + "" % x[1:]).encode('utf-8')) + else: + self.wfile.write((""\ + "" % x[1:]).encode('utf-8')) + self.wfile.write("""\ +

日時	名前	メッセージ
%s	"\ + "%s	%s
%s	"\ + "%s	%s

d	IP	Port	URL	title	note	date	size	hash
%d	%s	%d	%s	%s	%s	%s	%d	%s

Port

URL

title

note

date

size

hash

d	Name	flg	IP	Port	UA	ID
%d	%s	%s	%s	%d	%s	%s

Name

flg

Port

ID	IP	ポート	ノード名	UA	ハッシュ
%s	%s	%s	%s	%s	%s

ポート

ノード名

ハッシュ

ノード数	dat数	datキー数	検索中dat数
%d	%d	%d	%d

シャットダウン

opy2onをシャットダウンしますか?

はい / いいえ

\r\n" + board_xml += "\r\n" + for b in boards: board_xml += "%s\r\n" % b + board_xml += "\r\n" + return board_xml + +class Query: + def __init__(self, filename): + self.lock = threading.Lock() + self.file = filename + with self.lock: + self.list = [] + self.load() + with self.lock: + self.semap = threading.Semaphore(len(self.list)) + def __len__(self): + with self.lock: return len(self.list) + def __str__(self): + with self.lock: + return "\n".join(map(str, self.list)) + def save(self): + pkl_file = open(self.file,"wb") + with self.lock: + cPickle.dump(self.list, pkl_file,-1) + pkl_file.close() + def load(self): + if(os.path.isfile(self.file)): + pkl_file = open(self.file,"rb") + with self.lock: + self.list = cPickle.load(pkl_file) + pkl_file.close() + def add(self,x): + with self.lock: + if not x in self.list: + self.list.append(x) + self.semap.release() + def pop(self): + self.semap.acquire() + with self.lock: + if len(self.list): + return self.list.pop(0) + +class DatQuery(Query): + def __init__(self): + Query.__init__(self, DatQueryFile) +class KeyQuery(Query): + def __init__(self): + Query.__init__(self, KeyQueryFile) Added: trunk/opy2on/o2on_config.py.sample =================================================================== --- trunk/opy2on/o2on_config.py.sample (rev 0) +++ trunk/opy2on/o2on_config.py.sample 2009-08-07 19:13:53 UTC (rev 142) @@ -0,0 +1,70 @@ +#!/usr/bin/python +# -*- coding: utf-8 + +# P2Pサーバのポート +P2PPort = 0 + +# プロキシのポート +ProxyPort = 8000 + +# Adminサーバのポート +AdminPort = 9999 + +# ノードをインポートするURL http, ftp, file などが使える +Node_List_URLs = ["http://o2on.jf.land.to/node/node.xml", + "http://o2on.sourceforge.jp/nodes/"] + +# dat保存ディレトクリ +DatDir = "dat" + +# 集めるdatのリスト None にしておくと全て +DatCollectionBoardList = [] +# DatCollectionBoardList = None +# DatCollectionBoardList = ["2ch.net:tech", "2ch.net:unix", "2ch.net:linux"] + +# dat を gzip で保存するかどうか +DatSaveAsGzip = False +# DatSaveAsGzip = True + +# 接続タイムアウト (単位: 秒) +SocketTimeout = 20 + +# このノードの名前今のところ日本語(ascii以外)はうまく動かない。 +NodeName = "" + +# 持ってない dat がプロキシにリクエストされたら取得しておくかどうか +RequestNonExistDat = False +# RequestNonExistDat = True + +# 2channel.brd のパス +Path2channel_brd = "2channel.brd" + +# ping 後にふたたびpingを行なう時間 (単位: 秒) +RePingSec = 300 + +# メッセージの通知にD-Busを使うかどうか +# True にしておくといくつかのメッセージがpopupされる +UseDBus = False +# UseDBus = True + +# ログを標準出力に出力するかどうか +NoLog = False +# NoLog = True + +############################ +# 以下は基本的にデバッグ用 # +############################ + +# pingでローカルなIPアドレスを報告されても無視する +IgnoreLocalIP = True + +# プロファイルを取得する。どこで時間をとっているのかを計測します。 +RecordProfile = False + +# プロファイルの出力先 +ProfileDir = "profile" + +# エラーが起きた時に error-<時間>.txt にエラーメッセージを出力するかど +# うか。 +OutputErrorFile = False +# OutputError = True Added: trunk/opy2on/opy2on.py =================================================================== --- trunk/opy2on/opy2on.py (rev 0) +++ trunk/opy2on/opy2on.py 2009-08-07 19:13:53 UTC (rev 142) @@ -0,0 +1,200 @@ +#!/usr/bin/python +# -*- coding: utf-8 + +from binascii import hexlify +import socket +import sys +import os.path +import os +import re +import traceback +import time +import threading + +sys.path.append("lib") + +import o2on_profile +import o2on_node +import o2on_util +import o2on_config +import o2on_server +import o2on_dat +import o2on_const +import o2on_key +import o2on_job +import o2on_im + +def showstat(args): + glob.logger.begin() + glob.logger.log("GLOBAL", "nodes %d" % len(glob.nodedb)) + glob.logger.log("GLOBAL", "datquery %d" % len(glob.datquery)) + glob.logger.log("GLOBAL", "dat %d" % len(glob.datdb)) + glob.logger.log("GLOBAL", "key %d" % len(glob.keydb)) + glob.logger.end() + +def showmynode(args): + if glob.prof.mynode.ip: + glob.logger.log("GLOBAL", + "my node is %s%s%s" % (hexlify(glob.prof.mynode.id), + o2on_node.ip2e(glob.prof.mynode.ip), + o2on_node.port2e(glob.prof.mynode.port))) + else: + glob.logger.log("GLOBAL", "Didn't get global IP") + +def read_2channel_brd(): + res = [] + regBoard = re.compile(r'^\s+[^.]+\.'+o2on_const.regHosts+r'\s+([a-z0-9]+)\s') + if os.path.isfile(o2on_config.Path2channel_brd): + f = open(o2on_config.Path2channel_brd) + while True: + line = f.readline() + if line == '':break + m = regBoard.match(line) + if m: + res.append(m.group(1)+":"+m.group(2)) + f.close() + return res + +def show_myid(x): + glob.logger.log("GLOBAL", "my ID is %s" % hexlify(glob.prof.mynode.id)) + +def show_mypubkey(x): + glob.logger.log("GLOBAL", "my pubkey is %s" % hexlify(glob.prof.mynode.pubkey)) + +def exportnode(x): + glob.nodedb.exportnode() + +def showdatquery(x): + glob.logger.begin() + glob.logger.log("GLOBAL", "-"*80) + for x in str(glob.datquery).split("\n"): + glob.logger.log("GLOBAL", x) + glob.logger.log("GLOBAL", "-"*80) + glob.logger.end() + +def showhelp(x): + glob.logger.begin() + glob.logger.log("GLOBAL", "datq: show searching dat") + glob.logger.log("GLOBAL", "exit: finish program") + glob.logger.log("GLOBAL", "exportnode: export nodes to 'exportnodes.xml'") + glob.logger.log("GLOBAL", "help: show this help") + glob.logger.log("GLOBAL", "keys: show keys") + glob.logger.log("GLOBAL", "myid: show my ID") + glob.logger.log("GLOBAL", "mynode: show my node info") + glob.logger.log("GLOBAL", "mypubkey: show my RSA public key") + glob.logger.log("GLOBAL", "nodes: show nodes") + glob.logger.log("GLOBAL", + "stat: show the numbers of nodes, searching dats, owning dats, keys") + glob.logger.end() + +def readcommand(glob): + try: + regexit = re.compile(r'^exit\s*$') + while True: + foo = sys.stdin.readline() + if regexit.match(foo): break + if foo == '': break + args = re.compile("\s+").split(foo) + procd = False + for c in commands.keys(): + if c == args[0]: + commands[c](args[1:]) + procd = True + break + if not procd: glob.logger.log("GLOBAL", "No such command: %s" % args[0]) + except Exception,inst: + if o2on_config.OutputErrorFile: + f = open('error-'+str(int(time.time()))+'.txt', 'w') + traceback.print_exc(file=f) + f.close() + self.glob.logger.popup("ERROR", str(inst)) + glob.shutdown.set() + +class dammy: pass + +#socket.setdefaulttimeout(o2on_config.SocketTimeout) + +if not os.path.exists(o2on_const.DBDir): + os.makedirs(o2on_const.DBDir) + +glob = dammy() +glob.logger = o2on_util.Logger() +glob.prof = o2on_profile.Profile(glob.logger) + +glob.nodedb = o2on_node.NodeDB(glob) +glob.datdb = o2on_dat.DatDB(glob) +glob.keydb = o2on_key.KeyDB(glob) +glob.imdb = o2on_im.IMDB(glob) + +glob.datquery = o2on_util.DatQuery() +glob.keyquery = o2on_util.KeyQuery() +glob.allboards = read_2channel_brd() + +glob.shutdown = threading.Event() + +o2on_node.build_common_header(glob.prof) +o2on_server.build_common_header(glob.prof) + +th = threading.Thread(target=readcommand, args=(glob,)) +th.setDaemon(True) +th.start() + +show_myid(None) +show_mypubkey(None) + +jobs = ( + o2on_job.GetIPThread(glob), + o2on_job.ProxyServerThread(glob), + o2on_job.AdminServerThread(glob), + o2on_job.NodeCollectorThread(glob), + o2on_job.DatCollectorThread(glob), + o2on_job.AskNodeCollectionThread(glob), + o2on_job.PublishOrigThread(glob), + o2on_job.PublishKeyThread(glob), + o2on_job.SearchThread(glob), + o2on_job.DatQueryThread(glob), + o2on_job.P2PServerThread(glob), + ) + +for j in jobs: j.start() + +commands = { + "datq": showdatquery, + 'exportnode': exportnode, + "help": showhelp, + "keys": (lambda x: glob.keydb.show()), + "myid": show_myid, + "mynode" : showmynode, + "mypubkey": show_mypubkey, + "nodes": (lambda x: glob.nodedb.show()), + "stat": showstat, +} + +try: + glob.shutdown.wait() +except KeyboardInterrupt: + pass +except Exception,inst: + if o2on_config.OutputErrorFile: + f = open('error-'+str(int(time.time()))+'.txt', 'w') + traceback.print_exc(file=f) + f.close() + glob.logger.popup("ERROR", str(inst)) + +glob.logger.log("GLOBAL", "Finish Jobs") +for j in jobs: j.stop() +glob.logger.popup("GLOBAL", "Waiting for Jobs to stop") +n = len(jobs) +c = 0 +for j in jobs: + j.join(1) + while j.isAlive(): + glob.logger.popup("GLOBAL", "Waiting for %s" % j.name) + j.join(7) + c += 1 + glob.logger.log("GLOBAL", "Finished %d/%d" % (c, n)) +glob.imdb.save() +glob.keydb.save() +glob.datdb.save() +glob.nodedb.save() +glob.logger.popup("GLOBAL", "Finished Completely") Property changes on: trunk/opy2on/opy2on.py ___________________________________________________________________ Added: svn:executable + * From o2on-svn ＠ lists.sourceforge.jp Sat Aug 8 16:49:21 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 08 Aug 2009 16:49:21 +0900 Subject: [o2on-svn] [151] Support python 2.5 Message-ID: <1249717761.267413.24116.nullmailer@users.sourceforge.jp> Revision: 151 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=151 Author: nawota Date: 2009-08-08 16:49:21 +0900 (Sat, 08 Aug 2009) Log Message: ----------- Support python 2.5 Modified Paths: -------------- trunk/opy2on/README trunk/opy2on/lib/o2on_dat.py trunk/opy2on/lib/o2on_im.py trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_node.py trunk/opy2on/lib/o2on_server.py trunk/opy2on/lib/o2on_util.py Modified: trunk/opy2on/README =================================================================== --- trunk/opy2on/README 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/README 2009-08-08 07:49:21 UTC (rev 151) @@ -8,9 +8,9 @@ 必要なもの -- python 2.6 +- python 2.5 (できれば 2.6) - pycrypto -- D-Bus を使うならば python-dbus +- D-Bus を使うならば dbus-python 起動 Modified: trunk/opy2on/lib/o2on_dat.py =================================================================== --- trunk/opy2on/lib/o2on_dat.py 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/lib/o2on_dat.py 2009-08-08 07:49:21 UTC (rev 151) @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import with_statement + import threading import cPickle import os.path Modified: trunk/opy2on/lib/o2on_im.py =================================================================== --- trunk/opy2on/lib/o2on_im.py 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/lib/o2on_im.py 2009-08-08 07:49:21 UTC (rev 151) @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import with_statement + import threading import os.path import cPickle Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/lib/o2on_key.py 2009-08-08 07:49:21 UTC (rev 151) @@ -1,6 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 +from __future__ import with_statement + import os.path import re import cPickle @@ -14,8 +16,6 @@ import hashlib import time -import sys - from o2on_const import KeyDBFile, regHosts import o2on_config from o2on_util import hash_xor_bitlength Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/lib/o2on_node.py 2009-08-08 07:49:21 UTC (rev 151) @@ -1,6 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 +from __future__ import with_statement + import os from Crypto.Cipher import AES # pycrypto import xml.dom.minidom @@ -166,8 +168,11 @@ raise NodeRemovable except socket.error, inst: socket.setdefaulttimeout(None) - if inst.errno in (113, 111): raise NodeRemovable - if inst.errno in (110, 104): raise NodeRefused + errno = None + if hasattr(inst, 'errno'): errno = inst.errno + else: errno = inst[0] + if errno in (113, 111): raise NodeRemovable + if errno in (110, 104): raise NodeRefused else: raise inst except httplib.BadStatusLine: socket.setdefaulttimeout(None) Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/lib/o2on_server.py 2009-08-08 07:49:21 UTC (rev 151) @@ -19,6 +19,8 @@ import traceback import sys from xml.parsers.expat import ExpatError +import threading +import select import o2on_config from o2on_const import regHosts, ProtocolVer, AppName @@ -35,6 +37,32 @@ handler) self.glob = g self.requests = [] + self.__is_shut_down = threading.Event() + self.__serving = False + def serve_forever(self, poll_interval=0.5): + #hasattr(BaseHTTPServer.HTTPServer, '_handle_request_noblock'): + if sys.hexversion >= 0x020600f0: + BaseHTTPServer.HTTPServer.serve_forever(self, poll_interval) # 2.6 + else: + self._serve_forever(poll_interval) # 2.5 + def _serve_forever(self, poll_interval=0.5): + """Handle one request at a time until shutdown. + + Polls for shutdown every poll_interval seconds. Ignores + self.timeout. If you need to do periodic tasks, do them in + another thread. + """ + self.__serving = True + self.__is_shut_down.clear() + while self.__serving: + # XXX: Consider using another file descriptor or + # connecting to the socket to wake this up instead of + # polling. Polling reduces our responsiveness to a + # shutdown request and wastes cpu at all other times. + r, w, e = select.select([self], [], [], poll_interval) + if r: + self.handle_request() + self.__is_shut_down.set() def shutdown(self): for r in self.requests: try: @@ -42,7 +70,11 @@ r.close() except Exception: pass - BaseHTTPServer.HTTPServer.shutdown(self) + if hasattr(BaseHTTPServer.HTTPServer, 'shutdown'): + BaseHTTPServer.HTTPServer.shutdown(self) + else: + self.__serving = False + self.__is_shut_down.wait() def finish_request(self, request, client_address): self.requests.append(request) try: @@ -50,7 +82,11 @@ except socket.timeout: pass except Exception,inst: - if isinstance(inst, socket.error) and inst.errno in (104, 32): + errno = None + if isinstance(inst, socket.error): # 2.6 + if hasattr(inst, 'errno'): errno = inst.errno + else: errno = inst[0] + if errno in (104, 32): # 2.5 pass else: if o2on_config.OutputErrorFile: Modified: trunk/opy2on/lib/o2on_util.py =================================================================== --- trunk/opy2on/lib/o2on_util.py 2009-08-07 22:04:34 UTC (rev 150) +++ trunk/opy2on/lib/o2on_util.py 2009-08-08 07:49:21 UTC (rev 151) @@ -1,5 +1,7 @@ #!/usr/bin/python +from __future__ import with_statement + import random from struct import pack import threading From o2on-svn ＠ lists.sourceforge.jp Sat Aug 8 22:31:35 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 08 Aug 2009 22:31:35 +0900 Subject: [o2on-svn] [152] Add 2channel.brd; Message-ID: <1249738295.157058.22307.nullmailer@users.sourceforge.jp> Revision: 152 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=152 Author: nawota Date: 2009-08-08 22:31:35 +0900 (Sat, 08 Aug 2009) Log Message: ----------- Add 2channel.brd; Fix typo in opy2on.py Modified Paths: -------------- trunk/opy2on/lib/o2on_job.py trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_node.py trunk/opy2on/lib/o2on_server.py trunk/opy2on/o2on_config.py.sample trunk/opy2on/opy2on.py Added Paths: ----------- trunk/opy2on/2channel.brd Added: trunk/opy2on/2channel.brd =================================================================== --- trunk/opy2on/2channel.brd (rev 0) +++ trunk/opy2on/2channel.brd 2009-08-08 13:31:35 UTC (rev 152) @@ -0,0 +1,829 @@ +0,0 +?? 0 + headline.2ch.net bbynamazu ??headline + news24.2ch.net namazuplus ???? + live24.2ch.net eq ???? + live23.2ch.net eqplus ????+ +be 0 + changi.2ch.net be ????news + etc7.2ch.net nandemo ????ｿ? + etc7.2ch.net argue ?? +???? 0 + headline.2ch.net bbynews ??headline + news24.2ch.net bizplus ????news+ + mamono.2ch.net newsplus ??????+ + news24.2ch.net wildplus ??????+ + news24.2ch.net moeplus ??????+ + news24.2ch.net mnewsplus ?????+ + news24.2ch.net femnewsplus ??????+ + news24.2ch.net dqnplus ??????+ + news24.2ch.net scienceplus ??????+ + news24.2ch.net owabiplus ???+ + news24.2ch.net liveplus ????ﾀ?+ + namidame.2ch.net news ?????? + news24.2ch.net trafficinfo ????+ music8.2ch.net musicnews ?????? + anime3.2ch.net comicnews ??????? + news24.2ch.net gamenews ????? + pc11.2ch.net pcnews PC???? + news24.2ch.net news7 ?????? + bubble6.2ch.net archives ??????? + news24.2ch.net news2 ?????? + tmp7.2ch.net asia ?????? + tmp7.2ch.net bakanews ?????? + money6.2ch.net editorial ﾐ? +????0 + society6.2ch.net kokusai ????+ news24.2ch.net news4plus ????news+ + news24.2ch.net news5 ??????+ sports2.2ch.net iraq ?????+ news24.2ch.net news5plus ??????+ + bubble6.2ch.net dejima dejima +?? 0 + changi.2ch.net entrance ???? + sports2.2ch.net entrance2 彝歇涕彈? + etc7.2ch.net qa ?Sﾒ?ｿ? + pc11.2ch.net pcqa PC?Sﾒ + info.2ch.net wiki 2ch?????? + etc7.2ch.net goods ?????? + society6.2ch.net gline ?????? + etc7.2ch.net event ?????? + bubble6.2ch.net 2chse 2ch?????+ info.2ch.net rank ??????? + etc7.2ch.net dataroom ??ｺ + changi.2ch.net vote ???+?? 0 + qb5.2ch.net operate 2ch????+ sports2.2ch.net operatex ??????+ qb5.2ch.net sec2ch 2ch????+ qb5.2ch.net sec2chd 2ch???? + qb5.2ch.net saku2ch ??v? + qb5.2ch.net saku ????+ qb5.2ch.net sakud ??c? + qb5.2ch.net sakukb ??m?? +???? 0 + changi.2ch.net intro ｩ???+ human7.2ch.net honobono ???? + changi.2ch.net yume ????? + sports11.2ch.net offmatrix ???OFF + sports11.2ch.net offreg ??OFF + sports11.2ch.net offevent ??OFF +AA 0 + love6.2ch.net aasaloon AA??? + love6.2ch.net mona ??? + love6.2ch.net nida ??? + love6.2ch.net aastory AA?? + love6.2ch.net kao ??? +ﾐ? 0 + society6.2ch.net mass ???? + tmp7.2ch.net youth ?N?? + science6.2ch.net disaster ｩ??? + love6.2ch.net gender ?????_ + society6.2ch.net giin ????? + news24.2ch.net manifesto ?｡??? + society6.2ch.net police ?? + society6.2ch.net court ????? + society6.2ch.net soc ﾐ???? + society6.2ch.net atom ????? + society6.2ch.net river ?????? + society6.2ch.net traf ????? + money6.2ch.net recruit ?E + changi.2ch.net job ?? + society6.2ch.net volunteer ?????? + society6.2ch.net welfare ????? + society6.2ch.net mayor ??ｩ｡?? + money6.2ch.net ftax ?????? + society6.2ch.net jsdf ｩ?? + money6.2ch.net nenga ????? + school7.2ch.net lifework ????+ society6.2ch.net regulate ???? +?ﾐ??? 0 + money6.2ch.net venture ????? + money6.2ch.net manage ??? + money6.2ch.net management ???? + money6.2ch.net estate ????? + society6.2ch.net koumu ??? + school7.2ch.net shikaku ?????? + school7.2ch.net lic ???? + money6.2ch.net haken ???? + society6.2ch.net hoken ???? + money6.2ch.net tax ?????? + school7.2ch.net exam ?????? + society6.2ch.net hosp ????ﾒ + society6.2ch.net bio ???? + society6.2ch.net hikari ??? + money6.2ch.net dtp DTP??? + changi.2ch.net part ????? + society6.2ch.net koukoku ???? + society6.2ch.net agri ????? + money6.2ch.net build ?????E + etc7.2ch.net peko ??????? +?ﾐ? 0 + tmp7.2ch.net company ??????+ life9.2ch.net bouhan ??????? + pc11.2ch.net antispam ?????spam + tmp7.2ch.net ihou ???? + tmp7.2ch.net ihan ?????? +?? 0 + love6.2ch.net expo ?????? + human7.2ch.net subcal ???? + love6.2ch.net bun ???? + love6.2ch.net poem ????? + tv11.2ch.net movie ?????8mm + tv11.2ch.net cinema ?????? + bubble6.2ch.net rmovie ????? + bubble6.2ch.net kinema ????? + hobby11.2ch.net occult ???? + etc7.2ch.net esp ??? + tv11.2ch.net sfx ??? + bubble6.2ch.net rsfx ?a?? + hobby11.2ch.net drama ??????ﾒ + hobby11.2ch.net siki ????? + hobby11.2ch.net fortune ?? + hobby11.2ch.net uranai ???_ﾀ? + love6.2ch.net kyoto ?ﾐ??? + academy6.2ch.net gallery ????+ hobby11.2ch.net rakugo ???? + society6.2ch.net ruins ???? +????? 0 + science6.2ch.net rikei ???? + science6.2ch.net sci ?? + science6.2ch.net life ?? + science6.2ch.net bake ?? + science6.2ch.net kikai ????? + science6.2ch.net denki ????? + science6.2ch.net robot ??????+ science6.2ch.net infosys ??V??? + science6.2ch.net informatics ??w + science6.2ch.net sim ?????? + science6.2ch.net nougaku ?? + science6.2ch.net sky ?????+ school7.2ch.net doctor ????? + science6.2ch.net kampo ???? + science6.2ch.net math ?? + science6.2ch.net doboku ????? + science6.2ch.net material ???? + love6.2ch.net space ????? + science6.2ch.net future ????+ science6.2ch.net wild ???? + science6.2ch.net earth ???? +????? 0 + academy6.2ch.net psycho ??? + academy6.2ch.net gengo ??? + academy6.2ch.net pedagogy ??? + academy6.2ch.net sociology ﾐ?? + academy6.2ch.net economics ??? + love6.2ch.net book ?? + love6.2ch.net poetics ??? + academy6.2ch.net history ??? + academy6.2ch.net history2 ????? + academy6.2ch.net whis ??? + academy6.2ch.net archeology ??? + academy6.2ch.net min ?????? + academy6.2ch.net kobun ????? + academy6.2ch.net english ENGLISH + society6.2ch.net korea ???? + academy6.2ch.net china ?? + academy6.2ch.net taiwan ?? + academy6.2ch.net geo ?????? + love6.2ch.net chiri ????ｩ? + academy6.2ch.net gogaku ??? + academy6.2ch.net art ??f??? + academy6.2ch.net philo ?? + academy6.2ch.net jurisp ?? + changi.2ch.net shihou ???? +???? 0 + hobby11.2ch.net kaden ???? + bubble6.2ch.net wm ?????AV + bubble6.2ch.net vcamera ?????? + bubble6.2ch.net bakery ???? + bubble6.2ch.net toilet ??????? + hobby11.2ch.net sony ??? + hobby11.2ch.net phs ?????? + hobby11.2ch.net keitai ???? + hobby11.2ch.net chakumelo ??????? + hobby11.2ch.net appli ?????? + hobby11.2ch.net dgoods ?????? + hobby11.2ch.net camera ??? + hobby11.2ch.net dcamera ???? + hobby11.2ch.net av AV?? + hobby11.2ch.net pav ???AU +?｡?? 0 + money6.2ch.net seiji ?｡ + society6.2ch.net diplomacy ???? + society6.2ch.net trafficpolicy ???? + money6.2ch.net eco ?? + changi.2ch.net stock ?ｮ + live27.2ch.net stockb ????? + changi.2ch.net market ???? + mamono.2ch.net livemarket1 ??1 + changi.2ch.net livemarket2 ??2 + money6.2ch.net deal ?? + society6.2ch.net koumei ????? + money6.2ch.net kyousan ??? + tmp7.2ch.net sisou ?｡?? + tmp7.2ch.net kova ?????? + money6.2ch.net money ?? +??? 0 + food8.2ch.net food ??? + food8.2ch.net candy ??? + food8.2ch.net juice ??????? + food8.2ch.net pot ???獻琥 + food8.2ch.net cook ?? + food8.2ch.net salt ??? + food8.2ch.net ramen ???? + food8.2ch.net nissin ??????? + food8.2ch.net jnoodle ?????? + food8.2ch.net sushi ??? + food8.2ch.net don ? + food8.2ch.net curry ??? + food8.2ch.net bread ?? + food8.2ch.net pasta ?????? + food8.2ch.net kbbq ??+ food8.2ch.net konamono ?????+ food8.2ch.net toba ?? + food8.2ch.net gurume ????? + food8.2ch.net famires ????? + food8.2ch.net jfoods ????? + food8.2ch.net bento ????? + food8.2ch.net sake ???Bar + food8.2ch.net wine ??? + food8.2ch.net drunk ??? + food8.2ch.net recipe ??? + food8.2ch.net patissier ?????? + food8.2ch.net supplement ??????? +?? 0 + life9.2ch.net lifesaloon ????? + changi.2ch.net kankon ???? + life9.2ch.net okiraku ?????? + life9.2ch.net homealone ????? + life9.2ch.net countrylife ?ﾉ??? + life9.2ch.net debt ﾘ??? + life9.2ch.net inpatient ???? + life9.2ch.net sportsclub ??????? + hobby11.2ch.net bath ?????? + life9.2ch.net anniversary ??? + life9.2ch.net sousai ???? + life9.2ch.net baby ?? + life9.2ch.net kagu ?? + hobby11.2ch.net diy DIY + money6.2ch.net shop ?????? + life9.2ch.net trend ?? + etc7.2ch.net ticketplus Walker+ + life9.2ch.net model ??? + mamono.2ch.net fashion ?????? + life9.2ch.net shoes ? + life9.2ch.net female ??+ changi.2ch.net diet ?? + life9.2ch.net seikei ???? + life9.2ch.net shapeup ????? + life9.2ch.net world ?????? + life9.2ch.net northa ?????? + life9.2ch.net credit ????? + hobby11.2ch.net point ???????? + bubble6.2ch.net cafe30 ??? + bubble6.2ch.net cafe40 ??? + bubble6.2ch.net cafe50 ?????+ life9.2ch.net live ?? + life9.2ch.net souji ??S? + life9.2ch.net goki ??????+ money6.2ch.net kechi2 ??? + life9.2ch.net chance ??+ life9.2ch.net cigaret ??? + life9.2ch.net megane ??? + life9.2ch.net yuusen ????? + life9.2ch.net conv ???? + life9.2ch.net sale ???? + hobby11.2ch.net stationery ??? + life9.2ch.net class ???+???? 0 + mamono.2ch.net shar ?????? + anime3.2ch.net x3 ?????? + etc7.2ch.net denpa ?????? + hobby11.2ch.net owarai ?????+ anime3.2ch.net 2chbook ?????? + changi.2ch.net uwasa ?? + etc7.2ch.net charaneta ????? + etc7.2ch.net charaneta2 ?????? + etc7.2ch.net mascot ???????? + bubble6.2ch.net senji ?? +?????? 0 + changi.2ch.net lovesaloon ????? + love6.2ch.net ex ???? + life9.2ch.net x1 ?? + changi.2ch.net gaysaloon ?????? + human7.2ch.net nohodame ?????? + human7.2ch.net dame ????? + life9.2ch.net loser ??? + mamono.2ch.net hikky ???? + changi.2ch.net mental ??????? + bubble6.2ch.net single ???? + human7.2ch.net wom ??+ human7.2ch.net sfe ??????+ human7.2ch.net wmotenai ?????+ changi.2ch.net ms ????+ changi.2ch.net male ???? + bubble6.2ch.net motetai ????? + changi.2ch.net motenai ?????? + life9.2ch.net alone ????? + human7.2ch.net tomorrow ???? + money6.2ch.net employee ???? + ex24.2ch.net campus ???? + changi.2ch.net student ??????? + anime3.2ch.net otaku ??? + bubble6.2ch.net nendai ??? + bubble6.2ch.net sepia ??? + game14.2ch.net gag ??? + game14.2ch.net 575 ???? + game14.2ch.net tanka ?ｵ???? + changi.2ch.net 4649 ????? +ﾀ?ch 0 + headline.2ch.net bbylive ﾀ?headline + epg.2ch.net tv2chwiki ?????? + live24.2ch.net livesaturn ????ﾀ?S + live24.2ch.net livevenus ????ﾀ?V + live23.2ch.net livejupiter ????ﾀ?J + live27.2ch.net liveuranus ????ﾀ?U + live24.2ch.net endless ﾀ?ch + live24.2ch.net weekly ??ch + live24.2ch.net livewkwest ??ch(???) + live23.2ch.net livenhk ??ch(NHK) + live23.2ch.net liveetv ??ch(??) + live23.2ch.net liventv ??ch(NTV) + live23.2ch.net livetbs ??ch(TBS) + live23.2ch.net livecx ??ch(??) + live23.2ch.net liveanb ??ch(??) + live23.2ch.net livetx ??ch(TX) + live24.2ch.net livebs BSﾀ?(NHK) + live24.2ch.net livewowow BSﾀ?(??) + live24.2ch.net liveskyp ????ﾀ? + live24.2ch.net liveradio ???ﾀ? + live24.2ch.net dome ????ch + live24.2ch.net livebase ??ch + live24.2ch.net livefoot ????ch + live24.2ch.net oonna ??ﾀ?(? + live24.2ch.net ootoko ??ﾀ?(?) + live24.2ch.net dancesite ??ch + live24.2ch.net festival ???ch +????? 0 + school7.2ch.net edu ????? + changi.2ch.net jsaloon ??????? + namidame.2ch.net kouri ???? + school7.2ch.net juku ??m???? + school7.2ch.net ojyuken ??? + school7.2ch.net senmon ???? + school7.2ch.net design ??n?? + school7.2ch.net musicology ????? + school7.2ch.net govexam ????? +?? 0 + hobby11.2ch.net hobby ???? + hobby11.2ch.net magic ????? + hobby11.2ch.net card ???? + hobby11.2ch.net puzzle ??? + hobby11.2ch.net craft ??????? + hobby11.2ch.net toy ???? + hobby11.2ch.net zoid ??? + hobby11.2ch.net watch ?????+ hobby11.2ch.net smoking ??????? + hobby11.2ch.net knife ?? + hobby11.2ch.net doll ??? + hobby11.2ch.net engei ?? + hobby11.2ch.net dog ????? + hobby11.2ch.net pet ?????? + hobby11.2ch.net aquarium ?????? + hobby11.2ch.net goldenfish ?????? + hobby11.2ch.net insect ?? + tmp7.2ch.net cat ????? + hobby11.2ch.net bike ??? + hobby11.2ch.net car ﾔ + hobby11.2ch.net kcar ?ｩ?ﾔ + hobby11.2ch.net auto ﾔ?????? + hobby11.2ch.net usedcar ??ﾔ + hobby11.2ch.net truck ?????ﾔ? + hobby11.2ch.net army ?? + hobby11.2ch.net radio ?? + hobby11.2ch.net train ???? + hobby11.2ch.net rail ?????ﾔ? + hobby11.2ch.net ice ??(??) + hobby11.2ch.net gage ???? + hobby11.2ch.net bus ??????? + hobby11.2ch.net airline ????? + hobby11.2ch.net mokei ?????? + hobby11.2ch.net radiocontrol RC?????) + hobby11.2ch.net gun ???? + hobby11.2ch.net fireworks ?? + ex24.2ch.net warhis ?????? + hobby11.2ch.net chinahero ???? + hobby11.2ch.net sengoku ???? + etc7.2ch.net nanminhis ???? + hobby11.2ch.net dance ??? + hobby11.2ch.net bird ???? + hobby11.2ch.net collect ?????? + hobby11.2ch.net photo ﾊ??? +?????? 0 + sports11.2ch.net sposaloon ??????? + sports11.2ch.net sports ???? + sports11.2ch.net rsports ??????? + sports11.2ch.net stadium ?????? + sports11.2ch.net athletics ???Z + sports11.2ch.net gymnastics ?????? + sports11.2ch.net muscle ?????? + sports11.2ch.net noroma ???? + sports11.2ch.net wsports ????? + sports11.2ch.net ski ?????? + yutori.2ch.net skate ???? + sports11.2ch.net swim ?? + sports11.2ch.net msports ??????? + sports11.2ch.net boat ????? + sports11.2ch.net birdman ????? + sports11.2ch.net fish ?? + sports11.2ch.net bass ???? + sports11.2ch.net bicycle ｩ?ﾔ + sports11.2ch.net equestrian ?n???+ ex24.2ch.net f1 唹整塾澎?+ sports11.2ch.net olympic ?????? + sports11.2ch.net bullseye ????? + sports11.2ch.net parksports ?????? + sports11.2ch.net amespo ???? + sports11.2ch.net cheerleading ?? + sports11.2ch.net xsports xsports +?? 0 + ex24.2ch.net base ???? + sports11.2ch.net npb ?????? + bubble6.2ch.net meikyu ???? + sports11.2ch.net mlb ???? + sports11.2ch.net hsb ???? + sports11.2ch.net kyozin ????? + ex24.2ch.net soccer ?????? + sports11.2ch.net eleven ??????+ sports2.2ch.net wc ??????? + sports11.2ch.net football ?????? + sports11.2ch.net basket ????? + sports11.2ch.net tennis ??? + sports11.2ch.net volley ?????? + sports11.2ch.net ovalball ???? + sports11.2ch.net pingpong ?? + sports11.2ch.net gutter ????? + sports11.2ch.net golf ??? + sports11.2ch.net billiards ????? +??? 0 + ex24.2ch.net k1 ??? + sports11.2ch.net wres ???? + sports11.2ch.net budou ????? + sports11.2ch.net boxing ????? + sports11.2ch.net sumou ?? + sports11.2ch.net jyudo ????+?????0 + love6.2ch.net oversea ???? + society6.2ch.net 21oversea ????? + love6.2ch.net travel ???? + love6.2ch.net hotel ??????+ food8.2ch.net localfoods ??????? + love6.2ch.net tropical ????? + love6.2ch.net onsen ?? + love6.2ch.net park ??? + love6.2ch.net zoo ??????? + love6.2ch.net museum ???????+ love6.2ch.net out ?????? +???? 0 + tv11.2ch.net tvsaloon ?????? + sports2.2ch.net kouhaku ?????? + mamono.2ch.net tv ????? + bubble6.2ch.net natsutv ?????? + mamono.2ch.net tvd ?????? + live27.2ch.net nhkdrama ????? + bubble6.2ch.net natsudora ?????? + tv11.2ch.net kin ??? + tv11.2ch.net am ????? + bubble6.2ch.net rradio ?????? + tv11.2ch.net tv2 ????? + tv11.2ch.net cs ?????? + tv11.2ch.net skyp ???? + tv11.2ch.net bs ?????? + tv11.2ch.net nhk NHK + tv11.2ch.net cm ????? +?? 0 + tv11.2ch.net geino ?? + tv11.2ch.net celebrity ????? + tv11.2ch.net kyon2 ?????? + tv11.2ch.net actor ???? + tv11.2ch.net actress ?D + tv11.2ch.net geinoj U-15???? + changi.2ch.net geinin ???|? + ex24.2ch.net ana ?????? + tv11.2ch.net ami ????? + tv11.2ch.net apple ???? + tv11.2ch.net ainotane ????? + tv11.2ch.net zurui ????? + music8.2ch.net mendol ?????? + changi.2ch.net idol ??A??? + changi.2ch.net akb ?????? + tv11.2ch.net jan ????? + tv11.2ch.net smap ???? + tv11.2ch.net jr ?????? + tv11.2ch.net jr2 ?????Jr +????? 0 + money6.2ch.net mj ???? + money6.2ch.net pachi ??????? + money6.2ch.net pachij ???????+ money6.2ch.net pachik ??????? + money6.2ch.net slot ??????? + money6.2ch.net slotj ???????+ money6.2ch.net slotk ?????? + mamono.2ch.net keiba ?? + hobby11.2ch.net uma ??? + money6.2ch.net keirin ?? + money6.2ch.net kyotei ?? + money6.2ch.net autorace ?????? + money6.2ch.net gamble ????? + money6.2ch.net loto ??? +??? 0 + game13.2ch.net gsaloon ?????? + game13.2ch.net gameover ????? + game13.2ch.net goveract ??ACT?? + game13.2ch.net goverrpg ??RPG?? + game14.2ch.net gamerpg ???RPG + game13.2ch.net ff FF????? + game14.2ch.net gamesrpg ???SRPG + game13.2ch.net gamerobo ?????? + game14.2ch.net gal ????? + game14.2ch.net gboy ??Q??? + game14.2ch.net ggirl ??Q??? + game13.2ch.net gamespo ?????RACE + game13.2ch.net gamehis ????? + game13.2ch.net otoge ??? + game13.2ch.net gamefight ????? + game13.2ch.net gamestg ??????? + game14.2ch.net gamef PC????? + game14.2ch.net fly ?????? + game13.2ch.net famicom ?????? + game14.2ch.net retro ?????? + game14.2ch.net retro2 ?????? + game14.2ch.net game90 90????? + game13.2ch.net arc ????? + game13.2ch.net amusement ???????? + game13.2ch.net gecen ???? + game13.2ch.net game PC??? + game13.2ch.net gameama ????? + game14.2ch.net gameswf ??????? + game14.2ch.net cgame ??Q?? + game14.2ch.net tcg TCG + game14.2ch.net bgame ??E??? + game14.2ch.net gamestones ?????? + game14.2ch.net quiz ????? + namidame.2ch.net ghard ?????? + game14.2ch.net gameurawaza ????? + game13.2ch.net gamechara ?????? + game14.2ch.net gamemusic ????? +?????? 0 + game13.2ch.net handygame ??????? + game14.2ch.net handygover ?????? + game14.2ch.net handygrpg ????RPG + game13.2ch.net poke ???? + game13.2ch.net wifi Wi-Fi + game14.2ch.net rhandyg ??????? + game13.2ch.net pokechara ??????? +?????? 0 + live27.2ch.net mmonews ????? + live27.2ch.net mmoqa ???ｿ? + changi.2ch.net ogame ???ﾀ? + ex24.2ch.net ogame2 ???ﾀ?2 + changi.2ch.net ogame3 ???ﾀ?3 + game13.2ch.net mmosaloon ?????? + game13.2ch.net netgame ?????? + game13.2ch.net mmo ???MMO + game13.2ch.net mmominor ?K?MMO +??????0 + changi.2ch.net asaloon ?????? + changi.2ch.net anime4vip ??????ex + changi.2ch.net anime ??? + changi.2ch.net anime2 ???? + anime3.2ch.net anime3 ???????+ anime3.2ch.net ranime ????a + anime3.2ch.net ranimeh ????? + anime3.2ch.net animovie ????? + anime3.2ch.net anichara ??????? + changi.2ch.net anichara2 ??????? + anime3.2ch.net cosp ???? + anime3.2ch.net voice ???? + ex24.2ch.net voiceactor ???? + anime3.2ch.net doujin ?? + sports2.2ch.net comiket ?????? + changi.2ch.net csaloon ????? + changi.2ch.net comic ?? + anime3.2ch.net rcomic ????? + anime3.2ch.net ymag ?N?? + ex24.2ch.net wcomic ???N?? + anime3.2ch.net gcomic ????+ anime3.2ch.net 4koma ????? + anime3.2ch.net cchara ????? + anime3.2ch.net sakura CC??? + anime3.2ch.net eva ??? + anime3.2ch.net cartoon ??????? + anime3.2ch.net iga ??????? + love6.2ch.net bookall ????T?? + love6.2ch.net magazin ?????? + love6.2ch.net mystery ????? + love6.2ch.net sf SF?FT???? + love6.2ch.net zassi ?? + love6.2ch.net books ????+ love6.2ch.net ehon ?? + love6.2ch.net juvenile ???+ love6.2ch.net illustrator ???????? +?? 0 + music8.2ch.net msaloon ????? + music8.2ch.net mjsaloon ????? + music8.2ch.net musicj ?? + music8.2ch.net musicjm ?????? + music8.2ch.net musicjf ????\? + music8.2ch.net musicjg ?????? + bubble6.2ch.net natsumeloj ????? + music8.2ch.net enka ?? + music8.2ch.net mesaloon ????? + music8.2ch.net musice ?? + bubble6.2ch.net natsumeloe ????? + music8.2ch.net music ???? + bubble6.2ch.net beatles ????? + music8.2ch.net visual ??????? + music8.2ch.net visualb ??????? + music8.2ch.net dj ?????? + music8.2ch.net disco ???? + music8.2ch.net randb R&B?SOUL + music8.2ch.net punk ??? + music8.2ch.net hrhm HR?HM + music8.2ch.net hiphop HIPHOP + music8.2ch.net techno TECHNO + music8.2ch.net progre ???? + bubble6.2ch.net healmusic ??????? + music8.2ch.net wmusic ?????? + music8.2ch.net classic ??? + bubble6.2ch.net fusion ?????? + music8.2ch.net classical ????? + music8.2ch.net contemporary ???? + music8.2ch.net nika ??????? + music8.2ch.net suisou ??? + bubble6.2ch.net chorus ??+ music8.2ch.net doyo ?????+ anime3.2ch.net asong ????? + bubble6.2ch.net soundtrack ???? + music8.2ch.net karaok ???? + music8.2ch.net legend ??? + music8.2ch.net minor ?????? + bubble6.2ch.net band ??? + music8.2ch.net compose ????? + bubble6.2ch.net piano ???? +???? 0 + life9.2ch.net healing ?? + life9.2ch.net jinsei ???? + life9.2ch.net psy ????+ life9.2ch.net body ????? + human7.2ch.net handicap ???????? + etc7.2ch.net infection ?????+ love6.2ch.net hiv HIV??? + life9.2ch.net atopi ???? + life9.2ch.net allergy ????? + life9.2ch.net hage ????? + love6.2ch.net pure ????+ love6.2ch.net furin ????? + love6.2ch.net gay ??? + life9.2ch.net utu ??????? + love6.2ch.net break ｸ? +??? 0 + ex24.2ch.net pc2nanmin PC??? + pc11.2ch.net win Windows + pc11.2ch.net jobs ??mac + pc11.2ch.net mac ??mac + pc11.2ch.net os OS + pc11.2ch.net desktop ?????? + pc11.2ch.net pc ?????? + pc11.2ch.net notepc ???PC + pc11.2ch.net jisaku ｩ?PC + pc11.2ch.net printer ???? + pc11.2ch.net hard ?????? + pc11.2ch.net cdr CD-R,DVD + pc11.2ch.net software ?????? + pc11.2ch.net mobile ???? + pc11.2ch.net bsoft ????soft + pc11.2ch.net unix UNIX + pc11.2ch.net db ?????? + pc11.2ch.net linux Linux + pc11.2ch.net prog ?????? + pc11.2ch.net tech ????? + pc11.2ch.net cg ?? + pc11.2ch.net dtm DTM + pc11.2ch.net avi DTV + pc11.2ch.net swf FLASH + pc11.2ch.net gamedev ?????+ bubble6.2ch.net i4004 ??PC +????? 0 + pc11.2ch.net internet ??????? + changi.2ch.net download Download + pc11.2ch.net hp Web?? + pc11.2ch.net affiliate Web?? + pc11.2ch.net hosting ????? + pc11.2ch.net mysv ｩ???? + pc11.2ch.net php WebProg + pc11.2ch.net hack ?????? + pc11.2ch.net sec ?????? + pc11.2ch.net network ????+ ipv6.2ch.net ipv6 IPv6 + pc11.2ch.net friend ????irc + pc11.2ch.net isp ?????? + pc11.2ch.net netspot ?????? + pc11.2ch.net nifty Nifty + pc11.2ch.net mmag ???? + changi.2ch.net nanmin ?? + ex24.2ch.net ad ???ｦ? + pc11.2ch.net esite ??????? + pc11.2ch.net streaming YouTube + pc11.2ch.net mstreaming ???? + music8.2ch.net mdis ???? + pc11.2ch.net blog ??? + pc11.2ch.net sns ???????? + pc11.2ch.net net ???watch + pc11.2ch.net yahoo ?????? + pc11.2ch.net nntp nntp +???? 0 + etc7.2ch.net bobby ?????? + tmp7.2ch.net lobby ??? + etc7.2ch.net maru ? + changi.2ch.net mog2 ?????? + bubble6.2ch.net mukashi ? + tmp7.2ch.net kitchen ??? + tmp7.2ch.net tubo ?? + tmp7.2ch.net joke ?? + society6.2ch.net shugi ????? + tmp7.2ch.net rights ???? + ex24.2ch.net accuse 2ch???? + changi.2ch.net morningcoffee ????? + ex24.2ch.net ranking ??? + etc7.2ch.net siberia ??????? + yutori.2ch.net news4vip ????VIP + yutori.2ch.net news4viptasu ????VIP+ + namidame.2ch.net poverty ????(??) + yutori.2ch.net heaven4vip ?? + yutori.2ch.net neet4vip ??? +BBSPINK 0 + headline.bbspink.com bbypink PINKheadline + babiru.bbspink.com hnews ??????? + babiru.bbspink.com pinkqa pink?Sﾒ + yomi.bbspink.com sureh ??H????? + babiru.bbspink.com erolive ???ﾀ? + venus.bbspink.com hneta ????? + yomi.bbspink.com pinkcafe PINK????? + set.bbspink.com eromog2 PINK????? + set.bbspink.com ogefin ??? + babiru.bbspink.com pinknanmin ????? + set.bbspink.com erobbs pink???? + babiru.bbspink.com housekeeping PINK????+ venus.bbspink.com ccc PINK???? + babiru.bbspink.com 21oversea2 ????? + qiufen.bbspink.com hgame ???? + qiufen.bbspink.com hgame2 ??????? + set.bbspink.com erog ????? + set.bbspink.com leaf Leaf?key + set.bbspink.com adultsite ??????? + yomi.bbspink.com webmaster ??????? + set.bbspink.com avideo AV?? + set.bbspink.com avideo2 AV?D + babiru.bbspink.com nude ??????? + yomi.bbspink.com eroanime ?????? + set.bbspink.com erocomic ??????+ yomi.bbspink.com erodoujin ???? + set.bbspink.com natuero ????? + yomi.bbspink.com kgirls ???? + set.bbspink.com erocosp ?????? + set.bbspink.com eroacademy PINK??? + set.bbspink.com mcheck ????(??) + babiru.bbspink.com couple ???? + yomi.bbspink.com kageki ????? + babiru.bbspink.com kageki2 ????? + babiru.bbspink.com onatech ???? + babiru.bbspink.com loveho ????? + babiru.bbspink.com adultgoods ??????? + babiru.bbspink.com adultaccessory ?????+ set.bbspink.com sm ?? + set.bbspink.com feti ??? + babiru.bbspink.com mature ??+ yomi.bbspink.com okama ??????? + babiru.bbspink.com gaypink ?????? + babiru.bbspink.com lesbian ??????? + babiru.bbspink.com eroaa ??AA + babiru.bbspink.com erochara ?????? + yomi.bbspink.com erochara2 ????? + yomi.bbspink.com 801 ??? + set.bbspink.com erocg ??????? + yomi.bbspink.com eroparo ???? + venus.bbspink.com ascii ????? + yomi.bbspink.com ascii2d ????? + qiufen.bbspink.com ascii2kana ???? + set.bbspink.com girls ?????? + set.bbspink.com sportgirls ?????? + qiufen.bbspink.com club ???? + qiufen.bbspink.com pub ?????n + babiru.bbspink.com host ?????? + qiufen.bbspink.com nuki ??? + qiufen.bbspink.com soap ??? + yomi.bbspink.com neet4pink ???(pink) + venus.bbspink.com cherryboy ?? + venus.bbspink.com megami ?_ Modified: trunk/opy2on/lib/o2on_job.py =================================================================== --- trunk/opy2on/lib/o2on_job.py 2009-08-08 07:49:21 UTC (rev 151) +++ trunk/opy2on/lib/o2on_job.py 2009-08-08 13:31:35 UTC (rev 152) @@ -112,6 +112,7 @@ JobThread.__init__(self,"dat collector",60,g) def dojob(self, nodes, logger, prof, datdb, datq): board = nodes.get_random_board() + logger.log("DATCOLLECTOR","Try to get dat in %s" % board) if not board: return for n in nodes.get_nodes_for_board(board): if self.finish: break @@ -190,8 +191,7 @@ logger.log("ASKNODECOLLECTION", "\tadd collection for %s" % (hexlify(n.id))) nodedb.reset_collection_for_node(n) - for b in colboards: - nodedb.add_collection(b,n) + for b in colboards: nodedb.add_collection(b,n) nodedb.add_node(n) nodedb.save() Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-08 07:49:21 UTC (rev 151) +++ trunk/opy2on/lib/o2on_key.py 2009-08-08 13:31:35 UTC (rev 152) @@ -119,7 +119,9 @@ return len(self.keys) def show(self): pager = os.environ.get('PAGER') - if not pager: self.glob.logger.log("KEYDB", "PAGER env must be set") + if not pager: + self.glob.logger.log("KEYDB", "PAGER env must be set") + return proc = subprocess.Popen(pager, shell=True, stdin=subprocess.PIPE) pipe = proc.stdin try: Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-08-08 07:49:21 UTC (rev 151) +++ trunk/opy2on/lib/o2on_node.py 2009-08-08 13:31:35 UTC (rev 152) @@ -397,6 +397,9 @@ def get_nodes_for_board(self, board): with self.lock: if not board in self.boardmap: return [] + if len(self.boardmap[board])==0: + del self.boardmap[board] + return [] return map(lambda x: self.nodes[x], self.boardmap[board]) def get_random_board(self): with self.lock: Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-08 07:49:21 UTC (rev 151) +++ trunk/opy2on/lib/o2on_server.py 2009-08-08 13:31:35 UTC (rev 152) @@ -83,10 +83,10 @@ pass except Exception,inst: errno = None - if isinstance(inst, socket.error): # 2.6 - if hasattr(inst, 'errno'): errno = inst.errno - else: errno = inst[0] - if errno in (104, 32): # 2.5 + if isinstance(inst, socket.error): + if hasattr(inst, 'errno'): errno = inst.errno # 2.6 + else: errno = inst[0] # 2.5 + if errno in (104, 32, 110): pass else: if o2on_config.OutputErrorFile: Modified: trunk/opy2on/o2on_config.py.sample =================================================================== --- trunk/opy2on/o2on_config.py.sample 2009-08-08 07:49:21 UTC (rev 151) +++ trunk/opy2on/o2on_config.py.sample 2009-08-08 13:31:35 UTC (rev 152) @@ -67,4 +67,4 @@ # ????若?莎激??????error-.txt ???????＜??祉??吾??阪??????? # ????? OutputErrorFile = False -# OutputError = True +# OutputErrorFile = True Modified: trunk/opy2on/opy2on.py =================================================================== --- trunk/opy2on/opy2on.py 2009-08-08 07:49:21 UTC (rev 151) +++ trunk/opy2on/opy2on.py 2009-08-08 13:31:35 UTC (rev 152) @@ -45,7 +45,7 @@ res = [] regBoard = re.compile(r'^\s+[^.]+\.'+o2on_const.regHosts+r'\s+([a-z0-9]+)\s') if os.path.isfile(o2on_config.Path2channel_brd): - f = open(o2on_config.Path2channel_brd) + f = open(o2on_config.Path2channel_brd,'r') while True: line = f.readline() if line == '':break @@ -53,6 +53,7 @@ if m: res.append(m.group(1)+":"+m.group(2)) f.close() + else: glob.logger.popup("GLOBAL", "No 2channel.brd file") return res def show_myid(x): @@ -107,17 +108,17 @@ f = open('error-'+str(int(time.time()))+'.txt', 'w') traceback.print_exc(file=f) f.close() - self.glob.logger.popup("ERROR", str(inst)) + glob.logger.popup("ERROR", str(inst)) glob.shutdown.set() -class dammy: pass +class dummy: pass #socket.setdefaulttimeout(o2on_config.SocketTimeout) if not os.path.exists(o2on_const.DBDir): os.makedirs(o2on_const.DBDir) -glob = dammy() +glob = dummy() glob.logger = o2on_util.Logger() glob.prof = o2on_profile.Profile(glob.logger) From o2on-svn ＠ lists.sourceforge.jp Sat Aug 8 22:38:17 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 08 Aug 2009 22:38:17 +0900 Subject: [o2on-svn] [153] Start command reading thread after commands is set. Message-ID: <1249738697.593528.3191.nullmailer@users.sourceforge.jp> Revision: 153 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=153 Author: nawota Date: 2009-08-08 22:38:17 +0900 (Sat, 08 Aug 2009) Log Message: ----------- Start command reading thread after commands is set. Modified Paths: -------------- trunk/opy2on/opy2on.py Modified: trunk/opy2on/opy2on.py =================================================================== --- trunk/opy2on/opy2on.py 2009-08-08 13:31:35 UTC (rev 152) +++ trunk/opy2on/opy2on.py 2009-08-08 13:38:17 UTC (rev 153) @@ -136,10 +136,6 @@ o2on_node.build_common_header(glob.prof) o2on_server.build_common_header(glob.prof) -th = threading.Thread(target=readcommand, args=(glob,)) -th.setDaemon(True) -th.start() - show_myid(None) show_mypubkey(None) @@ -171,6 +167,10 @@ "stat": showstat, } +th = threading.Thread(target=readcommand, args=(glob,)) +th.setDaemon(True) +th.start() + try: glob.shutdown.wait() except KeyboardInterrupt: From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 09:05:14 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 09:05:14 +0900 Subject: [o2on-svn] [154] Fix dat query's bug. Message-ID: <1249776314.350190.1072.nullmailer@users.sourceforge.jp> Revision: 154 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=154 Author: nawota Date: 2009-08-09 09:05:14 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Fix dat query's bug. make proxy server to try to get dat's title. Modified Paths: -------------- trunk/opy2on/lib/o2on_dat.py trunk/opy2on/lib/o2on_job.py trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_node.py trunk/opy2on/lib/o2on_server.py trunk/opy2on/lib/o2on_util.py trunk/opy2on/opy2on.py Modified: trunk/opy2on/lib/o2on_dat.py =================================================================== --- trunk/opy2on/lib/o2on_dat.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/lib/o2on_dat.py 2009-08-09 00:05:14 UTC (rev 154) @@ -160,9 +160,9 @@ def get(self,x): with self.lock: return self.hashmap.get(x) - def has_key(self,key): + def has_keyhash(self,key): with self.lock: - return o2on_util.datkeyhash(key) in self.hashmap + return key in self.hashmap def add_dat(self, dat): with self.lock: befdat = self.hashmap.get(dat.hash()) Modified: trunk/opy2on/lib/o2on_job.py =================================================================== --- trunk/opy2on/lib/o2on_job.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/lib/o2on_job.py 2009-08-09 00:05:14 UTC (rev 154) @@ -295,18 +295,18 @@ self.glob.datquery.semap.release() def dojob(self, nodedb, logger, prof, datdb, datq): d = datq.pop() - if self.finish: return - if datdb.has_key(d): + if datdb.has_keyhash(d.hash): datq.save() return - kid = o2on_util.datkeyhash(d) + d.published = int(time.time()) datq.add(d) datq.save() + if self.finish: return reckey = [] - next = nodedb.neighbors_nodes(kid,False,5) + next = nodedb.neighbors_nodes(d.hash,False,5) sent = [] - key = self.glob.keydb.get(kid) - if key: reckey.append(key) + keys = self.glob.keydb.get_bydatkey(d.hash) + if keys: reckey.extend(keys) while True: if self.finish: return neighbors = next @@ -314,10 +314,10 @@ next = [] for node in neighbors: if self.finish: return - logger.log("SEARCH","findvalue to %s for %s" % (hexlify(node.id),d)) + logger.log("SEARCH","findvalue to %s for %s" % (hexlify(node.id),d.url)) sent.append(node.id) try: - res = node.findvalue(kid) + res = node.findvalue(d.hash) except o2on_node.NodeRemovable: nodedb.remove(node) nodedb.save() @@ -340,7 +340,7 @@ logger.log("SEARCH","\tadd new key") if x not in reckey: reckey.append(x) nodedb.save() - if len(reckey) == 0: logger.log("SEARCH","\tfailed to get key for %s" % d) + if len(reckey) == 0: logger.log("SEARCH","\tfailed to get key for %s" % d.url) for key in reckey: self.glob.keydb.add(key) self.glob.keyquery.add(key) Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/lib/o2on_key.py 2009-08-09 00:05:14 UTC (rev 154) @@ -37,7 +37,9 @@ def __cmp__(self,x): return cmp(self.idkeyhash(), x.idkeyhash()) def idkeyhash(self): - if not self.ikhash: self.ikhash = hashlib.sha1(self.hash + self.nodeid).digest() + if not self.ikhash: + if self.nodeid: self.ikhash = hashlib.sha1(self.hash + self.nodeid).digest() + else: self.ikhash = self.hash return self.ikhash def from_key(self, key): if self.idkeyhash() == key.idkeyhash(): @@ -112,6 +114,7 @@ self.keys = {} self.lenmap = {} self.publishmap = {} + self.datkeymap = {} self.glob = g self.load() def __len__(self): @@ -174,9 +177,9 @@ key.published = publish_time if publish_time not in self.publishmap: self.publishmap[publish_time]=[] self.publishmap[publish_time].append(idkeyhash) - def get(self, target): + def get_bydatkey(self, target): with self.lock: - return self.keys.get(target) + return map(lambda x: self.keys.get(x), self.datkeymap.get(target,[])) def remove_bynodeid(self, nid): if len(nid) != 20:raise Exception removes = [] @@ -191,9 +194,11 @@ l = hash_xor_bitlength(self.glob.prof.mynode.id, k.hash) self.lenmap[l].remove(k.idkeyhash()) self.publishmap[k.published].remove(k.idkeyhash()) + self.datkeymap[k.hash].remove(k.idkeyhash()) if len(self.lenmap[l]) == 0: del self.lenmap[l] if len(self.publishmap[k.published])==0: del self.publishmap[k.published] - def add(self, k): + if len(self.datkeymap[k.hash])==0: del self.datkeymap[k.hash] + def add(self, k): if not k.valid(): return k.published = int(time.time()) if k.idkeyhash() in self.keys: @@ -214,6 +219,9 @@ self.publishmap[maxkey.published].remove(maxkey.idkeyhash()) if len(self.publishmap[maxkey.published]) == 0: del self.publishmap[maxkey.published] + self.datkeymap[maxkey.hash].remove(maxkey.idkeyhash()) + if len(self.datkeymap[maxkey.hash]) == 0: + del self.datkeymap[maxkey.hash] else: return self.keys[k.idkeyhash()] = k if bl not in self.lenmap: self.lenmap[bl] = [] @@ -221,12 +229,16 @@ if k.published not in self.publishmap: self.publishmap[k.published] = [] self.publishmap[k.published].append(k.idkeyhash()) + if k.hash not in self.datkeymap: + self.datkeymap[k.hash] = [] + self.datkeymap[k.hash].append(k.idkeyhash()) def save(self): f = open(KeyDBFile,'wb') with self.lock: cPickle.dump(self.keys, f, -1) cPickle.dump(self.lenmap, f, -1) cPickle.dump(self.publishmap,f,-1) + cPickle.dump(self.datkeymap,f,-1) f.close() def load(self): if os.path.isfile(KeyDBFile): @@ -235,4 +247,15 @@ self.keys = cPickle.load(f) self.lenmap = cPickle.load(f) self.publishmap = cPickle.load(f) + try: + self.datkeymap = cPickle.load(f) + except EOFError: + rebuild = True + else: rebuild = False f.close() + if rebuild: + keys = self.keys.values() + self.keys.clear() + self.lenmap.clear() + self.publishmap.clear() + for k in keys: self.add(k) Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/lib/o2on_node.py 2009-08-09 00:05:14 UTC (rev 154) @@ -429,7 +429,10 @@ del self.boardmap[board][0] self.boardmap[board].append(n.id) else: - r = nt.ping() + try: + r = nt.ping() + except NodeRemovable, NodeRefused: + r = False if r: self.boardmap[board].append(self.boardmap[board][0]) del self.boardmap[board][0] @@ -502,7 +505,10 @@ self.nodes[node.id] = node else: n = self.nodes[self.KBuckets[bitlen][0]] - r = n.ping() + try: + r = n.ping() + except NodeRemovable, NodeRefused: + r = False if r: del self.KBuckets[bitlen][0] self.KBuckets[bitlen].append(n.id) Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/lib/o2on_server.py 2009-08-09 00:05:14 UTC (rev 154) @@ -29,6 +29,7 @@ from o2on_node import ip2e, port2e, e2ip import o2on_key import o2on_im +import o2on_util class O2ONServer(BaseHTTPServer.HTTPServer): def __init__(self, handler, port, g): @@ -64,7 +65,7 @@ self.handle_request() self.__is_shut_down.set() def shutdown(self): - for r in self.requests: + for r in []:#self.requests: try: r.shutdown(socket.SHUT_RDWR) r.close() @@ -186,6 +187,22 @@ if not m: m = self.regs[self.URLTYPE_KAKO_GZ].match(self.path) if not m: return None return "/".join((m.group(1), m.group(2), m.group(3))) + def readcgi_url(self): + + return None + def dattitle(self,data): + first = data.split("\n",1)[0] + m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) + if not m: return "" + try: + first = first.decode('cp932').encode('utf-8') + except UnicodeDecodeError, inst: + try: + first = first.decode('euc_jp').encode('utf-8') + except UnicodeDecodeError, inst: raise inst + m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) + if not m: return "" + return m.group(1) def do_GET(self): logger = self.server.glob.logger logger.log("PROXY", "proxy requested %s" % self.path) @@ -219,14 +236,15 @@ self.wfile.write(data) self.wfile.close() dk = self.datkey() + dkh = o2on_util.datkeyhash(dk) dp = self.datpath() if r.status == 200: - if not self.server.glob.datdb.has_key(dk): + if not self.server.glob.datdb.has_keyhash(dkh): # 持ってない dat が取得された logger.log("PROXY", "\tsave responsed dat for myself") self.server.glob.datdb.add(dk, datdata) else: - if self.server.glob.datdb.has_key(dk): + if self.server.glob.datdb.has_keyhash(dkh): if r.status == 206: # 持ってる dat の差分 rg = r.getheader('Content-Range') @@ -248,7 +266,9 @@ if r2 and r2.status == 200: data = r2.read() if r.getheader("content-encoding") == "gzip": - data = zlib.decompress(data) + sf = StringIO.StringIO(data) + dec = gzip.GzipFile(fileobj=sf) + data = dec.read() self.server.glob.datdb.add(dk, data) elif ut in (self.URLTYPE_DAT, self.URLTYPE_KAKO_DAT, self.URLTYPE_KAKO_GZ): logger.log("PROXY", "\ttry to read dat from cache") @@ -290,14 +310,33 @@ f.close() os.remove(dp) else: - logger.popup("PROXY", "no cached dat. query for the dat.\n%s" % self.datkey()) + logger.popup("PROXY", "no cached dat. query for the dat.\n%s" % \ + self.datkey()) + data = r.read() self.wfile.write("HTTP/%d.%d %d %s\r\n" % (r.version/10,r.version%10,r.status,r.reason)) self.wfile.write(self.msg(r)) self.wfile.write("\r\n") - self.wfile.write(r.read()) + self.wfile.write(data) self.wfile.close() - self.server.glob.datquery.add(self.datkey()) + try: + conn = self.get_connection(['If-Modified-Since', 'Range', + 'User-Agent']) + r2= conn.getresponse() + conn.close() + except socket.timeout: + r2 = None + if r2 and r2.status == 203: + data = r2.read() + if r2.getheader("content-encoding") == "gzip": + sf = StringIO.StringIO(data) + dec = gzip.GzipFile(fileobj=sf) + data = dec.read() + title = self.dattitle(data) + else: title = "" + self.server.glob.datquery.add_bydatkey(self.datkey(), + None, title, True) + self.server.glob.datquery.save() common_header = {} def build_common_header(prof): @@ -476,11 +515,11 @@ "\tfindvalue from %s for %s" % (hexlify(node.id), target)) target = unhexlify(target) xml_data = None - key = self.server.glob.keydb.get(target) - if key: + keys = self.server.glob.keydb.get_bydatkey(target) + if keys: xml_data = "\r\n" xml_data += "\r\n" - xml_data += key.xml() + for key in keys: xml_data += key.xml() xml_data += "\r\n" else: neighbors = self.server.glob.nodedb.neighbors_nodes(target, True) @@ -668,6 +707,27 @@ self.end_headers() self.wfile.write(self.html_header % (AppName, curname)) self.send_nav(cur) + def datq(self, args): + datq = self.server.glob.datquery + self.send_common("im", "Searching Dats") + self.wfile.write("""\ +

検索中dat

検索中dat数 %d

+ + +""" % (len(datq))) + for x in datq.datq_list(): + self.wfile.write( + ("\n" \ + % (x[0],x[0],x[1],x[2])).encode('utf-8')) + self.wfile.write("""\ +

URL	Title	最終検索日時
%s	%s	%s

+""") + self.wfile.write(self.html_footer) def im_send(self,args): if not re.compile(r'^[0-9a-f]{40}$').match(args[1]) or \ not re.compile(r'^[0-9a-f]{8}$').match(args[2]) or \ @@ -761,11 +821,11 @@ for x in imdb.im_list(): if x[0]: self.wfile.write(("%s"\ - "%s"\ + "%s\n"\ "%s" % x[1:]).encode('utf-8')) else: self.wfile.write(("%s"\ - "%s"\ + "%s\n"\ "%s" % x[1:]).encode('utf-8')) self.wfile.write("""\ @@ -812,7 +872,7 @@ for x in nodedb.node_list(): self.wfile.write( ("%d%s%s"\ - "%s%d%s%s" % x).encode('utf-8')) + "%s%d%s%s\n" % x).encode('utf-8')) self.wfile.write("""\ Modified: trunk/opy2on/lib/o2on_util.py =================================================================== --- trunk/opy2on/lib/o2on_util.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/lib/o2on_util.py 2009-08-09 00:05:14 UTC (rev 154) @@ -1,4 +1,5 @@ #!/usr/bin/python +# -*- coding: utf-8 from __future__ import with_statement @@ -9,6 +10,7 @@ import re import os.path import cPickle +import datetime import o2on_config from o2on_const import DatQueryFile, KeyQueryFile, AppName @@ -92,10 +94,11 @@ with self.lock: self.list = cPickle.load(pkl_file) pkl_file.close() - def add(self,x): + def add(self,x, front=False): with self.lock: if not x in self.list: - self.list.append(x) + if front: self.list.insert(0,x) + else: self.list.append(x) self.semap.release() def pop(self): self.semap.acquire() @@ -103,9 +106,45 @@ if len(self.list): return self.list.pop(0) +import o2on_key + class DatQuery(Query): + regDatKey = re.compile("^([^/]+)/([^/]+)/(\d+)$") def __init__(self): Query.__init__(self, DatQueryFile) + def load(self): + Query.load(self) + with self.lock: + if len(self.list)>0 and isinstance(self.list[0], str): + copy = list(self.list) + self.list = [] + for x in copy: + m = self.regDatKey.match(x) + key = o2on_key.Key() + key.hash = datkeyhash(x) + key.url = "http://xxx.%s/test/read.cgi/%s/%s/" % (m.group(1), + m.group(2), + m.group(3)) + self.list.append(key) + def add_bydatkey(self, x, url=None, title ="", front=False): + key = o2on_key.Key() + key.hash = datkeyhash(x) + if url: key.url = url + else: + m = self.regDatKey.match(x) + key.url = "http://xxx.%s/test/read.cgi/%s/%s/" % (m.group(1), + m.group(2), + m.group(3)) + key.title = title + self.add(key, front) + def datq_list(self): + with self.lock: + result = [] + for x in self.list: + if x.published == 0: t = "まだ検索されてない".decode('utf-8') + else: t = str(datetime.datetime.fromtimestamp(int(x.published))) + result.append((x.url, x.title.decode('utf-8'), t)) + return result class KeyQuery(Query): def __init__(self): Query.__init__(self, KeyQueryFile) Modified: trunk/opy2on/opy2on.py =================================================================== --- trunk/opy2on/opy2on.py 2009-08-08 13:38:17 UTC (rev 153) +++ trunk/opy2on/opy2on.py 2009-08-09 00:05:14 UTC (rev 154) @@ -198,4 +198,6 @@ glob.keydb.save() glob.datdb.save() glob.nodedb.save() +glob.datquery.save() +glob.keyquery.save() glob.logger.popup("GLOBAL", "Finished Completely") From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 09:31:10 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 09:31:10 +0900 Subject: [o2on-svn] [155] throw Exception which contain dat filename. Message-ID: <1249777870.402739.31677.nullmailer@users.sourceforge.jp> Revision: 155 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=155 Author: nawota Date: 2009-08-09 09:31:10 +0900 (Sun, 09 Aug 2009) Log Message: ----------- throw Exception which contain dat filename. Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-09 00:05:14 UTC (rev 154) +++ trunk/opy2on/lib/o2on_key.py 2009-08-09 00:31:10 UTC (rev 155) @@ -59,7 +59,8 @@ except UnicodeDecodeError, inst: try: first = first.decode('euc_jp').encode('utf-8') - except UnicodeDecodeError, inst: raise inst + except UnicodeDecodeError, inst: + raise Exception("Couldn't decode first line %s" % dat.datpath()) m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if m: self.title = m.group(1) #reg = re.compile(r'^(?:2ch\.net|machibbs\.com)/(?:cyugoku|hokkaidou|k(?:an(?:a|to)|inki|(?:ousinet|yusy)u)|o(?:(?:kinaw|sak)a)|sikoku|t(?:a(?:(?:m|war)a)|o(?:kyo|u(?:hoku|kai))))') From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 09:54:55 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 09:54:55 +0900 Subject: [o2on-svn] [156] Ignore "Connection reset by peer" error. Message-ID: <1249779295.981722.28314.nullmailer@users.sourceforge.jp> Revision: 156 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=156 Author: nawota Date: 2009-08-09 09:54:55 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Ignore "Connection reset by peer" error. Modified Paths: -------------- trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-09 00:31:10 UTC (rev 155) +++ trunk/opy2on/lib/o2on_server.py 2009-08-09 00:54:55 UTC (rev 156) @@ -87,7 +87,7 @@ if isinstance(inst, socket.error): if hasattr(inst, 'errno'): errno = inst.errno # 2.6 else: errno = inst[0] # 2.5 - if errno in (104, 32, 110): + if errno in (104, 32, 110, 54): pass else: if o2on_config.OutputErrorFile: From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 13:52:40 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 13:52:40 +0900 Subject: [o2on-svn] [157] Fix finish time error. Message-ID: <1249793560.620852.12688.nullmailer@users.sourceforge.jp> Revision: 157 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=157 Author: nawota Date: 2009-08-09 13:52:40 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Fix finish time error. Modified Paths: -------------- trunk/opy2on/lib/o2on_job.py Modified: trunk/opy2on/lib/o2on_job.py =================================================================== --- trunk/opy2on/lib/o2on_job.py 2009-08-09 00:54:55 UTC (rev 156) +++ trunk/opy2on/lib/o2on_job.py 2009-08-09 04:52:40 UTC (rev 157) @@ -295,6 +295,7 @@ self.glob.datquery.semap.release() def dojob(self, nodedb, logger, prof, datdb, datq): d = datq.pop() + if not d: return if datdb.has_keyhash(d.hash): datq.save() return @@ -354,7 +355,7 @@ self.glob.keyquery.semap.release() def dojob(self, nodedb, logger, prof, datdb, datq): k = self.glob.keyquery.pop() - if self.finish: return + if not k: return node = nodedb[k.nodeid] if not node: node = o2on_node.Node(k.nodeid, k.ip, k.port) logger.log("DATQUERY","dat query %s to %s" % (hexlify(k.hash),hexlify(node.id))) From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 14:06:20 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 14:06:20 +0900 Subject: [o2on-svn] [158] Fix typo in README. Message-ID: <1249794380.751848.1215.nullmailer@users.sourceforge.jp> Revision: 158 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=158 Author: nawota Date: 2009-08-09 14:06:20 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Fix typo in README. Modified Paths: -------------- trunk/opy2on/README Modified: trunk/opy2on/README =================================================================== --- trunk/opy2on/README 2009-08-09 04:52:40 UTC (rev 157) +++ trunk/opy2on/README 2009-08-09 05:06:20 UTC (rev 158) @@ -23,7 +23,7 @@ - 重いぞ!という方は RecordProfile を True にしてください。ProfileDir 下にプロファイルが出力されます。 - ポートを開けたり閉めたりする。 -- ./opy2on で起動。 +- ./opy2on.py で起動。操作 From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 15:09:13 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 15:09:13 +0900 Subject: [o2on-svn] [159] Use errno pacakge instead of direct number. Message-ID: <1249798153.349392.20822.nullmailer@users.sourceforge.jp> Revision: 159 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=159 Author: nawota Date: 2009-08-09 15:09:13 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Use errno pacakge instead of direct number. Modified Paths: -------------- trunk/opy2on/lib/o2on_job.py trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_node.py trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_job.py =================================================================== --- trunk/opy2on/lib/o2on_job.py 2009-08-09 05:06:20 UTC (rev 158) +++ trunk/opy2on/lib/o2on_job.py 2009-08-09 06:09:13 UTC (rev 159) @@ -15,6 +15,7 @@ import httplib import traceback import sys +import errno import o2on_server import o2on_config @@ -44,7 +45,7 @@ try: os.makedirs(o2on_config.ProfileDir) except OSError, inst: - if inst.errno != 17: raise inst + if inst.errno != errno.EEXIST: raise inst profname = os.path.join(o2on_config.ProfileDir, "o2on_"+"_".join(self.name.split(" "))+".prof") cProfile.runctx('self.dummy()', None, {'self':self,}, profname) Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-09 05:06:20 UTC (rev 158) +++ trunk/opy2on/lib/o2on_key.py 2009-08-09 06:09:13 UTC (rev 159) @@ -15,6 +15,7 @@ import datetime import hashlib import time +import errno from o2on_const import KeyDBFile, regHosts import o2on_config @@ -145,7 +146,7 @@ pipe.close() proc.wait() except IOError, inst: - if inst.errno == 32:pass # Broken pipe + if inst.errno == errno.EPIPE:pass # Broken pipe else: raise inst self.glob.logger.log("KEYDB", "Finished to show keys") def key_list(self): Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-08-09 05:06:20 UTC (rev 158) +++ trunk/opy2on/lib/o2on_node.py 2009-08-09 06:09:13 UTC (rev 159) @@ -16,6 +16,7 @@ import threading import random import time +from errno import EHOSTUNREACH, ECONNREFUSED, ETIMEDOUT, ECONNRESET import o2on_config from o2on_util import hash_xor_bitlength @@ -171,8 +172,8 @@ errno = None if hasattr(inst, 'errno'): errno = inst.errno else: errno = inst[0] - if errno in (113, 111): raise NodeRemovable - if errno in (110, 104): raise NodeRefused + if errno in (EHOSTUNREACH, ETIMEDOUT): raise NodeRemovable + if errno in (ECONNREFUSED, ECONNRESET): raise NodeRefused else: raise inst except httplib.BadStatusLine: socket.setdefaulttimeout(None) Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-09 05:06:20 UTC (rev 158) +++ trunk/opy2on/lib/o2on_server.py 2009-08-09 06:09:13 UTC (rev 159) @@ -21,6 +21,7 @@ from xml.parsers.expat import ExpatError import threading import select +from errno import ECONNRESET, EPIPE, ETIMEDOUT import o2on_config from o2on_const import regHosts, ProtocolVer, AppName @@ -65,7 +66,7 @@ self.handle_request() self.__is_shut_down.set() def shutdown(self): - for r in []:#self.requests: + for r in self.requests: try: r.shutdown(socket.SHUT_RDWR) r.close() @@ -87,7 +88,7 @@ if isinstance(inst, socket.error): if hasattr(inst, 'errno'): errno = inst.errno # 2.6 else: errno = inst[0] # 2.5 - if errno in (104, 32, 110, 54): + if errno in (ECONNRESET, EPIPE, ETIMEDOUT): pass else: if o2on_config.OutputErrorFile: @@ -709,7 +710,7 @@ self.send_nav(cur) def datq(self, args): datq = self.server.glob.datquery - self.send_common("im", "Searching Dats") + self.send_common("datq", "Searching Dats") self.wfile.write("""\

検索中dat

From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 15:17:31 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 15:17:31 +0900 Subject: [o2on-svn] [160] Replace unsupported SJIS charcter. Message-ID: <1249798651.903559.29565.nullmailer@users.sourceforge.jp> Revision: 160 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=160 Author: nawota Date: 2009-08-09 15:17:31 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Replace unsupported SJIS charcter. Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-09 06:09:13 UTC (rev 159) +++ trunk/opy2on/lib/o2on_key.py 2009-08-09 06:17:31 UTC (rev 160) @@ -56,7 +56,7 @@ self.size = len(data) first = data.split("\n",1)[0] try: - first = first.decode('cp932').encode('utf-8') + first = first.replace("\x86\xa6", "\x81E").decode('cp932').encode('utf-8') except UnicodeDecodeError, inst: try: first = first.decode('euc_jp').encode('utf-8') Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-09 06:09:13 UTC (rev 159) +++ trunk/opy2on/lib/o2on_server.py 2009-08-09 06:17:31 UTC (rev 160) @@ -196,7 +196,7 @@ m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if not m: return "" try: - first = first.decode('cp932').encode('utf-8') + first = first.replace("\x86\xa6", "\x81E").decode('cp932').encode('utf-8') except UnicodeDecodeError, inst: try: first = first.decode('euc_jp').encode('utf-8') From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 21:15:14 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 21:15:14 +0900 Subject: [o2on-svn] [161] Fix Exception catching error. Message-ID: <1249820114.105619.13675.nullmailer@users.sourceforge.jp> Revision: 161 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=161 Author: nawota Date: 2009-08-09 21:15:14 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Fix Exception catching error. KeyDB's lock is now RLock Change Timeout style. Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_node.py trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-09 06:17:31 UTC (rev 160) +++ trunk/opy2on/lib/o2on_key.py 2009-08-09 12:15:14 UTC (rev 161) @@ -64,9 +64,6 @@ raise Exception("Couldn't decode first line %s" % dat.datpath()) m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if m: self.title = m.group(1) - #reg = re.compile(r'^(?:2ch\.net|machibbs\.com)/(?:cyugoku|hokkaidou|k(?:an(?:a|to)|inki|(?:ousinet|yusy)u)|o(?:(?:kinaw|sak)a)|sikoku|t(?:a(?:(?:m|war)a)|o(?:kyo|u(?:hoku|kai))))') - #if re.compile("^\s*$").match(self.title) and \ - # not reg.match(dat.path()): print dat.datpath() self.url = "http://xxx.%s/test/read.cgi/%s/%s/" % (dat.domain, dat.board, dat.datnum) @@ -111,7 +108,7 @@ class KeyDB: def __init__(self, g): - self.lock = threading.Lock() + self.lock = threading.RLock() with self.lock: self.keys = {} self.lenmap = {} @@ -188,8 +185,8 @@ with self.lock: for k in self.keys.values(): if k.nodeid == nid: removes.append(k) - for k in removes: - self.remove(k) + for k in removes: + self.remove(k) def remove(self,k): with self.lock: del self.keys[k.idkeyhash()] Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-08-09 06:17:31 UTC (rev 160) +++ trunk/opy2on/lib/o2on_node.py 2009-08-09 12:15:14 UTC (rev 161) @@ -157,9 +157,10 @@ with self.lock: conn = httplib.HTTPConnection(self.ip, self.port) try: - socket.setdefaulttimeout(o2on_config.SocketTimeout) + socket.setdefaulttimeout(15) conn.connect() socket.setdefaulttimeout(None) + conn.sock.settimeout(o2on_config.SocketTimeout) conn.request(method,path,body, headers) r = conn.getresponse() conn.close() @@ -432,7 +433,7 @@ else: try: r = nt.ping() - except NodeRemovable, NodeRefused: + except (NodeRemovable, NodeRefused): r = False if r: self.boardmap[board].append(self.boardmap[board][0]) @@ -508,7 +509,7 @@ n = self.nodes[self.KBuckets[bitlen][0]] try: r = n.ping() - except NodeRemovable, NodeRefused: + except (NodeRemovable, NodeRefused): r = False if r: del self.KBuckets[bitlen][0] Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-09 06:17:31 UTC (rev 160) +++ trunk/opy2on/lib/o2on_server.py 2009-08-09 12:15:14 UTC (rev 161) @@ -68,7 +68,7 @@ def shutdown(self): for r in self.requests: try: - r.shutdown(socket.SHUT_RDWR) + #r.shutdown(socket.SHUT_RDWR) r.close() except Exception: pass @@ -215,13 +215,13 @@ conn = self.get_connection() r= conn.getresponse() conn.close() - except socket.timeout: + except (socket.timeout, socket.gaierror, socket.error): r = None data = None header = None - if r: + if True: logger.log("PROXY", "\tresponse %s" % r.status) - if ut != self.URLTYPE_OFFLAW and r.status in (200,206,304): + if r and ut != self.URLTYPE_OFFLAW and r.status in (200,206,304): logger.log("PROXY", "\tgot response from server") data = r.read() if r.getheader("content-encoding") == "gzip": @@ -313,13 +313,14 @@ else: logger.popup("PROXY", "no cached dat. query for the dat.\n%s" % \ self.datkey()) - data = r.read() - self.wfile.write("HTTP/%d.%d %d %s\r\n" % - (r.version/10,r.version%10,r.status,r.reason)) - self.wfile.write(self.msg(r)) - self.wfile.write("\r\n") - self.wfile.write(data) - self.wfile.close() + if r: + data = r.read() + self.wfile.write("HTTP/%d.%d %d %s\r\n" % + (r.version/10,r.version%10,r.status,r.reason)) + self.wfile.write(self.msg(r)) + self.wfile.write("\r\n") + self.wfile.write(data) + self.wfile.close() try: conn = self.get_connection(['If-Modified-Since', 'Range', 'User-Agent']) From o2on-svn ＠ lists.sourceforge.jp Sun Aug 9 21:21:34 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 09 Aug 2009 21:21:34 +0900 Subject: [o2on-svn] [162] Ignore socket.gaierror in normal_proxy() Message-ID: <1249820494.074751.21303.nullmailer@users.sourceforge.jp> Revision: 162 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=162 Author: nawota Date: 2009-08-09 21:21:34 +0900 (Sun, 09 Aug 2009) Log Message: ----------- Ignore socket.gaierror in normal_proxy() Modified Paths: -------------- trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-09 12:15:14 UTC (rev 161) +++ trunk/opy2on/lib/o2on_server.py 2009-08-09 12:21:34 UTC (rev 162) @@ -167,7 +167,7 @@ conn = self.get_connection() r= conn.getresponse() conn.close() - except socket.timeout: + except (socket.timeout, socket.error, socket.gaierror): return self.wfile.write("HTTP/%d.%d %d %s\r\n" % (r.version/10,r.version%10,r.status,r.reason)) From o2on-svn ＠ lists.sourceforge.jp Thu Aug 13 09:57:06 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Thu, 13 Aug 2009 09:57:06 +0900 Subject: [o2on-svn] =?utf-8?b?WzE2M10gRklYOiAgIzE4MTY5IG9weTJvbuOCkuaWsA==?= =?utf-8?b?44OQ44O844K444On44Oz44Go6Kqk6KqN44GZ44KL?= Message-ID: <1250125026.711467.20320.nullmailer@users.sourceforge.jp> Revision: 163 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=163 Author: osa_p Date: 2009-08-13 09:57:06 +0900 (Thu, 13 Aug 2009) Log Message: ----------- FIX: #18169 opy2on???????吾??潟?茯よ???? Ticket Links: :----------- http://sourceforge.jp/projects/o2on/tracker/detail/18169 Modified Paths: -------------- trunk/o2on/src.o2on/O2Node.h trunk/o2on/src.o2on/O2NodeDB.cpp trunk/o2on/src.o2on/O2Protocol.h Modified: trunk/o2on/src.o2on/O2Node.h =================================================================== --- trunk/o2on/src.o2on/O2Node.h 2009-08-09 12:21:34 UTC (rev 162) +++ trunk/o2on/src.o2on/O2Node.h 2009-08-13 00:57:06 UTC (rev 163) @@ -41,6 +41,9 @@ pubT pubkey; //local wstring ua; + wstring proto_ver; + wstring app_name; + wstring app_ver; uint status; wstring flags; time_t lastlink; Modified: trunk/o2on/src.o2on/O2NodeDB.cpp =================================================================== --- trunk/o2on/src.o2on/O2NodeDB.cpp 2009-08-09 12:21:34 UTC (rev 162) +++ trunk/o2on/src.o2on/O2NodeDB.cpp 2009-08-13 00:57:06 UTC (rev 163) @@ -53,12 +53,15 @@ O2NodeDB:: touch_preprocessor(O2Node &node) { - // O2/0.2 (o2on/0.02.0027; Win32) - if (node.ua.size() > 13) { - wstring node_ver = node.ua.substr(13, 9); - if (wcscmp(node_ver.c_str(), ver) > 0) + if (wcscmp(node.app_name.c_str(), _T(APP_NAME)) == 0) { + // ????????????????? + wchar_t tmpW[64]; + swprintf_s(tmpW, 64, L"%1d.%02d.%04d", APP_VER_MAJOR, APP_VER_MINOR, APP_BUILDNO); + + if (wcscmp(node.app_ver.c_str(), tmpW) > 0) NewVerDetectionFlag = true; } + if (node.port == 0) { AddPort0Node(node); return false; Modified: trunk/o2on/src.o2on/O2Protocol.h =================================================================== --- trunk/o2on/src.o2on/O2Protocol.h 2009-08-09 12:21:34 UTC (rev 162) +++ trunk/o2on/src.o2on/O2Protocol.h 2009-08-13 00:57:06 UTC (rev 163) @@ -13,6 +13,7 @@ #include "httpheader.h" #include "O2Profile.h" #include "O2Node.h" +#include "O2Version.h" @@ -230,6 +231,51 @@ return false; ascii2unicode(it->second, node.ua); + // ?????????????????????+ // O2/0.2 (o2on/0.02.0027; Win32) + // O2/0.2 (opy2on/0.00.0001; Linux x86_64) + //???O2/?????????? (????/????????; ???)??ｮ????? + size_t ProtoNamePos = node.ua.find(L"O2/", 0); + if (ProtoNamePos != 0) { + // ????????????? + return false; + } + size_t AppNamePeriodPos = node.ua.find(L" ", ProtoNamePos); + if ( AppNamePeriodPos == wstring::npos ) { + // ????????????????????? + return false; + } + node.proto_ver = node.ua.substr( 3, AppNamePeriodPos - 3 ); + size_t AppNameStartPos = node.ua.find(L"(", AppNamePeriodPos); + if (( AppNameStartPos == wstring::npos ) || ((AppNameStartPos + 1) == node.ua.size() )) { + // ???????????????? + return false; + } + AppNameStartPos++; + size_t AppNameEndPos = node.ua.find(L"/", AppNameStartPos); + if ( AppNameEndPos == wstring::npos ) { + // ????????u??????? + return false; + } + node.app_name = node.ua.substr( AppNameStartPos, AppNameEndPos - AppNameStartPos ); + if ((wcscmp(node.app_name.c_str(), _T(APP_NAME)) == 0) && ((AppNameEndPos + 1) < node.ua.size() )) { + // ????????????????? + AppNameEndPos++; + size_t VerEndPos = node.ua.find(L";", AppNameEndPos); + if ( VerEndPos == wstring::npos ) { + // ???????????u??????? + return false; + } + node.app_ver = node.ua.substr(AppNameEndPos, VerEndPos - AppNameEndPos); + } +#ifdef O2DEBUG + else { + wchar_t tmpW[128]; + swprintf_s(tmpW, 128, L"??????:%s\n", node.app_name.c_str()); + TRACEW(tmpW); + } +#endif + return true; } From o2on-svn ＠ lists.sourceforge.jp Sun Aug 16 16:11:49 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 16 Aug 2009 16:11:49 +0900 Subject: [o2on-svn] [164] logger.popup() fallback to logger.log() when dbus is not supported. Message-ID: <1250406709.550238.4759.nullmailer@users.sourceforge.jp> Revision: 164 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=164 Author: nawota Date: 2009-08-16 16:11:49 +0900 (Sun, 16 Aug 2009) Log Message: ----------- logger.popup() fallback to logger.log() when dbus is not supported. Modified Paths: -------------- trunk/opy2on/lib/o2on_util.py Modified: trunk/opy2on/lib/o2on_util.py =================================================================== --- trunk/opy2on/lib/o2on_util.py 2009-08-13 00:57:06 UTC (rev 163) +++ trunk/opy2on/lib/o2on_util.py 2009-08-16 07:11:49 UTC (rev 164) @@ -44,11 +44,14 @@ print l def popup(self, categ, s): if o2on_config.UseDBus: - if not self.bus: self.bus = dbus.SessionBus() - obj = self.bus.get_object("org.freedesktop.Notifications", - "/org/freedesktop/Notifications") - obj.Notify(AppName, 0, '', AppName+" "+categ,s, [], {}, -1, - dbus_interface="org.freedesktop.Notifications") + try: + if not self.bus: self.bus = dbus.SessionBus() + obj = self.bus.get_object("org.freedesktop.Notifications", + "/org/freedesktop/Notifications") + obj.Notify(AppName, 0, '', AppName+" "+categ,s, [], {}, -1, + dbus_interface="org.freedesktop.Notifications") + except dbus.exceptions.DBusException: + self.log(categ,s) else: self.log(categ, s) From o2on-svn ＠ lists.sourceforge.jp Sun Aug 16 16:12:03 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 16 Aug 2009 16:12:03 +0900 Subject: [o2on-svn] [165] Change default Timeout to 300 Message-ID: <1250406723.040617.6003.nullmailer@users.sourceforge.jp> Revision: 165 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=165 Author: nawota Date: 2009-08-16 16:12:02 +0900 (Sun, 16 Aug 2009) Log Message: ----------- Change default Timeout to 300 Modified Paths: -------------- trunk/opy2on/o2on_config.py.sample Modified: trunk/opy2on/o2on_config.py.sample =================================================================== --- trunk/opy2on/o2on_config.py.sample 2009-08-16 07:11:49 UTC (rev 164) +++ trunk/opy2on/o2on_config.py.sample 2009-08-16 07:12:02 UTC (rev 165) @@ -27,7 +27,7 @@ # DatSaveAsGzip = True # 接続タイムアウト (単位: 秒) -SocketTimeout = 20 +SocketTimeout = 300 # このノードの名前今のところ日本語(ascii以外)はうまく動かない。 NodeName = "" From o2on-svn ＠ lists.sourceforge.jp Sun Aug 16 22:28:38 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 16 Aug 2009 22:28:38 +0900 Subject: [o2on-svn] [166] Decoding is now compatible with o2on. Message-ID: <1250429318.848130.12478.nullmailer@users.sourceforge.jp> Revision: 166 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=166 Author: nawota Date: 2009-08-16 22:28:38 +0900 (Sun, 16 Aug 2009) Log Message: ----------- Decoding is now compatible with o2on. Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-08-16 07:12:02 UTC (rev 165) +++ trunk/opy2on/lib/o2on_key.py 2009-08-16 13:28:38 UTC (rev 166) @@ -16,6 +16,7 @@ import hashlib import time import errno +import codecs from o2on_const import KeyDBFile, regHosts import o2on_config @@ -23,6 +24,14 @@ import o2on_dat import o2on_node +def my_replace_handler(inst): + return ((u"\u30fb", inst.start+2)) + +try: + codecs.lookup_error('opy2on_replace') +except LookupError: + codecs.register_error('opy2on_replace', my_replace_handler) + class Key: def __init__(self): self.hash = None @@ -56,12 +65,12 @@ self.size = len(data) first = data.split("\n",1)[0] try: - first = first.replace("\x86\xa6", "\x81E").decode('cp932').encode('utf-8') + first = first.decode('cp932').encode('utf-8') except UnicodeDecodeError, inst: try: first = first.decode('euc_jp').encode('utf-8') except UnicodeDecodeError, inst: - raise Exception("Couldn't decode first line %s" % dat.datpath()) + first = first.decode('cp932','opy2on_replace').encode('utf-8') m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if m: self.title = m.group(1) self.url = "http://xxx.%s/test/read.cgi/%s/%s/" % (dat.domain, Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-16 07:12:02 UTC (rev 165) +++ trunk/opy2on/lib/o2on_server.py 2009-08-16 13:28:38 UTC (rev 166) @@ -22,6 +22,7 @@ import threading import select from errno import ECONNRESET, EPIPE, ETIMEDOUT +import codecs import o2on_config from o2on_const import regHosts, ProtocolVer, AppName @@ -32,6 +33,14 @@ import o2on_im import o2on_util +def my_replace_handler(inst): + return ((u"\u30fb", inst.start+2)) + +try: + codecs.lookup_error('opy2on_replace') +except LookupError: + codecs.register_error('opy2on_replace', my_replace_handler) + class O2ONServer(BaseHTTPServer.HTTPServer): def __init__(self, handler, port, g): BaseHTTPServer.HTTPServer.__init__(self, @@ -68,7 +77,7 @@ def shutdown(self): for r in self.requests: try: - #r.shutdown(socket.SHUT_RDWR) + r.shutdown(socket.SHUT_RDWR) r.close() except Exception: pass @@ -196,11 +205,12 @@ m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if not m: return "" try: - first = first.replace("\x86\xa6", "\x81E").decode('cp932').encode('utf-8') + first = first.decode('cp932').encode('utf-8') except UnicodeDecodeError, inst: try: first = first.decode('euc_jp').encode('utf-8') - except UnicodeDecodeError, inst: raise inst + except UnicodeDecodeError, inst: + first = first.decode('cp932','opy2on_replace').encode('utf-8') m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if not m: return "" return m.group(1) From o2on-svn ＠ lists.sourceforge.jp Sun Aug 16 22:39:44 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 16 Aug 2009 22:39:44 +0900 Subject: [o2on-svn] [167] Don't respond when proxied server doesn't respond. Message-ID: <1250429984.023714.23840.nullmailer@users.sourceforge.jp> Revision: 167 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=167 Author: nawota Date: 2009-08-16 22:39:43 +0900 (Sun, 16 Aug 2009) Log Message: ----------- Don't respond when proxied server doesn't respond. Modified Paths: -------------- trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-08-16 13:28:38 UTC (rev 166) +++ trunk/opy2on/lib/o2on_server.py 2009-08-16 13:39:43 UTC (rev 167) @@ -178,6 +178,7 @@ conn.close() except (socket.timeout, socket.error, socket.gaierror): return + if not r: return self.wfile.write("HTTP/%d.%d %d %s\r\n" % (r.version/10,r.version%10,r.status,r.reason)) self.wfile.write(self.msg(r)) From o2on-svn ＠ lists.sourceforge.jp Sat Sep 5 08:17:48 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 05 Sep 2009 08:17:48 +0900 Subject: [o2on-svn] =?utf-8?b?WzE2OF0gIGJvYXJkbWFwIOOBq+WtmOWcqOOBl+OBqg==?= =?utf-8?b?44GESUTjgYznmbvpjLLjgZXjgozjgabjgYTjgovloLTlkIjjgavlr77lh6Y=?= Message-ID: <1252106268.219986.7811.nullmailer@users.sourceforge.jp> Revision: 168 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=168 Author: nawota Date: 2009-09-05 08:17:48 +0900 (Sat, 05 Sep 2009) Log Message: ----------- boardmap に存在しないIDが登録されている場合に対処 Modified Paths: -------------- trunk/opy2on/lib/o2on_node.py Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-08-16 13:39:43 UTC (rev 167) +++ trunk/opy2on/lib/o2on_node.py 2009-09-04 23:17:48 UTC (rev 168) @@ -340,7 +340,7 @@ self.glob = glob self.KBuckets = [] self.port0nodes = [] - self.lock = threading.Lock() + self.lock = threading.RLock() for x in range(0,160): self.KBuckets.append([]) self.nodes = dict() self.boardmap = dict() @@ -402,7 +402,11 @@ if len(self.boardmap[board])==0: del self.boardmap[board] return [] - return map(lambda x: self.nodes[x], self.boardmap[board]) + res = [] + for x in self.boardmap[board]: + n = self.nodes.get(x) + if n: res.append(n) + return res def get_random_board(self): with self.lock: if len(self.boardmap) == 0: return None @@ -421,13 +425,12 @@ r = None with self.lock: if not board in self.boardmap: - self.boardmap[board] = [n.id] + self.boardmap[board] = [n.id, ] elif len(self.boardmap[board])<10: self.boardmap[board].append(n.id) else: nt = self.nodes.get(self.boardmap[board][0]) if not nt: - raise Exception del self.boardmap[board][0] self.boardmap[board].append(n.id) else: From o2on-svn ＠ lists.sourceforge.jp Sat Sep 5 21:43:29 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 05 Sep 2009 21:43:29 +0900 Subject: [o2on-svn] =?utf-8?b?WzE2OV0gIC0gYm9hcmRtYXAg44Gr5a2Y5Zyo44GX44Gq?= =?utf-8?b?44GESUTjgYznmbvpjLLjgZXjgozjgabjgYTjgozjgbDliYrpmaTjgpLooYw=?= =?utf-8?b?44Gq44GG44KI44GG44Gr?= Message-ID: <1252154609.110380.2375.nullmailer@users.sourceforge.jp> Revision: 169 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=169 Author: nawota Date: 2009-09-05 21:43:29 +0900 (Sat, 05 Sep 2009) Log Message: ----------- - boardmap に存在しないIDが登録されていれば削除を行なうように - publishmap に key が登録されていない場合に対処 Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_node.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-09-04 23:17:48 UTC (rev 168) +++ trunk/opy2on/lib/o2on_key.py 2009-09-05 12:43:29 UTC (rev 169) @@ -201,8 +201,10 @@ del self.keys[k.idkeyhash()] l = hash_xor_bitlength(self.glob.prof.mynode.id, k.hash) self.lenmap[l].remove(k.idkeyhash()) - self.publishmap[k.published].remove(k.idkeyhash()) - self.datkeymap[k.hash].remove(k.idkeyhash()) + if self.publishmap[k.published].get(k.idkeyhash()): + self.publishmap[k.published].remove(k.idkeyhash()) + if self.datkeymap[k.hash].get(k.idkeyhash()): + self.datkeymap[k.hash].remove(k.idkeyhash()) if len(self.lenmap[l]) == 0: del self.lenmap[l] if len(self.publishmap[k.published])==0: del self.publishmap[k.published] if len(self.datkeymap[k.hash])==0: del self.datkeymap[k.hash] Modified: trunk/opy2on/lib/o2on_node.py =================================================================== --- trunk/opy2on/lib/o2on_node.py 2009-09-04 23:17:48 UTC (rev 168) +++ trunk/opy2on/lib/o2on_node.py 2009-09-05 12:43:29 UTC (rev 169) @@ -403,9 +403,14 @@ del self.boardmap[board] return [] res = [] + rem = [] for x in self.boardmap[board]: n = self.nodes.get(x) if n: res.append(n) + else: rem.append(x) + for x in rem: + self.boardmap[board].remove(x) + if len(self.boardmap[board]) == 0: del self.boardmap[board] return res def get_random_board(self): with self.lock: From o2on-svn ＠ lists.sourceforge.jp Sat Sep 5 21:47:03 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sat, 05 Sep 2009 21:47:03 +0900 Subject: [o2on-svn] [170] Fix last commit. Message-ID: <1252154823.093112.6653.nullmailer@users.sourceforge.jp> Revision: 170 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=170 Author: nawota Date: 2009-09-05 21:47:03 +0900 (Sat, 05 Sep 2009) Log Message: ----------- Fix last commit. Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-09-05 12:43:29 UTC (rev 169) +++ trunk/opy2on/lib/o2on_key.py 2009-09-05 12:47:03 UTC (rev 170) @@ -201,9 +201,9 @@ del self.keys[k.idkeyhash()] l = hash_xor_bitlength(self.glob.prof.mynode.id, k.hash) self.lenmap[l].remove(k.idkeyhash()) - if self.publishmap[k.published].get(k.idkeyhash()): + if k.idkeyhash() in self.publishmap[k.published]: self.publishmap[k.published].remove(k.idkeyhash()) - if self.datkeymap[k.hash].get(k.idkeyhash()): + if k.idkeyhash() in self.datkeymap[k.hash]: self.datkeymap[k.hash].remove(k.idkeyhash()) if len(self.lenmap[l]) == 0: del self.lenmap[l] if len(self.publishmap[k.published])==0: del self.publishmap[k.published] From o2on-svn ＠ lists.sourceforge.jp Sun Sep 13 13:39:10 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Sun, 13 Sep 2009 13:39:10 +0900 Subject: [o2on-svn] [171] parse first line before encoding. Message-ID: <1252816750.720429.22525.nullmailer@users.sourceforge.jp> Revision: 171 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=171 Author: nawota Date: 2009-09-13 13:39:10 +0900 (Sun, 13 Sep 2009) Log Message: ----------- parse first line before encoding. return 404 when client_address could not get. Modified Paths: -------------- trunk/opy2on/lib/o2on_key.py trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_key.py =================================================================== --- trunk/opy2on/lib/o2on_key.py 2009-09-05 12:47:03 UTC (rev 170) +++ trunk/opy2on/lib/o2on_key.py 2009-09-13 04:39:10 UTC (rev 171) @@ -64,6 +64,9 @@ data = dat.data() self.size = len(data) first = data.split("\n",1)[0] + m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) + if m: first = m.group(1) + else: self.title = None try: first = first.decode('cp932').encode('utf-8') except UnicodeDecodeError, inst: @@ -71,8 +74,7 @@ first = first.decode('euc_jp').encode('utf-8') except UnicodeDecodeError, inst: first = first.decode('cp932','opy2on_replace').encode('utf-8') - m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) - if m: self.title = m.group(1) + self.title = first self.url = "http://xxx.%s/test/read.cgi/%s/%s/" % (dat.domain, dat.board, dat.datnum) @@ -174,7 +176,8 @@ res = [] for x in sorted(self.publishmap.keys()): for y in self.publishmap[x]: - res.append(self.keys[y]) + tmp = self.keys.get(y) + if tmp: res.append(tmp) return res def published(self, idkeyhash, publish_time): if len(idkeyhash) != 20: raise Exception Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-09-05 12:47:03 UTC (rev 170) +++ trunk/opy2on/lib/o2on_server.py 2009-09-13 04:39:10 UTC (rev 171) @@ -386,8 +386,6 @@ if ".." in datpath: return self.response_400("datpath include ..") if not dat.setpath(datpath): return self.response_400("invalid datpath") if not dat.save(data): - logger.log("P2PSERVER", - "I don't like this omiyage dat %s" % self.client_address[0]) return self.response_400("invalid omiyage") else: self.server.glob.datdb.add_dat(dat) @@ -573,7 +571,7 @@ def response_400(self, reason=""): logger = self.server.glob.logger logger.log("P2PSERVER", - "response 400 %s (%s)" % (self.client_address[0], reason)) + "response 400 %s (%s)" % (hexlify(self.client_address[0]), reason)) logger.log("P2PSERVER", "\tpath was %s" % self.path) logger.log("P2PSERVER", "\theader was %s" % self.headers) header = common_header.copy() @@ -582,7 +580,6 @@ self.wfile.write("\r\n") self.wfile.close() def response_404(self): - #print "p2p server response 404 %s" % self.client_address[0] header = common_header.copy() self.wfile.write("HTTP/1.0 404 Not Found\r\n") for h in header: self.wfile.write("%s: %s\r\n" % (h,header[h])) @@ -598,6 +595,8 @@ def do_POST(self): self.do_GET() def do_GET(self): + if not self.client_address: return self.response_404() + self.server.glob.logger.log("P2PSERVER", "connection came %s" % (self.path)) nid = self.headers.getheader('X-O2-Node-ID') From o2on-svn ＠ lists.sourceforge.jp Tue Sep 22 20:39:48 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Tue, 22 Sep 2009 20:39:48 +0900 Subject: [o2on-svn] =?utf-8?q?=5B172=5D_ReCheckIP=2C__ForceShutdown_?= =?utf-8?b?44KS6L+95Yqg?= Message-ID: <1253619588.158711.13138.nullmailer@users.sourceforge.jp> Revision: 172 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=172 Author: nawota Date: 2009-09-22 20:39:48 +0900 (Tue, 22 Sep 2009) Log Message: ----------- ReCheckIP, ForceShutdown を追加 Modified Paths: -------------- trunk/opy2on/lib/o2on_job.py trunk/opy2on/lib/o2on_node.py trunk/opy2on/o2on_config.py.sample trunk/opy2on/opy2on.py Modified: trunk/opy2on/lib/o2on_job.py =================================================================== --- trunk/opy2on/lib/o2on_job.py 2009-09-13 04:39:10 UTC (rev 171) +++ trunk/opy2on/lib/o2on_job.py 2009-09-22 11:39:48 UTC (rev 172) @@ -34,6 +34,10 @@ self.name = name self.glob = g self.sec = s + self.node = None + def shutdown(self): + if self.node: self.node.shutdown() + self.node = None def stop(self): self.finish = True def wakeup(self): @@ -61,8 +65,10 @@ self.glob.logger.log("JOBMANAGER", "job %s started" % self.name) while not self.finish: #t = time.time() + self.node = None self.dojob(self.glob.nodedb, self.glob.logger, self.glob.prof, self.glob.datdb, self.glob.datquery) + self.node = None if self.finish: break diff = int(self.sec) #int(self.sec - (time.time()-t)) if 0 Revision: 173 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=173 Author: nawota Date: 2009-09-30 17:47:33 +0900 (Wed, 30 Sep 2009) Log Message: ----------- Proxy Server: POST に対応 Admin Server: /dats を実装 lib/o2on_dat: class dat に title を取得する関数 title を追加強制終了時に強制終了するスレッドの名前を表示 Modified Paths: -------------- trunk/opy2on/lib/o2on_dat.py trunk/opy2on/lib/o2on_server.py trunk/opy2on/opy2on.py Modified: trunk/opy2on/lib/o2on_dat.py =================================================================== --- trunk/opy2on/lib/o2on_dat.py 2009-09-22 11:39:48 UTC (rev 172) +++ trunk/opy2on/lib/o2on_dat.py 2009-09-30 08:47:33 UTC (rev 173) @@ -52,6 +52,27 @@ return os.path.join(o2on_config.DatDir, self.domain, self.board, self.datnum[:4],self.datnum+".dat") raise Exception + def title(self): + dp = self.datpath() + if os.path.exists(dp): f=open(dp) + elif os.path.exists(dp+".gz"): f=gzip.GzipFile(dp+".gz") + else: f=None + if f: + first=f.readline() + f.close() + m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) + if not m: return None + try: + first = first.decode('cp932').encode('utf-8') + except UnicodeDecodeError, inst: + try: + first = first.decode('euc_jp').encode('utf-8') + except UnicodeDecodeError, inst: + first = first.decode('cp932','opy2on_replace').encode('utf-8') + m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) + if not m: return None + return m.group(1) + return None def data(self): dp = self.datpath() if os.path.exists(dp): f=open(dp) Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-09-22 11:39:48 UTC (rev 172) +++ trunk/opy2on/lib/o2on_server.py 2009-09-30 08:47:33 UTC (rev 173) @@ -162,7 +162,7 @@ for r in remove: if r in hr: del hr[r] conn = httplib.HTTPConnection(loc) - conn.request("GET",p.path, None, hr) + conn.request(self.command, p.path, self.rfile.read(), hr) return conn def msg(self,r): res = '' @@ -215,13 +215,17 @@ m = re.compile(r'^.*<>.*<>.*<>.*<>(.*)$').match(first) if not m: return "" return m.group(1) + def do_POST(self): + self.do_GET() def do_GET(self): logger = self.server.glob.logger logger.log("PROXY", "proxy requested %s" % self.path) ut = self.urltype() if ut in (self.URLTYPE_UNKNOWN, self.URLTYPE_NORMAL, self.URLTYPE_MACHI): + # 普通のプロキシとして動作 self.normal_proxy() return + # datがリクエストされた try: conn = self.get_connection() r= conn.getresponse() @@ -235,6 +239,7 @@ if r and ut != self.URLTYPE_OFFLAW and r.status in (200,206,304): logger.log("PROXY", "\tgot response from server") data = r.read() + # gzipをdecode if r.getheader("content-encoding") == "gzip": sf = StringIO.StringIO(data) dec = gzip.GzipFile(fileobj=sf) @@ -891,6 +896,50 @@

""") self.wfile.write(self.html_footer) + def dats(self, args): + self.send_common("dats", "Dat") + if len(args)==0: + regBoard = re.compile(r'^\t[^\t.]+\.([^\t]+)\t([^\t]+)\t([^\t]+)$') + inul = False + f=open(o2on_config.Path2channel_brd) + for line in f: + m = regBoard.match(line) + if m: + boardname = m.group(3).decode('cp932').encode('utf-8') + if os.path.exists(os.path.join(o2on_config.DatDir, + m.group(1), m.group(2))): + self.wfile.write("

\n" % \ + (m.group(1), m.group(2), boardname)) + else: + self.wfile.write("

\n" % boardname) + else: + pos = line.find("\t") + if pos == -1: continue + if inul: self.wfile.write("\n") + else: self.wfile.write("

%s
\n") + self.wfile.write(self.html_footer) + elif len(args)==2: + regdat = re.compile('^(\d+)\.dat(?:\.gz)?$') + self.wfile.write("") + for root,dirs,files in os.walk(os.path.join(o2on_config.DatDir, + args[0], + args[1])): + for f in files: + m=regdat.match(f) + path = args[0]+"/"+args[1]+"/"+m.group(1) + dkhash = o2on_util.datkeyhash(path) + dat = self.server.glob.datdb.get(dkhash) + if dat: + self.wfile.write("\n" % \ + (dat.title() or "Unknown Title", + args[0], args[1], m.group(1))) + self.wfile.write("
スレタイ URL
%s http://xxx.%s/test/read.cgi/%s/%s/
\n") + self.wfile.write(self.html_footer) def status(self,args): self.send_common("status", "Status Summary") glob = self.server.glob Modified: trunk/opy2on/opy2on.py =================================================================== --- trunk/opy2on/opy2on.py 2009-09-22 11:39:48 UTC (rev 172) +++ trunk/opy2on/opy2on.py 2009-09-30 08:47:33 UTC (rev 173) @@ -196,7 +196,7 @@ shutcount += 1 if o2on_config.ForceShutdown != None and \ o2on_config.ForceShutdown / 8 < shutcount: - glob.logger.popup("GLOBAL", "Force Shutdown") + glob.logger.popup("GLOBAL", "Force Shutdown %s" % j.name) j.shutdown() c += 1 glob.logger.log("GLOBAL", "Finished %d/%d" % (c, n)) From o2on-svn ＠ lists.sourceforge.jp Wed Sep 30 17:55:54 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Wed, 30 Sep 2009 17:55:54 +0900 Subject: [o2on-svn] =?utf-8?b?WzE3NF0gUHJveHkgU2VydmVyOiAgUE9TVCDjgavlr74=?= =?utf-8?b?5b+c5pmC44Gu44OQ44Kw44KS5L+u5q2j?= Message-ID: <1254300954.591732.17459.nullmailer@users.sourceforge.jp> Revision: 174 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=174 Author: nawota Date: 2009-09-30 17:55:54 +0900 (Wed, 30 Sep 2009) Log Message: ----------- Proxy Server: POST に対応時のバグを修正 Modified Paths: -------------- trunk/opy2on/lib/o2on_server.py Modified: trunk/opy2on/lib/o2on_server.py =================================================================== --- trunk/opy2on/lib/o2on_server.py 2009-09-30 08:47:33 UTC (rev 173) +++ trunk/opy2on/lib/o2on_server.py 2009-09-30 08:55:54 UTC (rev 174) @@ -162,7 +162,9 @@ for r in remove: if r in hr: del hr[r] conn = httplib.HTTPConnection(loc) - conn.request(self.command, p.path, self.rfile.read(), hr) + if self.command == "GET": body = None + else: body=self.rfile.read() + conn.request(self.command, p.path, body, hr) return conn def msg(self,r): res = '' From o2on-svn ＠ lists.sourceforge.jp Wed Sep 30 18:07:22 2009 From: o2on-svn ＠ lists.sourceforge.jp (o2on svn commit) Date: Wed, 30 Sep 2009 18:07:22 +0900 Subject: [o2on-svn] =?utf-8?b?WzE3NV0gIFJlY2hlY2tJUOOBjOOBhuOBvuOBj+WLlQ==?= =?utf-8?b?44GE44Gm44GE44Gq44GL44Gj44Gf44OQ44Kw44KS5L+u5q2j?= Message-ID: <1254301642.568265.7156.nullmailer@users.sourceforge.jp> Revision: 175 http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=175 Author: nawota Date: 2009-09-30 18:07:22 +0900 (Wed, 30 Sep 2009) Log Message: ----------- RecheckIPがうまく動いていなかったバグを修正 Modified Paths: -------------- trunk/opy2on/lib/o2on_job.py Modified: trunk/opy2on/lib/o2on_job.py =================================================================== --- trunk/opy2on/lib/o2on_job.py 2009-09-30 08:55:54 UTC (rev 174) +++ trunk/opy2on/lib/o2on_job.py 2009-09-30 09:07:22 UTC (rev 175) @@ -172,18 +172,17 @@ self.glob.logger.log("GETIP", inst) else: if r: - if not prof.mynode.ip: - ip = o2on_node.e2ip(r[:8]) - if not regLocalIP.match(ip): - prof.mynode.ip = ip - if o2on_config.ReCheckIP == None: - self.finish = True - else: - self.sec = o2on_config.ReCheckIP * 60 + ip = o2on_node.e2ip(r[:8]) + if not regLocalIP.match(ip): + if o2on_config.ReCheckIP == None: + self.finish = True + else: + self.sec = o2on_config.ReCheckIP * 60 + if prof.mynode.ip != ip: logger.popup("GETIP","Got Global IP %s" % ip) - nodes.add_node(n) - break - else: break + prof.mynode.ip = ip + nodes.add_node(n) + break class AskNodeCollectionThread(JobThread): def __init__(self, g):

IM送信エラー

IM送信

IMを送信しました。

IM

キー情報

ノード情報

自ノード情報

概要

シャットダウン

シャットダウン

検索中dat

検索中dat