Merge remote branch 'tim/master'

timpritlove · Mar 13, 2011 · 84b7cc2 · 84b7cc2
2 parents 41d097d + 908b256
commit 84b7cc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/torrentdb.erl b/src/torrentdb.erl
@@ -244,7 +244,7 @@ peer_id() ->
 
 %% http://www.bittorrent.org/beps/bep_0020.html
 generate_peer_id() ->
-    list_to_binary("-CR0000-" ++
+    list_to_binary("-PR0001-" ++
 		       [random:uniform(256) - 1
 			|| _ <- lists:seq(1, 12)]).
 

diff --git a/src/wire_connection.erl b/src/wire_connection.erl
@@ -440,8 +440,8 @@ send_piece(FileRanges, #state{sock = Sock,
 			      info_hash = InfoHash}) ->
     lists:foreach(
       fun({Path, Offset, Length}) ->
-	      logger:log(wire, debug,
-			 "Sending ~B bytes to socket ~p", [Length, Sock]),
+%%	      logger:log(wire, debug,
+%%			 "Sending ~B bytes to socket ~p", [Length, Sock]),
 	      backend:fold_file(Path, Offset, Length,
 				fun(Data, _) ->
 					gen_tcp:send(Sock, Data),