/*
* Copyright (C) 1998 Michael R. Elkins <me@mutt.org>
- * Copyright (C) 1999-2001 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 1999-2005 Brendan Cully <brendan@kublai.com>
* Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>
*
* This program is free software; you can redistribute it and/or modify
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "mutt.h"
#include "globals.h"
#include "mutt_socket.h"
if (socket_preconnect ())
return -1;
- return conn->open (conn);
+ return conn->conn_open (conn);
}
int mutt_socket_close (CONNECTION* conn)
if (conn->fd < 0)
dprint (1, (debugfile, "mutt_socket_close: Attempt to close closed connection.\n"));
else
- rc = conn->close (conn);
+ rc = conn->conn_close (conn);
conn->fd = -1;
conn->ssf = 0;
return -1;
}
- rc = conn->read (conn, buf, len);
+ rc = conn->conn_read (conn, buf, len);
/* EOF */
if (rc == 0)
{
}
len = mutt_strlen (buf);
- if ((rc = conn->write (conn, buf, len)) < 0)
+ if ((rc = conn->conn_write (conn, buf, len)) < 0)
{
dprint (1, (debugfile,
"mutt_socket_write: error writing, closing socket\n"));
if (conn->bufpos >= conn->available)
{
if (conn->fd >= 0)
- conn->available = conn->read (conn, conn->inbuf, sizeof (conn->inbuf));
+ conn->available = conn->conn_read (conn, conn->inbuf, sizeof (conn->inbuf));
else
{
dprint (1, (debugfile, "mutt_socket_readchar: attempt to read from closed connection.\n"));
}
else
{
- conn->read = raw_socket_read;
- conn->write = raw_socket_write;
- conn->open = raw_socket_open;
- conn->close = raw_socket_close;
+ conn->conn_read = raw_socket_read;
+ conn->conn_write = raw_socket_write;
+ conn->conn_open = raw_socket_open;
+ conn->conn_close = raw_socket_close;
}
return conn;