noot

lib/fed/conn.go

@@ -168,7 +168,7 @@ func (T *Conn) ReadByte() (byte, error) {
 }
 
 func (T *Conn) EnableSSL(config *tls.Config, isClient bool) error {
-	return T.EnableSSL(config, isClient)
+	return T.codec.EnableSSL(config, isClient)
 }
 
 func (T *Conn) Close() error {

lib/gat/handlers/discovery/discoverers/google_cloud_sql/discoverer.go

@@ -135,7 +135,7 @@ func (T *Discoverer) instanceToCluster(primary *sqladmin.DatabaseInstance, repli
 
 			var result authQueryResult
 
-			inward, outward := gsql.NewPair()
+			inward, outward, _, _ := gsql.NewPair()
 
 			var b flip.Bank
 			b.Queue(func() error {

lib/gat/handlers/pgbouncer/module.go

@@ -114,7 +114,7 @@ func (T *Module) getPassword(user, database string) (string, bool) {
 
 		var b flip.Bank
 
-		inward, outward := gsql.NewPair()
+		inward, outward, _, _ := gsql.NewPair()
 		b.Queue(func() error {
 			if err := gsql.ExtendedQuery(inward, &result, T.Config.PgBouncer.AuthQuery, user); err != nil {
 				return err

lib/gsql/pair.go

 package gsql
 
 import (
+	"net"
+
 	"gfx.cafe/gfx/pggat/lib/fed"
 	"gfx.cafe/gfx/pggat/lib/fed/codecs/netconncodec"
 	"gfx.cafe/gfx/pggat/lib/util/mio"
 )
 
-func NewPair() (*fed.Conn, *fed.Conn) {
+func NewPair() (*fed.Conn, *fed.Conn, net.Conn, net.Conn) {
 	conn := new(mio.Conn)
+	in := mio.InwardConn{Conn: conn}
+	out := mio.InwardConn{Conn: conn}
 	inward := fed.NewConn(
 		netconncodec.NewCodec(
-			mio.InwardConn{Conn: conn},
+			in,
 		),
 	)
 	inward.Ready = true
 	outward := fed.NewConn(
 		netconncodec.NewCodec(
-			mio.OutwardConn{Conn: conn},
+			out,
 		),
 	)
 	outward.Ready = true
 
-	return inward, outward
+	return inward, outward, in, out
 }

lib/gsql/query_test.go

@@ -49,7 +49,7 @@ func TestQuery(t *testing.T) {
 		return
 	}
 
-	inward, outward := gsql.NewPair()
+	inward, outward, _, _ := gsql.NewPair()
 
 	var res Result
 

test/runner.go

@@ -76,7 +76,7 @@ func (T *Runner) runModeL1(dialer pool.Dialer, client *fed.Conn) error {
 }
 
 func (T *Runner) runModeOnce(dialer pool.Dialer) ([]byte, error) {
-	inward, outward := gsql.NewPair()
+	inward, outward, in, _ := gsql.NewPair()
 	if err := T.prepare(inward, len(T.test.Packets)); err != nil {
 		return nil, err
 	}
@@ -89,12 +89,12 @@ func (T *Runner) runModeOnce(dialer pool.Dialer) ([]byte, error) {
 		return nil, err
 	}
 
-	return io.ReadAll(inward.NetConn)
+	return io.ReadAll(in)
 }
 
 func (T *Runner) runModeFail(dialer pool.Dialer) error {
 	for i := 1; i <= len(T.test.Packets); i++ {
-		inward, outward := gsql.NewPair()
+		inward, outward, _, _ := gsql.NewPair()
 		if err := T.prepare(inward, i); err != nil {
 			return err
 		}