From 148892ef80356a790c7f41b383b68f3f8d033bd5 Mon Sep 17 00:00:00 2001
From: bagyenda <>
Date: Wed, 16 Mar 2005 05:16:09 +0000
Subject: [PATCH] Added Soren's changes for optimising size of notification.ind

---
 mbuni/mmlib/mms_msg.c        | 9 +++++----
 mbuni/mmlib/mms_msg.h        | 2 +-
 mbuni/mmlib/mms_util.c       | 2 +-
 mbuni/mmlib/mms_util.h       | 4 +++-
 mbuni/mmsc/mmsmobilesender.c | 3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index b8bb2a6..dd744c7 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1333,7 +1333,7 @@ MmsMsg *mms_deliveryreport(Octstr *msgid, Octstr *to, time_t date, Octstr *statu
 }
 
 MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url, 
-			 Octstr *transactionid, time_t expiryt)
+			 Octstr *transactionid, time_t expiryt, int optimizesize)
 {
      MmsMsg *m = gw_malloc(sizeof *m);
      char buf[10];
@@ -1360,9 +1360,10 @@ MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, Octstr *url,
         } else if (d) \
           http_header_add(m->headers, #h, d); \
        } while(0)
-
-     HX(From,NULL);
-     HX(Subject,NULL);
+     if (!optimizesize) {
+	  HX(From,NULL);
+	  HX(Subject,NULL);
+     }
      HX(X-Mms-Message-Class, "Personal");
 #undef HX
      
diff --git a/mbuni/mmlib/mms_msg.h b/mbuni/mmlib/mms_msg.h
index 86684bb..9780315 100644
--- a/mbuni/mmlib/mms_msg.h
+++ b/mbuni/mmlib/mms_msg.h
@@ -44,7 +44,7 @@ extern List *mms_message_headers(MmsMsg *msg);
 /* Make a notification message out of this one and the url given. */
 extern MmsMsg *mms_notification(MmsMsg *msg, unsigned int msize, 
 				Octstr *url,
-				Octstr *transactionid, time_t expiryt);
+				Octstr *transactionid, time_t expiryt, int optimizesize);
 
 MmsMsg *mms_retrieveconf(MmsMsg *msg, Octstr *transactionid, char *err, char *errtxt, Octstr *opt_from);
 int mms_remove_headers(MmsMsg *m, char *name);
diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 2e7d370..060cfd8 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -201,7 +201,7 @@ MmsBoxSettings *mms_load_mmsbox_settings(Cfg *cfg)
 	  m->mms_detokenizefuncs = NULL;
 
      cfg_get_bool(&m->allow_ip_type, grp, octstr_imm("allow-ip-type"));
-
+     cfg_get_bool(&m->optimize_notification_size, grp, octstr_imm("optimize-notification-size"));
      return m;
 }
 
diff --git a/mbuni/mmlib/mms_util.h b/mbuni/mmlib/mms_util.h
index c1bba88..9076ecf 100644
--- a/mbuni/mmlib/mms_util.h
+++ b/mbuni/mmlib/mms_util.h
@@ -68,8 +68,10 @@ typedef struct MmsBoxSettings {
      MmsDetokenizerFuncStruct *mms_detokenizefuncs; /* Link to detokenizer funcs. */
      void *mms_detokenizer_module_data;
 
-	 int allow_ip_type;
+     int allow_ip_type;
 
+     int optimize_notification_size;
+     
      Octstr *prov_notify;
      Octstr *prov_notify_arg;
      Octstr *prov_getstatus;
diff --git a/mbuni/mmsc/mmsmobilesender.c b/mbuni/mmsc/mmsmobilesender.c
index a4dde57..5ded50e 100644
--- a/mbuni/mmsc/mmsmobilesender.c
+++ b/mbuni/mmsc/mmsmobilesender.c
@@ -395,7 +395,8 @@ static int sendNotify(MmsEnvelope *e)
 	  
 	  smsg = mms_notification(msg, e->msize, url, transid, 
 				  e->expiryt ? e->expiryt :
-				  tnow + settings->default_msgexpiry);
+				  tnow + settings->default_msgexpiry,
+				  settings->optimize_notification_size);
 	  octstr_destroy(transid);
 	  octstr_destroy(url);
      } else if (mtype == MMS_MSGTYPE_DELIVERY_IND ||