mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Fix error msg strings from rtnetlink module

Browse Source 
Ticket:
Reviewed By:
Testing Done:
This commit is contained in:
Roopa Prabhu
2014-12-26 09:37:42 -08:00
parent 7e2e64fbe9
commit 1f87118e33
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ifupdown/netlink.py
View File

@@ -117,8 +117,7 @@ class NetlinkError(Exception):
def __init__(self, message): def __init__(self, message):
Exception.__init__(self, message) Exception.__init__(self, message)
#logger.error(message) #print(message)
print(message)
class Netlink(socket.socket): class Netlink(socket.socket):
@@ -182,7 +181,7 @@ class Netlink(socket.socket):
except socket.error as (errno, string): except socket.error as (errno, string):
if errno in [EINTR, EAGAIN]: if errno in [EINTR, EAGAIN]:
return False return False
raise NetlinkError("process: socket err[%d]: %s" % \ raise NetlinkError("netlink: socket err[%d]: %s" % \
(errno, string)) (errno, string))
nlh = Nlmsghdr.from_buffer(self.recvbuf) nlh = Nlmsghdr.from_buffer(self.recvbuf)
@@ -194,7 +193,7 @@ class Netlink(socket.socket):
l = nlh.nlmsg_len - sizeof(Nlmsghdr) l = nlh.nlmsg_len - sizeof(Nlmsghdr)
if l < 0 or nlh.nlmsg_len > recv: if l < 0 or nlh.nlmsg_len > recv:
raise NetlinkError("process: malformed msg: len %d" % \ raise NetlinkError("netlink: malformed msg: len %d" % \
nlh.nlmsg_len) nlh.nlmsg_len)
if tokens: if tokens:
@@ -210,7 +209,7 @@ class Netlink(socket.socket):
err = Nlmsgerr.from_address(NLMSG_DATA(nlh)) err = Nlmsgerr.from_address(NLMSG_DATA(nlh))
if err.error == 0: if err.error == 0:
return False return False
raise NetlinkError("process: %s" % strerror(abs(err.error))) raise NetlinkError("netlink: %s" % strerror(abs(err.error)))
if self._nl_cb: if self._nl_cb:
self._nl_cb(nlh) self._nl_cb(nlh)
@@ -220,7 +219,7 @@ class Netlink(socket.socket):
remnant = recv - NLMSG_ALIGN(nlh.nlmsg_len) > 0 remnant = recv - NLMSG_ALIGN(nlh.nlmsg_len) > 0
if remnant: if remnant:
raise NetlinkError("process: remnant of size %d" % \ raise NetlinkError("netlink: remnant of size %d" % \
remnant) remnant)
return True return True