Don't leave errors unchecked. gofmt again.

helper/helper.go

@@ -10,6 +10,9 @@ import (
 	"github.com/eyedeekay/sam3"
 )
 
+// HEY! If you're looking at this, there's a good chance that `github.com/eyedeekay/onramp`
+// is a better fit! Check it out.
+
 func NetListener(name, samaddr, keyspath string) (net.Listener, error) {
 	return I2PListener(name, sam3.SAMDefaultAddr(samaddr), keyspath)
 }
@@ -20,7 +23,9 @@ func NetListener(name, samaddr, keyspath string) (net.Listener, error) {
 func I2PListener(name, samaddr, keyspath string) (*sam3.StreamListener, error) {
 	log.Printf("Starting and registering I2P service, please wait a couple of minutes...")
 	listener, err := I2PStreamSession(name, sam3.SAMDefaultAddr(samaddr), keyspath)
-
+	if err != nil {
+		return nil, err
+	}
 	if keyspath != "" {
 		err = ioutil.WriteFile(keyspath+".i2p.public.txt", []byte(listener.Keys().Addr().Base32()), 0644)
 		if err != nil {

raw.go

@@ -57,6 +57,9 @@ func (s *SAM) NewRawSession(id string, keys i2pkeys.I2PKeys, options []string, u
 		return nil, err
 	}
 	_, lport, err := net.SplitHostPort(udpconn.LocalAddr().String())
+	if err != nil {
+		return nil, err
+	}
 	conn, err := s.newGenericSession("RAW", id, keys, options, []string{"PORT=" + lport})
 	if err != nil {
 		return nil, err

streamListener.go

@@ -77,39 +77,43 @@ func (l *StreamListener) AcceptI2P() (*SAMConn, error) {
 		// we connected to sam
 		// send accept() command
 		_, err = io.WriteString(s.conn, "STREAM ACCEPT ID="+l.id+" SILENT=false\n")
+		if err != nil {
+			s.Close()
+			return nil, err
+		}
 		// read reply
 		rd := bufio.NewReader(s.conn)
 		// read first line
 		line, err := rd.ReadString(10)
-		log.Println(line)
-		if err == nil {
-			if strings.HasPrefix(line, "STREAM STATUS RESULT=OK") {
-				// we gud read destination line
-				destline, err := rd.ReadString(10)
-				if err == nil {
-					dest := ExtractDest(destline)
-					l.session.from = ExtractPairString(destline, "FROM_PORT")
-					l.session.to = ExtractPairString(destline, "TO_PORT")
-					// return wrapped connection
-					dest = strings.Trim(dest, "\n")
-					return &SAMConn{
-						laddr: l.laddr,
-						raddr: i2pkeys.I2PAddr(dest),
-						conn:  s.conn,
-					}, nil
-				} else {
-					s.Close()
-					return nil, err
-				}
-			} else {
-				s.Close()
-				return nil, errors.New("invalid sam line: " + line)
-			}
-		} else {
+		if err != nil {
 			s.Close()
 			return nil, err
 		}
+		log.Println(line)
+		if strings.HasPrefix(line, "STREAM STATUS RESULT=OK") {
+			// we gud read destination line
+			destline, err := rd.ReadString(10)
+			if err == nil {
+				dest := ExtractDest(destline)
+				l.session.from = ExtractPairString(destline, "FROM_PORT")
+				l.session.to = ExtractPairString(destline, "TO_PORT")
+				// return wrapped connection
+				dest = strings.Trim(dest, "\n")
+				return &SAMConn{
+					laddr: l.laddr,
+					raddr: i2pkeys.I2PAddr(dest),
+					conn:  s.conn,
+				}, nil
+			} else {
+				s.Close()
+				return nil, err
+			}
+		} else {
+			s.Close()
+			return nil, errors.New("invalid sam line: " + line)
+		}
+	} else {
+		s.Close()
+		return nil, err
 	}
-	s.Close()
-	return nil, err
 }