Merge pull request #446 from Arceliar/bugfixes

Bugfixes

src/tuntap/iface.go

@@ -225,11 +225,11 @@ func (tun *TunAdapter) reader() error {
 				panic("Given empty dstNodeID and dstNodeIDMask - this shouldn't happen")
 			}
 			// Dial to the remote node
+			packet := append(util.GetBytes(), bs[:n]...)
 			go func() {
 				// FIXME just spitting out a goroutine to do this is kind of ugly and means we drop packets until the dial finishes
 				tun.mutex.Lock()
 				_, known := tun.dials[*dstNodeID]
-				packet := append(util.GetBytes(), bs[:n]...)
 				tun.dials[*dstNodeID] = append(tun.dials[*dstNodeID], packet)
 				for len(tun.dials[*dstNodeID]) > 32 {
 					util.PutBytes(tun.dials[*dstNodeID][0])

src/yggdrasil/api.go

@@ -211,16 +211,31 @@ func (c *Core) GetSessions() []Session {
 	var sessions []Session
 	getSessions := func() {
 		for _, sinfo := range c.sessions.sinfos {
-			// TODO? skipped known but timed out sessions?
+			var session Session
-			session := Session{
+			workerFunc := func() {
-				Coords:      append([]byte{}, sinfo.coords...),
+				session := Session{
-				MTU:         sinfo.getMTU(),
+					Coords:      append([]byte{}, sinfo.coords...),
-				BytesSent:   sinfo.bytesSent,
+					MTU:         sinfo.getMTU(),
-				BytesRecvd:  sinfo.bytesRecvd,
+					BytesSent:   sinfo.bytesSent,
-				Uptime:      time.Now().Sub(sinfo.timeOpened),
+					BytesRecvd:  sinfo.bytesRecvd,
-				WasMTUFixed: sinfo.wasMTUFixed,
+					Uptime:      time.Now().Sub(sinfo.timeOpened),
+					WasMTUFixed: sinfo.wasMTUFixed,
+				}
+				copy(session.PublicKey[:], sinfo.theirPermPub[:])
 			}
-			copy(session.PublicKey[:], sinfo.theirPermPub[:])
+			var skip bool
+			func() {
+				defer func() {
+					if recover() != nil {
+						skip = true
+					}
+				}()
+				sinfo.doWorker(workerFunc)
+			}()
+			if skip {
+				continue
+			}
+			// TODO? skipped known but timed out sessions?
 			sessions = append(sessions, session)
 		}
 	}

src/yggdrasil/conn.go

@@ -236,6 +236,11 @@ func (c *Conn) Write(b []byte) (bytesWritten int, err error) {
 	timer := getDeadlineTimer(&c.writeDeadline)
 	defer util.TimerStop(timer)
 	// Hand over to the session worker
+	defer func() {
+		if recover() != nil {
+			err = errors.New("write failed")
+		}
+	}() // In case we're racing with a close
 	select { // Send to worker
 	case sinfo.worker <- workerFunc:
 	case <-timer.C: