backport r8693

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/tags/1.0.0@8695 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/sofia-sip/.update

-Mon May 26 20:18:27 EDT 2008
+Tue May 27 11:32:48 EDT 2008

libs/sofia-sip/libsofia-sip-ua/nta/nta.c

@@ -1176,6 +1176,10 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
     progress = 60 * 1000;
   agent->sa_progress = progress;
 
+  if (server_rport > 2)
+    server_rport = 1;
+  agent->sa_server_rport = server_rport;
+
   agent->sa_bad_req_mask = bad_req_mask;
   agent->sa_bad_resp_mask = bad_resp_mask;
 
@@ -1197,7 +1201,6 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
   agent->sa_smime = smime;
   agent->sa_flags = flags & MSG_FLG_USERMASK;
   agent->sa_rport = rport != 0;
-  agent->sa_server_rport = server_rport != 0;
   agent->sa_tcp_rport = tcp_rport != 0;
   agent->sa_preload = preload;
   agent->sa_tport_threadpool = threadpool;

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_bool_v((x))
+#define NTATAG_SERVER_RPORT(x) ntatag_server_rport, tag_uint_v((x))
 
 NTA_DLL extern tag_typedef_t ntatag_server_rport_ref;
-#define NTATAG_SERVER_RPORT_REF(x) ntatag_server_rport_ref, tag_bool_vr(&(x))
+#define NTATAG_SERVER_RPORT_REF(x) ntatag_server_rport_ref, tag_uint_vr(&(x))
 
 NTA_DLL extern tag_typedef_t ntatag_tcp_rport;
 #define NTATAG_TCP_RPORT(x) ntatag_tcp_rport, tag_bool_v((x))