xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ipv6 autoconfiguration on ethernet

Browse source 
for ip autoconfiguration, setup ipv6 link local addresses
and do SLAAC in parallel to DHCP.
This commit is contained in:
cinap_lenrek 2018-08-15 21:39:30 +02:00
parent ab4c0a012f
commit cd752a39f8
6 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rc/bin/cpurc
View file

@ -62,9 +62,13 @@ if(test -r /net/ipselftab){
addr=`{cat $ether/addr}
switch($addr){
case $addrs
# try /lib/ndb first, then do dhcp
ip/ipconfig -N ether $ether >[2]/dev/null \
|| ip/ipconfig -h $sysname ether $ether
# try /lib/ndb first, then do dhcp/slaac
ip/ipconfig -6 ether $ether
ip/ipconfig -N ether $ether >[2]/dev/null || @{
ip/ipconfig ether $ether ra6 recvra 1 &
ip/ipconfig -h $sysname ether $ether &
wait
}
}
}
}

8
rc/bin/inst/configether
View file

@ -8,10 +8,10 @@ case go
echo 'Please choose a method for configuring your ethernet connection.'
echo
echo ' manual - specify IP address, network mask, gateway IP address'
echo ' dhcp - use DHCP to automatically configure'
echo ' automatic - use DHCP and SLAAC to automatically configure'
echo
prompt -d dhcp 'Configuration method' manual dhcp
prompt -d automatic 'Configuration method' manual automatic
ethermethod=$rd
gwaddr=xxx
ipaddr=xxx
@ -26,11 +26,11 @@ case go
export DNSSERVER
}
}
export ethermethod gwaddr ipaddr ipmask dhcphost
export ethermethod gwaddr ipaddr ipmask
exec ./startether go
case checkdone
if(! ~ $ethermethod manual dhcp) {
if(! ~ $ethermethod manual automatic) {
configether=notdone
export configether
}

4
rc/bin/inst/ndbsetup
View file

@ -7,7 +7,7 @@ etheraddr=`{cat $netdev/addr >[2]/dev/null}
switch($1){
case checkready checkdone
if(~ $#etheraddr 1 && ~ $netisfrom ether && ~ $ethermethod dhcp manual && \
if(~ $#etheraddr 1 && ~ $netisfrom ether && ~ $ethermethod automatic manual && \
! grep -s $etheraddr /n/newfs/lib/ndb/local)
ndbsetup=ready
if not
@ -33,7 +33,7 @@ case go
echo
switch($ethermethod){
case dhcp
case automatic
echo $se
case manual
echo $se 'ip='^$ipaddr 'ipmask='^$ipmask 'ipgw='^$gwaddr

9
rc/bin/inst/startether
View file

@ -15,11 +15,16 @@ case go
exit
log starting ethernet $ethermethod config
ip/ipconfig -6
switch($ethermethod) {
case manual
ip/ipconfig -g $gwaddr ether $netdev $ipaddr $ipmask >>[2]/srv/log
case dhcp
ip/ipconfig >>[2]/srv/log
case automatic
>>[2]/srv/log @{
ip/ipconfig ra6 recva 1 &
ip/ipconfig &
wait
}
}
case checkdone

10
rc/bin/termrc
View file

@ -63,9 +63,13 @@ if(test -r /net/ipselftab){
addr=`{cat $ether/addr}
switch($addr){
case $addrs
# try /lib/ndb first, then do dhcp
ip/ipconfig -N ether $ether >[2]/dev/null \
|| ip/ipconfig -h $sysname ether $ether
# try /lib/ndb first, then do dhcp/slaac
ip/ipconfig -6 ether $ether
ip/ipconfig -N ether $ether >[2]/dev/null || @{
ip/ipconfig ether $ether ra6 recvra 1 &
ip/ipconfig -h $sysname ether $ether &
wait
}
}
}
}

25
sys/src/9/boot/net.rc
View file

@ -15,7 +15,16 @@ fn confignet{
}
}
must ip/ipconfig -p $*
if(~ $1 ether && ~ $#* 2) @{
ip/ipconfig -6 $*
ip/ipconfig $* ra6 recvra 1 &
ip/ipconfig -p $* &
wait
}
if not {
ip/ipconfig -p $*
}
if(~ $#fs 0)
fs=`{awk -F'=' '/^[ ]*fs=/{print $2}' /net/ndb}
if(~ $#auth 0)
@ -33,13 +42,13 @@ fn confignet{
}
}
# set bootstrap authservers for factotum
if(! ~ $#auth 0){
grep -v '^[ ]*auth=' /net/ndb >/env/x
cat /env/x <{echo ' auth='^$auth^'
'} >/net/ndb
rm /env/x
}
# publish info in /net/ndb for factotum
>> /net/ndb {
echo
echo 'ipbootinfo='
for(i in $fs) echo ' fs='^$i
for(i in $auth) echo ' auth='^$i
}
}
fn connecttcp{