diff options
| author | Satoshi Fujimoto <satoshi.fujimoto7@gmail.com> | 2017-08-21 16:50:55 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2017-08-29 22:49:53 +0900 |
| commit | 98a838e487af16004bbb582ef35d4eb52433d283 (patch) | |
| tree | 35895f61b8a873fa76f7f345fe73c36f982f4ae9 | |
| parent | f85ae784652367c4a7e8b212644af105ae955763 (diff) | |
packet/bmp: Correctly parse peer address with IPv4
Currently, Ryu expects that the IPv4 peer address format is
"4 bytes with IPv4 address, followed by 12 bytes padding".
However RFC 7854 says the format is
"12 bytes padding, followed by 4 bytes with IPv4 address".
This patch fixes it to correctly parse/serialize peer address.
Reported-by: Henk Smit <hhwsmit@xs4all.nl>
Signed-off-by: Satoshi Fujimoto <satoshi.fujimoto7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | ryu/lib/packet/bmp.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ryu/lib/packet/bmp.py b/ryu/lib/packet/bmp.py index 9d1cda3b..bc49c577 100644 --- a/ryu/lib/packet/bmp.py +++ b/ryu/lib/packet/bmp.py @@ -208,7 +208,7 @@ class BMPPeerMessage(BMPMessage): if peer_flags & (1 << 7): peer_address = addrconv.ipv6.bin_to_text(peer_address) else: - peer_address = addrconv.ipv4.bin_to_text(peer_address[:4]) + peer_address = addrconv.ipv4.bin_to_text(peer_address[-4:]) peer_bgp_id = addrconv.ipv4.bin_to_text(peer_bgp_id) @@ -234,7 +234,8 @@ class BMPPeerMessage(BMPMessage): flags |= (1 << 7) peer_address = addrconv.ipv6.text_to_bin(self.peer_address) else: - peer_address = addrconv.ipv4.text_to_bin(self.peer_address) + peer_address = struct.pack( + '!12x4s', addrconv.ipv4.text_to_bin(self.peer_address)) peer_bgp_id = addrconv.ipv4.text_to_bin(self.peer_bgp_id) @@ -562,7 +563,7 @@ class BMPPeerUpNotification(BMPPeerMessage): remote_port) = struct.unpack_from(cls._PACK_STR, six.binary_type(rest)) if '.' in kwargs['peer_address']: - local_address = addrconv.ipv4.bin_to_text(local_address[:4]) + local_address = addrconv.ipv4.bin_to_text(local_address[-4:]) elif ':' in kwargs['peer_address']: local_address = addrconv.ipv6.bin_to_text(local_address) else: @@ -586,7 +587,8 @@ class BMPPeerUpNotification(BMPPeerMessage): msg = super(BMPPeerUpNotification, self).serialize_tail() if '.' in self.local_address: - local_address = addrconv.ipv4.text_to_bin(self.local_address) + local_address = struct.pack( + '!12x4s', addrconv.ipv4.text_to_bin(self.local_address)) elif ':' in self.local_address: local_address = addrconv.ipv6.text_to_bin(self.local_address) else: |