diff mbox series

[13/14] channel_curl: Make setting channel operation method symmetric

Message ID 20200914145712.4989-13-christian.storm@siemens.com
State Accepted
Headers show
Series [01/14] channel_curl: Make setting request_body symmetric | expand

Commit Message

Storm, Christian Sept. 14, 2020, 2:57 p.m. UTC 
Move setting the channel operation method to the method
implementations so that channel_set_options() only sets
options common to all methods.

Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
 corelib/channel_curl.c | 63 +++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 35 deletions(-)
diff mbox series

Patch

diff --git a/corelib/channel_curl.c b/corelib/channel_curl.c
index b69eb3b..5142c71 100644
--- a/corelib/channel_curl.c
+++ b/corelib/channel_curl.c
@@ -60,8 +60,7 @@  size_t channel_callback_membuffer(void *streamdata, size_t size, size_t nmemb,
 				   write_callback_t *data);
 channel_op_res_t channel_map_http_code(channel_t *this, long *http_response_code);
 channel_op_res_t channel_map_curl_error(CURLcode res);
-channel_op_res_t channel_set_options(channel_t *this, channel_data_t *channel_data,
-				     channel_method_t method);
+channel_op_res_t channel_set_options(channel_t *this, channel_data_t *channel_data);
 char *channel_get_redirect_url(channel_t *this);
 
 static void channel_log_effective_url(channel_t *this);
@@ -475,9 +474,7 @@  static channel_op_res_t channel_set_content_type(channel_t *this,
 	return result;
 }
 
-channel_op_res_t channel_set_options(channel_t *this,
-					channel_data_t *channel_data,
-					channel_method_t method)
+channel_op_res_t channel_set_options(channel_t *this, channel_data_t *channel_data)
 {
 	if (channel_data->low_speed_timeout == 0) {
 		channel_data->low_speed_timeout = SPEED_LOW_TIME_SEC;
@@ -620,27 +617,6 @@  channel_op_res_t channel_set_options(channel_t *this,
 		}
 	}
 
-	switch (method) {
-	case CHANNEL_GET:
-		if (curl_easy_setopt(channel_curl->handle, CURLOPT_CUSTOMREQUEST,
-				     "GET") != CURLE_OK) {
-			result = CHANNEL_EINIT;
-			goto cleanup;
-		}
-		break;
-	case CHANNEL_PUT:
-		if ((curl_easy_setopt(channel_curl->handle, CURLOPT_PUT, 1L) !=
-		     CURLE_OK) ||
-		     (curl_easy_setopt(channel_curl->handle, CURLOPT_UPLOAD, 1L) !=
-		      CURLE_OK)) {
-			result = CHANNEL_EINIT;
-			goto cleanup;
-		}
-		break;
-	case CHANNEL_POST:
-		break;
-	}
-
 	if (channel_curl->proxy != NULL) {
 		if (channel_curl->proxy != USE_PROXY_ENV) {
 			if (curl_easy_setopt(
@@ -808,8 +784,7 @@  static channel_op_res_t channel_post_method(channel_t *this, void *data)
 		goto cleanup_header;
 	}
 
-	if ((result = channel_set_options(this, channel_data, CHANNEL_POST)) !=
-	    CHANNEL_OK) {
+	if ((result = channel_set_options(this, channel_data)) != CHANNEL_OK) {
 		ERROR("Set channel option failed.");
 		goto cleanup_header;
 	}
@@ -822,7 +797,7 @@  static channel_op_res_t channel_post_method(channel_t *this, void *data)
 		(curl_easy_setopt(channel_curl->handle, CURLOPT_POSTFIELDS,
 					channel_data->request_body) != CURLE_OK)) {
 		result = CHANNEL_EINIT;
-		ERROR("Set channel option failed.");
+		ERROR("Set POST channel method option failed.");
 		goto cleanup_header;
 	}
 	if (channel_data->debug) {
@@ -875,12 +850,18 @@  static channel_op_res_t channel_put_method(channel_t *this, void *data)
 		goto cleanup_header;
 	}
 
-	if ((result = channel_set_options(this, channel_data, CHANNEL_PUT)) !=
-	    CHANNEL_OK) {
+	if ((result = channel_set_options(this, channel_data)) != CHANNEL_OK) {
 		ERROR("Set channel option failed.");
 		goto cleanup_header;
 	}
 
+	if ((curl_easy_setopt(channel_curl->handle, CURLOPT_PUT, 1L) != CURLE_OK) ||
+	    (curl_easy_setopt(channel_curl->handle, CURLOPT_UPLOAD, 1L) != CURLE_OK)) {
+		ERROR("Set PUT channel method option failed.");
+		result = CHANNEL_EINIT;
+		goto cleanup_header;
+	}
+
 	if ((curl_easy_setopt(channel_curl->handle, CURLOPT_READFUNCTION, put_read_callback) !=
 		CURLE_OK) ||
 	   (curl_easy_setopt(channel_curl->handle, CURLOPT_INFILESIZE_LARGE,
@@ -966,12 +947,18 @@  channel_op_res_t channel_get_file(channel_t *this, void *data)
 		goto cleanup_header;
 	}
 
-	if ((result = channel_set_options(this, channel_data, CHANNEL_GET)) !=
-	    CHANNEL_OK) {
+	if ((result = channel_set_options(this, channel_data)) != CHANNEL_OK) {
 		ERROR("Set channel option failed.");
 		goto cleanup_header;
 	}
 
+	if (curl_easy_setopt(channel_curl->handle, CURLOPT_CUSTOMREQUEST, "GET") !=
+	    CURLE_OK) {
+		ERROR("Set GET channel method option failed.");
+		result = CHANNEL_EINIT;
+		goto cleanup_header;
+	}
+
 	for (int retries = 3; retries >= 0; retries--) {
 		file_handle = ipc_inst_start_ext(channel_data->source,
 			channel_data->info == NULL ? 0 : strlen(channel_data->info),
@@ -1141,12 +1128,18 @@  channel_op_res_t channel_get(channel_t *this, void *data)
 		goto cleanup_header;
 	}
 
-	if ((result = channel_set_options(this, channel_data, CHANNEL_GET)) !=
-	    CHANNEL_OK) {
+	if ((result = channel_set_options(this, channel_data)) != CHANNEL_OK) {
 		ERROR("Set channel option failed.");
 		goto cleanup_header;
 	}
 
+	if (curl_easy_setopt(channel_curl->handle, CURLOPT_CUSTOMREQUEST, "GET") !=
+	    CURLE_OK) {
+		ERROR("Set GET channel method option failed.");
+		result = CHANNEL_EINIT;
+		goto cleanup_header;
+	}
+
 	if ((result = setup_reply_buffer(channel_curl->handle, &wrdata)) != CHANNEL_OK) {
 		goto cleanup_header;
 	}