Download raw body.
relayd: refactor rsession done handling
Simplify session close paths in relay and HTTP read callbacks
No functional change, OK?
diff --git a/relay.c b/relay.c
index 1f28ccd..03da5be 100644
--- a/relay.c
+++ b/relay.c
@@ -865,19 +865,15 @@ relay_write(struct bufferevent *bev, void *arg)
getmonotime(&con->se_tv_last);
- if (con->se_done && EVBUFFER_LENGTH(EVBUFFER_OUTPUT(bev)) == 0)
- goto done;
+ if (con->se_done && EVBUFFER_LENGTH(EVBUFFER_OUTPUT(bev)) == 0) {
+ relay_close(con, "last write (done)", 0);
+ return;
+ }
if (cre->dst->bev)
bufferevent_enable(cre->dst->bev, EV_READ);
- if (relay_splice(cre->dst) == -1)
- goto fail;
-
- return;
- done:
- relay_close(con, "last write (done)", 0);
- return;
- fail:
- relay_close(con, strerror(errno), 1);
+ if (relay_splice(cre->dst) == -1) {
+ relay_close(con, strerror(errno), 1);
+ }
}
void
@@ -911,22 +907,19 @@ relay_read(struct bufferevent *bev, void *arg)
if (!EVBUFFER_LENGTH(src))
return;
- if (relay_bufferevent_write_buffer(cre->dst, src) == -1)
- goto fail;
- if (con->se_done)
- goto done;
+ if (relay_bufferevent_write_buffer(cre->dst, src) == -1) {
+ relay_close(con, strerror(errno), 1);
+ return;
+ }
+ if (con->se_done) {
+ relay_close(con, "last read (done)", 0);
+ return;
+ }
if (cre->dst->bev)
bufferevent_enable(cre->dst->bev, EV_READ);
if (cre->dst->bev && EVBUFFER_LENGTH(EVBUFFER_OUTPUT(cre->dst->bev)) >
(size_t)RELAY_MAX_PREFETCH * proto->tcpbufsiz)
bufferevent_disable(bev, EV_READ);
-
- return;
- done:
- relay_close(con, "last read (done)", 0);
- return;
- fail:
- relay_close(con, strerror(errno), 1);
}
/*
diff --git a/relay_http.c b/relay_http.c
index ad95fef..92bf0f0 100644
--- a/relay_http.c
+++ b/relay_http.c
@@ -83,6 +83,7 @@ char *server_root_strip(char *, int);
int relay_http_parse_startline(struct ctl_relay_event *, char *,
enum httpmethod *);
static int relay_url_log_match(const struct kv *, const char *);
+static int relay_session_done(struct rsession *, const char *);
static struct relayd *env = NULL;
@@ -617,10 +618,8 @@ relay_read_http(struct bufferevent *bev, void *arg)
}
}
}
- if (con->se_done) {
- relay_close(con, "last http read (done)", 0);
+ if (relay_session_done(con, "last http read (done)"))
return;
- }
switch (relay_splice(cre)) {
case -1:
relay_close(con, strerror(errno), 1);
@@ -682,8 +681,8 @@ relay_read_httpcontent(struct bufferevent *bev, void *arg)
cre->toread = TOREAD_HTTP_HEADER;
bev->readcb = relay_read_http;
}
- if (con->se_done)
- goto done;
+ if (relay_session_done(con,"last http content read"))
+ return;
bufferevent_enable(bev, EV_READ);
if (cre->dst->bev && EVBUFFER_LENGTH(EVBUFFER_OUTPUT(cre->dst->bev)) >
@@ -694,9 +693,6 @@ relay_read_httpcontent(struct bufferevent *bev, void *arg)
bev->readcb(bev, arg);
/* The callback readcb() might have freed the session. */
return;
- done:
- relay_close(con, "last http content read", 0);
- return;
fail:
relay_close(con, strerror(errno), 1);
}
@@ -835,8 +831,8 @@ relay_read_httpchunks(struct bufferevent *bev, void *arg)
}
next:
- if (con->se_done)
- goto done;
+ if (relay_session_done(con, "last http chunk read (done)"))
+ return;
bufferevent_enable(bev, EV_READ);
if (cre->dst->bev && EVBUFFER_LENGTH(EVBUFFER_OUTPUT(cre->dst->bev)) >
@@ -848,9 +844,6 @@ relay_read_httpchunks(struct bufferevent *bev, void *arg)
/* The callback readcb() might have freed the session. */
return;
- done:
- relay_close(con, "last http chunk read (done)", 0);
- return;
fail:
relay_close(con, strerror(errno), 1);
}
@@ -2249,3 +2242,13 @@ relay_url_log_match(const struct kv *kv, const char *str)
/* without a keyword, url log keys are case-insensitive glob(7) */
return (fnmatch(kv->kv_key, str, FNM_CASEFOLD) != FNM_NOMATCH);
}
+
+static int
+relay_session_done(struct rsession *con, const char *msg)
+{
+ if (con->se_done) {
+ relay_close(con, msg, 0);
+ return (1);
+ }
+ return (0);
+}
relayd: refactor rsession done handling