author | John Beck <John.Beck@Oracle.COM> |
Wed, 29 Jan 2014 13:44:48 -0800 | |
changeset 1673 | f4a923835a61 |
parent 1581 | 0d12ca3c361f |
child 1674 | 2f4f37df32e3 |
permissions | -rw-r--r-- |
1581
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
# This patch is to fix: |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
# 16134419 rsyslogd forwarding over TCP does not detect server restart |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
# which was fixed in upstream version 6.4.1; this patch is a minor variant |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
# on the upstream patch, adapted for 6.2.0 . This can go away once we |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
# upgrade to 6.4.1 or later. |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
--- rsyslog/runtime/netstrm.c.orig 2012-01-09 06:05:45.000000000 -0800 |
1673
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
7 |
+++ rsyslog/runtime/netstrm.c 2014-01-29 10:16:47.131765870 -0800 |
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
8 |
@@ -250,11 +250,13 @@ |
1581
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
/* check connection - slim wrapper for NSD driver function */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
-static void |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
+static rsRetVal |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
CheckConnection(netstrm_t *pThis) |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
{ |
1673
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
16 |
+ DEFiRet; |
1581
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
ISOBJ_TYPE_assert(pThis, netstrm); |
1673
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
18 |
- pThis->Drvr.CheckConnection(pThis->pDrvrData); |
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
19 |
+ iRet = pThis->Drvr.CheckConnection(pThis->pDrvrData); |
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
20 |
+ RETiRet; |
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
21 |
} |
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
22 |
|
f4a923835a61
18125113 mysql Python module needs updates for MySQL 5.5 and 64-bit
John Beck <John.Beck@Oracle.COM>
parents:
1581
diff
changeset
|
23 |
|
1581
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
--- rsyslog/runtime/netstrm.h~ 2011-12-01 02:26:19.000000000 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
+++ rsyslog/runtime/netstrm.h 2013-12-02 09:30:45.155766988 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
@@ -53,7 +53,7 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
rsRetVal (*SetDrvrMode)(netstrm_t *pThis, int iMode); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
rsRetVal (*SetDrvrAuthMode)(netstrm_t *pThis, uchar*); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
29 |
rsRetVal (*SetDrvrPermPeers)(netstrm_t *pThis, permittedPeers_t*); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
30 |
- void (*CheckConnection)(netstrm_t *pThis); /* This is a trick mostly for plain tcp syslog */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
31 |
+ rsRetVal (*CheckConnection)(netstrm_t *pThis); /* This is a trick mostly for plain tcp syslog */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
32 |
/* the GetSock() below is a hack to make imgssapi work. In the long term, |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
33 |
* we should migrate imgssapi to a stream driver, which will relieve us of |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
34 |
* this problem. Please note that nobody else should use GetSock(). Using it |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
35 |
@@ -72,9 +72,10 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
36 |
/* v4 */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
37 |
rsRetVal (*EnableKeepAlive)(netstrm_t *pThis); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
38 |
ENDinterface(netstrm) |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
39 |
-#define netstrmCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
40 |
+#define netstrmCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
41 |
/* interface version 3 added GetRemAddr() |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
42 |
* interface version 4 added EnableKeepAlive() -- rgerhards, 2009-06-02 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
43 |
+ * interface version 5 changed return of CheckConnection from void to rsRetVal -- alorbach, 2012-09-06 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
44 |
* */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
45 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
46 |
/* prototypes */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
47 |
--- rsyslog/runtime/nsd.h.orig 2012-01-09 06:05:45.000000000 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
48 |
+++ rsyslog/runtime/nsd.h 2013-12-02 09:21:26.146155301 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
49 |
@@ -65,7 +65,7 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
50 |
rsRetVal (*SetMode)(nsd_t *pThis, int mode); /* sets a driver specific mode - see driver doc for details */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
51 |
rsRetVal (*SetAuthMode)(nsd_t *pThis, uchar*); /* sets a driver specific mode - see driver doc for details */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
52 |
rsRetVal (*SetPermPeers)(nsd_t *pThis, permittedPeers_t*); /* sets driver permitted peers for auth needs */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
53 |
- void (*CheckConnection)(nsd_t *pThis); /* This is a trick mostly for plain tcp syslog */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
54 |
+ rsRetVal (*CheckConnection)(nsd_t *pThis); /* This is a trick mostly for plain tcp syslog */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
55 |
rsRetVal (*GetSock)(nsd_t *pThis, int *pSock); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
56 |
rsRetVal (*SetSock)(nsd_t *pThis, int sock); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
57 |
/* GetSock() and SetSock() return an error if the driver does not use plain |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
58 |
@@ -82,9 +82,10 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
59 |
/* v5 */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
60 |
rsRetVal (*EnableKeepAlive)(nsd_t *pThis); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
61 |
ENDinterface(nsd) |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
62 |
-#define nsdCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
63 |
+#define nsdCURR_IF_VERSION 6 /* increment whenever you change the interface structure! */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
64 |
/* interface version 4 added GetRemAddr() |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
65 |
* interface version 5 added EnableKeepAlive() -- rgerhards, 2009-06-02 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
66 |
+ * interface version 6 changed return of CheckConnection from void to rsRetVal -- alorbach, 2012-09-06 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
67 |
*/ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
68 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
69 |
/* interface for the select call */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
70 |
--- rsyslog/runtime/nsd_gtls.c~ 2012-01-09 06:05:45.000000000 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
71 |
+++ rsyslog/runtime/nsd_gtls.c 2013-12-02 10:14:55.324156585 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
72 |
@@ -1310,13 +1310,16 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
73 |
* This is a dummy here. For details, check function common in ptcp driver. |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
74 |
* rgerhards, 2008-06-09 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
75 |
*/ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
76 |
-static void |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
77 |
+static rsRetVal |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
78 |
CheckConnection(nsd_t __attribute__((unused)) *pNsd) |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
79 |
{ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
80 |
+ DEFiRet; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
81 |
nsd_gtls_t *pThis = (nsd_gtls_t*) pNsd; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
82 |
ISOBJ_TYPE_assert(pThis, nsd_gtls); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
83 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
84 |
- nsd_ptcp.CheckConnection(pThis->pTcp); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
85 |
+ CHKiRet(nsd_ptcp.CheckConnection(pThis->pTcp)); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
86 |
+finalize_it: |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
87 |
+ RETiRet; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
88 |
} |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
89 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
90 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
91 |
--- rsyslog/runtime/nsd_ptcp.c~ 2012-01-09 06:05:17.000000000 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
92 |
+++ rsyslog/runtime/nsd_ptcp.c 2013-12-02 10:13:48.561929979 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
93 |
@@ -726,9 +726,10 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
94 |
* http://blog.gerhards.net/2008/06/getting-bit-more-reliability-from-plain.html |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
95 |
* rgerhards, 2008-06-09 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
96 |
*/ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
97 |
-static void |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
98 |
+static rsRetVal |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
99 |
CheckConnection(nsd_t *pNsd) |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
100 |
{ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
101 |
+ DEFiRet; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
102 |
int rc; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
103 |
char msgbuf[1]; /* dummy */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
104 |
nsd_ptcp_t *pThis = (nsd_ptcp_t*) pNsd; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
105 |
@@ -741,7 +742,10 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
106 |
* need to close our side, too. |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
107 |
*/ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
108 |
sockClose(&pThis->sock); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
109 |
+ ABORT_FINALIZE(RS_RET_IO_ERROR); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
110 |
} |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
111 |
+finalize_it: |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
112 |
+ RETiRet; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
113 |
} |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
114 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
115 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
116 |
--- rsyslog/tools/omfwd.c.orig 2012-01-09 06:05:45.000000000 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
117 |
+++ rsyslog/tools/omfwd.c 2013-12-02 09:01:51.293926230 -0800 |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
118 |
@@ -310,7 +310,7 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
119 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
120 |
alreadySent = 0; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
121 |
dbgprintf("omfwd: XXXX: pData %p, pNetStrm %p\n", pData, pData->pNetstrm); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
122 |
- netstrm.CheckConnection(pData->pNetstrm); /* hack for plain tcp syslog - see ptcp driver for details */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
123 |
+ CHKiRet(netstrm.CheckConnection(pData->pNetstrm)); /* hack for plain tcp syslog - see ptcp driver for details */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
124 |
while(alreadySent != len) { |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
125 |
lenSend = len - alreadySent; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
126 |
CHKiRet(netstrm.Send(pData->pNetstrm, buf+alreadySent, &lenSend)); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
127 |
@@ -319,6 +319,12 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
128 |
} |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
129 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
130 |
finalize_it: |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
131 |
+ if(iRet != RS_RET_OK) { |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
132 |
+ /* error! */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
133 |
+ dbgprintf("TCPSendBuf error %d, destruct TCP Connection!\n", iRet); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
134 |
+ DestructTCPInstanceData(pData); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
135 |
+ iRet = RS_RET_SUSPENDED; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
136 |
+ } |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
137 |
RETiRet; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
138 |
} |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
139 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
140 |
@@ -363,6 +369,7 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
141 |
{ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
142 |
DEFiRet; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
143 |
instanceData *pData = (instanceData *) pvData; |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
144 |
+ dbgprintf("TCPSendPrepRetry performs a DestructTCPInstanceData\n"); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
145 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
146 |
assert(pData != NULL); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
147 |
DestructTCPInstanceData(pData); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
148 |
@@ -380,6 +387,7 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
149 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
150 |
assert(pData != NULL); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
151 |
if(pData->pNetstrm == NULL) { |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
152 |
+ dbgprintf("TCPSendInit CREATE\n"); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
153 |
CHKiRet(netstrms.Construct(&pData->pNS)); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
154 |
/* the stream driver must be set before the object is finalized! */ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
155 |
CHKiRet(netstrms.SetDrvrName(pData->pNS, cs.pszStrmDrvr)); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
156 |
@@ -403,6 +411,7 @@ |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
157 |
|
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
158 |
finalize_it: |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
159 |
if(iRet != RS_RET_OK) { |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
160 |
+ dbgprintf("TCPSendInit FAILED with %d.\n", iRet); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
161 |
DestructTCPInstanceData(pData); |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
162 |
} |
0d12ca3c361f
16134419 rsyslogd forwarding over TCP does not detect server restart
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
163 |