[svn-commits] oej: branch oej/darjeeling-prack-1.8 r369699 - /team/oej/darjeeling-prack-1.8...

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Jul  6 09:18:00 2012
New Revision: 369699

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369699
Log:
SImplify. KISS.

Modified:
    team/oej/darjeeling-prack-1.8/channels/chan_sip.c

Modified: team/oej/darjeeling-prack-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_sip.c?view=diff&rev=369699&r1=369698&r2=369699
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_sip.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_sip.c Fri Jul  6 09:18:00 2012
@@ -21425,9 +21425,7 @@
 	if (sip_cfg.early_media_focus && !ast_strlen_zero(p->theirtag_early) && !strcmp(p->theirtag_early, p->theirtag)) {
 		/* If we already are in early media phase, and have a response from a new device in this call we should
 	   	ignore the SDP. */
-		if(p->invitestate == INV_EARLY_MEDIA) {
-			req->ignoresdp = TRUE;
-		}
+		req->ignoresdp = TRUE;
 	}
 
 	if (p->relatedpeer && sipmethod == SIP_OPTIONS) {
@@ -28025,8 +28023,6 @@
 					ast_log(LOG_WARNING, "'%s' is not a valid maxforwards value at line %d.  Using default.\n", v->value, v->lineno);
 					peer->maxforwards = sip_cfg.default_max_forwards;
 				}
-			} else if (!strcasecmp(v->name, "earlymediafocus")) {
-				sip_cfg.early_media_focus = ast_true(v->value);
 			} else if (!strcasecmp(v->name, "accountcode")) {
 				ast_string_field_set(peer, accountcode, v->value);
 			} else if (!strcasecmp(v->name, "mohinterpret")) {
@@ -28926,6 +28922,8 @@
 			global_match_auth_username = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "srvlookup")) {
 			sip_cfg.srvlookup = ast_true(v->value);
+		} else if (!strcasecmp(v->name, "earlymediafocus")) {
+			sip_cfg.early_media_focus = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "pedantic")) {
 			sip_cfg.pedanticsipchecking = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "maxexpirey") || !strcasecmp(v->name, "maxexpiry")) {