summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
63a984d)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
ENDIF()
ADD_LIBRARY(uclient SHARED uclient.c uclient-http.c uclient-utils.c)
ENDIF()
ADD_LIBRARY(uclient SHARED uclient.c uclient-http.c uclient-utils.c)
-TARGET_LINK_LIBRARIES(uclient ubox ustream-ssl)
+TARGET_LINK_LIBRARIES(uclient ubox dl)
ADD_EXECUTABLE(uclient-example uclient-example.c)
ADD_EXECUTABLE(uclient-example uclient-example.c)
-TARGET_LINK_LIBRARIES(uclient-example uclient)
+TARGET_LINK_LIBRARIES(uclient-example uclient ustream-ssl)
INSTALL(FILES uclient.h uclient-utils.h
DESTINATION include/libubox
INSTALL(FILES uclient.h uclient-utils.h
DESTINATION include/libubox
- uclient_http_set_ssl_ctx(cl, ctx, verify);
+ uclient_http_set_ssl_ctx(cl, &ustream_ssl_ops, ctx, verify);
example_request_sm(cl);
uloop_run();
uloop_done();
example_request_sm(cl);
uloop_run();
uloop_done();
struct uclient_http {
struct uclient uc;
struct uclient_http {
struct uclient uc;
+ const struct ustream_ssl_ops *ssl_ops;
struct ustream_ssl_ctx *ssl_ctx;
struct ustream *us;
struct ustream_ssl_ctx *ssl_ctx;
struct ustream *us;
struct ustream_ssl ussl;
bool ssl_require_validation;
struct ustream_ssl ussl;
bool ssl_require_validation;
bool ssl;
bool eof;
bool connection_close;
bool ssl;
bool eof;
bool connection_close;
us->string_data = true;
us->notify_state = uclient_notify_state;
us->notify_read = uclient_notify_read;
ret = uclient_do_connect(uh, "80");
if (ret)
us->string_data = true;
us->notify_state = uclient_notify_state;
us->notify_read = uclient_notify_read;
ret = uclient_do_connect(uh, "80");
if (ret)
+ return UCLIENT_ERROR_CONNECT;
uh->ssl = true;
uh->us = us;
uh->ssl = true;
uh->us = us;
+ if (!uh->ssl_ctx)
+ return UCLIENT_ERROR_MISSING_SSL_CONTEXT;
+
ret = uclient_do_connect(uh, "443");
if (ret)
ret = uclient_do_connect(uh, "443");
if (ret)
- return ret;
-
- if (!uh->ssl_ctx)
- uh->ssl_ctx = ustream_ssl_context_new(false);
+ return UCLIENT_ERROR_CONNECT;
us->string_data = true;
us->notify_state = uclient_ssl_notify_state;
us->string_data = true;
us->notify_state = uclient_ssl_notify_state;
uh->ussl.notify_error = uclient_ssl_notify_error;
uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
uh->ussl.notify_connected = uclient_ssl_notify_connected;
uh->ussl.notify_error = uclient_ssl_notify_error;
uh->ussl.notify_verify_error = uclient_ssl_notify_verify_error;
uh->ussl.notify_connected = uclient_ssl_notify_connected;
- ustream_ssl_init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
- ustream_ssl_set_peer_cn(&uh->ussl, uh->uc.url->host);
+ uh->ssl_ops->init(&uh->ussl, &uh->ufd.stream, uh->ssl_ctx, false);
+ uh->ssl_ops->set_peer_cn(&uh->ussl, uh->uc.url->host);
else
ret = uclient_setup_http(uh);
else
ret = uclient_setup_http(uh);
- if (ret)
- uclient_http_error(uh, UCLIENT_ERROR_CONNECT);
-
static void uclient_http_free_ssl_ctx(struct uclient_http *uh)
{
static void uclient_http_free_ssl_ctx(struct uclient_http *uh)
{
- if (uh->ssl_ctx && !uh->ssl_ctx_ext)
- ustream_ssl_context_free(uh->ssl_ctx);
-
- uh->ssl_ctx_ext = false;
+ uh->ssl_ops = NULL;
+ uh->ssl_ctx = NULL;
}
static void uclient_http_free(struct uclient *cl)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
}
static void uclient_http_free(struct uclient *cl)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
- uclient_http_free_ssl_ctx(uh);
uclient_http_free_url_state(cl);
uclient_http_free_url_state(cl);
+ uclient_http_free_ssl_ctx(uh);
blob_buf_free(&uh->headers);
blob_buf_free(&uh->meta);
free(uh);
blob_buf_free(&uh->headers);
blob_buf_free(&uh->meta);
free(uh);
-int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bool require_validation)
+int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *ops,
+ struct ustream_ssl_ctx *ctx, bool require_validation)
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
{
struct uclient_http *uh = container_of(cl, struct uclient_http, uc);
uclient_http_free_url_state(cl);
uclient_http_free_ssl_ctx(uh);
uclient_http_free_url_state(cl);
uclient_http_free_ssl_ctx(uh);
- uh->ssl_ctx_ext = !!ctx;
uh->ssl_require_validation = !!ctx && require_validation;
return 0;
uh->ssl_require_validation = !!ctx && require_validation;
return 0;
UCLIENT_ERROR_CONNECT,
UCLIENT_ERROR_SSL_INVALID_CERT,
UCLIENT_ERROR_SSL_CN_MISMATCH,
UCLIENT_ERROR_CONNECT,
UCLIENT_ERROR_SSL_INVALID_CERT,
UCLIENT_ERROR_SSL_CN_MISMATCH,
+ UCLIENT_ERROR_MISSING_SSL_CONTEXT,
int uclient_http_set_request_type(struct uclient *cl, const char *type);
bool uclient_http_redirect(struct uclient *cl);
int uclient_http_set_request_type(struct uclient *cl, const char *type);
bool uclient_http_redirect(struct uclient *cl);
-int uclient_http_set_ssl_ctx(struct uclient *cl, struct ustream_ssl_ctx *ctx, bool require_validation);
+int uclient_http_set_ssl_ctx(struct uclient *cl, const struct ustream_ssl_ops *ops,
+ struct ustream_ssl_ctx *ctx, bool require_validation);