commit 69cbdb3ced3f1b437fc12337992eb8e7a627174e
author oliverschmidt <oliverschmidt> jeu. mai 05 22:15:49 2005 +0000
committer oliverschmidt <oliverschmidt> jeu. mai 05 22:15:49 2005 +0000
tree 7c79c72815de02f9661ebc9c389626fe450dd7ce
parent 639f75d199b0cbca33ce4af70accb23fa788ad06

Added dns support.

contiki/apps/email.c

diff --git a/contiki/apps/email.c b/contiki/apps/email.c
index e25c28c..a792e84 100644
--- a/contiki/apps/email.c
+++ b/contiki/apps/email.c
@@ -29,7 +29,7 @@
  *
  * This file is part of the Contiki desktop environment for the C64.
  *
- * $Id: email.c,v 1.20 2005/05/05 20:57:09 oliverschmidt Exp $
+ * $Id: email.c,v 1.21 2005/05/05 22:15:49 oliverschmidt Exp $
  *
  */
 
@@ -38,6 +38,7 @@
 #include "ctk.h"
 #include "smtp.h"
 #include "uiplib.h"
+#include "resolv.h"
 #include "petsciiconv.h"
 #include "loader.h"
 #include "tcpip.h"
@@ -70,7 +71,7 @@
 static struct ctk_separator sep1 =
  {CTK_SEPARATOR(0, MAIL_HEIGHT + 3, MAIL_WIDTH + 1)};
 static struct ctk_label statuslabel =
- {CTK_LABEL(6, MAIL_HEIGHT + 4, MAIL_WIDTH - 12, 1, "")};
+ {CTK_LABEL(7, MAIL_HEIGHT + 4, MAIL_WIDTH - 14, 1, "")};
 
 
 static struct ctk_label tolabel =
@@ -186,15 +187,22 @@
 static void
 applyconfig(void)
 {
-  u16_t addr[2];
+  u16_t addr[2], *addrptr;
   char *cptr;
 
   for(cptr = smtpserver; *cptr != ' ' && *cptr != 0; ++cptr);
   *cptr = 0;
   
-  if(uiplib_ipaddrconv(smtpserver, (unsigned char *)addr)) {
-    smtp_configure("contiki", addr);
+  addrptr = &addr[0];
+  if(uiplib_ipaddrconv(smtpserver, (unsigned char *)addr) == 0) {
+    addrptr = resolv_lookup(smtpserver);
+    if(addrptr == NULL) {
+      resolv_query(smtpserver);
+      ctk_label_set_text(&statuslabel, "Resolving host...");
+      return;
+    }
   }
+  smtp_configure("contiki", addrptr);
 }
 /*-----------------------------------------------------------------------------------*/
 static void
@@ -242,11 +250,11 @@
     CTK_WIDGET_ADD(&setupwindow, &fromaddresstextentry);
     CTK_WIDGET_ADD(&setupwindow, &smtpserverlabel);
     CTK_WIDGET_ADD(&setupwindow, &smtpservertextentry);
-    CTK_WIDGET_ADD(&setupwindow, &pop3serverlabel);
+    /*	  CTK_WIDGET_ADD(&setupwindow, &pop3serverlabel);*/
     /*    CTK_WIDGET_ADD(&setupwindow, &pop3servertextentry);*/
-    CTK_WIDGET_ADD(&setupwindow, &pop3userlabel);
+    /*	  CTK_WIDGET_ADD(&setupwindow, &pop3userlabel);*/
     /*    CTK_WIDGET_ADD(&setupwindow, &pop3usertextentry);*/
-    CTK_WIDGET_ADD(&setupwindow, &pop3passwordlabel);
+    /*    CTK_WIDGET_ADD(&setupwindow, &pop3passwordlabel);*/
     /*    CTK_WIDGET_ADD(&setupwindow, &pop3passwordtextentry);*/
     CTK_WIDGET_ADD(&setupwindow, &setupokbutton);
 
@@ -322,6 +330,16 @@
 	email_quit();
       }
     }
+  } else if(ev == resolv_event_found) {
+    if(strcmp(data, smtpserver) == 0) {
+      if(resolv_lookup(smtpserver) != NULL) {
+	applyconfig();
+	ctk_label_set_text(&statuslabel, "");
+      } else {
+	ctk_label_set_text(&statuslabel, "Host not found");
+      }
+      CTK_WIDGET_REDRAW(&statuslabel);  
+    }
   } else if(ev == EK_EVENT_REQUEST_EXIT) {
     email_quit();
   }