Fix TAP support again

This commit is contained in:
Neil Alexander 2019-04-23 11:46:16 +01:00
parent 2b44f5d2f6
commit 75130f7735
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 5 additions and 5 deletions

View file

@ -236,7 +236,7 @@ func (tun *TunAdapter) connReader(conn *yggdrasil.Conn) error {
var dstAddr address.Address
if b[0]&0xf0 == 0x60 {
if len(b) < 40 {
//panic("Tried to sendb a packet shorter than an IPv6 header...")
//panic("Tried to send a packet shorter than an IPv6 header...")
util.PutBytes(b)
continue
}
@ -301,8 +301,9 @@ func (tun *TunAdapter) connReader(conn *yggdrasil.Conn) error {
ethernet.NotTagged, // VLAN tagging
proto, // Ethertype
len(b)) // Payload length
copy(frame[tun_ETHER_HEADER_LENGTH:], b[:])
w, err = tun.iface.Write(b[:n])
copy(frame[tun_ETHER_HEADER_LENGTH:], b[:n])
n += tun_ETHER_HEADER_LENGTH
w, err = tun.iface.Write(frame[:n])
}
} else {
w, err = tun.iface.Write(b[:n])