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

EcnlProtoTool/trunk/asp3_dcre/tinet/netapp/wwws.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
  *
@@ -39 +39 @@
  */
 
-#include <tinet_defs.h>
-
-#include <net/if.h>
-#include <net/if_ppp.h>
-#include <net/if_loop.h>
-#include <net/ethernet.h>
-
-#include <netinet6/in6.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-
 #ifdef TOPPERS_S810_CLG3_85
 #define WWW_SRV_STACK_SIZE              768             /* タスクのスタックサイズ  */
@@ -62 +50 @@
  */
 
-#if defined(NUM_MPF_NET_BUF_IF_PDU) && NUM_MPF_NET_BUF_IF_PDU > 0
+#if defined(USE_TCP_MSS_SEG) || defined(USE_IPV6_MMTU)
 
-#define WWW_SRV_SWBUF_SIZE      ((IF_MTU-(IP_HDR_SIZE+TCP_HDR_SIZE))*1)
-
-#else   /* of #if defined(NUM_MPF_NET_BUF_IF_PDU) && NUM_MPF_NET_BUF_IF_PDU > 0 */
-
-#if defined(SUPPORT_INET4)
-#define WWW_SRV_SWBUF_SIZE      (TCP_MSS)
+#if defined(SUPPORT_INET6)
+#define WWW_SRV_SWBUF_SIZE      (1024)
+#elif defined(SUPPORT_INET4)
+#define WWW_SRV_SWBUF_SIZE      (512)
 #endif
 
-#if defined(SUPPORT_INET6)
-#define WWW_SRV_SWBUF_SIZE      (TCP6_MSS)
-#endif
+#else   /* of #if defined(USE_TCP_MSS_SEG) || defined(USE_IPV6_MMTU) */
 
-#endif  /* of #if defined(NUM_MPF_NET_BUF_IF_PDU) && NUM_MPF_NET_BUF_IF_PDU > 0 */
+#define WWW_SRV_SWBUF_SIZE      (2048)
 
-#if defined(SUPPORT_INET4)
-#define WWW_SRV_RWBUF_SIZE      (TCP_MSS)
-#endif
+#endif  /* of #if defined(USE_TCP_MSS_SEG) || defined(USE_IPV6_MMTU) */
 
 #if defined(SUPPORT_INET6)
-#define WWW_SRV_RWBUF_SIZE      (TCP6_MSS)
+#define WWW_SRV_RWBUF_SIZE      (1024)
+#elif defined(SUPPORT_INET4)
+#define WWW_SRV_RWBUF_SIZE      (512)
 #endif
 
@@ -89 +73 @@
 #define WWW_LINE_SIZE           80
 #define WWW_NUM_FIELDS          4
+
+/*
+ *  タスク数
+ */
 
 #ifndef _MACRO_ONLY
@@ -128 +116 @@
 
 /*
- *  TCP 送受信バッファ
+ *  変数
  */
+
+/* TCP 送受信ウィンドバッファ */
+
+#ifdef NUM_WWW_SRV_TASKS
 
 extern uint8_t www_srv_swbuf[NUM_WWW_SRV_TASKS][WWW_SRV_SWBUF_SIZE];
 extern uint8_t www_srv_rwbuf[NUM_WWW_SRV_TASKS][WWW_SRV_RWBUF_SIZE];
 
+#endif  /* of #ifdef NUM_WWW_SRV_TASKS */
+
+/*
+ *  関数
+ */
+
+extern ER       wakeup_www_srv (char apip);
+
 #endif  /* of #ifndef _MACRO_ONLY */