Changeset 5984

Timestamp:

May 9, 2019 8:18:18 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJSIP* to use PJ_ERROR consistently.

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-simple/publishc.c (modified) (1 diff)
• pjsip-ua/sip_inv.c (modified) (1 diff)
• pjsip-ua/sip_reg.c (modified) (1 diff)
• pjsip/sip_endpoint.c (modified) (3 diffs)
• pjsip/sip_resolve.c (modified) (4 diffs)
• pjsip/sip_transaction.c (modified) (2 diffs)
• pjsip/sip_transport.c (modified) (1 diff)
• pjsip/sip_transport_tcp.c (modified) (3 diffs)
• pjsip/sip_transport_tls.c (modified) (2 diffs)
• pjsip/sip_transport_udp.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -804 +804 @@
         // cause accessing freed memory location.
         //--pubc->pending_tsx;
-        PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
+        PJ_PERROR(4,(THIS_FILE, status, "Error sending request"));
     }
 

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -1948 +1948 @@
     status = pjmedia_sdp_neg_negotiate(inv->pool_prov, inv->neg, 0);
 
-    PJ_LOG(5,(inv->obj_name, "SDP negotiation done, status=%d", status));
+    PJ_PERROR(4,(inv->obj_name, status, "SDP negotiation done"));
 
     if (mod_inv.cb.on_media_update && inv->notify)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -1440 +1440 @@
         regc->has_tsx = PJ_FALSE;
 
-        PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
+        PJ_PERROR(4,(THIS_FILE, status, "Error sending request"));
     }
 

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -524 +524 @@
     status = pjsip_resolver_create(endpt->pool, &endpt->resolver);
     if (status != PJ_SUCCESS) {
-        PJ_LOG(4, (THIS_FILE, "Error creating resolver instance"));
+        PJ_PERROR(4, (THIS_FILE, status,
+                      "Error creating resolver instance"));
         goto on_error;
     }
@@ -568 +569 @@
     pj_pool_release( endpt->pool );
 
-    PJ_LOG(4, (THIS_FILE, "Error creating endpoint"));
+    PJ_PERROR(4, (THIS_FILE, status, "Error creating endpoint"));
     return status;
 }
@@ -580 +581 @@
     exit_cb *ecb;
 
-    PJ_LOG(5, (THIS_FILE, "Destroying endpoing instance.."));
+    PJ_LOG(5, (THIS_FILE, "Destroying endpoint instance.."));
 
     /* Phase 1: stop all modules */

pjproject/trunk/pjsip/src/pjsip/sip_resolve.c

@@ -513 +513 @@
 on_error:
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        PJ_LOG(4,(THIS_FILE, "Failed to resolve '%.*s'. Err=%d (%s)",
-                             (int)target->addr.host.slen,
-                             target->addr.host.ptr,
-                             status,
-                             pj_strerror(status,errmsg,sizeof(errmsg)).ptr));
+        PJ_PERROR(4,(THIS_FILE, status,
+                     "Failed to resolve '%.*s'",
+                     (int)target->addr.host.slen,
+                     target->addr.host.ptr));
         (*cb)(status, token, NULL);
         return;
@@ -568 +566 @@
     
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        /* Log error */
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(query->objname, "DNS A record resolution failed: %s", 
-                  errmsg));
+        PJ_PERROR(4,(query->objname, status,
+                     "DNS A record resolution failed"));
 
         query->last_error = status;
@@ -631 +625 @@
     
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        /* Log error */
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(query->objname, "DNS AAAA record resolution failed: %s", 
-                  errmsg));
+        PJ_PERROR(4,(query->objname, status,
+                     "DNS AAAA record resolution failed"));
 
         query->last_error = status;
