WebSVN – Kolibri OS – Diff – /programs/develop/tinypy/tinypy/kolibri_net.c

 #include "tp.h"
 extern tp_obj tp_dict(TP);
 extern tp_obj tp_method(TP,tp_obj self,tp_obj v(TP));
+extern tp_obj tp_fnc(TP,tp_obj v(TP));
+extern tp_obj tp_get(TP,tp_obj self, tp_obj k);
+tp_obj tp_has(TP,tp_obj self, tp_obj k);
+#define _cdecl __attribute__((cdecl))
+extern int (* _cdecl con_printf)(const char* format,...);
-extern tp_obj tp_fnc(TP,tp_obj v(TP));
+#define PRECISION 0.000001
 #define GET_SOCKET_DESCRIPTOR(_obj, _sock) do{                  \
-    if (!tp_has(tp, _obj, tp_string("socket")))                  \
+    if (fabs(tp_has(tp, _obj, tp_string("socket")).number.val) < PRECISION)\
         tp_raise(tp_None, "Socket not open", tp_None);          \
-    _sock = (__u32)tp_get(tp, _obj, tp_string("socket")).number.val;\
+    _sock = (__u32)(tp_get(tp, _obj, tp_string("socket")).number.val + PRECISION);\
 } while(0)
 /* Socket close method.
+ *
  * Example:
  * s.close() # s must be a socket object created by socket.
  *
  * Raises exception if socket was not opened. Otherwise returns True.
  */
-tp_obj kolibri_close_socket(TP)
+static tp_obj kolibri_close_socket(TP)
+{
     tp_obj self = TP_TYPE(TP_DICT);
-    __u32  socktype;
-    __u32  s;
+    __u32  socktype;
-    GET_SOCKET_DESCRIPTOR(self, s);
-    con_printf("cp5\n");
-    socktype = (__u32)tp_get(tp, self, tp_string("type")).number.val;
-    con_printf("cp6\n");
-    if (!tp_has(tp, self, tp_string("socket")))
-    {
+    __u32  s;
         con_printf("cp7\n");
-        tp_raise(tp_None, "Socket not open", tp_None);
-    }
-    s = (__u32)tp_get(tp, self, tp_string("socket")).number.val;
+    GET_SOCKET_DESCRIPTOR(self, s);
-    con_printf("cp0, s=%d\n", s);
-    if (socktype == SOCK_STREAM)
-        con_printf("cp1\n");
-        __menuet__close_TCP_socket(s);
+    socktype = (__u32)tp_get(tp, self, tp_string("type")).number.val;
-        con_printf("cp2\n");
     GET_SOCKET_DESCRIPTOR(self, s);
-    else if (socktype == SOCK_DGRAM)
+    if (socktype == SOCK_STREAM)
         __menuet__close_TCP_socket(s);
-        __menuet__close_UDP_socket(s);
+    else if (socktype == SOCK_DGRAM)
  * data="Preved!!!Example."
  * s.send(data)
  * or:
  * s.send(data, 20) # Send just 20 bytes
  */
-tp_obj kolibri_send(TP)
+static tp_obj kolibri_send(TP)
+{
     tp_obj self = TP_TYPE(TP_DICT);
     tp_obj data_obj = TP_TYPE(TP_STRING);
     __u32  datalen = TP_DEFAULT(tp_False).number.val;
     __u32  socktype = (__u32)tp_get(tp, self, tp_string("type")).number.val;
     __u32  s;
+    int result;
     GET_SOCKET_DESCRIPTOR(self, s);
     if (datalen < 0 || datalen > data_obj.string.len)
         datalen = data_obj.string.len;
     if (socktype == SOCK_STREAM)
-        __menuet__write_TCP_socket(s, datalen, (void *)data_obj.string.val);
+        result = __menuet__write_TCP_socket(s, datalen, (void *)data_obj.string.val);
     else if (socktype == SOCK_DGRAM)
-        __menuet__write_UDP_socket(s, datalen, (void *)data_obj.string.val);
+        result = __menuet__write_UDP_socket(s, datalen, (void *)data_obj.string.val);
-    return tp_None;
+    return tp_number(!(result != 0));
+}
 /* Socket recv method.
+ *
  * data="Preved!!!Example."
  * s.recv(data)
  * or:
  * s.recv(data, 20) # Send just 20 bytes
  */
-tp_obj kolibri_recv(TP)
 static tp_obj kolibri_recv(TP)
     tp_obj self = TP_TYPE(TP_DICT);
-    tp_obj data_obj = TP_TYPE(TP_STRING);
+    tp_obj self = TP_TYPE(TP_DICT);
     __u32  datalen = TP_DEFAULT(tp_False).number.val;
     __u32  s;
+        }
+    }
     return tp_string_n(buf, bytes_read);
+}
-void inet_pton(TP, const char *buf, int len, __u32 *addr)
+static void inet_pton(TP, const char *buf, int len, __u32 *addr)
+{
     char *p = (char *)buf;
     int i = 0;
     __u32 val = 0;
     *addr = 0;
     while (*p && p < buf + len && i < 4)
-    {
-        con_printf("char %d", *p);
+    {
-        if (*p == '.')
+        if (*p == '.' || !*p)
+        {
             if (val > 255)
-                tp_raise(, "ValueError: number > 255 in IP address", tp_None);
+                tp_raise(tp_None, "ValueError: number > 255 in IP address", tp_None);
-            *addr += (val << ((i++) << 3));
-            con_printf("num %d\n", val);
+            *addr += (val << ((i++) << 3));
             val = 0;
+        }
         else
+        {
             if (*p < '0' || *p > '9')
-                tp_raise(, "ValueError: bad char in IP address, digit expected", tp_None);
+                tp_raise(tp_None, "ValueError: bad char in IP address, digit expected", tp_None);
             val = val * 10 + *p - '0';
+        }
         p++;
+    }
+    if (!*p)
+    {
+        if (i == 3)
+            *addr += (val << ((i++) << 3));
+        else
+            tp_raise(tp_None, "ValueError: bad IP address", tp_None);
+    }
+}
 /* Converter from string presentation to binary address. */
-tp_obj kolibri_inet_pton(TP)
+static tp_obj kolibri_inet_pton(TP)
+{
-    tp_obj obj;
-    __u32 addr;
+    tp_obj obj;
-    con_printf("A1\n");
-    obj = TP_TYPE(TP_STRING);
+    __u32 addr;
-    con_printf("A2\n");
-    inet_pton(tp, (char *)obj.string.val, (int)obj.string.len, &addr);
+    obj = TP_TYPE(TP_STRING);
-    con_printf("A3\n");
+    inet_pton(tp, (char *)obj.string.val, (int)obj.string.len, &addr);
     return tp_number(addr);
+}
+{
     tp_obj s;
     tp_obj sockfamily = TP_TYPE(TP_NUMBER);
     tp_obj socktype = TP_TYPE(TP_NUMBER);
-    if (abs(sockfamily.number.val - AF_INET) > 0.000001 ||
+    if (fabs(sockfamily.number.val - AF_INET) > PRECISION ||
-        (abs(socktype.number.val - SOCK_STREAM) > 0.000001 &&
+        (fabs(socktype.number.val - SOCK_STREAM) > PRECISION &&
-         abs(socktype.number.val - SOCK_DGRAM) > 0.000001))
+         fabs(socktype.number.val - SOCK_DGRAM) > PRECISION))
         return tp_None;
     s = tp_dict(tp);
     tp_set(tp, s, tp_string("family"), sockfamily);
     tp_set(tp, s, tp_string("type"), socktype);
     tp_set(tp, s, tp_string("bind"), tp_method(tp, s, kolibri_bind));
     tp_set(tp, s, tp_string("connect"), tp_method(tp, s, kolibri_connect));
     tp_set(tp, s, tp_string("send"), tp_method(tp, s, kolibri_send));
     tp_set(tp, s, tp_string("recv"), tp_method(tp, s, kolibri_recv));
     tp_set(tp, s, tp_string("close"), tp_method(tp, s, kolibri_close_socket));
-    if (abs(socktype.number.val - SOCK_STREAM) < 0.000001)
+    if (fabs(socktype.number.val - SOCK_STREAM) < PRECISION)
         tp_set(tp, s, tp_string("listen"), tp_method(tp, s, kolibri_listen));
     return s;
+}
     tp_obj socket_mod = tp_dict(tp);
     tp_set(tp, socket_mod, tp_string("AF_INET"), tp_number(AF_INET));
     tp_set(tp, socket_mod, tp_string("SOCK_STREAM"), tp_number(SOCK_STREAM));
-    tp_set(tp, socket_mod, tp_string("SOCK_DGRAM"), tp_number(SOCK_DGRAM));
-    tp_set(tp, socket_mod, tp_string("socket"), tp_fnc(tp, kolibri_socket));
+    tp_set(tp, socket_mod, tp_string("SOCK_DGRAM"), tp_number(SOCK_DGRAM));
+    tp_set(tp, socket_mod, tp_string("inet_pton"), tp_fnc(tp, kolibri_inet_pton));
-    tp_set(tp, socket_mod, tp_string("inet_pton"), tp_fnc(tp, kolibri_inet_pton));
+    tp_set(tp, socket_mod, tp_string("socket"), tp_fnc(tp, kolibri_socket));
     return socket_mod;

Subversion Repositories Kolibri OS

(root)/programs/develop/tinypy/tinypy/kolibri_net.c – Rev 2099 → 2110