Merge pull request #15 from tuxad-loudmouth/master
authorMikael <mikael@lilotux.net>
Sat, 14 Feb 2015 19:34:43 +0100
changeset 662 9600dc32c15c
parent 659 761839714ea3 (diff)
parent 661 22492003e3f7 (current diff)
child 663 3697251ef911
Merge pull request #15 from tuxad-loudmouth/master SSL/TLS protocol usage; use SANs of CERTs
--- a/loudmouth/lm-debug.h	Sun Feb 08 01:10:26 2015 +0100
+++ b/loudmouth/lm-debug.h	Sat Feb 14 19:34:43 2015 +0100
@@ -23,18 +23,17 @@
 
 #include <glib.h>
 
-typedef enum {
-    LM_LOG_LEVEL_VERBOSE = 1 << (G_LOG_LEVEL_USER_SHIFT),
-    LM_LOG_LEVEL_NET     = 1 << (G_LOG_LEVEL_USER_SHIFT + 1),
-    LM_LOG_LEVEL_PARSER  = 1 << (G_LOG_LEVEL_USER_SHIFT + 2),
-    LM_LOG_LEVEL_SSL     = 1 << (G_LOG_LEVEL_USER_SHIFT + 3),
-    LM_LOG_LEVEL_SASL    = 1 << (G_LOG_LEVEL_USER_SHIFT + 4),
-    LM_LOG_LEVEL_ALL     = (LM_LOG_LEVEL_NET |
-                            LM_LOG_LEVEL_VERBOSE |
-                            LM_LOG_LEVEL_PARSER |
-                            LM_LOG_LEVEL_SSL |
-                            LM_LOG_LEVEL_SASL)
-} LmLogLevelFlags;
+#define LM_LOG_LEVEL_VERBOSE (1 << (G_LOG_LEVEL_USER_SHIFT))
+#define LM_LOG_LEVEL_NET     (1 << (G_LOG_LEVEL_USER_SHIFT + 1))
+#define LM_LOG_LEVEL_PARSER  (1 << (G_LOG_LEVEL_USER_SHIFT + 2))
+#define LM_LOG_LEVEL_SSL     (1 << (G_LOG_LEVEL_USER_SHIFT + 3))
+#define LM_LOG_LEVEL_SASL    (1 << (G_LOG_LEVEL_USER_SHIFT + 4))
+#define LM_LOG_LEVEL_ALL     (LM_LOG_LEVEL_NET | \
+                              LM_LOG_LEVEL_VERBOSE | \
+                              LM_LOG_LEVEL_PARSER | \
+                              LM_LOG_LEVEL_SSL | \
+                              LM_LOG_LEVEL_SASL)
+typedef GLogLevelFlags LmLogLevelFlags;
 
 #ifndef LM_LOG_DOMAIN
 #  define LM_LOG_DOMAIN "LM"
--- a/loudmouth/lm-old-socket.c	Sun Feb 08 01:10:26 2015 +0100
+++ b/loudmouth/lm-old-socket.c	Sat Feb 14 19:34:43 2015 +0100
@@ -212,7 +212,7 @@
                                           NULL);
     }
 
-    if (status != G_IO_STATUS_NORMAL || *bytes_read < 0) {
+    if (status != G_IO_STATUS_NORMAL) {
         switch (status) {
         case G_IO_STATUS_EOF:
             *reason = LM_DISCONNECT_REASON_HUP;