From: <vi...@us...> - 2012-05-24 19:02:20
|
Revision: 12386 http://amsn.svn.sourceforge.net/amsn/?rev=12386&view=rev Author: vivia Date: 2012-05-24 19:02:14 +0000 (Thu, 24 May 2012) Log Message: ----------- Fixed bug where p15vsp18 would talk in p2pv2 Modified Paths: -------------- trunk/amsn/msnp2p/transport/TLPv2.tcl trunk/amsn/msnp2p/transport/base.tcl trunk/amsn/protocol.tcl Modified: trunk/amsn/msnp2p/transport/TLPv2.tcl =================================================================== --- trunk/amsn/msnp2p/transport/TLPv2.tcl 2012-05-24 05:43:55 UTC (rev 12385) +++ trunk/amsn/msnp2p/transport/TLPv2.tcl 2012-05-24 19:02:14 UTC (rev 12386) @@ -196,6 +196,7 @@ set len [set TLPParamLength($::p2pv2::TLPParamType::ACK_SEQ)] if {[string length $val] != $len} { set val [string range $val[string repeat \x00 $len] 0 [expr {$len - 1}]] + #wtf, I just puts this, $val was 59799 and now it became 5979... maybe we should binary format/scan it? } } $options(-tlv) upd $::p2pv2::TLPParamType::ACK_SEQ $val @@ -240,7 +241,7 @@ method set_sync { sync } { if { $sync == 1 } { - set options(-op_code) [expr {$::p2pv2::TLPFlag::SYN | $::p2pv2::TLPFlag::RAK}] + set options(-op_code) [expr {$::p2pv2::TLPFlag::SYN}] set peer_info [binary format SuSuSuSuIu $::p2p::PeerInfo::PROTOCOL_VERSION $::p2p::PeerInfo::IMPLEMENTATION_ID $::p2p::PeerInfo::VERSION 0 $::p2p::PeerInfo::CAPABILITIES] $self set_peer_info $peer_info } else { Modified: trunk/amsn/msnp2p/transport/base.tcl =================================================================== --- trunk/amsn/msnp2p/transport/base.tcl 2012-05-24 05:43:55 UTC (rev 12385) +++ trunk/amsn/msnp2p/transport/base.tcl 2012-05-24 19:02:14 UTC (rev 12386) @@ -274,6 +274,7 @@ #puts "Going to send [hexify [$chunk toString]]" puts "Adding command : Send_chunk $peer $peer_guid $chunk" + puts "Chunk id is [hexify [$chunk id]]" set chunk_queue [lappend chunk_queue [list [list $options(-transport) Send_chunk $peer $peer_guid $chunk] $blob]] puts "send $self. Chunk queue: $chunk_queue" Modified: trunk/amsn/protocol.tcl =================================================================== --- trunk/amsn/protocol.tcl 2012-05-24 05:43:55 UTC (rev 12385) +++ trunk/amsn/protocol.tcl 2012-05-24 19:02:14 UTC (rev 12386) @@ -1681,13 +1681,13 @@ if {$cap == "p2paware"} { return [expr {[clientCapsVersion $clientid] > 0}] } - if {$cap == "p2pv2" } { - if {[llength [split $clientcaps ":"]] > 1} { - return 1 - } else { - return 0 - } - } + #if {$cap == "p2pv2" } { + # if {[llength [split $clientcaps ":"]] > 1} { + # return 1 + # } else { + # return 0 + # } + #} if {$flag != 0} { if {($clientid & $flag) == $flag} { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |