aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox/patches/610-syslog-remote-retry-connection.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-04-03 18:31:00 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-04-03 18:31:00 +0000
commit03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79 (patch)
tree138dd3337ab4da580067379a45074ea7e7cf7b11 /package/busybox/patches/610-syslog-remote-retry-connection.patch
parent1bda5f253040898869baba09a04008ef51009cca (diff)
downloadupstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.tar.gz
upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.tar.bz2
upstream-03e30ae13f122c6606d8c63dbf0e49a5f4a8dc79.zip
update busybox to 1.18.4, patch from Peter Wagner
SVN-Revision: 26455
Diffstat (limited to 'package/busybox/patches/610-syslog-remote-retry-connection.patch')
-rw-r--r--package/busybox/patches/610-syslog-remote-retry-connection.patch39
1 files changed, 0 insertions, 39 deletions
diff --git a/package/busybox/patches/610-syslog-remote-retry-connection.patch b/package/busybox/patches/610-syslog-remote-retry-connection.patch
deleted file mode 100644
index 94cd3ded04..0000000000
--- a/package/busybox/patches/610-syslog-remote-retry-connection.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/sysklogd/syslogd.c
-+++ b/sysklogd/syslogd.c
-@@ -555,6 +555,7 @@ static void do_syslogd(void)
- {
- int sock_fd;
- #if ENABLE_FEATURE_REMOTE_LOG
-+ int send_err = 0;
- llist_t *item;
- #endif
- #if ENABLE_FEATURE_SYSLOGD_DUP
-@@ -636,11 +637,23 @@ static void do_syslogd(void)
- if (rh->remoteFD == -1)
- continue;
- }
-- /* Send message to remote logger, ignore possible error */
-- /* TODO: on some errors, close and set G.remoteFD to -1
-- * so that DNS resolution and connect is retried? */
-- sendto(rh->remoteFD, recvbuf, sz+1, MSG_DONTWAIT,
-- &(rh->remoteAddr->u.sa), rh->remoteAddr->len);
-+ /* Send message to remote logger */
-+ if (sendto(rh->remoteFD, recvbuf, sz+1, MSG_DONTWAIT,
-+ &(rh->remoteAddr->u.sa), rh->remoteAddr->len) == -1)
-+ send_err = errno;
-+
-+ /* On some errors, close and set G.remoteFD to -1
-+ * so that DNS resolution and connect is retried */
-+ switch (send_err) {
-+ case ECONNRESET:
-+ case EDESTADDRREQ:
-+ case EISCONN:
-+ case ENOTCONN:
-+ case EPIPE:
-+ close(rh->remoteFD);
-+ rh->remoteFD = -1;
-+ break;
-+ }
- }
- #endif
- if (!ENABLE_FEATURE_REMOTE_LOG || (option_mask32 & OPT_locallog)) {