http: add helper function for checking redirect status

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/uclient-http.c b/uclient-http.c
index c2bba6b5b8f2093e3b408d6d35a312673f821583..935d50f413c03883bb3c3c923e850624b23913f2 100644 (file)
--- a/uclient-http.c
+++ b/uclient-http.c
@@ -1159,14 +1159,8 @@ int uclient_http_redirect(struct uclient *cl)
        if (cl->backend != &uclient_backend_http)
                return false;
 
-       switch (cl->status_code) {
-       case 301:
-       case 302:
-       case 307:
-               break;
-       default:
+       if (!uclient_http_status_redirect(cl))
                return false;
-       }
 
        blobmsg_parse(&location, 1, &tb, blob_data(uh->meta.head), blob_len(uh->meta.head));
        if (!tb)

diff --git a/uclient.h b/uclient.h
index 0901910bb5f604d12e58a79cd9a87248587b13ed..ffe159a3375f083272225796015eee70dcfec462 100644 (file)
--- a/uclient.h
+++ b/uclient.h
@@ -125,6 +125,18 @@ int uclient_http_set_header(struct uclient *cl, const char *name, const char *va
 int uclient_http_set_request_type(struct uclient *cl, const char *type);
 int uclient_http_redirect(struct uclient *cl);
 
+static inline bool uclient_http_status_redirect(struct uclient *cl)
+{
+       switch (cl->status_code) {
+       case 301:
+       case 302:
+       case 307:
+               return true;
+       default:
+               return false;
+       }
+}
+
 int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *ops,
                             struct ustream_ssl_ctx *ctx, bool require_validation);
 int uclient_http_set_address_family(struct uclient *cl, int af);