Merge bab2fb7f24 into 3b58ebc5f3

We observed that the new Poly phones (formerly known as Polycom) were not getting sent a SIP UPDATE in certain circumstances (example: retrieving a parked call, and therefore, Caller ID would not show the parked caller). I renamed Polycom to Poly which will catch all Poly AND Polycom UA's. I also added Acrobits, and Ringotel to extend such functionality to those UA's. There were also other minor compatibility issues with the new Poly phones which have been resolved with tweaking the UA recognition on the code.

Co-authored-by: Joseph <junction1153@gmail.com>

src/mod/applications/mod_spandsp/mod_spandsp.c

@@ -519,6 +519,7 @@ switch_status_t load_configuration(switch_bool_t reload)
 	spandsp_globals.verbose_log_level = SWITCH_LOG_DEBUG;
 	spandsp_globals.use_ecm = 1;
 	spandsp_globals.disable_v17 = 0;
+	spandsp_globals.enable_jbig = 1;
 	spandsp_globals.prepend_string = switch_core_strdup(spandsp_globals.config_pool, "fax");
 	spandsp_globals.spool = switch_core_strdup(spandsp_globals.config_pool, "/tmp");
 	spandsp_globals.ident = "SpanDSP Fax Ident";
@@ -602,6 +603,11 @@ switch_status_t load_configuration(switch_bool_t reload)
 						spandsp_globals.disable_v17 = 1;
 					else
 						spandsp_globals.disable_v17 = 0;
+				} else if (!strcmp(name, "enable-jbig")) {
+					if (switch_true(value))
+						spandsp_globals.enable_jbig = 1;
+					else
+						spandsp_globals.enable_jbig = 0;
 				} else if (!strcmp(name, "enable-colour")) {
 					if (switch_true(value))
 						spandsp_globals.enable_colour_fax = 1;

src/mod/applications/mod_spandsp/mod_spandsp.h

@@ -73,6 +73,7 @@ struct spandsp_globals {
 	switch_log_level_t verbose_log_level;
 	short int disable_v17;
 	short int enable_tep;
+	short int enable_jbig;
 	short int enable_colour_fax;
 	short int enable_image_resizing;
 	short int enable_colour_to_bilevel;

src/mod/applications/mod_spandsp/mod_spandsp_fax.c

@@ -101,6 +101,7 @@ struct pvt_s {
 	int use_ecm;
 	int disable_v17;
 	int enable_tep;
+	int enable_jbig;
 	int enable_colour_fax;
 	int enable_image_resizing;
 	int enable_colour_to_bilevel;
@@ -983,9 +984,11 @@ static switch_status_t spanfax_init(pvt_t *pvt, transport_mode_t trans_mode)
                                         | T4_RESOLUTION_400_400);
 	compressions = T4_COMPRESSION_T4_1D
 				 | T4_COMPRESSION_T4_2D
-				 | T4_COMPRESSION_T6
-				 | T4_COMPRESSION_T85
+				 | T4_COMPRESSION_T6;
+	if (pvt->enable_jbig) {
+		compressions |=    T4_COMPRESSION_T85
 				 | T4_COMPRESSION_T85_L0;
+	}
 	if (pvt->enable_colour_fax) {
 		t30_set_supported_colour_resolutions(t30, T4_RESOLUTION_100_100
 												| T4_RESOLUTION_200_200
@@ -1363,6 +1366,12 @@ static pvt_t *pvt_init(switch_core_session_t *session, mod_spandsp_fax_applicati
 		pvt->disable_v17 = spandsp_globals.disable_v17;
 	}
 
+	if ((tmp = switch_channel_get_variable(channel, "fax_enable_jbig"))) {
+		pvt->enable_jbig = switch_true(tmp);
+	} else {
+		pvt->enable_jbig = spandsp_globals.enable_jbig;
+	}
+
 	if ((tmp = switch_channel_get_variable(channel, "fax_enable_colour"))) {
 		pvt->enable_colour_fax = switch_true(tmp);
 	} else {

src/mod/endpoints/mod_sofia/mod_sofia.c

@@ -254,7 +254,7 @@ char *generate_pai_str(private_object_t *tech_pvt)
 	callee_number = switch_sanitize_number(switch_core_session_strdup(session, callee_number));
 	callee_name = switch_sanitize_number(switch_core_session_strdup(session, callee_name));
 
-	if (!zstr(callee_number) && (zstr(ua) || !switch_stristr("polycom", ua))) {
+	if (!zstr(callee_number) && (zstr(ua) || !switch_stristr("poly", ua))) {
 		callee_number = switch_core_session_sprintf(session, "sip:%s@%s", callee_number, host);
 	}
 
@@ -2075,13 +2075,15 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 							nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
 									 TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), SIPTAG_PAYLOAD_STR(message), TAG_END());
 						} else if (update_allowed && ua && (switch_channel_var_true(tech_pvt->channel, "update_ignore_ua") ||
-									  switch_stristr("polycom", ua) ||
+									  switch_stristr("poly", ua) ||
 									  (switch_stristr("aastra", ua) && !switch_stristr("Intelligate", ua)) ||
 									  (switch_stristr("cisco/spa50", ua) ||
 									  switch_stristr("cisco/spa525", ua)) ||
 									  switch_stristr("cisco/spa30", ua) ||
 									  switch_stristr("Fanvil", ua) ||
 									  switch_stristr("Grandstream", ua) ||
+									  switch_stristr("Ringotel", ua) ||
+									  switch_stristr("Groundwire", ua) ||									  
 									  switch_stristr("Yealink", ua) ||
 									  switch_stristr("Mitel", ua) ||
 									  switch_stristr("Panasonic", ua))) {
@@ -2152,7 +2154,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 								 SIPTAG_PAYLOAD_STR(message),
 								 TAG_IF(!zstr(session_id_header), SIPTAG_HEADER_STR(session_id_header)),
 								 TAG_END());
-					} else if (ua && switch_stristr("polycom", ua)) {
+					} else if (ua && switch_stristr("poly", ua)) {
 						snprintf(message, sizeof(message), "P-Asserted-Identity: \"%s\" <%s>", msg->string_arg, tech_pvt->caller_profile->destination_number);
 						nua_update(tech_pvt->nh,
 								   NUTAG_SESSION_TIMER(tech_pvt->session_timeout),

src/mod/endpoints/mod_sofia/sofia.c

@@ -10476,7 +10476,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
 		(!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, "Poly", 4) || !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20)))
 		) {
 		if (sip->sip_via) {
 			const char *port = sip->sip_via->v_port;

src/mod/endpoints/mod_sofia/sofia_presence.c

@@ -2501,7 +2501,7 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *r
 {
 	char *ret = NULL;
 
-	if (switch_stristr("polycom", user_agent)) {
+	if (switch_stristr("poly", user_agent)) {
 		*ct = "application/xpidf+xml";
 
 		/* If unknown/none prpid is provided, just show the user as online. */

src/mod/endpoints/mod_sofia/sofia_reg.c

@@ -1661,7 +1661,7 @@ 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, "Poly", 4) ||
 				  !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_via) {