diff options
| author |   Jordan Augé <jordan.auge@cisco.com> | 2019-10-30 17:56:08 +0100 |
|---|---|---|
| committer | Jordan Augé <jordan.auge@cisco.com> | 2019-10-31 13:41:47 +0100 |
| commit | 95170bf3a69597b49238bb7ff396d41f6dc94f30 (patch) | |
| tree | 2f9b565e84514d7ee25cfd874235dd25e9300a0f /ctrl/facemgr/src/cfg.c | |
| parent | fc6dfe9f7ee02834ae1e6f56e0aaee36ac3e88dd (diff) | |
[HICN-369] Implement reconciliation state machine in face manager incl. reattempts in case of errors
Change-Id: Ia4ecf621fbd513d9e29313d2aaa487aa65811183
Signed-off-by: Jordan Augé <jordan.auge@cisco.com>
Diffstat (limited to 'ctrl/facemgr/src/cfg.c')
| -rw-r--r-- | ctrl/facemgr/src/cfg.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ctrl/facemgr/src/cfg.c b/ctrl/facemgr/src/cfg.c index 527da54e7..bf47e5570 100644 --- a/ctrl/facemgr/src/cfg.c +++ b/ctrl/facemgr/src/cfg.c @@ -726,13 +726,13 @@ facemgr_cfg_get_override(const facemgr_cfg_t * cfg, continue; /* Check match for interface type */ if (rule_array[i]->match.interface_type != NETDEVICE_TYPE_UNDEFINED) { -#ifdef __ANDROID__ +//#ifdef __ANDROID__ if (netdevice_type != rule_array[i]->match.interface_type) continue; -#else - ERROR("Match on interface type is currently not implemented"); - goto ERR_ARRAY; -#endif /* __ANDROID__ */ +//#else +// ERROR("Match on interface type is currently not implemented"); +// goto ERR_ARRAY; +//#endif /* __ANDROID__ */ } /* Found match... do we have an override for face_type */ *override = &rule_array[i]->override; @@ -745,11 +745,11 @@ FOUND: free(rule_array); return 0; -#ifndef __ANDROID__ -ERR_ARRAY: - free(rule_array); - return -1; -#endif /* __ANDROID__ */ +//#ifndef __ANDROID__ +//ERR_ARRAY: +// free(rule_array); +// return -1; +//#endif /* __ANDROID__ */ } int |