From 9c7c03ffbcebf582addbaa68b0e0e656154df9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20de=20la=20Concepci=C3=B3n=20Sanz?= Date: Mon, 15 Feb 2010 19:18:53 +0000 Subject: [PATCH] =?UTF-8?q?2010-02-15=20=20Pablo=20de=20la=20Concepci?= =?UTF-8?q?=C3=B3n=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * bin/tentacle_server: Updated tentacle server and synchronized with the version from tentacle proyect. * man/man1/tentacle_server.1: Updated manpage from the updated pod documentation on bin/tentacle_server git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 8 ++++ pandora_server/bin/tentacle_server | 48 +++++++++++--------- pandora_server/man/man1/tentacle_server.1 | 54 ++++++++++------------- 3 files changed, 58 insertions(+), 52 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 6cb3d6a32b..e15ab469dd 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,11 @@ +2010-02-15 Pablo de la Concepción + + * bin/tentacle_server: Updated tentacle server and synchronized with the + version from tentacle proyect. + + * man/man1/tentacle_server.1: Updated manpage from the updated pod + documentation on bin/tentacle_server + 2010-02-15 Eric Ross Comit first batch of changes to implement the new log4x data type: Basicaly I modified the XML parser and changed how the "data" is handled and passed diff --git a/pandora_server/bin/tentacle_server b/pandora_server/bin/tentacle_server index d715b017aa..db46f7c427 100755 --- a/pandora_server/bin/tentacle_server +++ b/pandora_server/bin/tentacle_server @@ -4,11 +4,16 @@ # See http://www.openideas.info/wiki for protocol description. # Tentacle have IANA assigned port tpc/41121 as official port. ########################################################################## +# Copyright (c) 2007-2008 Ramon Novoa # Copyright (c) 2005-2010 Artica Soluciones Tecnologicas S.L # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; version 2 +# tentacle_server.pl Tentacle Server. See http://www.openideas.info/wiki for +# protocol description. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -17,6 +22,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ########################################################################## + package tentacle::server; =head1 NAME @@ -32,7 +38,7 @@ tentacle_server B<< -s F >> [I] =head1 DESCRIPTION -B is a B file transfer protocol that aims to be: +B is a server for B, a B file transfer protocol that aims to be: =over @@ -985,39 +991,39 @@ __END__ =over -=item I<-a> ip_address Address to listen on (default 0.0.0.0). +=item I<-a ip_address> Address to B on (default I<0.0.0.0>). -=item I<-c> number Maximum number of simultaneous connections (default 10). +=item I<-c number> B number of simultaneous B (default I<10>). -=item I<-d> Run as daemon. +=item I<-d> Run as B. -=item I<-e> cert OpenSSL certificate file. Enables SSL. +=item I<-e cert> B file. Enables SSL. -=item I<-f> ca_cert Verify that the peer certificate is signed by a ca. +=item I<-f ca_cert> Verify that the peer certificate is signed by a B. -=item I<-h> Show help. +=item I<-h> Show B. -=item I<-i> Filters. +=item I<-i> B. -=item I<-k> key OpenSSL private key file. +=item I<-k key> B file. -=item I<-m> size Maximum file size in bytes (default 2000000b). +=item I<-m size> B in bytes (default I<2000000b>). -=item I<-o> Enable file overwrite. +=item I<-o> Enable file B. -=item I<-p> port Port to listen on (default 41121). +=item I<-p port> B on (default I<41121>). -=item I<-q> Quiet. Do now print error messages. +=item I<-q> B. Do now print error messages. -=item I<-r> number Number of retries for network opertions (default 3). +=item I<-r number> B for network opertions (default I<3>). -=item I<-t> time Time-out for network operations in seconds (default 1s). +=item I<-t time> B for network operations in B (default I<1s>). -=item I<-v> Be verbose. +=item I<-v> Be B. -=item I<-w> Prompt for OpenSSL private key password. +=item I<-w> Prompt for B. -=item I<-x> pwd Server password. +=item I<-x> pwd B. =back diff --git a/pandora_server/man/man1/tentacle_server.1 b/pandora_server/man/man1/tentacle_server.1 index 352517200e..f6ee91321a 100644 --- a/pandora_server/man/man1/tentacle_server.1 +++ b/pandora_server/man/man1/tentacle_server.1 @@ -1,15 +1,7 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.05) +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05) .\" .\" Standard preamble: .\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. .de Sp \" Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp @@ -53,7 +45,7 @@ .el .ds Aq ' .\" .\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index .\" entries marked with X<> in POD. Of course, you'll have to process the .\" output yourself in some meaningful fashion. .ie \nF \{\ @@ -132,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "TENTACLE_SERVER 1" -.TH TENTACLE_SERVER 1 "2010-02-14" "perl v5.10.0" "User Contributed Perl Documentation" +.TH TENTACLE_SERVER 1 "2010-02-15" "perl v5.10.0" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -147,7 +139,7 @@ Version 0.2.1 tentacle_server \fB\-s \f(BIstorage_directory\fB\fR [\fIoptions\fR] .SH "DESCRIPTION" .IX Header "DESCRIPTION" -\&\fB\f(BItentacle_server\fB\|(1)\fR is a \fBclient/server\fR file transfer protocol that aims to be: +\&\fB\f(BItentacle_server\fB\|(1)\fR is a server for \fBtentacle\fR, a \fBclient/server\fR file transfer protocol that aims to be: .IP "\(bu" 4 Secure by design. .IP "\(bu" 4 @@ -165,39 +157,39 @@ The client and server (\fB\s-1TCP\s0 port 41121\fR) are designed to be run from .SH "OPTIONS" .IX Header "OPTIONS" .PD 0 -.IP "\fI\-a\fR ip_address Address to listen on (default 0.0.0.0)." 4 -.IX Item "-a ip_address Address to listen on (default 0.0.0.0)." -.IP "\fI\-c\fR number Maximum number of simultaneous connections (default 10)." 4 +.IP "\fI\-a ip_address\fR Address to \fBlisten\fR on (default \fI0.0.0.0\fR)." 4 +.IX Item "-a ip_address Address to listen on (default 0.0.0.0)." +.IP "\fI\-c number\fR \fBMaximum\fR number of simultaneous \fBconnections\fR (default \fI10\fR)." 4 .IX Item "-c number Maximum number of simultaneous connections (default 10)." -.IP "\fI\-d\fR Run as daemon." 4 +.IP "\fI\-d\fR Run as \fBdaemon\fR." 4 .IX Item "-d Run as daemon." -.IP "\fI\-e\fR cert OpenSSL certificate file. Enables \s-1SSL\s0." 4 +.IP "\fI\-e cert\fR \fBOpenSSL certificate\fR file. Enables \s-1SSL\s0." 4 .IX Item "-e cert OpenSSL certificate file. Enables SSL." -.IP "\fI\-f\fR ca_cert Verify that the peer certificate is signed by a ca." 4 -.IX Item "-f ca_cert Verify that the peer certificate is signed by a ca." -.IP "\fI\-h\fR Show help." 4 +.IP "\fI\-f ca_cert\fR Verify that the peer certificate is signed by a \fB\s-1CA\s0\fR." 4 +.IX Item "-f ca_cert Verify that the peer certificate is signed by a CA." +.IP "\fI\-h\fR Show \fBhelp\fR." 4 .IX Item "-h Show help." -.IP "\fI\-i\fR Filters." 4 +.IP "\fI\-i\fR \fBFilters\fR." 4 .IX Item "-i Filters." -.IP "\fI\-k\fR key OpenSSL private key file." 4 +.IP "\fI\-k key\fR \fBOpenSSL private key\fR file." 4 .IX Item "-k key OpenSSL private key file." -.IP "\fI\-m\fR size Maximum file size in bytes (default 2000000b)." 4 +.IP "\fI\-m size\fR \fBMaximum file size\fR in bytes (default \fI2000000b\fR)." 4 .IX Item "-m size Maximum file size in bytes (default 2000000b)." -.IP "\fI\-o\fR Enable file overwrite." 4 +.IP "\fI\-o\fR Enable file \fBoverwrite\fR." 4 .IX Item "-o Enable file overwrite." -.IP "\fI\-p\fR port Port to listen on (default 41121)." 4 +.IP "\fI\-p port\fR \fBPort to listen\fR on (default \fI41121\fR)." 4 .IX Item "-p port Port to listen on (default 41121)." -.IP "\fI\-q\fR Quiet. Do now print error messages." 4 +.IP "\fI\-q\fR \fBQuiet\fR. Do now print error messages." 4 .IX Item "-q Quiet. Do now print error messages." -.IP "\fI\-r\fR number Number of retries for network opertions (default 3)." 4 +.IP "\fI\-r number\fR \fBNumber of retries\fR for network opertions (default \fI3\fR)." 4 .IX Item "-r number Number of retries for network opertions (default 3)." -.IP "\fI\-t\fR time Time-out for network operations in seconds (default 1s)." 4 +.IP "\fI\-t time\fR \fBTime-out\fR for network operations in \fBseconds\fR (default \fI1s\fR)." 4 .IX Item "-t time Time-out for network operations in seconds (default 1s)." -.IP "\fI\-v\fR Be verbose." 4 +.IP "\fI\-v\fR Be \fBverbose\fR." 4 .IX Item "-v Be verbose." -.IP "\fI\-w\fR Prompt for OpenSSL private key password." 4 +.IP "\fI\-w\fR Prompt for \fBOpenSSL private key password\fR." 4 .IX Item "-w Prompt for OpenSSL private key password." -.IP "\fI\-x\fR pwd Server password." 4 +.IP "\fI\-x\fR pwd \fBServer password\fR." 4 .IX Item "-x pwd Server password." .PD .SH "EXIT STATUS"