projects
/
cascardo
/
sendxmpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import Debian changes 1.23-1
[cascardo/sendxmpp.git]
/
sendxmpp
diff --git
a/sendxmpp
b/sendxmpp
index
b78fbc2
..
8348398
100755
(executable)
--- a/
sendxmpp
+++ b/
sendxmpp
@@
-10,14
+10,12
@@
if 0; # not running under some shell
# Author: Dirk-Jan C. Binnema <djcb AT djcbsoftware.nl>
# Maintainer: Lubomir Host 'rajo' <rajo AT platon.sk>
# Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema
# Author: Dirk-Jan C. Binnema <djcb AT djcbsoftware.nl>
# Maintainer: Lubomir Host 'rajo' <rajo AT platon.sk>
# Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema
-# Copyright (c) 2006 - 20
09
Lubomir Host 'rajo'
+# Copyright (c) 2006 - 20
12
Lubomir Host 'rajo'
#
#
-# Homepage: http://sendxmpp.
platon
.sk
+# Homepage: http://sendxmpp.
hostname
.sk
#
# Released under the terms of the GNU General Public License v2
#
#
# Released under the terms of the GNU General Public License v2
#
-# $Platon: sendxmpp/sendxmpp,v 1.22 2010-10-03 19:36:35 rajo Exp $
-# $Id: $
use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed
use Net::XMPP;
use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed
use Net::XMPP;
@@
-28,7
+26,7
@@
use open ':utf8';
use open ':std';
# subroutines decls
use open ':std';
# subroutines decls
-sub xmpp_login($$$$$$$$$);
+sub xmpp_login($$$$$$$$$
$$
);
sub xmpp_send ($$$$);
sub xmpp_send_raw_xml($$);
sub xmpp_send_message($$$$$$);
sub xmpp_send ($$$$);
sub xmpp_send_raw_xml($$);
sub xmpp_send_message($$$$$$);
@@
-44,7
+42,7
@@
sub terminate();
sub main();
my # MakeMaker
sub main();
my # MakeMaker
-$VERSION = [ q$Revision: 1.2
2
$ =~ m/(\S+)\s*$/g ]->[0];
+$VERSION = [ q$Revision: 1.2
3
$ =~ m/(\S+)\s*$/g ]->[0];
my $RESOURCE = 'sendxmpp';
my $VERBOSE = 0;
my $DEBUG = 0;
my $RESOURCE = 'sendxmpp';
my $VERBOSE = 0;
my $DEBUG = 0;
@@
-76,8
+74,10
@@
sub main () {
$$cmdline{'username'} || $$config{'username'},
$$cmdline{'password'} || $$config{'password'},
$$cmdline{'component'}|| $$config{'component'},
$$cmdline{'username'} || $$config{'username'},
$$cmdline{'password'} || $$config{'password'},
$$cmdline{'component'}|| $$config{'component'},
- $$cmdline{'resource'},
- $$cmdline{'tls'},
+ $$cmdline{'resource'},
+ $$cmdline{'tls'} || $$config{'tls'},
+ $$cmdline{'no-tls-verify'} || $$config{'no-tls-verify'},
+ $$cmdline{'tls-ca-path'} || $$config{'tls-ca-path'} || '',
$$cmdline{'ssl'},
$$cmdline{'debug'})
or error_exit("cannot login: $!");
$$cmdline{'ssl'},
$$cmdline{'debug'})
or error_exit("cannot login: $!");
@@
-207,7
+207,9
@@
sub parse_cmdline () {
usage() unless (scalar(@ARGV));
my ($subject,$file,$resource,$jserver,$port,$username,$password,$component,
usage() unless (scalar(@ARGV));
my ($subject,$file,$resource,$jserver,$port,$username,$password,$component,
- $message, $chatroom, $headline, $debug, $tls, $ssl, $interactive, $help, $raw, $verbose);
+ $message, $chatroom, $headline, $debug, $tls, $ssl,
+ $no_tls_verify, $tls_ca_path,
+ $interactive, $help, $raw, $verbose);
my $res = GetOptions ('subject|s=s' => \$subject,
'file|f=s' => \$file,
'resource|r=s' => \$resource,
my $res = GetOptions ('subject|s=s' => \$subject,
'file|f=s' => \$file,
'resource|r=s' => \$resource,
@@
-220,6
+222,8
@@
sub parse_cmdline () {
'message-type=s' => \$message_type,
'chatroom|c' => \$chatroom,
'tls|t' => \$tls,
'message-type=s' => \$message_type,
'chatroom|c' => \$chatroom,
'tls|t' => \$tls,
+ 'no-tls-verify|n' => \$no_tls_verify,
+ 'tls-ca-path|a=s' => \$tls_ca_path,
'ssl|e' => \$ssl,
'interactive|i' => \$interactive,
'help|usage|h' => \$help,
'ssl|e' => \$ssl,
'interactive|i' => \$interactive,
'help|usage|h' => \$help,
@@
-279,6
+283,8
@@
sub parse_cmdline () {
'message-type' => $message_type,
'interactive' => ($interactive or 0),
'tls' => ($tls or 0),
'message-type' => $message_type,
'interactive' => ($interactive or 0),
'tls' => ($tls or 0),
+ 'no-tls-verify' => ($no_tls_verify or 0),
+ 'tls-ca-path' => ($tls_ca_path or ''),
'ssl' => ($ssl or 0),
'debug' => ($debug or 0),
'verbose' => ($verbose or 0),
'ssl' => ($ssl or 0),
'debug' => ($debug or 0),
'verbose' => ($verbose or 0),
@@
-301,18
+307,26
@@
sub parse_cmdline () {
# input: hostname,port,username,password,resource,tls,ssl,debug
# output: an XMPP connection object
#
# input: hostname,port,username,password,resource,tls,ssl,debug
# output: an XMPP connection object
#
-sub xmpp_login ($$$$$$$$$) {
+sub xmpp_login ($$$$$$$$$
$$
) {
- my ($host, $port, $user, $pw, $comp, $res, $tls, $ssl, $debug) = @_;
+ my ($host, $port, $user, $pw, $comp, $res, $tls, $
no_tls_verify, $tls_ca_path, $
ssl, $debug) = @_;
my $cnx = new Net::XMPP::Client(debuglevel=>($debug?2:0));
error_exit "could not create XMPP client object: $!"
unless ($cnx);
my $cnx = new Net::XMPP::Client(debuglevel=>($debug?2:0));
error_exit "could not create XMPP client object: $!"
unless ($cnx);
+ my $ssl_verify = 0x01;
+ if ($no_tls_verify) { $ssl_verify = 0x00; }
+ debug_print "ssl_verify: $ssl_verify";
+
+ debug_print "tls_ca_path: $tls_ca_path";
+
my @res;
my $arghash = {
hostname => $host,
port => $port,
tls => $tls,
my @res;
my $arghash = {
hostname => $host,
port => $port,
tls => $tls,
+ ssl_verify => $ssl_verify,
+ ssl_ca_path => $tls_ca_path,
ssl => $ssl,
connectiontype => 'tcpip',
componentname => $comp
ssl => $ssl,
connectiontype => 'tcpip',
componentname => $comp
@@
-595,6
+609,14
@@
Connect securely, using TLS
Connect securely, using SSL
Connect securely, using SSL
+=item B<-n>,B<--no-tls-verify>
+
+Deactivate the verification of SSL certificates. Better way is to use parameter B<--tls-ca-path> with the needed path to CA certificates.
+
+=item B<-a>,B<--tls-ca-path>
+
+Path to your custom CA certificates, so you can verificate SSL certificates during connecting.
+
=item B<-l>,B<--headline>
Backward compatibility option. You should use B<--message-type=headline> instead. Send a headline type message (not stored in offline messages)
=item B<-l>,B<--headline>
Backward compatibility option. You should use B<--message-type=headline> instead. Send a headline type message (not stored in offline messages)
@@
-691,12
+713,12
@@
Documentation for the L<Net::XMPP> module
The jabber homepage: L<http://www.jabber.org/>
The jabber homepage: L<http://www.jabber.org/>
-The sendxmpp homepage: L<http://sendxmpp.
platon
.sk>
+The sendxmpp homepage: L<http://sendxmpp.
hostname
.sk>
=head1 AUTHOR
sendxmpp has been written by Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>, and uses
the L<Net::XMPP> modules written by Ryan Eatmon. Current maintainer is
=head1 AUTHOR
sendxmpp has been written by Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>, and uses
the L<Net::XMPP> modules written by Ryan Eatmon. Current maintainer is
-Lubomir Host 'rajo' <rajo AT platon.sk>, L<http://
rajo.platon
.sk>
+Lubomir Host 'rajo' <rajo AT platon.sk>, L<http://
blog.hostname
.sk>
=cut
=cut