diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-06-08 00:02:40 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-06-08 00:02:40 +0800 |
| commit | 657d43f453ffa4360d8716c49006bdd3297f86b4 (patch) | |
| tree | f5ca28e0e15fba073d2dd65d1ea2cc73f8b26220 /mbbsd | |
| parent | 5c8bb43b13925613c4c35b7483c421cc1abe62a0 (diff) | |
| download | pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.tar pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.tar.gz pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.tar.bz2 pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.tar.lz pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.tar.xz pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.tar.zst pttbbs-657d43f453ffa4360d8716c49006bdd3297f86b4.zip | |
* add client code detection to tunnel mode
* refine telnet library to support write customization
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4517 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
| -rw-r--r-- | mbbsd/mbbsd.c | 6 | ||||
| -rw-r--r-- | mbbsd/telnet.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c index ff9188d8..6d86247b 100644 --- a/mbbsd/mbbsd.c +++ b/mbbsd/mbbsd.c @@ -1853,6 +1853,8 @@ tunnel_login(char *argv0, struct ProgramOption *option) towrite(tunnel, &success, sizeof(success)) < sizeof(success)) return 0; + assert(dat.cb == sizeof(dat)); + // optimize connection set_connection_opt(csock); @@ -1880,6 +1882,10 @@ tunnel_login(char *argv0, struct ProgramOption *option) option->term_width = dat.t_cols; option->term_height = dat.t_lines; telnet_init(0); +#ifdef DETECT_CLIENT + telnet_turnoff_client_detect(); + client_code = dat.client_code; // use the client code detected by remote daemon +#endif return 1; } diff --git a/mbbsd/telnet.c b/mbbsd/telnet.c index d60254ac..7cf1fee5 100644 --- a/mbbsd/telnet.c +++ b/mbbsd/telnet.c @@ -20,6 +20,7 @@ telnet_cb_resize_term(void *resize_arg, int w, int h) } const static struct TelnetCallback telnet_callback = { + NULL, telnet_cb_resize_term, #ifdef DETECT_CLIENT telnet_cb_update_client_code, @@ -39,7 +40,7 @@ telnet_init(int do_init_cmd) telnet_ctx_set_cc_arg(ctx, (void*)1); #endif if (do_init_cmd) - telnet_send_init_cmds(fd); + telnet_ctx_send_init_cmds(ctx); } /* tty_read |