Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_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/netinet/ip_output.c (modified) (8 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/ip_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
  *
@@ -93 +93 @@
 #include <net/ppp.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_buf.h>
 #include <net/net_count.h>
@@ -104 +105 @@
 #include <netinet6/ipsec.h>
 #endif
+
+#if defined(_IP4_CFG)
 
 static uint16_t frag_id = 0;
@@ -221 +224 @@
 
                 len  = ntohs(ip4h->len);
-                off  = hlen = GET_IP4_HDR_SIZE(ip4h);
+                off  = hlen = GET_IP4_HDR_SIZE(output);
                 while (off < len) {
                         if (off + (IF_MTU - IP4_HDR_SIZE) < len)
@@ -245 +248 @@
                                 fip4h->id       = htons(frag_id);
                                 fip4h->sum      = 0;
-                                fip4h->sum      = in_cksum(fip4h, GET_IP4_HDR_SIZE(fip4h));
+                                fip4h->sum      = in_cksum(fip4h, GET_IP4_HDR_SIZE(frag));
 
                                 NET_COUNT_IP4(net_count_ip4[NC_IP4_OUT_OCTETS], ntohs(fip4h->len));
@@ -279 +282 @@
                 frag_id ++;
                 ip4h->sum = 0;
-                ip4h->sum = in_cksum(ip4h, GET_IP4_HDR_SIZE(ip4h));
+                ip4h->sum = in_cksum(ip4h, GET_IP4_HDR_SIZE(output));
 
                 NET_COUNT_IP4(net_count_ip4[NC_IP4_OUT_OCTETS], ntohs(ip4h->len));
@@ -301 +304 @@
         frag_id ++;
         ip4h->sum = 0;
-        ip4h->sum = in_cksum(ip4h, (uint_t)GET_IP4_HDR_SIZE(ip4h));
+        ip4h->sum = in_cksum(ip4h, (uint_t)GET_IP4_HDR_SIZE(output));
 
         NET_COUNT_IP4(net_count_ip4[NC_IP4_OUT_OCTETS], ntohs(ip4h->len));
@@ -327 +330 @@
         return error;
         }
+
+#endif  /* of #if defined(_IP4_CFG) */