projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
`ssh-default': change the /DSSH_DEFAULT flag to a /DTELNET_DEFAULT one
[u/mdw/putty]
/
raw.c
diff --git
a/raw.c
b/raw.c
index
e269a7d
..
94ff43f
100644
(file)
--- a/
raw.c
+++ b/
raw.c
@@
-1,4
+1,3
@@
-#include <windows.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-41,7
+40,7
@@
static int raw_closing(Plug plug, char *error_msg, int error_code,
}
if (error_msg) {
/* A socket error has occurred. */
}
if (error_msg) {
/* A socket error has occurred. */
- logevent(error_msg);
+ logevent(
raw->frontend,
error_msg);
connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
@@
-69,6
+68,7
@@
static void raw_sent(Plug plug, int bufsize)
* freed by the caller.
*/
static char *raw_init(void *frontend_handle, void **backend_handle,
* freed by the caller.
*/
static char *raw_init(void *frontend_handle, void **backend_handle,
+ Config *cfg,
char *host, int port, char **realhost, int nodelay)
{
static const struct plug_function_table fn_table = {
char *host, int port, char **realhost, int nodelay)
{
static const struct plug_function_table fn_table = {
@@
-91,12
+91,13
@@
static char *raw_init(void *frontend_handle, void **backend_handle,
* Try to find host.
*/
{
* Try to find host.
*/
{
- char buf[200];
- sprintf(buf, "Looking up host \"%.170s\"", host);
- logevent(buf);
+ char *buf;
+ buf = dupprintf("Looking up host \"%s\"", host);
+ logevent(raw->frontend, buf);
+ sfree(buf);
}
}
- addr =
sk_namelookup(host, realhost
);
- if ((err = sk_addr_error(addr)))
+ addr =
name_lookup(host, port, realhost, cfg
);
+ if ((err = sk_addr_error(addr))
!= NULL
)
return err;
if (port < 0)
return err;
if (port < 0)
@@
-106,13
+107,15
@@
static char *raw_init(void *frontend_handle, void **backend_handle,
* Open socket.
*/
{
* Open socket.
*/
{
- char
buf[200]
, addrbuf[100];
+ char
*buf
, addrbuf[100];
sk_getaddr(addr, addrbuf, 100);
sk_getaddr(addr, addrbuf, 100);
- sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
- logevent(buf);
+ 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, (Plug) raw);
- if ((err = sk_socket_error(raw->s)))
+ raw->s = new_connection(addr, *realhost, port, 0, 1, nodelay,
+ (Plug) raw, cfg);
+ if ((err = sk_socket_error(raw->s)) != NULL)
return err;
sk_addr_free(addr);
return err;
sk_addr_free(addr);
@@
-121,6
+124,13
@@
static char *raw_init(void *frontend_handle, void **backend_handle,
}
/*
}
/*
+ * Stub routine (we don't have any need to reconfigure this backend).
+ */
+static void raw_reconfig(void *handle, Config *cfg)
+{
+}
+
+/*
* Called to send data down the raw connection.
*/
static int raw_send(void *handle, char *buf, int len)
* Called to send data down the raw connection.
*/
static int raw_send(void *handle, char *buf, int len)
@@
-191,6
+201,11
@@
static void raw_provide_ldisc(void *handle, void *ldisc)
/* This is a stub. */
}
/* This is a stub. */
}
+static void raw_provide_logctx(void *handle, void *logctx)
+{
+ /* This is a stub. */
+}
+
static int raw_exitcode(void *handle)
{
/* Exit codes are a meaningless concept in the Raw protocol */
static int raw_exitcode(void *handle)
{
/* Exit codes are a meaningless concept in the Raw protocol */
@@
-199,6
+214,7
@@
static int raw_exitcode(void *handle)
Backend raw_backend = {
raw_init,
Backend raw_backend = {
raw_init,
+ raw_reconfig,
raw_send,
raw_sendbuffer,
raw_size,
raw_send,
raw_sendbuffer,
raw_size,
@@
-208,6
+224,7
@@
Backend raw_backend = {
raw_sendok,
raw_ldisc,
raw_provide_ldisc,
raw_sendok,
raw_ldisc,
raw_provide_ldisc,
+ raw_provide_logctx,
raw_unthrottle,
1
};
raw_unthrottle,
1
};