docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
return false, fmt.Errorf("couldn't receive packet: %w", err)
<mask> log.Debug("DHCPv4: didn't receive DHCP response") <mask> return false, nil <mask> } <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't receive packet") <mask> } <mask> <mask> log.Tracef("Received packet (%v bytes)", n) <mask> <mask> response, err := dhcpv4.From...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err)
<mask> // and waits for a response for a period defined by defaultDiscoverTime <mask> func CheckIfOtherDHCPServersPresentV6(ifaceName string) (bool, error) { <mask> iface, err := net.InterfaceByName(ifaceName) <mask> if err != nil { <mask> return false, fmt.Errorf("DHCPv6: net.InterfaceByName: %s: %s", ifaceNa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface)
<mask> } <mask> <mask> ifaceIPNet := getIfaceIPv6(*iface) <mask> if len(ifaceIPNet) == 0 { <mask> return false, fmt.Errorf("DHCPv6: couldn't find IPv6 address of interface %s %+v", ifaceName, iface) <mask> } <mask> <mask> srcIP := ifaceIPNet[0] <mask> src := net.JoinHostPort(srcIP.String(), "546") <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: dhcpv6.NewSolicit: %w", err)
<mask> dst := "[ff02::1:2]:547" <mask> <mask> req, err := dhcpv6.NewSolicit(iface.HardwareAddr) <mask> if err != nil { <mask> return false, fmt.Errorf("DHCPv6: dhcpv6.NewSolicit: %s", err) <mask> } <mask> <mask> udpAddr, err := net.ResolveUDPAddr("udp6", src) <mask> if err != nil { <mask> return f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", src, err)
<mask> } <mask> <mask> udpAddr, err := net.ResolveUDPAddr("udp6", src) <mask> if err != nil { <mask> return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src) <mask> } <mask> <mask> if !udpAddr.IP.To16().Equal(srcIP) { <mask> return false, wrapErrPrint(err, "DHCPv6: Resolved UD...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: Resolved UDP address is not %s: %w", src, err)
<mask> return false, wrapErrPrint(err, "DHCPv6: Couldn't resolve UDP address %s", src) <mask> } <mask> <mask> if !udpAddr.IP.To16().Equal(srcIP) { <mask> return false, wrapErrPrint(err, "DHCPv6: Resolved UDP address is not %s", src) <mask> } <mask> <mask> dstAddr, err := net.ResolveUDPAddr("udp6", dst...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: Couldn't resolve UDP address %s: %w", dst, err)
<mask> } <mask> <mask> dstAddr, err := net.ResolveUDPAddr("udp6", dst) <mask> if err != nil { <mask> return false, fmt.Errorf("DHCPv6: Couldn't resolve UDP address %s: %s", dst, err) <mask> } <mask> <mask> log.Debug("DHCPv6: Listening to udp6 %+v", udpAddr) <mask> c, err := nclient6.NewIPv6UDPConn(if...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: Couldn't listen on :546: %w", err)
<mask> <mask> log.Debug("DHCPv6: Listening to udp6 %+v", udpAddr) <mask> c, err := nclient6.NewIPv6UDPConn(ifaceName, dhcpv6.DefaultClientPort) <mask> if err != nil { <mask> return false, fmt.Errorf("DHCPv6: Couldn't listen on :546: %s", err) <mask> } <mask> if c != nil { <mask> defer c.Close() <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("dhcpv6: Couldn't send a packet to %s: %w", dst, err)
<mask> } <mask> <mask> _, err = c.WriteTo(req.ToBytes(), dstAddr) <mask> if err != nil { <mask> return false, fmt.Errorf("DHCPv6: Couldn't send a packet to %s: %s", dst, err) <mask> } <mask> <mask> for { <mask> log.Debug("DHCPv6: Waiting %v for an answer", defaultDiscoverTime) <mask> b := make([]...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
return false, fmt.Errorf("couldn't receive packet: %w", err)
<mask> log.Debug("DHCPv6: didn't receive DHCP response") <mask> return false, nil <mask> } <mask> if err != nil { <mask> return false, wrapErrPrint(err, "Couldn't receive packet") <mask> } <mask> <mask> log.Debug("DHCPv6: Received packet (%v bytes)", n) <mask> <mask> resp, err := dhcpv6.F...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/check_other_dhcp.go
<mask> import ( <mask> "encoding/binary" <mask> "fmt" <mask> "net" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> func isTimeout(err error) bool { <mask> operr, ok := err.(*net.OpError) <mask> if !ok { </s> Pull request:* all: remove gi...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/helpers.go
<mask> } <mask> return res <mask> } <mask> <mask> func wrapErrPrint(err error, message string, args ...interface{}) error { <mask> var errx error <mask> if err == nil { <mask> errx = fmt.Errorf(message, args...) <mask> } else { <mask> errx = errorx.Decorate(err, message, args...) <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/helpers.go
log.Debug("dhcpv6 ra: source IP address: %s DNS IP address: %s",
<mask> if !(ra.raAllowSlaac || ra.raSlaacOnly) { <mask> return nil <mask> } <mask> <mask> log.Debug("DHCPv6 RA: source IP address: %s DNS IP address: %s", <mask> ra.ipAddr, ra.dnsIPAddr) <mask> <mask> params := icmpv6RA{ <mask> managedAddressConfiguration: !ra.raSlaacOnly, <mask> otherConfigura...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err)
<mask> var err error <mask> ipAndScope := ra.ipAddr.String() + "%" + ra.ifaceName <mask> ra.conn, err = icmp.ListenPacket("ip6:ipv6-icmp", ipAndScope) <mask> if err != nil { <mask> return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err) <mask> } <mask> success := false <mask> defer func() { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err)
<mask> <mask> con6 := ra.conn.IPv6PacketConn() <mask> <mask> if err := con6.SetHopLimit(255); err != nil { <mask> return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err) <mask> } <mask> <mask> if err := con6.SetMulticastHopLimit(255); err != nil { <mask> return fmt.Errorf("DHCPv6 RA: SetMulticastHopLim...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
return fmt.Errorf("dhcpv6 ra: SetMulticastHopLimit: %w", err)
<mask> return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err) <mask> } <mask> <mask> if err := con6.SetMulticastHopLimit(255); err != nil { <mask> return fmt.Errorf("DHCPv6 RA: SetMulticastHopLimit: %s", err) <mask> } <mask> <mask> msg := &ipv6.ControlMessage{ <mask> HopLimit: 255, <mask> Src: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets")
<mask> IP: net.ParseIP("ff02::1"), <mask> } <mask> <mask> go func() { <mask> log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets") <mask> for ra.stop.Load() == 0 { <mask> _, err = con6.WriteTo(data, msg, addr) <mask> if err != nil { <mask> log.Error("DHCPv6 RA: WriteT...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
log.Error("dhcpv6 ra: WriteTo: %s", err)
<mask> log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets") <mask> for ra.stop.Load() == 0 { <mask> _, err = con6.WriteTo(data, msg, addr) <mask> if err != nil { <mask> log.Error("DHCPv6 RA: WriteTo: %s", err) <mask> } <mask> time.Sleep(ra.packetSendPeriod) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
log.Debug("dhcpv6 ra: loop exit")
<mask> log.Error("DHCPv6 RA: WriteTo: %s", err) <mask> } <mask> time.Sleep(ra.packetSendPeriod) <mask> } <mask> log.Debug("DHCPv6 RA: loop exit") <mask> }() <mask> <mask> success = true <mask> return nil <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
log.Debug("dhcpv6 ra: closing")
<mask> } <mask> <mask> // Close - close module <mask> func (ra *raCtx) Close() { <mask> log.Debug("DHCPv6 RA: closing") <mask> <mask> ra.stop.Store(1) <mask> <mask> if ra.conn != nil { <mask> ra.conn.Close() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-h...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/router_adv.go
log.Debug("dhcpv4: skipping a lease with IP %v: not within current IP range", l.IP)
<mask> <mask> if l.Expiry.Unix() != leaseExpireStatic && <mask> !ip4InRange(s.conf.ipStart, s.conf.ipEnd, l.IP) { <mask> <mask> log.Debug("DHCPv4: skipping a lease with IP %v: not within current IP range", l.IP) <mask> continue <mask> } <mask> <mask> s.addLease(l) <mask> } </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr)
<mask> <mask> // Remove (swap) lease by index <mask> func (s *v4Server) leaseRemoveSwapByIndex(i int) { <mask> s.ipAddrs[s.leases[i].IP[3]] = 0 <mask> log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr) <mask> <mask> n := len(s.leases) <mask> if i != n-1 { <mask> s.leases[i] = s.leases[n-1] // sw...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr)
<mask> // Add a lease <mask> func (s *v4Server) addLease(l *Lease) { <mask> s.leases = append(s.leases, l) <mask> s.ipAddrs[l.IP[3]] = 1 <mask> log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr) <mask> } <mask> <mask> // Remove a lease with the same properties <mask> func (s *v4Server) rmLease(leas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return fmt.Errorf("lease not found")
<mask> if net.IP.Equal(l.IP, lease.IP) { <mask> <mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) || <mask> l.Hostname != lease.Hostname { <mask> <mask> return fmt.Errorf("Lease not found") <mask> } <mask> <mask> s.leaseRemoveSwapByIndex(i) <mask> return nil <mask> } </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: Sending ICMP Echo to %v", target)
<mask> reply := false <mask> pinger.OnRecv = func(pkt *ping.Packet) { <mask> reply = true <mask> } <mask> log.Debug("DHCPv4: Sending ICMP Echo to %v", target) <mask> pinger.Run() <mask> <mask> if reply { <mask> log.Info("DHCPv4: IP conflict: %v is already used by another device", target) <mask> r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Info("dhcpv4: IP conflict: %v is already used by another device", target)
<mask> log.Debug("DHCPv4: Sending ICMP Echo to %v", target) <mask> pinger.Run() <mask> <mask> if reply { <mask> log.Info("DHCPv4: IP conflict: %v is already used by another device", target) <mask> return false <mask> } <mask> <mask> log.Debug("DHCPv4: ICMP procedure is complete: %v", target) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: ICMP procedure is complete: %v", target)
<mask> log.Info("DHCPv4: IP conflict: %v is already used by another device", target) <mask> return false <mask> } <mask> <mask> log.Debug("DHCPv4: ICMP procedure is complete: %v", target) <mask> return true <mask> } <mask> <mask> // Find lease by MAC <mask> func (s *v4Server) findLease(mac net.Hardwa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: No more IP addresses")
<mask> toStore := false <mask> for lease == nil { <mask> lease = s.reserveLease(mac) <mask> if lease == nil { <mask> log.Debug("DHCPv4: No more IP addresses") <mask> if toStore { <mask> s.conf.notify(LeaseChangedDBStore) <mask> } <mask> return nil <mask> } </s> Pull request:...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: different RequestedIP: %v != %v", reqIP, lease.IP)
<mask> } else { <mask> reqIP := req.Options.Get(dhcpv4.OptionRequestedIPAddress) <mask> if len(reqIP) != 0 && <mask> !bytes.Equal(reqIP, lease.IP) { <mask> log.Debug("DHCPv4: different RequestedIP: %v != %v", reqIP, lease.IP) <mask> } <mask> } <mask> <mask> resp.UpdateOption(dhcpv4.OptMessageTy...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: Bad OptionServerIdentifier in Request message for %s", mac)
<mask> <mask> sid := req.Options.Get(dhcpv4.OptionServerIdentifier) <mask> if len(sid) != 0 && <mask> !bytes.Equal(sid, s.conf.dnsIPAddrs[0]) { <mask> log.Debug("DHCPv4: Bad OptionServerIdentifier in Request message for %s", mac) <mask> return nil, false <mask> } <mask> <mask> if len(reqIP) != 4 { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
<mask> return nil, false <mask> } <mask> <mask> if len(reqIP) != 4 { <mask> log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac) <mask> return nil, false <mask> } <mask> <mask> s.leasesLock.Lock() <mask> for _, l := range s.leases { </s> Pull request:* all: remove git...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac)
<mask> for _, l := range s.leases { <mask> if bytes.Equal(l.HWAddr, mac) { <mask> if !bytes.Equal(l.IP, reqIP) { <mask> s.leasesLock.Unlock() <mask> log.Debug("DHCPv4: Mismatched OptionRequestedIPAddress in Request message for %s", mac) <mask> return nil, true <mask> } <mask> <mask> le...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: No lease for %s", mac)
<mask> } <mask> s.leasesLock.Unlock() <mask> <mask> if lease == nil { <mask> log.Debug("DHCPv4: No lease for %s", mac) <mask> return nil, true <mask> } <mask> <mask> if lease.Expiry.Unix() != leaseExpireStatic { <mask> lease.Hostname = string(hostname) </s> Pull request:* all: remove github.com/...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: received message: %s", req.Summary())
<mask> // client(255.255.255.255:68) <- (Reply:YourIP,ClientMAC,Type=Offer,ServerID,SubnetMask,LeaseTime) <- server(<IP>:67) <mask> // client(0.0.0.0:68) -> (Request:ClientMAC,Type=Request,ClientID,ReqIP||ClientIP,HostName,ServerID,ParamReqList) -> server(255.255.255.255:67) <mask> // client(255.255.255.255:68) <- (...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: unsupported message type %d", req.MessageType())
<mask> dhcpv4.MessageTypeRequest: <mask> // <mask> <mask> default: <mask> log.Debug("DHCPv4: unsupported message type %d", req.MessageType()) <mask> return <mask> } <mask> <mask> resp, err := dhcpv4.NewReplyFromRequest(req) <mask> if err != nil { </s> Pull request:* all: remove github.com/joomc...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: dhcpv4.New: %s", err)
<mask> } <mask> <mask> resp, err := dhcpv4.NewReplyFromRequest(req) <mask> if err != nil { <mask> log.Debug("DHCPv4: dhcpv4.New: %s", err) <mask> return <mask> } <mask> <mask> if len(req.ClientHWAddr) != 6 { <mask> log.Debug("DHCPv4: Invalid ClientHWAddr") </s> Pull request:* all: remove github....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: Invalid ClientHWAddr")
<mask> return <mask> } <mask> <mask> if len(req.ClientHWAddr) != 6 { <mask> log.Debug("DHCPv4: Invalid ClientHWAddr") <mask> return <mask> } <mask> <mask> r := s.process(req, resp) <mask> if r < 0 { </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: sending: %s", resp.Summary())
<mask> } else if r == 0 { <mask> resp.Options.Update(dhcpv4.OptMessageType(dhcpv4.MessageTypeNak)) <mask> } <mask> <mask> log.Debug("DHCPv4: sending: %s", resp.Summary()) <mask> <mask> _, err = conn.WriteTo(resp.ToBytes(), peer) <mask> if err != nil { <mask> log.Error("DHCPv4: conn.Write to %s faile...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Error("dhcpv4: conn.Write to %s failed: %s", peer, err)
<mask> log.Debug("DHCPv4: sending: %s", resp.Summary()) <mask> <mask> _, err = conn.WriteTo(resp.ToBytes(), peer) <mask> if err != nil { <mask> log.Error("DHCPv4: conn.Write to %s failed: %s", peer, err) <mask> return <mask> } <mask> } <mask> <mask> // Start - start server </s> Pull request:* all: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err)
<mask> } <mask> <mask> iface, err := net.InterfaceByName(s.conf.InterfaceName) <mask> if err != nil { <mask> return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err) <mask> } <mask> <mask> log.Debug("DHCPv4: starting...") <mask> s.conf.dnsIPAddrs = getIfaceIPv4(*...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: starting...")
<mask> if err != nil { <mask> return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err) <mask> } <mask> <mask> log.Debug("DHCPv4: starting...") <mask> s.conf.dnsIPAddrs = getIfaceIPv4(*iface) <mask> if len(s.conf.dnsIPAddrs) == 0 { <mask> log.Debug("DHCPv4: no IPv6...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name)
<mask> <mask> log.Debug("DHCPv4: starting...") <mask> s.conf.dnsIPAddrs = getIfaceIPv4(*iface) <mask> if len(s.conf.dnsIPAddrs) == 0 { <mask> log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name) <mask> return nil <mask> } <mask> <mask> laddr := &net.UDPAddr{ <mask> IP: net.ParseIP(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Info("dhcpv4: listening")
<mask> if err != nil { <mask> return err <mask> } <mask> <mask> log.Info("DHCPv4: listening") <mask> <mask> go func() { <mask> err = s.srv.Serve() <mask> log.Debug("DHCPv4: srv.Serve: %s", err) <mask> }() </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: srv.Serve: %s", err)
<mask> log.Info("DHCPv4: listening") <mask> <mask> go func() { <mask> err = s.srv.Serve() <mask> log.Debug("DHCPv4: srv.Serve: %s", err) <mask> }() <mask> return nil <mask> } <mask> <mask> // Stop - stop server </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adgu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: stopping")
<mask> if s.srv == nil { <mask> return <mask> } <mask> <mask> log.Debug("DHCPv4: stopping") <mask> err := s.srv.Close() <mask> if err != nil { <mask> log.Error("DHCPv4: srv.Close: %s", err) <mask> } <mask> // now s.srv.Serve() will return </s> Pull request:* all: remove github.com/joomcode/errorx...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Error("dhcpv4: srv.Close: %s", err)
<mask> <mask> log.Debug("DHCPv4: stopping") <mask> err := s.srv.Close() <mask> if err != nil { <mask> log.Error("DHCPv4: srv.Close: %s", err) <mask> } <mask> // now s.srv.Serve() will return <mask> s.srv = nil <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Me...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return s, fmt.Errorf("dhcpv4: %w", err)
<mask> <mask> var err error <mask> s.conf.routerIP, err = parseIPv4(s.conf.GatewayIP) <mask> if err != nil { <mask> return s, fmt.Errorf("DHCPv4: %s", err) <mask> } <mask> <mask> subnet, err := parseIPv4(s.conf.SubnetMask) <mask> if err != nil || !isValidSubnetMask(subnet) { <mask> return s, fmt.E...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
<mask> } <mask> <mask> subnet, err := parseIPv4(s.conf.SubnetMask) <mask> if err != nil || !isValidSubnetMask(subnet) { <mask> return s, fmt.Errorf("DHCPv4: invalid subnet mask: %s", s.conf.SubnetMask) <mask> } <mask> s.conf.subnetMask = make([]byte, 4) <mask> copy(s.conf.subnetMask, subnet) <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return s, fmt.Errorf("dhcpv4: %w", err)
<mask> copy(s.conf.subnetMask, subnet) <mask> <mask> s.conf.ipStart, err = parseIPv4(conf.RangeStart) <mask> if s.conf.ipStart == nil { <mask> return s, fmt.Errorf("DHCPv4: %s", err) <mask> } <mask> if s.conf.ipStart[0] == 0 { <mask> return s, fmt.Errorf("DHCPv4: invalid range start IP") <mask> } <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return s, fmt.Errorf("dhcpv4: invalid range start IP")
<mask> if s.conf.ipStart == nil { <mask> return s, fmt.Errorf("DHCPv4: %s", err) <mask> } <mask> if s.conf.ipStart[0] == 0 { <mask> return s, fmt.Errorf("DHCPv4: invalid range start IP") <mask> } <mask> <mask> s.conf.ipEnd, err = parseIPv4(conf.RangeEnd) <mask> if s.conf.ipEnd == nil { <mask> ret...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return s, fmt.Errorf("dhcpv4: %w", err)
<mask> } <mask> <mask> s.conf.ipEnd, err = parseIPv4(conf.RangeEnd) <mask> if s.conf.ipEnd == nil { <mask> return s, fmt.Errorf("DHCPv4: %s", err) <mask> } <mask> if !net.IP.Equal(s.conf.ipStart[:3], s.conf.ipEnd[:3]) || <mask> s.conf.ipStart[3] > s.conf.ipEnd[3] { <mask> return s, fmt.Errorf("DHCP...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return s, fmt.Errorf("dhcpv4: range end IP should match range start IP")
<mask> return s, fmt.Errorf("DHCPv4: %s", err) <mask> } <mask> if !net.IP.Equal(s.conf.ipStart[:3], s.conf.ipEnd[:3]) || <mask> s.conf.ipStart[3] > s.conf.ipEnd[3] { <mask> return s, fmt.Errorf("DHCPv4: range end IP should match range start IP") <mask> } <mask> <mask> if conf.LeaseDuration == 0 { <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
log.Debug("dhcpv4: bad option string: %s", o)
<mask> <mask> for _, o := range conf.Options { <mask> code, val := parseOptionString(o) <mask> if code == 0 { <mask> log.Debug("DHCPv4: bad option string: %s", o) <mask> continue <mask> } <mask> <mask> opt := dhcpOption{ <mask> code: code, </s> Pull request:* all: remove github.com/joomco...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v4.go
return fmt.Errorf("lease not found")
<mask> if net.IP.Equal(l.IP, lease.IP) { <mask> <mask> if !bytes.Equal(l.HWAddr, lease.HWAddr) || <mask> l.Hostname != lease.Hostname { <mask> <mask> return fmt.Errorf("Lease not found") <mask> } <mask> <mask> s.leaseRemoveSwapByIndex(i) <mask> return nil <mask> } </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return fmt.Errorf("dhcpv6: no ClientID option in request")
<mask> <mask> // Check Client ID <mask> func (s *v6Server) checkCID(msg *dhcpv6.Message) error { <mask> if msg.Options.ClientID() == nil { <mask> return fmt.Errorf("DHCPv6: no ClientID option in request") <mask> } <mask> return nil <mask> } <mask> <mask> // Check ServerID policy </s> Pull request:* al...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return fmt.Errorf("dhcpv6: drop packet: ServerID option in message %s", msg.Type().String())
<mask> dhcpv6.MessageTypeConfirm, <mask> dhcpv6.MessageTypeRebind: <mask> <mask> if sid != nil { <mask> return fmt.Errorf("DHCPv6: drop packet: ServerID option in message %s", msg.Type().String()) <mask> } <mask> <mask> case dhcpv6.MessageTypeRequest, <mask> dhcpv6.MessageTypeRenew, <mask> d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return fmt.Errorf("dhcpv6: drop packet: no ServerID option in message %s", msg.Type().String())
<mask> dhcpv6.MessageTypeRelease, <mask> dhcpv6.MessageTypeDecline: <mask> <mask> if sid == nil { <mask> return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String()) <mask> } <mask> if !sid.Equal(s.sid) { <mask> return fmt.Errorf("DHCPv6: drop packet: mismatch...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return fmt.Errorf("dhcpv6: drop packet: mismatched ServerID option in message %s: %s",
<mask> if sid == nil { <mask> return fmt.Errorf("DHCPv6: drop packet: no ServerID option in message %s", msg.Type().String()) <mask> } <mask> if !sid.Equal(s.sid) { <mask> return fmt.Errorf("DHCPv6: drop packet: mismatched ServerID option in message %s: %s", <mask> msg.Type().String(), sid.String(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err)
<mask> } <mask> <mask> iface, err := net.InterfaceByName(s.conf.InterfaceName) <mask> if err != nil { <mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName) <mask> } <mask> <mask> s.conf.dnsIPAddrs = getIfaceIPv6(*iface) <mask> if len(s.conf.dnsIPAddrs) == 0 { <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return fmt.Errorf("dhcpv6: invalid MAC %s", iface.HardwareAddr)
<mask> <mask> log.Debug("DHCPv6: starting...") <mask> <mask> if len(iface.HardwareAddr) != 6 { <mask> return fmt.Errorf("DHCPv6: invalid MAC %s", iface.HardwareAddr) <mask> } <mask> s.sid = dhcpv6.Duid{ <mask> Type: dhcpv6.DUID_LLT, <mask> HwType: iana.HWTypeEthernet, <mask> Link...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart)
<mask> } <mask> <mask> s.conf.ipStart = net.ParseIP(conf.RangeStart) <mask> if s.conf.ipStart == nil || s.conf.ipStart.To16() == nil { <mask> return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart) <mask> } <mask> <mask> if conf.LeaseDuration == 0 { <mask> s.conf.leaseTime = time...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dhcpd/v6.go
return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err)
<mask> // On Windows we don't pass a file to urlfilter because <mask> // it's difficult to update this file while it's being used. <mask> data, err := ioutil.ReadFile(f.FilePath) <mask> if err != nil { <mask> return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err) <mask> } <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err)
<mask> } else { <mask> var err error <mask> list, err = filterlist.NewFileRuleList(int(f.ID), f.FilePath, true) <mask> if err != nil { <mask> return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err) <mask> } <mask> } <mask> listArray = append(listArray, list) <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err)
<mask> } <mask> <mask> rulesStorage, err := filterlist.NewRuleStorage(listArray) <mask> if err != nil { <mask> return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err) <mask> } <mask> filteringEngine := urlfilter.NewDNSEngine(rulesStorage) <mask> return rulesStorage, filteringEngine, nil <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
log.Debug("Filtering: found whitelist rule for host %q: %q list_id: %d",
<mask> } else if rr.HostRulesV6 != nil { <mask> rule = rr.HostRulesV6[0] <mask> } <mask> <mask> log.Debug("Filtering: found whitelist rule for host '%s': '%s' list_id: %d", <mask> host, rule.Text(), rule.GetFilterListID()) <mask> res := makeResult(rule, NotFilteredWhiteList) <mask> retu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> return Result{}, nil <mask> } <mask> <mask> if rr.NetworkRule != nil { <mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", <mask> host, rr.NetworkRule.Text(), rr.NetworkRule.GetFilterListID()) <mask> reason := FilteredBlackList <mask> if rr.NetworkRule.Whitelist { <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> } <mask> <mask> if qtype == dns.TypeA && rr.HostRulesV4 != nil { <mask> rule := rr.HostRulesV4[0] // note that we process only 1 matched rule <mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", <mask> host, rule.Text(), rule.GetFilterListID()) <mask> res := makeResult(ru...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> } <mask> <mask> if qtype == dns.TypeAAAA && rr.HostRulesV6 != nil { <mask> rule := rr.HostRulesV6[0] // note that we process only 1 matched rule <mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", <mask> host, rule.Text(), rule.GetFilterListID()) <mask> res := makeResult...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
log.Debug("Filtering: found rule for host %q: %q list_id: %d",
<mask> rule = rr.HostRulesV4[0] <mask> } else if rr.HostRulesV6 != nil { <mask> rule = rr.HostRulesV6[0] <mask> } <mask> log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d", <mask> host, rule.Text(), rule.GetFilterListID()) <mask> res := makeResult(rule, FilteredBlackList) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
log.Debug("skipping unknown blocked-service %q", s)
<mask> <mask> bsvcs := []string{} <mask> for _, s := range d.BlockedServices { <mask> if !BlockedSvcKnown(s) { <mask> log.Debug("skipping unknown blocked-service '%s'", s) <mask> continue <mask> } <mask> bsvcs = append(bsvcs, s) <mask> } <mask> d.BlockedServices = bsvcs </s> Pull request:* a...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsfilter/dnsfilter.go
return fmt.Errorf("filterlist.NewRuleStorage(): %w", err)
<mask> } <mask> listArray = append(listArray, list) <mask> rulesStorage, err := filterlist.NewRuleStorage(listArray) <mask> if err != nil { <mask> return fmt.Errorf("filterlist.NewRuleStorage(): %s", err) <mask> } <mask> a.blockedHostsEngine = urlfilter.NewDNSEngine(rulesStorage) <mask> <mask> return...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/access.go
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> ) <mask> <mask> // FilteringConfig represents the DNS filtering c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/config.go
return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err)
<mask> } <mask> upstreams = filterOutComments(upstreams) <mask> upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout) <mask> if err != nil { <mask> return fmt.Errorf("DNS: proxy.ParseUpstreamsConfig: %s", err) <mask> } <mask> <mask> if len(upstreamConfig.Upst...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/config.go
return fmt.Errorf("dns: failed to parse default upstreams: %v", err)
<mask> if len(upstreamConfig.Upstreams) == 0 { <mask> log.Info("Warning: no default upstream servers specified, using %v", defaultDNS) <mask> uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout) <mask> if err != nil { <mask> return fmt.Errorf("DNS: failed to parse defaul...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/config.go
return fmt.Errorf("failed to parse TLS keypair: %w", err)
<mask> <mask> var err error <mask> s.conf.cert, err = tls.X509KeyPair(s.conf.CertificateChainData, s.conf.PrivateKeyData) <mask> if err != nil { <mask> return errorx.Decorate(err, "Failed to parse TLS keypair") <mask> } <mask> <mask> if s.conf.StrictSNICheck { <mask> x, err := x509.ParseCertificate(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/config.go
return fmt.Errorf("x509.ParseCertificate(): %w", err)
<mask> <mask> if s.conf.StrictSNICheck { <mask> x, err := x509.ParseCertificate(s.conf.cert.Certificate[0]) <mask> if err != nil { <mask> return errorx.Decorate(err, "x509.ParseCertificate(): %s", err) <mask> } <mask> if len(x.DNSNames) != 0 { <mask> s.conf.dnsNames = x.DNSNames <mask> log.D...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/config.go
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog" <mask> "github.com/AdguardTeam/AdGuardHome/internal/stats" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> "github.com/miekg/dns" <mask> ) <mask> <mask> // D...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward.go
return fmt.Errorf("dns: invalid custom blocking IP address specified")
<mask> if s.conf.BlockingMode == "custom_ip" { <mask> s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4) <mask> s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6) <mask> if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil { <mask> return fmt.Errorf("DNS: invalid custo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward.go
return fmt.Errorf("could not stop the DNS server properly: %w", err)
<mask> func (s *Server) stopInternal() error { <mask> if s.dnsProxy != nil { <mask> err := s.dnsProxy.Stop() <mask> if err != nil { <mask> return errorx.Decorate(err, "could not stop the DNS server properly") <mask> } <mask> } <mask> <mask> s.isRunning = false <mask> return nil </s> Pull reques...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward.go
return fmt.Errorf("could not reconfigure the server: %w", err)
<mask> <mask> log.Print("Start reconfiguring the server") <mask> err := s.stopInternal() <mask> if err != nil { <mask> return errorx.Decorate(err, "could not reconfigure the server") <mask> } <mask> <mask> // It seems that net.Listener.Close() doesn't close file descriptors right away. <mask> // We w...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward.go
return fmt.Errorf("could not reconfigure the server: %w", err)
<mask> time.Sleep(100 * time.Millisecond) <mask> <mask> err = s.Prepare(config) <mask> if err != nil { <mask> return errorx.Decorate(err, "could not reconfigure the server") <mask> } <mask> <mask> err = s.startInternal() <mask> if err != nil { <mask> return errorx.Decorate(err, "could not reconfig...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward.go
return fmt.Errorf("could not reconfigure the server: %w", err)
<mask> } <mask> <mask> err = s.startInternal() <mask> if err != nil { <mask> return errorx.Decorate(err, "could not reconfigure the server") <mask> } <mask> <mask> return nil <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home from 2240-r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward.go
log.Info("dns: %s %s: %s", r.Method, r.URL, text)
<mask> ) <mask> <mask> func httpError(r *http.Request, w http.ResponseWriter, code int, format string, args ...interface{}) { <mask> text := fmt.Sprintf(format, args...) <mask> log.Info("DNS: %s %s: %s", r.Method, r.URL, text) <mask> http.Error(w, text, code) <mask> } <mask> <mask> type dnsConfigJSON stru...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("invalid bootstrap server address: %w", err)
<mask> return fmt.Errorf("invalid bootstrap server address: empty") <mask> } <mask> _, err := upstream.NewResolver(addr, 0) <mask> if err != nil { <mask> return fmt.Errorf("invalid bootstrap server address: %s", err) <mask> } <mask> return nil <mask> } <mask> <mask> // nolint(gocyclo) - we need to c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return "", defaultUpstream, fmt.Errorf("wrong dns upstream per domain specification: %s", upstream)
<mask> defaultUpstream = false <mask> // split domains and upstream string <mask> domainsAndUpstream := strings.Split(strings.TrimPrefix(upstream, "[/"), "/]") <mask> if len(domainsAndUpstream) != 2 { <mask> return "", defaultUpstream, fmt.Errorf("wrong DNS upstream per domain specification: %s", upstre...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("%s is not a valid port: %w", port, err)
<mask> } <mask> <mask> _, err = strconv.ParseInt(port, 0, 64) <mask> if err != nil { <mask> return fmt.Errorf("%s is not a valid port: %s", port, err) <mask> } <mask> <mask> return nil <mask> } <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-home f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("wrong upstream format: %w", err)
<mask> <mask> // separate upstream from domains list <mask> input, defaultUpstream, err := separateUpstream(input) <mask> if err != nil { <mask> return fmt.Errorf("wrong upstream format: %s", err) <mask> } <mask> <mask> // No need to check this DNS server <mask> if !defaultUpstream { <mask> return...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("wrong upstream format: %w", err)
<mask> return nil <mask> } <mask> <mask> if _, err := validateUpstream(input); err != nil { <mask> return fmt.Errorf("wrong upstream format: %s", err) <mask> } <mask> <mask> if len(bootstrap) == 0 { <mask> bootstrap = defaultBootstrap <mask> } </s> Pull request:* all: remove github.com/joomcode/...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
log.Debug("checking if dns %s works...", input)
<mask> if len(bootstrap) == 0 { <mask> bootstrap = defaultBootstrap <mask> } <mask> <mask> log.Debug("Checking if DNS %s works...", input) <mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: DefaultTimeout}) <mask> if err != nil { <mask> return fmt.Errorf...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("failed to choose upstream for %s: %w", input, err)
<mask> <mask> log.Debug("Checking if DNS %s works...", input) <mask> u, err := upstream.AddressToUpstream(input, upstream.Options{Bootstrap: bootstrap, Timeout: DefaultTimeout}) <mask> if err != nil { <mask> return fmt.Errorf("failed to choose upstream for %s: %s", input, err) <mask> } <mask> <mask> re...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err)
<mask> {Name: "google-public-dns-a.google.com.", Qtype: dns.TypeA, Qclass: dns.ClassINET}, <mask> } <mask> reply, err := u.Exchange(&req) <mask> if err != nil { <mask> return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err) <mask> } <mask> if len(reply.Answer) != 1 { <mask> retur...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("dns server %s returned wrong answer", input)
<mask> if err != nil { <mask> return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err) <mask> } <mask> if len(reply.Answer) != 1 { <mask> return fmt.Errorf("DNS server %s returned wrong answer", input) <mask> } <mask> if t, ok := reply.Answer[0].(*dns.A); ok { <mask> if !net.IPv4(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A)
<mask> return fmt.Errorf("DNS server %s returned wrong answer", input) <mask> } <mask> if t, ok := reply.Answer[0].(*dns.A); ok { <mask> if !net.IPv4(8, 8, 8, 8).Equal(t.A) { <mask> return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A) <mask> } <mask> } <mask> <mask> log.Debug(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
log.Debug("dns %s works OK", input)
<mask> return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A) <mask> } <mask> } <mask> <mask> log.Debug("DNS %s works OK", input) <mask> return nil <mask> } <mask> <mask> // Control flow: <mask> // web </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
httpError(r, w, http.StatusInternalServerError, "dns server is not running")
<mask> return <mask> } <mask> <mask> if !s.IsRunning() { <mask> httpError(r, w, http.StatusInternalServerError, "DNS server is not running") <mask> return <mask> } <mask> <mask> s.ServeHTTP(w, r) <mask> } </s> Pull request:* all: remove github.com/joomcode/errorx dependency Merge in DNS/adguard-...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/dnsforward_http.go
"fmt"
<mask> package dnsforward <mask> <mask> import ( <mask> "strings" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> </s> Pull request:* all: remove github.com/joomcode/errorx dependency ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/filter.go
<mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/AdguardTeam/dnsproxy/proxy" <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/joomcode/errorx" <mask> "github.com/miekg/dns" <mask> ) <mask> <mask> func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/filter.go
return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err)
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".") <mask> res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts) <mask> if err != nil { <mask> // Return immediately if there's an error <mask> return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host) <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/filter.go
log.Tracef("Host %s is filtered, reason - %q, matched rule: %q", host, res.Reason, res.Rule)
<mask> // Return immediately if there's an error <mask> return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host) <mask> <mask> } else if res.IsFiltered { <mask> log.Tracef("Host %s is filtered, reason - '%s', matched rule: '%s'", host, res.Reason, res.Rule) <mask> d.Res = s.genDNSFi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/filter.go
log.Debug("IPSET: invalid value %q", it)
<mask> for _, it := range ipsetConfig { <mask> it = strings.TrimSpace(it) <mask> hostsAndNames := strings.Split(it, "/") <mask> if len(hostsAndNames) != 2 { <mask> log.Debug("IPSET: invalid value '%s'", it) <mask> continue <mask> } <mask> <mask> ipsetNames := strings.Split(hostsAndNames[1], "...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693
internal/dnsforward/ipset.go