Changeset 387 for asp3_tinet_ecnl_arm/trunk/ntshell

Timestamp:

May 22, 2019, 4:09:18 PM (5 years ago)

Author:

coas-nagasima

Message:

ファイルディスクリプタ処理を更新

Location:

asp3_tinet_ecnl_arm/trunk/ntshell

Files:

• fatfs/ffarch.c (modified) (11 diffs)
• ntshell/util/ntstdio.c (modified) (4 diffs)
• ntshell/util/ntstdio.h (modified) (1 diff)
• src/fdtable.c (modified) (10 diffs)
• src/fdtable.h (moved) (moved from asp3_tinet_ecnl_arm/trunk/ntshell/src/socket_stub.h ) (2 diffs)
• src/io_stub.c (modified) (10 diffs)
• src/net_misc.c (modified) (4 diffs)
• src/ntp_cli.c (modified) (12 diffs)
• src/ntshell.cdl (added)
• src/ntshell_main.c (modified) (8 diffs)
• src/shellif.h (modified) (5 diffs)
• src/socket_stub.c (modified) (49 diffs)
• src/stdio_stub.c (added)
• src/syscall.c (modified) (3 diffs)
• src/tSIOPortNTShell.cdl (added)
• src/tSIOPortNTShellMain.c (added)

asp3_tinet_ecnl_arm/trunk/ntshell/fatfs/ffarch.c

