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

ip/tinc: handle and set ethertype for ipv6

Browse source
This commit is contained in:
cinap_lenrek 2017-12-21 04:11:02 +01:00
parent 21b5656d89
commit 3b7f73ccff
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sys/src/cmd/ip/tinc.c
View file

@ -1019,7 +1019,8 @@ Ether:
memmove(p+4, p, 2*Eaddrlen); memmove(p+4, p, 2*Eaddrlen);
p += 4, n -= 4; p += 4, n -= 4;
goto Ether; goto Ether;
case 0x0800: /* IP */ case 0x0800: /* IPv4 */
case 0x86DD: /* IPv6 */
break; break;
} }
switch(p[EtherHdr] & 0xF0){ switch(p[EtherHdr] & 0xF0){
@ -1534,8 +1535,13 @@ ip2tunnel(void)
localip, localmask); localip, localmask);
while((n = read(ipdfd, buf+EtherHdr, sizeof buf-EtherHdr)) > 0){ while((n = read(ipdfd, buf+EtherHdr, sizeof buf-EtherHdr)) > 0){
memset(buf, 0, 2*Eaddrlen); memset(buf, 0, 2*Eaddrlen);
if((buf[EtherHdr]&0xF0) == 0x60){
buf[EtherType+0] = 0x86;
buf[EtherType+1] = 0xDD;
} else{
buf[EtherType+0] = 0x08; buf[EtherType+0] = 0x08;
buf[EtherType+1] = 0x00; buf[EtherType+1] = 0x00;
}
routepkt(myhost, buf, n+EtherHdr); routepkt(myhost, buf, n+EtherHdr);
} }
} }