Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
map-topology
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Multi-AP
map-topology
Commits
f733e8dc
Commit
f733e8dc
authored
4 years ago
by
Nevadita
Committed by
Anjan Chanda
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed few cases
parent
d77996ab
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/config.c
+1
-1
1 addition, 1 deletion
src/config.c
src/topologyd.c
+5
-1
5 additions, 1 deletion
src/topologyd.c
with
6 additions
and
2 deletions
src/config.c
+
1
−
1
View file @
f733e8dc
...
...
@@ -47,7 +47,7 @@ int topologyd_config_defaults(struct topologyd_config *cfg)
if
(
!
cfg
)
return
-
1
;
cfg
->
enabled
=
fals
e
;
cfg
->
enabled
=
tru
e
;
cfg
->
depth
=
TOPOLOGY_DEPTH
;
cfg
->
refresh_int
=
TOPOLOGY_REFRESH_INT
;
cfg
->
maxlog
=
TOPOLOGY_LOG_MAX
;
...
...
This diff is collapsed.
Click to expand it.
src/topologyd.c
+
5
−
1
View file @
f733e8dc
...
...
@@ -55,6 +55,7 @@ static void ieee1905_info_response_cb(struct ubus_request *req,
mac_str
=
_json_obj_get_string
(
jroot
,
"ieee1905id"
);
if
(
mac_str
)
{
hwaddr_aton
(
mac_str
,
p
->
ieee1905_macaddr
);
hwaddr_aton
(
mac_str
,
p
->
selfnode
.
hwaddr
);
free
(
mac_str
);
}
...
...
@@ -89,7 +90,7 @@ int topologyd_send_ieee1905_topology_query(struct topologyd_private *p,
blob_buf_init
(
&
bb
,
0
);
if
(
dest
)
{
hwaddr_ntoa
(
dest
,
dest_macstr
);
blobmsg_add_string
(
&
bb
,
"
remote_mac
"
,
dest_macstr
);
blobmsg_add_string
(
&
bb
,
"
dst_macaddr
"
,
dest_macstr
);
}
ret
=
ubus_invoke
(
p
->
ctx
,
p
->
ieee1905
,
"query_topology"
,
bb
.
head
,
...
...
@@ -412,6 +413,9 @@ static int topologyd_run(struct topologyd_private *priv)
return
-
1
;
}
if
(
priv
->
refresh_int
==
0
)
priv
->
refresh_int
=
TOPOLOGY_REFRESH_INT
;
topologyd_start_heartbeat
(
&
priv
->
heartbeat
);
topologyd_periodic_refresh
(
&
priv
->
refresh_timer
);
...
...
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