Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libdap-client
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
cellframe
libdap-client
Commits
054291f1
Commit
054291f1
authored
4 years ago
by
Roman Khlopkov
🔜
Browse files
Options
Downloads
Patches
Plain Diff
[*] Small bugs fixed
parent
e94eba92
No related branches found
No related tags found
1 merge request
!16
bugs-3621
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/dap_client_http.c
+2
-2
2 additions, 2 deletions
src/dap_client_http.c
src/dap_client_pvt.c
+2
-2
2 additions, 2 deletions
src/dap_client_pvt.c
with
4 additions
and
4 deletions
src/dap_client_http.c
+
2
−
2
View file @
054291f1
...
@@ -328,10 +328,10 @@ void* dap_client_http_request_custom(const char *a_uplink_addr, uint16_t a_uplin
...
@@ -328,10 +328,10 @@ void* dap_client_http_request_custom(const char *a_uplink_addr, uint16_t a_uplin
int
l_err
=
0
;
int
l_err
=
0
;
if
((
l_err
=
connect
(
l_socket
,
(
struct
sockaddr
*
)
&
l_remote_addr
,
sizeof
(
struct
sockaddr_in
)))
!=
-
1
)
{
if
((
l_err
=
connect
(
l_socket
,
(
struct
sockaddr
*
)
&
l_remote_addr
,
sizeof
(
struct
sockaddr_in
)))
!=
-
1
)
{
//s_set_sock_nonblock(a_client_pvt->stream_socket, false);
//s_set_sock_nonblock(a_client_pvt->stream_socket, false);
log_it
(
L_INFO
,
"Remote address connected (%s:%u) with sock_id %d"
,
a_uplink_addr
,
a_uplink_port
,
socket
);
log_it
(
L_INFO
,
"Remote address connected (%s:%u) with sock_id %d"
,
a_uplink_addr
,
a_uplink_port
,
l_
socket
);
}
}
else
{
else
{
log_it
(
L_ERROR
,
"Remote address can't connected (%s:%u) with sock_id %d"
,
a_uplink_addr
,
a_uplink_port
);
log_it
(
L_ERROR
,
"Remote address can't connected (%s:%u) with sock_id %d"
,
a_uplink_addr
,
a_uplink_port
,
l_socket
);
//l_ev_socket->no_close = false;
//l_ev_socket->no_close = false;
dap_events_socket_kill_socket
(
l_ev_socket
);
dap_events_socket_kill_socket
(
l_ev_socket
);
//shutdown(l_ev_socket->socket, SHUT_RDWR);
//shutdown(l_ev_socket->socket, SHUT_RDWR);
...
...
This diff is collapsed.
Click to expand it.
src/dap_client_pvt.c
+
2
−
2
View file @
054291f1
...
@@ -414,7 +414,7 @@ static void s_stage_status_after(dap_client_pvt_t * a_client_pvt)
...
@@ -414,7 +414,7 @@ static void s_stage_status_after(dap_client_pvt_t * a_client_pvt)
DAP_DELETE
(
l_key_str
);
DAP_DELETE
(
l_key_str
);
}
}
break
;
break
;
case
STAGE_STREAM_CTL
:
{
case
STAGE_STREAM_CTL
:
{
log_it
(
L_INFO
,
"Go to stage STREAM_CTL: prepare the request"
);
log_it
(
L_INFO
,
"Go to stage STREAM_CTL: prepare the request"
);
char
*
l_request
=
dap_strdup_printf
(
"%d"
,
DAP_CLIENT_PROTOCOL_VERSION
);
char
*
l_request
=
dap_strdup_printf
(
"%d"
,
DAP_CLIENT_PROTOCOL_VERSION
);
...
@@ -625,7 +625,7 @@ static void s_stage_status_after(dap_client_pvt_t * a_client_pvt)
...
@@ -625,7 +625,7 @@ static void s_stage_status_after(dap_client_pvt_t * a_client_pvt)
// Expecting that its one-shot callback
// Expecting that its one-shot callback
a_client_pvt
->
stage_target_done_callback
=
NULL
;
a_client_pvt
->
stage_target_done_callback
=
NULL
;
}
}
}
else
{
}
else
if
(
a_client_pvt
->
stage
!=
STAGE_STREAM_CTL
)
{
// need wait for dap_client_pvt_request_enc response
log_it
(
L_ERROR
,
"!! dap_CLIENT_STAGE_STATUS_DONE but not l_is_last_stage (cur stage=%d, target=%d)!!"
,
a_client_pvt
->
stage
,
a_client_pvt
->
stage_target
);
log_it
(
L_ERROR
,
"!! dap_CLIENT_STAGE_STATUS_DONE but not l_is_last_stage (cur stage=%d, target=%d)!!"
,
a_client_pvt
->
stage
,
a_client_pvt
->
stage_target
);
}
}
//l_is_unref = true;
//l_is_unref = true;
...
...
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