Skip to content

Commit

Permalink
etc/rc: start lwip service
Browse files Browse the repository at this point in the history
Change-Id: I10cfdcde490987b93c79532a2c53dda2307b83ce
  • Loading branch information
dcvmoole committed Apr 30, 2017
1 parent e4dbab1 commit 60299d8
Show file tree
Hide file tree
Showing 4 changed files with 98 additions and 1 deletion.
1 change: 1 addition & 0 deletions distrib/sets/lists/minix-base/mi
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
./etc/rc.subr minix-base
./etc/release minix-base
./etc/rs.inet minix-base obsolete
./etc/rs.lwip minix-base
./etc/rs.single minix-base
./etc/saslc.d minix-base crypto
./etc/saslc.d/postfix minix-base crypto
Expand Down
2 changes: 1 addition & 1 deletion etc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ BIN1+= \
syslog.conf
# MINIX-only files:
BIN1+= boot.cfg.default rc.minix \
rs.single termcap utmp
rs.lwip rs.single termcap utmp
.else
BIN1+= bootptab changelist csh.cshrc csh.login \
csh.logout daily daily.conf dm.conf envsys.conf floppytab ftpchroot \
Expand Down
67 changes: 67 additions & 0 deletions etc/rs.lwip
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
#!/bin/sh

# Recovery script for LWIP. Aside from restarting the LWIP service itself, the
# script aims to restart all of networking. This includes in particular any
# network daemons: these daemons typically have open (listening) sockets that
# will now have become invalid, and the daemons typically do not know how to
# deal with that. Unfortunately, there is no reliable way to determine the
# list of rc scripts that concern network daemons, so for now we hardcode a
# list of known ones here: this is the list of network-related rc.d scripts.
# FIXME: since we are not yet done importing etc/rc.d from NetBSD, this list is
# still incomplete and should be extended as more scripts are imported!
RC_SCRIPTS="dhclient dhcpcd dhcpd dhcrelay ftpd inetd named network rtadvd \
sshd staticroute syslogd"

exec < /dev/console
exec > /dev/console
exec 2> /dev/console

export HOME=/
export PATH=/sbin:/usr/sbin:/bin:/usr/bin

. /etc/rc.subr
. /etc/rc.conf

# Restart the LWIP service.

# There is no need to shut down daemons before bringing back up the service.
# Note that "minix-service restart" does not do the same as these steps, and in
# fact breaks a proper LWIP restart.
restarts=$(grep restarts /proc/service/$1 | cut -d: -f2)
minix-service down "$1"
minix-service up /service/lwip -dev /dev/bpf -script /etc/rs.lwip \
-restarts $(($restarts + 1))

# Reload TCP ISN, or make a new one if there is none. Do not save anything.
TCPISN_FILE=/usr/adm/tcpisn.dat
TCPISN_LEN=$(sysctl -n net.inet.tcp.isn_secret | awk '{print length/2}')
if [ ! -f $TCPISN_FILE ]; then TCPISN_FILE=/dev/random; fi
sysctl -qw net.inet.tcp.isn_secret=`dd if=$TCPISN_FILE bs=$TCPISN_LEN \
count=1 2>/dev/null | hexdump -v -e '/1 "%02x"'` 2>/dev/null

# Let LWIP find all network drivers before performing initialization.
sleep 1

# XXX temporary block until the networking rc scripts are fully imported!
exit 0

# Restart all network daemons.

# Start with dhcpcd, which may be launched directly from ifconfig.if(5) scripts
# and therefore may not be enabled in, and thus stopped by, rc.d scripts below.
service dhcpcd onestop >/dev/null 2>&1

# Then stop and start all known network daemons using their rc.d scripts.
regex='/('"$(echo $RC_SCRIPTS | tr ' ' '|')"')$'
scripts=$(for rcd in ${rc_directories:-/etc/rc.d}; do
test -d ${rcd} && echo ${rcd}/*; done)
files=$(rcorder ${scripts} | grep -E "$regex")

for _rc_elem in $(reverse_list $files); do
# We have already stopped dhcpcd if it was running, so skip it here.
[ $_rc_elem != /etc/rc.d/dhcpcd ] && run_rc_script $_rc_elem stop
done

for _rc_elem in $files; do
run_rc_script $_rc_elem start
done
29 changes: 29 additions & 0 deletions etc/usr/rc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# /usr/etc/rc - continued system initialization.

RANDOM_FILE=/usr/adm/random.dat
TCPISN_FILE=/usr/adm/tcpisn.dat
LOCAL_FILE=/usr/etc/rc.local

ARCH="`sysenv arch`"
Expand Down Expand Up @@ -254,6 +255,34 @@ start)
# pty needs to know the "tty" group ID
up pty -dev /dev/ptmx -args "gid=`stat -f '%g' /dev/ptmx`"

# Start the LWIP service.
up lwip -dev /dev/bpf -script /etc/rs.lwip

# Load stable seed for TCP Initial Sequence Number generation (RFC 6528).
# The idea here is that (especially) after a system crash, the seed stays
# the same, so as to make it unlikely that incoming packets for connections
# from before the crash are accepted on connections after the crash.
TCPISN_LEN=$(sysctl -n net.inet.tcp.isn_secret | awk '{print length/2}')
if [ ! -f $TCPISN_FILE ]; then
# If the /usr file system is read-only, we cannot create the file. In
# that case, we draw a temporary secret from the random service.
if grep ' \/usr .*rw.*' /etc/mtab >/dev/null; then
dd if=/dev/random of=$TCPISN_FILE bs=$TCPISN_LEN count=1 2>/dev/null
else
TCPISN_FILE=/dev/random
fi
fi
sysctl -qw net.inet.tcp.isn_secret=`dd if=$TCPISN_FILE bs=$TCPISN_LEN \
count=1 2>/dev/null | hexdump -v -e '/1 "%02x"'` 2>/dev/null

# LWIP does not block until all network drivers have fully initialized and
# reported back to LWIP. That may prevent proper configuration of the
# corresponding interfaces a bit later. Sleep up to five seconds waiting
# for all registered network drivers to initialize and report to LWIP.
for i in 1 2 3 4 5; do
[ $(sysctl -n minix.lwip.drivers.pending) -gt 0 ] && sleep 1
done

up uds

up -n ipc
Expand Down

0 comments on commit 60299d8

Please sign in to comment.