denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-netlink: Clean up socket initialization, handle 0 as valid socket fd

Browse Source
This commit is contained in:
Martin Willi
2014-09-24 11:19:59 +02:00
parent 4c3aca273f
commit 5957e76b38
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c
+6 -9
View File
@@ -219,7 +219,7 @@ METHOD(netlink_socket_t, netlink_send_ack, status_t,
METHOD(netlink_socket_t, destroy, void, METHOD(netlink_socket_t, destroy, void,
private_netlink_socket_t *this) private_netlink_socket_t *this)
{ {
if (this->socket > 0) if (this->socket != -1)
{ {
close(this->socket); close(this->socket);
} }
@@ -233,7 +233,9 @@ METHOD(netlink_socket_t, destroy, void,
netlink_socket_t *netlink_socket_create(int protocol) netlink_socket_t *netlink_socket_create(int protocol)
{ {
private_netlink_socket_t *this; private_netlink_socket_t *this;
struct sockaddr_nl addr; struct sockaddr_nl addr = {
.nl_family = AF_NETLINK,
};
INIT(this, INIT(this,
.public = { .public = {
@@ -243,21 +245,16 @@ netlink_socket_t *netlink_socket_create(int protocol)
}, },
.seq = 200, .seq = 200,
.mutex = mutex_create(MUTEX_TYPE_DEFAULT), .mutex = mutex_create(MUTEX_TYPE_DEFAULT),
.socket = socket(AF_NETLINK, SOCK_RAW, protocol),
.protocol = protocol, .protocol = protocol,
); );
memset(&addr, 0, sizeof(addr)); if (this->socket == -1)
addr.nl_family = AF_NETLINK;
this->socket = socket(AF_NETLINK, SOCK_RAW, protocol);
if (this->socket < 0)
{ {
DBG1(DBG_KNL, "unable to create netlink socket"); DBG1(DBG_KNL, "unable to create netlink socket");
destroy(this); destroy(this);
return NULL; return NULL;
} }
addr.nl_groups = 0;
if (bind(this->socket, (struct sockaddr*)&addr, sizeof(addr))) if (bind(this->socket, (struct sockaddr*)&addr, sizeof(addr)))
{ {
DBG1(DBG_KNL, "unable to bind netlink socket"); DBG1(DBG_KNL, "unable to bind netlink socket");