Refactor UDP DNS hijack

protocol/openvpn/client.go

@@ -477,6 +477,10 @@ func (c *ClientEndpoint) JudgeFlow(network uint8, source netip.AddrPort, destina
 	return judgeOpenVPNFlow(c.router, c.Tag(), c.Type(), c.state.Load().localAddresses, network, source, destination, firstPacket)
 }
 
+func (c *ClientEndpoint) NewDNSPacket(payload []byte, source M.Socksaddr, destination M.Socksaddr, writer N.PacketWriter) {
+	c.newDNSPacket(log.ContextWithNewID(c.ctx), c, payload, source, destination, writer)
+}
+
 func (c *ClientEndpoint) ready() bool {
 	state := c.state.Load()
 	return state.started && state.tunnelConfigured

protocol/openvpn/endpoint.go

@@ -72,6 +72,18 @@ func (e *endpointBase) newPacketConnection(ctx context.Context, endpoint adapter
 	e.router.RoutePacketConnectionEx(ctx, conn, metadata, onClose)
 }
 
+func (e *endpointBase) newDNSPacket(ctx context.Context, endpoint adapter.Endpoint, payload []byte, source M.Socksaddr, destination M.Socksaddr, writer N.PacketWriter) {
+	var metadata adapter.InboundContext
+	metadata.Inbound = endpoint.Tag()
+	metadata.InboundType = endpoint.Type()
+	metadata.Network = N.NetworkUDP
+	metadata.Source = source
+	metadata.Destination = destination
+	metadata.Protocol = C.ProtocolDNS
+	e.logger.InfoContext(ctx, "inbound DNS packet from ", source)
+	e.router.HijackDNSPacket(ctx, payload, writer, metadata)
+}
+
 func isEndpointLocalAddress(localAddresses []netip.Prefix, address netip.Addr) bool {
 	for _, localPrefix := range localAddresses {
 		if address == localPrefix.Addr() {

protocol/openvpn/server.go

@@ -484,6 +484,10 @@ func (s *ServerEndpoint) JudgeFlow(network uint8, source netip.AddrPort, destina
 	return judgeOpenVPNFlow(s.router, s.Tag(), s.Type(), s.localAddresses, network, source, destination, firstPacket)
 }
 
+func (s *ServerEndpoint) NewDNSPacket(payload []byte, source M.Socksaddr, destination M.Socksaddr, writer N.PacketWriter) {
+	s.newDNSPacket(log.ContextWithNewID(s.ctx), s, payload, source, destination, writer)
+}
+
 func (s *ServerEndpoint) WritePackets(packets [][]byte) error {
 	if !s.started.Load() {
 		return E.New("OpenVPN server is not ready yet")