mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

unpack addresses coming downstream rather than assuming they have been created as IP addresses

Browse Source
This commit is contained in:
Joel Bender 2015-10-20 16:54:52 -04:00
parent 3e0d9769ad
commit 412f1da368
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py25/bacpypes/bvllservice.py
View File

@ -14,7 +14,8 @@ from .task import OneShotTask, RecurringTask
from .comm import Client, Server, bind, \
ServiceAccessPoint, ApplicationServiceElement
from .pdu import Address, LocalBroadcast, LocalStation, PDU
from .pdu import Address, LocalBroadcast, LocalStation, PDU, \
unpack_ip_addr
from .bvll import BVLPDU, DeleteForeignDeviceTableEntry, \
DistributeBroadcastToNetwork, FDTEntry, ForwardedNPDU, \
OriginalBroadcastNPDU, OriginalUnicastNPDU, \
@ -108,7 +109,7 @@ class UDPMultiplexer:
dest = self.addrBroadcastTuple
if _debug: UDPMultiplexer._debug(" - requesting local broadcast: %r", dest)
elif pdu.pduDestination.addrType == Address.localStationAddr:
dest = pdu.pduDestination.addrTuple
dest = unpack_ip_addr(pdu.pduDestination.addrAddr)
if _debug: UDPMultiplexer._debug(" - requesting local station: %r", dest)
else:
raise RuntimeError("invalid destination address type")

5
py27/bacpypes/bvllservice.py
View File

@ -14,7 +14,8 @@ from .task import OneShotTask, RecurringTask
from .comm import Client, Server, bind, \
ServiceAccessPoint, ApplicationServiceElement
from .pdu import Address, LocalBroadcast, LocalStation, PDU
from .pdu import Address, LocalBroadcast, LocalStation, PDU, \
unpack_ip_addr
from .bvll import BVLPDU, DeleteForeignDeviceTableEntry, \
DistributeBroadcastToNetwork, FDTEntry, ForwardedNPDU, \
OriginalBroadcastNPDU, OriginalUnicastNPDU, \
@ -109,7 +110,7 @@ class UDPMultiplexer:
dest = self.addrBroadcastTuple
if _debug: UDPMultiplexer._debug(" - requesting local broadcast: %r", dest)
elif pdu.pduDestination.addrType == Address.localStationAddr:
dest = pdu.pduDestination.addrTuple
dest = unpack_ip_addr(pdu.pduDestination.addrAddr)
if _debug: UDPMultiplexer._debug(" - requesting local station: %r", dest)
else:
raise RuntimeError("invalid destination address type")

3
py34/bacpypes/bvllservice.py
View File

@ -14,7 +14,8 @@ from .task import OneShotTask, RecurringTask
from .comm import Client, Server, bind, \
ServiceAccessPoint, ApplicationServiceElement
from .pdu import Address, LocalBroadcast, LocalStation, PDU
from .pdu import Address, LocalBroadcast, LocalStation, PDU, \
unpack_ip_addr
from .bvll import BVLPDU, DeleteForeignDeviceTableEntry, \
DistributeBroadcastToNetwork, FDTEntry, ForwardedNPDU, \
OriginalBroadcastNPDU, OriginalUnicastNPDU, \