automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40629 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 18 insertions, 22 deletions

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e359b407e..4f45d50fc 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3627,17 +3627,15 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
 		return -2;
 	}
 	/* Check for Media-description-level-address for audio */
-	if (pedanticsipchecking) {
-		c = get_sdp_iterate(&destiterator, req, "c");
-		if (!ast_strlen_zero(c)) {
-			if (sscanf(c, "IN IP4 %256s", host) != 1) {
-				ast_log(LOG_WARNING, "Invalid secondary host in c= line, '%s'\n", c);
-			} else {
-				/* XXX This could block for a long time, and block the main thread! XXX */
-				hp = ast_gethostbyname(host, &ahp);
-				if (!hp) {
-					ast_log(LOG_WARNING, "Unable to lookup host in secondary c= line, '%s'\n", c);
-				}
+	c = get_sdp_iterate(&destiterator, req, "c");
+	if (!ast_strlen_zero(c)) {
+		if (sscanf(c, "IN IP4 %256s", host) != 1) {
+			ast_log(LOG_WARNING, "Invalid secondary host in c= line, '%s'\n", c);
+		} else {
+			/* XXX This could block for a long time, and block the main thread! XXX */
+			hp = ast_gethostbyname(host, &ahp);
+			if (!hp) {
+				ast_log(LOG_WARNING, "Unable to lookup host in secondary c= line, '%s'\n", c);
 			}
 		}
 	}
@@ -3655,17 +3653,15 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
 		}
 	}
 	/* Check for Media-description-level-address for video */
-	if (pedanticsipchecking) {
-		c = get_sdp_iterate(&destiterator, req, "c");
-		if (!ast_strlen_zero(c)) {
-			if (sscanf(c, "IN IP4 %256s", host) != 1) {
-				ast_log(LOG_WARNING, "Invalid secondary host in c= line, '%s'\n", c);
-			} else {
-				/* XXX This could block for a long time, and block the main thread! XXX */
-				hp = ast_gethostbyname(host, &ahp);
-				if (!hp) {
-					ast_log(LOG_WARNING, "Unable to lookup host in secondary c= line, '%s'\n", c);
-				}
+	c = get_sdp_iterate(&destiterator, req, "c");
+	if (!ast_strlen_zero(c)) {
+		if (sscanf(c, "IN IP4 %256s", host) != 1) {
+			ast_log(LOG_WARNING, "Invalid secondary host in c= line, '%s'\n", c);
+		} else {
+			/* XXX This could block for a long time, and block the main thread! XXX */
+			hp = ast_gethostbyname(host, &ahp);
+			if (!hp) {
+				ast_log(LOG_WARNING, "Unable to lookup host in secondary c= line, '%s'\n", c);
 			}
 		}
 	}