OpenSourceRouting / quagga-snap / 4c699477d24

Commits

Stephen Hemminger authored and Paul Jakma committed 4c699477d24 17 Aug 2008

[zebra:linux] netlink: no need to change privs for receive

2008-06-17 Stephen Hemminger <stephen.hemminger@vyatta.com>

	* rt_netlink.c: (netlink_parse_info) Linux doesn't check privledges
	  on receive, so avoid the overhead of lowering and raising the
	  priviledges on each received message

Signed-off-by: Paul Jakma <paul@quagga.net>

zebra/rt_netlink.c

Modified

-278
+  int ret = 0;
-279
+  int error;
-280
-281
+  while (1)
-282
+    {
-283
+      char buf[4096];
-284
+      struct iovec iov = { buf, sizeof buf };
-285
+      struct sockaddr_nl snl;
-286
+      struct msghdr msg = { (void *) &snl, sizeof snl, &iov, 1, NULL, 0, 0 };
-287
+      struct nlmsghdr *h;
--
+      int save_errno;
--
--
+      if (zserv_privs.change (ZPRIVS_RAISE))
--
+        zlog (NULL, LOG_ERR, "Can't raise privileges");
-288
-289
+      status = recvmsg (nl->sock, &msg, 0);
--
+      save_errno = errno;
--
--
+      if (zserv_privs.change (ZPRIVS_LOWER))
--
+        zlog (NULL, LOG_ERR, "Can't lower privileges");
--
-290
+      if (status < 0)
-291
+        {
--
+          if (save_errno == EINTR)
-+
+          if (errno == EINTR)
-293
+            continue;
--
+          if (save_errno == EWOULDBLOCK || save_errno == EAGAIN)
-+
+          if (errno == EWOULDBLOCK || errno == EAGAIN)
-295
+            break;
-296
+          zlog (NULL, LOG_ERR, "%s recvmsg overrun: %s",
--
+	  	nl->name, safe_strerror(save_errno));
-+
+	  	nl->name, safe_strerror(errno));
-298
+          continue;
-299
+        }
-300
-301
+      if (status == 0)
-302
+        {
-303
+          zlog (NULL, LOG_ERR, "%s EOF", nl->name);
-304
+          return -1;
-305
+        }
-306
-307
+      if (msg.msg_namelen != sizeof snl)

quagga-snap

Commits

Jira Issues

Add shortcut