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

EcnlProtoTool/trunk/asp3_dcre/tinet/netapp/ping.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>
@@ -74 +75 @@
 #ifdef USE_PING
 
+#if defined(SUPPORT_INET4)
+
 /*
  *  変数
  */
 
-static uint16_t icmp_id = 0;
+#if 0
 static uint16_t curr_icmp_id;
 static uint16_t curr_icmp_len;
+#endif
+
+static uint16_t icmp_id = 0;
 static SYSTIM   icmp_start_time;
 
@@ -90 +96 @@
 icmp_reply_timeout (void *arg)
 {
-        syslog(LOG_NOTICE, "[PING] request timeout.");
+        syslog(LOG_NOTICE, "[PING4] request timeout.");
         }
 
@@ -100 +106 @@
 icmp_echo_reply (T_NET_BUF *input, uint_t ihoff)
 {
-        SYSTIM time;
+        SYSTIM          time;
+        T_IN4_ADDR      addr;
 
         syscall(get_tim(&time));
+        addr = ntohl(GET_IP4_HDR(input)->src);
         untimeout(icmp_reply_timeout, NULL);
-        syslog(LOG_NOTICE, "[PING] reply, %d [ms].",
-                           (time - icmp_start_time) * 1000 / SYSTIM_HZ);
+        syslog(LOG_NOTICE, "[PING4] reply: %5ld [ms] from: %s",
+                           (time - icmp_start_time) * 1000 / SYSTIM_HZ,
+                           ip2str(NULL, &addr));
         }
 
@@ -143 +152 @@
 
         /* 応答チェック用の変数を設定する。*/
+#if 0
         curr_icmp_id  = icmp_id ++;
         curr_icmp_len = len;
+#endif
 
         NET_COUNT_MIB(icmp_stats.icmpOutMsgs, 1);
@@ -157 +168 @@
         }
 
+#endif  /* of #if defined(SUPPORT_INET4) */
+
 #endif  /* of #ifdef USE_PING */