Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/ip6_input.c

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:

• EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/ip6_input.c (modified) (8 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/ip6_input.c

@@ -2 +2 @@
  *  TINET (TCP/IP Protocol Stack)
  * 
- *  Copyright (C) 2001-2009 by Dep. of Computer Science and Engineering
+ *  Copyright (C) 2001-2017 by Dep. of Computer Science and Engineering
  *                   Tomakomai National College of Technology, JAPAN
  *
@@ -105 +105 @@
 #include <kernel.h>
 #include <sil.h>
+#include <t_syslog.h>
+#include "tinet_cfg.h"
 
 #endif  /* of #ifdef TARGET_KERNEL_ASP */
@@ -112 +114 @@
 #include <s_services.h>
 #include <t_services.h>
+#include "tinet_id.h"
 
 #endif  /* of #ifdef TARGET_KERNEL_JSP */
@@ -124 +127 @@
 #include <net/ppp_ipcp.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_buf.h>
 #include <net/net_count.h>
 
 #include <netinet/in.h>
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/tcp.h>
+#include <netinet/tcp_var.h>
+#include <netinet/udp_var.h>
+
 #include <netinet6/nd6.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet/icmp6.h>
 #include <netinet6/ah6.h>
 #include <netinet6/esp6.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <netinet/udp_var.h>
-
-#include <net/if6_var.h>
-
-#ifdef SUPPORT_INET6
+
+#include <net/if_var.h>
+
+#ifdef _IP6_CFG
 
 /*
@@ -170 +173 @@
         { icmp6_input,  IPPROTO_ICMPV6          },
 
-#ifdef SUPPORT_UDP
-
-        { udp_input,    IPPROTO_UDP             },
-
-#endif  /* of #ifdef SUPPORT_UDP */
-
-#ifdef SUPPORT_TCP
+#if defined(SUPPORT_TCP)
 
         { tcp_input,    IPPROTO_TCP             },
 
-#endif  /* of #ifdef SUPPORT_TCP */
+#endif  /* of #if defined(SUPPORT_TCP) */
+
+#if defined(SUPPORT_UDP) && TNUM_UDP6_CEPID > 0
+
+        { udp6_input,   IPPROTO_UDP             },
+
+#endif  /* of #if defined(SUPPORT_UDP) && TNUM_UDP6_CEPID > 0 */
 
         };
@@ -640 +643 @@
 
         /* 開始オフセットを IP ヘッダに設定する。*/
-        off = ((uint8_t *)GET_IP_HDR(nbuf)) - nbuf->buf;
+        off = ((uint8_t *)GET_IP6_HDR(nbuf)) - nbuf->buf;
 
         /* 最終ヘッダを探索する。*/
@@ -650 +653 @@
                 uint_t sdu;
 
-                sdu = GET_IP_SDU(nbuf) - nbuf->buf;
+                sdu = GET_IP6_SDU(nbuf) - nbuf->buf;
                 if (off > sdu) {
                         memmove(nbuf->buf + sdu, nbuf->buf + off, off - sdu);
-                        GET_IP_HDR(nbuf)->plen -= off - sdu;
+                        GET_IP6_HDR(nbuf)->plen -= off - sdu;
                         nbuf->len              -= off - sdu;
                         }
@@ -660 +663 @@
         }
 
-#endif /* of #ifdef SUPPORT_INET6 */
+#endif /* of #ifdef _IP6_CFG */