kernel-netlink: Use larger buffer for event messages

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
index 70edef6ad188c729c6578b8fb849b6d70e6e1574..33e982d22fdbf4fb611fdcc6b523942725566679 100644 (file)
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
@@ -1131,7 +1131,7 @@ static void process_mapping(private_kernel_netlink_ipsec_t *this,
 static bool receive_events(private_kernel_netlink_ipsec_t *this, int fd,
                                                   watcher_event_t event)
 {
-       char response[1024];
+       char response[netlink_get_buflen()];
        struct nlmsghdr *hdr = (struct nlmsghdr*)response;
        struct sockaddr_nl addr;
        socklen_t addr_len = sizeof(addr);

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
index b6eb54370663d81cb77e4659b6102d1ba7d72336..3ef3dc712fa04f1667e3796705a9e30730203e20 100644 (file)
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
@@ -1504,7 +1504,7 @@ static void process_rule(private_kernel_netlink_net_t *this, struct nlmsghdr *hd
 static bool receive_events(private_kernel_netlink_net_t *this, int fd,
                                                   watcher_event_t event)
 {
-       char response[1536];
+       char response[netlink_get_buflen()];
        struct nlmsghdr *hdr = (struct nlmsghdr*)response;
        struct sockaddr_nl addr;
        socklen_t addr_len = sizeof(addr);

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
index 2327d75915f0b327161031310d35ad33fb3f6a90..84d78eca2497d48741afd68344003bf5ed1a7231 100644 (file)
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c
@@ -587,8 +587,31 @@ METHOD(netlink_socket_t, destroy, void,
        free(this);
 }
 
-/**
- * Described in header.
+/*
+ * Described in header
+ */
+u_int netlink_get_buflen()
+{
+       u_int buflen;
+
+       buflen = lib->settings->get_int(lib->settings,
+                                                               "%s.plugins.kernel-netlink.buflen", 0, lib->ns);
+       if (!buflen)
+       {
+               long pagesize = sysconf(_SC_PAGESIZE);
+
+               if (pagesize == -1)
+               {
+                       pagesize = 4096;
+               }
+               /* base this on NLMSG_GOODSIZE */
+               buflen = min(pagesize, 8192);
+       }
+       return buflen;
+}
+
+/*
+ * Described in header
  */
 netlink_socket_t *netlink_socket_create(int protocol, enum_name_t *names,
                                                                                bool parallel)
@@ -612,8 +635,7 @@ netlink_socket_t *netlink_socket_create(int protocol, enum_name_t *names,
                .entries = hashtable_create(hashtable_hash_ptr, hashtable_equals_ptr, 4),
                .protocol = protocol,
                .names = names,
-               .buflen = lib->settings->get_int(lib->settings,
-                                                       "%s.plugins.kernel-netlink.buflen", 0, lib->ns),
+               .buflen = netlink_get_buflen(),
                .timeout = lib->settings->get_int(lib->settings,
                                                        "%s.plugins.kernel-netlink.timeout", 0, lib->ns),
                .retries = lib->settings->get_int(lib->settings,
@@ -624,16 +646,6 @@ netlink_socket_t *netlink_socket_create(int protocol, enum_name_t *names,
                .parallel = parallel,
        );
 
-       if (!this->buflen)
-       {
-               long pagesize = sysconf(_SC_PAGESIZE);
-               if (pagesize == -1)
-               {
-                       pagesize = 4096;
-               }
-               /* base this on NLMSG_GOODSIZE */
-               this->buflen = min(pagesize, 8192);
-       }
        if (this->socket == -1)
        {
                DBG1(DBG_KNL, "unable to create netlink socket: %s (%d)",

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
index 7056e6ccc78f7e829cf0ebf62596dc717452131c..82dce4c5c6f221ce2d8a995b475c6c698238fc95 100644 (file)
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.h
@@ -101,4 +101,11 @@ void netlink_add_attribute(struct nlmsghdr *hdr, int rta_type, chunk_t data,
  */
 void* netlink_reserve(struct nlmsghdr *hdr, int buflen, int type, int len);
 
+/**
+ * Determine buffer size for received messages (e.g. events).
+ *
+ * @return                             buffer size
+ */
+u_int netlink_get_buflen();
+
 #endif /* KERNEL_NETLINK_SHARED_H_ */