From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 2/3 v3] allow changing remote syslog protocol to TCP
Date: Mon, 20 Nov 2017 15:45:42 +0000
Message-ID: <1511192742.4838.539.camel@ipfire.org>
In-Reply-To: <20171119174033.3dc70013.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0506670098431280616=="
List-Id: <development.lists.ipfire.org>

--===============0506670098431280616==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

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 <peter.mueller(a)link38.eu>
> ---
>  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?

>    }
>    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 <<END
>  <tr>
>    <td class='base'>$Lang::tr{'enabled'}</td><td><input type='checkbox'
> name='ENABLE_REMOTELOG' $checked{'ENABLE_REMOTELOG'}{'on'} /></td>
>    <td>$Lang::tr{'log server address'}</td><td><input type='text'
> name='REMOTELOG_ADDR' value='$logsettings{'REMOTELOG_ADDR'}' /></td>
> +  <td>$Lang::tr{'log server protocol'}</td><td>
> +  <select name='REMOTELOG_PROTOCOL'>
> +  <option value='udp' $selected{'REMOTELOG_PROTOCOL'}{'udp'}>$Lang::tr{'udp
> less overhead'}</option>
> +  <option value='tcp' $selected{'REMOTELOG_PROTOCOL'}{'tcp'}>$Lang::tr{'tcp
> more reliable'}</option>
> +  </select></td>
>  </tr>
>  </table>
>  END

--===============0506670098431280616==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxvUytLWUFDZ2tRZ0hudy8yK1EKQ1FlTE9SQUFtQ1BQaEd4b2tq
Wisrbi9VcXFEaWlpaWdlWSt2cVBwaldIUVcrTjQ5NUZPRU1td3lLaldKUnYveQpERnpsbUpNRVBo
cTB2aFQxV29RSmpESjFVTEJhbkwxdUlwTnZMMWJuaGhGd1pQU012MGZaSXh3MEkwaVIyOW9rCncr
bTBFaW5YUm90dEtzVk91cWlCV0RXSFQ2Q3VZblZkc3JJeXQ0L3VrQXVEOHFoeVhYTGJlSzA1bUVD
V28vRkgKcklpVlR1enNSRWVjY2xscUhzZlBwUkgyVjg2QzNMVkNXSkJ3dk90V2UrZ3lXU2tQc1lL
WTZZRzR3UVdrbXJ1cQowdzhmaFhxNWkweWVuRkRQeVcxU3JsNXNGenVHVFdDYnA3UjYzbFc0RDU4
QVVUZ0RvU0owMU9sbHYzbDZjNlMyClhGTmV3L0ZQSkpaWWNQVnltektzNlBDSG02UkhySGxEWTFx
eWYxMFdqRXpnME9QV2dpaGVKa3k3Z2pLTXNDdFEKUnNZVENjU3RDa2VBVUJ3MWZXNkF0ak9MUlh0
M2s2YWZXRXpEY0Mzb0FjUlFza2NmaGFUT21oYzZ3eHhKenN0Zwp4K3BCWk5weFNQa2UxQks0cDJE
VGpBVnh1SENmQXJySk9EdEN6RzdrNmh3QlhzY2JPSXpiT3g2ZVA0MWtrNGphCkFvSm9Qc0dZMFp5
cm9ZVXBjY3hKSkZCSFh4M29Ga0FwVmxCTjVYMy8yNEIrd0x4NDVzZU8vckpDN3haeEg5TTIKZzJG
cmdHSnBzS3NhUlZCVjZLb1RFYWNaWDRFUE9OaEdEeXdvczJTNlUvV2w3VGFkME5LUVlRYktFby9B
dzJqUwpaSXF3QWozUUpvaEJETmR6dWphbzZhM0k4Si9nMWZWN05NNFR4SHR4UGVZNlZoNEtQY0E9
Cj03NlhtCi0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============0506670098431280616==--