Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_icmp.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/netinet/ip_icmp.h (modified) (3 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_icmp.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
  *
@@ -71 +71 @@
 #define _IP_ICMP_H_
 
+#include <netinet/icmp6.h>
+
 /*
  *  ICMP ヘッダの定義、RFC 792
@@ -96 +98 @@
 #define GET_ICMP4_SDU(nbuf,ihoff)       ((uint8_t*)((nbuf)->buf) + ihoff + ICMP4_HDR_SIZE)
 
-#define GET_ICMP4_HDR_OFFSET(nbuf)      (GET_IF_IP_HDR_SIZE(nbuf))
+#define GET_ICMP4_HDR_OFFSET(nbuf)      (GET_IF_IP4_HDR_SIZE(nbuf))
 
-#define GET_IP4_ICMP4_HDR_SIZE(nbuf)    (GET_IP4_HDR_SIZE(GET_IP4_HDR(nbuf)) + ICMP4_HDR_SIZE)
+#define GET_IP4_ICMP4_HDR_SIZE(nbuf)    (GET_IP4_HDR_SIZE(nbuf) + ICMP4_HDR_SIZE)
 #define GET_IF_IP4_ICMP4_HDR_SIZE(nbuf) (IF_HDR_SIZE + GET_IP4_ICMP4_HDR_SIZE(nbuf))