Changeset 7869e48 for perl/modules/Jabber/lib/Net/XMPP/Protocol.pm

Timestamp:

Jan 12, 2013, 1:43:13 PM (11 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

e3a0d71, 4485285

Parents:

4626016

git-author:

Jason Gross <jgross@mit.edu> (01/12/13 13:13:18)

git-committer:

Jason Gross <jgross@mit.edu> (01/12/13 13:43:13)

Message:

Remove trailing whitespace

This commit was made with the command sequence

    for i in $(git ls-files | tr '\n' ' ');
    do
      echo $i; sed -i s'/\s\+$//g' "$(readlink -f $i)";
    done

File:

• perl/modules/Jabber/lib/Net/XMPP/Protocol.pm (modified) (48 diffs)

perl/modules/Jabber/lib/Net/XMPP/Protocol.pm

@@ -58 +58 @@
             comes back.  You can optionally specify a timeout so that
             you do not block forever.
-           
+
     nonblock - send the packet with an ID, but then return that id and
                control to the master program.  Net::XMPP is still
@@ -69 +69 @@
                combined with the XPath function because you can register
                a one shot function tied to the id you get back.
-               
+
 
 =head2 Basic Functions
@@ -234 +234 @@
                       groups=>["foo"]
                      );
-    
+
     $Con->RosterDBRemove("bob\@jabber.org");
     $Con->RosterDBRemove(Net::XMPP::JID);
@@ -244 +244 @@
 
     @jids = $Con->RosterDBJIDs();
-    
+
     if ($Con->RosterDBGroupExists("foo")) { ...
 
     @groups = $Con->RosterDBGroups();
-    
+
     @jids = $Con->RosterDBGroupJIDs("foo");
-    
+
     @jids = $Con->RosterDBNonGroupJIDs();
-    
+
     %hash = $Con->RosterDBQuery("bob\@jabber.org");
     %hash = $Con->RosterDBQuery(Net::XMPP::JID);
@@ -340 +340 @@
                               then you must *NOT* specify a callback for
                               presence in the SetCallBacks function.
- 
+
                                           Net::XMPP defines a few default
                                           callbacks for various types:
- 
+
                                           "subscribe" -
                                             replies with subscribed
-                                          
+
                                           "unsubscribe" -
                                             replies with unsubscribed
-                                          
+
                                           "subscribed" -
                                             replies with subscribed
-                                          
+
                                           "unsubscribed" -
                                             replies with unsubscribed
-                                         
+
 
     SetMessageCallBacks(type=>function, - sets the callback functions for
@@ -441 +441 @@
                            0   - Status ok, no data received.
                          undef - Status not ok, stop processing.
-                       
+
                        IMPORTANT: You need to check the output of every
                        Process.  If you get an undef then the connection
@@ -684 +684 @@
                             the has returned by RosterParse above, and
                             is the actual hash, not a reference.
-    
+
     RosterDBRemove(jid) - Remove a JID from the roster DB. The JID is
                           either a string, or a Net::XMPP::JID object.
@@ -696 +696 @@
     RosterDBJIDs() - returns a list of Net::XMPP::JID objects that
                      represents all of the JIDs in the DB.
-    
+
     RosterDBGroups() - returns the complete list of roster groups in the
                        roster.
-    
+
     RosterDBGroupExists(group) - return 1 if the group is a group in the
                                  roster DB, undef otherwise.
@@ -706 +706 @@
                                that represents all of the JIDs in the
                                specified roster group.
-    
+
     RosterDBNonGroupJIDs() - returns a list of Net::XMPP::JID objects
                              that represents all of the JIDs not in a
@@ -720 +720 @@
                              the given key.  The available keys are:
                                name, ask, subsrcription and groups
-                             The JID is either a string, or a 
+                             The JID is either a string, or a
                              Net::XMPP::JID object.
 
@@ -827 +827 @@
     my $id;
     my $tree;
-    
+
     if (ref($object) !~ /^Net::XMPP/)
     {
@@ -884 +884 @@
                 }
             }
-            
+
             return if $direct_pass;
         }
@@ -1093 +1093 @@
 ###############################################################################
 sub SetXPathCallBacks
