2025.2

Author: jedeoric

bpm.tml

@@ -1,6 +1,6 @@
 [package]
 name = "socket"
-version = "2025.1"
+version = "2025.2"
 authors = [ "[email protected]",]
 license = "MIT OR Apache-2.0"
 edition = "2018"

docs/_bind.md

@@ -0,0 +1 @@
+

docs/_recvfrom.md

@@ -0,0 +1 @@
+

docs/_sendto.md

@@ -0,0 +1,2 @@
+## int sendto(unsigned char sockfd, const void *buf, size_t len, unsigned char flags, const struct sockaddr *dest_addr, socklen_t addrlen);
+

src/_bind.s

@@ -0,0 +1,17 @@
+.include "ch395.inc"
+.include "sys/socket.inc"
+.include "sys/socket.mac"
+.include "telestrat.inc"
+
+.export _bind
+
+.import popax
+.import popa
+
+.importzp ptr1, ptr2, ptr3, tmp1
+
+
+;;@proto unsigned char bind(int socket, const struct sockaddr_in* addr, unsigned int addrlen);
+.proc _bind
+    rts
+.endproc

src/_connect.s

@@ -1,9 +1,8 @@
 .include "ch395.inc"
-.include "socket.inc"
-.include "socket.mac"
+.include "sys/socket.inc"
+.include "sys/socket.mac"
 .include "telestrat.inc"
 
-
 .export _connect
 
 .import popax
@@ -51,7 +50,7 @@
     clc
     adc     ptr2
     bcc     @S1
-    inc     ptr2+1
+    inc     ptr2 + 1
 
 @S1:
     sta     ptr2

src/_recv.s

@@ -1,5 +1,5 @@
 .include "telestrat.inc"
-.include "socket.mac"
+.include "sys/socket.mac"
 
 .export _recv
 
@@ -15,7 +15,7 @@
     length := ptr2
     buffer := ptr1
     socket := tmp1
-    flags := tmp2
+    flags  := tmp2
     ; Drop flag
 
     sta     flags ; Flags stored but not managed
@@ -37,13 +37,13 @@
     ;;@inputY High ptr to store the buffer
     ;;@modifyMEM_RES
 
-    ldy    ptr1
-    ldx    ptr1 + 1
+    ldy     buffer
+    ldx     buffer + 1
 
     RECV socket, buffer, length
     tya
-    stx     ptr1 + 1
-    ldy     ptr1 + 1
+    stx     buffer + 1
+    ldy     buffer + 1
 
     rts
 .endproc

src/_recvfrom.s

@@ -0,0 +1,51 @@
+.include "ch395.inc"
+.include "sys/socket.inc"
+.include "sys/socket.mac"
+.include "telestrat.inc"
+
+.export _recvfrom
+
+.importzp ptr1, ptr2, ptr3, tmp1, tmp2, tmp3
+
+.import popa, popax
+
+.proc _recvfrom
+    ; int recvfrom(unsigned char sockfd, void *buf, size_t len, unsigned char flags, struct sockaddr *src_addr, socklen_t *addrlen);
+    addrlen   := tmp1
+    dest_addr := ptr1
+    flags     := tmp2
+    len       := ptr2
+    buf       := ptr3
+    sockfd    := tmp3
+
+    sta     addrlen
+
+    ; Get dest addr
+    jsr     popax
+    sta     ptr1
+    stx     ptr1 + 1
+
+    jsr     popa
+    sta     flags
+
+    jsr     popax
+    sta     len
+    stx     len + 1
+
+    jsr     popax
+    sta     buf
+    stx     buf + 1
+
+    jsr     popa
+    sta     sockfd
+
+    ldy     buf
+    ldx     buf + 1
+
+    RECV sockfd, buf, length
+    tya
+    stx     buf + 1
+    ldy     buf + 1
+
+    rts
+.endproc

src/_send.s

@@ -1,5 +1,5 @@
 .include "telestrat.inc"
-.include "socket.mac"
+.include "sys/socket.mac"
 
 .export _send
 

src/_sendto.s

@@ -0,0 +1,71 @@
+.include "ch395.inc"
+.include "sys/socket.inc"
+.include "sys/socket.mac"
+.include "telestrat.inc"
+
+.export _sendto
+
+.importzp ptr1, ptr2, ptr3, tmp1, tmp2, tmp3
+
+.import popa, popax
+
+.proc _sendto
+    ;;@proto int sendto(unsigned char sockfd, const void *buf, size_t len, unsigned char flags, const struct sockaddr *dest_addr, socklen_t addrlen);
+    addrlen   := tmp1
+    dest_addr := ptr1
+    flags     := tmp2
+    len       := ptr2
+    buf       := ptr3
+    sockfd    := tmp3
+    sin_port  := RESB
+    sin_addr  := RES
+
+    sta     addrlen
+
+    ; Get dest addr
+    jsr     popax
+    sta     dest_addr
+    stx     dest_addr + 1
+
+    ; For compute below
+    sta     sin_addr
+    stx     sin_addr + 1
+
+    jsr     popa
+    sta     flags
+
+    jsr     popax
+    sta     len
+    stx     len + 1
+
+    jsr     popax
+    sta     buf
+    stx     buf + 1
+
+    jsr     popa
+    sta     sockfd
+
+
+
+    ldy     #sockaddr_in::sin_port
+    lda     (dest_addr),y
+    sta     sin_port
+    iny
+    lda     (dest_addr),y
+    sta     sin_port + 1
+
+
+    ; Compute ip addr ptr
+    lda     #sockaddr_in::sin_addr
+    clc
+    adc     sin_addr
+    bcc     @S1
+    inc     sin_addr + 1
+
+@S1:
+    sta     sin_addr
+
+    CONNECT sockfd, sin_addr, sin_port
+    SEND sockfd, buf, len
+    rts
+.endproc

src/_socket.s

@@ -1,4 +1,4 @@
-.include "include/socket.mac"
+.include "include/sys/socket.mac"
 .include "telestrat.inc"
 
 .export _socket

src/_socket_close.s

@@ -1,5 +1,5 @@
 .include "telestrat.inc"
-.include "socket.mac"
+.include "sys/socket.mac"
 
 .export _socket_close
 

src/include/socket.h src/include/sys/socket.h

@@ -14,6 +14,8 @@ struct in_addr {
     long s_addr; // Adresse IPv4 en format binaire (big-endian)
 };
 
+typedef unsigned char socklen_t;
+
 
 //server.sin_addr.s_addr = inet_addr("192.168.177"); // Exemple IP (www.example.com)
 struct sockaddr_in {
@@ -25,7 +27,7 @@ struct sockaddr_in {
 
 struct sockaddr {
    unsigned char sa_family;      /* Address family */
-   char          sa_data[];      /* Socket address */
+   char          sa_data[14];      /* Socket address */
 };
 
 /* Create a new socket of type TYPE in domain DOMAIN, using
@@ -43,3 +45,6 @@ unsigned int send(unsigned char sockfd, const void buf[], unsigned int len, unsi
 unsigned int socket_close(unsigned char sockfd);
 
 unsigned char connect(unsigned char sockfd, const struct sockaddr *addr, unsigned int addrlen);
+
+int recvfrom(unsigned char sockfd, void *buf, size_t len, unsigned char flags, struct sockaddr *src_addr, socklen_t *addrlen);
+int sendto(unsigned char sockfd, const void *buf, size_t len, unsigned char flags, const struct sockaddr *dest_addr, socklen_t addrlen);

src/include/socket.inc src/include/sys/socket.inc

@@ -41,5 +41,4 @@ EHOSTUNREACH    = 65 ; No route to host
    ;struct in_addr sin_addr;    // Adresse IPv4
    sin_addr   .res 4  ;long sin_addr
    sin_port   .word   ; e.g. htons(3490)
-
 .endstruct