Hi!

Here's the humble result of tonight's work. Just a few bugfixes.

The patch is against the 0.9.7 version posted earlier by Paul.

Enjoy!

-- 
SÃren Hansen <[EMAIL PROTECTED]>
Index: mmsc/mmsfromemail.c
===================================================================
RCS file: /home/sh/src/cvs/mbuni/mmsc/mmsfromemail.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mmsfromemail.c
--- mmsc/mmsfromemail.c	3 Mar 2005 13:33:01 -0000	1.1.1.2
+++ mmsc/mmsfromemail.c	3 Mar 2005 19:55:02 -0000
@@ -152,9 +152,9 @@
 		    dlr = 0;
 
 	       qf = mms_queue_add(xfrom, lto, msgid, NULL, xproxy, NULL,
-				  0, time(NULL) + settings->default_msgexpiry, msg, NULL, 0,
+				  0, time(NULL) + settings->default_msgexpiry, msg, NULL, dlr,
 				  octstr_get_cstr(settings->global_queuedir));
-	       list_destroy(lto, NULL);
+
 	       if (qf) {
 
 		    info(0, "Email2MMS Queued message to %s from %s (via %s) => %s",
@@ -191,7 +191,7 @@
 	       mms_log("Received", xfrom, lto, 
 		       -1, msgid, NULL, xproxy, xproxy ? "MM4" : "MM3", NULL);
 	       
-
+	       list_destroy(lto, NULL);
 	       octstr_destroy(transid);
 	       octstr_destroy(msgid);
 	       if (dreport) 
Index: mmsc/mmsproxy.c
===================================================================
RCS file: /home/sh/src/cvs/mbuni/mmsc/mmsproxy.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 mmsproxy.c
--- mmsc/mmsproxy.c	3 Mar 2005 13:33:01 -0000	1.1.1.2
+++ mmsc/mmsproxy.c	3 Mar 2005 23:04:08 -0000
@@ -750,7 +750,6 @@
 	  
 	  MmsMsg *mrpt;
 	  
-	  
 	  if (mtype == MMS_MSGTYPE_NOTIFYRESP)
 	       status  = mms_get_header_value(m, octstr_imm("X-Mms-Status"));
 	  else  /* This (acknowledge-ind) is the same as notify_resp with status=retrieved. */
@@ -771,8 +770,8 @@
 	  } else
 	       e->lastaccess = time(NULL); /* Note now that it has been touched. */
 	  
-	  if (allow_report == NULL 
-	      || (octstr_case_compare(allow_report, octstr_imm("Yes")) == 0 &&
+	  if (allow_report != NULL 
+	      && (octstr_case_compare(allow_report, octstr_imm("Yes")) == 0 &&
 	      e->dlr)) {		    
 	       Octstr *x;
 	       List *l = list_create();
Index: mmlib/mms_uaprof.c
===================================================================
RCS file: /home/sh/src/cvs/mbuni/mmlib/mms_uaprof.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 mms_uaprof.c
--- mmlib/mms_uaprof.c	3 Mar 2005 13:31:31 -0000	1.1.1.1
+++ mmlib/mms_uaprof.c	3 Mar 2005 15:30:26 -0000
@@ -1027,7 +1027,7 @@
      List *params_h;
      
      tmpf[0] = 0;
-     get_content_type(m->headers, &content_type, &params);	       
+     get_content_type(m->headers, &content_type, &params);
      params_h = get_value_parameters(params);
 
      if (m->multiparts && list_len(m->multiparts) > 0) {
Index: mmlib/mms_util.c
===================================================================
RCS file: /home/sh/src/cvs/mbuni/mmlib/mms_util.c,v
retrieving revision 1.2
diff -u -r1.2 mms_util.c
--- mmlib/mms_util.c	3 Mar 2005 13:43:48 -0000	1.2
+++ mmlib/mms_util.c	3 Mar 2005 19:54:06 -0000
@@ -407,6 +407,7 @@
 
      if (!*type) {
 	  *type = octstr_create("application/octet-stream");
+	  *params = octstr_create("");
 	  return -1;          
      }
      for (i = 0, n = octstr_len(*type); i < n; i++) {

Attachment: smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
Devel mailing list
[email protected]
http://mbuni.org/mailman/listinfo/devel_mbuni.org

Reply via email to