Changeset 7f33c18 for perl

Timestamp:

Apr 12, 2007, 6:05:37 PM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

80e54a7

Parents:

c2c5c77

Message:

Net::XMPP::Protocol -  Make resource binding note the full jid on connect.
BarnOwl::Module::Jabber::ConnectionManager - Allow for connections to be renamed.
BarnOwl::Module::Jabber - Rename the connection after connect to match the jid received.

This makes Net::XMPP recognize that the server may in fact connect a
user under a different resource than the one the user specified. In
particular, it works around the crap GoogleTalk appends to the
supplied resource.

Location:

perl/modules/Jabber/lib

Files:

• BarnOwl/Module/Jabber.pm (modified) (2 diffs)
• BarnOwl/Module/Jabber/ConnectionManager.pm (modified) (1 diff)
• Net/XMPP/Protocol.pm (modified) (2 diffs)

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -363 +363 @@
                 $conn->getRosterFromJID($jidStr)->fetch();
                 $client->PresenceSend( priority => 1 );
-                queue_admin_msg("Connected to jabber as $jidStr");
+                my $fullJid = $client->{SESSION}->{FULLJID};
+                $conn->renameConnection($jidStr, $fullJid);
+                queue_admin_msg("Connected to jabber as $fullJid");
             }
         }
-
     }
     delete $vars{jlogin_jid};
@@ -374 +375 @@
     delete $vars{jlogin_connhash};
     delete $vars{jlogin_authhash};
+ 
     return "";
 }

perl/modules/Jabber/lib/BarnOwl/Module/Jabber/ConnectionManager.pm

@@ -41 +41 @@
     delete $self->{$jidStr};
 
+    return 1;
+}
+
+sub renameConnection {
+    my $self = shift;
+    my $oldJidStr = shift;
+    my $newJidStr = shift;
+    return 0 unless exists $self->{$oldJidStr};
+    return 0 if $oldJidStr eq $newJidStr;
+
+    $self->{$newJidStr} = $self->{$oldJidStr}; 
+    delete $self->{$oldJidStr};
     return 1;
 }

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

@@ -1978 +1978 @@
     {
         $self->{DEBUG}->Log1("AuthSASL: Binding to resource");
-        $self->BindResource($args{resource});
+        my $jid = $self->BindResource($args{resource});
+        $self->{SESSION}->{FULLJID} = $jid;
     }
 
@@ -2019 +2020 @@
 
     my $result = $self->SendAndReceiveWithID($iq);
+    return $result->GetChild(&ConstXMLNS("xmpp-bind"))->GetJID();;
 }