Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow passing args up to GenericNetlinkSocket constructor #1113

Merged
merged 1 commit into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pyroute2/netlink/devlink/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,8 +492,8 @@ def fix_message(self, msg):


class DevlinkSocket(GenericNetlinkSocket):
def __init__(self):
GenericNetlinkSocket.__init__(self)
def __init__(self, *args, **kwargs):
GenericNetlinkSocket.__init__(self, *args, **kwargs)
self.marshal = MarshalDevlink()

def bind(self, groups=0, **kwarg):
Expand Down
4 changes: 2 additions & 2 deletions pyroute2/netlink/event/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ class EventSocket(GenericNetlinkSocket):
marshal_class = None
genl_family = None

def __init__(self):
GenericNetlinkSocket.__init__(self)
def __init__(self, *args, **kwargs):
GenericNetlinkSocket.__init__(self, *args, **kwargs)
self.marshal = self.marshal_class()
if kernel[0] <= 2:
self.bind(groups=0xFFFFFF)
Expand Down
4 changes: 2 additions & 2 deletions pyroute2/netlink/generic/l2tp.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ class l2tp_stats(nla):


class L2tp(GenericNetlinkSocket):
def __init__(self):
GenericNetlinkSocket.__init__(self)
def __init__(self, *args, **kwargs):
GenericNetlinkSocket.__init__(self, *args, **kwargs)
self.bind(L2TP_GENL_NAME, l2tpmsg)

def _do_request(self, msg, msg_flags=NLM_F_REQUEST | NLM_F_ACK):
Expand Down
4 changes: 2 additions & 2 deletions pyroute2/netlink/generic/wireguard.py
Original file line number Diff line number Diff line change
Expand Up @@ -263,8 +263,8 @@ def encode(self):


class WireGuard(GenericNetlinkSocket):
def __init__(self):
GenericNetlinkSocket.__init__(self)
def __init__(self, *args, **kwargs):
GenericNetlinkSocket.__init__(self, *args, **kwargs)
self.bind(WG_GENL_NAME, wgmsg)

def info(self, interface):
Expand Down
4 changes: 2 additions & 2 deletions pyroute2/netlink/nl80211/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1533,8 +1533,8 @@ def fix_message(self, msg):


class NL80211(GenericNetlinkSocket):
def __init__(self):
GenericNetlinkSocket.__init__(self)
def __init__(self, *args, **kwargs):
GenericNetlinkSocket.__init__(self, *args, **kwargs)
self.marshal = MarshalNl80211()

def bind(self, groups=0, **kwarg):
Expand Down
3 changes: 0 additions & 3 deletions pyroute2/netlink/taskstats/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ class aggr_tgid(aggr_id):


class TaskStats(GenericNetlinkSocket):
def __init__(self):
GenericNetlinkSocket.__init__(self)

def bind(self):
GenericNetlinkSocket.bind(self, 'TASKSTATS', taskstatsmsg)

Expand Down