From fbbec2877bb875168f61bfe64278f788bab687fc Mon Sep 17 00:00:00 2001
From: bagyenda <>
Date: Mon, 5 May 2008 20:25:13 +0000
Subject: [PATCH] *** empty log message ***

---
 mbuni/mmlib/mms_util.c       |  7 +++++--
 mbuni/mmlib/mms_util.h       |  3 ++-
 mbuni/mmsbox/bearerbox.c     |  4 +++-
 mbuni/mmsc/mmsglobalsender.c |  4 +++-
 mbuni/mmsc/mmsproxy.c        | 16 ++++++++++++----
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 7fbd5e2..fc53ab0 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -885,7 +885,8 @@ int mm_lockfile(int fd, char *fname, int shouldblock)
 void mms_collect_envdata_from_msgheaders(List *mh, List **xto, 
 					 Octstr **subject, 
 					 Octstr **otransid, time_t *expiryt, 
-					 time_t *deliveryt, long default_msgexpiry)
+					 time_t *deliveryt, long default_msgexpiry, 
+					 char *unified_prefix, List *strip_prefixes)
 {
 
      Octstr *s;
@@ -895,9 +896,9 @@ void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
 	  for (i = 0, n = gwlist_len(l); i<n; i++) {
 	       Octstr *name, *value;
 	       http_header_get(l, i, &name, &value);
+	       _mms_fixup_address(&value, unified_prefix, strip_prefixes, 1);
 	       gwlist_append(*xto, value);
 	       octstr_destroy(name);
-
 	  }
 	  http_destroy_headers(l);
      }
@@ -908,6 +909,7 @@ void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
 	  for (i = 0, n = gwlist_len(l); i<n; i++) {
 	       Octstr *name, *value;
 	       http_header_get(l, i, &name, &value);
+	       _mms_fixup_address(&value, unified_prefix, strip_prefixes, 1);
 	       gwlist_append(*xto, value);
 	       octstr_destroy(name);
 
@@ -923,6 +925,7 @@ void mms_collect_envdata_from_msgheaders(List *mh, List **xto,
 	  for (i = 0, n = gwlist_len(l); i<n; i++) {
 	       Octstr *name, *value;
 	       http_header_get(l, i, &name, &value);
+	       _mms_fixup_address(&value, unified_prefix, strip_prefixes, 1);
 	       gwlist_append(*xto, value);
 	       octstr_destroy(name);
 
diff --git a/mbuni/mmlib/mms_util.h b/mbuni/mmlib/mms_util.h
index 1052f96..7f59aac 100644
--- a/mbuni/mmlib/mms_util.h
+++ b/mbuni/mmlib/mms_util.h
@@ -146,7 +146,8 @@ Octstr *_mms_cfg_getx(mCfgGrp *grp, Octstr *item);
 void mms_collect_envdata_from_msgheaders(List *mh, List **xto, 
 					 Octstr **subject, 
 					 Octstr **otransid, time_t *expiryt, 
-					 time_t *deliveryt, long default_msgexpiry);
+					 time_t *deliveryt, long default_msgexpiry,
+					 char *unified_prefix, List *strip_prefixes);
 
 /* Simple hash function */
 unsigned long _mshash(char *s);
diff --git a/mbuni/mmsbox/bearerbox.c b/mbuni/mmsbox/bearerbox.c
index cdf24ba..f89c58e 100644
--- a/mbuni/mmsbox/bearerbox.c
+++ b/mbuni/mmsbox/bearerbox.c
@@ -390,7 +390,9 @@ static void mm7eaif_receive(MmsHTTPClientInfo *h)
       */
      mms_collect_envdata_from_msgheaders(mh, &to, &subject, 
 					 &otransid, &expiryt, &deliveryt, 
-					 DEFAULT_EXPIRE);
+					 DEFAULT_EXPIRE,
+					 octstr_get_cstr(unified_prefix), 
+					 strip_prefixes);
      
      
      if ((hto = http_header_find_all(h->headers, "X-NOKIA-MMSC-To")) != NULL && 
diff --git a/mbuni/mmsc/mmsglobalsender.c b/mbuni/mmsc/mmsglobalsender.c
index 8cac658..a9ac459 100644
--- a/mbuni/mmsc/mmsglobalsender.c
+++ b/mbuni/mmsc/mmsglobalsender.c
@@ -79,7 +79,9 @@ static int  sendMsg(MmsEnvelope *e)
 	       MmsEnvelopeTo *to = gwlist_get(e->to, i);
 	       Octstr *s = octstr_duplicate(to->rcpt);
 	       
-	       _mms_fixup_address(&s, octstr_get_cstr(settings->unified_prefix), settings->strip_prefixes, 1);
+	       _mms_fixup_address(&s, 
+				  octstr_get_cstr(settings->unified_prefix),
+				  settings->strip_prefixes, 1);
 	       gwlist_append(l, s);
 	  }
 	   
diff --git a/mbuni/mmsc/mmsproxy.c b/mbuni/mmsc/mmsproxy.c
index ef0e296..ff37a2b 100644
--- a/mbuni/mmsc/mmsproxy.c
+++ b/mbuni/mmsc/mmsproxy.c
@@ -555,7 +555,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h)
 	  Octstr *sdf = NULL;
 	  
 	  mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt, 
-					      &deliveryt, settings->default_msgexpiry);
+					      &deliveryt, settings->default_msgexpiry,
+					      octstr_get_cstr(settings->unified_prefix), 
+					      settings->strip_prefixes);
 	  
 	  if (!h->client_addr) {
 	       mresp = mms_sendconf("Error-sending-address-unresolved", "None", 
@@ -678,7 +680,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h)
 
 
 	  mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt, 
-					      &deliveryt, settings->default_msgexpiry);
+					      &deliveryt, settings->default_msgexpiry,
+					      octstr_get_cstr(settings->unified_prefix), 
+					      settings->strip_prefixes);
 	  
 	  if (!h->client_addr) {
 	       mresp = mms_sendconf("Error-sending-address-unresolved", "None", octstr_get_cstr(otransid),1,
@@ -1032,7 +1036,9 @@ static void sendmms_proxy(MmsHTTPClientInfo *h)
 	       goto mdone2;
 	  
 	  mms_collect_envdata_from_msgheaders(mh, &to,  NULL, NULL, NULL, NULL, 
-	       settings->default_msgexpiry);
+					      settings->default_msgexpiry,
+					      octstr_get_cstr(settings->unified_prefix), 
+					      settings->strip_prefixes);
 	  
 	  x = settings->qfs->mms_queue_add(from, to,  NULL, NULL, NULL, time(NULL), 
 			    time(NULL) + settings->default_msgexpiry, 
@@ -1785,7 +1791,9 @@ static void mm7eaif_dispatch(MmsHTTPClientInfo *h)
       * for now we ignore adaptation flags. 
       */
      mms_collect_envdata_from_msgheaders(mh, &to, &subject, &otransid, &expiryt, 
-					 &deliveryt, settings->default_msgexpiry);
+					 &deliveryt, settings->default_msgexpiry,
+					      octstr_get_cstr(settings->unified_prefix), 
+					      settings->strip_prefixes);
      
 
      if ((hto = http_header_find_all(h->headers, "X-NOKIA-MMSC-To")) != NULL &&