-{ 
+{
     my $self = shift;
     my (%xpaths) = @_;
@@ -1133 +1133 @@
 ###############################################################################
 sub SetDirectXPathCallBacks
-{ 
+{
     my $self = shift;
     my (%xpaths) = @_;
@@ -1538 +1538 @@
 
     $self->{DEBUG}->Log4("PresenceDBParse: pres(",$presence->GetXML(),")");
-    
+
     my $type = $presence->GetType();
     $type = "" unless defined($type);
@@ -1942 +1942 @@
         &{$self->{CB}->{update}}() if exists($self->{CB}->{update});
     }
-    
+
     #-------------------------------------------------------------------------
     # The loop finished... but was it done?
@@ -1951 +1951 @@
         return( "system","SASL timed out authenticating");
     }
-    
+
     #-------------------------------------------------------------------------
     # Ok, it was done... but did we auth?
@@ -1960 +1960 @@
         return ( "error", $self->{STREAM}->SASLClientError($sid));
     }
-    
+
     #-------------------------------------------------------------------------
     # Phew... Restart the <stream:stream> per XMPP
@@ -1967 +1967 @@
     $self->{SESSION} = $self->{STREAM}->OpenStream($sid);
     $sid = $self->{SESSION}->{id};
-    
+
     $self->{DEBUG}->Log1("AuthSASL: We got a new session. sid($sid)");
 
@@ -2012 +2012 @@
     $iq->SetIQ(type=>"set");
     my $bind = $iq->NewChild(&ConstXMLNS("xmpp-bind"));
-    
+
     if (defined($resource) && ($resource ne ""))
     {
@@ -2037 +2037 @@
     $iq->SetIQ(type=>"set");
     my $session = $iq->NewChild(&ConstXMLNS("xmpp-session"));
-    
+
     my $result = $self->SendAndReceiveWithID($iq);
 }
@@ -2096 +2096 @@
     my %args;
     while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
-    
+
     my $iq = $self->_iq();
     $iq->SetIQ(type=>"get");
@@ -2122 +2122 @@
     my %args;
     while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
-    
+
     my $iq = $self->_iq();
     $iq->SetIQ(type=>"set");
@@ -2181 +2181 @@
         return $id;
     }
-    
+
     return $self->SendWithID($iq) if ($args{mode} eq "nonblock");
 
@@ -2443 +2443 @@
         $jid = $jid->GetJID();
     }
-    
+
     return unless exists($self->{ROSTERDB});
     return unless exists($self->{ROSTERDB}->{JIDS});
@@ -2611 +2611 @@
         $jid = $jid->GetJID();
     }
-    
+
     return unless $self->RosterDBExists($jid);
     if (defined($key))
@@ -2619 +2619 @@
     }
     return %{$self->{ROSTERDB}->{JIDS}->{$jid}};
-}                        
+}
 
 
@@ -2645 +2645 @@
             }
         }
-    
+
         delete($self->{ROSTERDB}->{JIDS}->{$jid});
     }
@@ -2692 +2692 @@
         $self->TLSClientFailure($node);
     }
-    
+
     if ($tag eq "proceed")
     {
@@ -2711 +2711 @@
     $timeout = 120 unless defined($timeout);
     $timeout = 120 if ($timeout eq "");
-    
+
     $self->TLSSendStartTLS();
 
@@ -2751 +2751 @@
         $self->{TLS}->{error} = $message;
     }
-    
+
     $self->RemoveDirectXPathCallBacks('/[@xmlns="'.&ConstXMLNS("xmpp-tls").'"]'=>$TLS_CALLBACK);
 }
@@ -2764 +2764 @@
 {
     my $self = shift;
-    
+
     return $self->{TLS}->{secure};
 }
@@ -2777 +2777 @@
 {
     my $self = shift;
-    
+
     return $self->{TLS}->{done};
 }
@@ -2790 +2790 @@
 {
     my $self = shift;
-    
+
     return $self->{TLS}->{error};
 }
@@ -2804 +2804 @@
     my $self = shift;
     my $node = shift;
-    
+
     my $type = &XML::Stream::XPath($node,"*/name()");
 
@@ -2821 +2821 @@
     my $self = shift;
     my $type = shift;
-    
+
     $self->Send("<failure xmlns='".&ConstXMLNS('xmpp-tls')."'><${type}/></failure>");
 }
@@ -2880 +2880 @@
         $self->SASLAnswerChallenge($node);
     }
-    
+
     if ($tag eq "failure")
     {
         $self->SASLClientFailure($node);
     }
-    
+
     if ($tag eq "success")
     {
@@ -2906 +2906 @@
     my $challenge64 = &XML::Stream::XPath($node,"text()");
     my $challenge = MIME::Base64::decode_base64($challenge64);
-    
+
     my $response = $self->SASLGetClient()->client_step($challenge);
 
@@ -2929 +2929 @@
 
     return unless defined($mechanisms);
-    
+
     my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
                                 callback=>{ user => $username,
@@ -2954 +2954 @@
 {
     my $self = shift;
-    
+
     return $self->{SASL}->{authed};
 }
@@ -2967 +2967 @@
 {
     my $self = shift;
-    
+
     return $self->{SASL}->{done};
 }
@@ -2980 +2980 @@
 {
     my $self = shift;
-    
+
     return $self->{SASL}->{error};
 }
@@ -2994 +2994 @@
     my $self = shift;
     my $node = shift;
-    
+
     my $type = &XML::Stream::XPath($node,"*/name()");
 
@@ -3011 +3011 @@
     my $self = shift;
     my $node = shift;
-    
+
     $self->{SASL}->{authed} = 1;
     $self->{SASL}->{done} = 1;
@@ -3027 +3027 @@
 {
     my $self = shift;
-    
+
     return $self->{SASL}->{client};
 }
@@ -3068 +3068 @@
     my $self = shift;
     my $type = shift;
-    
+
     $self->Send("<failure xmlns='".&ConstXMLNS('xmpp-sasl')."'><${type}/></failure>");
 }
@@ -3232 +3232 @@
 }
 
-   
+
 ##############################################################################
 #
@@ -3309 +3309 @@
 {
     my $const = shift;
-    
+
     return $XMLNS{$const};
 }