Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
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
Service Desk
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
cm-projects
RIOT
Commits
b1f2f228
Commit
b1f2f228
authored
9 years ago
by
Cenk Gündoğan
Browse files
Options
Downloads
Patches
Plain Diff
rpl: uint32_t is sufficient for the DAO timer
parent
fc831f0e
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
sys/include/net/gnrc/rpl/structs.h
+1
-1
1 addition, 1 deletion
sys/include/net/gnrc/rpl/structs.h
sys/net/gnrc/routing/rpl/gnrc_rpl.c
+3
-3
3 additions, 3 deletions
sys/net/gnrc/routing/rpl/gnrc_rpl.c
with
4 additions
and
4 deletions
sys/include/net/gnrc/rpl/structs.h
+
1
−
1
View file @
b1f2f228
...
...
@@ -223,7 +223,7 @@ struct gnrc_rpl_dodag {
bool
dodag_conf_requested
;
/**< flag to send DODAG_CONF options */
bool
prefix_info_requested
;
/**< flag to send PREFIX_INFO options */
msg_t
dao_msg
;
/**< msg_t for firing a dao */
uint
64
_t
dao_time
;
/**< time to schedule the next DAO */
uint
32
_t
dao_time
;
/**< time to schedule the next DAO */
xtimer_t
dao_timer
;
/**< timer to schedule the next DAO */
msg_t
cleanup_msg
;
/**< msg_t for firing a cleanup */
uint32_t
cleanup_time
;
/**< time to schedula a DODAG cleanup */
...
...
This diff is collapsed.
Click to expand it.
sys/net/gnrc/routing/rpl/gnrc_rpl.c
+
3
−
3
View file @
b1f2f228
...
...
@@ -256,7 +256,7 @@ void gnrc_rpl_delay_dao(gnrc_rpl_dodag_t *dodag)
dodag
->
dao_time
=
GNRC_RPL_DEFAULT_DAO_DELAY
*
SEC_IN_USEC
;
dodag
->
dao_counter
=
0
;
dodag
->
dao_ack_received
=
false
;
xtimer_set_msg
64
(
&
dodag
->
dao_timer
,
dodag
->
dao_time
,
&
dodag
->
dao_msg
,
gnrc_rpl_pid
);
xtimer_set_msg
(
&
dodag
->
dao_timer
,
dodag
->
dao_time
,
&
dodag
->
dao_msg
,
gnrc_rpl_pid
);
}
void
gnrc_rpl_long_delay_dao
(
gnrc_rpl_dodag_t
*
dodag
)
...
...
@@ -264,7 +264,7 @@ void gnrc_rpl_long_delay_dao(gnrc_rpl_dodag_t *dodag)
dodag
->
dao_time
=
GNRC_RPL_REGULAR_DAO_INTERVAL
*
SEC_IN_USEC
;
dodag
->
dao_counter
=
0
;
dodag
->
dao_ack_received
=
false
;
xtimer_set_msg
64
(
&
dodag
->
dao_timer
,
dodag
->
dao_time
,
&
dodag
->
dao_msg
,
gnrc_rpl_pid
);
xtimer_set_msg
(
&
dodag
->
dao_timer
,
dodag
->
dao_time
,
&
dodag
->
dao_msg
,
gnrc_rpl_pid
);
}
void
_dao_handle_send
(
gnrc_rpl_dodag_t
*
dodag
)
...
...
@@ -273,7 +273,7 @@ void _dao_handle_send(gnrc_rpl_dodag_t *dodag)
dodag
->
dao_counter
++
;
gnrc_rpl_send_DAO
(
dodag
->
instance
,
NULL
,
dodag
->
default_lifetime
);
dodag
->
dao_time
=
GNRC_RPL_DEFAULT_WAIT_FOR_DAO_ACK
*
SEC_IN_USEC
;
xtimer_set_msg
64
(
&
dodag
->
dao_timer
,
dodag
->
dao_time
,
&
dodag
->
dao_msg
,
gnrc_rpl_pid
);
xtimer_set_msg
(
&
dodag
->
dao_timer
,
dodag
->
dao_time
,
&
dodag
->
dao_msg
,
gnrc_rpl_pid
);
}
else
if
(
dodag
->
dao_ack_received
==
false
)
{
gnrc_rpl_long_delay_dao
(
dodag
);
...
...
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