Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/net/net_count.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

File:

• EcnlProtoTool/trunk/asp3_dcre/tinet/net/net_count.h (modified) (5 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/net/net_count.h

@@ -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
  *
@@ -155 +155 @@
 #endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_PPP_LCP */
 
+/* PPP IPV6CP */
+
+#if NET_COUNT_ENABLE & PROTO_FLG_PPP_IPV6CP
+
+#define NET_COUNT_PPP_IPV6CP(v,c)       ((v)+=(c))
+
+#ifndef _MACRO_ONLY
+
+extern T_NET_COUNT_VAL net_count_ppp_ipv6cp_in_octets;
+extern T_NET_COUNT_VAL net_count_ppp_ipv6cp_in_packets;
+
+#endif  /* of #ifndef _MACRO_ONLY */
+
+#else   /* of #if NET_COUNT_ENABLE & PROTO_FLG_PPP_IPV6CP */
+
+#define NET_COUNT_PPP_IPV6CP(v,c)
+
+#endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_PPP_IPV6CP */
+
 /* PPP IPCP */
 
@@ -302 +321 @@
 #endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_NET_BUF */
 
-#if defined(SUPPORT_INET4)
+#if defined(_IP4_CFG)
 
 /* ARP */
@@ -380 +399 @@
 #endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_ICMP4 */
 
-#endif  /* of #if defined(SUPPORT_INET4) */
-
-#if defined(SUPPORT_INET6)
+/* IGMP */
+
+#if NET_COUNT_ENABLE & PROTO_FLG_IGMP
+
+#define NET_COUNT_IGMP(v,c)     ((v)+=(c))
+
+#ifndef _MACRO_ONLY
+
+extern T_NET_COUNT      net_count_igmp;
+
+#endif  /* of #ifndef _MACRO_ONLY */
+
+#else   /* of #if NET_COUNT_ENABLE & PROTO_FLG_IGMP */
+
+#define NET_COUNT_IGMP(v,c)
+
+#endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_IGMP */
+
+#endif  /* of #if defined(_IP4_CFG) */
+
+#if defined(_IP6_CFG)
 
 /* IPv6 */
@@ -472 +509 @@
 #endif  /* of #if NET_COUNT_ENABLE & PROTO_FLG_ND6 */
 
-#endif  /* of #if defined(SUPPORT_INET6) */
+#endif  /* of #if defined(_IP6_CFG) */
 
 #ifdef SUPPORT_TCP