~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Selection now supported in pterm. Required small modifications
[sgt/putty]
/
x11fwd.c
diff --git
a/x11fwd.c
b/x11fwd.c
index
0e0df20
..
6f7be40
100644
(file)
--- a/
x11fwd.c
+++ b/
x11fwd.c
@@
-5,13
+5,6
@@
#include "putty.h"
#include "ssh.h"
#include "putty.h"
#include "ssh.h"
-#ifndef FALSE
-#define FALSE 0
-#endif
-#ifndef TRUE
-#define TRUE 1
-#endif
-
#define GET_32BIT_LSB_FIRST(cp) \
(((unsigned long)(unsigned char)(cp)[0]) | \
((unsigned long)(unsigned char)(cp)[1] << 8) | \
#define GET_32BIT_LSB_FIRST(cp) \
(((unsigned long)(unsigned char)(cp)[0]) | \
((unsigned long)(unsigned char)(cp)[1] << 8) | \
@@
-195,7
+188,7
@@
char *x11_init(Socket * s, char *display, void *c)
pr->throttled = pr->throttle_override = 0;
pr->c = c;
pr->throttled = pr->throttle_override = 0;
pr->c = c;
- pr->s = *s =
sk_new(addr, port, 0, 1
, (Plug) pr);
+ pr->s = *s =
new_connection(addr, dummy_realhost, port, 0, 1, 0
, (Plug) pr);
if ((err = sk_socket_error(*s))) {
sfree(pr);
return err;
if ((err = sk_socket_error(*s))) {
sfree(pr);
return err;
@@
-308,7
+301,7
@@
int x11_send(Socket s, char *data, int len)
reply[0] = 0; /* failure */
reply[1] = msglen; /* length of reason string */
memcpy(reply + 2, pr->firstpkt + 2, 4); /* major/minor proto vsn */
reply[0] = 0; /* failure */
reply[1] = msglen; /* length of reason string */
memcpy(reply + 2, pr->firstpkt + 2, 4); /* major/minor proto vsn */
- PUT_16BIT(pr->firstpkt[0], reply + 6, msg
len >> 2);
/* data len */
+ PUT_16BIT(pr->firstpkt[0], reply + 6, msg
size >> 2);
/* data len */
memset(reply + 8, 0, msgsize);
memcpy(reply + 8, message, msglen);
sshfwd_write(pr->c, reply, 8 + msgsize);
memset(reply + 8, 0, msgsize);
memcpy(reply + 8, message, msglen);
sshfwd_write(pr->c, reply, 8 + msgsize);