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.

Sign up for GitHub

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

Adding the linux version dependency check to retrieve the netlink skb's ... #1

Merged
merged 1 commit into from
Oct 2, 2013
Merged

Adding the linux version dependency check to retrieve the netlink skb's ... #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions linux/vr_genetlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <linux/rtnetlink.h>
#include <linux/netlink.h>
#include <linux/genetlink.h>
#include <linux/version.h>

#include <net/genetlink.h>

Expand Down Expand Up @@ -88,6 +89,7 @@ netlink_trans_request(struct sk_buff *in_skb, struct genl_info *info)
struct nlattr *nla;
struct vr_message request, *response;
struct sk_buff *skb;
uint32_t netlink_id;

if (!aap || !(nla = aap[NL_ATTR_VR_MESSAGE_PROTOCOL]))
return -EINVAL;
Expand All @@ -110,8 +112,12 @@ netlink_trans_request(struct sk_buff *in_skb, struct genl_info *info)
len = response->vr_message_len;
len += GENL_HDRLEN + NLA_HDRLEN;
len = NLMSG_ALIGN(len);

rep = __nlmsg_put(skb, NETLINK_CB(in_skb).pid, nlh->nlmsg_seq,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,9,10))
netlink_id = NETLINK_CB(in_skb).pid;
#else
netlink_id = NETLINK_CB(in_skb).portid;
#endif
rep = __nlmsg_put(skb, netlink_id, nlh->nlmsg_seq,
nlh->nlmsg_type, len, multi_flag);
genlh = nlmsg_data(rep);
memcpy(genlh, info->genlhdr, sizeof(*genlh));
Expand All @@ -120,8 +126,7 @@ netlink_trans_request(struct sk_buff *in_skb, struct genl_info *info)
nla->nla_len = response->vr_message_len;
nla->nla_type = NL_ATTR_VR_MESSAGE_PROTOCOL;

netlink_unicast(in_skb->sk, skb,
NETLINK_CB(in_skb).pid, MSG_DONTWAIT);
netlink_unicast(in_skb->sk, skb, netlink_id, MSG_DONTWAIT);

response->vr_message_buf = NULL;
vr_message_free(response);
Expand All @@ -132,10 +137,8 @@ netlink_trans_request(struct sk_buff *in_skb, struct genl_info *info)
if (!skb)
return 0;

__nlmsg_put(skb, NETLINK_CB(in_skb).pid, nlh->nlmsg_seq,
NLMSG_DONE, 0, 0);
netlink_unicast(in_skb->sk, skb,
NETLINK_CB(in_skb).pid, MSG_DONTWAIT);
__nlmsg_put(skb, netlink_id, nlh->nlmsg_seq, NLMSG_DONE, 0, 0);
netlink_unicast(in_skb->sk, skb, netlink_id, MSG_DONTWAIT);
}


Expand Down