FS-3571 FS-3442 FS-957 --resolve tighten up the parsing of these boolean vals issue in t38 sdp

src/include/switch_types.h

@@ -868,6 +868,7 @@ typedef struct {
 	uint16_t remote_port;
 	const char *local_ip;
 	uint16_t local_port;
+	const char *sdp_o_line;
 } switch_t38_options_t;
 
 /*!

src/include/switch_utils.h

@@ -525,6 +525,18 @@ static inline char *switch_clean_name_string(char *s)
 
 
 
+/*!
+  \brief Turn a string into a number (default if NULL)
+  \param nptr the string
+  \param dft the default
+  \return the number version of the string or the default
+*/
+static inline int switch_safe_atoi(const char *nptr, int dft)
+{
+	return nptr ? atoi(nptr) : dft;
+}
+
+
 /*!
   \brief Free a pointer and set it to NULL unless it already is NULL
   \param it the pointer

src/mod/applications/mod_spandsp/mod_spandsp_fax.c

@@ -806,7 +806,9 @@ static t38_mode_t negotiate_t38(pvt_t *pvt)
         switch_channel_set_private(channel, "t38_options", NULL);
     } else {
         pvt->t38_mode = T38_MODE_NEGOTIATED;
-        
+
+
+        switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38 SDP Origin = %s\n", t38_options->sdp_o_line);        
         switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38FaxVersion = %d\n", t38_options->T38FaxVersion);
         switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38MaxBitRate = %d\n", t38_options->T38MaxBitRate);
         switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "T38FaxFillBitRemoval = %d\n", t38_options->T38FaxFillBitRemoval);
@@ -827,7 +829,12 @@ static t38_mode_t negotiate_t38(pvt_t *pvt)
             t38_options->T38FaxVersion = 3;
         }
         t38_options->T38MaxBitRate = (pvt->disable_v17)  ?  9600  :  14400;
-        t38_options->T38FaxFillBitRemoval = 1;
+
+        /* cisco gets mad when we set this to one in a response where they set it to 0, are we allowed to hardcode this to 1 on responses?  */
+        if (!zstr(t38_options->sdp_o_line) && !switch_stristr("cisco", t38_options->sdp_o_line)) {
+            t38_options->T38FaxFillBitRemoval = 1;
+        }
+
         t38_options->T38FaxTranscodingMMR = 0;
         t38_options->T38FaxTranscodingJBIG = 0;
         t38_options->T38FaxRateManagement = "transferredTCF";

src/mod/endpoints/mod_sofia/sofia_glue.c

@@ -48,12 +48,23 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *
 	uint32_t port = t38_options->local_port;
 	const char *family = "IP4";
 	const char *username = tech_pvt->profile->username;
-	char MMR[32] = "";
-	char JBIG[32] = "";
-	char FILLBIT[32] = "";
+	const char *bit_removal_on = "a=T38FaxFillBitRemoval\n";
+	const char *bit_removal_off = "";
+	
+	const char *mmr_on = "a=T38FaxTranscodingMMR\n";
+	const char *mmr_off = "";
+
+	const char *jbig_on = "a=T38FaxTranscodingJBIG\n";
+	const char *jbig_off = "";
+	const char *var;
+	int broken_boolean;
 
 	//sofia_clear_flag(tech_pvt, TFLAG_ENABLE_SOA);
 
