v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Show upgrade message

Browse Source
This commit is contained in:
Nicolas Viennot 2013-07-23 18:10:53 -04:00
parent 4a6ccae4fa
commit b464ad7b4c
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmate-decoder.c
View File

@ -110,6 +110,10 @@ static void tmate_header(struct tmate_decoder *decoder,
tmate_debug("new master, client version: %s, protocol version: %d", tmate_debug("new master, client version: %s, protocol version: %d",
client_version, decoder->protocol); client_version, decoder->protocol);
if (strcmp(client_version, TMATE_LATEST_VERSION))
tmate_notify_later(10, "A new version is available, please upgrade :)");
free(client_version); free(client_version);
if (gethostname(hostname, sizeof(hostname)) < 0) if (gethostname(hostname, sizeof(hostname)) < 0)

40
tmate-encoder.c
View File

@ -32,6 +32,13 @@ void tmate_encoder_init(struct tmate_encoder *encoder)
msgpack_pack_##what(&tmate_encoder->pk, __VA_ARGS__); \ msgpack_pack_##what(&tmate_encoder->pk, __VA_ARGS__); \
} while(0) } while(0)
static void __tmate_notify(const char *msg)
{
pack(array, 2);
pack(int, TMATE_NOTIFY);
pack(string, msg);
}
void printflike1 tmate_notify(const char *fmt, ...) void printflike1 tmate_notify(const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -41,9 +48,36 @@ void printflike1 tmate_notify(const char *fmt, ...)
vsnprintf(msg, sizeof(msg), fmt, ap); vsnprintf(msg, sizeof(msg), fmt, ap);
va_end(ap); va_end(ap);
pack(array, 2); __tmate_notify(msg);
pack(int, TMATE_NOTIFY); }
pack(string, msg);
static void __tmate_notify_later(evutil_socket_t fd, short what, void *arg)
{
char *msg = arg;
__tmate_notify(msg);
}
void printflike2 tmate_notify_later(int timeout, const char *fmt, ...)
{
struct timeval tv;
va_list ap;
char *msg;
tv.tv_sec = timeout;
tv.tv_usec = 0;
va_start(ap, fmt);
xvasprintf(&msg, fmt, ap);
va_end(ap);
/*
* FIXME leaks like crazy when calling tmate_notify_later()
* multiple times.
*/
evtimer_assign(&tmate_encoder->ev_notify_timer, ev_base,
__tmate_notify_later, msg);
evtimer_add(&tmate_encoder->ev_notify_timer, &tv);
} }
static int num_clients(void) static int num_clients(void)

3
tmate.h
View File

@ -19,6 +19,7 @@ do { \
/* tmate-encoder.c */ /* tmate-encoder.c */
#define TMATE_LATEST_VERSION "1.8.6"
#define TMATE_DOMAIN "tmate.io" #define TMATE_DOMAIN "tmate.io"
enum tmate_client_commands { enum tmate_client_commands {
@ -31,12 +32,14 @@ enum tmate_client_commands {
struct tmate_encoder { struct tmate_encoder {
struct evbuffer *buffer; struct evbuffer *buffer;
struct event ev_readable; struct event ev_readable;
struct event ev_notify_timer;
msgpack_packer pk; msgpack_packer pk;
}; };
extern void tmate_encoder_init(struct tmate_encoder *encoder); extern void tmate_encoder_init(struct tmate_encoder *encoder);
extern void printflike1 tmate_notify(const char *fmt, ...); extern void printflike1 tmate_notify(const char *fmt, ...);
extern void printflike2 tmate_notify_later(int timeout, const char *fmt, ...);
extern void tmate_notify_client_join(struct client *c); extern void tmate_notify_client_join(struct client *c);
extern void tmate_notify_client_left(struct client *c); extern void tmate_notify_client_left(struct client *c);