diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2018-08-11 16:19:32 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2018-08-11 16:19:32 +0200 |
| commit | 9445f08788765dbcc763cc0eab598216cca97667 (patch) | |
| tree | c68c2b8902e669e6331ea16d4d644d0a68a2dbd5 | |
| parent | e49f7fc1f7435de94a632fea0dc7753b58570eb8 (diff) | |
| download | plan9front-9445f08788765dbcc763cc0eab598216cca97667.tar.xz | |
ip/ipconfig: call mklladdr() to get conf.hwa initialized for ipv6
| -rw-r--r-- | sys/src/cmd/ip/ipconfig/ipconfig.h | 1 | ||||
| -rw-r--r-- | sys/src/cmd/ip/ipconfig/ipv6.c | 2 | ||||
| -rw-r--r-- | sys/src/cmd/ip/ipconfig/main.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/sys/src/cmd/ip/ipconfig/ipconfig.h b/sys/src/cmd/ip/ipconfig/ipconfig.h index 7f58a5148..8797c7154 100644 --- a/sys/src/cmd/ip/ipconfig/ipconfig.h +++ b/sys/src/cmd/ip/ipconfig/ipconfig.h @@ -121,6 +121,7 @@ void ipunconfig(void); void adddefroute(uchar*, uchar*, uchar*, uchar*); void removedefroute(int, uchar*, uchar*); +void mklladdr(void); long jitter(void); void procsetname(char *fmt, ...); void catch(void*, char*); diff --git a/sys/src/cmd/ip/ipconfig/ipv6.c b/sys/src/cmd/ip/ipconfig/ipv6.c index c1e8cde8f..9f31e37e0 100644 --- a/sys/src/cmd/ip/ipconfig/ipv6.c +++ b/sys/src/cmd/ip/ipconfig/ipv6.c @@ -1139,6 +1139,8 @@ startra6(void) { static char routeon[] = "iprouting 1"; + mklladdr(); + if(conf.recvra > 0) recvra6(); diff --git a/sys/src/cmd/ip/ipconfig/main.c b/sys/src/cmd/ip/ipconfig/main.c index b8899d06d..5bb16bdf0 100644 --- a/sys/src/cmd/ip/ipconfig/main.c +++ b/sys/src/cmd/ip/ipconfig/main.c @@ -392,8 +392,8 @@ main(int argc, char **argv) } doadd(); break; - case Vaddpref6: case Vra6: + case Vaddpref6: doipv6(action); break; case Vremove: @@ -413,7 +413,7 @@ isether(void) } /* create link local address */ -static void +void mklladdr(void) { if(isether() && myetheraddr(conf.hwa, conf.dev) == 0){ |