Attachment 53133 Details for Bug 15006 – Proposed patch

[patch] Proposed patch

0002-Bug-15006-Remove-tabs-from-sip_protocol_loop.patch (text/plain), 2.35 KB, created by Colin Campbell on 2016-07-06 14:53:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Campbell

Created: 2016-07-06 14:53:42 UTC

Size: 2.35 KB

patch

obsolete

>From edbcad84f7c27e6aa0e2394d9c3710fd93288de1 Mon Sep 17 00:00:00 2001
>From: Colin Campbell <colin.campbell@ptfs-europe.com>
>Date: Tue, 5 Jul 2016 10:36:31 +0100
>Subject: [PATCH 2/4] Bug 15006 Remove tabs from sip_protocol_loop
>
>Remove the tabs causing inconsistent indentation
>of sip_protocol_loop and replace with spaces
>
>Reimplements the renaining parts of Marcel de Rooy's
>original QA patch
>
>No logic changes in this patch - layout only
>---
> C4/SIP/SIPServer.pm | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/C4/SIP/SIPServer.pm b/C4/SIP/SIPServer.pm
>index b3f67d4..0a76ca8 100755
>--- a/C4/SIP/SIPServer.pm
>+++ b/C4/SIP/SIPServer.pm
>@@ -134,7 +134,7 @@ sub raw_transport {
> 
>     # Timeout the while loop if we get stuck in it
>     # In practice it should only iterate once but be prepared
>-    local $SIG{ALRM} = sub { die 'raw transport Timed Out!' }
>+    local $SIG{ALRM} = sub { die 'raw transport Timed Out!' };
>     syslog('LOG_DEBUG', "raw_transport: timeout is $service->{timeout}");
>     alarm $service->{timeout};
>     while (!$self->{account}) {
>@@ -253,14 +253,14 @@ sub telnet_transport {
> # telnet transport.  From that point on, both the raw and the telnet
> # processes are the same:
> sub sip_protocol_loop {
>-	my $self = shift;
>-	my $service = $self->{service};
>-	my $config  = $self->{config};
>+    my $self = shift;
>+    my $service = $self->{service};
>+    my $config  = $self->{config};
>     my $timeout = $self->{service}->{timeout} || $config->{timeout} || 30;
> 
>     # The spec says the first message will be:
>-	# 	SIP v1: SC_STATUS
>-	# 	SIP v2: LOGIN (or SC_STATUS via telnet?)
>+    #     SIP v1: SC_STATUS
>+    #     SIP v2: LOGIN (or SC_STATUS via telnet?)
>     # But it might be SC_REQUEST_RESEND.  As long as we get
>     # SC_REQUEST_RESEND, we keep waiting.
> 
>@@ -268,9 +268,9 @@ sub sip_protocol_loop {
>     # constraint, so we'll relax about it too.
>     # Using the SIP "raw" login process, rather than telnet,
>     # requires the LOGIN message and forces SIP 2.00.  In that
>-	# case, the LOGIN message has already been processed (above).
>-	# 
>-	# In short, we'll take any valid message here.
>+    # case, the LOGIN message has already been processed (above).
>+
>+    # In short, we'll take any valid message here.
>     eval {
>         local $SIG{ALRM} = sub {
>             syslog( 'LOG_DEBUG', 'Inactive: timed out' );
>-- 
>2.7.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 15006: 45039 | 45583 | 45594 | 52477 | 52478 | 52479 | 52480 | 52784 | 52785 | 52786 | 52787 | 52849 | 52850 | 52851 | 52852 | 52853 | 53009 | 53010 | 53011 | 53012 | 53013 | 53014 | 53132 | 53133 | 53134 | 53135 | 53309 | 53310 | 53311 | 53312 | 53355 | 53356 | 53357 | 53358 | 53359 | 53360 | 53363 | 53364 | 53365 | 53366 | 53367 | 53368 | 53369