1 # This patch is to fix: |
1 # This patch is to fix: |
2 # 16134419 rsyslogd forwarding over TCP does not detect server restart |
2 # 16134419 rsyslogd forwarding over TCP does not detect server restart |
3 # which was fixed in upstream version 6.4.1; this patch is a minor variant |
3 # which was fixed in upstream version 6.4.1; this patch is a minor variant |
4 # on the upstream patch, adapted for 6.2.0 . This can go away once we |
4 # on the upstream patch, adapted for 6.2.0 . This can go away once we |
5 # upgrade to 6.4.1 or later. |
5 # upgrade to 6.4.1 or later, except for the CheckConnection() part in |
|
6 # runtime/netstrm.c which needs to make sure to return a value, as there |
|
7 # was a bug in the 6.4.1 code that failed to do this: |
|
8 # http://bugzilla.adiscon.com/show_bug.cgi?id=511 |
|
9 |
6 --- rsyslog/runtime/netstrm.c.orig 2012-01-09 06:05:45.000000000 -0800 |
10 --- rsyslog/runtime/netstrm.c.orig 2012-01-09 06:05:45.000000000 -0800 |
7 +++ rsyslog/runtime/netstrm.c 2013-12-02 09:14:19.766000221 -0800 |
11 +++ rsyslog/runtime/netstrm.c 2014-01-29 10:16:47.131765870 -0800 |
8 @@ -250,7 +250,7 @@ |
12 @@ -250,11 +250,13 @@ |
9 |
13 |
10 |
14 |
11 /* check connection - slim wrapper for NSD driver function */ |
15 /* check connection - slim wrapper for NSD driver function */ |
12 -static void |
16 -static void |
13 +static rsRetVal |
17 +static rsRetVal |
14 CheckConnection(netstrm_t *pThis) |
18 CheckConnection(netstrm_t *pThis) |
15 { |
19 { |
|
20 + DEFiRet; |
16 ISOBJ_TYPE_assert(pThis, netstrm); |
21 ISOBJ_TYPE_assert(pThis, netstrm); |
|
22 - pThis->Drvr.CheckConnection(pThis->pDrvrData); |
|
23 + iRet = pThis->Drvr.CheckConnection(pThis->pDrvrData); |
|
24 + RETiRet; |
|
25 } |
|
26 |
|
27 |
17 --- rsyslog/runtime/netstrm.h~ 2011-12-01 02:26:19.000000000 -0800 |
28 --- rsyslog/runtime/netstrm.h~ 2011-12-01 02:26:19.000000000 -0800 |
18 +++ rsyslog/runtime/netstrm.h 2013-12-02 09:30:45.155766988 -0800 |
29 +++ rsyslog/runtime/netstrm.h 2013-12-02 09:30:45.155766988 -0800 |
19 @@ -53,7 +53,7 @@ |
30 @@ -53,7 +53,7 @@ |
20 rsRetVal (*SetDrvrMode)(netstrm_t *pThis, int iMode); |
31 rsRetVal (*SetDrvrMode)(netstrm_t *pThis, int iMode); |
21 rsRetVal (*SetDrvrAuthMode)(netstrm_t *pThis, uchar*); |
32 rsRetVal (*SetDrvrAuthMode)(netstrm_t *pThis, uchar*); |