Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/netapp/tinet_net_cons.cfg

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/netapp/tinet_net_cons.cfg (modified) (4 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netapp/tinet_net_cons.cfg

@@ -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
  *
@@ -41 +41 @@
 /* TCP 受付口 */
 
+#ifdef SUPPORT_INET6
+
+TCP6_CRE_REP (NET_CONS_REPID, {
+        0,
+        { IPV6_ADDRANY, 23 }
+        } );
+
+#else   /* of #ifdef SUPPORT_INET6 */
+
 #ifdef SUPPORT_INET4
 
@@ -50 +59 @@
 #endif  /* of #ifdef SUPPORT_INET4 */
 
-#ifdef SUPPORT_INET6
-
-TCP6_CRE_REP (NET_CONS_REPID, {
-        0,
-        { IPV6_ADDRANY, 23 }
-        } );
-
 #endif  /* of #ifdef SUPPORT_INET6 */
 
 /* TCP 通信端点 */
+
+#ifdef SUPPORT_INET6
+
+#ifdef TCP_CFG_SWBUF_CSAVE
+
+TCP6_CRE_CEP (NET_CONS_CEPID, {
+        0,
+        NADR,
+        NET_CONS_SWBUF_SIZE,
+        NADR,
+        NET_CONS_RWBUF_SIZE,
+        callback_nblk_net_cons
+        } );
+
+#else   /* of #ifdef TCP_CFG_SWBUF_CSAVE */
+
+TCP6_CRE_CEP (NET_CONS_CEPID, {
+        0,
+        net_cons_swbuf,
+        NET_CONS_SWBUF_SIZE,
+        net_cons_rwbuf,
+        NET_CONS_RWBUF_SIZE,
+        callback_nblk_net_cons
+        } );
+
+#endif  /* of #ifdef TCP_CFG_SWBUF_CSAVE */
+
+#else   /* of #ifdef SUPPORT_INET6 */
 
 #ifdef SUPPORT_INET4
@@ -89 +119 @@
 #endif  /* of #ifdef SUPPORT_INET4 */
 
-#ifdef SUPPORT_INET6
-
-#ifdef TCP_CFG_SWBUF_CSAVE
-
-TCP6_CRE_CEP (NET_CONS_CEPID, {
-        0,
-        NADR,
-        NET_CONS_SWBUF_SIZE,
-        NADR,
-        NET_CONS_RWBUF_SIZE,
-        callback_nblk_net_cons
-        } );
-
-#else   /* of #ifdef TCP_CFG_SWBUF_CSAVE */
-
-TCP6_CRE_CEP (NET_CONS_CEPID, {
-        0,
-        net_cons_swbuf,
-        NET_CONS_SWBUF_SIZE,
-        net_cons_rwbuf,
-        NET_CONS_RWBUF_SIZE,
-        callback_nblk_net_cons
-        } );
-
-#endif  /* of #ifdef TCP_CFG_SWBUF_CSAVE */
-
 #endif  /* of #ifdef SUPPORT_INET6 */