michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys/mgmt/hawkbit: update http response handling

Browse source 
Following the merge of #42026, the http body handling can be
simplified.

Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2022-02-26 15:47:33 +08:00 • committed by Carles Cufí
commit d2f7d696aa
1 changed files with 12 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

69
subsys/mgmt/hawkbit/hawkbit.c
View file

@ -691,28 +691,13 @@ static void response_cb(struct http_response *rsp,
switch (type) {
case HAWKBIT_PROBE:
if (hb_context.dl.http_content_size == 0) {
body_data = rsp->body_frag_start;
body_len = rsp->data_len;
/*
* subtract the size of the HTTP header from body_len
*/
body_len -= (rsp->body_frag_start - rsp->recv_buf);
hb_context.dl.http_content_size = rsp->content_length;
} else {
/*
* more general case where body data is set, but no need
* to take the HTTP header into account
*/
}
if (rsp->body_found) {
body_data = rsp->body_frag_start;
body_len = rsp->data_len;
}
body_len = rsp->body_frag_len;
if ((rsp->body_found == 1) && (body_data == NULL)) {
body_data = rsp->recv_buf;
body_len = rsp->data_len;
}
if (body_data != NULL) {
if ((hb_context.dl.downloaded_size + body_len) > response_buffer_size) {
response_buffer_size <<= 1;
rsp_tmp = realloc(hb_context.response_data,
@ -765,28 +750,13 @@ static void response_cb(struct http_response *rsp,
case HAWKBIT_PROBE_DEPLOYMENT_BASE:
if (hb_context.dl.http_content_size == 0) {
body_data = rsp->body_frag_start;
body_len = rsp->data_len;
/*
* subtract the size of the HTTP header from body_len
*/
body_len -= (rsp->body_frag_start - rsp->recv_buf);
hb_context.dl.http_content_size = rsp->content_length;
} else {
/*
* more general case where body data is set, but no need
* to take the HTTP header into account
*/
}
if (rsp->body_found) {
body_data = rsp->body_frag_start;
body_len = rsp->data_len;
}
body_len = rsp->body_frag_len;
if ((rsp->body_found == 1) && (body_data == NULL)) {
body_data = rsp->recv_buf;
body_len = rsp->data_len;
}
if (body_data != NULL) {
if ((hb_context.dl.downloaded_size + body_len) > response_buffer_size) {
response_buffer_size <<= 1;
rsp_tmp = realloc(hb_context.response_data,
@ -828,28 +798,13 @@ static void response_cb(struct http_response *rsp,
case HAWKBIT_DOWNLOAD:
if (hb_context.dl.http_content_size == 0) {
body_data = rsp->body_frag_start;
body_len = rsp->data_len;
/*
* subtract the size of the HTTP header from body_len
*/
body_len -= (rsp->body_frag_start - rsp->recv_buf);
hb_context.dl.http_content_size = rsp->content_length;
} else {
/*
* more general case where body data is set, but no need
* to take the HTTP header into account
*/
}
if (rsp->body_found) {
body_data = rsp->body_frag_start;
body_len = rsp->data_len;
}
body_len = rsp->body_frag_len;
if ((rsp->body_found == 1) && (body_data == NULL)) {
body_data = rsp->recv_buf;
body_len = rsp->data_len;
}
if (body_data != NULL) {
ret = mbedtls_md_update(&hb_context.dl.hash_ctx, body_data,
body_len);
if (ret != 0) {