From 35763dea799c96361e288a10eab0fbd16c36e880 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 14 Apr 2012 16:49:51 +0200 Subject: Add force_tls setting Use TLS for all actions when requested. Closes #234 --- src/ui.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/ui.c') diff --git a/src/ui.c b/src/ui.c index 104ee04..4162dce 100644 --- a/src/ui.c +++ b/src/ui.c @@ -134,14 +134,15 @@ void BarUiMsg (const BarSettings_t *settings, const BarUiMsg_t type, /* fetch http resource (post request) * @param waitress handle * @param piano request (initialized by PianoRequest()) + * @param ignore libpiano TLS hint and use it always */ static WaitressReturn_t BarPianoHttpRequest (WaitressHandle_t *waith, - PianoRequest_t *req) { + PianoRequest_t *req, bool forceTls) { waith->extraHeaders = "Content-Type: text/xml\r\n"; waith->postData = req->postData; waith->method = WAITRESS_METHOD_POST; waith->url.path = req->urlPath; - waith->url.tls = req->secure; + waith->url.tls = req->secure || forceTls; return WaitressFetchBuf (waith, &req->responseData); } @@ -172,7 +173,7 @@ int BarUiPianoCall (BarApp_t * const app, PianoRequestType_t type, return 0; } - *wRet = BarPianoHttpRequest (&app->waith, &req); + *wRet = BarPianoHttpRequest (&app->waith, &req, app->settings.forceTls); if (*wRet != WAITRESS_RET_OK) { BarUiMsg (&app->settings, MSG_NONE, "Network error: %s\n", WaitressErrorToStr (*wRet)); if (req.responseData != NULL) { -- cgit v1.2.3