[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/... |
Date: |
Wed, 15 Nov 2006 12:34:30 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 06/11/15 12:34:30
Modified files:
distrib : ChangeLog
src/networks/donkey: donkeyInteractive.ml donkeyServers.ml
donkeyUdp.ml
Log message:
patch #5560
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1095&r2=1.1096
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyServers.ml?cvsroot=mldonkey&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyUdp.ml?cvsroot=mldonkey&r1=1.24&r2=1.25
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1095
retrieving revision 1.1096
diff -u -b -r1.1095 -r1.1096
--- distrib/ChangeLog 14 Nov 2006 20:04:11 -0000 1.1095
+++ distrib/ChangeLog 15 Nov 2006 12:34:30 -0000 1.1096
@@ -14,6 +14,9 @@
ChangeLog
=========
+2006/11/15
+5560: EDK: Parse some more server.met fields, log unknown server tags
+
2006/11/14
5424: web_infos/rss: shell:// type url
- can be used to parse broken RSS feeds
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- src/networks/donkey/donkeyInteractive.ml 14 Nov 2006 18:42:59 -0000
1.136
+++ src/networks/donkey/donkeyInteractive.ml 15 Nov 2006 12:34:30 -0000
1.137
@@ -117,10 +117,19 @@
server.server_name <- s;
| { tag_name = Field_UNKNOWN "description" ; tag_value = String
s } ->
server.server_description <- s
+ | { tag_name = Field_UNKNOWN "version" ; tag_value = Uint64 s }
->
+ server.server_version <- Printf.sprintf "%d.%d"
+ ((Int64.to_int s) lsr 16)
((Int64.to_int s) land 0xFFFF)
| { tag_name = Field_UNKNOWN "ping" ; tag_value = Uint64 s } ->
server.server_ping <- (Int64.to_int s)
| { tag_name = Field_UNKNOWN "dynip" ; tag_value = String s } ->
server.server_dynip <- s
+ | { tag_name = Field_UNKNOWN "users" ; tag_value = Uint64 s } ->
+ (match server.server_nusers with
+ | None -> server.server_nusers <- Some s | _ -> ())
+ | { tag_name = Field_UNKNOWN "files" ; tag_value = Uint64 s } ->
+ (match server.server_nfiles with
+ | None -> server.server_nfiles <- Some s | _ -> ())
| { tag_name = Field_UNKNOWN "maxusers" ; tag_value = Uint64 s
} ->
(match server.server_max_users with
| None -> server.server_max_users <- Some s | _ -> ())
@@ -132,19 +141,19 @@
| None -> server.server_hard_limit <- Some s | _ -> ())
| { tag_name = Field_UNKNOWN "auxportslist" ; tag_value =
String s } ->
server.server_auxportslist <- s
- | { tag_name = Field_UNKNOWN "lowidusers" ; tag_value = Uint64
s } ->
+ | { tag_name = Field_UNKNOWN "lowusers" ; tag_value = Uint64 s
} ->
(match server.server_lowid_users with
| None -> server.server_lowid_users <- Some s | _ -> ())
- | { tag_name = Field_UNKNOWN "udpkey" ; tag_value = Uint64 s }
->
- (match server.server_udp_key with
- | None -> server.server_udp_key <- Some (Int64.to_int s) | _
-> ())
| { tag_name = Field_UNKNOWN "tcpportobfuscation" ; tag_value =
Uint64 s } ->
(match server.server_obfuscation_port_tcp with
| None -> server.server_obfuscation_port_tcp <- Some
(Int64.to_int s) | _ -> ())
| { tag_name = Field_UNKNOWN "udpportobfuscation" ; tag_value =
Uint64 s } ->
(match server.server_obfuscation_port_udp with
| None -> server.server_obfuscation_port_udp <- Some
(Int64.to_int s) | _ -> ())
- | _ -> ()
+ | { tag_name = Field_UNKNOWN "country" ; tag_value = String s }
-> ()
+ | { tag_name = Field_UNKNOWN "udpflags" ; tag_value = Uint64 s
} -> ()
+ | { tag_name = Field_UNKNOWN "refs" ; tag_value = Uint64 s }
-> ()
+ | _ -> lprintf_nl "parsing server.met, unknown field %s"
(string_of_tag tag)
) r.S.tags;
server_must_update server
with _ -> ()
@@ -1804,7 +1813,6 @@
n ((List.length (Hashtbl2.to_list servers_by_key)) - nservers)
with _ -> ()
end;
- lprint_newline ()
end
else
if not !!enable_donkey then
Index: src/networks/donkey/donkeyServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- src/networks/donkey/donkeyServers.ml 14 Nov 2006 18:42:59 -0000
1.63
+++ src/networks/donkey/donkeyServers.ml 15 Nov 2006 12:34:30 -0000
1.64
@@ -346,7 +346,7 @@
s.server_name <- name
| { tag_name = Field_UNKNOWN "description"; tag_value = String
desc } ->
s.server_description <- desc
- | _ -> ()
+ | _ -> lprintf_nl "parsing donkeyServers.ServerInfo, unknown field
%s" (string_of_tag tag)
) s.server_tags;
(* nice and ugly, but it doesn't require any new fields *)
Index: src/networks/donkey/donkeyUdp.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyUdp.ml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- src/networks/donkey/donkeyUdp.ml 1 Oct 2006 17:54:00 -0000 1.24
+++ src/networks/donkey/donkeyUdp.ml 15 Nov 2006 12:34:30 -0000 1.25
@@ -296,7 +296,11 @@
s.server_name <- name
| { tag_name = Field_UNKNOWN "description"; tag_value = String
desc } ->
s.server_description <- desc
- | _ -> ()
+ | { tag_name = Field_UNKNOWN "auxportslist" ; tag_value = String
aux } ->
+ s.server_auxportslist <- aux
+ | { tag_name = Field_UNKNOWN "dynip" ; tag_value = String dynip }
->
+ s.server_dynip <- dynip
+ | _ -> lprintf_nl "parsing Udp.ServerDescReplyUdp, unknown field
%s" (string_of_tag tag)
) t.M.tags;
if s.server_tags = [] then
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/05
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/12
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/14
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...,
mldonkey-commits <=
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/19
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/20
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/21
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/26
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/28
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/..., mldonkey-commits, 2006/11/28