[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/05 14:13:51

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyOvernet.ml donkeyProtoOvernet.ml 

Log message:
        patch #5481

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1077&r2=1.1078
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyProtoOvernet.ml?cvsroot=mldonkey&r1=1.30&r2=1.31

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1077
retrieving revision 1.1078
diff -u -b -r1.1077 -r1.1078
--- distrib/ChangeLog   5 Nov 2006 14:11:28 -0000       1.1077
+++ distrib/ChangeLog   5 Nov 2006 14:13:51 -0000       1.1078
@@ -15,6 +15,10 @@
 =========
 
 2006/11/05
+5481: Overnet: Small updates
+- do not print opcode 18 (OvernetNoResult) as unknown message
+- parse bcp type bcp://xxxxxxxxxxxxxxxxxxxxxxxxxxx:ip:tcpport:udpport
+- print debug log message when a new source was added
 5513: HTML: Let webinterface work in a HTML frame (ported from Knockers Mulus)
 - third button row does not work yet, patches welcome
 5521: BT: Fix non-working EDK upload when BT is enabled,

Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- src/networks/donkey/donkeyOvernet.ml        5 Nov 2006 14:09:39 -0000       
1.72
+++ src/networks/donkey/donkeyOvernet.ml        5 Nov 2006 14:13:51 -0000       
1.73
@@ -1123,6 +1123,9 @@
   | OvernetPublicized (Some p) ->
       ()
 
+  | OvernetNoResult (md4) ->
+      ()
+
   | OvernetSearch (nresults, md4, from_who) ->
       let peers = get_closest_peers md4 nresults in
       udp_send sender (OvernetSearchReply (md4,peers))
@@ -1189,6 +1192,9 @@
                       if is_overnet_ip ip && port <> 0 then
                         let s = DonkeySources.find_source_by_uid
                             (Direct_address (ip, port))  in
+                       if !verbose_overnet then
+                         lprintf_nl "added new source %s:%d for file %s"
+                           (Ip.to_string ip) port (Md4.to_string md4);
                         incr source_hits;
                         DonkeySources.set_request_result s
                            file.file_sources File_new_source;

Index: src/networks/donkey/donkeyProtoOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyProtoOvernet.ml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/networks/donkey/donkeyProtoOvernet.ml   19 May 2006 23:43:54 -0000      
1.30
+++ src/networks/donkey/donkeyProtoOvernet.ml   5 Nov 2006 14:13:51 -0000       
1.31
@@ -189,15 +189,21 @@
           match tag.tag_name with
             Field_UNKNOWN "loc" ->
               for_string_tag tag (fun bcp ->
-                  if !verbose_overnet then
-                  lprintf_nl "loc tag : [%s]" bcp;
+                  if !verbose_overnet then lprintf_nl "loc tag : [%s]" bcp;
                   if String2.starts_with bcp "bcp://" then
                     let bcp2 = String.sub bcp 6 (String.length bcp - 6)
                     in
                     match String2.split_simplify bcp2 ':' with
+                    | [_;ip;udpport;tcpport] ->
+                        if !verbose_overnet then
+                          lprintf_nl "Received BCP type 3 %s" bcp;
+                        peer_ip := Ip.of_string ip;
+                        peer_udpport := int_of_string udpport;
+                        peer_tcpport := int_of_string tcpport;
+
                     | [_;ip;port] ->
                         if !verbose_overnet then
-                          lprintf_nl "Received BCP type 2 %s"
+                          lprintf_nl "Received BCP type 2 %s, ignoring"
                             bcp;
 
 (* FIXME: A firewalled peer...