Changeset 865

Timestamp:

04/29/09 16:34:03 (7 months ago)

Author:

mart

Message:

Improve debugging information for S2S connections. (Alex Vandiver <alexmv@…>)

Location:

trunk/DJabberd

Files:

• CHANGES (modified) (1 diff)
• lib/DJabberd/Connection/ServerIn.pm (modified) (1 diff)
• lib/DJabberd/DialbackParams.pm (modified) (1 diff)

trunk/DJabberd/CHANGES

@@ +1 @@
+  - Improve debugging information for S2S connections.
+    (Alex Vandiver <alexmv@bestpractical.com>)
+
   - Remove the stream:features-in-dialback quirk hack, since it breaks
     interop with a few different implementations and is incorrect

trunk/DJabberd/lib/DJabberd/Connection/ServerIn.pm

@@ -85 +85 @@
 
     unless ($stanza->acceptable_from_server($self)) {
+        if (not $stanza->from_jid) {
+            $self->log->error("Invalid 'from': @{[$stanza->from]}");
+        } elsif (not $stanza->to_jid) {
+            $self->log->error("Invalid 'to': @{[$stanza->to]}");
+        } else {
+            my $domain = $stanza->from_jid->domain;
+            my @known = sort keys %{$self->{verified_remote_domain}};
+            $self->log->error("Stanza of type '@{[ref $stanza]}' from $domain not acceptable; accept @known");
+        }
         # FIXME: who knows.  send something else.
-        $self->log->error("Stansa of type '$stanza' not acceptable");
         $self->stream_error;
         return 0;

trunk/DJabberd/lib/DJabberd/DialbackParams.pm

@@ -26 +26 @@
     my ($self, $cb) = @_;
     my $vhost = $self->{vhost};
-    $logger->info("Generating dialback result for vhost $vhost->{server_name}");
+    $logger->info("Generating dialback result for vhost $vhost->{server_name} from $self->{recv}");
     $vhost->get_secret_key(sub {
         my ($shandle, $secret) = @_;