summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2021-02-25 02:46:53 -0800
committerRobert Yang <liezhi.yang@windriver.com>2021-02-25 03:21:42 -0800
commit2fc3ec398db0998427e1d0cc351dfcc91d59a3f0 (patch)
treef2d78a5b65a63f39e872a20f00c368dc4f050ac8
parent93ad1ab49be03dd082a98f80464cfee9d98a3a33 (diff)
downloadopenembedded-core-contrib-rbt/socat.tar.gz
openembedded-core-contrib-rbt/socat.tar.bz2
openembedded-core-contrib-rbt/socat.zip
socat: Exit when the file associated with an FD is destroyedrbt/socat
In many scenarios the receipt of an EOF will coincide with the teardown of the file which the FD is associated with by the application on the other side of the file pipe. If a timeout (-t) is used socat continues to poll for new data (read) and send any new data (write) until the timeout. This can lead to input/output errors as the FD exists still but the file it was openned on is gone, and no check is done on writes. To get around this a check is added after the EOF is received that the file still exists, and if not we proceed to exit immediately. This will avoid i/o errors and will also cause a quicker return as we don't have to wait for the timeout. The original author is Mark Asselstine <asselsm@gmail.com>. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-connectivity/socat/files/Exit-when-the-file-associated-with-an-FD-is-destroye.patch62
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.4.1.bb1
2 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/socat/files/Exit-when-the-file-associated-with-an-FD-is-destroye.patch b/meta/recipes-connectivity/socat/files/Exit-when-the-file-associated-with-an-FD-is-destroye.patch
new file mode 100644
index 0000000000..b5ac62f616
--- /dev/null
+++ b/meta/recipes-connectivity/socat/files/Exit-when-the-file-associated-with-an-FD-is-destroye.patch
@@ -0,0 +1,62 @@
+From 956d4b00a101f61b4cfaafa0856b646646536492 Mon Sep 17 00:00:00 2001
+From: Mark Asselstine <asselsm@gmail.com>
+Date: Mon, 7 Dec 2015 21:27:35 -0500
+Subject: [PATCH] Exit when the file associated with an FD is destroyed
+
+In many scenarios the receipt of an EOF will coincide with the
+teardown of the file which the FD is associated with by the
+application on the other side of the file pipe. If a timeout (-t) is
+used socat continues to poll for new data (read) and send any new data
+(write) until the timeout. This can lead to input/output errors as the
+FD exists still but the file it was openned on is gone, and no check
+is done on writes.
+
+To get around this a check is added after the EOF is received that the
+file still exists, and if not we proceed to exit immediately. This
+will avoid i/o errors and will also cause a quicker return as we don't
+have to wait for the timeout.
+
+Signed-off-by: Mark Asselstine <asselsm@gmail.com>
+
+Upstream-Status: Submitted [socat@dest-unreach.org]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+---
+ socat.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/socat.c b/socat.c
+index b619a3d..de4a14b 100644
+--- a/socat.c
++++ b/socat.c
+@@ -773,6 +773,7 @@ int _socat(void) {
+ int polling = 0; /* handling ignoreeof */
+ int wasaction = 1; /* last poll was active, do NOT sleep before next */
+ struct timeval total_timeout; /* the actual total timeout timer */
++ struct stat file_stat;
+
+ #if WITH_FILAN
+ if (socat_opts.debug) {
+@@ -1123,6 +1124,10 @@ int _socat(void) {
+ xioshutdown(sock2, SHUT_WR);
+ XIO_RDSTREAM(sock1)->eof = 3;
+ XIO_RDSTREAM(sock1)->ignoreeof = false;
++ if (fstat(XIO_GETRDFD(sock1), &file_stat) == -1 || file_stat.st_nlink == 0) {
++ Notice1("socket 1 (fd %d) is gone", XIO_GETRDFD(sock1));
++ break;
++ }
+ }
+ } else if (polling && XIO_RDSTREAM(sock1)->ignoreeof) {
+ polling = 0;
+@@ -1146,6 +1151,10 @@ int _socat(void) {
+ xioshutdown(sock1, SHUT_WR);
+ XIO_RDSTREAM(sock2)->eof = 3;
+ XIO_RDSTREAM(sock2)->ignoreeof = false;
++ if (fstat(XIO_GETRDFD(sock2), &file_stat) == -1 || file_stat.st_nlink == 0) {
++ Notice1("socket 2 (fd %d) is gone", XIO_GETRDFD(sock2));
++ break;
++ }
+ }
+ } else if (polling && XIO_RDSTREAM(sock2)->ignoreeof) {
+ polling = 0;
diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.1.bb b/meta/recipes-connectivity/socat/socat_1.7.4.1.bb
index 5a13af91bc..82b66aed92 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.4.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.4.1.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
+ file://Exit-when-the-file-associated-with-an-FD-is-destroye.patch \
"
SRC_URI[md5sum] = "36cad050ecf4981ab044c3fbd75c643f"