+/*
+ * "Raw" backend.
+ */
+
#include <stdio.h>
#include <stdlib.h>
sk_set_frozen(raw->s, backlog > RAW_MAX_BACKLOG);
}
+static void raw_log(Plug plug, int type, SockAddr addr, int port,
+ const char *error_msg, int error_code)
+{
+ Raw raw = (Raw) plug;
+ char addrbuf[256], *msg;
+
+ sk_getaddr(addr, addrbuf, lenof(addrbuf));
+
+ if (type == 0)
+ msg = dupprintf("Connecting to %s port %d", addrbuf, port);
+ else
+ msg = dupprintf("Failed to connect to %s: %s", addrbuf, error_msg);
+
+ logevent(raw->frontend, msg);
+}
+
static int raw_closing(Plug plug, const char *error_msg, int error_code,
int calling_back)
{
int keepalive)
{
static const struct plug_function_table fn_table = {
+ raw_log,
raw_closing,
raw_receive,
raw_sent
*/
{
char *buf;
- buf = dupprintf("Looking up host \"%s\"", host);
+ buf = dupprintf("Looking up host \"%s\"%s", host,
+ (cfg->addressfamily == ADDRTYPE_IPV4 ? " (IPv4)" :
+ (cfg->addressfamily == ADDRTYPE_IPV6 ? " (IPv6)" :
+ "")));
logevent(raw->frontend, buf);
sfree(buf);
}
- addr = name_lookup(host, port, realhost, cfg);
+ addr = name_lookup(host, port, realhost, cfg, cfg->addressfamily);
if ((err = sk_addr_error(addr)) != NULL) {
sk_addr_free(addr);
return err;
/*
* Open socket.
*/
- {
- char *buf, addrbuf[100];
- sk_getaddr(addr, addrbuf, 100);
- buf = dupprintf("Connecting to %s port %d", addrbuf, port);
- logevent(raw->frontend, buf);
- sfree(buf);
- }
raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay, keepalive,
(Plug) raw, cfg);
if ((err = sk_socket_error(raw->s)) != NULL)
return err;
+ if (*cfg->loghost) {
+ char *colon;
+
+ sfree(*realhost);
+ *realhost = dupstr(cfg->loghost);
+ colon = strrchr(*realhost, ':');
+ if (colon) {
+ /*
+ * FIXME: if we ever update this aspect of ssh.c for
+ * IPv6 literal management, this should change in line
+ * with it.
+ */
+ *colon++ = '\0';
+ }
+ }
+
return NULL;
}
return NULL;
}
-static Socket raw_socket(void *handle)
+static int raw_connected(void *handle)
{
Raw raw = (Raw) handle;
- return raw->s;
+ return raw->s != NULL;
}
static int raw_sendok(void *handle)
return 0;
}
+/*
+ * cfg_info for Raw does nothing at all.
+ */
+static int raw_cfg_info(void *handle)
+{
+ return 0;
+}
+
Backend raw_backend = {
raw_init,
raw_free,
raw_size,
raw_special,
raw_get_specials,
- raw_socket,
+ raw_connected,
raw_exitcode,
raw_sendok,
raw_ldisc,
raw_provide_ldisc,
raw_provide_logctx,
raw_unthrottle,
- 1
+ raw_cfg_info,
+ "raw",
+ PROT_RAW,
+ 0
};