git://git.camperquake.de
/
xmlrtorrent.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f5d76d
)
- Reindent
author
Ralf Ertzinger
<sun@lain.camperquake.de>
Mon, 12 Jan 2009 20:34:33 +0000
(21:34 +0100)
committer
Ralf Ertzinger
<sun@lain.camperquake.de>
Mon, 12 Jan 2009 20:34:33 +0000
(21:34 +0100)
xmlrtorrent/SocketTalker.pm
patch
|
blob
|
history
diff --git
a/xmlrtorrent/SocketTalker.pm
b/xmlrtorrent/SocketTalker.pm
index
14b6590
..
a28f141
100644
(file)
--- a/
xmlrtorrent/SocketTalker.pm
+++ b/
xmlrtorrent/SocketTalker.pm
@@
-4,8
+4,8
@@
# licensed under GNU GPL v2
package xmlrtorrent::SocketTalker;
# licensed under GNU GPL v2
package xmlrtorrent::SocketTalker;
-use xmlrtorrent::TalkerBase;
-@ISA = qw(xmlrtorrent::TalkerBase);
+use xmlrtorrent::
RTorrent
TalkerBase;
+@ISA = qw(xmlrtorrent::
RTorrent
TalkerBase);
use RPC::XML;
use RPC::XML::Parser;
use RPC::XML;
use RPC::XML::Parser;
@@
-19,7
+19,7
@@
sub new {
$self->{'NAME'} = 'socket';
$self->{'DESC'} = 'talker using SCGI over Unix Domain Socket';
$self->{'_PARAMS'} = {
$self->{'NAME'} = 'socket';
$self->{'DESC'} = 'talker using SCGI over Unix Domain Socket';
$self->{'_PARAMS'} = {
- 'SOCKET' => ['', 'filename of socket'],
+
'SOCKET' => ['', 'filename of socket'],
};
$self->{'__RPCXMLPARSER'} = RPC::XML::Parser->new();
};
$self->{'__RPCXMLPARSER'} = RPC::XML::Parser->new();
@@
-50,15
+50,15
@@
sub send_request {
my $socketfile = $self->_getval('SOCKET');
unless (defined $socketfile and $socketfile ne '') {
my $socketfile = $self->_getval('SOCKET');
unless (defined $socketfile and $socketfile ne '') {
- return 'socket talker: SOCKET not set';
+
return 'socket talker: SOCKET not set';
}
# prepare socket
my $socket = IO::Socket::UNIX->new(
}
# prepare socket
my $socket = IO::Socket::UNIX->new(
-
'Type' => SOCK_STREAM,
-
'Peer' => $socketfile,
-
)
- or return "socket talker: cannot connect to SOCKET: $!";
+ 'Type' => SOCK_STREAM,
+ 'Peer' => $socketfile,
+ )
+
or return "socket talker: cannot connect to SOCKET: $!";
$socket->autoflush(1); # default since 1.18, but be sure
# prepare XML RPC request
$socket->autoflush(1); # default since 1.18, but be sure
# prepare XML RPC request
@@
-66,24
+66,24
@@
sub send_request {
# prpepare SCGI request
my $scgi_request =
# prpepare SCGI request
my $scgi_request =
- $self->_create_netstring(
-
$self->_create_scgi_header('CONTENT_LENGTH', length $rpc_request)
-
.
-
$self->_create_scgi_header('SCGI', '1')
-
)
- .
- $rpc_request;
+
$self->_create_netstring(
+ $self->_create_scgi_header('CONTENT_LENGTH', length $rpc_request)
+ .
+ $self->_create_scgi_header('SCGI', '1')
+ )
+
.
+
$rpc_request;
# write to socket
$socket->print($scgi_request);
# read from socket
while (my $line = <$socket>) {
# write to socket
$socket->print($scgi_request);
# read from socket
while (my $line = <$socket>) {
- last if ($line =~ /^\s*$/); # munch headers
+
last if ($line =~ /^\s*$/); # munch headers
}
my $ret = '';
while (my $line = <$socket>) {
}
my $ret = '';
while (my $line = <$socket>) {
- $ret .= $line;
+
$ret .= $line;
}
$socket->close() or return "socket talker: cannot close SOCKET: $!";
}
$socket->close() or return "socket talker: cannot close SOCKET: $!";