Changeset 5983

Timestamp:

May 9, 2019 7:47:39 AM (5 years ago)

Author:

nanang

Message:

Re #1298: Updated PJNATH to use PJ_ERROR consistently.

Location:

pjproject/trunk/pjnath/src/pjnath

Files:

• errno.c (modified) (1 diff)
• ice_strans.c (modified) (2 diffs)
• nat_detect.c (modified) (1 diff)
• stun_session.c (modified) (2 diffs)
• stun_sock.c (modified) (2 diffs)
• turn_session.c (modified) (2 diffs)
• turn_sock.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/errno.c

@@ -194 +194 @@
                            pj_status_t status)
 {
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    pj_strerror(status, errmsg, sizeof(errmsg));
-
 #if PJNATH_ERROR_LEVEL==1
-    PJ_LOG(1,(sender, "%s: %s", title, errmsg));
+    PJ_PERROR(1,(sender, status, title));
 #elif PJNATH_ERROR_LEVEL==2
-    PJ_LOG(2,(sender, "%s: %s", title, errmsg));
+    PJ_PERROR(2,(sender, status, title));
 #elif PJNATH_ERROR_LEVEL==3
-    PJ_LOG(3,(sender, "%s: %s", title, errmsg));
+    PJ_PERROR(3,(sender, status, title));
 #elif PJNATH_ERROR_LEVEL==4
-    PJ_LOG(4,(sender, "%s: %s", title, errmsg));
+    PJ_PERROR(4,(sender, status, title));
 #elif PJNATH_ERROR_LEVEL==5
-    PJ_LOG(5,(sender, "%s: %s", title, errmsg));
+    PJ_PERROR(5,(sender, status, title));
 #else
 # error Invalid PJNATH_ERROR_LEVEL value

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -959 +959 @@
                       const char *title, pj_status_t status)
 {
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    pj_strerror(status, errmsg, sizeof(errmsg));
-    PJ_LOG(4,(ice_st->obj_name, "%s: %s", title, errmsg));
+    PJ_PERROR(4,(ice_st->obj_name, status, title));
+
     pj_log_push_indent();
 
@@ -1588 +1586 @@
     if (cb.on_ice_complete) {
         if (status != PJ_SUCCESS) {
-            char errmsg[PJ_ERR_MSG_SIZE];
-            pj_strerror(status, errmsg, sizeof(errmsg));
-            PJ_LOG(4,(ice_st->obj_name,
-                      "ICE negotiation failed after %ds:%03d: %s",
-                      msec/1000, msec%1000, errmsg));
+            PJ_PERROR(4,(ice_st->obj_name, status,
+                         "ICE negotiation failed after %ds:%03d",
+                         msec/1000, msec%1000));
         } else {
             unsigned i;

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -582 +582 @@
     }
 
-    PJ_LOG(5,(sess->pool->obj_name, "Completed %s, status=%d",
-              test_names[test_id], status));
+    PJ_PERROR(5,(sess->pool->obj_name, status, "Completed %s",
+                 test_names[test_id]));
 
     sess->result[test_id].complete = PJ_TRUE;

pjproject/trunk/pjnath/src/pjnath/stun_session.c

@@ -1221 +1221 @@
                                           &response);
     if (status != PJ_SUCCESS && response != NULL) {
-        PJ_LOG(5,(SNAME(sess), "Message authentication failed"));
+        PJ_PERROR(5,(SNAME(sess), status, "Message authentication failed"));
         send_response(sess, token, tmp_pool, response, &rdata->info, 
                       PJ_FALSE, src_addr, src_addr_len);
@@ -1263 +1263 @@
                                                &tdata->auth_info.auth_key);
         if (status != PJ_SUCCESS) {
-            PJ_LOG(5,(SNAME(sess), 
-                      "Response authentication failed"));
+            PJ_PERROR(5,(SNAME(sess), status,
+                         "Response authentication failed"));
             return status;
         }

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -244 +244 @@
                                           PJ_TRUE, &sobuf_size);
         if (status != PJ_SUCCESS) {
-            pj_perror(3, stun_sock->obj_name, status,
-                      "Failed setting SO_RCVBUF");
+            PJ_PERROR(3, (stun_sock->obj_name, status,
+                          "Failed setting SO_RCVBUF"));
         } else {
             if (sobuf_size < cfg->so_rcvbuf_size) {
@@ -263 +263 @@
                                           PJ_TRUE, &sobuf_size);
         if (status != PJ_SUCCESS) {
-            pj_perror(3, stun_sock->obj_name, status,
-                      "Failed setting SO_SNDBUF");
+            PJ_PERROR(3, (stun_sock->obj_name, status,
+                          "Failed setting SO_SNDBUF"));
         } else {
             if (sobuf_size < cfg->so_sndbuf_size) {

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -1933 +1933 @@
                                         PJ_STUN_MAGIC, NULL, &tdata);
                     if (status != PJ_SUCCESS) {
-                        PJ_LOG(1,(sess->obj_name, 
-                                 "Error creating CreatePermission request: %d",
-                                 status));
+                        PJ_PERROR(1,(sess->obj_name, status,
+                                  "Error creating CreatePermission request"));
                         return 0;
                     }
@@ -1978 +1977 @@
                                           tdata);
         if (status != PJ_SUCCESS) {
-            PJ_LOG(1,(sess->obj_name, 
-                      "Error sending CreatePermission request: %d",
-                      status));
+            PJ_PERROR(1,(sess->obj_name, status,
+                      "Error sending CreatePermission request"));
             count = 0;
         }

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -835 +835 @@
                                               PJ_TRUE, &sobuf_size);
             if (status != PJ_SUCCESS) {
-                pj_perror(3, turn_sock->obj_name, status,
-                          "Failed setting SO_RCVBUF");
+                PJ_PERROR(3, (turn_sock->obj_name, status,
+                              "Failed setting SO_RCVBUF"));
             } else {
                 if (sobuf_size < turn_sock->setting.so_rcvbuf_size) {
@@ -854 +854 @@
                                               PJ_TRUE, &sobuf_size);
             if (status != PJ_SUCCESS) {
-                pj_perror(3, turn_sock->obj_name, status,
-                          "Failed setting SO_SNDBUF");
+                PJ_PERROR(3, (turn_sock->obj_name, status,
+                              "Failed setting SO_SNDBUF"));
             } else {
                 if (sobuf_size < turn_sock->setting.so_sndbuf_size) {
@@ -905 +905 @@
             on_connect_complete(turn_sock->active_sock, PJ_SUCCESS);
         } else if (status != PJ_EPENDING) {
-            pj_perror(3, turn_sock->pool->obj_name, status,
-                      "Failed to connect to %s",
-                      pj_sockaddr_print(&info.server, addrtxt,
-                                        sizeof(addrtxt), 3));
+            PJ_PERROR(3, (turn_sock->pool->obj_name, status,
+                          "Failed to connect to %s",
+                          pj_sockaddr_print(&info.server, addrtxt,
+                                            sizeof(addrtxt), 3)));
             pj_turn_sock_destroy(turn_sock);
             return;