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

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet/tcp_subr_ncs.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
  *
@@ -95 +95 @@
 #include <net/ethernet.h>
 #include <net/if_arp.h>
-#include <net/ppp_ipcp.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_var.h>
 #include <net/net_buf.h>
@@ -103 +103 @@
 
 #include <netinet/in.h>
-#include <netinet6/in6.h>
-#include <netinet6/in6_var.h>
 #include <netinet/in_var.h>
+#include <netinet/in_itron.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet6/nd6.h>
 #include <netinet/tcp.h>
-#include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_seq.h>
-#include <netinet/in_itron.h>
+#include <netinet/tcp_timer.h>
 
 #ifdef SUPPORT_TCP
@@ -134 +129 @@
 {
         uint8_t *wptr, *rptr;
+        uint_t  sdu_size   = GET_IP_SDU_SIZE(output);
+        uint_t  hdr_offset = IF_IP_TCP_HDR_OFFSET(output);
 
         /* SDU の大きさをチェックする。*/
-        if (GET_IP_SDU_SIZE(GET_IP_HDR(output)) < GET_TCP_HDR_SIZE2(output, IF_IP_TCP_HDR_OFFSET) + len) {
+        if (sdu_size < GET_TCP_HDR_SIZE(output, hdr_offset) + len) {
                 syslog(LOG_INFO, "[TCP] shrink SUD len: %d -> %d",
-                       (uint16_t)len, (uint16_t)(GET_IP_SDU_SIZE(GET_IP_HDR(output)) - GET_TCP_HDR_SIZE2(output, IF_IP_TCP_HDR_OFFSET)));
-                len = GET_IP_SDU_SIZE(GET_IP_HDR(output)) - GET_TCP_HDR_SIZE2(output, IF_IP_TCP_HDR_OFFSET);
-                }
-
-        wptr = GET_TCP_SDU(output, IF_IP_TCP_HDR_OFFSET);
+                       (uint16_t)len, (uint16_t)(sdu_size - GET_TCP_HDR_SIZE(output, hdr_offset)));
+                len = sdu_size - GET_TCP_HDR_SIZE(output, hdr_offset);
+                }
+
+        wptr = GET_TCP_SDU(output, hdr_offset);
 
         /* 通信端点をロックする。*/
@@ -222 +219 @@
 
                         if (IS_PTR_DEFINED(cep->callback))
+
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-
                                 (*cep->callback)(GET_TCP_CEPID(cep), cep->snd_nblk_tfn, (void*)(uint32_t)len);
-
-#else   /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#else
                                 (*cep->callback)(GET_TCP_CEPID(cep), cep->snd_nblk_tfn, (void*)&len);
-
-#endif  /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#endif
                         else
                                 syslog(LOG_WARNING, "[TCP] no call back, CEP: %d.", GET_TCP_CEPID(cep));
@@ -268 +261 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-
                         (*cep->callback)(GET_TCP_CEPID(cep), cep->snd_nblk_tfn, (void*)error);
-
-#else   /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#else
                         (*cep->callback)(GET_TCP_CEPID(cep), cep->snd_nblk_tfn, (void*)&error);
-
-#endif  /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#endif
                 else
                         syslog(LOG_WARNING, "[TCP] no call back, CEP: %d.", GET_TCP_CEPID(cep));
@@ -628 +616 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-
                                 (*cep->callback)(GET_TCP_CEPID(cep), cep->rcv_nblk_tfn, (void*)(uint32_t)len);
-
-#else   /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#else
                                 (*cep->callback)(GET_TCP_CEPID(cep), cep->rcv_nblk_tfn, (void*)&len);
-
-#endif  /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#endif
                         else
                                 syslog(LOG_WARNING, "[TCP] no call back, CEP: %d.", GET_TCP_CEPID(cep));
@@ -680 +663 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-
                                 (*cep->callback)(GET_TCP_CEPID(cep), cep->rcv_nblk_tfn, (void*)(uint32_t)len);
-
-#else   /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#else
                                 (*cep->callback)(GET_TCP_CEPID(cep), cep->rcv_nblk_tfn, (void*)&len);
-
-#endif  /* of #ifdef TCP_CFG_NON_BLOCKING_COMPAT14 */
-
+#endif
                         else
                                 syslog(LOG_WARNING, "[TCP] no call back, CEP: %d.", GET_TCP_CEPID(cep));