[Mldonkey-commits] mldonkey config/Makefile.in src/utils/net/multi...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/02/15 14:26:08

Modified files:
        config         : Makefile.in 
Removed files:
        src/utils/net  : multicast.ml multicast.mli multicast_c.c 
        tools          : mlcast.ml 

Log message:
        patch #5738

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/multicast.ml?cvsroot=mldonkey&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/multicast.mli?cvsroot=mldonkey&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/multicast_c.c?cvsroot=mldonkey&r1=1.2&r2=0
http://cvs.savannah.gnu.org/viewcvs/mldonkey/tools/mlcast.ml?cvsroot=mldonkey&r1=1.2&r2=0

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- config/Makefile.in  15 Jan 2007 18:27:21 -0000      1.175
+++ config/Makefile.in  15 Feb 2007 14:26:08 -0000      1.176
@@ -202,7 +202,6 @@
   $(NET)/tcpBufferedSocket.ml \
   $(NET)/tcpServerSocket.ml \
   $(NET)/udpSocket.ml $(NET)/http_server.ml $(NET)/http_client.ml \
-  $(NET)/multicast.ml $(NET)/multicast_c.c  \
   $(NET)/cobs.ml \
   $(NET)/terminal.ml
 
@@ -547,10 +546,6 @@
   $(DRIVER)/driverInterface.ml \
   $(DRIVER)/driverMain.ml 
 
-MLCAST_SRCS= \
-  $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) \
-  tools/mlcast.ml
-
 ICONS_CMXA=icons.cmxa
 
 CDK_CMXA=cdk.cmxa

Index: src/utils/net/multicast.ml
===================================================================
RCS file: src/utils/net/multicast.ml
diff -N src/utils/net/multicast.ml
--- src/utils/net/multicast.ml  14 Dec 2005 21:17:47 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-(* Copyright 2001, 2002 b8_bavard, b8_fee_carabine, INRIA *)
-(*
-    This file is part of mldonkey.
-
-    mldonkey is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    mldonkey is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with mldonkey; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*)
-
-open Printf2
-
-open Unix
-
-type addr = Unix.inet_addr
-type socket = Unix.file_descr
-type group = int
-type port = int
-  
-external setsock_multicast: socket -> int = "setsock_multicast"
-external setsock_join: socket -> addr -> int = "setsock_join"
-external setsock_leave: socket -> addr -> int = "setsock_leave"
-  
-let socket_dgram ()     = socket Unix.PF_INET Unix.SOCK_DGRAM 0
-let setsock_reuse sock = Unix.setsockopt sock Unix.SO_REUSEADDR true
-  
-let deering_prefix = "233.252.252."
-
-let deering_addr i =
-  let i = (abs i) mod 248 in
-  let inet_s = Printf.sprintf  "%s%d" deering_prefix i in
-  Unix.inet_addr_of_string inet_s
-
-let create () =
-  let sock = socket_dgram () in
-  setsock_reuse sock;
-  sock
-
-let bind sock port = Unix.bind sock (Unix.ADDR_INET(Unix.inet_addr_any, port)) 
-  
-let join sock deering =
-  let multicast_addr = deering_addr deering in
-  let e = setsock_multicast sock in
-  if e < 0 then failwith "setsock_multicast";
-  let e = setsock_join sock multicast_addr in
-  if e < 0 then failwith "setsock_join"
-    
-let leave sock deering =
-  let multicast_addr = deering_addr deering in
-  let e = setsock_leave sock multicast_addr in
-  if e < 0 then failwith "setsock_leave"
-
-let server deering port =
-  let sock = create () in
-  bind sock port;
-  join sock deering;
-  sock
-
-let recv sock buffer =
-  recvfrom sock buffer 0 (String.length buffer) []
-  
-let send sock deering port message =
-  let multicast_addr = deering_addr deering in
-  lprintf "ADDR: %s\n" (string_of_inet_addr multicast_addr);
-  let to_addr = Unix.ADDR_INET(multicast_addr, port) in
-  let e = sendto sock message 0 (String.length message) [] to_addr in
-  if e < 0 then failwith "sendto"
-    
-let send_and_recv group port message =
-  let sock = server group port in
-  send sock group port message;
-  let buffer = String.create 100 in
-  try
-    while true do
-      let rs, _, _ = select [sock] [] [] 5.0 in
-      match rs with
-        [] -> raise Not_found
-      | _ -> 
-          ignore (recv sock buffer); 
-          if String.sub buffer 0 (String.length message) <> message then
-            raise Exit
-    done;
-    raise Exit
-  with 
-  | Exit -> 
-      close sock;
-      Marshal.from_string buffer 0
-  | e -> close sock; raise e
-      
-      
-      
\ No newline at end of file

