Changeset 2589 for pjproject/trunk/pjnath/src/pjnath/stun_session.c

Timestamp:

Apr 13, 2009 8:54:10 AM (16 years ago)

Author:

bennylp

Message:

Ticket #780: Update TURN from draft 09 to draft 13:

• new rules for permissions:
  • permission must be created and refreshed explicitly with CreatePermission?
  • transmitting data does not refresh permission
• attributes changed/added: XOR-PEER-ADDRESS, XOR-RELAYED-ADDRESS, EVEN-PORT, DONT-FRAGMENT
• attribute(s) removed: REQUESTED-PROPS
• new status codes: 401 (Forbidden), 507 (Insufficient Capacity)
• removed status codes: 443 (Invalid IP address), 444 (Invalid Port), 508 (Insufficient Port Capacity)

File:

• pjproject/trunk/pjnath/src/pjnath/stun_session.c (modified) (3 diffs)

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

@@ -218 +218 @@
     pj_str_t realm, username, nonce, auth_key;
 
-    /* The server SHOULD include a SOFTWARE attribute in all responses */
-    if (sess->srv_name.slen && PJ_STUN_IS_RESPONSE(msg->hdr.type)) {
+    /* 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 
+     */
+    if (sess->srv_name.slen && !PJ_STUN_IS_INDICATION(msg->hdr.type) &&
+        pj_stun_msg_find_attr(msg, PJ_STUN_ATTR_SOFTWARE, 0)==NULL) 
+    {
         pj_stun_msg_add_string_attr(pool, msg, PJ_STUN_ATTR_SOFTWARE,
                                     &sess->srv_name);
@@ -487 +492 @@
     sess->srv_name.ptr = (char*) pj_pool_alloc(pool, 32);
     sess->srv_name.slen = pj_ansi_snprintf(sess->srv_name.ptr, 32,
-                                           "pj_stun-%s", pj_get_version());
+                                           "pjnath-%s", pj_get_version());
 
     sess->rx_pool = pj_pool_create(sess->cfg->pf, name, 
@@ -591 +596 @@
 }
 
-PJ_DEF(pj_status_t) pj_stun_session_set_server_name(pj_stun_session *sess,
-                                                    const pj_str_t *srv_name)
+PJ_DEF(pj_status_t) pj_stun_session_set_software_name(pj_stun_session *sess,
+                                                      const pj_str_t *sw)
 {
     PJ_ASSERT_RETURN(sess, PJ_EINVAL);
-    if (srv_name)
-        pj_strdup(sess->pool, &sess->srv_name, srv_name);
+    if (sw && sw->slen)
+        pj_strdup(sess->pool, &sess->srv_name, sw);
     else
         sess->srv_name.slen = 0;