Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
celllframe-node
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Code
Merge requests
15
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
celllframe-node
Commits
ef31890d
Commit
ef31890d
authored
4 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'bugs-4415' into 'master'
bugs-4415 See merge request
!186
parents
b6639803
8afce957
No related branches found
Branches containing commit
No related tags found
2 merge requests
!193
bugs-4547
,
!186
bugs-4415
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cellframe-sdk
+1
-1
1 addition, 1 deletion
cellframe-sdk
python-cellframe
+1
-1
1 addition, 1 deletion
python-cellframe
sources/main.c
+2
-3
2 additions, 3 deletions
sources/main.c
with
5 additions
and
6 deletions
CMakeLists.txt
+
1
−
1
View file @
ef31890d
...
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
...
@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_NAME
"
${
PROJECT_NAME
}
"
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MAJOR 4
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 0
)
SET
(
CPACK_PACKAGE_VERSION_MINOR 0
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 5
0
)
SET
(
CPACK_PACKAGE_VERSION_PATCH 5
1
)
# init CellFrame SDK
# init CellFrame SDK
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
\"
"
)
add_definitions
(
"-DDAP_VERSION=
\"
${
CPACK_PACKAGE_VERSION_MAJOR
}
\"
"
)
...
...
This diff is collapsed.
Click to expand it.
cellframe-sdk
@
4e0d8da7
Compare
557d688d
...
4e0d8da7
Subproject commit
557d688dd02629f2864a3dabe88eb
8a
d
42
5da934
Subproject commit
4e0d8da7331479832d8e24
8a42
2fa5c5fe9d879f
This diff is collapsed.
Click to expand it.
python-cellframe
@
a58336cc
Compare
618770e6
...
a58336cc
Subproject commit
618770e6a20e04031fee135ef6c04ca4e2f1e8b7
Subproject commit
a58336ccc97d38e1f6011a91d2e6555b0eccdd1e
This diff is collapsed.
Click to expand it.
sources/main.c
+
2
−
3
View file @
ef31890d
...
@@ -394,8 +394,7 @@ int main( int argc, const char **argv )
...
@@ -394,8 +394,7 @@ int main( int argc, const char **argv )
if
(
l_port
>
0
)
{
if
(
l_port
>
0
)
{
l_server
=
dap_server_new
(
l_events
,
(
dap_config_get_item_str
(
g_config
,
"server"
,
"listen_address"
)),
l_server
=
dap_server_new
(
l_events
,
(
dap_config_get_item_str
(
g_config
,
"server"
,
"listen_address"
)),
(
uint16_t
)
l_port
,
(
uint16_t
)
l_port
,
DAP_SERVER_TCP
,
NULL
);
DAP_SERVER_TCP
);
}
else
}
else
log_it
(
L_WARNING
,
"Server is enabled but no port is defined"
);
log_it
(
L_WARNING
,
"Server is enabled but no port is defined"
);
...
@@ -446,7 +445,7 @@ int main( int argc, const char **argv )
...
@@ -446,7 +445,7 @@ int main( int argc, const char **argv )
bool
bootstrap_balancer_enabled
=
dap_config_get_item_bool_default
(
g_config
,
"dns_server"
,
"bootstrap_balancer"
,
false
);
bool
bootstrap_balancer_enabled
=
dap_config_get_item_bool_default
(
g_config
,
"dns_server"
,
"bootstrap_balancer"
,
false
);
log_it
(
L_DEBUG
,
"config dns_server->bootstrap_balancer =
\"
%u
\"
"
,
bootstrap_balancer_enabled
);
log_it
(
L_DEBUG
,
"config dns_server->bootstrap_balancer =
\"
%u
\"
"
,
bootstrap_balancer_enabled
);
if
(
bootstrap_balancer_enabled
)
{
if
(
bootstrap_balancer_enabled
)
{
dap_dns_server_start
();
dap_dns_server_start
(
l_events
);
}
}
// Chain Network init
// Chain Network init
...
...
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