Changeset 4199 for pjproject/trunk

Timestamp:

Jul 5, 2012 10:52:55 AM (12 years ago)

Author:

nanang

Message:

Re: Added compile-time setting PJNATH_STUN_SOFTWARE_NAME to specify SOFTWARE attribute for STUN sessions.

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/config.h (modified) (1 diff)
• include/pjnath/stun_config.h (modified) (2 diffs)
• src/pjnath/stun_session.c (modified) (1 diff)

pjproject/trunk/pjnath/include/pjnath/config.h

@@ -488 +488 @@
 #endif
 
+/** Default STUN software name */
+#ifndef PJNATH_STUN_SOFTWARE_NAME
+#   define PJNATH_MAKE_SW_NAME(a,b,c,d)     "pjnath-" #a "." #b "." #c d
+#   define PJNATH_MAKE_SW_NAME2(a,b,c,d)    PJNATH_MAKE_SW_NAME(a,b,c,d)
+#   define PJNATH_STUN_SOFTWARE_NAME        PJNATH_MAKE_SW_NAME2( \
+                                                    PJ_VERSION_NUM_MAJOR, \
+                                                    PJ_VERSION_NUM_MINOR, \
+                                                    PJ_VERSION_NUM_REV, \
+                                                    PJ_VERSION_NUM_EXTRA)
+#endif
+
 /**
  * @}

pjproject/trunk/pjnath/include/pjnath/stun_config.h

@@ -82 +82 @@
     unsigned             res_cache_msec;
 
+    /**
+     * Software name to be included in all STUN requests and responses.
+     *
+     * Default: PJNATH_STUN_SOFTWARE_NAME.
+     */
+    pj_str_t             software_name;
+
 } pj_stun_config;
 
@@ -103 +110 @@
     cfg->rto_msec = PJ_STUN_RTO_VALUE;
     cfg->res_cache_msec = PJ_STUN_RES_CACHE_DURATION;
+    cfg->software_name = pj_str((char*)PJNATH_STUN_SOFTWARE_NAME);
 }
 

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

@@ -501 +501 @@
     sess->use_fingerprint = fingerprint;
     sess->log_flag = 0xFFFF;
-    
-    sess->srv_name.ptr = (char*) pj_pool_alloc(pool, 32);
-    sess->srv_name.slen = pj_ansi_snprintf(sess->srv_name.ptr, 32,
-                                           "pjnath-%s", pj_get_version());
+
+    pj_stun_session_set_software_name(sess, &cfg->software_name);
 
     sess->rx_pool = pj_pool_create(sess->cfg->pf, name,