From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 2/3 v3] allow changing remote syslog protocol to TCP Date: Tue, 21 Nov 2017 12:26:13 +0000 Message-ID: <1511267173.4838.573.camel@ipfire.org> In-Reply-To: <20171120193746.68d370d0.peter.mueller@link38.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1476295171172067738==" List-Id: --===============1476295171172067738== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit On Mon, 2017-11-20 at 19:37 +0100, Peter Müller wrote: > Hello, > > > On Sun, 2017-11-19 at 17:40 +0100, Peter Müller wrote: > > > Add option to change remote syslog protocol to TCP, which > > > is more reliable than UDP, but might be unsupported on > > > older syslog servers. > > > > > > Signed-off-by: Peter Müller > > > --- > > > html/cgi-bin/logs.cgi/config.dat | 16 ++++++++++++++ > > > 1 file changed, 16 insertions(+) > > > > > > diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi- > > > bin/logs.cgi/config.dat > > > index 789341dbe..ec3c2a92d 100644 > > > --- a/html/cgi-bin/logs.cgi/config.dat > > > +++ b/html/cgi-bin/logs.cgi/config.dat > > > @@ -33,6 +33,7 @@ $logsettings{'LOGWATCH_KEEP'} = '56'; > > > my @VS = ('15','50','100','150','250','500'); > > > $logsettings{'ENABLE_REMOTELOG'} = 'off'; > > > $logsettings{'REMOTELOG_ADDR'} = ''; > > > +$logsettings{'REMOTELOG_PROTOCOL'} = 'udp'; > > > $logsettings{'ACTION'} = ''; > > > &Header::getcgihash(\%logsettings); > > > > > > @@ -45,6 +46,10 @@ if ($logsettings{'ACTION'} eq $Lang::tr{'save'}) > > > { > > > $errormessage = $Lang::tr{'invalid logserver address'}; > > > } > > > + unless ($logsettings{'REMOTELOG_PROTOCOL'} =~ /^udp|tcp$/) > > > + { > > > + > > > + } > > > > So what was going to happen here? > > There should be an error message in case invalid formula data was > received. Forgot the line, will send in another version of this. *sigh* Spotted this before but must have forgotten to comment on it. > > Sorry for all the noise here. > > Best regards, > Peter Müller > > > > > } > > > unless ($logsettings{'LOGWATCH_KEEP'} =~ /^\d+$/) > > > { > > > @@ -69,6 +74,10 @@ $checked{'ENABLE_REMOTELOG'}{'off'} = ''; > > > $checked{'ENABLE_REMOTELOG'}{'on'} = ''; > > > $checked{'ENABLE_REMOTELOG'}{$logsettings{'ENABLE_REMOTELOG'}} = > > > "checked='checked'"; > > > > > > +$selected{'REMOTELOG_PROTOCOL'}{'udp'} = ''; > > > +$selected{'REMOTELOG_PROTOCOL'}{'tcp'} == ''; > > > +$selected{'REMOTELOG_PROTOCOL'}{$logsettings{'REMOTELOG_PROTOCOL'}} = > > > "selected='selected'"; > > > + > > > $checked{'LOGVIEW_REVERSE'}{'off'} = ''; > > > $checked{'LOGVIEW_REVERSE'}{'on'} = ''; > > > $checked{'LOGVIEW_REVERSE'}{$logsettings{'LOGVIEW_REVERSE'}} = > > > "checked='checked'"; > > > @@ -139,6 +148,11 @@ print < > > > > > $Lang::tr{'enabled'} > > name='ENABLE_REMOTELOG' $checked{'ENABLE_REMOTELOG'}{'on'} /> > > > $Lang::tr{'log server address'} > > name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /> > > > + $Lang::tr{'log server protocol'} > > > + > > > > > > > > > END > > --===============1476295171172067738== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl Mnlwa3R4Z0hudy8yK1FDUWNGQWxvVUcyVUFDZ2tRZ0hudy8yK1EKQ1FkWEtBLzhDSjV6d00wNEs4 MVFIcDQvQmlubUs0TFRGZDUvUG1CYUx1N2dFbENyME4vYWpwNGVjYmgzZEdtQQpsTzQ0ZVRaUktw d3ViNHU1Z1pKM3ZaMXJOZzJtMkRxZExEVzlFeUlXTURZUnJPQ0dpMmVSam82U0ZQOTFqeSs2Citr K2JWWjRTQyswTTJxcjJxbVpsNDBqSWZYKzhEeXhxbkN6a2pTcXd0amJxS214Q1hOR3FMTDR0VFlU ZmQ0VS8KbXRHeTRIMW94ckttWWFYaE9KcThuTnZPcUVKQnkxalBXVGZZZFpTdC9KRUxFL25WcDhs ZnV5bEU0Y2R5RjVkdApCWGwwdkVMUDhxSXlUUXZVa1ZJRXZwWVp5a2ZlMGxZYXFiNmRKMUp3aWc3 ZFdVTlJSVVBjTTBLalltMTB4TkdXCnZ0VXRScmVKMTB2aVlFSS9MN1dJUTV3dEUyM1hoWEtTdHVF QjhhVXNaQzlwQk1zYkJnSDlZN05HbmVDTXFWcEwKUlV4RGlFUUtlTUY4NlMzQzQ4c0FhZktXZFl5 WnZnLzRTOG9RdjRGcnlEYlRMTWZ3d3dQaHl3L2ZDL1dzQTVaRQp2QjRsaldFV2ZpWjcwWDRHa1dN cGE2RUtCYVVzcnVWSG9TZVRqckVMczZXWVh5ZTEzdHc2bkJmZ3h5TVNsa1lMCmdmSjF2bHZlWnls WDY3T1J3anpPNzVXbXRDZFdPOTJ0RHg2dy9OWFZsWGFlTkQ5aWNGMXhuTVA3NmlBR0hWYkIKenBa Y3VIQnhpcnIyNXhxWHRQUDJ2a1lESEZNNzhsRVFOendEOGI4YWRqQS9YSVhBTGs5U3NEWENUS0k1 bTEzRQp0d2h1R3N0cXlwbjBvT3FNMFBNL2Q1bkM4TXdIM1ZYK1hOdUMyL05IbG9tb05jR053R1E9 Cj1nUmJzCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo= --===============1476295171172067738==--