Signed-off-by: Luka Perkov <[email protected]>
---
uclient-fetch.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/uclient-fetch.c b/uclient-fetch.c
index 881b4ea..01dfbf1 100644
--- a/uclient-fetch.c
+++ b/uclient-fetch.c
@@ -137,7 +137,7 @@ static void read_data_cb(struct uclient *cl)
}
}
-static void msg_connecting(struct uclient *cl)
+static void msg_connected(struct uclient *cl)
{
char addr[INET6_ADDRSTRLEN];
int port;
@@ -146,16 +146,30 @@ static void msg_connecting(struct uclient *cl)
return;
uclient_get_addr(addr, &port, &cl->remote_addr);
- fprintf(stderr, "Connecting to %s:%d\n", addr, port);
+ fprintf(stderr, "Connected to %s:%d\n", addr, port);
}
-static void init_request(struct uclient *cl)
+static int init_request(struct uclient *cl)
{
+ int rc;
+
out_bytes = 0;
- uclient_connect(cl);
- msg_connecting(cl);
- uclient_http_set_request_type(cl, "GET");
- uclient_request(cl);
+
+ rc = uclient_connect(cl);
+ if (rc)
+ return rc;
+
+ msg_connected(cl);
+
+ rc = uclient_http_set_request_type(cl, "GET");
+ if (rc)
+ return rc;
+
+ rc = uclient_request(cl);
+ if (rc)
+ return rc;
+
+ return 0;
}
static void eof_cb(struct uclient *cl)
@@ -269,6 +283,7 @@ int main(int argc, char **argv)
struct uclient *cl;
int ch;
int longopt_idx = 0;
+ int rc;
init_ustream_ssl();
@@ -340,8 +355,15 @@ int main(int argc, char **argv)
if (ssl_ctx)
uclient_http_set_ssl_ctx(cl, ssl_ops, ssl_ctx, verify);
- init_request(cl);
- uloop_run();
+ rc = init_request(cl);
+ if (!rc) {
+ /* no error received, we can enter main loop */
+ uloop_run();
+ } else {
+ fprintf(stderr, "Failed to establish connection\n");
+ error_ret = 4;
+ }
+
uloop_done();
uclient_free(cl);
--
1.9.2
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
