commit 1263500f8b0001e6f1628b6743f91e8d9de36b94
author oliverschmidt <oliverschmidt> mer. mai 04 23:51:09 2005 +0000
committer oliverschmidt <oliverschmidt> mer. mai 04 23:51:09 2005 +0000
tree 4b5f56f8a95a92f6ab5880814919f28ec1aaaeb3
parent 1f615e4165ddb1e6ad687497c3ecf3cfb82d5901

Added support for CC: and change message parameter to match the content of a mltiline textentry widget.

contiki/apps/smtp-socket.c

diff --git a/contiki/apps/smtp-socket.c b/contiki/apps/smtp-socket.c
index 4ea7ed0..c5a2b2f 100644
--- a/contiki/apps/smtp-socket.c
+++ b/contiki/apps/smtp-socket.c
@@ -30,7 +30,7 @@
  * 
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: smtp-socket.c,v 1.3 2005/02/22 22:23:08 adamdunkels Exp $
+ * $Id: smtp-socket.c,v 1.4 2005/05/04 23:51:09 oliverschmidt Exp $
  */
 #include "smtp.h"
 
@@ -48,10 +48,13 @@
   char inputbuffer[4];
   
   char *to;
+  char *cc;
   char *from;
   char *subject;
   char *msg;
-  u16_t msglen;  
+  u8_t msgwidth;
+  u8_t msgheight;
+  u8_t line;
 };
 
 static struct smtp_state s;
@@ -107,7 +110,7 @@
   }
 
   SEND_STRING(&s.psock, (char *)smtp_rcpt_to);
-  SEND_STRING(&s.psock, s.from);
+  SEND_STRING(&s.psock, s.to);
   SEND_STRING(&s.psock, (char *)smtp_crnl);
 
   PSOCK_READTO(&s.psock, ISO_nl);
@@ -130,6 +133,10 @@
   SEND_STRING(&s.psock, s.to);
   SEND_STRING(&s.psock, (char *)smtp_crnl);
   
+  SEND_STRING(&s.psock, (char *)smtp_cc);
+  SEND_STRING(&s.psock, s.cc);
+  SEND_STRING(&s.psock, (char *)smtp_crnl);
+  
   SEND_STRING(&s.psock, (char *)smtp_from);
   SEND_STRING(&s.psock, s.from);
   SEND_STRING(&s.psock, (char *)smtp_crnl);
@@ -138,7 +145,10 @@
   SEND_STRING(&s.psock, s.subject);
   SEND_STRING(&s.psock, (char *)smtp_crnl);
 
-  PSOCK_SEND(&s.psock, s.msg, s.msglen);
+  for(s.line = 0; s.line < s.msgheight; ++s.line) {
+    SEND_STRING(&s.psock, (char *)smtp_crnl);
+    SEND_STRING(&s.psock, &s.msg[s.line * s.msgwidth]);
+  }
   
   SEND_STRING(&s.psock, (char *)smtp_crnlperiodcrnl);
 
@@ -173,8 +183,8 @@
 }
 /*---------------------------------------------------------------------------*/
 unsigned char
-smtp_send(char *to, char *from, char *subject,
-	  char *msg, u16_t msglen)
+smtp_send(char *to, char *cc, char *from, char *subject,
+	  char *msg, u8_t msgwidth, u8_t msgheight)
 {
   struct uip_conn *conn;
 
@@ -184,10 +194,12 @@
   }
   s.connected = 1;
   s.to = to;
+  s.cc = cc;
   s.from = from;
   s.subject = subject;
   s.msg = msg;
-  s.msglen = msglen;
+  s.msgwidth = msgwidth;
+  s.msgheight = msgheight;
 
   PSOCK_INIT(&s.psock, s.inputbuffer, sizeof(s.inputbuffer));
   

contiki/apps/smtp.h

diff --git a/contiki/apps/smtp.h b/contiki/apps/smtp.h
index 51cd0e6..e10a6de 100644
--- a/contiki/apps/smtp.h
+++ b/contiki/apps/smtp.h
@@ -28,7 +28,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: smtp.h,v 1.4 2004/07/04 11:35:08 adamdunkels Exp $
+ * $Id: smtp.h,v 1.5 2005/05/04 23:51:09 oliverschmidt Exp $
  *
  */
 #ifndef __SMTP_H__
@@ -42,9 +42,9 @@
 
 /* Functions. */
 void smtp_configure(char *localhostname, u16_t *smtpserver);
-unsigned char smtp_send(char *to, char *from,
+unsigned char smtp_send(char *to, char *cc, char *from,
 			char *subject, char *msg,
-			u16_t msglen);
+			u8_t msgwidth, u8_t msgheight);
 
 /*DISPATCHER_UIPCALL(smtp_appcall, state);*/