+	var = switch_channel_get_variable(tech_pvt->channel, "t38_broken_boolean");
+	
+	broken_boolean = switch_true(var);
+
 	if (!ip) {
 		if (!(ip = tech_pvt->adv_sdp_audio_ip)) {
 			ip = tech_pvt->proxy_sdp_audio_ip;
@@ -94,48 +105,6 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *
 					"o=%s %010u %010u IN %s %s\n"
 					"s=%s\n" "c=IN %s %s\n" "t=0 0\n", username, tech_pvt->owner_id, tech_pvt->session_id, family, ip, username, family, ip);
 
-	if(t38_options->T38FaxFillBitRemoval) {
-		if (switch_true(switch_channel_get_variable(tech_pvt->channel, "broken_T38FaxFillBitRemoval"))) {
-			switch_snprintf(FILLBIT, sizeof(FILLBIT), "a=T38FaxFillBitRemoval:1\n");
-		} else {
-			switch_set_string(FILLBIT, "a=T38FaxFillBitRemoval\n");
-		}
-	} else {
-		if (switch_true(switch_channel_get_variable(tech_pvt->channel, "broken_T38FaxFillBitRemoval"))) {
-			switch_snprintf(FILLBIT, sizeof(FILLBIT), "a=T38FaxFillBitRemoval:0\n");
-		} else {
-			switch_set_string(FILLBIT, "");
-		}
-	}
-
-	if( t38_options->T38FaxTranscodingMMR) {
-		if (switch_true(switch_channel_get_variable(tech_pvt->channel, "broken_T38FaxTranscodingMMR"))) {
-			switch_snprintf(MMR, sizeof(MMR), "a=T38FaxTranscodingMMR:1\n");
-		} else {
-			switch_set_string(MMR, "a=T38FaxTranscodingMMR\n");
-		}
-	} else {
-		if (switch_true(switch_channel_get_variable(tech_pvt->channel, "broken_T38FaxTranscodingMMR"))) {
-			switch_snprintf(MMR, sizeof(MMR), "a=T38FaxTranscodingMMR:0\n");
-		} else {
-			switch_set_string(MMR, "");
-		}
-	}
-
-	if( t38_options->T38FaxTranscodingJBIG) {
-		if (switch_true(switch_channel_get_variable(tech_pvt->channel, "broken_T38FaxTranscodingJBIG"))) {
-			switch_snprintf(JBIG, sizeof(JBIG), "a=T38FaxTranscodingJBIG:1\n");
-		} else {
-			switch_set_string(JBIG, "a=T38FaxTranscodingJBIG\n");
-		}
-	} else {
-		if (switch_true(switch_channel_get_variable(tech_pvt->channel, "broken_T38FaxTranscodingJBIG"))) {
-			switch_snprintf(JBIG, sizeof(JBIG), "a=T38FaxTranscodingJBIG:0\n");
-		} else {
-			switch_set_string(JBIG, "");
-		}
-	}
-
 	if (t38_options->T38FaxMaxBuffer) {
 		switch_snprintf(max_buf, sizeof(max_buf), "a=T38FaxMaxBuffer:%d\n", t38_options->T38FaxMaxBuffer);
 	};
@@ -145,6 +114,21 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *
 	};
 
 
+	
+
+	if (broken_boolean) {
+		bit_removal_on = "a=T38FaxFillBitRemoval:1\n";
+		bit_removal_off = "a=T38FaxFillBitRemoval:0\n";
+
+		mmr_on = "a=T38FaxTranscodingMMR:1\n";
+		mmr_off = "a=T38FaxTranscodingMMR:0\n";
+
+		jbig_on = "a=T38FaxTranscodingJBIG:1\n";
+		jbig_off = "a=T38FaxTranscodingJBIG:0\n";
+
+	}
+	
+
 	switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
 					"m=image %d udptl t38\n"
 					"a=T38FaxVersion:%d\n"
