commit 2d6858dd23ad489286e57ebce7c926ed63d0e73d
author William A. Kennington III <wak@google.com> Fri Feb 11 03:08:25 2022 -0800
committer William A. Kennington III <wak@google.com> Sat Feb 12 01:53:15 2022 +0000
tree 48dd5472479f805042d41fc99fb4d580ccbef77c
parent dffd6523f455804581b0536a491731b502014ac7

ncsid: Use per-interface gateway

Change-Id: I97185fc181918ad4668cb4e758eec25c51090b04
Signed-off-by: William A. Kennington III <wak@google.com>

subprojects/ncsid/src/ncsid_lib.sh

diff --git a/subprojects/ncsid/src/ncsid_lib.sh b/subprojects/ncsid/src/ncsid_lib.sh
index a4899c7..86b5036 100644
--- a/subprojects/ncsid/src/ncsid_lib.sh
+++ b/subprojects/ncsid/src/ncsid_lib.sh
@@ -364,10 +364,11 @@
 # set to the current value.
 UpdateGateway() {
   local service="$1"
-  local ip="$2"
+  local netdev="$2"
+  local ip="$3"
 
-  local object='/xyz/openbmc_project/network/config'
-  local interface='xyz.openbmc_project.Network.SystemConfiguration'
+  local object="$(EthObjRoot "$netdev")"
+  local interface='xyz.openbmc_project.Network.EthernetInterface'
   local property='DefaultGateway'
   if ! IsIPv4 "$ip"; then
     property='DefaultGateway6'

subprojects/ncsid/src/ncsid_udhcpc4.script

diff --git a/subprojects/ncsid/src/ncsid_udhcpc4.script b/subprojects/ncsid/src/ncsid_udhcpc4.script
index f1ba616..9c22756 100644
--- a/subprojects/ncsid/src/ncsid_udhcpc4.script
+++ b/subprojects/ncsid/src/ncsid_udhcpc4.script
@@ -50,7 +50,7 @@
     local service='xyz.openbmc_project.Network'
     local rc=0
     UpdateIP "$service" "$interface" "$ip" "$mask" && \
-      UpdateGateway "$service" "$router" && \
+      UpdateGateway "$service" "$interface" "$router" && \
       UpdateNeighbor "$service" "$interface" "$router" "$router_mac" || \
       rc=$?
     UnsuppressTerm

subprojects/ncsid/src/ncsid_udhcpc6.script

diff --git a/subprojects/ncsid/src/ncsid_udhcpc6.script b/subprojects/ncsid/src/ncsid_udhcpc6.script
index 508f2b4..cfed671 100644
--- a/subprojects/ncsid/src/ncsid_udhcpc6.script
+++ b/subprojects/ncsid/src/ncsid_udhcpc6.script
@@ -23,7 +23,7 @@
     local service='xyz.openbmc_project.Network'
     local rc=0
     UpdateIP "$service" "$interface" "$ipv6" '128' && \
-      UpdateGateway "$service" "$router_ip" && \
+      UpdateGateway "$service" "$interface" "$router_ip" && \
       UpdateNeighbor "$service" "$interface" "$router_ip" "$router_mac" || \
       rc=$?
     UnsuppressTerm

subprojects/ncsid/src/update_ra_gw.sh

diff --git a/subprojects/ncsid/src/update_ra_gw.sh b/subprojects/ncsid/src/update_ra_gw.sh
index 47e7f27..77d77f4 100644
--- a/subprojects/ncsid/src/update_ra_gw.sh
+++ b/subprojects/ncsid/src/update_ra_gw.sh
@@ -28,7 +28,7 @@
   (( lifetime > 0 )) || return
 
   echo "Setting default router: $rtr at $mac" >&2
-  UpdateGateway xyz.openbmc_project.Network "$rtr" || return
+  UpdateGateway xyz.openbmc_project.Network "$NCSI_IF" "$rtr" || return
   UpdateNeighbor xyz.openbmc_project.Network "$NCSI_IF" "$rtr" "$mac" || return
 
   retries=-1