Tadashi Okoshi
slash****@users*****
2005年 11月 23日 (水) 12:14:22 JST
Index: affelio/lib/Affelio/SNS/Handshaker_s.pm
diff -u affelio/lib/Affelio/SNS/Handshaker_s.pm:1.23 affelio/lib/Affelio/SNS/Handshaker_s.pm:1.24
--- affelio/lib/Affelio/SNS/Handshaker_s.pm:1.23 Sat Oct 29 05:31:03 2005
+++ affelio/lib/Affelio/SNS/Handshaker_s.pm Wed Nov 23 12:14:22 2005
@@ -14,35 +14,23 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
-# $Id: Handshaker_s.pm,v 1.23 2005/10/28 20:31:03 slash5234 Exp $
-
-use strict;
-use lib("../../../extlib/");
-use XMLRPC::Transport::HTTP;
-use DBI;
-use Crypt::RC5;
-use Crypt::DH;
-use MIME::Base64::Perl;
-use Error qw(:try);
-use lib("../../");
-use Affelio;
-use Affelio::SNS::FriendManager;
-use Affelio::SNS::Handshaker_tmpDB;
-use Affelio::SNS::Handshaker_c qw(get_F2List);
-use Affelio::Managing::MessageManager;
-use Affelio::misc::CGIError;
-use Affelio::misc::Debug;
-use Affelio::misc::MyCrypt;
-use Affelio::misc::NetMisc;
-use Affelio::misc::Time;
-use Affelio::misc::Sanitizer;
+# $Id: Handshaker_s.pm,v 1.24 2005/11/23 03:14:22 slash5234 Exp $
########################################################################
+#package Affelio::SNS::Handshaker_s::Util;
+########################################################################
package Affelio::SNS::Handshaker_s::Util;
{
+ BEGIN{
+ use strict;
+ use lib("../../");
+ use Affelio;
+ use Affelio::misc::Debug;
+ }
+
sub af_new {
my $cfg_dir = $Affelio::SNS::Handshaker_s::AF_DIR . "config/";
- Affelio::misc::Debug::debug_print("Starting AF($cfg_dir)...");
+ debug_print("Starting AF($cfg_dir)...");
my $af = Affelio->new( ConfigDir => $cfg_dir )
or die "Cannot start Affelio";
return($af);
@@ -50,14 +38,37 @@
}
########################################################################
+#Package Affelio::SNS::Handshaker_s;
+########################################################################
package Affelio::SNS::Handshaker_s;
{
- use strict;
- use Exporter;
- @Affelio::SNS::Handshaker_s::ISA = "Exporter";
- @Affelio::SNS::Handshaker_s::EXPORT = qw (HandShake HandShakeReply F2List post_Message get_services);
-
- use vars qw( $AF_DIR);
+ BEGIN{
+ use strict;
+ use lib("../../../extlib/");
+ use XMLRPC::Transport::HTTP;
+ use DBI;
+ use Crypt::RC5;
+ use Crypt::DH;
+ use MIME::Base64::Perl;
+ use Error qw(:try);
+ use lib("../../");
+ use Affelio;
+ use Affelio::SNS::FriendManager;
+ use Affelio::SNS::Handshaker_tmpDB;
+ use Affelio::SNS::Handshaker_c qw(get_F2List);
+ use Affelio::Managing::MessageManager;
+ use Affelio::misc::CGIError;
+ use Affelio::misc::Debug;
+ use Affelio::misc::MyCrypt;
+ use Affelio::misc::NetMisc;
+ use Affelio::misc::Time;
+ use Affelio::misc::Sanitizer;
+
+ use Exporter;
+ @Affelio::SNS::Handshaker_s::ISA = "Exporter";
+ @Affelio::SNS::Handshaker_s::EXPORT = qw (HandShake HandShakeReply F2List post_Message get_services);
+ use vars qw( $AF_DIR);
+ }
##################################################################
#server.get_services
@@ -107,7 +118,7 @@
$req_timestamp
= Affelio::misc::Sanitizer::sanitize_number($req_timestamp);
- Affelio::misc::Debug::debug_print("server.F2List: proto_ver=$proto_ver, timestamp=$req_timestamp");
+ debug_print("server.F2List: proto_ver=$proto_ver, timestamp=$req_timestamp");
##################################
#Retrieve friends whose
@@ -116,8 +127,8 @@
# timestamp > req_timestamp
my $retmsg = $af->getFM->get_updated_friends($req_timestamp);
- Affelio::misc::Debug::debug_print("server.F2List: ret=[$retmsg]");
- Affelio::misc::Debug::debug_print("server.F2List: end.");
+ debug_print("server.F2List: ret=[$retmsg]");
+ debug_print("server.F2List: end.");
return {
flerror => XMLRPC::Data->type('boolean', 0),
@@ -133,7 +144,7 @@
my $self = shift;
my $af = Affelio::SNS::Handshaker_s::Util::af_new();
- Affelio::misc::Debug::debug_print("server.postMesg: starg.");
+ debug_print("server.postMesg: start.");
##################################################
#Distill args
@@ -169,43 +180,43 @@
if($plain =~ /<src>(.+)<\/src>/){
$src = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: src: $src");
+ debug_print("server.postMesg: src: $src");
my $msg_from;
if($plain =~ /<from>(.+)<\/from>/){
$msg_from = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: from: $msg_from");
+ debug_print("server.postMesg: from: $msg_from");
my $msg_from_nickname;
if($plain =~ /<from_nickname>(.+)<\/from_nickname>/){
$msg_from_nickname = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: nick: $msg_from_nickname");
+ debug_print("server.postMesg: nick: $msg_from_nickname");
my $msg_to;
if($plain =~ /<to>(.+)<\/to>/){
$msg_to = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: to: $msg_to");
+ debug_print("server.postMesg: to: $msg_to");
my $msg_timestamp;
if($plain =~ /<timestamp>(.+)<\/timestamp>/){
$msg_timestamp = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: TIME: $msg_timestamp");
+ debug_print("server.postMesg: TIME: $msg_timestamp");
my $msg_MIMed_title;
if($plain =~ /<title>(.*)<\/title>/ms){
$msg_MIMed_title = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: title: $msg_MIMed_title");
+ debug_print("server.postMesg: title: $msg_MIMed_title");
my $msg_MIMed_body;
if($plain =~ /<text>(.*)<\/text>/ms){
$msg_MIMed_body = $1;
}
- Affelio::misc::Debug::debug_print("server.postMesg: body: $msg_MIMed_body");
+ debug_print("server.postMesg: body: $msg_MIMed_body");
##################################################
#Encryption integrity check
@@ -226,7 +237,7 @@
###########################################
# Post this message to Message Manager
###########################################
- Affelio::misc::Debug::debug_print("server.PostMesg: $proto_ver, $msg_from $msg_from_nickname $msg_to $msg_timestamp $msg_title $msg_body");
+ debug_print("server.PostMesg: $proto_ver, $msg_from $msg_from_nickname $msg_to $msg_timestamp $msg_title $msg_body");
$msg_from = '<A HREF="' . $msg_from . '">' . $msg_from_nickname . '</A>';
@@ -262,10 +273,10 @@
$peer_af_id, $peer_DH_pub_key_str, $MIMed_mesg) = @_;
my $peer_domain = Affelio::misc::NetMisc::get_remote_domain(%ENV);
my $sessionid = "$$" . "$timestamp";
- Affelio::misc::Debug::debug_print("server.HandShake: size=["
+ debug_print("server.HandShake: size=["
. length($MIMed_mesg));
- Affelio::misc::Debug::debug_print("server.HandShake: $proto_ver, $timestamp, $peer_domain, $peer_nickname, $peer_af_id, $peer_DH_pub_key_str [$MIMed_mesg]\n");
+ debug_print("server.HandShake: $proto_ver, $timestamp, $peer_domain, $peer_nickname, $peer_af_id, $peer_DH_pub_key_str [$MIMed_mesg]\n");
##################################################
#Version check
##################################################
@@ -304,7 +315,7 @@
$timestamp,
$peer_DH_pub_key_str);
- Affelio::misc::Debug::debug_print("server.HandShake: DB(W) $sessionid\n");
+ debug_print("server.HandShake: DB(W) $sessionid\n");
undef($af);
###########################################
@@ -332,7 +343,7 @@
###########################################
my ($proto_ver, $timestamp, $peer_nickname,
$peer_af_id, $peer_DH_pub_key_str, $mesg) = @_;
- Affelio::misc::Debug::debug_print("server.HandShakeReply: $proto_ver, $timestamp, $peer_nickname, $peer_af_id, $peer_DH_pub_key_str $mesg\n");
+ debug_print("server.HandShakeReply: $proto_ver, $timestamp, $peer_nickname, $peer_af_id, $peer_DH_pub_key_str $mesg\n");
##################################################
#Version check
@@ -352,7 +363,7 @@
###########################################
# check peer's info in "received_Handshake" DB
###########################################
- Affelio::misc::Debug::debug_print("server.HandShakeReply: searching... $peer_af_id => $timestamp\n");
+ debug_print("server.HandShakeReply: searching... $peer_af_id => $timestamp\n");
my $tmpdb= new Affelio::SNS::Handshaker_tmpDB($af);
my @ret= $tmpdb->remove_sent_Handshake($timestamp);
@@ -365,15 +376,15 @@
if(!defined(@ret)){
#No such session exists!!
- Affelio::misc::Debug::debug_print("server.HandShakeReply: sent-Handshake session NOT Found!\n");
+ debug_print("server.HandShakeReply: sent-Handshake session NOT Found!\n");
return {
flerror => XMLRPC::Data->type('boolean', 1),
message => "ERR:103 HandShakeReply denied."
};
}else{
($dummy1, $dummy2, $dummy3, $dummy4, $my_DH_pri_key_str) = @ret;
- Affelio::misc::Debug::debug_print("server.HandShakeReply: my DH_pri_key = $my_DH_pri_key_str");
- Affelio::misc::Debug::debug_print("server.HandShakeReply: sent-Handshake session Found. OK. Let's Move on.");
+ debug_print("server.HandShakeReply: my DH_pri_key = $my_DH_pri_key_str");
+ debug_print("server.HandShakeReply: sent-Handshake session Found. OK. Let's Move on.");
}
###########################################
@@ -390,7 +401,7 @@
$mydh->priv_key(Math::BigInt->new($my_DH_pri_key_str) );
my $pass
= $mydh->compute_key(Math::BigInt->new($peer_DH_pub_key_str))->bstr;
- Affelio::misc::Debug::debug_print("server.HandShakeReply: PASSWORD=[$pass]\n");
+ debug_print("server.HandShakeReply: PASSWORD=[$pass]\n");
###########################################
#Add peer to my friends list.
@@ -399,7 +410,7 @@
$peer_nickname,
$timestamp,
$pass);
- Affelio::misc::Debug::debug_print("server.HandShakeReply: add_friend finished.\n");
+ debug_print("server.HandShakeReply: add_friend finished.\n");
eval{
$af->getDB->commit;
@@ -407,25 +418,25 @@
undef($af);
};
if($@){
- Affelio::misc::Debug::debug_print($@);
+ debug_print($@);
}
###########################################
#Get peer's friends list.
###########################################
# "peer's friends" = my F2 friends
- Affelio::misc::Debug::debug_print("server.HandshakeReply: Let's download peer's flist!");
+ debug_print("server.HandshakeReply: Let's download peer's flist!");
my $ret = Affelio::SNS::Handshaker_c::get_F2List(dest_uri => "$peer_af_id/bin/xml-rpc-serv.cgi", timestamp => 0);
- Affelio::misc::Debug::debug_print("server.HandshakeReply: get_F2List finished.");
- Affelio::misc::Debug::debug_print("server.HandshakeReply: List I've got is [$ret]");
+ debug_print("server.HandshakeReply: get_F2List finished.");
+ debug_print("server.HandshakeReply: List I've got is [$ret]");
###########################################
#Save the F2 list into my DB
###########################################
$af = Affelio::SNS::Handshaker_s::Util::af_new();
- Affelio::misc::Debug::debug_print("server.HandshakeReply: Let's save peer's flist!");
+ debug_print("server.HandshakeReply: Let's save peer's flist!");
$af->getFM->save_F2List($ret, $peer_af_id);
- Affelio::misc::Debug::debug_print("server.HandshakeReply: save_F2List finished.");
+ debug_print("server.HandshakeReply: save_F2List finished.");
#Make a new instance of Affelio
###########################################
@@ -436,16 +447,15 @@
message => "OK: Thanks for your HandShakeReply."
};
}
-
}
########################################################################
+#Package affelio
+########################################################################
{
package affelio;
BEGIN { @affelio::ISA = qw( Affelio::SNS::Handshaker_s ); }
}
-
-
########################################################################
1;