@@ -80 +80 @@
         ret2 = get_tim(&now);
         if (ret2 != E_OK){
-                printf("[ffarch] get_tim error: %s",
+                syslog(LOG_NOTICE, "[ffarch] get_tim error: %s",
                         itron_strerror(ret2));
                 return;
@@ -94 +94 @@
                 ret = tslp_tsk(timer);
                 if ((ret != E_OK) && (ret != E_TMOUT)) {
-                        printf("[ffarch] tslp_tsk error: %s %d",
+                        syslog(LOG_NOTICE, "[ffarch] tslp_tsk error: %s %d",
                                 itron_strerror(ret), timer);
                         break;
@@ -101 +101 @@
                 ret2 = get_tim(&now);
                 if (ret2 != E_OK) {
-                        printf("[ffarch] get_tim error: %s",
+                        syslog(LOG_NOTICE, "[ffarch] get_tim error: %s",
                                 itron_strerror(ret2));
                         break;
@@ -131 +131 @@
 bool_t SD_begin();
 
-void ffarch_init()
+void ffarch_init(void)
 {
         /* SD_CD */
@@ -150 +150 @@
 
         if (romdisk_init()) {
-                printf("ROM disk (0:) OK!\n");
+                syslog(LOG_NOTICE, "ROM disk (0:) OK!");
         }
         else {
-                printf("ROM disk (0:) NG!\n");
+                syslog(LOG_NOTICE, "ROM disk (0:) NG!");
         }
 }
@@ -352 +352 @@
 }
 
-int ffarch_get_timer()
+int ffarch_get_timer(void)
 {
         return ffarch_timer;
@@ -367 +367 @@
 }
 
-void ffarch_timeout()
+void ffarch_timeout(void)
 {
         if (ffarch_timer != 0)
@@ -375 +375 @@
         case FFS_RETRY_WAIT:
                 if (ffarch_retry_count == 0) {
-                        printf("SD card (1:) initialize tired...\n");
+                        syslog(LOG_NOTICE, "SD card (1:) initialize tired...");
 
                         ffarch_state = FFS_IDLE;
@@ -388 +388 @@
                 if ((sdfs._is_initialized & STA_NOINIT)
                         || (((sdfs_prev_status & STA_NODISK) != 0) && ((sdfs_new_status & STA_NODISK) == 0))) {
-                        printf("SD card initializing ...\n");
+                        syslog(LOG_NOTICE, "SD card initializing ...");
 
                         if (SD_begin()) {
-                                printf("SD card (1:) OK!\n");
+                                syslog(LOG_NOTICE, "SD card (1:) OK!");
 
                                 /* uploadディレクトリを作成しておく */
@@ -401 +401 @@
                         }
                         else {
-                                printf("SD card (1:) NG!\n");
+                                syslog(LOG_NOTICE, "SD card (1:) NG!");
                                 ffarch_state = FFS_RETRY_WAIT;
                                 ffarch_timer = 1000 * 1000;
@@ -408 +408 @@
                 /* SDカードが抜かれた場合 */
                 else if (((sdfs_prev_status & STA_NODISK) == 0) && ((sdfs_new_status & STA_NODISK) != 0)) {
-                        printf("SD card unmount\n");
+                        syslog(LOG_NOTICE, "SD card unmount");
 
                         f_mount(&Sd.FatFs, "1:", 0);

asp3_tinet_ecnl_arm/trunk/ntshell/ntshell/util/ntstdio.c

@@ -224 +224 @@
         handle->xi = xi;
         handle->xo = xo;
-        handle->outptr = 0;
-        handle->len = 0;
         handle->pos = 0;
         handle->option = option;
@@ -232 +230 @@
 static void _putc(ntstdio_t *handle, char c)
 {
-        if (handle->outptr) {
-                if ((handle->pos + 1) >= handle->len)
-                        return;
-                handle->outptr[handle->pos] = (unsigned char)c;
-                handle->pos++;
-                return;
-        }
-
         if (handle->xo) {
                 handle->xo(handle, (unsigned char)c);
@@ -291 +281 @@
 }
 
+struct put_buf_t {
+        char *outptr;
+        int len;
+};
+
+static void put_buf(struct ntstdio_t *handle, unsigned char c)
+{
+        struct put_buf_t *put_buf = (struct put_buf_t *)handle->exinf;
+        if ((handle->pos + 1) >= put_buf->len)
+                return;
+        put_buf->outptr[handle->pos] = (char)c;
+        handle->pos++;
+}
+
 int ntstdio_snprintf(char *buf, int len, const char *fmt, ...)
 {
         int result;
         ntstdio_t handle;
+        struct put_buf_t exinf;
         va_list arp;
         /* Switch destination for memory */
+        handle.xo = put_buf;
         handle.option = 0;
-        handle.outptr = buf;
-        handle.len = len;
         handle.pos = 0;
+        handle.exinf = &exinf;
+        exinf.outptr = buf;
+        exinf.len = len;
+
         va_start(arp, fmt);
         result = xvprintf(&handle, fmt, arp);
@@ -306 +314 @@
 
         /* Terminate output string with a \0 */
-        handle.outptr[handle.pos] = '\0';
+        buf[handle.pos] = '\0';
         return result;
 }

asp3_tinet_ecnl_arm/trunk/ntshell/ntshell/util/ntstdio.h

@@ -74 +74 @@
         NTSTDIO_XI xi;
         NTSTDIO_XO xo;
-        char *outptr;
-        int len;
         int pos;
         unsigned int option;

asp3_tinet_ecnl_arm/trunk/ntshell/src/fdtable.c

@@ -44 +44 @@
 #include "syssvc/syslog.h"
 #include "target_syssvc.h"
-#ifndef NTSHELL_NO_SOCKET
-#include <tinet_defs.h>
-#include <tinet_config.h>
-#include <net/net.h>
-#include <net/net_endian.h>
-#include <netinet/in.h>
-#include <netinet/in_itron.h>
-#include <tinet_nic_defs.h>
-#include <tinet_cfg.h>
-#include <netinet/in_var.h>
-#include <net/ethernet.h>
-#include <net/if6_var.h>
-#include <net/net.h>
-#include <net/if_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_var.h>
-#include <net/net_buf.h>
-#endif
-#include "ff.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "kernel_cfg.h"
 #include <string.h>
@@ -75 +54 @@
 #endif
 
-static int stdio_close(struct SHELL_FILE *fp);
-static size_t stdio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len);
-static size_t stdio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static size_t stdin_read(struct SHELL_FILE *fp, unsigned char *data, size_t len);
-static size_t stdout_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static size_t stderr_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static void stdio_delete(struct SHELL_FILE *fp);
-
-static int sio_close(struct SHELL_FILE *fp);
-static size_t sio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len);
-static size_t sio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len);
-static off_t sio_seek(struct SHELL_FILE *fp, off_t ofs, int org);
-static int sio_ioctl(struct SHELL_FILE *fp, int req, void *arg);
-static bool_t sio_readable(struct SHELL_FILE *fp);
-static void sio_delete(struct SHELL_FILE *fp);
-
-IO_TYPE IO_TYPE_STDIN = { stdio_close, stdin_read, stdio_write, sio_seek, sio_ioctl, sio_readable, stdio_delete };
-IO_TYPE IO_TYPE_STDOUT = { stdio_close, stdio_read, stdout_write, sio_seek, sio_ioctl, sio_readable, stdio_delete };
-IO_TYPE IO_TYPE_STDERR = { stdio_close, stdio_read, stderr_write, sio_seek, sio_ioctl, sio_readable, stdio_delete };
-IO_TYPE IO_TYPE_SIO = { sio_close, sio_read, sio_write, sio_seek, sio_ioctl, sio_readable, sio_delete };
-ntstdio_t ntstdio;
+extern IO_TYPE IO_TYPE_STDIN;
+extern IO_TYPE IO_TYPE_STDOUT;
+extern IO_TYPE IO_TYPE_STDERR;
 
 static struct SHELL_FILE fd_table[8 * sizeof(FLGPTN)] = {
-        { 0, &IO_TYPE_STDIN, 0, .exinf = &ntstdio },
-        { 1, &IO_TYPE_STDOUT, 0, .exinf = &ntstdio },
-        { 2, &IO_TYPE_STDERR, 0,.exinf = &ntstdio },
+        { STDIN_FILENO, &IO_TYPE_STDIN, 0 },
+        { STDOUT_FILENO, &IO_TYPE_STDOUT, 0 },
+        { STDERR_FILENO, &IO_TYPE_STDERR, 0 },
 };
 #define fd_table_count (sizeof(fd_table) / sizeof(fd_table[0]))
-
-extern ntstdio_t ntstdio;
-extern serial_t stdio_uart;
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        return serial_getc((serial_t *)handle->exinf);
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        serial_putc((serial_t *)handle->exinf, c);
-}
-
-void sys_init(intptr_t exinf)
-{
-        ntstdio_init(&ntstdio, NTSTDIO_OPTION_LINE_ECHO | NTSTDIO_OPTION_CANON | NTSTDIO_OPTION_LF_CRLF | NTSTDIO_OPTION_LF_CR, ntstdio_xi, ntstdio_xo);
-        ntstdio.exinf = (void *)&stdio_uart;
-}
-
-int stdio_close(struct SHELL_FILE *fp)
-{
-        return -EPERM;
-}
-
-size_t stdio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-size_t stdio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-size_t stdin_read(struct SHELL_FILE *fp, unsigned char *data, size_t len)
-{
-        int i = 0;
-        while (i < len) {
-                int c = ntstdio_getc((struct ntstdio_t *)fp->exinf);
-                data[i++] = c;
-                if ((c == EOF) || (c == '\n'))
-                        break;
-        }
-        return i;
-}
-
-size_t stdout_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        for (int i = 0; i < len; i++) {
-                ntstdio_putc((struct ntstdio_t *)fp->exinf, data[i]);
-        }
-        return len;
-}
-
-size_t stderr_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        for (int i = 0; i < len; i++) {
-                ntstdio_putc((struct ntstdio_t *)fp->exinf, data[i]);
-        }
-        return len;
-}
-
-void stdio_delete(struct SHELL_FILE *fp)
-{
-}
-
-int sio_close(struct SHELL_FILE *fp)
-{
-        return -EPERM;
-}
-
-size_t sio_read(struct SHELL_FILE *fp, unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-size_t sio_write(struct SHELL_FILE *fp, const unsigned char *data, size_t len)
-{
-        return -EPERM;
-}
-
-off_t sio_seek(struct SHELL_FILE *fp, off_t ofs, int org)
-{
-        return -EPERM;
-}
-
-int sio_ioctl(struct SHELL_FILE *fp, int request, void *arg)
-{
-        switch (request) {
-        case TIOCGWINSZ:
-                return 0;
-        case TCGETS:
-                return sio_tcgetattr(fp->fd, (struct termios *)arg);
-        case TCSETS + TCSANOW:
-        case TCSETS + TCSADRAIN:
-        case TCSETS + TCSAFLUSH:
-                return sio_tcsetattr(fp->fd, request - TCSETS, (const struct termios *)arg);
-        }
-
-        return -EINVAL;
-}
-
-bool_t sio_readable(struct SHELL_FILE *fp)
-{
-        return fp->readevt_w != fp->readevt_r;
-}
-
-void sio_delete(struct SHELL_FILE *fp)
-{
-        free((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf);
-        ((struct ntstdio_t *)fp->exinf)->exinf = NULL;
-        free((struct ntstdio_t *)fp->exinf);
-        fp->exinf = NULL;
-}
 
 struct SHELL_FILE *new_fp(IO_TYPE *type, int id, int writable)
@@ -245 +91 @@
         if (ret < 0) {
                 syslog(LOG_ERROR, "sig_sem => %d", ret);
+        }
+
+        if (fp != NULL) {
+                FLGPTN flgptn = 0;
+
+                FD_SET(fp->fd, (fd_set *)&flgptn);
+
+                ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "clr_flg => %d", ret);
+                }
         }
 
@@ -440 +297 @@
 }
 
-/* TODO:コールバック化したい */
-void stdio_update_evts()
-{
-        int fd = STDIN_FILENO;
-        struct SHELL_FILE *fp = &fd_table[fd];
-        FLGPTN flgptn = 0;
-
-        if (serial_readable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
-
-                FD_SET(fd, (fd_set *)&flgptn);
-        }
-        if (serial_writable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->writeevt_w == fp->writeevt_r) fp->writeevt_w++;
-
-                FD_SET(fd, (fd_set *)&flgptn);
-        }
-
-        if (flgptn != 0) {
-                set_flg(FLG_SELECT_WAIT, flgptn);
-        }
-}
-
-/* TODO:コールバック化したい */
-void stdio_flgptn(FLGPTN *flgptn)
-{
-        int fd = STDIN_FILENO;
-        struct SHELL_FILE *fp = &fd_table[fd];
-        *flgptn = 0;
-
-        if (serial_readable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->readevt_w == fp->readevt_r) fp->readevt_w++;
-
-                FD_SET(fd, (fd_set *)flgptn);
-        }
-        if (serial_writable((serial_t *)((struct ntstdio_t *)fp->exinf)->exinf)) {
-                if (fp->writeevt_w == fp->writeevt_r) fp->writeevt_w++;
-
-                FD_SET(fd, (fd_set *)flgptn);
-        }
-}
-
 ER shell_get_evts(struct fd_events *evts, TMO tmout)
 {
         int count = 0;
         SYSTIM prev, now;
+        FLGPTN flgptn;
 
         get_tim(&prev);
@@ -491 +307 @@
         for (;;) {
                 ER ret;
-                FLGPTN waitptn, flgptn, readfds = 0, writefds = 0;
+                FLGPTN waitptn, readfds = 0, writefds = 0;
                 struct SHELL_FILE *fp = NULL;
-
-                stdio_update_evts();
 
 #ifndef NTSHELL_NO_SOCKET
@@ -504 +318 @@
                         fp = &fd_table[fd];
 
-#ifndef NTSHELL_NO_SOCKET
                         if (FD_ISSET(fd, &evts->readfds)) {
                                 if (fp->type->readable(fp)) {
@@ -515 +328 @@
                                 }
                         }
-#endif
+
                         if (FD_ISSET(fd, &evts->writefds)) {
-                                if (fp->writeevt_w == fp->writeevt_r) {
+                                if (fp->type->writable(fp)) {
                                         FD_SET(fd, (fd_set *)&writefds);
                                         count++;
@@ -547 +360 @@
                                 return ret;
                         }
-
-                        stdio_flgptn(&flgptn);
-
-                        if (flgptn == 0)
-                                return E_TMOUT;
-                }
-                flgptn &= waitptn;
-
-                /* 受け取ったフラグのみクリア */
-                ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
-                if (ret != E_OK) {
-                        syslog(LOG_ERROR, "clr_flg => %d", ret);
+                }
+
+                if (flgptn != 0) {
+                        flgptn &= waitptn;
+
+                        /* 受け取ったフラグのみクリア */
+                        ret = clr_flg(FLG_SELECT_WAIT, ~flgptn);
+                        if (ret != E_OK) {
+                                syslog(LOG_ERROR, "clr_flg => %d", ret);
+                        }
                 }
 
                 count = 0;
                 for (int fd = 0; fd < fd_table_count; fd++) {
-                        if (!FD_ISSET(fd, (fd_set *)&waitptn))
-                                continue;
-
                         fp = &fd_table[fd];
 
                         if (fp->readevt_w != fp->readevt_r) {
                                 fp->readevt_r++;
-                                FD_SET(fd, &evts->readfds);
+                                if (FD_ISSET(fd, (fd_set *)&waitptn))
+                                        FD_SET(fd, &evts->readfds);
                                 count++;
                         }
                         if (fp->writeevt_w != fp->writeevt_r) {
                                 fp->writeevt_r++;
-                                fp->writable = 1;
-                        }
-                        if (fp->writable) {
-                                FD_SET(fd, &evts->writefds);
+                                if (FD_ISSET(fd, (fd_set *)&waitptn))
+                                        FD_SET(fd, &evts->writefds);
                                 count++;
                         }
                         if (fp->errorevt_w != fp->errorevt_r) {
                                 fp->errorevt_r++;
-                                FD_SET(fd, &evts->errorfds);
+                                if (FD_ISSET(fd, (fd_set *)&waitptn))
+                                        FD_SET(fd, &evts->errorfds);
                                 count++;
                         }
                 }
 
-                if (count > 0)
+                if ((flgptn == 0) || (count > 0))
                         break;
 
@@ -594 +402 @@
 
                 SYSTIM elapse = now - prev;
-                if (elapse > tmout)
-                        return E_TMOUT;
+                if (elapse > tmout) {
+                        flgptn = 0;
+                        break;
+                }
 
                 prev = now;
@@ -603 +413 @@
         evts->count = count;
 
-        return E_OK;
+        return (flgptn == 0) ? E_TMOUT : E_OK;
 }
 

asp3_tinet_ecnl_arm/trunk/ntshell/src/fdtable.h

@@ -38 +38 @@
 #define SOCKET_STUB_H
 
-struct addrinfo {
-        int ai_flags;
-        int ai_family;
-        int ai_socktype;
-        int ai_protocol;
-        socklen_t ai_addrlen;
-        struct sockaddr *ai_addr;
-        char *ai_canonname;
-        struct addrinfo *ai_next;
-};
-
-typedef uint16_t in_port_t;
-typedef uint32_t in_addr_t;
-struct in_addr { in_addr_t s_addr; };
-
-struct sockaddr_in {
-        sa_family_t sin_family;
-        in_port_t sin_port;
-        struct in_addr sin_addr;
-        uint8_t sin_zero[8];
-};
-
-struct in6_addr
-{
-        union {
-                uint8_t __s6_addr[16];
-                uint16_t __s6_addr16[8];
-                uint32_t __s6_addr32[4];
-        } __in6_union;
-};
-//#define s6_addr __in6_union.__s6_addr
-//#define s6_addr16 __in6_union.__s6_addr16
-//#define s6_addr32 __in6_union.__s6_addr32
-
-struct sockaddr_in6
-{
-        sa_family_t     sin6_family;
-        in_port_t       sin6_port;
-        uint32_t        sin6_flowinfo;
-        struct in6_addr sin6_addr;
-        uint32_t        sin6_scope_id;
-};
-
-typedef struct socket_t {
-        int family;
-        int type;
-        int protocol;
-        int cepid;
-        int repid;
-        int backlog;
-        unsigned int flags;
-        union {
-                struct sockaddr_in laddr4;
-                struct sockaddr_in6 laddr6;
-        };
-        union {
-                struct sockaddr_in raddr4;
-                struct sockaddr_in6 raddr6;
-        };
-        int buf_size;
-        unsigned char *buf;
-        void *input;
-        int len;
-} socket_t;
-
-struct SHELL_DIR {
-        FATFS_DIR dir;
-        struct dirent dirent;
-};
-
 typedef const struct io_type_s IO_TYPE;
 
@@ -131 +61 @@
         int (*ioctl)(struct SHELL_FILE *, int, void *);
         bool_t (*readable)(struct SHELL_FILE *);
+        bool_t (*writable)(struct SHELL_FILE *);
         void (*delete)(struct SHELL_FILE *);
 };

asp3_tinet_ecnl_arm/trunk/ntshell/src/io_stub.c

@@ -45 +45 @@
 #include "syssvc/serial.h"
 #include "syssvc/syslog.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "util/ntstdio.h"
 #include "usrcmd.h"
@@ -51 +51 @@
 #include "kernel_cfg.h"
 #include "target_syssvc.h"
+
+struct SHELL_DIR {
+        FATFS_DIR dir;
+        struct dirent dirent;
+};
 
 int fresult2errno(FRESULT res)
@@ -85 +90 @@
 static int file_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t file_readable(struct SHELL_FILE *fp);
+static bool_t file_writable(struct SHELL_FILE *fp);
 static void file_delete(struct SHELL_FILE *fp);
 
@@ -93 +99 @@
 static int dir_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t dir_readable(struct SHELL_FILE *fp);
+static bool_t dir_writable(struct SHELL_FILE *fp);
 static void dir_delete(struct SHELL_FILE *fp);
 
-IO_TYPE IO_TYPE_FILE = { file_close, file_read, file_write, file_seek, file_ioctl, file_readable, file_delete };
-IO_TYPE IO_TYPE_DIR = { dir_close, dir_read, dir_write, dir_seek, dir_ioctl, dir_readable, dir_delete };
+IO_TYPE IO_TYPE_FILE = { file_close, file_read, file_write, file_seek, file_ioctl, file_readable, file_writable, file_delete };
+IO_TYPE IO_TYPE_DIR = { dir_close, dir_read, dir_write, dir_seek, dir_ioctl, dir_readable, dir_writable, dir_delete };
 
 int shell_open(const char *path, int flags, void *arg)
@@ -114 +121 @@
                 FRESULT res;
                 if ((res = f_opendir(dir, path)) != FR_OK) {
+                        delete_fp(fp);
                         return fresult2errno(res);
                 }
@@ -165 +173 @@
         }
 
+        delete_fp(fp);
         return fresult2errno(res);
 }
@@ -239 +248 @@
 }
 
+bool_t file_writable(struct SHELL_FILE *fp)
+{
+        return fp->writable && (fp->writeevt_w == fp->writeevt_r);
+}
+
 void file_delete(struct SHELL_FILE *fp)
 {
@@ -356 +370 @@
 {
         return shell_ioctl(fd, cmd, arg);
-}
-
-extern IO_TYPE IO_TYPE_SIO;
-
-int sio_tcgetattr(int fd, struct termios *termios)
-{
-        struct SHELL_FILE *fp = fd_to_fp(fd);
-        if ((fp == NULL) || (fp->type != &IO_TYPE_SIO))
-                return -EBADF;
-
-        ntstdio_t *ntstdio = (ntstdio_t *)fp->exinf;
-
-        memset(termios, 0, sizeof(*termios));
-
-        if (ntstdio->option & NTSTDIO_OPTION_LINE_ECHO) {
-                termios->c_lflag |= ECHO;
-        }
-        else {
-                termios->c_lflag &= ~ECHO;
-        }
-        if (ntstdio->option & NTSTDIO_OPTION_CANON) {
-                termios->c_lflag |= ICANON;
-        }
-        else {
-                termios->c_lflag &= ~ICANON;
-        }
-        if (ntstdio->option & NTSTDIO_OPTION_LF_CR) {
-                termios->c_iflag |= INLCR;
-        }
-        else {
-                termios->c_iflag &= ~INLCR;
-        }
-        if (ntstdio->option & NTSTDIO_OPTION_LF_CRLF) {
-                termios->c_oflag |= ONLCR;
-        }
-        else {
-                termios->c_oflag &= ~ONLCR;
-        }
-
-        return 0;
-}
-
-int sio_tcsetattr(int fd, int optional_actions, const struct termios *termios)
-{
-        struct SHELL_FILE *fp = fd_to_fp(fd);
-        if ((fp == NULL) || (fp->type != &IO_TYPE_SIO))
-                return -EBADF;
-
-        ntstdio_t *ntstdio = (ntstdio_t *)fp->exinf;
-
-        if (optional_actions == TCSANOW) {
-                if (termios->c_lflag & ECHO) {
-                        ntstdio->option |= NTSTDIO_OPTION_LINE_ECHO;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_LINE_ECHO;
-                }
-                if (termios->c_lflag & ICANON) {
-                        ntstdio->option |= NTSTDIO_OPTION_CANON;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_CANON;
-                }
-                if (termios->c_iflag & INLCR) {
-                        ntstdio->option |= NTSTDIO_OPTION_LF_CR;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_LF_CR;
-                }
-                if (termios->c_oflag & ONLCR) {
-                        ntstdio->option |= NTSTDIO_OPTION_LF_CRLF;
-                }
-                else {
-                        ntstdio->option &= ~NTSTDIO_OPTION_LF_CRLF;
-                }
-                return 0;
-        }
-
-        shell_abort();
-        return 0;
 }
 
@@ -688 +622 @@
 }
 
+bool_t dir_writable(struct SHELL_FILE *fp)
+{
+        return false;
+}
+
 void dir_delete(struct SHELL_FILE *fp)
 {
@@ -710 +649 @@
         return 0;
 }
-
-#ifndef _MSC_VER
-extern uint32_t __HeapBase;
-extern uint32_t __HeapLimit;
-#else
-uint8_t __HeapBase[14 * 4096];
-#define __HeapLimit __HeapBase[sizeof(__HeapBase)]
-#endif
-
-void *shell_brk(void *addr)
-{
-        if (addr == 0) {
-                return (void *)(&__HeapBase);
-        }
-        if ((addr >= (void *)&__HeapBase) && (addr < (void *)&__HeapLimit)) {
-                return addr;
-        }
-        return (void *)-1;
-}
-
-void *shell_mmap2(void *start, size_t length, int prot, int flags, int fd, off_t pgoffset)
-{
-        if (fd != -1)
-                return (void *)-EINVAL;
-
-        if ((length >= 0) && (length <= sizeof(&__HeapBase))) {
-                return &__HeapBase;
-        }
-        return (void *)-1;
-}
-
-int shell_mprotect(void *addr, size_t len, int prot)
-{
-        //if ((addr >= (void *)&__HeapBase) && (addr + len < (void *)&__HeapLimit)) {
-        return 0;
-//}
-//return -1;
-}

asp3_tinet_ecnl_arm/trunk/ntshell/src/net_misc.c

@@ -95 +95 @@
 
         get_tid(&nc->tskid);
-        printf("[NET MISC:%d,%d] started.", nc->tskid, (ID)exinf);
+        syslog(LOG_NOTICE, "[NET MISC:%d,%d] started.", nc->tskid, (ID)exinf);
 
         /* 初期化 */
