move doqproto to doq package

Author: natesales

internal/doqproto/main.go renamed to main.go

@@ -1,4 +1,4 @@
-package doqproto
+package doq
 
 // Only implementations of the final, published RFC can identify
 // themselves as "doq". Until such an RFC exists, implementations MUST
@@ -15,6 +15,6 @@ var TlsProtosCompat = []string{"doq-i02", "doq-i01", "doq-i00", "doq", "dq"}
 
 // Errors
 const (
-	DoqNoError       = 0x00 // No error. This is used when the connection or stream needs to be closed, but there is no error to signal.
-	DoqInternalError = 0x01 // The DoQ implementation encountered an internal error and is incapable of pursuing the transaction or the connection
+	NoError       = 0x00 // No error. This is used when the connection or stream needs to be closed, but there is no error to signal.
+	InternalError = 0x01 // The DoQ implementation encountered an internal error and is incapable of pursuing the transaction or the connection
 )

pkg/client/main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/miekg/dns"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/natesales/doq/internal/doqproto"
+	"github.com/natesales/doq"
 )
 
 // Client stores a DoQ client
@@ -22,9 +22,9 @@ func New(server string, tlsInsecureSkipVerify bool, compat bool) (Client, error)
 	// Select TLS protocols for DoQ
 	var tlsProtos []string
 	if compat {
-		tlsProtos = doqproto.TlsProtosCompat
+		tlsProtos = doq.TlsProtosCompat
 	} else {
-		tlsProtos = doqproto.TlsProtos
+		tlsProtos = doq.TlsProtos
 	}
 
 	// Connect to DoQ server
@@ -59,14 +59,14 @@ func (c Client) SendQuery(message dns.Msg) (dns.Msg, error) {
 	log.Debugln("packing dns message")
 	packed, err := message.Pack()
 	if err != nil {
-		stream.Close()
+		_ = stream.Close()
 		return dns.Msg{}, errors.New("dns message pack: " + err.Error())
 	}
 
 	// Send the DNS query over QUIC
 	log.Debugln("writing packed format to the stream")
 	_, err = stream.Write(packed)
-	stream.Close()
+	_ = stream.Close()
 	if err != nil {
 		return dns.Msg{}, errors.New("quic stream write: " + err.Error())
 	}

pkg/server/main.go

@@ -13,7 +13,7 @@ import (
 	"github.com/miekg/dns"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/natesales/doq/internal/doqproto"
+	"github.com/natesales/doq"
 )
 
 // Server stores a DoQ server
@@ -45,9 +45,9 @@ func New(listenAddr string, cert tls.Certificate, upstream string, tlsCompat boo
 	// Select TLS protocols for DoQ
 	var tlsProtos []string
 	if tlsCompat {
-		tlsProtos = doqproto.TlsProtosCompat
+		tlsProtos = doq.TlsProtosCompat
 	} else {
-		tlsProtos = doqproto.TlsProtos
+		tlsProtos = doq.TlsProtos
 	}
 
 	// Create QUIC listener
@@ -88,7 +88,7 @@ func handleDoQSession(session quic.Session, upstream string) {
 			} else {
 				log.Warnf("QUIC stream accept: %v", err)
 			}
-			_ = session.CloseWithError(doqproto.DoqInternalError, "") // Close the session with an internal error message
+			_ = session.CloseWithError(doq.InternalError, "") // Close the session with an internal error message
 			return
 		}