Changeset 3110 for pjproject/trunk/pjlib/src/pj/ssl_sock_dump.c

Timestamp:

Feb 25, 2010 11:58:19 AM (14 years ago)

Author:

nanang

Message:

More ticket #1032:

• Updated transport state notification callback to return void.
• Updated transport state enum to only contain connected and disconnected, no more bitmask value.
• Added direction field to SIP transport.
• Removed remote hostname hash from transport key.
• Updated cert info dump to return -1 when buffer is insufficient.
• Added new error code PJSIP_TLS_ECERTVERIF.
• Updated get_cert_name() in ssl_sock_symbian.c to use heap buffer instead of stack.
• Minors, e.g: added prefix PJ in cipher types, docs.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_dump.c (modified) (9 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_dump.c

@@ -28 +28 @@
 #define THIS_FILE       "ssl_sock_dump.c"
 
-#define CHECK_BUF_LEN()                                                 \
-    if ((len < 0) || ((p+=len) >= end)) {                               \
-        *(p-1) = '\0';                                                  \
-        return PJ_ETOOSMALL;                                            \
-    }
+#define CHECK_BUF_LEN()                                         \
+    if ((len < 0) || (len >= end-p)) {                          \
+        *p = '\0';                                              \
+        return -1;                                              \
+    }                                                           \
+    p += len;
 
-PJ_DEF(pj_status_t) pj_ssl_cert_info_dump(const pj_ssl_cert_info *ci,
-                                          const char *prefix,
-                                          char *buf,
-                                          pj_size_t buf_size)
+PJ_DEF(pj_ssize_t) pj_ssl_cert_info_dump(const pj_ssl_cert_info *ci,
+                                         const char *indent,
+                                         char *buf,
+                                         pj_size_t buf_size)
 {
     const char *wdays[] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
@@ -54 +55 @@
     /* Version */
     len = pj_ansi_snprintf(p, end-p, "%sVersion    : v%d\n", 
-                           prefix, ci->version);
+                           indent, ci->version);
     CHECK_BUF_LEN();
     
     /* Serial number */
-    len = pj_ansi_snprintf(p, end-p, "%sSerial     : ", prefix);
+    len = pj_ansi_snprintf(p, end-p, "%sSerial     : ", indent);
     CHECK_BUF_LEN();
 
@@ -69 +70 @@
     
     /* Subject */
-    len = pj_ansi_snprintf( p, end-p, "%sSubject    : %.*s\n", prefix,
+    len = pj_ansi_snprintf( p, end-p, "%sSubject    : %.*s\n", indent,
                             ci->subject.cn.slen, 
                             ci->subject.cn.ptr);
     CHECK_BUF_LEN();
-    len = pj_ansi_snprintf( p, end-p, "%s             %.*s\n", prefix,
+    len = pj_ansi_snprintf( p, end-p, "%s             %.*s\n", indent,
                             ci->subject.info.slen,
                             ci->subject.info.ptr);
@@ -79 +80 @@
 
     /* Issuer */
-    len = pj_ansi_snprintf( p, end-p, "%sIssuer     : %.*s\n", prefix,
+    len = pj_ansi_snprintf( p, end-p, "%sIssuer     : %.*s\n", indent,
                             ci->issuer.cn.slen,
                             ci->issuer.cn.ptr);
     CHECK_BUF_LEN();
-    len = pj_ansi_snprintf( p, end-p, "%s             %.*s\n", prefix,
+    len = pj_ansi_snprintf( p, end-p, "%s             %.*s\n", indent,
                             ci->issuer.info.slen,
                             ci->issuer.info.ptr);
@@ -90 +91 @@
     /* Validity period */
     len = pj_ansi_snprintf( p, end-p, "%sValid from : %s %4d-%02d-%02d "
-                            "%02d:%02d:%02d.%03d %s\n", prefix,
+                            "%02d:%02d:%02d.%03d %s\n", indent,
                             wdays[pt1.wday], pt1.year, pt1.mon+1, pt1.day,
                             pt1.hour, pt1.min, pt1.sec, pt1.msec,
@@ -97 +98 @@
 
     len = pj_ansi_snprintf( p, end-p, "%sValid to   : %s %4d-%02d-%02d "
-                            "%02d:%02d:%02d.%03d %s\n", prefix,
+                            "%02d:%02d:%02d.%03d %s\n", indent,
                             wdays[pt2.wday], pt2.year, pt2.mon+1, pt2.day,
                             pt2.hour, pt2.min, pt2.sec, pt2.msec,
@@ -108 +109 @@
 
         len = pj_ansi_snprintf(p, end-p, "%ssubjectAltName extension\n", 
-                               prefix);
+                               indent);
         CHECK_BUF_LEN();
 
@@ -131 +132 @@
             }
             if (type) {
-                len = pj_ansi_snprintf( p, end-p, "%s      %s : %.*s\n", prefix, 
+                len = pj_ansi_snprintf( p, end-p, "%s      %s : %.*s\n", indent, 
                                         type, 
                                         ci->subj_alt_name.entry[i].name.slen, 
@@ -140 +141 @@
     }
 
-    return PJ_SUCCESS;
+    return (p-buf);
 }