libnetlink cleanup0.9.38.12

2 files changed, 19 insertions, 52 deletions

diff --git a/RELNOTES b/RELNOTES
index 4591625f5..4b1125eb1 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -8,12 +8,13 @@ firejail (0.9.38.12) baseline; urgency=low
   * bugfix: --quiet option
   * bugfix: truncated output in snprintf
   * bugfix: fix handling of /dev/shm in whitelists
-  * enhancement: --output cleanup
   * enhancement: quiet support in profile files
+  * maintenance: --output cleanup
+  * manitenance: libnetlink cleanup
   * maintenance: updated terminal support in disable-common.inc
   * maintenance: updated copyright statement in all files
   * maintenance: testing suite update for Debian "stretch"
- -- netblue30 <netblue30@yahoo.com>  Wed, 4 Oct 2017 10:00:00 -0500
+ -- netblue30 <netblue30@yahoo.com>  Sat, 11 Nov 2017 10:00:00 -0500
 
 firejail (0.9.38.10) baseline; urgency=low
   * security: new fix for CVE-2017-5180 reported by Sebastian Krahmer last week
diff --git a/src/lib/libnetlink.c b/src/lib/libnetlink.c
index 07457eefe..d2975bd57 100644
--- a/src/lib/libnetlink.c
+++ b/src/lib/libnetlink.c
@@ -1,16 +1,16 @@
 /* file extracted from iproute2 software package
  *
  * Original source code:
- * 
+ *
  * Information:
  *     http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
- * 
+ *
  * Download:
  *     http://www.kernel.org/pub/linux/utils/net/iproute2/
- * 
+ *
  * Repository:
  *     git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
- * 
+ *
  * License: GPL v2
  *
  * Original copyright header
@@ -105,6 +105,7 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
         return rtnl_open_byproto(rth, subscriptions, NETLINK_ROUTE);
 }
 
+#if 0
 int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
         return rtnl_wilddump_req_filter(rth, family, type, RTEXT_FILTER_VF);
@@ -165,7 +166,7 @@ int rtnl_send_check(struct rtnl_handle *rth, const void *buf, int len)
                         struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
                         if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
                                 fprintf(stderr, "ERROR truncated\n");
-                        else 
+                        else
                                 errno = -err->error;
                         return -1;
                 }
@@ -303,6 +304,7 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
 
         return rtnl_dump_filter_l(rth, a);
 }
+#endif
 
 int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
               unsigned groups, struct nlmsghdr *answer)
@@ -422,6 +424,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
         }
 }
 
+#if 0
 int rtnl_listen(struct rtnl_handle *rtnl,
                 rtnl_filter_t handler,
                 void *jarg)
@@ -580,7 +583,7 @@ int addattrstrz(struct nlmsghdr *n, int maxlen, int type, const char *str)
 {
         return addattr_l(n, maxlen, type, str, strlen(str)+1);
 }
-
+#endif
 
 
 int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
@@ -597,7 +600,7 @@ if (type == IFLA_LINK) {
         for (i = 0; i < alen; i++)
                 printf("%02x, ", *((unsigned char *)data + i));
         printf("\n");
-}       
+}
 else if (type == IFLA_IFNAME) {
         printf("IFLA_IFNAME\n");
         printf("\tdata - #%s#\n", data);
@@ -612,8 +615,8 @@ else if (type == IFLA_ADDRESS) {
         printf("\n");
 }
 else if (type == IFLA_BROADCAST) printf("IFLA_BROADCAST or IFLA_INFO_DATA\n");
-        
-printf("\tdata length: %d\n", alen);    
+
+printf("\tdata length: %d\n", alen);
 #endif
 
         int len = RTA_LENGTH(alen);
@@ -632,46 +635,8 @@ printf("\tdata length: %d\n", alen);
         return 0;
 }
 
-#if 0
-int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
-              int alen)
-{
-printf("%s: adding type %d, length %d ", __FUNCTION__, type, alen);
-if (type == IFLA_INFO_KIND) {
-if (alen)
-        printf("(IFLA_INFO_KIND %s)\n", (char *)data);  
-else
-printf("(VETH_INFO_PEER)\n");
-}
-else if (type == IFLA_IFNAME) {
-printf("(IFLA_IFNAME %s)\n", (char *) data);
-}
-else if (type == IFLA_NET_NS_PID) {
-printf("(IFLA_NET_NS_PID %u)\n", *((unsigned *) data));
-}
-else if (type == IFLA_LINKINFO)
-printf("(IFLA_LINKINFO)\n");
-else if (type == IFLA_INFO_DATA)
-printf("(IFLA_INFO_DATA)\n");
-else
-        printf("\n");
-
-        int len = RTA_LENGTH(alen);
-        struct rtattr *rta;
-
-        if (NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) {
-                fprintf(stderr, "addattr_l ERROR: message exceeded bound of %d\n",maxlen);
-                return -1;
-        }
-        rta = NLMSG_TAIL(n);
-        rta->rta_type = type;
-        rta->rta_len = len;
-        memcpy(RTA_DATA(rta), data, alen);
-        n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
-        return 0;
-}
-#endif
 
+#if 0
 int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
 {
         if ((int)(NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len)) > maxlen) {
@@ -723,7 +688,7 @@ int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
         int len = RTA_LENGTH(4);
         struct rtattr *subrta;
 
-        if (RTA_ALIGN(rta->rta_len) + len > maxlen) {
+        if ((int) (RTA_ALIGN(rta->rta_len) + len) > maxlen) {
                 fprintf(stderr,"rta_addattr32: Error! max allowed bound %d exceeded\n",maxlen);
                 return -1;
         }
@@ -741,7 +706,7 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
         struct rtattr *subrta;
         int len = RTA_LENGTH(alen);
 
-        if (RTA_ALIGN(rta->rta_len) + RTA_ALIGN(len) > maxlen) {
+        if ((int) (RTA_ALIGN(rta->rta_len) + RTA_ALIGN(len)) > maxlen) {
                 fprintf(stderr,"rta_addattr_l: Error! max allowed bound %d exceeded\n",maxlen);
                 return -1;
         }
@@ -802,3 +767,4 @@ int __parse_rtattr_nested_compat(struct rtattr *tb[], int max, struct rtattr *rt
         memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
         return 0;
 }
+#endif