Changeset 6263

Timestamp:

09/28/10 22:37:00 (3 years ago)

Author:

Cyrus

Message:

libunl: Minor improvements

Location:

luci2/libunl

Files:

• genl.c (modified) (1 diff)
• io.c (modified) (2 diffs)
• unl/msg.h (modified) (2 diffs)

luci2/libunl/genl.c

@@ -50 +50 @@
         && (nla = unl_attr_find(grp, CTRL_ATTR_MCAST_GRP_ID))) {
             id = NLA_CAST_NUMBER(nla, uint32_t, 0);
+            break;
         }
     }

luci2/libunl/io.c

@@ -34 +34 @@
 
 int unl_open(struct unl *hndl, int proto, const struct sockaddr_nl *peer) {
-    const struct sockaddr_nl kernel = {.nl_family = AF_NETLINK};
-    if (!peer) peer = &kernel;
+    const struct sockaddr_nl sa_default = {.nl_family = AF_NETLINK};
+    if (!peer) peer = &sa_default;
 
     memset(hndl, 0, sizeof(*hndl));
@@ -41 +41 @@
     fcntl(hndl->fd, F_SETFD, fcntl(hndl->fd, F_GETFD) | FD_CLOEXEC);
 
-    struct sockaddr_nl local = { .nl_family = AF_NETLINK };
-
-    if (bind(hndl->fd, (struct sockaddr*)&local, sizeof(hndl->addr))
+    if (bind(hndl->fd, (struct sockaddr*)&sa_default, sizeof(hndl->addr))
     || connect(hndl->fd, (struct sockaddr*)peer, sizeof(*peer))) {
         close(hndl->fd);

luci2/libunl/unl/msg.h

@@ -338 +338 @@
 
 /**
- * Same as unl_attr_append_nested but appends a zero-terminated string
+ * Same as unl_attr_append_attr but appends a zero-terminated string
  */
 static inline void* unl_attr_append_string
@@ -345 +345 @@
 }
 
+
+/**
+ * Same as unl_attr_append_attr but appends a numerical value
+ *
+ * datatype: type to cast the value to before appending
+ */
 #define unl_attr_append_number(nla, type, datatype, value) \
     (*((datatype*)unl_attr_claim_attr(nla, type, sizeof(datatype))) = value)