Changeset 1289

Timestamp:

May 22, 2007 9:55:31 PM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #286: Bug in STUN FINGERPRINT verification and logging STUN message

Location:

pjproject/trunk/pjnath/src

Files:

• pjnath/stun_msg.c (modified) (2 diffs)
• pjnath/stun_msg_dump.c (modified) (5 diffs)
• pjstun-srv-test/main.c (modified) (1 diff)
• pjstun-srv-test/server.h (modified) (1 diff)
• pjstun-srv-test/turn_usage.c (modified) (5 diffs)

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

@@ -1657 +1657 @@
 
         /* Check if FINGERPRINT attribute is present */
-        if (GETVAL16H(pdu, msg_len + 20) == PJ_STUN_ATTR_FINGERPRINT) {
-            pj_uint16_t attr_len = GETVAL16H(pdu, msg_len + 22);
-            pj_uint32_t fingerprint = GETVAL32H(pdu, msg_len + 24);
+        if (GETVAL16H(pdu, msg_len + 20 - 8) == PJ_STUN_ATTR_FINGERPRINT) {
+            pj_uint16_t attr_len = GETVAL16H(pdu, msg_len + 20 - 8 + 2);
+            pj_uint32_t fingerprint = GETVAL32H(pdu, msg_len + 20 - 8 + 4);
             pj_uint32_t crc;
 
@@ -1665 +1665 @@
                 return PJNATH_ESTUNINATTRLEN;
 
-            crc = pj_crc32_calc(pdu, msg_len + 20);
+            crc = pj_crc32_calc(pdu, msg_len + 20 - 8);
             crc ^= STUN_XOR_FINGERPRINT;
 

pjproject/trunk/pjnath/src/pjnath/stun_msg_dump.c

@@ -97 +97 @@
                                        ", INVALID ADDRESS FAMILY!\n");
             }
+            APPLY();
         }
         break;
@@ -118 +119 @@
                                    (pj_uint32_t)attr->value,
                                    (pj_uint32_t)attr->value);
+            APPLY();
         }
         break;
@@ -134 +136 @@
                                    (int)attr->value.slen,
                                    attr->value.ptr);
+            APPLY();
         }
         break;
@@ -147 +150 @@
                                    (int)attr->reason.slen,
                                    attr->reason.ptr);
+            APPLY();
         }
         break;
@@ -192 +196 @@
     default:
         len = pj_ansi_snprintf(p, end-p, "\n");
-
+        APPLY();
         break;
     }
-
-    APPLY();
 
     return (p-buffer);

pjproject/trunk/pjnath/src/pjstun-srv-test/main.c

@@ -133 +133 @@
 
     status = pj_stun_turn_usage_create(srv, PJ_SOCK_DGRAM, NULL,
-                                       3478, &turn);
+                                       3478, o.use_fingerprint, &turn);
     if (status != PJ_SUCCESS) {
         pj_stun_perror(THIS_FILE, "Unable to create bind usage", status);

pjproject/trunk/pjnath/src/pjstun-srv-test/server.h

@@ -123 +123 @@
                                                const pj_str_t *ip_addr,
                                                unsigned port,
+                                               pj_bool_t use_fingerprint,
                                                pj_stun_usage **p_bu);
 

pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c

@@ -80 +80 @@
     pj_hash_table_t     *client_htable;
     pj_stun_auth_cred   *cred;
+    pj_bool_t            use_fingerprint;
 
     unsigned             max_bw_kbps;
@@ -147 +148 @@
                                               const pj_str_t *ip_addr,
                                               unsigned port,
+                                              pj_bool_t use_fingerprint,
                                               pj_stun_usage **p_bu)
 {
@@ -173 +175 @@
     tu->max_bw_kbps = 64;
     tu->max_lifetime = 10 * 60;
+    tu->use_fingerprint = use_fingerprint;
 
     status = pj_sockaddr_in_init(&local_addr, ip_addr, (pj_uint16_t)port);
@@ -200 +203 @@
     sess_cb.on_rx_request = &tu_sess_on_rx_request;
     status = pj_stun_session_create(&si->stun_cfg, "turns%p", &sess_cb, 
-                                    PJ_FALSE, &tu->default_session);
+                                    use_fingerprint, &tu->default_session);
     if (status != PJ_SUCCESS) {
         pj_stun_usage_destroy(tu->usage);
@@ -638 +641 @@
     sess_cb.on_rx_indication = &client_sess_on_rx_msg;
     status = pj_stun_session_create(tu->cfg, client->obj_name, 
-                                    &sess_cb, PJ_FALSE,
+                                    &sess_cb, tu->use_fingerprint,
                                     &client->session);
     if (status != PJ_SUCCESS) {