Index: src/utils/net/multicast.mli
===================================================================
RCS file: src/utils/net/multicast.mli
diff -N src/utils/net/multicast.mli
--- src/utils/net/multicast.mli 22 Apr 2003 22:33:40 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-(***********************************************************************)
-(*                                                                     *)
-(*                             ____                                    *)
-(*                                                                     *)
-(*       Fabrice Le Fessant, projet Para/SOR, INRIA Rocquencourt       *)
-(*                                                                     *)
-(*  Copyright 1999 Institut National de Recherche en Informatique et   *)
-(*  Automatique.  Distributed only by permission.                      *)
-(*                                                                     *)
-(***********************************************************************)
-
-type addr = Unix.inet_addr
-type socket = Unix.file_descr
-type group = int
-type port = int
-  
-(* [deering_addr group] creates an INET address for the multicast group
-224.0.0.[group], with [group] between 0 and 247. *)
-val deering_addr: group -> addr
-  
-(* [create ()] creates a datagram socket. *)  
-val create: unit -> socket
-  
-(* [bind sock port] binds a datagram socket to the port [port] *)
-val bind: socket -> port -> unit
-  
-(* [join sock group] makes the socket [sock] join the group 224.0.0.[group] *)
-val join: socket ->  group -> unit
-
-(* [leave sock group] makes the socket [sock] leave the group 224.0.0.[group] 
*)
-val leave: socket -> group -> unit
-  
-(* [server group port] creates a new datagram socket, binds it to [port] and
-  join the multicast group 224.0.0.[group]. *)
-val server: group -> port -> socket
-  
-(* [recv sock buffer] waits for a message on [sock] and stores it in [buffer] 
*)
-val recv: socket -> string -> int * Unix.sockaddr
-  
-(* [send sock group port message] sends a message [message] on [sock] to 
-  the group 224.0.0.[group] on port [port]. *)
-val send: socket -> group -> port -> string -> unit
-
-val send_and_recv: group -> port -> string -> 'a
\ No newline at end of file

Index: src/utils/net/multicast_c.c
===================================================================
RCS file: src/utils/net/multicast_c.c
diff -N src/utils/net/multicast_c.c
--- src/utils/net/multicast_c.c 21 Nov 2003 23:18:13 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,71 +0,0 @@
-/***********************************************************************/
-/*                                                                     */
-/*                             ____                                    */
-/*                                                                     */
-/*       Fabrice Le Fessant, projet Para/SOR, INRIA Rocquencourt       */
-/*                                                                     */
-/*  Copyright 1999 Institut National de Recherche en Informatique et   */
-/*  Automatique.  Distributed only by permission.                      */
-/*                                                                     */
-/***********************************************************************/
-
-#include "caml/mlvalues.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-#if defined(__MINGW32__)
-typedef unsigned int uint;
-#include <winsock.h>
-#else
-
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-
-#endif
-
-
-#define GET_INET_ADDR(v) (*((uint32 *) (v)))
-
-value setsock_multicast(value sock_v)
-{
-  int sock = Int_val(sock_v);
-  char value;
-
-  value = 64;   /* Set the time-to-live:  only within site. */
-  printf("ttl %d\n", value);
-  return Val_int(setsockopt(sock,
-      IPPROTO_IP, IP_MULTICAST_TTL,
-      &value, sizeof(value)));
-}
-
-value setsock_join(value sock_v, value group_v)
-{
-   struct ip_mreq mreq;
-   int sock = Int_val(sock_v);
-  
-  mreq.imr_multiaddr.s_addr = GET_INET_ADDR(group_v);
-  mreq.imr_interface.s_addr = INADDR_ANY;
-
-  return Val_int(setsockopt(sock, 
-      IPPROTO_IP, IP_ADD_MEMBERSHIP, 
-      (void*)&mreq, sizeof(mreq)));
-}
-
-value setsock_leave(value sock_v, value group_v) 
-{
-  struct ip_mreq mreq;
-  int sock = Int_val(sock_v);
-
-  mreq.imr_multiaddr.s_addr = GET_INET_ADDR(group_v);
-  mreq.imr_interface.s_addr = INADDR_ANY;
-
-  return Val_int(setsockopt(sock,
-      IPPROTO_IP, IP_DROP_MEMBERSHIP, 
-      (void*)&mreq, sizeof(mreq)));
-}
-
-
-

Index: tools/mlcast.ml
===================================================================
RCS file: tools/mlcast.ml
diff -N tools/mlcast.ml
--- tools/mlcast.ml     4 Mar 2003 21:56:14 -0000       1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-open Unix
-  
-let mgroup = 1
-let mport = 4000
-
-let _ =
-  let buffer = String.create 2000 in
-  let sock = Multicast.server mgroup mport in
-  Multicast.send sock mgroup mport (Sys.argv.(1));
-  while true do
-    let len,_ = Multicast.recv sock buffer in
-    lprintf "RECEIVED: %s" (String.escaped (String.sub buffer 0 len));
-    lprint_newline ();
-    sleep 1;
-    Multicast.send sock mgroup mport (Sys.argv.(1));
-  done
-  
-  
\ No newline at end of file