diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-01-29 08:44:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-29 08:44:10 +0000 |
| commit | aea68fddd979bf6852b8aef9bc718567f9da935a (patch) | |
| tree | d961248eed95d18475875ebba167db26bded546f /server/RouteController.cpp | |
| parent | b1842acd6fcba8a1d80efd95ea3e88c2faf7eeb0 (diff) | |
| parent | 0321315d4e94dacd5ef2e0de217059cbc72d803d (diff) | |
Merge "Don't fail when trying to add routes that already exist."
Diffstat (limited to 'server/RouteController.cpp')
| -rw-r--r-- | server/RouteController.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/server/RouteController.cpp b/server/RouteController.cpp index 4cb145b2..56e3c286 100644 --- a/server/RouteController.cpp +++ b/server/RouteController.cpp @@ -815,11 +815,8 @@ WARN_UNUSED_RESULT int modifyRoute(uint16_t action, const char* interface, const } int ret = modifyIpRoute(action, table, interface, destination, nexthop); - // We allow apps to call requestRouteToHost() multiple times with the same route, so ignore - // EEXIST failures when adding routes to legacy tables. - if (ret && !(action == RTM_NEWROUTE && ret == -EEXIST && - (tableType == RouteController::LEGACY_NETWORK || - tableType == RouteController::LEGACY_SYSTEM))) { + // Trying to add a route that already exists shouldn't cause an error. + if (ret && !(action == RTM_NEWROUTE && ret == -EEXIST)) { return ret; } |