Wed Jul 23 12:22:57 EDT 2008 Pekka Pessi <first.last@nokia.com>

  * nta: changed type of NTATAG_SERVER_RPORT() back to signed int

  Documented magic value 2 for server rport.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9267 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index ac529862960fa5b4d1a677f4973c271e92d33058..9eca0233e52028e1ea452d8fca3886d401997733 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Aug 12 13:02:56 EDT 2008
+Tue Aug 12 13:03:36 EDT 2008

diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index f8bcce170b7d65ad7db8f745d84e84bb8bc64b40..98197ece65691349d4bd086091f3b0d15c202453 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -987,7 +987,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
   void *smime         = agent->sa_smime;
   uint32_t flags      = agent->sa_flags;
   int rport           = agent->sa_rport;
-  unsigned server_rport    = agent->sa_server_rport;
+  int server_rport    = agent->sa_server_rport;
   int tcp_rport       = agent->sa_tcp_rport;
   unsigned preload         = agent->sa_preload;
   unsigned threadpool      = agent->sa_tport_threadpool;
@@ -1178,6 +1178,8 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
 
   if (server_rport > 2)
     server_rport = 1;
+  else if (server_rport < 0)
+    server_rport = 1;
   agent->sa_server_rport = server_rport;
 
   agent->sa_bad_req_mask = bad_req_mask;
@@ -1295,7 +1297,7 @@ int agent_get_params(nta_agent_t *agent, tagi_t *tags)
             NTATAG_PRELOAD(agent->sa_preload),
             NTATAG_PROGRESS(agent->sa_progress),
             NTATAG_REL100(agent->sa_invite_100rel),
-            NTATAG_SERVER_RPORT(agent->sa_server_rport),
+            NTATAG_SERVER_RPORT((int)(agent->sa_server_rport)),
             NTATAG_SIGCOMP_ALGORITHM(agent->sa_algorithm),
             NTATAG_SIGCOMP_OPTIONS(agent->sa_sigcomp_options ?
                                    agent->sa_sigcomp_options :

diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
index 9e015849951fe8e3dea7bbda033baa5b0e1c6309..d054a8795d6333fe4f4721f10445b661099333ac 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta_tag.c
@@ -1329,12 +1329,13 @@ tag_typedef_t ntatag_client_rport = BOOLTAG_TYPEDEF(client_rport);
  *          or false (zero or NULL pointer)
  *
  * @par Values
- *    - true - use "rport" parameter (default)
- *    - false - do not use "rport" parameterx
+ *    - 2 - add "rport" parameter even if was not present in request
+ *    - 1 - use "rport" parameter (default)
+ *    - 0 - do not use "rport" parameter
  *
  * @sa @RFC3581, NTATAG_CLIENT_RPORT(), NTATAG_TCP_RPORT(), @Via
  */
-tag_typedef_t ntatag_server_rport = UINTTAG_TYPEDEF(server_rport);
+tag_typedef_t ntatag_server_rport = INTTAG_TYPEDEF(server_rport);
 
 
 /**@def NTATAG_TCP_RPORT(x)

diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h b/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h
index 9fb014475d234683626136e3b2ef41e00392474d..b1eb0b42fb85a77bcecfa2760afa921947a65fa1 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/sofia-sip/nta_tag.h
@@ -358,10 +358,10 @@ NTA_DLL extern tag_typedef_t ntatag_client_rport_ref;
 #define NTATAG_RPORT_REF(x) ntatag_client_rport_ref, tag_bool_vr(&(x))
 
 NTA_DLL extern tag_typedef_t ntatag_server_rport;
-#define NTATAG_SERVER_RPORT(x) ntatag_server_rport, tag_uint_v((x))
+#define NTATAG_SERVER_RPORT(x) ntatag_server_rport, tag_int_v((x))
 
 NTA_DLL extern tag_typedef_t ntatag_server_rport_ref;
-#define NTATAG_SERVER_RPORT_REF(x) ntatag_server_rport_ref, tag_uint_vr(&(x))
+#define NTATAG_SERVER_RPORT_REF(x) ntatag_server_rport_ref, tag_int_vr(&(x))
 
 NTA_DLL extern tag_typedef_t ntatag_tcp_rport;
 #define NTATAG_TCP_RPORT(x) ntatag_tcp_rport, tag_bool_v((x))