Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
20
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
6ba7a906
Commit
6ba7a906
authored
4 years ago
by
Dmitriy A. Gerasimov
Browse files
Options
Downloads
Patches
Plain Diff
[*] Some more fixes
parent
9727ee05
No related branches found
No related tags found
1 merge request
!263
Master
Pipeline
#6622
passed with stage
Stage: analyze
in 14 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dap-sdk/net/client/dap_client_http.c
+16
-7
16 additions, 7 deletions
dap-sdk/net/client/dap_client_http.c
dap-sdk/net/server/enc_server/dap_enc_ks.c
+0
-1
0 additions, 1 deletion
dap-sdk/net/server/enc_server/dap_enc_ks.c
with
16 additions
and
8 deletions
dap-sdk/net/client/dap_client_http.c
+
16
−
7
View file @
6ba7a906
...
@@ -221,23 +221,32 @@ static void s_es_delete(dap_events_socket_t * a_es, void * a_arg)
...
@@ -221,23 +221,32 @@ static void s_es_delete(dap_events_socket_t * a_es, void * a_arg)
dap_client_http_pvt_t
*
l_client_http_internal
=
PVT
(
a_es
);
dap_client_http_pvt_t
*
l_client_http_internal
=
PVT
(
a_es
);
if
(
!
l_client_http_internal
->
were_callbacks_called
){
if
(
!
l_client_http_internal
->
were_callbacks_called
){
size_t
l_response_size
=
l_client_http_internal
->
response_size
>
l_client_http_internal
->
header_length
?
l_client_http_internal
->
response_size
-
l_client_http_internal
->
header_length
:
0
;
if
(
l_client_http_internal
->
content_length
){
if
(
l_client_http_internal
->
content_length
){
log_it
(
L_WARNING
,
"Remote server disconnected before he sends all data: %zd data in buffer when expected %zd"
,
log_it
(
L_WARNING
,
"Remote server disconnected before he sends all data: %zd data in buffer when expected %zd"
,
l_client_http_internal
->
response_size
,
l_client_http_internal
->
content_length
);
l_client_http_internal
->
response_size
,
l_client_http_internal
->
content_length
);
l_client_http_internal
->
error_callback
(
-
666
,
l_client_http_internal
->
obj
);
// -666 means remote server disconnected before he sends all
l_client_http_internal
->
error_callback
(
-
666
,
l_client_http_internal
->
obj
);
// -666 means remote server disconnected before he sends all
}
else
if
(
l_
client_http_internal
->
response_size
){
}
else
if
(
l_response_size
){
log_it
(
L_INFO
,
"Remote server replied without no content legth but we have the response %zd bytes size"
,
log_it
(
L_INFO
,
"Remote server replied without no content legth but we have the response %zd bytes size"
,
l_client_http_internal
->
response_size
);
l_response_size
);
if
(
l_client_http_internal
->
response_callback
)
l_client_http_internal
->
error_callback
(
-
10
,
l_client_http_internal
->
obj
);
/* if(l_client_http_internal->response_callback)
l_client_http_internal->response_callback(
l_client_http_internal->response_callback(
l_client_http_internal->response + l_client_http_internal->header_length,
l_client_http_internal->response + l_client_http_internal->header_length,
l_client_http_internal
->
response_size
>
l_client_http_internal
->
header_length
?
l_response_size,
l_client_http_internal
->
response_size
-
l_client_http_internal
->
header_length
:
0
,
l_client_http_internal->obj);*/
l_client_http_internal
->
obj
);
l_client_http_internal
->
were_callbacks_called
=
true
;
}
else
if
(
l_client_http_internal
->
response_size
){
log_it
(
L_INFO
,
"Remote server disconnected with reply. Body is empty, only headers are in"
);
l_client_http_internal
->
error_callback
(
-
667
,
l_client_http_internal
->
obj
);
// -667 means remote server replied only with headers
l_client_http_internal
->
were_callbacks_called
=
true
;
l_client_http_internal
->
were_callbacks_called
=
true
;
}
else
{
}
else
{
log_it
(
L_WARNING
,
"Remote server disconnected without reply"
);
log_it
(
L_WARNING
,
"Remote server disconnected without reply"
);
l_client_http_internal
->
error_callback
(
-
667
,
l_client_http_internal
->
obj
);
// -667 means remote server disconnected before he sends anythinh
l_client_http_internal
->
error_callback
(
-
668
,
l_client_http_internal
->
obj
);
// -668 means remote server disconnected before he sends anythinh
l_client_http_internal
->
were_callbacks_called
=
true
;
}
}
}
}
s_client_http_delete
(
PVT
(
a_es
));
s_client_http_delete
(
PVT
(
a_es
));
...
...
This diff is collapsed.
Click to expand it.
dap-sdk/net/server/enc_server/dap_enc_ks.c
+
0
−
1
View file @
6ba7a906
...
@@ -98,7 +98,6 @@ dap_enc_ks_key_t * dap_enc_ks_find(const char * v_id)
...
@@ -98,7 +98,6 @@ dap_enc_ks_key_t * dap_enc_ks_find(const char * v_id)
return ret;
return ret;
}*/
}*/
}
}
log_it
(
L_WARNING
,
"Key not found"
);
}
}
return
ret
;
return
ret
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment