Changeset 1151 for pjproject

Timestamp:

Apr 4, 2007 5:49:28 PM (18 years ago)

Author:

bennylp

Message:

Added PJ_STUN_NO_AUTHENTICATE option to disable authentication in STUN session

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/stun_msg.h (modified) (1 diff)
• src/pjnath/stun_session.c (modified) (2 diffs)
• src/pjstun-client/client_main.c (modified) (2 diffs)

pjproject/trunk/pjnath/include/pjnath/stun_msg.h

@@ -1030 +1030 @@
      * decode the packet.
      */
-    PJ_STUN_CHECK_PACKET    = 2
+    PJ_STUN_CHECK_PACKET    = 2,
+
+    /**
+     * This option current is only valid for #pj_stun_session_on_rx_pkt().
+     * When specified, it tells the session NOT to authenticate the
+     * message.
+     */
+    PJ_STUN_NO_AUTHENTICATE = 4
 };
 

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

@@ -957 +957 @@
     }
 
-    /* Authenticate the message */
-    status = authenticate_msg(sess, packet, pkt_size, msg, tmp_pool, 
-                              src_addr, src_addr_len);
-    if (status != PJ_SUCCESS) {
-        goto on_return;
+    /* Authenticate the message, unless PJ_STUN_NO_AUTHENTICATE
+     * is specified in the option.
+     */
+    if ((options & PJ_STUN_NO_AUTHENTICATE) == 0) {
+        status = authenticate_msg(sess, packet, pkt_size, msg, tmp_pool,
+                                  src_addr, src_addr_len);
+        if (status != PJ_SUCCESS) {
+            goto on_return;
+        }
     }
 
@@ -993 +997 @@
 
 
+

pjproject/trunk/pjnath/src/pjstun-client/client_main.c

@@ -30 +30 @@
 #define REQ_IP          NULL                /* IP address string */
 
+#define OPTIONS         PJ_STUN_NO_AUTHENTICATE
 
 static struct global
@@ -157 +158 @@
                 if (pj_stun_msg_check(buffer, len, PJ_STUN_IS_DATAGRAM)==PJ_SUCCESS) {
                     rc = pj_stun_session_on_rx_pkt(g.sess, buffer, len, 
-                                                   0, 
+                                                   OPTIONS, 
                                                    NULL, &addr, addrlen);
                     if (rc != PJ_SUCCESS)