summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-05-24 13:35:24 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-05-24 13:35:24 +0000
commit51aac5614ccd7928ba23af0cca0e94010f3fcebc (patch)
tree9579582c95c67c910aab8ad7931746e3d3fb39c1 /src/ipcpd
parentf986d188898f8b7cd6db3442d29728ca78dad76e (diff)
parentf2be3677aedd7a3d68122c48f00c99a4c8e76f88 (diff)
downloadouroboros-51aac5614ccd7928ba23af0cca0e94010f3fcebc.tar.gz
ouroboros-51aac5614ccd7928ba23af0cca0e94010f3fcebc.zip
Merged in dstaesse/ouroboros/be-normal-main (pull request #512)
ipcpd: Start DT component before flow allocator
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/normal/main.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 0b8a26ab..8c28de78 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -128,19 +128,14 @@ static int boot_components(void)
log_dbg("Ribmgr started.");
- if (fa_init()) {
- log_err("Failed to initialize flow allocator ae.");
- goto fail_fa;
- }
-
if (dt_init()) {
log_err("Failed to initialize data transfer ae.");
goto fail_dt;
}
- if (fa_start()) {
- log_err("Failed to start flow allocator.");
- goto fail_fa_start;
+ if (fa_init()) {
+ log_err("Failed to initialize flow allocator ae.");
+ goto fail_fa;
}
if (dt_start()) {
@@ -148,6 +143,11 @@ static int boot_components(void)
goto fail_dt_start;
}
+ if (fa_start()) {
+ log_err("Failed to start flow allocator.");
+ goto fail_fa_start;
+ }
+
if (enroll_start()) {
log_err("Failed to start enroll.");
goto fail_enroll_start;
@@ -166,14 +166,14 @@ static int boot_components(void)
ipcp_set_state(IPCP_INIT);
enroll_stop();
fail_enroll_start:
- dt_stop();
- fail_dt_start:
fa_stop();
fail_fa_start:
- dt_fini();
- fail_dt:
+ dt_stop();
+ fail_dt_start:
fa_fini();
fail_fa:
+ dt_fini();
+ fail_dt:
ribmgr_fini();
fail_ribmgr:
dir_fini();
@@ -191,14 +191,14 @@ void shutdown_components(void)
enroll_stop();
- dt_stop();
-
fa_stop();
- dt_fini();
+ dt_stop();
fa_fini();
+ dt_fini();
+
ribmgr_fini();
dir_fini();