From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 3 Feb 2011 16:19:04 +0000 (-0600)
Subject: FS-3027
X-Git-Tag: v1.2-rc1~187^2~23^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74a0cfd1e101413a3941c41d04ee01d8df2ae418;p=thirdparty%2Ffreeswitch.git

FS-3027
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index dfd6a76974..8b2f470980 100644
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -4071,15 +4071,22 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
 	greedy = !!sofia_test_pflag(tech_pvt->profile, PFLAG_GREEDY);
 	scrooge = !!sofia_test_pflag(tech_pvt->profile, PFLAG_SCROOGE);
 
-	if (!greedy || !scrooge) {
-		if ((val = switch_channel_get_variable(channel, "sip_codec_negotiation"))) {
-			if (!strcasecmp(val, "greedy")) {
-				greedy = 1;
-			} else if (!strcasecmp(val, "scrooge")) {
-				scrooge = 1;
-				greedy = 1;
-			}
-		}
+	if ((val = switch_channel_get_variable(channel, "sip_codec_negotiation"))) {
+		if (!strcasecmp(val, "generous")) {
+			greedy = 0;
+			scrooge = 0;
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "sip_codec_negotiation overriding sofia inbound-codec-negotiation : generous\n" );
+		} else if (!strcasecmp(val, "greedy")) {
+			greedy = 1;
+			scrooge = 0;
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "sip_codec_negotiation overriding sofia inbound-codec-negotiation : greedy\n" );
+		} else if (!strcasecmp(val, "scrooge")) {
+			scrooge = 1;
+			greedy = 1;
+			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "sip_codec_negotiation overriding sofia inbound-codec-negotiation : scrooge\n" );
+		} else {
+		    switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "sip_codec_negotiation ignored invalid value : '%s' \n", val );	
+		}		
 	}
 
 	if ((tech_pvt->origin = switch_core_session_strdup(session, (char *) sdp->sdp_origin->o_username))) {