commit f7fc8eccb0a6a4fbca4cafdf53f5c167c8f1d755
author Lorenzo Colitti <lorenzo@google.com> Wed Jun 18 00:41:58 2014 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Jun 24 00:46:59 2014 +0900
tree 7217049a19d215354077f4ab6726da5787779fa4
parent ba25df989b48f36b784ad39307a49a4fd9c3fd66

Pass route add/delete errors back to CommandListener.

Change-Id: Id1d6d578963080e141f71bc1303801fc53bce40a

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index f5739e9..de433b7 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -345,13 +345,13 @@
     return status;
 }
 
-bool NetworkController::addRoute(unsigned netId, const char* interface, const char* destination,
-                                 const char* nexthop, bool legacy, unsigned uid) {
+int NetworkController::addRoute(unsigned netId, const char* interface, const char* destination,
+                                const char* nexthop, bool legacy, unsigned uid) {
     return modifyRoute(netId, interface, destination, nexthop, true, legacy, uid);
 }
 
-bool NetworkController::removeRoute(unsigned netId, const char* interface, const char* destination,
-                                    const char* nexthop, bool legacy, unsigned uid) {
+int NetworkController::removeRoute(unsigned netId, const char* interface, const char* destination,
+                                   const char* nexthop, bool legacy, unsigned uid) {
     return modifyRoute(netId, interface, destination, nexthop, false, legacy, uid);
 }
 
@@ -364,18 +364,16 @@
     return mValidNetworks.find(netId) != mValidNetworks.end();
 }
 
-bool NetworkController::modifyRoute(unsigned netId, const char* interface, const char* destination,
-                                    const char* nexthop, bool add, bool legacy, unsigned uid) {
+int NetworkController::modifyRoute(unsigned netId, const char* interface, const char* destination,
+                                   const char* nexthop, bool add, bool legacy, unsigned uid) {
     if (!isValidNetwork(netId)) {
         ALOGE("invalid netId %u", netId);
-        errno = EINVAL;
-        return false;
+        return -EINVAL;
     }
 
     if (getNetworkId(interface) != netId) {
         ALOGE("netId %u has no such interface %s", netId, interface);
-        errno = ENOENT;
-        return false;
+        return -ENOENT;
     }
 
     RouteController::TableType tableType;