Ignore:
Timestamp:
Jan 21, 2018, 12:10:09 AM (6 years ago)
Author:
coas-nagasima
Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

File:
1 edited

Legend:

Unmodified
Added
Removed

  • EcnlProtoTool/trunk/ntshell/src/socket_stub.h

    r321 r331  
    3838#define SOCKET_STUB_H
    3939
    40 typedef unsigned socklen_t;
    41 typedef unsigned short sa_family_t;
    42 
    43 struct sockaddr {
    44         sa_family_t sa_family;
    45         char sa_data[14];
    46 };
    47 
    4840struct addrinfo {
    4941        int ai_flags;
    … …  
    5749};
    5850
    59 #define AF_INET         2
    60 #define AF_INET6        10
    61 
    62 #define SOCK_STREAM     1
    63 #define SOCK_DGRAM      2
    64 
    6551typedef uint16_t in_port_t;
    6652typedef uint32_t in_addr_t;
    … …  
    8268        } __in6_union;
    8369};
    84 #define s6_addr __in6_union.__s6_addr
    85 #define s6_addr16 __in6_union.__s6_addr16
    86 #define s6_addr32 __in6_union.__s6_addr32
     70//#define s6_addr __in6_union.__s6_addr
     71//#define s6_addr16 __in6_union.__s6_addr16
     72//#define s6_addr32 __in6_union.__s6_addr32
    8773
    8874struct sockaddr_in6
    … …  
    9480        uint32_t        sin6_scope_id;
    9581};
    96 
    97 #define MSG_OOB       0x0001
    9882
    9983typedef struct socket_t {
    … …  
    124108        size_t (*read)(struct _IO_FILE *, unsigned char *, size_t);
    125109        size_t (*write)(struct _IO_FILE *, const unsigned char *, size_t);
     110        off_t (*seek)(struct _IO_FILE *, off_t, int);
     111        int (*ioctl)(struct _IO_FILE *, int, void *);
    126112        int readevt_r;
    127113        int readevt_w;
    … …  
    132118        union {
    133119                FIL file;
     120                struct {
     121                        DIR dir;
     122                        struct dirent dirent;
     123                };
    134124                socket_t socket;
    135125        };
    … …  
    156146extern size_t sio_read(struct _IO_FILE *fp, unsigned char *data, size_t len);
    157147extern size_t sio_write(struct _IO_FILE *fp, const unsigned char *data, size_t len);
     148extern off_t sio_seek(struct _IO_FILE *fp, off_t ofs, int org);
     149extern int sio_ioctl(struct _IO_FILE *fp, int req, void *arg);
    158150
    159151extern int file_close(struct _IO_FILE *fp);
    160152extern size_t file_read(struct _IO_FILE *fp, unsigned char *data, size_t len);
    161153extern size_t file_write(struct _IO_FILE *fp, const unsigned char *data, size_t len);
     154extern off_t file_seek(struct _IO_FILE *fp, off_t ofs, int org);
     155extern int file_ioctl(struct _IO_FILE *fp, int req, void *arg);
     156
     157extern int dir_close(struct _IO_FILE *fp);
     158extern size_t dir_read(struct _IO_FILE *fp, unsigned char *data, size_t len);
     159extern size_t dir_write(struct _IO_FILE *fp, const unsigned char *data, size_t len);
     160extern off_t dir_seek(struct _IO_FILE *fp, off_t ofs, int org);
     161extern int dir_ioctl(struct _IO_FILE *fp, int req, void *arg);
    162162
    163163extern int tcp_fd_close(struct _IO_FILE *fp);
    164164extern size_t tcp_fd_read(struct _IO_FILE *fp, unsigned char *data, size_t len);
    165165extern size_t tcp_fd_write(struct _IO_FILE *fp, const unsigned char *data, size_t len);
     166extern off_t tcp_fd_seek(struct _IO_FILE *fp, off_t ofs, int org);
     167extern int tcp_fd_ioctl(struct _IO_FILE *fp, int req, void *arg);
    166168
    167169extern int udp_fd_close(struct _IO_FILE *fp);
    168170extern size_t udp_fd_read(struct _IO_FILE *fp, unsigned char *data, size_t len);
    169171extern size_t udp_fd_write(struct _IO_FILE *fp, const unsigned char *data, size_t len);
     172extern off_t udp_fd_seek(struct _IO_FILE *fp, off_t ofs, int org);
     173extern int udp_fd_ioctl(struct _IO_FILE *fp, int req, void *arg);
    170174
    171175struct _IO_FILE *fd_to_fp(int fd);
    … …  
    179183struct _IO_FILE *fileid_to_fd(int fileid);
    180184
     185struct _IO_FILE *new_dir_fd(int dirid);
     186int delete_dir_fd(int dirid);
     187struct _IO_FILE *dirid_to_fd(int dirid);
     188
    181189struct _IO_FILE *new_tcp_fd(int tcpid);
    182190int delete_tcp_fd(int tcpid);
Note: See TracChangeset for help on using the changeset viewer.