Changeset 1038 for pjproject/trunk

Timestamp:

Mar 3, 2007 7:35:34 PM (18 years ago)

Author:

bennylp

Message:

Fixed STUN client/server authentication

Location:

pjproject/trunk/pjlib-util/src/pjlib-util

Files:

• stun_msg.c (modified) (2 diffs)
• stun_msg_dump.c (modified) (2 diffs)
• stun_session.c (modified) (3 diffs)

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

@@ -1842 +1842 @@
 
 /*
+static char *print_binary(const pj_uint8_t *data, unsigned data_len)
+{
+    static char static_buffer[1024];
+    char *buffer = static_buffer;
+    unsigned length=sizeof(static_buffer), i;
+
+    if (length < data_len * 2 + 8)
+        return "";
+
+    pj_ansi_sprintf(buffer, ", data=");
+    buffer += 7;
+
+    for (i=0; i<data_len; ++i) {
+        pj_ansi_sprintf(buffer, "%02x", (*data) & 0xFF);
+        buffer += 2;
+        data++;
+    }
+
+    pj_ansi_sprintf(buffer, "\n");
+    buffer++;
+
+    return static_buffer;
+}
+*/
+
+/*
  * Print the message structure to a buffer.
  */
@@ -2002 +2028 @@
 
         /* Calculate HMAC-SHA1 digest */
-        pj_hmac_sha1((pj_uint8_t*)buf, buf-start, 
+        pj_hmac_sha1((pj_uint8_t*)start, buf-start, 
                      (pj_uint8_t*)key.ptr, key.slen,
                      amsgint->hmac);

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

@@ -27 +27 @@
                         p += len
 
+static int print_binary(char *buffer, unsigned length,
+                        const pj_uint8_t *data, unsigned data_len)
+{
+    unsigned i;
+
+    if (length < data_len * 2 + 8)
+        return -1;
+
+    pj_ansi_sprintf(buffer, ", data=");
+    buffer += 7;
+
+    for (i=0; i<data_len; ++i) {
+        pj_ansi_sprintf(buffer, "%02x", (*data) & 0xFF);
+        buffer += 2;
+        data++;
+    }
+
+    pj_ansi_sprintf(buffer, "\n");
+    buffer++;
+
+    return data_len * 2 + 8;
+}
+
 static int print_attr(char *buffer, unsigned length,
                       const pj_stun_attr_hdr *ahdr)
@@ -145 +168 @@
 
     case PJ_STUN_ATTR_MESSAGE_INTEGRITY:
+        {
+            const pj_stun_msgint_attr *attr;
+
+            attr = (const pj_stun_msgint_attr*) ahdr;
+            len = print_binary(p, end-p, attr->hmac, 20);
+            APPLY();
+        }
+        break;
+
     case PJ_STUN_ATTR_DATA:
+        {
+            const pj_stun_binary_attr *attr;
+
+            attr = (const pj_stun_binary_attr*) ahdr;
+            len = print_binary(p, end-p, attr->data, attr->length);
+            APPLY();
+        }
+        break;
     case PJ_STUN_ATTR_USE_CANDIDATE:
     default:

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

@@ -700 +700 @@
                                        tmp_pool, &response);
     if (status != PJ_SUCCESS && response != NULL) {
+        PJ_LOG(5,(SNAME(sess), "Message authentication failed"));
         send_response(sess, tmp_pool, response, PJ_FALSE, 
                       src_addr, src_addr_len);
@@ -866 +867 @@
     dump = pj_pool_alloc(tmp_pool, PJ_STUN_MAX_PKT_LEN);
 
-    PJ_LOG(4,(SNAME(sess),
+    PJ_LOG(5,(SNAME(sess),
               "RX STUN message:\n"
               "--- begin STUN message ---\n"
@@ -885 +886 @@
     status = authenticate_msg(sess, packet, pkt_size, msg, tmp_pool, 
                               src_addr, src_addr_len);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
         goto on_return;
+    }
 
     /* Handle message */