summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaria Matejka <mq@ucw.cz>2022-09-18 16:36:07 +0200
committerMaria Matejka <mq@ucw.cz>2022-09-18 16:36:07 +0200
commitf33793acf768646b63c42287de2e09e7f33d7b1f (patch)
treed124797f3325b43cb6b90056a5f6505e4a178244
parentcf38092b2ddf7c3bc8d2ec25e57c2621462c02c2 (diff)
parent4f3fa1623f66acd24c227cf0cc5a4af2f5133b6c (diff)
Merge commit '4f3fa162' into HEAD
-rw-r--r--nest/proto.c1
-rw-r--r--proto/pipe/config.Y1
2 files changed, 2 insertions, 0 deletions
diff --git a/nest/proto.c b/nest/proto.c
index 8c8daa0a..7baab269 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1147,6 +1147,7 @@ proto_event(void *ptr)
{
if (p->proto == &proto_unix_iface)
if_flush_ifaces(p);
+
p->do_stop = 0;
}
diff --git a/proto/pipe/config.Y b/proto/pipe/config.Y
index 0990168e..444de127 100644
--- a/proto/pipe/config.Y
+++ b/proto/pipe/config.Y
@@ -25,6 +25,7 @@ proto: pipe_proto '}' { this_channel = NULL; } ;
pipe_proto_start: proto_start PIPE
{
this_proto = proto_config_new(&proto_pipe, $1);
+ this_proto->loop_order = DOMAIN_ORDER(proto);
PIPE_CFG->max_generation = 16;
}
proto_name