[sr-dev] git:3.3: Revert "Minor bug-fix: Need to update length."

[admin at sip-router.org]

Module: sip-router
Branch: 3.3
Commit: 97d882a722d933f509565b7a2c578cac8b3ea5f9
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97d882a722d933f509565b7a2c578cac8b3ea5f9

Author: Carsten Bock <carsten at ng-voice.com>
Committer: Carsten Bock <carsten at ng-voice.com>
Date:   Thu Nov  1 20:59:40 2012 +0100

Revert "Minor bug-fix: Need to update length."
(Not a Bug-Fix)

This reverts commit 942229d809e715ae330894b20d099f38b616c044.

---

 modules/rtpproxy/rtpproxy.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
index 3ba0455..e18655f 100644
--- a/modules/rtpproxy/rtpproxy.c
+++ b/modules/rtpproxy/rtpproxy.c
@@ -2206,7 +2206,7 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc
 			/* XXX must compare address families in all addresses */
 			if (pf == AF_INET6) {
 				if (autobridge_ipv4v6 != 0) {
-					if ((append_opts(&opts, 'E') == -1) || (append_opts(&opts, 'I') == -1))  {
+					if ((append_opts(&opts, 'E') == -1) && (append_opts(&opts, 'I') == -1))  {
 						LM_ERR("out of pkg memory\n");
 						FORCE_RTP_PROXY_RET (-1);
 					}
@@ -2220,13 +2220,10 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc
 				v[1].iov_len = opts.oidx;
 			} else {
 				if (autobridge_ipv4v6 != 0) {
-					if ((append_opts(&opts, 'I') == -1) || (append_opts(&opts, 'E') == -1))  {
+					if ((append_opts(&opts, 'I') == -1) && (append_opts(&opts, 'E') == -1))  {
 						LM_ERR("out of pkg memory\n");
 						FORCE_RTP_PROXY_RET (-1);
 					}
-					/* We need to update the pointers and the length here, it has changed. */
-					v[1].iov_base = opts.s.s;
-					v[1].iov_len = opts.oidx;
 				}
 			}