mirror of
https://github.com/ncoevoet/ChanTracker.git
synced 2025-04-26 21:11:13 -05:00
Fixing error in summary with .* ips
This commit is contained in:
parent
7fd423a7d8
commit
d0ff0d36c4
@ -78,12 +78,12 @@ def matchHostmask (pattern,n,resolve):
|
|||||||
if '/' in host:
|
if '/' in host:
|
||||||
if host.startswith('gateway/web/freenode/ip.'):
|
if host.startswith('gateway/web/freenode/ip.'):
|
||||||
n.ip = cache[n.prefix] = host.split('ip.')[1]
|
n.ip = cache[n.prefix] = host.split('ip.')[1]
|
||||||
if n.ip != None and '@' in pattern and mcidr.match(pattern.split('@')[1]):
|
if n.ip != None and '@' in pattern and n.ip.find('*') == -1 and mcidr.match(pattern.split('@')[1]):
|
||||||
address = IPAddress('%s' % n.ip)
|
address = IPAddress('%s' % n.ip)
|
||||||
network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
|
network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
|
||||||
if address in network:
|
if address in network:
|
||||||
return '%s!%s@%s' % (nick,ident,n.ip)
|
return '%s!%s@%s' % (nick,ident,n.ip)
|
||||||
elif n.ip != None and '@' in pattern and m6cidr.match(pattern.split('@')[1]):
|
elif n.ip != None and '@' in pattern and n.ip.find('*') == -1 and m6cidr.match(pattern.split('@')[1]):
|
||||||
address = IPAddress('%s' % n.ip)
|
address = IPAddress('%s' % n.ip)
|
||||||
network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
|
network = IPNetwork('%s' % pattern.split('@')[1], strict=False)
|
||||||
if address in network:
|
if address in network:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user