Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/libiproute/libnetlink.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/libiproute/libnetlink.c (modified) (16 diffs)

branches/2.2.5/mindi-busybox/networking/libiproute/libnetlink.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /*
  * libnetlink.c RTnetlink service routines.
@@ -11 +12 @@
  */
 
+#include <sys/socket.h>
+#include <sys/uio.h>
+
 #include "libbb.h"
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <sys/uio.h>
-
 #include "libnetlink.h"
 
@@ -28 +23 @@
 }
 
-int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
+int xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/)
 {
     socklen_t addr_len;
@@ -34 +29 @@
     memset(rth, 0, sizeof(rth));
 
-    rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-    if (rth->fd < 0) {
-        bb_perror_msg("Cannot open netlink socket");
-        return -1;
-    }
+    rth->fd = xsocket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
 
     memset(&rth->local, 0, sizeof(rth->local));
     rth->local.nl_family = AF_NETLINK;
-    rth->local.nl_groups = subscriptions;
-
-    if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
-        bb_perror_msg("Cannot bind netlink socket");
-        return -1;
-    }
+    /*rth->local.nl_groups = subscriptions;*/
+
+    xbind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local));
     addr_len = sizeof(rth->local);
-    if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
-        bb_perror_msg("Cannot getsockname");
-        return -1;
-    }
-    if (addr_len != sizeof(rth->local)) {
-        bb_error_msg("Wrong address length %d", addr_len);
-        return -1;
-    }
-    if (rth->local.nl_family != AF_NETLINK) {
-        bb_error_msg("Wrong address family %d", rth->local.nl_family);
-        return -1;
-    }
+    if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0)
+        bb_perror_msg_and_die("cannot getsockname");
+    if (addr_len != sizeof(rth->local))
+        bb_error_msg_and_die("wrong address length %d", addr_len);
+    if (rth->local.nl_family != AF_NETLINK)
+        bb_error_msg_and_die("wrong address family %d", rth->local.nl_family);
     rth->seq = time(NULL);
     return 0;
 }
 
-int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
+int xrtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
     struct {
@@ -83 +65 @@
     req.g.rtgen_family = family;
 
-    return sendto(rth->fd, (void*)&req, sizeof(req), 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
+    return xsendto(rth->fd, (void*)&req, sizeof(req),
+                 (struct sockaddr*)&nladdr, sizeof(nladdr));
 }
 
@@ -93 +76 @@
     nladdr.nl_family = AF_NETLINK;
 
-    return sendto(rth->fd, buf, len, 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
+    return xsendto(rth->fd, buf, len, (struct sockaddr*)&nladdr, sizeof(nladdr));
 }
 
@@ -120 +103 @@
 }
 
-int rtnl_dump_filter(struct rtnl_handle *rth,
-             int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
-             void *arg1,
-             int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
-             void *arg2)
-{
-    char    buf[8192];
+static int rtnl_dump_filter(struct rtnl_handle *rth,
+        int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        void *arg1/*,
+        int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        void *arg2*/)
+{
+    char buf[8192];
     struct sockaddr_nl nladdr;
     struct iovec iov = { buf, sizeof(buf) };
@@ -164 +147 @@
                 h->nlmsg_pid != rth->local.nl_pid ||
                 h->nlmsg_seq != rth->dump) {
-                if (junk) {
+/*              if (junk) {
                     err = junk(&nladdr, h, arg2);
-                    if (err < 0) {
+                    if (err < 0)
                         return err;
-                    }
-                }
+                } */
                 goto skip_it;
             }
@@ -187 +169 @@
             }
             err = filter(&nladdr, h, arg1);
-            if (err < 0) {
+            if (err < 0)
                 return err;
-            }
 
 skip_it:
@@ -195 +176 @@
         }
         if (msg.msg_flags & MSG_TRUNC) {
-            bb_error_msg("Message truncated");
+            bb_error_msg("message truncated");
             continue;
         }
         if (status) {
-            bb_error_msg_and_die("!!!Remnant of size %d", status);
-        }
-    }
+            bb_error_msg_and_die("remnant of size %d!", status);
+        }
+    }
+}
+
+int xrtnl_dump_filter(struct rtnl_handle *rth,
+        int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
+        void *arg1)
+{
+    int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
+    if (ret < 0)
+        bb_error_msg_and_die("dump terminated");
+    return ret;
 }
 
@@ -234 +225 @@
 
     if (status < 0) {
-        bb_perror_msg("Cannot talk to rtnetlink");
+        bb_perror_msg("cannot talk to rtnetlink");
         return -1;
     }
@@ -265 +256 @@
             if (l<0 || len>status) {
                 if (msg.msg_flags & MSG_TRUNC) {
-                    bb_error_msg("Truncated message");
+                    bb_error_msg("truncated message");
                     return -1;
                 }
-                bb_error_msg_and_die("!!!malformed message: len=%d", len);
+                bb_error_msg_and_die("malformed message: len=%d!", len);
             }
 
@@ -304 +295 @@
             }
 
-            bb_error_msg("Unexpected reply!!!");
+            bb_error_msg("unexpected reply!");
 
             status -= NLMSG_ALIGN(len);
@@ -310 +301 @@
         }
         if (msg.msg_flags & MSG_TRUNC) {
-            bb_error_msg("Message truncated");
+            bb_error_msg("message truncated");
             continue;
         }
         if (status) {
-            bb_error_msg_and_die("!!!Remnant of size %d", status);
-        }
-    }
-}
-
-int addattr32(struct nlmsghdr *n, int maxlen, int type, __u32 data)
+            bb_error_msg_and_die("remnant of size %d!", status);
+        }
+    }
+}
+
+int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
 {
     int len = RTA_LENGTH(4);
@@ -348 +339 @@
 }
 
-int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
+int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
 {
     int len = RTA_LENGTH(4);
@@ -390 +381 @@
     }
     if (len) {
-        bb_error_msg("!!!Deficit %d, rta_len=%d", len, rta->rta_len);
-    }
-    return 0;
-}
+        bb_error_msg("deficit %d, rta_len=%d!", len, rta->rta_len);
+    }
+    return 0;
+}