From: <vi...@us...> - 2010-09-01 23:38:18
|
Revision: 12177 http://amsn.svn.sourceforge.net/amsn/?rev=12177&view=rev Author: vivia Date: 2010-09-01 23:38:11 +0000 (Wed, 01 Sep 2010) Log Message: ----------- Reordered the transresp body fields to match WLM order. Not that it changes anything. Modified Paths: -------------- branches/p2p/msnp2p/slp.tcl branches/p2p/msnp2p/transport/direct.tcl Modified: branches/p2p/msnp2p/slp.tcl =================================================================== --- branches/p2p/msnp2p/slp.tcl 2010-09-01 18:07:04 UTC (rev 12176) +++ branches/p2p/msnp2p/slp.tcl 2010-09-01 23:38:11 UTC (rev 12177) @@ -522,40 +522,39 @@ $SLPMessageBody conf2 - if { $options(-bridge) != "" } { - $SLPMessageBody setHeader Bridge $options(-bridge) - } $SLPMessageBody setHeader Listening $options(-listening) - if { $options(-nonce) != "" } { - set nonce [string toupper $options(-nonce)] - if { [string first \{ $nonce] < 0 } { - set nonce \{${nonce}\} - set options(-nonce) $nonce - } - $SLPMessageBody setHeader Nonce $nonce - } - if { $options(-internal_ips) != "" } { - $SLPMessageBody setHeader IPv4Internal-Addrs $options(-internal_ips) - } - if { $options(-internal_port) != "" } { - $SLPMessageBody setHeader IPv4Internal-Port $options(-internal_port) - } - if { $options(-external_ips) != "" } { - $SLPMessageBody setHeader IPv4External-Addrs $options(-external_ips) - } - if { $options(-external_port) != "" } { - $SLPMessageBody setHeader IPv4External-Port $options(-external_port) - } - - $SLPMessageBody setHeader Nat-Trav-Msg-Type "WLX-Nat-Trav-Msg-Direct-Connect-Req" - $SLPMessageBody setHeader Conn-Type $options(-conn_type) - $SLPMessageBody setHeader TCP-Conn-Type "Symmetric-NAT" - $SLPMessageBody setHeader IPv6-global "" - if { $options(-session_id) != "" } { + $SLPMessageBody setHeader Conn-Type $options(-conn_type) + $SLPMessageBody setHeader TCP-Conn-Type "Symmetric-NAT" + $SLPMessageBody setHeader IPv6-global "" + $SLPMessageBody setHeader Capabilities-Flags $options(-capabilities_flags) + if { $options(-external_ips) != "" } { + $SLPMessageBody setHeader IPv4External-Addrs $options(-external_ips) + } + if { $options(-external_port) != "" } { + $SLPMessageBody setHeader IPv4External-Port $options(-external_port) + } + if { $options(-internal_ips) != "" } { + $SLPMessageBody setHeader IPv4Internal-Addrs $options(-internal_ips) + } + if { $options(-internal_port) != "" } { + $SLPMessageBody setHeader IPv4Internal-Port $options(-internal_port) + } + $SLPMessageBody setHeader Nat-Trav-Msg-Type "WLX-Nat-Trav-Msg-Direct-Connect-Req" + if { $options(-bridge) != "" } { + $SLPMessageBody setHeader Bridge $options(-bridge) + } + if { $options(-nonce) != "" } { + set nonce [string toupper $options(-nonce)] + if { [string first \{ $nonce] < 0 } { + set nonce \{${nonce}\} + set options(-nonce) $nonce + } + $SLPMessageBody setHeader Nonce $nonce + } + if { $options(-session_id) != "" } { $SLPMessageBody setHeader SessionID $options(-session_id) - } - $SLPMessageBody setHeader SChannelState $options(-s_channel_state) - $SLPMessageBody setHeader Capabilities-Flags $options(-capabilities_flags) + } + $SLPMessageBody setHeader SChannelState $options(-s_channel_state) } Modified: branches/p2p/msnp2p/transport/direct.tcl =================================================================== --- branches/p2p/msnp2p/transport/direct.tcl 2010-09-01 18:07:04 UTC (rev 12176) +++ branches/p2p/msnp2p/transport/direct.tcl 2010-09-01 23:38:11 UTC (rev 12177) @@ -19,7 +19,7 @@ option -extern_port "" option -mapping_timeout_src "" option -connect_timeout_src "" - option -timeout 30000 + option -timeout 5000 option -rating 1 option -sock "" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |