WIP porting picoruby-net

Author: hasumikin

mrbgems/picoruby-net/include/net.h

@@ -4,13 +4,9 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-//#define PICO_CYW43_ARCH_POLL 1
 #include "lwipopts.h"
-//#define LWIP_DNS 1
 #include "lwip/dns.h"
 #include "lwip/pbuf.h"
-//#define LWIP_ALTCP 1
-//#define LWIP_ALTCP_TLS 1
 #include "lwip/altcp_tls.h"
 #include "lwip/udp.h"
 
@@ -28,10 +24,11 @@ extern "C" {
 //#if !defined(sleep_ms)
 //int sleep_ms(long milliseconds);
 //#endif
-//void lwip_begin(void);
-//void lwip_end(void);
+void lwip_begin(void);
+void lwip_end(void);
+void Net_sleep_ms(int);
 //
-//err_t Net_get_ip(const char *name, ip_addr_t *ip);
+err_t Net_get_ip(const char *name, ip_addr_t *ip);
 //void TCPClient_send(void *mrb, const char *host, int port, const char *send_data, size_t send_data_len, bool is_tls, recv_data_t *recv_data);
 //void UDPClient_send(void *mrb, const char *host, int port, const char *send_data, size_t send_data_len, bool is_dtls, recv_data_t *recv_data);
 

mrbgems/picoruby-net/ports/rp2040/common.c

@@ -0,0 +1,21 @@
+#include "pico/stdlib.h"
+#include "pico/cyw43_arch.h"
+
+void
+Net_sleep_ms(int ms)
+{
+  cyw43_arch_poll();
+  sleep_ms(ms);
+}
+
+void
+lwip_begin(void)
+{
+  cyw43_arch_lwip_begin();
+}
+
+void
+lwip_end(void)
+{
+  cyw43_arch_lwip_end();
+}

mrbgems/picoruby-net/ports/rp2040/include/common.h

@@ -1,10 +1,7 @@
-#include "../../include/net.h"
+#include "../include/net.h"
 #include "lwipopts.h"
-#include "pico/cyw43_arch.h"
 #include "lwip/pbuf.h"
 
-#include "include/common.h"
-
 #include "mruby.h"
 
 mrb_value

mrbgems/picoruby-net/ports/rp2040/net.c

@@ -0,0 +1,54 @@
+#include "mruby.h"
+#include "mruby/presym.h"
+#include "mruby.h"
+#include "../include/net.h"
+
+static mrb_value
+mrb_net_dns_s_resolve(mrb_state *mrb, mrb_value self)
+{
+  const char *host;
+  mrb_bool is_tls;
+  mrb_get_args(mrb, "zb", &host, &is_tls);
+  return DNS_resolve(mrb, host, is_tls);
+}
+
+static mrb_value
+mrb_net_tcpclient_s__request_impl(mrb_state *mrb, mrb_value self)
+{
+  const char *host;
+  mrb_int port;
+  mrb_value data;
+  mrb_bool use_dtls;
+  mrb_get_args(mrb, "ziob", &host, &port, &data, &use_dtls);
+  return TCPClient_send(host, port, mrb, data, use_dtls);
+}
+
+static mrb_value
+mrb_net_udpclient_s__send_impl(mrb_state *mrb, mrb_value self)
+{
+  const char *host;
+  mrb_int port;
+  mrb_value data;
+  mrb_bool use_dtls;
+  mrb_get_args(mrb, "ziob", &host, &port, &data, &use_dtls);
+  return UDPClient_send(host, port, mrb, data, use_dtls);
+}
+
+void
+mrb_picoruby_net_gem_init(mrb_state* mrb)
+{
+  struct RClass *class_Net = mrb_define_class_id(mrb, MRB_SYM(Net), mrb->object_class);
+
+  struct RClass *class_Net_DNS = mrb_define_class_under_id(mrb, class_Net, MRB_SYM(DNS), mrb->object_class);
+  mrb_define_class_method_id(mrb, class_Net_DNS, MRB_SYM(resolve), mrb_net_dns_s_resolve, MRB_ARGS_REQ(2));
+
+  struct RClass *class_Net_TCPClient = mrb_define_class_under_id(mrb, class_Net, MRB_SYM(TCPClient), mrb->object_class);
+  mrb_define_class_method_id(mrb, class_Net_TCPClient, MRB_SYM(_request_impl), mrb_net_tcpclient_s__request_impl, MRB_ARGS_REQ(4));
+
+  struct RClass *class_Net_UDPClient = mrb_define_class_under_id(mrb, class_Net, MRB_SYM(UDPClient), mrb->object_class);
+  mrb_define_class_method_id(mrb, class_Net_UDPClient, MRB_SYM(_send_impl), mrb_net_udpclient_s__send_impl, MRB_ARGS_REQ(4));
+}
+void
+mrb_picoruby_net_gem_final(mrb_state* mrb)
+{
+}

mrbgems/picoruby-net/src/mbedtls_debug.c

@@ -1,11 +1,8 @@
-#include "../../include/net.h"
-#include "../../include/mbedtls_debug.h"
+#include "../include/net.h"
+#include "../include/mbedtls_debug.h"
 #include "lwipopts.h"
-#include "pico/cyw43_arch.h"
 #include "lwip/altcp_tls.h"
 
-#include "include/common.h"
-
 #include "mruby.h"
 #include "mruby/string.h"
 
@@ -47,7 +44,7 @@ TCPClient_close(tcp_connection_state *cs)
 {
   err_t err = ERR_OK;
   if (!cs || !cs->pcb) return ERR_ARG;
-  cyw43_arch_lwip_begin();
+  lwip_begin();
   altcp_arg(cs->pcb, NULL);
   altcp_recv(cs->pcb, NULL);
   altcp_sent(cs->pcb, NULL);
@@ -59,7 +56,7 @@ TCPClient_close(tcp_connection_state *cs)
     altcp_abort(cs->pcb);
     err = ERR_ABRT;
   }
-  cyw43_arch_lwip_end();
+  lwip_end();
   TCPClient_free_tls_config(cs);
   mrb_free(cs->mrb, cs);
   return err;
@@ -186,15 +183,15 @@ TCPClient_connect_impl(ip_addr_t *ip, const char *host, int port, mrb_value send
     cs = TCPClient_new_connection(send_data, recv_data, mrb);
   }
   if (cs) {
-    cyw43_arch_lwip_begin();
+    lwip_begin();
     err = altcp_connect(cs->pcb, ip, port, TCPClient_connected_cb);
     if (err != ERR_OK) {
       mrb_warn(cs->mrb, "altcp_connect failed: %d\n", err);
       cs->state = NET_TCP_STATE_ERROR;
-      cyw43_arch_lwip_end();
+      lwip_end();
       return cs;
     }
-    cyw43_arch_lwip_end();
+    lwip_end();
     cs->state = NET_TCP_STATE_CONNECTION_STARTED;
   }
   return cs;
@@ -217,15 +214,15 @@ TCPClient_poll_impl(tcp_connection_state **pcs)
       break;
     case NET_TCP_STATE_CONNECTED:
       cs->state = NET_TCP_STATE_WAITING_PACKET;
-      cyw43_arch_lwip_begin();
+      lwip_begin();
       err = altcp_write(cs->pcb, RSTRING_PTR(cs->send_data), RSTRING_LEN(cs->send_data), 0);
       if (err != ERR_OK) {
         mrb_warn(cs->mrb, "altcp_write failed: %d\n", err);
         cs->state = NET_TCP_STATE_ERROR;
         return 1;
       }
       altcp_output(cs->pcb);
-      cyw43_arch_lwip_end();
+      lwip_end();
       break;
     case NET_TCP_STATE_PACKET_RECVED:
       cs->state = NET_TCP_STATE_WAITING_PACKET;
@@ -261,7 +258,7 @@ TCPClient_send(const char *host, int port, mrb_state *mrb, mrb_value send_data,
     } else {
       while(TCPClient_poll_impl(&cs))
       {
-        sleep_ms(200);
+        Net_sleep_ms(200);
       }
       // recv_data is ready after connection is complete
       ret = recv_data;

mrbgems/picoruby-net/ports/rp2040/dns.c mrbgems/picoruby-net/src/mruby/dns.cmrbgems/picoruby-net/ports/rp2040/dns.c renamed to mrbgems/picoruby-net/src/mruby/dns.c

@@ -1,8 +1,6 @@
-#include "../../include/net.h"
+#include "../include/net.h"
 #include "lwipopts.h"
-#include "pico/cyw43_arch.h"
 #include "lwip/udp.h"
-#include "include/common.h"
 
 #include "mruby.h"
 #include "mruby/string.h"
@@ -82,9 +80,9 @@ UDPClient_send_impl(ip_addr_t *ip, int port, mrb_value send_data, mrb_value recv
   struct pbuf *p = pbuf_alloc(PBUF_TRANSPORT, RSTRING_LEN(cs->send_data), PBUF_RAM);
   if (p != NULL) {
     memcpy(p->payload, RSTRING_PTR(cs->send_data), RSTRING_LEN(cs->send_data));
-    cyw43_arch_lwip_begin();
+    lwip_begin();
     err_t err = udp_sendto(cs->pcb, p, ip, port);
-    cyw43_arch_lwip_end();
+    lwip_end();
     pbuf_free(p);
 
     if (err == ERR_OK) {
@@ -117,17 +115,17 @@ UDPClient_poll_impl(udp_connection_state **pcs)
       break;
     case NET_UDP_STATE_RECEIVED:
       cs->state = NET_UDP_STATE_NONE;
-      cyw43_arch_lwip_begin();
+      lwip_begin();
       udp_remove(cs->pcb);
-      cyw43_arch_lwip_end();
+      lwip_end();
       mrb_free(cs->mrb, cs);
       *pcs = NULL;
       return 0;
     case NET_UDP_STATE_ERROR:
       mrb_warn(cs->mrb, "Error occurred, cleaning up\n");
-      cyw43_arch_lwip_begin();
+      lwip_begin();
       udp_remove(cs->pcb);
-      cyw43_arch_lwip_end();
+      lwip_end();
       mrb_free(cs->mrb, cs);
       *pcs = NULL;
       return 0;
@@ -156,7 +154,7 @@ UDPClient_send(const char *host, int port, mrb_state *mrb, mrb_value send_data,
       while(UDPClient_poll_impl(&cs))
       {
         poll_count++;
-        sleep_ms(200);
+        Net_sleep_ms(200);
         // Add a timeout mechanism to prevent infinite loop
         if (poll_count > 50) { // 10 seconds timeout (50 * 200ms)
           mrb_warn(cs->mrb, "Polling timeout reached\n");
@@ -165,9 +163,9 @@ UDPClient_send(const char *host, int port, mrb_state *mrb, mrb_value send_data,
       }
       if (cs != NULL) {
         mrb_warn(cs->mrb, "Connection state not NULL after polling, cleaning up\n");
-        cyw43_arch_lwip_begin();
+        lwip_begin();
         udp_remove(cs->pcb);
-        cyw43_arch_lwip_end();
+        lwip_end();
         mrb_free(cs->mrb, cs);
       }
       ret = recv_data;