@@ -103 +103 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                printf("[NET MISC,%d] get_tim error: %7lu,%s",
+                syslog(LOG_NOTICE, "[NET MISC,%d] get_tim error: %7lu,%s",
                         nc->cepid, time / SYSTIM_HZ, itron_strerror(ret));
                 return;
@@ -117 +117 @@
                 error = tslp_tsk(timer);
                 if ((error != E_OK) && (error != E_TMOUT)) {
-                        printf("[NET MISC,%d] tslp_tsk error: %s %d",
+                        syslog(LOG_NOTICE, "[NET MISC,%d] tslp_tsk error: %s %d",
                                 nc->cepid, itron_strerror(error), timer);
                         break;
@@ -124 +124 @@
                 ret = get_tim(&time);
                 if (ret != E_OK) {
-                        printf("[NET MISC,%d] get_tim error: %s",
+                        syslog(LOG_NOTICE, "[NET MISC,%d] get_tim error: %s",
                                 nc->cepid, itron_strerror(ret));
                         break;

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntp_cli.c

@@ -277 +277 @@
         }
 
-        printf("[NTP CLI,%d] recv time: %s .%09u\n",
+        syslog(LOG_NOTICE, "[NTP CLI,%d] recv time: %s .%09u",
                 nc->cepid, nc->buf, tp.tv_nsec);
 }
@@ -309 +309 @@
                 line = lookup_ipaddr(&nc->ipaddr6, NTP_SRV_URL, API_PROTO_IPV4);
                 if (line == NULL || !in6_is_addr_ipv4mapped(&nc->ipaddr6)) {
-                        printf("[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
                                 nc->cepid, SLP_ITV / SYSTIM_HZ, SLP_ITV % SYSTIM_HZ);
                         nc->timer = SLP_ITV;
@@ -317 +317 @@
 #else   /* of #if defined(SUPPORT_INET6) && defined(SUPPORT_INET4) */
                 if ((line = lookup_ipaddr(&nc->snd_rmt.ipaddr, NTP_SRV_URL, DEFAULT_API_PROTO)) == NULL) {
-                        printf("[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] sleep %d.%03u[s], unknown host.",
                                 nc->cepid, SLP_ITV / SYSTIM_HZ, SLP_ITV % SYSTIM_HZ);
                         nc->timer = SLP_ITV;
@@ -421 +421 @@
 
         if ((error = udp_snd_dat(nc->cepid, &nc->snd_rmt, ntp, len, TMO_NBLK)) != E_WBLK) {
-                printf("[NTP CLI,%d] udp_snd_dat error: %s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] udp_snd_dat error: %s",
                         nc->cepid, itron_strerror(error));
                 return error;
         }
         else
-                syslog(LOG_DEBUG, "[NTP CLI,%d] udp_snd_dat: to: %s.%d\n",
+                syslog(LOG_DEBUG, "[NTP CLI,%d] udp_snd_dat: to: %s.%d",
                         nc->cepid, ip2str(NULL, &nc->snd_rmt.ipaddr), nc->snd_rmt.portno);
 
@@ -439 +439 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                printf("[NTP CLI,%d] get_tim error: %s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] get_tim error: %s",
                         nc->cepid, itron_strerror(ret));
                 tp->tv_sec = 0;
@@ -459 +459 @@
         ret = set_tim(time);
         if (ret != E_OK) {
-                printf("[NTP CLI,%d] set_tim error: %s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] set_tim error: %s",
                         nc->cepid, itron_strerror(ret));
         }
@@ -477 +477 @@
         if (len < 0 && len != E_RLWAI) {
                 /* E_RLWAI 以外で、0 以下の場合は、エラーを意味している。*/
-                printf("[NTP CLI,%d] callback error: %s, fncd: %s", nc->cepid,
+                syslog(LOG_NOTICE, "[NTP CLI,%d] callback error: %s, fncd: %s", nc->cepid,
                         itron_strerror(len), in_strtfn(fncd));
         }
@@ -484 +484 @@
                         if ((len = udp_rcv_dat(nc->cepid, &nc->rcv_rmt, &nc->ntp_msg, len, TMO_POL)) < 0)
                         {
-                                printf("[NTP CLI,%d] udp_rcv_dat error: %s", nc->cepid,
+                                syslog(LOG_NOTICE, "[NTP CLI,%d] udp_rcv_dat error: %s", nc->cepid,
                                         itron_strerror(len));
                         }
@@ -516 +516 @@
 
         get_tid(&nc->tskid);
-        printf("[NTP CLI:%d,%d] started.", nc->tskid, (ID)exinf);
+        syslog(LOG_NOTICE, "[NTP CLI:%d,%d] started.", nc->tskid, (ID)exinf);
 
         /* 初期化 */
@@ -523 +523 @@
         ret = get_tim(&time);
         if (ret != E_OK) {
-                printf("[NTP CLI,%d] get_tim error: %7lu,%s",
+                syslog(LOG_NOTICE, "[NTP CLI,%d] get_tim error: %7lu,%s",
                         nc->cepid, time / SYSTIM_HZ, itron_strerror(ret));
                 return;
@@ -537 +537 @@
                 error = tslp_tsk(timer);
                 if ((error != E_OK) && (error != E_TMOUT)) {
-                        printf("[NTP CLI,%d] tslp_tsk error: %s %d",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] tslp_tsk error: %s %d",
                                 nc->cepid, itron_strerror(error), timer);
                         break;
@@ -544 +544 @@
                 ret = get_tim(&time);
                 if (ret != E_OK) {
-                        printf("[NTP CLI,%d] get_tim error: %s",
+                        syslog(LOG_NOTICE, "[NTP CLI,%d] get_tim error: %s",
                                 nc->cepid, itron_strerror(ret));
                         break;

asp3_tinet_ecnl_arm/trunk/ntshell/src/ntshell_main.c

@@ -58 +58 @@
 #include "util/ntopt.h"
 #include "ntshell_main.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 
 char command[NTOPT_TEXT_MAXLEN];
@@ -78 +78 @@
 }
 
+void stdio_open(ID portid);
 static int usrcmd_ntopt_callback(long *args, void *extobj);
 
@@ -86 +87 @@
 void ntshell_task_init(ID portid)
 {
-        serial_ctl_por(portid, IOCTL_CRLF | IOCTL_FCSND | IOCTL_FCRCV);
+        stdio_open(portid);
 }
 
@@ -95 +96 @@
 {
         ntshell_state = 1;
-        ntshell_exit_code = ntopt_parse(command, usrcmd_ntopt_callback, NULL);
+
+        if (setjmp(process_exit) == 0) {
+                ntshell_exit_code = ntopt_parse(command, usrcmd_ntopt_callback, NULL);
+        }
+
+        fflush(stdout);
+        clean_fd();
+
         ntshell_state = 2;
 }
@@ -139 +147 @@
                 printf("Unknown command found.\n");
 
-        clean_fd();
-
         return result;
 }
@@ -285 +291 @@
 }
 
-struct sigaction sigtable[7];
-
-int shell_sigaction(int sig, const struct sigaction *restrict sa, struct sigaction *restrict old)
-{
-        struct sigaction *sat;
+// musl-1.1.18\src\internal\ksigaction.h
+struct k_sigaction {
+        void(*handler)(int);
+        unsigned long flags;
+        void(*restorer)(void);
+        unsigned mask[2];
+};
+
+struct k_sigaction sigtable[7];
+
+int shell_sigaction(int sig, const struct k_sigaction *__restrict sa,
+        struct k_sigaction *__restrict old, size_t size)
+{
+        struct k_sigaction *sat;
 
         switch(sig){
@@ -318 +333 @@
 
         if (old != NULL)
-                memcpy(old, sat, sizeof(struct sigaction));
-
-        memcpy(sat, sa, sizeof(struct sigaction));
+                memcpy(old, sat, offsetof(struct k_sigaction, mask) + size);
+
+        memcpy(sat, sa, offsetof(struct k_sigaction, mask) + size);
 
         return 0;
@@ -368 +383 @@
 }
 
+int shell_nanosleep(const struct timespec *req, struct timespec *rem)
+{
+        ER ret;
+        TMO tmo;
+        SYSTIM prev, now, diff;
+
+        if ((req == NULL) || (req->tv_nsec < 0) || (req->tv_nsec >= 1000000000))
+                return -EINVAL;
+
+        get_tim(&prev);
+
+        tmo = req->tv_sec * 1000000 + req->tv_nsec / 1000;
+        ret = tslp_tsk(tmo);
+        if (ret == E_OK) {
+                if (rem != NULL) {
+                        get_tim(&now);
+                        diff = now - prev;
+                        rem->tv_sec = diff / 1000000ll;
+                        rem->tv_nsec = (diff - (rem->tv_sec * 1000000ll)) * 1000ll;
+                }
+                return 0;
+        }
+        else if (ret == E_TMOUT) {
+                if (rem != NULL) {
+                        rem->tv_sec = 0;
+                        rem->tv_nsec = 0;
+                }
+                return 0;
+        }
+
+        return -EFAULT;
+}

asp3_tinet_ecnl_arm/trunk/ntshell/src/shellif.h

@@ -74 +74 @@
 #define NCCS 32
 
-#include <bits/fcntl.h>
-#include <bits/termios.h>
-#include <bits/stat.h>
+#include <fcntl.h>
+#include <termios.h>
+#include <sys/stat.h>
 #include <sys/select.h>
 #include <time.h>
@@ -85 +85 @@
 #include <sys/utsname.h>
 #include <dirent.h>
-#include <bits/ioctl.h>
-#include <bits/errno.h>
+#include <sys/ioctl.h>
+#include <errno.h>
 #include <sys/socket.h>
 #else
@@ -132 +132 @@
 // time.h
 #define CLOCK_REALTIME 0
+int shell_nanosleep(const struct timespec *req, struct timespec *rem);
 
 // dirent.h
@@ -177 +178 @@
 // signal.h
 int shell_sigprocmask(int how, const sigset_t *__restrict set, sigset_t *__restrict old);
-int shell_sigaction(int sig, const struct sigaction *__restrict sa, struct sigaction *__restrict old);
+struct k_sigaction;
+int shell_sigaction(int sig, const struct k_sigaction *__restrict sa,
+        struct k_sigaction *__restrict old, size_t size);
 // socket.h
 int shell_socket(int, int, int);
@@ -197 +200 @@
 // syslog.h
 void vsyslog (int, const char *, va_list);
-// termios.h
-int sio_tcgetattr (int, struct termios *);
-int sio_tcsetattr(int, int, const struct termios *);
 // fcntl.h
 int shell_open(const char *, int, void *arg);

asp3_tinet_ecnl_arm/trunk/ntshell/src/socket_stub.c

@@ -62 +62 @@
 #include <netinet/tcp_var.h>
 #include <netapp/resolver.h>
-extern const ID tmax_tcp_cepid;
-#include "ff.h"
-#include "socket_stub.h"
+#include "fdtable.h"
 #include "kernel_cfg.h"
 
+#ifdef _DEBUG
+static const char THIS_FILE[] = __FILE__;
+#endif
+
 #define SOCKET_TIMEOUT 2000000
+
+struct addrinfo {
+        int ai_flags;
+        int ai_family;
+        int ai_socktype;
+        int ai_protocol;
+        socklen_t ai_addrlen;
+        struct sockaddr *ai_addr;
+        char *ai_canonname;
+        struct addrinfo *ai_next;
+};
+
+typedef uint16_t in_port_t;
+typedef uint32_t in_addr_t;
+struct in_addr { in_addr_t s_addr; };
+
+struct sockaddr_in {
+        sa_family_t sin_family;
+        in_port_t sin_port;
+        struct in_addr sin_addr;
+        uint8_t sin_zero[8];
+};
+
+struct in6_addr
+{
+        union {
+                uint8_t __s6_addr[16];
+                uint16_t __s6_addr16[8];
+                uint32_t __s6_addr32[4];
+        } __in6_union;
+};
+//#define s6_addr __in6_union.__s6_addr
+//#define s6_addr16 __in6_union.__s6_addr16
+//#define s6_addr32 __in6_union.__s6_addr32
+
+struct sockaddr_in6
+{
+        sa_family_t     sin6_family;
+        in_port_t       sin6_port;
+        uint32_t        sin6_flowinfo;
+        struct in6_addr sin6_addr;
+        uint32_t        sin6_scope_id;
+};
+
+typedef struct socket_t {
+        int family;
+        int type;
+        int protocol;
+        int cepid;
+        int repid;
+        int backlog;
+        unsigned int flags;
+        union {
+                struct sockaddr_in laddr4;
+                struct sockaddr_in6 laddr6;
+        };
+        union {
+                struct sockaddr_in raddr4;
+                struct sockaddr_in6 raddr6;
+        };
+        int buf_size;
+        unsigned char *buf;
+        void *input;
+        int len;
+} socket_t;
 
 #define tcp6_cre_cep tcp_cre_cep
@@ -82 +149 @@
 #define tcp6_set_opt tcp_set_opt
 
-#define udp6_del_cep udp_del_cep
-#define udp6_get_opt udp_get_opt
-#define udp6_set_opt udp_set_opt
-
 #ifndef SUPPORT_INET6
 
@@ -93 +156 @@
 
 ER      udp6_cre_cep (ID cepid, T_UDP6_CCEP *pk_ccep) { return E_SYS; }
+ER      udp6_del_cep (ID cepid) { return E_SYS; }
 ER_UINT udp6_snd_dat (ID cepid, T_IPV6EP *p_dstaddr, void *data, int_t len, TMO tmout) { return E_SYS; }
 ER_UINT udp6_rcv_dat (ID cepid, T_IPV6EP *p_dstaddr, void *data, int_t len, TMO tmout) { return E_SYS; }
+ER      udp6_set_opt (ID cepid, int_t optname, void *optval, int_t optlen) { return E_SYS; }
+ER      udp6_get_opt (ID cepid, int_t optname, void *optval, int_t optlen) { return E_SYS; }
 
 const T_IN6_ADDR *in6_get_ifaddr (int_t index) { return NULL; }
@@ -111 +177 @@
 static int tcp_fd_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t tcp_fd_readable(struct SHELL_FILE *fp);
+static bool_t tcp_fd_writable(struct SHELL_FILE *fp);
 static void tcp_fd_delete(struct SHELL_FILE *fp);
 
@@ -119 +186 @@
 static int udp_fd_ioctl(struct SHELL_FILE *fp, int req, void *arg);
 static bool_t udp_fd_readable(struct SHELL_FILE *fp);
+static bool_t udp_fd_writable(struct SHELL_FILE *fp);
 static void udp_fd_delete(struct SHELL_FILE *fp);
 
-IO_TYPE IO_TYPE_TCP = { tcp_fd_close, tcp_fd_read, tcp_fd_write, tcp_fd_seek, tcp_fd_ioctl, tcp_fd_readable, tcp_fd_delete };
-IO_TYPE IO_TYPE_UDP = { udp_fd_close, udp_fd_read, udp_fd_write, udp_fd_seek, udp_fd_ioctl, udp_fd_readable, udp_fd_delete };
+IO_TYPE IO_TYPE_TCP = { tcp_fd_close, tcp_fd_read, tcp_fd_write, tcp_fd_seek, tcp_fd_ioctl, tcp_fd_readable, tcp_fd_writable, tcp_fd_delete };
+IO_TYPE IO_TYPE_UDP = { udp_fd_close, udp_fd_read, udp_fd_write, udp_fd_seek, udp_fd_ioctl, udp_fd_readable, udp_fd_writable, udp_fd_delete };
 
 typedef struct id_table_t {
@@ -185 +253 @@
 
 #endif
+
+void addrcpy(void *_dst, const void *_src, int len)
+{
+#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
+        memcpy(_dst, _src, len);
+#else
+        uint8_t *dst = (uint8_t *)_dst, *src = &((uint8_t *)_src)[len];
+        while (src != _src)
+                *dst++ = *--src;
+#endif
+}
 
 ID new_id(id_table_t *table, int count)
@@ -347 +426 @@
                 }
                 case SOCK_DGRAM: {
-                        ID cepid = new_id(udp_cepid_table, udp_cepid_table_count);
+                        ID cepid = new_id(udp6_cepid_table, udp6_cepid_table_count);
                         if (cepid < 0)
                                 return -ENOMEM;
 
-                        T_UDP6_CCEP ccep = { 0, {ntohl(addr_in6->sin6_addr.__in6_union.__s6_addr), ntohs(addr_in6->sin6_port)}, (FP)socket_udp6_callback };
+                        T_UDP6_CCEP ccep = { 0, { { ntohl(addr_in6->sin6_addr.__in6_union.__s6_addr) }, ntohs(addr_in6->sin6_port)}, (FP)socket_udp6_callback };
                         ret = udp6_cre_cep(cepid, &ccep);
                         if (ret != E_OK) {
-                                delete_id(udp_cepid_table, udp_cepid_table_count, cepid);
+                                delete_id(udp6_cepid_table, udp6_cepid_table_count, cepid);
                                 return -ENOMEM;
                         }
@@ -407 +486 @@
 
                 struct sockaddr_in6 *laddr = &socket->laddr6;
-                T_TCP6_CREP crep = { 0, {ntohl(laddr->sin6_addr.__in6_union.__s6_addr), ntohs(laddr->sin6_port)} };
+                T_TCP6_CREP crep = { 0, { { ntohl(laddr->sin6_addr.__in6_union.__s6_addr) }, ntohs(laddr->sin6_port)} };
                 ret = tcp6_cre_rep(repid, &crep);
                 if (ret != E_OK) {
@@ -423 +502 @@
 }
 
-int shell_connect(int fd, const struct sockaddr *addr, socklen_t len)
+int shell_connect(int fd, const struct sockaddr *addr, socklen_t alen)
 {
         SOCKET *fp = fd_to_fp(fd);
@@ -435 +514 @@
         switch (socket->family) {
         case AF_INET: {
-                if (len < 8) {
+                if (alen < sizeof(struct sockaddr_in)) {
                         return -EINVAL;
                 }
@@ -455 +534 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
                 struct sockaddr_in *laddr = &socket->laddr4;
                 struct sockaddr_in *raddr = &socket->raddr4;
-                memset(raddr, 0, sizeof(*raddr));
-                memcpy(raddr, addr, len);
+                memcpy(raddr, addr, sizeof(struct sockaddr_in));
                 T_IPV4EP lep = { ntohl(laddr->sin_addr.s_addr), ntohs(laddr->sin_port) };
                 T_IPV4EP rep = { ntohl(raddr->sin_addr.s_addr), ntohs(raddr->sin_port) };
                 ret = tcp_con_cep(socket->cepid, &lep, &rep, SOCKET_TIMEOUT);
-                if (ret < 0) {
+                if (ret == E_TMOUT) {
+                        return -ETIMEDOUT;
+                }
+                else if (ret < 0) {
                         return -EHOSTUNREACH;
                 }
@@ -470 +552 @@
         }
         case AF_INET6: {
-                if (len < 20) {
+                if (alen < sizeof(struct sockaddr_in6)) {
                         return -EINVAL;
                 }
@@ -490 +572 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
                 struct sockaddr_in6 *laddr = &socket->laddr6;
                 struct sockaddr_in6 *raddr = &socket->raddr6;
-                memset(raddr, 0, sizeof(*raddr));
-                memcpy(raddr, addr, len);
-                T_IPV6EP lep = { ntohl(laddr->sin6_addr.__in6_union.__s6_addr), ntohs(laddr->sin6_port) };
-                T_IPV6EP rep = { ntohl(raddr->sin6_addr.__in6_union.__s6_addr), ntohs(raddr->sin6_port) };
+                memcpy(raddr, addr, sizeof(struct sockaddr_in6));
+                T_IPV6EP lep;
+                addrcpy(&lep.ipaddr, &laddr->sin6_addr, 16);
+                lep.portno = ntohs(laddr->sin6_port);
+                T_IPV6EP rep;
+                addrcpy(&rep.ipaddr, &raddr->sin6_addr, 16);
+                rep.portno = ntohs(raddr->sin6_port);
                 ret = tcp6_con_cep(socket->cepid, &lep, &rep, SOCKET_TIMEOUT);
-                if (ret < 0) {
+                if (ret == E_TMOUT) {
+                        return -ETIMEDOUT;
+                }
+                else if (ret < 0) {
                         return -EHOSTUNREACH;
                 }
@@ -508 +597 @@
         }
 
+        if (fp->writeevt_w != fp->writeevt_r) fp->writeevt_r++;
+
         return 0;
 }
 
-int shell_accept(int fd, struct sockaddr *__restrict addr, socklen_t *__restrict len)
+int shell_accept(int fd, struct sockaddr *__restrict addr, socklen_t *__restrict alen)
 {
         SOCKET *lfp = fd_to_fp(fd);
@@ -550 +641 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
@@ -555 +647 @@
                         cepid = ((socket_t *)lfp->exinf)->cepid;
                         fp->handle = cepid;
+                        fp->writable = 1;
                         lfp->handle = tmax_tcp_cepid + ((socket_t *)lfp->exinf)->repid;
                         ((socket_t *)lfp->exinf)->cepid = 0;
@@ -566 +659 @@
                 }
                 struct sockaddr_in *raddr = &socket->raddr4;
-                memset(raddr, 0, sizeof(*raddr));
+                memset(raddr, 0, sizeof(struct sockaddr_in));
                 raddr->sin_family = AF_INET;
                 raddr->sin_port = htons(rep.portno);
                 raddr->sin_addr.s_addr = htonl(rep.ipaddr);
 
-                if (addr != NULL && len != NULL) {
-                        int sz = *len;
-                        if (sz < 8) {
+                if (addr != NULL && alen != NULL) {
+                        int sz = *alen;
+                        if (sz < sizeof(struct sockaddr_in)) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in *raddr = &socket->raddr4;
-                        if (sz > sizeof(*raddr))
-                                sz = sizeof(*raddr);
+                        if (sz > sizeof(struct sockaddr_in))
+                                sz = sizeof(struct sockaddr_in);
                         memcpy(addr, raddr, sz);
-                        *len = sizeof(*raddr);
+                        *alen = sz;
                 }
                 break;
@@ -603 +696 @@
                         }
                         fp->handle = cepid;
+                        fp->writable = 1;
                         socket->cepid = cepid;
                 }
@@ -608 +702 @@
                         cepid = ((socket_t *)lfp->exinf)->cepid;
                         fp->handle = cepid;
+                        fp->writable = 1;
                         lfp->handle = tmax_tcp6_cepid + ((socket_t *)lfp->exinf)->repid;
                         ((socket_t *)lfp->exinf)->cepid = 0;
@@ -613 +708 @@
                         ((socket_t *)lfp->exinf)->buf = 0;
                 }
-                T_IPV6EP rep = { 0, 0 };
+                T_IPV6EP rep = { { 0 }, 0 };
                 ret = tcp6_acp_cep(socket->cepid, socket->repid, &rep, TMO_FEVR);
                 if (ret < 0) {
@@ -619 +714 @@
                 }
                 struct sockaddr_in6 *raddr = &socket->raddr6;
-                memset(raddr, 0, sizeof(*raddr));
+                memset(raddr, 0, sizeof(struct sockaddr_in6));
                 raddr->sin6_family = AF_INET;
                 raddr->sin6_port = htons(rep.portno);
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                memcpy(raddr->sin6_addr.__in6_union.__s6_addr, rep.ipaddr.__u6_addr.__u6_addr8, 16);
-#else
-                for (int i = 0; i < 16; i++)
-                        raddr->sin6_addr.__in6_union.__s6_addr[i] = rep.ipaddr.__u6_addr.__u6_addr8[i];
-#endif
-
-                if (addr != NULL && len != NULL) {
-                        int sz = *len;
-                        if (sz < 8) {
+                addrcpy(&raddr->sin6_addr, &rep.ipaddr, 16);
+
+                if (addr != NULL && alen != NULL) {
+                        int sz = *alen;
+                        if (sz < sizeof(struct sockaddr_in6)) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in6 *raddr = &socket->raddr6;
-                        if (sz > sizeof(*raddr))
-                                sz = sizeof(*raddr);
+                        if (sz > sizeof(struct sockaddr_in6))
+                                sz = sizeof(struct sockaddr_in6);
                         memcpy(addr, raddr, sz);
-                        *len = sizeof(*raddr);
+                        *alen = sz;
                 }
                 break;
@@ -645 +735 @@
                 return -ENOPROTOOPT;
         }
+
+        if (fp->writeevt_w != fp->writeevt_r) fp->writeevt_r++;
 
         return fp->fd;
@@ -673 +765 @@
                         }
                         else {
+                                int temp = len;
                                 for (;;) {
                                         ret = tcp_snd_dat(socket->cepid, (void *)buf, len, SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                if (ret == E_TMOUT)
-                                                        return -ETIME;
-                                                return -ECOMM;
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         len -= ret;
@@ -685 +776 @@
                                         buf = (const void *)&((uint8_t *)buf)[ret];
                                 } 
+                                ret = temp;
                         }
                         break;
                 }
                 case SOCK_DGRAM: {
-                        int sz = alen;
-                        if ((addr == NULL) || (sz < 8)) {
+                        if ((addr == NULL) || (alen < sizeof(struct sockaddr_in))) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in *raddr = &socket->raddr4;
-                        memset(raddr, 0, sizeof(*raddr));
-                        memcpy(raddr, addr, sz);
+                        memcpy(raddr, addr, sizeof(struct sockaddr_in));
                         T_IPV4EP rep = { ntohl(raddr->sin_addr.s_addr), ntohs(raddr->sin_port) };
                         ret = udp_snd_dat(socket->cepid, &rep, (void *)buf, len,
                                 (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                         if (ret < 0) {
-                                return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                         }
                         break;
@@ -721 +811 @@
                         }
                         else {
+                                int temp = len;
                                 for (;;) {
                                         ret = tcp6_snd_dat(socket->cepid, (void *)buf, len, SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                if (ret == E_TMOUT)
-                                                        return -ETIME;
-                                                return -ECOMM;
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         len -= ret;
@@ -732 +821 @@
                                                 break;
                                         buf = (const void *)&((uint8_t *)buf)[ret];
-                                } 
+                                }
+                                ret = temp;
                         }
                         break;
                 }
                 case SOCK_DGRAM: {
-                        int sz = alen;
-                        if ((addr == NULL) || (sz < 8)) {
+                        if ((addr == NULL) || (alen < sizeof(struct sockaddr_in6))) {
                                 return -EINVAL;
                         }
                         struct sockaddr_in6 *raddr = &socket->raddr6;
-                        memset(raddr, 0, sizeof(*raddr));
-                        memcpy(raddr, addr, sz);
-                        T_IPV6EP rep = { ntohl(raddr->sin6_addr.__in6_union.__s6_addr), ntohs(raddr->sin6_port) };
+                        memcpy(raddr, addr, sizeof(struct sockaddr_in6));
+                        T_IPV6EP rep;
+                        addrcpy(&rep.ipaddr, &raddr->sin6_addr, 16);
+                        rep.portno = ntohs(raddr->sin6_port);
                         ret = udp6_snd_dat(socket->cepid, &rep, (void *)buf, len,
                                 (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                         if (ret < 0) {
-                                return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                         }
                         break;
@@ -758 +848 @@
                 return -ENOPROTOOPT;
         }
+
+        if (fp->writeevt_w != fp->writeevt_r) fp->writeevt_r++;
 
         return ret;
@@ -800 +892 @@
                                                 syslog(LOG_ERROR, "sig_sem => %d", ret);
                                         }
-                                        ret = tcp_rcv_buf(socket->cepid, &socket->input, TMO_FEVR);
+                                        ret = tcp_rcv_buf(socket->cepid, &socket->input,
+                                                (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                syslog(LOG_ERROR, "tcp_rcv_buf => %d", ret);
-                                                return -ECOMM;
+                                                if ((socket->flags & O_NONBLOCK) == 0)
+                                                        syslog(LOG_ERROR, "tcp_rcv_buf => %d", ret);
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         rsz = ret;
@@ -858 +952 @@
                                         if ((socket->flags & O_NONBLOCK) == 0)
                                                 syslog(LOG_ERROR, "udp_rcv_buf => %d", ret);
-                                        return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                        return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                 }
                                 rsz = ret;
@@ -867 +961 @@
                                         }
                                         int sz = *alen;
-                                        memset(raddr, 0, sizeof(socket->raddr4));
+                                        memset(raddr, 0, sizeof(struct sockaddr_in));
                                         raddr->sin_family = AF_INET;
                                         raddr->sin_port = htons(rep.portno);
                                         raddr->sin_addr.s_addr = htonl(rep.ipaddr);
-                                        if (sz > sizeof(socket->raddr4))
-                                                sz = sizeof(socket->raddr4);
+                                        if (sz > sizeof(struct sockaddr_in))
+                                                sz = sizeof(struct sockaddr_in);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -889 +983 @@
                                 if ((addr != NULL) && (alen != NULL)) {
                                         int sz = *alen;
-                                        if (sz > sizeof(socket->raddr4))
-                                                sz = sizeof(socket->raddr4);
+                                        if (sz > sizeof(struct sockaddr_in))
+                                                sz = sizeof(struct sockaddr_in);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -934 +1028 @@
                                                 syslog(LOG_ERROR, "sig_sem => %d", ret);
                                         }
-                                        ret = tcp6_rcv_buf(socket->cepid, &socket->input, TMO_FEVR);
+                                        ret = tcp6_rcv_buf(socket->cepid, &socket->input,
+                                                (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
                                         if (ret < 0) {
-                                                syslog(LOG_ERROR, "tcp6_rcv_buf => %d", ret);
-                                                return -ECOMM;
+                                                if ((socket->flags & O_NONBLOCK) == 0)
+                                                        syslog(LOG_ERROR, "tcp6_rcv_buf => %d", ret);
+                                                return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                         }
                                         rsz = ret;
@@ -986 +1082 @@
                                 }
 
-                                T_IPV6EP rep = { 0, 0 };
+                                T_IPV6EP rep = { { 0 }, 0 };
                                 ret = udp6_rcv_dat(socket->cepid, &rep, buf, len,
                                         (socket->flags & O_NONBLOCK) ? TMO_POL : SOCKET_TIMEOUT);
@@ -992 +1088 @@
                                         if ((socket->flags & O_NONBLOCK) == 0)
                                                 syslog(LOG_ERROR, "udp6_rcv_buf => %d", ret);
-                                        return (ret == E_TMOUT) ? -ETIME : -ECOMM;
+                                        return (ret == E_TMOUT) ? -EAGAIN : -ECOMM;
                                 }
                                 rsz = ret;
@@ -1001 +1097 @@
                                         }
                                         int sz = *alen;
-                                        memset(raddr, 0, sizeof(socket->raddr6));
+                                        memset(raddr, 0, sizeof(struct sockaddr_in6));
                                         raddr->sin6_family = AF_INET;
                                         raddr->sin6_port = htons(rep.portno);
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                                        memcpy(raddr->sin6_addr.__in6_union.__s6_addr, rep.ipaddr.__u6_addr.__u6_addr8, 16);
-#else
-                                        for (int i = 0; i < 16; i++)
-                                                raddr->sin6_addr.__in6_union.__s6_addr[i] = rep.ipaddr.__u6_addr.__u6_addr8[i];
-#endif
-                                        if (sz > sizeof(socket->raddr6))
-                                                sz = sizeof(socket->raddr6);
+                                        addrcpy(&raddr->sin6_addr, &rep.ipaddr, 16);
+                                        if (sz > sizeof(struct sockaddr_in6))
+                                                sz = sizeof(struct sockaddr_in6);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -1028 +1119 @@
                                 if ((addr != NULL) && (alen != NULL)) {
                                         int sz = *alen;
-                                        if (sz > sizeof(socket->raddr6))
-                                                sz = sizeof(socket->raddr6);
+                                        if (sz > sizeof(struct sockaddr_in6))
+                                                sz = sizeof(struct sockaddr_in6);
                                         memcpy(addr, raddr, sz);
                                         *alen = sz;
@@ -1054 +1145 @@
                 return -ENOPROTOOPT;
         }
+
+        if (fp->readevt_w != fp->readevt_r) fp->readevt_r++;
 
         return ret;
@@ -1427 +1520 @@
                 struct sockaddr_in6 laddr;
                 laddr.sin6_family = AF_INET;
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                memcpy(laddr.sin6_addr.__in6_union.__s6_addr, laddr6->__u6_addr.__u6_addr8, 16);
-#else
-                for (int i = 0; i < 16; i++)
-                        laddr.sin6_addr.__in6_union.__s6_addr[i] = laddr6->__u6_addr.__u6_addr8[i];
-#endif
+                addrcpy(&laddr.sin6_addr, laddr6, 16);
                 laddr.sin6_port = socket->laddr6.sin6_port;
                 *len = sizeof(struct sockaddr_in6);
@@ -1465 +1553 @@
                         delete_id(tcp_cepid_table, tcp_cepid_table_count, cepid);
                         if ((ret < 0) || (ret2 < 0)) {
-                                return (ret == E_TMOUT) ? -ETIME : -EINVAL;
+                                return (ret == E_TMOUT) ? -ETIMEDOUT : -EIO;
                         }
                 }
@@ -1494 +1582 @@
                         delete_id(tcp6_cepid_table, tcp6_cepid_table_count, cepid);
                         if ((ret < 0) || (ret2 < 0)) {
-                                return (ret == E_TMOUT) ? -ETIME : -EINVAL;
+                                return (ret == E_TMOUT) ? -ETIMEDOUT : -EIO;
                         }
                 }
@@ -1535 +1623 @@
 int tcp_fd_ioctl(struct SHELL_FILE *fp, int req, void *arg)
 {
+        socket_t *socket = (socket_t *)fp->exinf;
+
+        switch (req) {
+        case F_GETFL:
+                return socket->flags;
+        case F_SETFL:
+                socket->flags = (unsigned int)arg;
+                return 0;
+        }
+
         return -EINVAL;
 }
@@ -1571 +1669 @@
 }
 
+bool_t tcp_fd_writable(struct SHELL_FILE *fp)
+{
+        //socket_t *socket = (socket_t *)fp->exinf;
+
+        return /*fp->writable &&*/ (fp->writeevt_w == fp->writeevt_r);
+}
+
 void tcp_fd_delete(struct SHELL_FILE *fp)
 {
@@ -1590 +1695 @@
                 return E_PAR;
 
+        socket_t *socket = (socket_t *)fp->exinf;
         int fd = fp->fd;
         FD_SET(fd, (fd_set *)&flgptn);
@@ -1603 +1709 @@
                         syslog(LOG_ERROR, "wai_sem => %d", ret);
                 }
-                socket_t *socket = (socket_t *)fp->exinf;
                 socket->len += len;
                 ret = sig_sem(SEM_FILEDESC);
@@ -1670 +1775 @@
                 return E_PAR;
 
+        socket_t *socket = (socket_t *)fp->exinf;
         int fd = fp->fd;
         FD_SET(fd, (fd_set *)&flgptn);
@@ -1683 +1789 @@
                         syslog(LOG_ERROR, "wai_sem => %d", ret);
                 }
-                socket_t *socket = (socket_t *)fp->exinf;
                 socket->len += len;
                 ret = sig_sem(SEM_FILEDESC);
@@ -1806 +1911 @@
 }
 
+bool_t udp_fd_writable(struct SHELL_FILE *fp)
+{
+        //socket_t *socket = (socket_t *)fp->exinf;
+
+        return fp->writable && (fp->writeevt_w == fp->writeevt_r);
+}
+
 void udp_fd_delete(struct SHELL_FILE *fp)
 {
@@ -1849 +1961 @@
                 socket->input = udppara->input;
                 socket->buf = GET_UDP_SDU(udppara->input, udppara->off);
-                memset(&socket->raddr4, 0, sizeof(socket->raddr4));
+                memset(&socket->raddr4, 0, sizeof(struct sockaddr_in));
                 socket->raddr4.sin_family = AF_INET;
                 socket->raddr4.sin_port = htons(udppara->rep4.portno);
@@ -1932 +2044 @@
                 socket->input = udppara->input;
                 socket->buf = GET_UDP_SDU(udppara->input, udppara->off);
-                memset(&socket->raddr6, 0, sizeof(socket->raddr6));
+                memset(&socket->raddr6, 0, sizeof(struct sockaddr_in6));
                 socket->raddr6.sin6_family = AF_INET;
                 socket->raddr6.sin6_port = htons(udppara->rep6.portno);
-#if _NET_CFG_BYTE_ORDER == _NET_CFG_BIG_ENDIAN
-                memcpy(socket->raddr6.sin6_addr.__in6_union.__s6_addr, udppara->rep6.ipaddr.__u6_addr.__u6_addr8, 16);
-#else
-                for (int i = 0; i < 16; i++)
-                        socket->raddr6.sin6_addr.__in6_union.__s6_addr[i] = udppara->rep6.ipaddr.__u6_addr.__u6_addr8[i];
-#endif
+                addrcpy(&socket->raddr6.sin6_addr, &udppara->rep6.ipaddr, 16);
                 udppara->input->flags |= NB_FLG_NOREL_IFOUT;
                 ret = sig_sem(SEM_FILEDESC);

asp3_tinet_ecnl_arm/trunk/ntshell/src/syscall.c

@@ -336 +336 @@
 }
 
-long SYS_rt_sigaction(long a, long b, long c) {
-        return shell_sigaction((int)a, (const struct sigaction *)b, (struct sigaction *)c);
+long SYS_rt_sigaction(long a, long b, long c, long d) {
+        return shell_sigaction((int)a, (const struct k_sigaction *)b, (struct k_sigaction *)c, (size_t)d);
 }
 
@@ -429 +429 @@
 }
 
+long SYS_nanosleep(long a, long b)
+{
+        return shell_nanosleep((const struct timespec *)a, (struct timespec *)b);
+}
+
 long SYS_dup(long a) {
         //int dup(int fd)
@@ -532 +537 @@
 {
         return no_implement("tgkill\n");
-}
-
-long SYS_nanosleep(long a, long b) {
-        //int nanosleep(const struct timespec *req, struct timespec *rem)
-        return no_implement("nanosleep\n");
 }