Changeset 3110 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Feb 25, 2010 11:58:19 AM (15 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/pjsip-apps/src/pjsua/pjsua_app.c (modified) (6 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2791 +2791 @@
  * Transport status notification
  */
-static pj_bool_t on_transport_state(pjsip_transport *tp, pj_uint32_t state,
-                                    const pjsip_transport_state_info *info)
+static void on_transport_state(pjsip_transport *tp, 
+                               pjsip_transport_state state,
+                               const pjsip_transport_state_info *info)
 {
     char host_port[128];
@@ -2801 +2802 @@
                      tp->remote_name.port);
 
-    if (state & PJSIP_TP_STATE_CONNECTED) {
-        PJ_LOG(3,(THIS_FILE, "SIP transport %s is connected to %s", 
-                 tp->type_name, host_port));
-    } 
-    else if (state & PJSIP_TP_STATE_ACCEPTED) {
-        PJ_LOG(3,(THIS_FILE, "SIP transport %s accepted %s",
-                 tp->type_name, host_port));
-    } 
-    else if (state & PJSIP_TP_STATE_DISCONNECTED) {
-        char buf[100];
-
-        snprintf(buf, sizeof(buf), "SIP transport %s is disconnected from %s",
-                 tp->type_name, host_port);
-        pjsua_perror(THIS_FILE, buf, info->status);
-    }
-    else if (state & PJSIP_TP_STATE_REJECTED) {
-        char buf[100];
-
-        snprintf(buf, sizeof(buf), "SIP transport %s rejected %s",
-                 tp->type_name, host_port);
-        pjsua_perror(THIS_FILE, buf, info->status);
+    switch (state) {
+    case PJSIP_TP_STATE_CONNECTED:
+        {
+            PJ_LOG(3,(THIS_FILE, "SIP transport %s is connected to %s", 
+                     tp->type_name, host_port));
+        }
+        break;
+
+    case PJSIP_TP_STATE_DISCONNECTED:
+        {
+            char buf[100];
+
+            snprintf(buf, sizeof(buf), "SIP transport %s is disconnected from %s",
+                     tp->type_name, host_port);
+            pjsua_perror(THIS_FILE, buf, info->status);
+        }
+        break;
+
+    default:
+        break;
     }
 
@@ -2828 +2828 @@
     if (!pj_ansi_stricmp(tp->type_name, "tls") && info->ext_info &&
         (state == PJSIP_TP_STATE_CONNECTED || 
-         (state & PJSIP_TP_STATE_TLS_VERIF_ERROR)))
+         ((pjsip_tls_state_info*)info->ext_info)->
+                                 ssl_sock_info->verify_status != PJ_SUCCESS))
     {
         pjsip_tls_state_info *tls_info = (pjsip_tls_state_info*)info->ext_info;
-        pj_ssl_sock_info *ssl_sock_info = (pj_ssl_sock_info*)
-                                          tls_info->ssl_sock_info;
+        pj_ssl_sock_info *ssl_sock_info = tls_info->ssl_sock_info;
         char buf[2048];
         const char *verif_msgs[32];
@@ -2844 +2844 @@
         /* Dump server TLS certificate verification result */
         verif_msg_cnt = PJ_ARRAY_SIZE(verif_msgs);
-        pj_ssl_cert_verify_error_st(ssl_sock_info->verify_status,
-                                    verif_msgs, &verif_msg_cnt);
+        pj_ssl_cert_get_verify_status_strings(ssl_sock_info->verify_status,
+                                              verif_msgs, &verif_msg_cnt);
         PJ_LOG(3,(THIS_FILE, "TLS cert verification result of %s : %s",
                              host_port,
@@ -2855 +2855 @@
         }
 
-        if (state & PJSIP_TP_STATE_TLS_VERIF_ERROR && 
+        if (ssl_sock_info->verify_status &&
             !app_config.udp_cfg.tls_setting.verify_server) 
         {
@@ -2864 +2864 @@
 
 #endif
-    return PJ_TRUE;
+
 }