summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMADA Hideki <yamada.hideki@po.ntts.co.jp>2013-05-21 13:44:09 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-05-23 07:46:08 +0900
commit1ece4717b905e666466fafa634dda10a7aa6ba65 (patch)
tree97f36ac70970ab3eeeabded479fc95852849a3b5
parent524f79ebb2516a830a04fc33f54e768adb353fc3 (diff)
lib/packet/vrrp: fix is_valid()
Signed-off-by: YAMADA Hideki <yamada.hideki@po.ntts.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/lib/packet/vrrp.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/ryu/lib/packet/vrrp.py b/ryu/lib/packet/vrrp.py
index 7c50fed8..8b6140a7 100644
--- a/ryu/lib/packet/vrrp.py
+++ b/ryu/lib/packet/vrrp.py
@@ -395,7 +395,7 @@ class vrrp(packet_base.PacketBase):
def is_valid(self):
cls = self._VRRP_VERSIONS.get(self.version, None)
- if None:
+ if cls is None:
return False
return cls.is_valid(self)
@@ -499,8 +499,8 @@ class vrrpv2(vrrp):
return (self.version == VRRP_VERSION_V2 and
self.type == VRRP_TYPE_ADVERTISEMENT and
VRRP_VRID_MIN <= self.vrid and self.vrid <= VRRP_VRID_MAX and
- VRRP_PRIORITY_MIN <= self.vrid and
- self.vrid <= VRRP_PRIORITY_MAX and
+ VRRP_PRIORITY_MIN <= self.priority and
+ self.priority <= VRRP_PRIORITY_MAX and
self.auth_type == VRRP_AUTH_NO_AUTH and
VRRP_V2_MAX_ADVER_INT_MIN <= self.max_adver_int and
self.max_adver_int <= VRRP_V2_MAX_ADVER_INT_MAX and
@@ -616,8 +616,8 @@ class vrrpv3(vrrp):
return (self.version == VRRP_VERSION_V3 and
self.type == VRRP_TYPE_ADVERTISEMENT and
VRRP_VRID_MIN <= self.vrid and self.vrid <= VRRP_VRID_MAX and
- VRRP_PRIORITY_MIN <= self.vrid and
- self.vrid <= VRRP_PRIORITY_MAX and
+ VRRP_PRIORITY_MIN <= self.priority and
+ self.priority <= VRRP_PRIORITY_MAX and
VRRP_V3_MAX_ADVER_INT_MIN <= self.max_adver_int and
self.max_adver_int <= VRRP_V3_MAX_ADVER_INT_MAX and
self.count_ip == len(self.ip_addresses))