Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/netapp/ping6.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/netapp/ping6.c (modified) (7 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netapp/ping6.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
  *
@@ -61 +61 @@
 #include <net/ppp_ipcp.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_buf.h>
 #include <net/net_timer.h>
@@ -67 +68 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/ip_icmp.h>
 
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
 
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet/icmp6.h>
-
-#include <net/if6_var.h>
+#include <net/if_var.h>
 
 #ifdef USE_PING
+
+#if defined(SUPPORT_INET6)
 
 /*
@@ -84 +84 @@
  */
 
-static uint16_t send_icmp6_id = 0;
+#if 0
 static uint16_t curr_icmp6_id;
 static uint16_t curr_icmp6_size;
+#endif
+
+static uint16_t send_icmp6_id = 0;
 static uint16_t reply_count;
 static SYSTIM   icmp6_start_time;
@@ -108 +111 @@
 icmp6_echo_reply (T_NET_BUF *input, uint_t ihoff)
 {
-        T_IP6_HDR       *ip6h;
-        SYSTIM          time;
+        SYSTIM  time;
 
         syscall(get_tim(&time));
-        ip6h  = GET_IP6_HDR(input);
-
-        syslog(LOG_NOTICE, "[PING6] reply: %5d [ms] from: %s",
+        untimeout(icmp6_reply_timeout, NULL);
+        syslog(LOG_NOTICE, "[PING6] reply: %5ld [ms] from: %s",
                            (time - icmp6_start_time) * 1000 / SYSTIM_HZ,
-                           ipv62str(NULL, &ip6h->src));
+                           ipv62str(NULL, &GET_IP6_HDR(input)->src));
         reply_count ++;
         }
@@ -169 +170 @@
 
         /* 応答チェック用の変数を設定する。*/
+        reply_count = 0;
+
+#if 0
         curr_icmp6_id   = send_icmp6_id ++;
         curr_icmp6_size = size;
+#endif
 
-        reply_count = 0;
-
+#if 0
         syslog(LOG_NOTICE, "[PING6] send: TMO:%d, SIZE:%d, to: %s, from %s",
                            tmo, size,
                            ipv62str(NULL, addr), ipv62str(NULL, &ia->addr));
+#endif
 
         /* 送信後、現在の時間を記憶し、タイムアウトを設定する。*/
@@ -188 +193 @@
         }
 
+#endif  /* of #if defined(SUPPORT_INET6) */
+
 #endif  /* of #ifdef USE_PING */