*** empty log message ***

mbuni/mmlib/mms_mm7soap.c

@@ -295,11 +295,37 @@ MSoapMsg_t *mm7_parse_soap(List *headers, Octstr *body)
 	       if (c) 
 		    break;
 	  } 
-
 	  if (c)
 	       msg = c; /* this is already a copy. */	  
 	  octstr_destroy(cloc);	  
+     } else {
+	       /* XXX Sigh! Broken MMC don't set this parameter. Lets try to be kind to them! */
+	       int i, n = mime_entity_num_parts(mime);
+	       int found = 0;
+	       for (i = 0; !found && i < n; i++) {
+		    MIMEEntity *x = mime_entity_get_part(mime,i);
+		    List *hx = NULL;
+		    Octstr *xctype = NULL, *xparams = NULL;
+		    if (!x)
+			 goto loop;
+		    hx = mime_entity_headers(x);
+		    get_content_type(hx, &xctype, &xparams);
+		    
+		    if (xctype && octstr_case_compare(xctype, octstr_imm("text/xml")) != 0) {
+			 /* Found something that might be the body, since its not XML. 
+			  * Perhaps we compare bodies? For broken ones anyway, so no bother!
+			  */
+			 found = 1;
+			 msg = x;
 		    }
+	       loop:
+		    if (x && !found) mime_entity_destroy(x);
+		    if (hx) http_destroy_headers(hx);
+		    octstr_destroy(xctype);
+		    octstr_destroy(xparams);
+	       }
+     }
+          
      smsg = gw_malloc(sizeof *smsg);
      smsg->envelope = h;
      smsg->msg = msg;

mbuni/mmlib/mms_util.c

@@ -22,7 +22,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-
+#ifdef HAVE_LIBSSL
+#include <openssl/md5.h>
+#endif
 #include "mms_util.h"
 #include "mms_queue.h"
 #include "mms_uaprof.h"

mbuni/mmsbox/bearerbox.c

@@ -905,7 +905,7 @@ static int sendMsg(MmsEnvelope *e)
 	  info(0, "%s MMSBox Outgoing Queue MMS Send: From %s, to %s, msgsize=%ld: err=%s", 
                SEND_ERROR_STR(res),
                octstr_get_cstr(e->from), octstr_get_cstr(to->rcpt), e->msize,
-               err ? octstr_get_cstr(err) : "(null)");
+               err ? octstr_get_cstr(err) : "(none)");
 	  
 	  
 	  e->lasttry = tnow;