fix(scripts): Fix the output and recording of data
This commit is contained in:
@@ -43,7 +43,7 @@ func New(config Config) (*Client, error) {
|
||||
}
|
||||
|
||||
logger.Debug("Creating DoH client: %s:%s%s (KeepAlive: %v)", config.Host, config.Port, config.Path, config.KeepAlive)
|
||||
|
||||
|
||||
if config.Host == "" || config.Port == "" || config.Path == "" {
|
||||
logger.Error("DoH client creation failed: missing required fields")
|
||||
return nil, errors.New("doh: host, port, and path must not be empty")
|
||||
@@ -136,7 +136,7 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
|
||||
if c.config.DNSSEC {
|
||||
msg.SetEdns0(4096, true)
|
||||
}
|
||||
|
||||
|
||||
packedMsg, err := msg.Pack()
|
||||
if err != nil {
|
||||
logger.Error("DoH failed to pack DNS message: %v", err)
|
||||
@@ -152,7 +152,7 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
|
||||
httpReq.Header.Set("User-Agent", "sdns-proxy")
|
||||
httpReq.Header.Set("Content-Type", dnsMessageContentType)
|
||||
httpReq.Header.Set("Accept", dnsMessageContentType)
|
||||
|
||||
|
||||
// Set Connection header based on KeepAlive setting
|
||||
if c.config.KeepAlive {
|
||||
httpReq.Header.Set("Connection", "keep-alive")
|
||||
|
||||
@@ -47,7 +47,7 @@ func New(config Config) (*Client, error) {
|
||||
logger.Error("DoQ failed to resolve address %s:%s: %v", config.Host, config.Port, err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
||||
udpConn, err := net.ListenUDP("udp", nil)
|
||||
if err != nil {
|
||||
logger.Error("DoQ failed to create UDP connection: %v", err)
|
||||
|
||||
+11
-11
@@ -33,7 +33,7 @@ type Client struct {
|
||||
|
||||
func New(config Config) (*Client, error) {
|
||||
logger.Debug("Creating DoT client: %s:%s (KeepAlive: %v)", config.Host, config.Port, config.KeepAlive)
|
||||
|
||||
|
||||
if config.Host == "" {
|
||||
logger.Error("DoT client creation failed: empty host")
|
||||
return nil, fmt.Errorf("dot: Host cannot be empty")
|
||||
@@ -73,7 +73,7 @@ func (c *Client) Close() {
|
||||
logger.Debug("Closing DoT client")
|
||||
c.connMutex.Lock()
|
||||
defer c.connMutex.Unlock()
|
||||
|
||||
|
||||
if c.conn != nil {
|
||||
c.conn.Close()
|
||||
c.conn = nil
|
||||
@@ -91,15 +91,15 @@ func (c *Client) ensureConnection() error {
|
||||
// Try to read one byte to test connection
|
||||
var testBuf [1]byte
|
||||
_, err := c.conn.Read(testBuf[:])
|
||||
|
||||
|
||||
// Reset deadline
|
||||
c.conn.SetReadDeadline(time.Time{})
|
||||
|
||||
|
||||
// If we get a timeout error, connection is still good
|
||||
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
// Any other error means connection is dead
|
||||
logger.Debug("DoT connection test failed, reconnecting: %v", err)
|
||||
c.conn.Close()
|
||||
@@ -117,7 +117,7 @@ func (c *Client) ensureConnection() error {
|
||||
logger.Error("DoT connection failed to %s: %v", c.hostAndPort, err)
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
c.conn = conn
|
||||
logger.Debug("DoT connection established to %s", c.hostAndPort)
|
||||
return nil
|
||||
@@ -142,7 +142,7 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
|
||||
c.conn = nil
|
||||
}
|
||||
c.connMutex.Unlock()
|
||||
|
||||
|
||||
if err := c.ensureConnection(); err != nil {
|
||||
return nil, fmt.Errorf("dot: failed to create connection: %w", err)
|
||||
}
|
||||
@@ -175,22 +175,22 @@ func (c *Client) Query(msg *dns.Msg) (*dns.Msg, error) {
|
||||
|
||||
if _, err := conn.Write(data); err != nil {
|
||||
logger.Error("DoT failed to write message to %s: %v", c.hostAndPort, err)
|
||||
|
||||
|
||||
// If keep-alive is enabled and write failed, try to reconnect once
|
||||
if c.config.KeepAlive {
|
||||
logger.Debug("DoT write failed with keep-alive, attempting reconnect")
|
||||
if reconnectErr := c.ensureConnection(); reconnectErr != nil {
|
||||
return nil, fmt.Errorf("dot: failed to reconnect: %w", reconnectErr)
|
||||
}
|
||||
|
||||
|
||||
c.connMutex.Lock()
|
||||
conn = c.conn
|
||||
c.connMutex.Unlock()
|
||||
|
||||
|
||||
if err := conn.SetWriteDeadline(time.Now().Add(c.config.WriteTimeout)); err != nil {
|
||||
return nil, fmt.Errorf("dot: failed to set write deadline after reconnect: %w", err)
|
||||
}
|
||||
|
||||
|
||||
if _, err := conn.Write(data); err != nil {
|
||||
return nil, fmt.Errorf("dot: failed to write message after reconnect: %w", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user