commit b163a2c1baca3112d420258f0e347e88afce5379
author William A. Kennington III <wak@google.com> Thu May 20 17:33:01 2021 -0700
committer William A. Kennington III <wak@google.com> Mon Sep 27 17:17:53 2021 +0000
tree fc6c1a5ca297b145d33e72b776a0e9111a96b251
parent 18c97f6dc582da01335f5958c32f979d3638ace4

ncsid: Support parsing unsolicited RA announcements

We depend on this for router's whose MACs change over the lifetime of
the BMC and need updates even when we can't send neighbor solicitations
and receive advertisements.

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

subprojects/ncsid/src/ncsid_udhcpc6.script

diff --git a/subprojects/ncsid/src/ncsid_udhcpc6.script b/subprojects/ncsid/src/ncsid_udhcpc6.script
index c5a3d7f..508f2b4 100644
--- a/subprojects/ncsid/src/ncsid_udhcpc6.script
+++ b/subprojects/ncsid/src/ncsid_udhcpc6.script
@@ -1,23 +1,6 @@
 #!/bin/bash
 source "$(dirname "${BASH_SOURCE[0]}")"/ncsid_lib.sh
 
-DiscoverRouter6() {
-  local netdev="$1"
-
-  local output
-  local st=0
-  output="$(RunInterruptible rdisc6 -1 -r 5 -w 1000 -n "$netdev")" || st=$?
-  if (( st != 0 )); then
-    echo "rdisc6 failed with: " >&2
-    echo "$output" >&2
-    return $st
-  fi
-
-  local ip="$(echo "$output" | grep 'from' | awk '{print $2}')"
-  local mac="$(echo "$output" | grep 'Source link-layer' | ParseMACFromLine)"
-  printf '{"router_ip":"%s","router_mac":"%s"}\n' "$ip" "$mac"
-}
-
 HandleDHCP6() {
   local op="$1"
 
@@ -26,7 +9,7 @@
     echo "IP: $ipv6/128" >&2
 
     local disc
-    if ! disc="$(DiscoverRouter6 "$interface")"; then
+    if ! disc="$(DiscoverRouter6 "$interface" 5 1000)"; then
       echo "Failed to discover router" >&2
       return 1
     fi