projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for (Backend)->size() changes -- internal declarations didn't include
[u/mdw/putty]
/
raw.c
diff --git
a/raw.c
b/raw.c
index
e3fcbc0
..
90fc8a8
100644
(file)
--- a/
raw.c
+++ b/
raw.c
@@
-15,12
+15,13
@@
static Socket s = NULL;
static int raw_bufsize;
static Socket s = NULL;
static int raw_bufsize;
+static void *frontend;
-static void raw_size(
void
);
+static void raw_size(
int width, int height
);
static void c_write(char *buf, int len)
{
static void c_write(char *buf, int len)
{
- int backlog = from_backend(0, buf, len);
+ int backlog = from_backend(
frontend,
0, buf, len);
sk_set_frozen(s, backlog > RAW_MAX_BACKLOG);
}
sk_set_frozen(s, backlog > RAW_MAX_BACKLOG);
}
@@
-33,7
+34,8
@@
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. */
- connection_fatal(error_msg);
+ logevent(error_msg);
+ connection_fatal("%s", error_msg);
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
} /* Otherwise, the remote side closed the connection normally. */
return 0;
}
@@
-57,7
+59,8
@@
static void raw_sent(Plug plug, int bufsize)
* Also places the canonical host name into `realhost'. It must be
* freed by the caller.
*/
* 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, int nodelay)
+static char *raw_init(void *frontend_handle, char *host, int port,
+ char **realhost, int nodelay)
{
static struct plug_function_table fn_table = {
raw_closing,
{
static struct plug_function_table fn_table = {
raw_closing,
@@
-68,6
+71,8
@@
static char *raw_init(char *host, int port, char **realhost, int nodelay)
SockAddr addr;
char *err;
SockAddr addr;
char *err;
+ frontend = frontend_handle;
+
/*
* Try to find host.
*/
/*
* Try to find host.
*/
@@
-92,7
+97,7
@@
static char *raw_init(char *host, int port, char **realhost, int nodelay)
sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
logevent(buf);
}
sprintf(buf, "Connecting to %.100s port %d", addrbuf, port);
logevent(buf);
}
- s =
sk_new(addr
, port, 0, 1, nodelay, &fn_table_ptr);
+ s =
new_connection(addr, *realhost
, port, 0, 1, nodelay, &fn_table_ptr);
if ((err = sk_socket_error(s)))
return err;
if ((err = sk_socket_error(s)))
return err;
@@
-125,7
+130,7
@@
static int raw_sendbuffer(void)
/*
* Called to set the size of the window
*/
/*
* Called to set the size of the window
*/
-static void raw_size(
void
)
+static void raw_size(
int width, int height
)
{
/* Do nothing! */
return;
{
/* Do nothing! */
return;
@@
-162,6
+167,12
@@
static int raw_ldisc(int option)
return 0;
}
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,
Backend raw_backend = {
raw_init,
raw_send,
@@
-169,6
+180,7
@@
Backend raw_backend = {
raw_size,
raw_special,
raw_socket,
raw_size,
raw_special,
raw_socket,
+ raw_exitcode,
raw_sendok,
raw_ldisc,
raw_unthrottle,
raw_sendok,
raw_ldisc,
raw_unthrottle,