Changeset 217 for pjproject/trunk/pjlib-util/src/pjlib-util/stun.c

Timestamp:

Feb 22, 2006 10:10:42 PM (18 years ago)

Author:

bennylp

Message:

Started errno framework in pjlib-util

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/stun.c (modified) (8 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/stun.c

@@ -18 +18 @@
  */
 #include <pjlib-util/stun.h>
+#include <pjlib-util/errno.h>
 #include <pj/pool.h>
 #include <pj/log.h>
@@ -23 +24 @@
 #include <pj/os.h>
 
-#define THIS_FILE   "stun"
+#define THIS_FILE   "stun.c"
 
 PJ_DEF(pj_status_t) pj_stun_create_bind_req( pj_pool_t *pool, 
@@ -34 +35 @@
     PJ_CHECK_STACK();
 
-    PJ_LOG(5,(THIS_FILE, "pj_stun_create_bind_req"));
 
     hdr = pj_pool_calloc(pool, 1, sizeof(pj_stun_msg_hdr));
-    if (!hdr) {
-        PJ_LOG(5,(THIS_FILE, "Error allocating memory!"));
-        return -1;
-    }
+    if (!hdr)
+        return PJ_ENOMEM;
 
     hdr->type = pj_htons(PJ_STUN_BINDING_REQUEST);
@@ -48 +46 @@
     *len = sizeof(pj_stun_msg_hdr);
 
-    return 0;
+    return PJ_SUCCESS;
 }
 
@@ -58 +56 @@
 
     PJ_CHECK_STACK();
-
-    PJ_LOG(5,(THIS_FILE, "pj_stun_parse_msg %p, len=%d", buf, len));
 
     msg->hdr = (pj_stun_msg_hdr*)buf;
@@ -73 +69 @@
         break;
     default:
-        PJ_LOG(5,(THIS_FILE, "Error: unknown msg type %d", msg_type));
-        return -1;
+        PJ_LOG(4,(THIS_FILE, "Error: unknown msg type %d", msg_type));
+        return PJLIB_UTIL_ESTUNINMSGTYPE;
     }
 
     msg_len = pj_ntohs(msg->hdr->length);
     if (msg_len != len - sizeof(pj_stun_msg_hdr)) {
-        PJ_LOG(5,(THIS_FILE, "Error: invalid msg_len %d (expecting %d)", 
+        PJ_LOG(4,(THIS_FILE, "Error: invalid msg_len %d (expecting %d)", 
                              msg_len, len - sizeof(pj_stun_msg_hdr)));
-        return -1;
+        return PJLIB_UTIL_ESTUNINMSGLEN;
     }
 
@@ -95 +91 @@
 
         if (msg_len < len) {
-            PJ_LOG(5,(THIS_FILE, "Error: length mismatch in attr %d", 
+            PJ_LOG(4,(THIS_FILE, "Error: length mismatch in attr %d", 
                                  msg->attr_count));
-            return -1;
+            return PJLIB_UTIL_ESTUNINATTRLEN;
         }
 
         if (pj_ntohs((*attr)->type) > PJ_STUN_ATTR_REFLECTED_FORM) {
-            PJ_LOG(5,(THIS_FILE, "Error: invalid attr type %d in attr %d",
+            PJ_LOG(4,(THIS_FILE, "Error: invalid attr type %d in attr %d",
                                  pj_ntohs((*attr)->type), msg->attr_count));
-            return -1;
+            return PJLIB_UTIL_ESTUNINATTRTYPE;
         }
 
@@ -111 +107 @@
     }
 
-    return 0;
+    return PJ_SUCCESS;
 }