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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       09/10/22 19:58:45

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml 

Log message:
        patch #6804

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1399&r2=1.1400
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.130&r2=1.131

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1399
retrieving revision 1.1400
diff -u -b -r1.1399 -r1.1400
--- distrib/ChangeLog   22 Oct 2009 19:56:42 -0000      1.1399
+++ distrib/ChangeLog   22 Oct 2009 19:58:45 -0000      1.1400
@@ -15,6 +15,7 @@
 =========
 
 2009/10/22
+6804: EDK: Log incoming chat messages with ip:port info (Dennis Nezic)
 6772: New option max_result_name_len, shortens strings in
       HTML/Telnet search results
 6958: EDK: Fix server connects on Solaris due to missing SO_KEEPALIVE

Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- src/networks/donkey/donkeyClient.ml 3 Feb 2008 23:08:45 -0000       1.130
+++ src/networks/donkey/donkeyClient.ml 22 Oct 2009 19:58:45 -0000      1.131
@@ -1941,9 +1941,11 @@
           try
             
             match c.client_source.DonkeySources.source_sock with
-              Connection sock -> Ip.to_string (peer_ip sock)
+              Connection sock ->
+                (Ip.to_string (peer_ip sock) ^ ":" ^ string_of_int (peer_port 
sock))
             | _ -> (match c.client_kind with 
-                    Direct_address (ip,port) -> Ip.to_string ip
+                    Direct_address (ip,port) ->
+                      ((Ip.to_string ip) ^ ":" ^ string_of_int port)
                   | Indirect_address _ | Invalid_address _ -> "Indirect"
                 )
           
@@ -1951,7 +1953,8 @@
               
               try 
                 match c.client_kind with 
-                  Direct_address (ip,port) -> Ip.to_string ip
+                  Direct_address (ip,port) ->
+                    ((Ip.to_string ip) ^ ":" ^ string_of_int port)
                 | Indirect_address _ | Invalid_address _ -> "Indirect"
               with _ -> ""
         )