Changeset 2712 for pjproject/branches/projects/sipit24

Timestamp:

May 18, 2009 7:24:37 PM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #854: Adding SOFTWARE attribute in all outgoing requests causes compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)

File:

• pjproject/branches/projects/sipit24/pjnath/src/pjnath/stun_session.c (modified) (1 diff)

pjproject/branches/projects/sipit24/pjnath/src/pjnath/stun_session.c

@@ -220 +220 @@
     /* If the agent is sending a request, it SHOULD add a SOFTWARE attribute
      * to the request. The server SHOULD include a SOFTWARE attribute in all 
-     * responses 
+     * responses.
+     *
+     * If magic value is not PJ_STUN_MAGIC, only apply the attribute for
+     * responses.
      */
-    if (sess->srv_name.slen && !PJ_STUN_IS_INDICATION(msg->hdr.type) &&
-        pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_SOFTWARE, 0)==NULL) 
+    if (sess->srv_name.slen && 
+        pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_SOFTWARE, 0)==NULL &&
+        (PJ_STUN_IS_RESPONSE(msg->hdr.type) ||
+         PJ_STUN_IS_REQUEST(msg->hdr.type) && msg->hdr.magic==PJ_STUN_MAGIC)) 
     {
         pj_stun_msg_add_string_attr(pool, msg, PJ_STUN_ATTR_SOFTWARE,