Changeset 521

Timestamp:

01/31/09 15:33:12 (3 years ago)

Author:

mooneer

Message:

Integrated interface.pop3 and interface.smtp modules (credit: Michael J. Edgar)

Location:

interpreter/trunk

Files:

• ChangeLog (modified) (1 diff)
• modules/Makefile.am (modified) (1 diff)
• modules/System/network/socket.c (modified) (5 diffs)
• modules/all_modules.kt (modified) (2 diffs)
• modules/interface/pop3.kt (added)
• modules/interface/smtp.kt (added)

interpreter/trunk/ChangeLog

@@ -1 +1 @@
 1/31/2009:
     * Regular expressions can be specified with "r/.../[i]" syntax (ticket #79)
+    * Integrated interface.pop3 and interface.smtp modules (credit: Michael J. Edgar)
 
 1/30/2009:

interpreter/trunk/modules/Makefile.am

@@ -20 +20 @@
         interface/http.kt interface/http/cgi.kt interface/language.kt interface/language/c.kt \
         interface/text.kt interface/text/readline.kt interface/text/base64.kt \
-        interface/text/binary.kt all_modules.kt
+        interface/text/binary.kt interface/pop3.kt interface/smtp.kt all_modules.kt
 
 AM_CFLAGS = -Wdeclaration-after-statement -Werror -Wextra -fno-omit-frame-pointer -ISystem/digest/ -I../objs -I../vm -fPIC -W -Wall -DCINVOKE_BUILD

interpreter/trunk/modules/System/network/socket.c

@@ -122 +122 @@
     kite_vm_return(thd, kite_new_integer(thd, ret));
 }
-
-/*****************************************************************************
- * Read up to the given number of bytes
- ****************************************************************************/
-KITE_CLASS_METHOD(Socket_read) {
-    kite_object_t *arg1 = args->builtin_data.listvalue.car;
-    kite_object_t *bytes = kite_int_object(thd, arg1);
+/*****************************************************************************
+ * Read up to the given number of bytes, also with a timeout supplied
+ ****************************************************************************/
+KITE_CLASS_METHOD(Socket_read_with_timeout) {
+    
+    kite_object_t *bytes;
+    kite_object_t *timeout;
+    struct timeval timeout_struct;
     kite_object_t *rval;
-    char *buf = calloc(bytes->builtin_data.intvalue + 1, 1);
-    int ret;
+    fd_set socklist;
+    
+    char *buf;
+    int ret, can_read;
+
+    KITE_GET_METHOD_ARGUMENT(bytes,1);
+    KITE_GET_METHOD_ARGUMENT(timeout, 2);
+    
+    buf = calloc(bytes->builtin_data.intvalue + 1, 1);
+    
+    timeout_struct.tv_sec = KITE_GET_INTEGER(timeout) / 1000;
+    timeout_struct.tv_usec = (float)(KITE_GET_INTEGER(timeout) % 1000) / 1000.0f;
 
     CHECK_SOCKET_OPEN;
-
+    
+    
+    FD_ZERO(&socklist);
+    FD_SET(KITE_GET_INTEGER(this),&socklist);
+    can_read = select(FD_SETSIZE,&socklist,NULL,NULL,&timeout_struct);
+    if (can_read <= 0) {
+      free(buf);
+      kite_vm_return(thd, kite_new_null(thd));
+      return;
+    }
+    
     ret = read(KITE_GET_INTEGER(this), buf, KITE_GET_STRING_LENGTH(bytes));
     if (ret < 0 && errno != EAGAIN) {
@@ -142 +163 @@
         free(buf);
         kite_vm_return(thd, kite_new_null(thd));
+        return;
     }
 
@@ -153 +175 @@
     kite_vm_return(thd, rval);
 }
+/*****************************************************************************
+ * Read up to the given number of bytes
+ ****************************************************************************/
+KITE_CLASS_METHOD(Socket_read) {
+    kite_object_t *arg1 = args->builtin_data.listvalue.car;
+    kite_object_t *bytes = kite_int_object(thd, arg1);
+    kite_object_t *rval;
+    char *buf = calloc(bytes->builtin_data.intvalue + 1, 1);
+    int ret, can_read;
+    struct timeval timeout;
+    fd_set socklist;
+    
+    CHECK_SOCKET_OPEN;
+    
+    timeout.tv_sec = 1;
+    timeout.tv_usec = 0;
+    
+    FD_ZERO(&socklist);
+    FD_SET(KITE_GET_INTEGER(this),&socklist);
+    can_read = select(FD_SETSIZE,&socklist,NULL,NULL,&timeout);
+    if (can_read <= 0) {
+      free(buf);
+      kite_vm_return(thd, kite_new_null(thd));
+      return;
+    }
+    ret = read(KITE_GET_INTEGER(this), buf, KITE_GET_INTEGER(bytes));
+    if (ret < 0 && errno != EAGAIN) {
+        free(buf);
+        THROW_SOCKET_ERROR;
+    } else if (ret == 0) {
+        free(buf);
+        kite_vm_return(thd, kite_new_null(thd));
+        return;
+    }
+
+    rval = kite_new_string_with_length(
+            thd, 
+            buf, 
+            ret
+        );
+    free(buf);
+    kite_dereference_object(bytes);
+    kite_vm_return(thd, rval);
+}
 
 /*****************************************************************************
@@ -161 +227 @@
     int ret, idx = 0;
     kite_object_t *rval;
+    int can_read;
+    struct timeval timeout;
+    fd_set socklist;
 
     CHECK_SOCKET_OPEN;
     KITE_NO_ARGS;
-    
+
     buf = calloc(1, 1);
+    
+    timeout.tv_sec = 1;
+    timeout.tv_usec = 0;
+    
+    FD_ZERO(&socklist);
+    FD_SET(KITE_GET_INTEGER(this),&socklist);
+    can_read = select(FD_SETSIZE,&socklist,NULL,NULL,&timeout);
+    if (can_read <= 0) {
+      free(buf);
+      kite_vm_return(thd, kite_new_null(thd));
+      return;
+    }
+    
     do {
         ret = read(KITE_GET_INTEGER(this), &buf[idx], 1);
@@ -476 +558 @@
                                   "Read bytes from socket and place in a string.", 1,
                                   "size", "Number of bytes to read."));
+    kite_add_method(thread, newclass, "read", 
+        kite_new_method_compiled_with_docs(thread, Socket_read_with_timeout, 
+                                  "Read bytes from socket and place in a string. Takes a timeout argument", 2,
+                                  "size", "Number of bytes to read.",
+                                  "timeout", "Number of milliseconds to wait for a connection."));
     kite_add_method(thread, newclass, "readline", 
         kite_new_method_compiled_with_docs(thread, Socket_readline, 

interpreter/trunk/modules/all_modules.kt

@@ -31 +31 @@
 import "System.collections";
 import "System.date";
+import "System.digest";
 import "System.directory";
 import "System.doc";
@@ -60 +61 @@
 import "interface.text.base64";
 import "interface.text.binary";
+import "interface.pop3";
+import "interface.smtp";