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

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/ip6_output.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
  *
@@ -125 +125 @@
 #include <net/ppp_ipcp.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_buf.h>
 #include <net/net_count.h>
 
 #include <netinet/in.h>
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
+#include <netinet/in_var.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/ip_icmp.h>
+
 #include <netinet6/nd6.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet/icmp6.h>
-
-#include <net/if6_var.h>
-
-#ifdef SUPPORT_INET6
+
+#include <net/if_var.h>
+
+#ifdef _IP6_CFG
 
 /*
@@ -165 +166 @@
 ip6_output (T_NET_BUF *output, uint16_t flags, TMO tmout)
 {
-        T_IP6_HDR       *ip6h;
-        T_IN6_ADDR      *gw;
-        T_IFNET         *ifp = IF_GET_IFNET();
-        ER              error = E_OK;
+        T_IP6_HDR               *ip6h;
+        const T_IN6_ADDR        *gw;
+        T_IFNET                 *ifp = IF_GET_IFNET();
+        ER                      error = E_OK;
 
 #ifdef IP6_CFG_FRAGMENT
@@ -185 +186 @@
 
         NET_COUNT_IP6(net_count_ip6[NC_IP6_OUT_OCTETS],
-                      GET_IP_HDR_SIZE(ip6h) + GET_IP_SDU_SIZE(ip6h));
+                      GET_IP6_HDR_SIZE(output) + GET_IP6_SDU_SIZE(output));
         NET_COUNT_IP6(net_count_ip6[NC_IP6_OUT_PACKETS], 1);
         NET_COUNT_MIB(in6_ifstat.ipv6IfStatsOutRequests, 1);
@@ -371 +372 @@
         }
 
-#endif /* of #ifdef SUPPORT_INET6 */
+#endif /* of #ifdef _IP6_CFG */