diff --git a/.gitattributes b/.gitattributes
index 4d53efa7af6e5739d1aaf311d28f5da0e499da15..a3a52d9210e4f7e9a2be0abd4a93d99801559c2e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -397,7 +397,6 @@ testfont binary
/src/modules/spider/configure.in foreign_ident
/src/modules/spider/defs.h foreign_ident
/src/modules/spider/discdate.c foreign_ident
-/src/modules/spider/dumudp.c foreign_ident
/src/modules/spider/spider.c foreign_ident
/src/modules/spider/stardate.c foreign_ident
/src/modules/spider/streamed_parser.c foreign_ident
diff --git a/src/modules/spider/Makefile.in b/src/modules/spider/Makefile.in
index 61b64c62bbf92204fb4ca4fe5656e2b30310fc6d..ee9978d8b41eb1e0bf4218d665261293ad72d98d 100644
--- a/src/modules/spider/Makefile.in
+++ b/src/modules/spider/Makefile.in
@@ -1,7 +1,7 @@
-# $Id: Makefile.in,v 1.17 1999/04/23 21:45:42 grubba Exp $
+# $Id: Makefile.in,v 1.18 1999/07/21 18:39:29 grubba Exp $
SRCDIR=@srcdir@
VPATH=@srcdir@:@srcdir@/../..:../..
-OBJS=spider.o discdate.o stardate.o dumudp.o xml.o
+OBJS=spider.o discdate.o stardate.o xml.o
MODULE_LDFLAGS=@LDFLAGS@
# streamed_parser.o
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
deleted file mode 100644
index d0632c3a7b4f9de5698ab2e35eb5c508946f6660..0000000000000000000000000000000000000000
--- a/src/modules/spider/dumudp.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*
- * $Id: dumudp.c,v 1.45 1999/07/16 11:10:45 mirar Exp $
- */
-
-#include "global.h"
-
-#include "config.h"
-
-RCSID("$Id: dumudp.c,v 1.45 1999/07/16 11:10:45 mirar Exp $");
-#include "fdlib.h"
-#include "interpret.h"
-#include "svalue.h"
-#include "stralloc.h"
-#include "array.h"
-#include "mapping.h"
-#include "object.h"
-#include "backend.h"
-#include "fd_control.h"
-
-#include "error.h"
-#include "signal_handler.h"
-#include "pike_types.h"
-#include "threads.h"
-
-#ifdef HAVE_SYS_TYPE_H
-#include <sys/types.h>
-#endif
-
-#include <sys/stat.h>
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>
-#endif
-
-#if ! defined(EWOULDBLOCK) && defined(WSAEWOULDBLOCK)
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#endif
-#if ! defined(EADDRINUSE) && defined(WSAEADDRINUSE)
-#define EADDRINUSE WSAEADDRINUSE
-#endif
-
-
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-#ifndef ARPA_INET_H
-#include <arpa/inet.h>
-#define ARPA_INET_H
-
-/* Stupid patch to avoid trouble with Linux includes... */
-#ifdef LITTLE_ENDIAN
-#undef LITTLE_ENDIAN
-#endif
-
-#endif
-#endif
-
-#ifdef HAVE_SYS_PROTOSW_H
-#include <sys/protosw.h>
-#endif
-
-#ifdef HAVE_SYS_STREAM_H
-#include <sys/stream.h>
-#endif
-
-#ifdef HAVE_SYS_SOCKETVAR_H
-#include <sys/socketvar.h>
-#endif
-
-/* Fix warning on OSF/1
- *
- * NOERROR is defined by both sys/stream.h (-1), and arpa/nameser.h (0),
- * the latter is included by netdb.h.
- */
-#ifdef NOERROR
-#undef NOERROR
-#endif /* NOERROR */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#include "dmalloc.h"
-
-struct dumudp {
- int fd;
- struct svalue read_callback;
-};
-
-#undef THIS
-#define THIS ((struct dumudp *)fp->current_storage)
-#define FD (THIS->fd)
-
-extern void get_inet_addr(struct sockaddr_in *addr,char *name);
-
-static void udp_bind(INT32 args)
-{
- struct sockaddr_in addr;
- int o;
- int fd,tmp;
-
-
- if(args < 1) error("Too few arguments to dumudp->bind()\n");
-
- if(sp[-args].type != T_INT)
- error("Bad argument 1 to dumudp->bind()\n");
-
- if(FD != -1)
- {
- set_read_callback( FD, 0, 0 );
- fd_close(FD); /* Shouldn't this be some other taste of close()? No - Hubbe */
- FD = -1;
- }
-
- fd = fd_socket(AF_INET, SOCK_DGRAM, 0);
- if(fd < 0)
- {
- pop_n_elems(args);
- error("socket failed\n");
- return;
- }
-
- o=1;
- if(fd_setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&o, sizeof(int)) < 0)
- {
- fd_close(fd);
- error("setsockopt failed\n");
- return;
- }
-
- MEMSET((char *)&addr,0,sizeof(struct sockaddr_in));
-
- if(args > 2 && sp[2-args].type==T_STRING) {
- get_inet_addr(&addr, sp[2-args].u.string->str);
- } else {
- addr.sin_addr.s_addr = htonl(INADDR_ANY);
- }
-
- addr.sin_port = htons( ((u_short)sp[-args].u.integer) );
- addr.sin_family = AF_INET;
-
- THREADS_ALLOW_UID();
-
- tmp=fd_bind(fd, (struct sockaddr *)&addr, sizeof(addr))<0;
-
- THREADS_DISALLOW_UID();
-
- if(tmp)
- {
- fd_close(fd);
- pop_n_elems(args);
- push_int(0);
- return;
- }
-
- FD=fd;
- pop_n_elems(args);
- push_int(1);
-}
-
-void udp_enable_broadcast(INT32 args)
-{
-#ifdef SO_BROADCAST
- int o;
- pop_n_elems(args);
- o = 1;
- push_int(fd_setsockopt(FD, SOL_SOCKET, SO_BROADCAST, (char *)&o, sizeof(int)));
-#else /* SO_BROADCAST */
- pop_n_elems(args);
- push_int(0);
-#endif /* SO_BROADCAST */
-}
-
-#define UDP_BUFFSIZE 65536
-
-void udp_read(INT32 args)
-{
- int flags = 0, res=0, fd;
- struct sockaddr_in from;
- char buffer[UDP_BUFFSIZE];
- ACCEPT_SIZE_T fromlen = sizeof(struct sockaddr_in);
-
- if(args)
- {
- if(sp[-args].u.integer & 1) {
- flags |= MSG_OOB;
- }
- if(sp[-args].u.integer & 2) {
-#ifdef MSG_PEEK
- flags |= MSG_PEEK;
-#else /* !MSG_PEEK */
- /* FIXME: What should we do here? */
-#endif /* MSG_PEEK */
- }
- if(sp[-args].u.integer & ~3) {
- error("Illegal 'flags' value passed to udp->read([int flags])\n");
- }
- }
- pop_n_elems(args);
- fd = FD;
- THREADS_ALLOW();
- while(((res = fd_recvfrom(fd, buffer, UDP_BUFFSIZE, flags,
- (struct sockaddr *)&from, &fromlen))==-1)
- &&(errno==EINTR));
- THREADS_DISALLOW();
-
- if(res<0)
- {
- switch(errno)
- {
-#ifdef WSAEBADF
- case WSAEBADF:
-#endif
- case EBADF:
- set_read_callback( FD, 0, 0 );
- error("Socket closed\n");
-#ifdef ESTALE
- case ESTALE:
-#endif
- case EIO:
- set_read_callback( FD, 0, 0 );
- error("I/O error\n");
- case ENOMEM:
-#ifdef ENOSR
- case ENOSR:
-#endif /* ENOSR */
- error("Out of memory\n");
-#ifdef ENOTSOCK
- case ENOTSOCK:
- fatal("reading from non-socket fd!!!\n");
-#endif
- case EWOULDBLOCK:
- push_int( 0 );
- return;
-
- default:
- error("Socket read failed with errno %d.\n",errno);
- }
- }
- /* Now comes the interresting part.
- * make a nice mapping from this stuff..
- */
- push_text("ip");
- push_text( inet_ntoa( from.sin_addr ) );
-
- push_text("port");
- push_int(ntohs(from.sin_port));
-
- push_text("data");
- push_string( make_shared_binary_string(buffer, res) );
- f_aggregate_mapping( 6 );
-}
-
-void udp_sendto(INT32 args)
-{
- int flags = 0, res=0, i, fd;
- struct sockaddr_in to;
- char *str;
- INT32 len;
- if(FD < 0)
- error("UDP: not open\n");
-
- if(args>3)
- {
- if(sp[3-args].u.integer & 1) {
- flags |= MSG_OOB;
- }
- if(sp[3-args].u.integer & 2) {
-#ifdef MSG_DONTROUTE
- flags |= MSG_DONTROUTE;
-#else /* !MSG_DONTROUTE */
- /* FIXME: What should we do here? */
-#endif /* MSG_DONTROUTE */
- }
- if(sp[3-args].u.integer & ~3) {
- error("Illegal 'flags' value passed to udp->send(string m,string t,int p,[int flags])\n");
- }
- }
- if(!args)
- error("Illegal number of arguments to udp->sendto(string to"
- ", string message, int port[, int flags])\n");
-
-
- if( sp[-args].type==T_STRING )
- get_inet_addr(&to, sp[-args].u.string->str);
- else
- error("Illegal type of argument to sendto, got non-string to-address.\n");
-
- to.sin_port = htons( ((u_short)sp[1-args].u.integer) );
-
- fd = FD;
- str = sp[2-args].u.string->str;
- len = sp[2-args].u.string->len;
- THREADS_ALLOW();
- while(((res = fd_sendto( fd, str, len, flags, (struct sockaddr *)&to,
- sizeof( struct sockaddr_in ))) == -1) && errno==EINTR);
- THREADS_DISALLOW();
-
- if(res<0)
- {
- switch(errno)
- {
-#ifdef EMSGSIZE
- case EMSGSIZE:
-#endif
- error("Too big message\n");
- case EBADF:
- set_read_callback( FD, 0, 0 );
- error("Socket closed\n");
- case ENOMEM:
-#ifdef ENOSR
- case ENOSR:
-#endif /* ENOSR */
- error("Out of memory\n");
- case EINVAL:
-#ifdef ENOTSOCK
- case ENOTSOCK:
- set_read_callback( FD, 0, 0 );
- error("Not a socket!!!\n");
-#endif
- case EWOULDBLOCK:
- error("Message would block.\n");
- }
- }
- pop_n_elems(args);
- push_int( res );
-}
-
-
-void zero_udp(struct object *ignored)
-{
- MEMSET(THIS, 0, sizeof(struct dumudp));
- THIS->read_callback.type=T_INT;
- FD = -1;
-}
-
-void exit_udp(struct object *ignored)
-{
- if(FD != -1)
- {
- set_read_callback( FD, 0, 0 );
- if (& THIS->read_callback)
- free_svalue(& THIS->read_callback );
- fd_close(FD);
- }
-}
-
-#define THIS_DATA ((struct dumudp *)data)
-
-static void udp_read_callback( int fd, void *data )
-{
- if(IS_ZERO(&THIS_DATA->read_callback))
- set_read_callback(THIS_DATA->fd, 0, 0);
- else
- apply_svalue(& THIS_DATA->read_callback, 0);
- pop_stack();
- return;
-}
-
-static void udp_set_read_callback(INT32 args)
-{
- if(FD < 0)
- error("File is not open.\n");
-
- if(args != 1)
- error("Wrong number of arguments to file->set_read_callback().\n");
-
- if(IS_ZERO(& THIS->read_callback))
- assign_svalue(& THIS->read_callback, sp-1);
- else
- assign_svalue_no_free(& THIS->read_callback, sp-1);
-
- if(IS_ZERO(& THIS->read_callback))
- set_read_callback(FD, 0, 0);
- else
- set_read_callback(FD, udp_read_callback, THIS);
- pop_n_elems(args);
-}
-
-static void udp_set_nonblocking(INT32 args)
-{
- if (FD < 0) error("File not open.\n");
-
- switch(args)
- {
- default: pop_n_elems(args-1);
- case 1: udp_set_read_callback(1);
- }
- set_nonblocking(FD,1);
-}
-
-static void udp_set_blocking(INT32 args)
-{
- if (FD < 0) error("File not open.\n");
- set_nonblocking(FD,0);
-}
-
-static void udp_query_address(INT32 args)
-{
- struct sockaddr_in addr;
- int i;
- char buffer[496],*q;
- ACCEPT_SIZE_T len;
-
- if(THIS->fd <0)
- error("socket->query_address(): Port not bound yet.\n");
-
- len=sizeof(addr);
- i=fd_getsockname(THIS->fd,(struct sockaddr *)&addr,&len);
- pop_n_elems(args);
- if(i < 0 || len < (int)sizeof(addr))
- {
- push_int(0);
- return;
- }
-
- q=inet_ntoa(addr.sin_addr);
- strncpy(buffer,q,sizeof(buffer)-20);
- buffer[sizeof(buffer)-20]=0;
- sprintf(buffer+strlen(buffer)," %d",(int)(ntohs(addr.sin_port)));
-
- push_string(make_shared_string(buffer));
-}
-
-
-void init_dumudp(void)
-{
- start_new_program();
-
- ADD_STORAGE(struct dumudp);
- /* function(int,void|function,void|string:int) */
- ADD_FUNCTION("bind",udp_bind,tFunc(tInt tOr(tVoid,tFunction) tOr(tVoid,tStr),tInt),0);
- /* function(:void) */
- ADD_FUNCTION("enable_broadcast", udp_enable_broadcast,tFunc(tNone,tVoid), 0);
- /* function(int|void:mapping(string:int|string)) */
- ADD_FUNCTION("read",udp_read,tFunc(tOr(tInt,tVoid),tMap(tStr,tOr(tInt,tStr))),0);
- /* function(string,int,string,void|int:int) */
- ADD_FUNCTION("send",udp_sendto,tFunc(tStr tInt tStr tOr(tVoid,tInt),tInt),0);
- /* function(function(void:void):void) */
- ADD_FUNCTION( "set_nonblocking", udp_set_nonblocking,tFunc(tFunc(tVoid,tVoid),tVoid), 0 );
- /* function(function(void:void):void) */
- ADD_FUNCTION( "set_read_callback", udp_set_read_callback,tFunc(tFunc(tVoid,tVoid),tVoid), 0 );
- /* function(void:void) */
- ADD_FUNCTION( "set_blocking", udp_set_blocking,tFunc(tVoid,tVoid), 0 );
- /* function(:string) */
- ADD_FUNCTION("query_address",udp_query_address,tFunc(tNone,tStr),0);
- set_init_callback(zero_udp);
- set_exit_callback(exit_udp);
- end_class("dumUDP",0);
-}
-
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index 5e49075a8791bc56adefa149cec7122a8c4f4896..69cdd2f4c7d7ee56ab486b589e74c296469ece5e 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -43,7 +43,7 @@
#include "threads.h"
#include "operators.h"
-RCSID("$Id: spider.c,v 1.83 1999/07/16 11:10:46 mirar Exp $");
+RCSID("$Id: spider.c,v 1.84 1999/07/21 18:39:31 grubba Exp $");
#ifdef HAVE_PWD_H
#include <pwd.h>
@@ -1308,8 +1308,6 @@ void pike_module_init(void)
#endif
}
- init_dumudp();
-
#ifdef ENABLE_STREAMED_PARSER
start_new_program();
add_storage( sizeof (struct streamed_parser) );