Changeset 672

Timestamp:

15/08/08 19:50:22 (5 months ago)

Author:

smoku

Message:

Implemented logging of compressed conection established. Closes #243

Location:

trunk

Files:

• c2s/authreg.c (modified) (1 diff)
• c2s/c2s.c (modified) (1 diff)
• c2s/main.c (modified) (2 diffs)
• sx/compress.c (modified) (4 diffs)

trunk/c2s/authreg.c

@@ -322 +322 @@
     if(authd)
     {
-        log_write(c2s->log, LOG_NOTICE, "[%d] legacy authentication succeeded: host=%s, username=%s, resource=%s%s", sess->s->tag, sess->host->realm, username, resource, sess->s->ssf ? ", TLS negotiated" : "");
+        log_write(c2s->log, LOG_NOTICE, "[%d] legacy authentication succeeded: host=%s, username=%s, resource=%s%s%s", sess->s->tag, sess->host->realm, username, resource, sess->s->ssf ? ", TLS negotiated" : "", sess->s->compressed ? ", ZLIB compression enabled" : "");
 
         /* create new bound jid holder */

trunk/c2s/c2s.c

@@ -473 +473 @@
             /* they sasl auth'd, so we only want the new-style session start */
             else {
-                log_write(sess->c2s->log, LOG_NOTICE, "[%d] SASL authentication succeeded: mechanism=%s; authzid=%s%s", sess->s->tag, &sess->s->auth_method[5], sess->s->auth_id, sess->s->ssf ? ", TLS negotiated" : "");
+                log_write(sess->c2s->log, LOG_NOTICE, "[%d] SASL authentication succeeded: mechanism=%s; authzid=%s%s%s", sess->s->tag, &sess->s->auth_method[5], sess->s->auth_id, sess->s->ssf ? ", TLS negotiated" : "", sess->s->compressed ? ", ZLIB compression enabled" : "");
                 sess->sasl_authd = 1;
             }

trunk/c2s/main.c

@@ -692 +692 @@
 #endif
 
+#ifdef HAVE_LIBZ
+    /* get compression up and running */
+    if(c2s->compression)
+        sx_env_plugin(c2s->sx_env, sx_compress_init);
+#endif
+
+#ifdef ENABLE_EXPERIMENTAL
+    /* get stanza ack up */
+    sx_env_plugin(c2s->sx_env, sx_ack_init);
+
+    /* and user IP address plugin */
+    sx_env_plugin(c2s->sx_env, sx_address_init);
+#endif
+
     /* get sasl online */
     c2s->sx_sasl = sx_env_plugin(c2s->sx_env, sx_sasl_init, "xmpp", _c2s_sx_sasl_callback, (void *) c2s);
@@ -698 +712 @@
         exit(1);
     }
-
-#ifdef HAVE_LIBZ
-    /* get compression up and running */
-    if(c2s->compression)
-        sx_env_plugin(c2s->sx_env, sx_compress_init);
-#endif
-
-#ifdef ENABLE_EXPERIMENTAL
-    /* get stanza ack up */
-    sx_env_plugin(c2s->sx_env, sx_ack_init);
-
-    /* and user IP address plugin */
-    sx_env_plugin(c2s->sx_env, sx_address_init);
-#endif
 
     /* get bind up */

trunk/sx/compress.c

@@ -43 +43 @@
 
     /* only want compress packets */
-    if(NAD_ENS(nad, 0) < 0 || NAD_NURI_L(nad, NAD_ENS(nad, 0)) != strlen(uri_COMPRESS) || strncmp(NAD_NURI(nad, NAD_ENS(nad, 0)), uri_COMPRESS, strlen(uri_COMPRESS)) != 0)
+    if(NAD_ENS(nad, 0) < 0 || NAD_NURI_L(nad, NAD_ENS(nad, 0)) != sizeof(uri_COMPRESS)-1 || strncmp(NAD_NURI(nad, NAD_ENS(nad, 0)), uri_COMPRESS, sizeof(uri_COMPRESS)-1) != 0)
         return 1;
 
@@ -60 +60 @@
 
             /* go ahead */
-            jqueue_push(s->wbufq, _sx_buffer_new("<compressed xmlns='" uri_COMPRESS "'/>", strlen(uri_COMPRESS) + 22, _sx_compress_notify_compress, NULL), 0);
+            jqueue_push(s->wbufq, _sx_buffer_new("<compressed xmlns='" uri_COMPRESS "'/>", sizeof(uri_COMPRESS)-1 + 22, _sx_compress_notify_compress, NULL), 0);
             s->want_write = 1;
 
@@ -224 +224 @@
             _sx_buffer_alloc_margin(buf, 0, SX_COMPRESS_CHUNK);
 
-                sc->rstrm.avail_out = SX_COMPRESS_CHUNK;
+            sc->rstrm.avail_out = SX_COMPRESS_CHUNK;
             sc->rstrm.next_out = buf->data + buf->len;
 
@@ -362 +362 @@
 
     /* go */
-    jqueue_push(s->wbufq, _sx_buffer_new("<compress xmlns='" uri_COMPRESS "'><method>zlib</method></compress>", strlen(uri_COMPRESS) + 51, NULL, NULL), 0);
+    jqueue_push(s->wbufq, _sx_buffer_new("<compress xmlns='" uri_COMPRESS "'><method>zlib</method></compress>", sizeof(uri_COMPRESS)-1 + 51, NULL, NULL), 0);
     s->want_write = 1;
     _sx_event(s, event_WANT_WRITE, NULL);