}
if (error_msg) {
/* A socket error has occurred. */
- connection_fatal(error_msg);
+ logevent(error_msg);
+ connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
return 1;
}
+static void raw_sent(Plug plug, int bufsize)
+{
+ raw_bufsize = bufsize;
+}
+
/*
* Called to set up the raw connection.
*
* Also places the canonical host name into `realhost'. It must be
* freed by the caller.
*/
-static char *raw_init(char *host, int port, char **realhost)
+static char *raw_init(char *host, int port, char **realhost, int nodelay)
{
static struct plug_function_table fn_table = {
raw_closing,
- raw_receive
+ raw_receive,
+ raw_sent
}, *fn_table_ptr = &fn_table;
SockAddr addr;
/*
* Try to find host.
*/
+ {
+ char buf[200];
+ sprintf(buf, "Looking up host \"%.170s\"", host);
+ logevent(buf);
+ }
addr = sk_namelookup(host, realhost);
if ((err = sk_addr_error(addr)))
return err;
/*
* Open socket.
*/
- s = sk_new(addr, port, 0, 1, &fn_table_ptr);
+ {
+ char buf[200], addrbuf[100];
+ sk_getaddr(addr, addrbuf, 100);
+ sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
+ logevent(buf);
+ }
+ s = new_connection(addr, *realhost, port, 0, 1, nodelay, &fn_table_ptr);
if ((err = sk_socket_error(s)))
return err;
*/
static int raw_send(char *buf, int len)
{
-
if (s == NULL)
- return;
+ return 0;
raw_bufsize = sk_write(s, buf, len);
return 0;
}
+static int raw_exitcode(void)
+{
+ /* Exit codes are a meaningless concept in the Raw protocol */
+ return 0;
+}
+
Backend raw_backend = {
raw_init,
raw_send,
raw_size,
raw_special,
raw_socket,
+ raw_exitcode,
raw_sendok,
raw_ldisc,
raw_unthrottle,