@@ -160,9 +144,9 @@ void sofia_glue_set_image_sdp(private_object_t *tech_pvt, switch_t38_options_t *
 					port,
 					t38_options->T38FaxVersion,
 					t38_options->T38MaxBitRate,
-					FILLBIT,
-					MMR,
-					JBIG,
+					t38_options->T38FaxFillBitRemoval ? bit_removal_on : bit_removal_off,
+					t38_options->T38FaxTranscodingMMR ? mmr_on : mmr_off,
+					t38_options->T38FaxTranscodingJBIG ? jbig_on : jbig_off,
 					t38_options->T38FaxRateManagement,
 					max_buf,
 					max_data,
@@ -4006,6 +3990,7 @@ void sofia_glue_copy_t38_options(switch_t38_options_t *t38_options, switch_core_
 	switch_channel_set_private(channel, "t38_options", local_t38_options);
 
 }
+
 static switch_t38_options_t *tech_process_udptl(private_object_t *tech_pvt, sdp_session_t *sdp, sdp_media_t *m)
 {
 	switch_t38_options_t *t38_options = switch_channel_get_private(tech_pvt->channel, "t38_options");
@@ -4025,6 +4010,12 @@ static switch_t38_options_t *tech_process_udptl(private_object_t *tech_pvt, sdp_
 
 	t38_options->remote_port = (switch_port_t)m->m_port;
 
+	if (sdp->sdp_origin) {
+		t38_options->sdp_o_line = switch_core_session_strdup(tech_pvt->session, sdp->sdp_origin->o_username);
+	} else {
+		t38_options->sdp_o_line = "unknown";
+	}
+	
 	if (m->m_connections && m->m_connections->c_address) {
 		t38_options->remote_ip = switch_core_session_strdup(tech_pvt->session, m->m_connections->c_address);
 	} else if (sdp && sdp->sdp_connection && sdp->sdp_connection->c_address) {
@@ -4037,41 +4028,11 @@ static switch_t38_options_t *tech_process_udptl(private_object_t *tech_pvt, sdp_
 		} else if (!strcasecmp(attr->a_name, "T38MaxBitRate") && attr->a_value) {
 			t38_options->T38MaxBitRate = (uint32_t) atoi(attr->a_value);
 		} else if (!strcasecmp(attr->a_name, "T38FaxFillBitRemoval")) {
-			if (switch_stristr("T38FaxFillBitRemoval:", tech_pvt->remote_sdp_str)) {
-				switch_channel_set_variable(tech_pvt->channel, "broken_T38FaxFillBitRemoval", "true");
-				if (atoi(attr->a_value) == 0) {
-					t38_options->T38FaxFillBitRemoval = SWITCH_FALSE;
-				} else {
-					t38_options->T38FaxFillBitRemoval = SWITCH_TRUE;
-				}
-			} else {
-				switch_channel_set_variable(tech_pvt->channel, "broken_T38FaxFillBitRemoval", "false");
-				t38_options->T38FaxFillBitRemoval = SWITCH_TRUE;
-			}
+			t38_options->T38FaxFillBitRemoval = switch_safe_atoi(attr->a_value, 1);
 		} else if (!strcasecmp(attr->a_name, "T38FaxTranscodingMMR")) {
-			if (switch_stristr("T38FaxTranscodingMMR:", tech_pvt->remote_sdp_str)) {
-				switch_channel_set_variable(tech_pvt->channel, "broken_T38FaxTranscodingMMR", "true");
-				if (atoi(attr->a_value) == 0) {
-					t38_options->T38FaxTranscodingMMR = SWITCH_FALSE;
-				} else {
-					t38_options->T38FaxTranscodingMMR = SWITCH_TRUE;
-				}
-			} else {
-				switch_channel_set_variable(tech_pvt->channel, "broken_T38FaxTranscodingMMR", "false");
-				t38_options->T38FaxTranscodingMMR = SWITCH_TRUE;
-			}
+			t38_options->T38FaxTranscodingMMR = switch_safe_atoi(attr->a_value, 1);
 		} else if (!strcasecmp(attr->a_name, "T38FaxTranscodingJBIG")) {
-			if (switch_stristr("T38FaxTranscodingJBIG:", tech_pvt->remote_sdp_str)) {
-				switch_channel_set_variable(tech_pvt->channel, "broken_T38FaxTranscodingJBIG", "true");
-				if (atoi(attr->a_value) == 0) {
-					t38_options->T38FaxTranscodingJBIG = SWITCH_FALSE;
-				} else {
-					t38_options->T38FaxTranscodingJBIG = SWITCH_TRUE;
-				}
-			} else {
-				switch_channel_set_variable(tech_pvt->channel, "broken_T38FaxTranscodingJBIG", "false");
-				t38_options->T38FaxTranscodingJBIG = SWITCH_TRUE;
-			}
+			t38_options->T38FaxTranscodingJBIG = switch_safe_atoi(attr->a_value, 1);
 		} else if (!strcasecmp(attr->a_name, "T38FaxRateManagement") && attr->a_value) {
 			t38_options->T38FaxRateManagement = switch_core_session_strdup(tech_pvt->session, attr->a_value);
 		} else if (!strcasecmp(attr->a_name, "T38FaxMaxBuffer") && attr->a_value) {
@@ -4420,6 +4381,11 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 		total_codecs = tech_pvt->num_negotiated_codecs;
 	}
 
+	if (switch_stristr("T38FaxFillBitRemoval:", r_sdp) || switch_stristr("T38FaxTranscodingMMR:", r_sdp) || 
+		switch_stristr("T38FaxTranscodingJBIG:", r_sdp)) {
+		switch_channel_set_variable(tech_pvt->channel, "t38_broken_boolean", "true");
+	}
+
 	for (m = sdp->sdp_media; m; m = m->m_next) {
 		sdp_connection_t *connection;
 		switch_core_session_t *other_session;