summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-01-07 03:08:00 +0100
committerLennart Poettering <lennart@poettering.net>2015-01-07 03:08:00 +0100
commit0ec5543c4c0318552a4dcdd83210793347b93081 (patch)
tree9de7421842bd9d1e274ae5943cab1f11dcc7cc86 /src/shared
parentf7ad54a301e4ae8dceab54d3ab3934e56c1134ea (diff)
machinectl: make sure that "machinectl login" exits immediately when the machine it is connected to dies
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/ptyfwd.c60
-rw-r--r--src/shared/ptyfwd.h5
2 files changed, 55 insertions, 10 deletions
diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 11356e2def..db2445ceab 100644
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -52,6 +52,7 @@ struct PTYForward {
bool master_readable:1;
bool master_writable:1;
bool master_hangup:1;
+ bool master_suppressed_hangup:1;
bool repeat:1;
@@ -170,16 +171,22 @@ static int shovel(PTYForward *f) {
k = read(f->master, f->out_buffer + f->out_buffer_full, LINE_MAX - f->out_buffer_full);
if (k < 0) {
- /* Note that EIO on the master device
- * might be cause by vhangup() or
- * temporary closing of everything on
- * the other side, we treat it like
- * EAGAIN here and try again, unless
- * repeat is off. */
+ if (errno == EAGAIN)
+ f->master_readable = false;
+
+ else if (errno == EIO && f->repeat) {
+
+ /* Note that EIO on the master device
+ * might be cause by vhangup() or
+ * temporary closing of everything on
+ * the other side, we treat it like
+ * EAGAIN here and try again, unless
+ * repeat is off. */
- if (errno == EAGAIN || (errno == EIO && f->repeat))
f->master_readable = false;
- else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) {
+ f->master_suppressed_hangup = true;
+
+ } else if (errno == EPIPE || errno == ECONNRESET || errno == EIO) {
f->master_readable = f->master_writable = false;
f->master_hangup = true;
@@ -243,6 +250,8 @@ static int on_master_event(sd_event_source *e, int fd, uint32_t revents, void *u
assert(fd >= 0);
assert(fd == f->master);
+ f->master_suppressed_hangup = false;
+
if (revents & (EPOLLIN|EPOLLHUP))
f->master_readable = true;
@@ -403,7 +412,7 @@ PTYForward *pty_forward_free(PTYForward *f) {
return NULL;
}
-int pty_forward_last_char(PTYForward *f, char *ch) {
+int pty_forward_get_last_char(PTYForward *f, char *ch) {
assert(f);
assert(ch);
@@ -413,3 +422,36 @@ int pty_forward_last_char(PTYForward *f, char *ch) {
*ch = f->last_char;
return 0;
}
+
+int pty_forward_set_repeat(PTYForward *f, bool repeat) {
+ int r;
+
+ assert(f);
+
+ if (f->repeat == repeat)
+ return 0;
+
+ f->repeat = repeat;
+
+ /* Are we currently in a suppress hangup phase? If so, let's
+ * immediately terminate things */
+ if (!f->repeat && f->master_suppressed_hangup) {
+
+ /* Let's try to read again from the master fd, and if
+ * it is this will now cause termination of the
+ * session. */
+
+ f->master_readable = true;
+ r = shovel(f);
+ if (r < 0)
+ return r;
+ }
+
+ return 0;
+}
+
+int pty_forward_get_repeat(PTYForward *f) {
+ assert(f);
+
+ return f->repeat;
+}
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index d7b658e181..d557dee9db 100644
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -31,6 +31,9 @@ typedef struct PTYForward PTYForward;
int pty_forward_new(sd_event *event, int master, bool repeat, PTYForward **f);
PTYForward *pty_forward_free(PTYForward *f);
-int pty_forward_last_char(PTYForward *f, char *ch);
+int pty_forward_get_last_char(PTYForward *f, char *ch);
+
+int pty_forward_set_repeat(PTYForward *f, bool repeat);
+int pty_forward_get_repeat(PTYForward *f);
DEFINE_TRIVIAL_CLEANUP_FUNC(PTYForward*, pty_forward_free);