Changeset 5522

Timestamp:

Jan 11, 2017 11:13:57 AM (8 years ago)

Author:

ming

Message:

Re #1960: Use boolean field to indicate whether the info is empty (instead of relying on bzero and memcmp)

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua2/endpoint.hpp (modified) (3 diffs)
• src/pjsua2/endpoint.cpp (modified) (4 diffs)

pjproject/trunk/pjsip/include/pjsua2/endpoint.hpp

@@ -165 +165 @@
 public:
     /**
+     * Constructor.
+     */
+    SslCertInfo();
+
+    /**
      * Check if the info is set with empty values.
      *
@@ -175 +180 @@
      */
     void fromPj(const pj_ssl_cert_info &info);
+    
+private:
+    bool empty;
 };
 
@@ -256 +264 @@
      */
     void fromPj(const pjsip_tls_state_info &info);
+
+private:
+    bool empty;
 };
 

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -46 +46 @@
 
 TlsInfo::TlsInfo()
-{
-    pj_bzero(this, sizeof(TlsInfo));
+        : empty(true)
+{
 }
 
 bool TlsInfo::isEmpty() const
 {
-    TlsInfo dummy;
-
-    pj_bzero(&dummy, sizeof(dummy));
-    return ((pj_memcmp(this, &dummy, sizeof(dummy)) == 0)? true: false);
+    return empty;
 }
 
@@ -66 +63 @@
     unsigned verif_msg_cnt;
     
+    empty       = false;
     established = PJ2BOOL(ssock_info->established);
     protocol    = ssock_info->proto;
@@ -90 +88 @@
 }
 
+SslCertInfo::SslCertInfo()
+        : empty(true)
+{
+}
+
 bool SslCertInfo::isEmpty() const
 {
-    SslCertInfo dummy;
-
-    pj_bzero(&dummy, sizeof(dummy));
-    return ((pj_memcmp(this, &dummy, sizeof(dummy)) == 0)? true: false);
+    return empty;
 }
 
 void SslCertInfo::fromPj(const pj_ssl_cert_info &info)
 {
+    empty       = false;
     version     = info.version;
     pj_memcpy(serialNo, info.serial_no, sizeof(info.serial_no));
@@ -638 +639 @@
     prm.state = state;
     prm.lastError = info ? info->status : PJ_SUCCESS;
-    pj_bzero(&prm.tlsInfo, sizeof(TlsInfo));
 
 #if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0