Trying to improve log about crypted link

diff --git a/Makefile b/Makefile
index 64b1974add1d63301fde1d0dedde0132f49a07e3..f28a26d23d4f8a2f5b4b746739c2a6020a67c597 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ go465       :
                        -cert_chain certs/localhost-chain-cert.pem      \
                        -CAfile /etc/pki/tls/make-ca/ca-bundle.crt      \
                        -tls1_2                                         \
-                       -connect $(TESTIP):1065
+                       -connect $(TESTIP):1025
 
 #                      -status                 
 #                      -crlf
@@ -148,7 +148,7 @@ tlsref:
                        -cert certs/localhost-cert.pem                  \
                        -key certs/localhost-key.pem                    \
                        -starttls smtp                                  \
-                       -connect smtp.google.com:25
+                       -connect tar1.osukiss.org:25
 
 #                      -connect mx2.free.fr:25
 #                      -connect mailprod1.safe.ca:587

diff --git a/Makefile.dbg b/Makefile.dbg
index af27a0e0f587050edf0c683e4b42c8fccb4a496a..49bc404c6691e60f1b52805df25a5ca2256f556d 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -9,7 +9,7 @@ TESTDIR =       $(CURDIR)/test_area
 TESTSRV        =       mailleur.example.com
 TESTIP =       127.127.10.25
 TESTPORT=      1025
-#TESTPROT=     smtps
+TESTPROT=      smtps
 EXTIP  =       safemail3.safe.ca
 EXTPORT =      25
 TESTITER=      1

diff --git a/lib/lvleml.c b/lib/lvleml.c
index 99deaa3d209a5941a24a1f5e7933f048a37c4388..658acec54ab2eb7370af7e5ec5c7c686201329db 100644 (file)
--- a/lib/lvleml.c
+++ b/lib/lvleml.c
@@ -2470,8 +2470,18 @@ while (proceed==true) {
         }
       break;
     case 7      :       //contact is good, then sending a signon
-      (void) log_fprintlog(contact->logptr,false,"opening connection CNT=%s",
-                                                  contact->mainsesid);
+      (void) log_fprintlog(contact->logptr,true,"Start CNT=%s",contact->mainsesid);
+      (void) log_fprintlog(contact->logptr,false,"(Contact open from [%s] to "
+                                                  "[%s:%s])",
+                                                  contact->peername,
+                                                  contact->locip,
+                                                  contact->locserv);
+      if (soc_iscrypted(contact->socptr)==true) {
+        int level;
+
+        level=soc_get_sec_level(contact->socptr);
+        (void) log_fprintlog(contact->logptr,false,cry,"server",level);
+        }
       break;
     default     :       //SAFE guard
       proceed=false;

diff --git a/lib/lvleml.h b/lib/lvleml.h
index 095cf7e417b91967949a144610277af9c92798bb..c6bad40caa380e62448e2c135ace0de26f7d9083 100644 (file)
--- a/lib/lvleml.h
+++ b/lib/lvleml.h
@@ -20,10 +20,10 @@ typedef struct  {
         SQLPTR *sqlptr;         //established contact database access
         int delay;              //communication max delay
         char *fqdn;             //fully qualified domain from peer
-        char *locip;            //socket local IP num
         RELTYP privilege;       //onnection privilege
         char *authname;         //Link is authenticated name
         AFNTYP **localafns;     //local IP as an AFNUM
+        char *locip;            //socket local IP num
         char *locname;          //socket local hostname
         char *locserv;          //local service port
         char *peername;         //socket remote peer FQDN