Changeset 933:1bb5abec6545

Show
Ignore:
Timestamp:
10/01/08 18:47:49 (2 months ago)
Author:
Phil <phil@secdev.org>
Message:

Fixed namespace problem for LOOPBACK_NAME in utils6.py

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • scapy/arch/linux.py

    r932 r933  
    252252        else: 
    253253            devaddrs = filter(lambda x: x[2] == dev, lifaddr) 
    254             cset = scapy.utils6.construct_source_candidate_set(d, dp, devaddrs) 
     254            cset = scapy.utils6.construct_source_candidate_set(d, dp, devaddrs, LOOPBACK_NAME) 
    255255         
    256256        if len(cset) != 0: 

  • scapy/arch/unix.py

    r928 r933  
    182182        else: 
    183183            devaddrs = filter(lambda x: x[2] == dev, lifaddr) 
    184             cset = construct_source_candidate_set(d, dp, devaddrs) 
     184            cset = construct_source_candidate_set(d, dp, devaddrs, scapy.arch.LOOPBACK_NAME) 
    185185 
    186186        if len(cset) != 0: 

  • scapy/utils6.py

    r921 r933  
    1313 
    1414 
    15 def construct_source_candidate_set(addr, plen, laddr): 
     15def construct_source_candidate_set(addr, plen, laddr, loname): 
    1616    """ 
    1717    Given all addresses assigned to a specific interface ('laddr' parameter), 
    …… 
    3535    elif in6_ismaddr(addr): 
    3636        if in6_ismnladdr(addr): 
    37             cset = [('::1', 16, LOOPBACK_NAME)] 
     37            cset = [('::1', 16, loname)] 
    3838        elif in6_ismgladdr(addr): 
    3939            cset = filter(lambda x: x[1] == IPV6_ADDR_GLOBAL, laddr)