Changeset 331 for EcnlProtoTool/trunk/musl-1.1.18/include/netinet/in.h

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

Location:

EcnlProtoTool/trunk/musl-1.1.18

Files:

• . (moved) (moved from EcnlProtoTool/trunk/musl-1.1.12 )
• include/netinet/in.h (modified) (13 diffs)

EcnlProtoTool/trunk/musl-1.1.18/include/netinet/in.h

@@ -14 +14 @@
 struct in_addr { in_addr_t s_addr; };
 
-struct sockaddr_in
-{
+struct sockaddr_in {
         sa_family_t sin_family;
         in_port_t sin_port;
@@ -22 +21 @@
 };
 
-struct in6_addr
-{
+struct in6_addr {
         union {
                 uint8_t __s6_addr[16];
@@ -34 +32 @@
 #define s6_addr32 __in6_union.__s6_addr32
 
-struct sockaddr_in6
-{
+struct sockaddr_in6 {
         sa_family_t     sin6_family;
         in_port_t       sin6_port;
@@ -43 +40 @@
 };
 
-struct ipv6_mreq
-{
+struct ipv6_mreq {
         struct in6_addr ipv6mr_multiaddr;
         unsigned        ipv6mr_interface;
@@ -73 +69 @@
 uint32_t ntohl(uint32_t);
 uint16_t ntohs(uint16_t);
+
+#define IPPORT_RESERVED 1024
 
 #define IPPROTO_IP       0
@@ -104 +102 @@
 #define IPPROTO_MH       135
 #define IPPROTO_UDPLITE  136
+#define IPPROTO_MPLS     137
 #define IPPROTO_RAW      255
 #define IPPROTO_MAX      256
@@ -201 +200 @@
 #define IP_NODEFRAG        22
 #define IP_CHECKSUM        23
+#define IP_BIND_ADDRESS_NO_PORT 24
 #define IP_MULTICAST_IF    32
 #define IP_MULTICAST_TTL   33
@@ -227 +227 @@
 #define IP_MAX_MEMBERSHIPS              20
 
-struct ip_opts
-{
+struct ip_opts {
         struct in_addr ip_dst;
         char ip_opts[40];
@@ -246 +245 @@
 #define MCAST_INCLUDE 1
 
-struct ip_mreq
-{
+struct ip_mreq {
         struct in_addr imr_multiaddr;
         struct in_addr imr_interface;
 };
 
-struct ip_mreqn
-{
+struct ip_mreqn {
         struct in_addr imr_multiaddr;
         struct in_addr imr_address;
@@ -298 +295 @@
         + (numsrc) * sizeof(struct sockaddr_storage))
 
-struct in_pktinfo
-{
+struct in_pktinfo {
         int ipi_ifindex;
         struct in_addr ipi_spec_dst;
@@ -305 +301 @@
 };
 
-struct in6_pktinfo
-{
+struct in6_pktinfo {
         struct in6_addr ipi6_addr;
         unsigned ipi6_ifindex;
 };
 
-struct ip6_mtuinfo
-{
+struct ip6_mtuinfo {
         struct sockaddr_in6 ip6m_addr;
         uint32_t ip6m_mtu;
@@ -343 +337 @@
 #define IPV6_IPSEC_POLICY       34
 #define IPV6_XFRM_POLICY        35
+#define IPV6_HDRINCL            36
 
 #define IPV6_RECVPKTINFO        49
@@ -393 +388 @@
 #define IPV6_RTHDR_TYPE_0       0
 
+#define __UAPI_DEF_IN_ADDR      0
+#define __UAPI_DEF_IN_IPPROTO   0
+#define __UAPI_DEF_IN_PKTINFO   0
+#define __UAPI_DEF_IP_MREQ      0
+#define __UAPI_DEF_SOCKADDR_IN  0
+#define __UAPI_DEF_IN_CLASS     0
+#define __UAPI_DEF_IN6_ADDR     0
+#define __UAPI_DEF_IN6_ADDR_ALT 0
+#define __UAPI_DEF_SOCKADDR_IN6 0
+#define __UAPI_DEF_IPV6_MREQ    0
+#define __UAPI_DEF_IPPROTO_V6   0
+#define __UAPI_DEF_IPV6_OPTIONS 0
+#define __UAPI_DEF_IN6_PKTINFO  0
+#define __UAPI_DEF_IP6_MTUINFO  0
+
 #ifdef __cplusplus
 }