@@ -661 +651 @@
 
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        /* Log error */
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(query->objname, "DNS A/AAAA record resolution failed: %s",
-                  errmsg));
+        PJ_PERROR(4,(query->objname, status,
+                     "DNS A/AAAA record resolution failed"));
 
         /* Call the callback */

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -776 +776 @@
      */
     if (pj_hash_count(mod_tsx_layer.htable) != 0) {
-        if (pjsip_endpt_atexit(mod_tsx_layer.endpt, &tsx_layer_destroy) !=
-            PJ_SUCCESS)
-        {
-            PJ_LOG(3,(THIS_FILE, "Failed to register transaction layer "
-                                 "module destroy."));
+        pj_status_t status;
+        status = pjsip_endpt_atexit(mod_tsx_layer.endpt, &tsx_layer_destroy);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(3,(THIS_FILE, status,
+                    "Failed to register transaction layer module destroy."));
         }
         return PJ_EBUSY;
@@ -2038 +2038 @@
     if (sent < 0) {
         pj_time_val delay = {0, 0};
-        char errmsg[PJ_ERR_MSG_SIZE];
-
-        pj_strerror((pj_status_t)-sent, errmsg, sizeof(errmsg));
-
-        PJ_LOG(2,(tsx->obj_name, "Transport failed to send %s! Err=%d (%s)",
-                pjsip_tx_data_get_info(tdata), -sent, errmsg));
+
+        PJ_PERROR(2,(tsx->obj_name, (pj_status_t)-sent,
+                      "Transport failed to send %s!",
+                      pjsip_tx_data_get_info(tdata)));
 
         /* Post the event for later processing, to avoid deadlock.

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -1507 +1507 @@
              * just fallback using pj_gethostip(), see ticket #1660.
              */
-            PJ_LOG(5,(THIS_FILE,"Warning: unable to determine local "
-                                "interface, fallback to default interface!"));
+            PJ_PERROR(5,(THIS_FILE, status,
+                         "Warning: unable to determine local interface, "
+                         "fallback to default interface!"));
             status = pj_gethostip(af, &itf_addr);
             if (status != PJ_SUCCESS)

pjproject/trunk/pjsip/src/pjsip/sip_transport_tcp.c

@@ -167 +167 @@
                        pj_status_t status)
 {
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    pj_strerror(status, errmsg, sizeof(errmsg));
-
-    PJ_LOG(3,(sender, "%s: %s [code=%d]", title, errmsg, status));
+    PJ_PERROR(3,(sender, status, "%s: [code=%d]", title, status));
 }
 
@@ -966 +962 @@
                                        readbuf, 0);
     if (status != PJ_SUCCESS && status != PJ_EPENDING) {
-        PJ_LOG(4, (tcp->base.obj_name, 
-                   "pj_activesock_start_read() error, status=%d", 
-                   status));
+        PJ_PERROR(4, (tcp->base.obj_name, status,
+                      "pj_activesock_start_read() error"));
         return status;
     }
@@ -1687 +1682 @@
                                     &enabled, sizeof(enabled));
         if (status != PJ_SUCCESS) {
-            PJ_LOG(1, ("TRACE", "fail set reuseaddr"));
             PJ_PERROR(4, (listener->factory.obj_name, status,
-                "Warning: error applying SO_REUSEADDR"));
+                          "Warning: error applying SO_REUSEADDR"));
         }
     }

pjproject/trunk/pjsip/src/pjsip/sip_transport_tls.c

@@ -173 +173 @@
                        pj_status_t status)
 {
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    pj_strerror(status, errmsg, sizeof(errmsg));
-
-    PJ_LOG(3,(sender, "%s: %s [code=%d]", title, errmsg, status));
+    PJ_PERROR(3,(sender, status, "%s: [code=%d]", title, status));
 }
 
@@ -1106 +1102 @@
                                      readbuf, 0);
     if (status != PJ_SUCCESS && status != PJ_EPENDING) {
-        PJ_LOG(4, (tls->base.obj_name, 
-                   "pj_ssl_sock_start_read() error, status=%d", 
-                   status));
+        PJ_PERROR(4, (tls->base.obj_name, status,
+                     "pj_ssl_sock_start_read() error"));
         return status;
     }

pjproject/trunk/pjsip/src/pjsip/sip_transport_udp.c

@@ -645 +645 @@
                                 &sobuf_size, sizeof(sobuf_size));
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(THIS_FILE, "Error setting SO_RCVBUF: %s [%d]", errmsg,
-                  status));
+        PJ_PERROR(4,(THIS_FILE, status, "Error setting SO_RCVBUF"));
     }
 #endif
@@ -658 +655 @@
                                 &sobuf_size, sizeof(sobuf_size));
     if (status != PJ_SUCCESS) {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        pj_strerror(status, errmsg, sizeof(errmsg));
-        PJ_LOG(4,(THIS_FILE, "Error setting SO_SNDBUF: %s [%d]", errmsg,
-                  status));
+        PJ_PERROR(4,(THIS_FILE, status, "Error setting SO_SNDBUF"));
     }
 #endif