Merge pull request #60 in FS/freeswitch from ~SJTHOMASON/freeswitch:FS-6823 to master

* commit 'afb00b2e':
  Force rport on ADTRAN TA Devices

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

@@ -3188,7 +3188,9 @@ int agent_check_request_via(nta_agent_t *agent,
   else if (agent->sa_server_rport == 2 ||
 		   (agent->sa_server_rport == 3 && sip && sip->sip_user_agent &&
 			sip->sip_user_agent->g_string &&
-			(!strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) || !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20)))) {
+			(!strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) ||
+			 !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20) ||
+			 !strncasecmp(sip->sip_user_agent->g_string, "ADTRAN_Total_Access", 19)))) {
     rport = su_sprintf(msg_home(msg), "rport=%u", ntohs(from->su_port));
     msg_header_replace_param(msg_home(msg), v->v_common, rport);
   }

src/mod/endpoints/mod_sofia/sofia_reg.c

@@ -1572,7 +1572,9 @@ uint8_t sofia_reg_handle_register_token(nua_t *nua, sofia_profile_t *profile, nu
 			if (!is_tcp && !is_tls && (zstr(network_ip) || !switch_check_network_list_ip(network_ip, profile->local_network)) &&
 				profile->server_rport_level >= 2 && sip->sip_user_agent &&
 				sip->sip_user_agent->g_string &&
-				( !strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) || !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20) )) {
+				( !strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) ||
+				  !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20) ||
+				  !strncasecmp(sip->sip_user_agent->g_string, "ADTRAN_Total_Access", 19) )) {
 				if (sip && sip->sip_via) {
 					const char *host = sip->sip_via->v_host;
 					const char *c_port = sip->sip_via->v_port;