Changeset 1101 for pjproject/trunk/pjnath/src/pjnath/stun_msg.c

Timestamp:

Mar 24, 2007 1:00:30 PM (17 years ago)

Author:

bennylp

Message:

ICE (work in progress): implement error codes

File:

• pjproject/trunk/pjnath/src/pjnath/stun_msg.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_msg.c

@@ -65 +65 @@
     { PJ_STUN_SC_STALE_NONCE,               "Stale Nonce"},
     { PJ_STUN_SC_TRANSITIONING,             "Active Destination Already Set"},
-    { PJ_STUN_SC_WRONG_USERNAME,            "Wrong Username"},
     { PJ_STUN_SC_UNSUPP_TRANSPORT_PROTO,    "Unsupported Transport Protocol"},
     { PJ_STUN_SC_INVALID_IP_ADDR,           "Invalid IP Address"},
@@ -514 +513 @@
 PJ_DEF(pj_str_t) pj_stun_get_err_reason(int err_code)
 {
+#if 0
+    /* Find error using linear search */
     unsigned i;
 
@@ -521 +522 @@
     }
     return pj_str(NULL);
+#else
+    /* Find error message using binary search */
+    int first = 0;
+    int n = PJ_ARRAY_SIZE(stun_err_msg_map);
+
+    while (n > 0) {
+        int half = n/2;
+        int mid = first + half;
+
+        if (stun_err_msg_map[mid].err_code < err_code) {
+            first = mid+1;
+            n -= (half+1);
+        } else if (stun_err_msg_map[mid].err_code > err_code) {
+            n = half;
+        } else {
+            first = mid;
+            break;
+        }
+    }
+
+
+    if (stun_err_msg_map[first].err_code == err_code) {
+        return pj_str((char*)stun_err_msg_map[first].err_msg);
+    } else {
+        return pj_str(NULL);
+    }
+#endif
 }
 
@@ -1580 +1608 @@
 
     if (pdu_len < sizeof(pj_stun_msg_hdr))
-        return PJNATH_ESTUNINMSGLEN;
+        return PJNATH_EINSTUNMSGLEN;
 
     /* First byte of STUN message is always 0x00 or 0x01. */
     if (*pdu != 0x00 && *pdu != 0x01)
-        return PJNATH_ESTUNINMSGTYPE;
+        return PJNATH_EINSTUNMSGTYPE;
 
     /* Check the PDU length */
@@ -1591 +1619 @@
         ((options & PJ_STUN_IS_DATAGRAM) && msg_len + 20 != pdu_len))
     {
-        return PJNATH_ESTUNINMSGLEN;
+        return PJNATH_EINSTUNMSGLEN;
     }
 
@@ -1635 +1663 @@
 
     PJ_ASSERT_RETURN(PJ_STUN_IS_REQUEST(msg_type), 
-                     PJNATH_ESTUNINMSGTYPE);
+                     PJNATH_EINSTUNMSGTYPE);
 
     /* Create response or error response */
@@ -1774 +1802 @@
                 }
 
-                return PJNATH_ESTUNUNKNOWNATTR;
+                return PJ_STATUS_FROM_STUN_CODE(PJ_STUN_SC_UNKNOWN_ATTRIBUTE);
             }
 
@@ -2103 +2131 @@
             /* Should not happen for message generated by us */
             pj_assert(PJ_FALSE);
-            return PJNATH_ESTUNNOUSERNAME;
+            return PJ_STATUS_FROM_STUN_CODE(PJ_STUN_SC_MISSING_USERNAME);
         }