Changeset 331 for EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/ip6_var.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/netinet6/ip6_var.h (modified) (10 diffs)

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/ip6_var.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
  *
@@ -102 +102 @@
 #define _IP6_VAR_H_
 
-#ifdef SUPPORT_INET6
-
 /*
  *  IPv6 ヘッダ・ペイロードアクセスマクロ
@@ -114 +112 @@
 #define GET_IP6_NEXT_HDR(nbuf)          ((uint8_t*)((nbuf)->buf) + IF_IP6_HDR_SIZE)
 
-#define GET_IP6_HDR_SIZE(iph)           (get_ip6_hdr_size(iph))
-#define GET_IP6_SDU_SIZE(iph)           (ntohs((iph)->plen))
-#define GET_IF_IP6_HDR_SIZE(nbuf)       (IF_HDR_SIZE + (GET_IP6_HDR_SIZE(GET_IP6_HDR(nbuf))))
-
-#define SET_IP6_SDU_SIZE(iph,slen)      ((iph)->plen=htons(slen))
+#define GET_IP6_HDR_SIZE(nbuf)          (get_ip6_hdr_size(nbuf))
+#define GET_IP6_SDU_SIZE(nbuf)          (ntohs(GET_IP6_HDR(nbuf)->plen))
+#define GET_IF_IP6_HDR_SIZE(nbuf)       (IF_HDR_SIZE + (GET_IP6_HDR_SIZE(nbuf)))
+
+#define SET_IP6_CF(nbuf,cf)             (GET_IP6_HDR(nbuf)->vcf=htonl(IP6_MAKE_VCF(IP6_VCF_V(ntohl(GET_IP6_HDR(nbuf)->vcf)),cf)))
+#define SET_IP6_SDU_SIZE(nbuf,slen)     (GET_IP6_HDR(nbuf)->plen=htons(slen))
 
 /* ip6_output のフラグ */
@@ -144 +143 @@
 
 /*
- *  IPv4 と IPv6 をコンパイル時に選択するためのマクロ
- */
-
-#define T_TCP_IP_Q_HDR                  T_TCP_IP6_Q_HDR
-
-#define IF_IP_HDR_SIZE                  IF_IP6_HDR_SIZE
-
-#define GET_IP_HDR(nbuf)                GET_IP6_HDR(nbuf)
-#define GET_IP_SDU(nbuf)                GET_IP6_SDU(nbuf)
-
-#define GET_IP_HDR_SIZE(iph)            GET_IP6_HDR_SIZE(iph)
-#define GET_IP_SDU_SIZE(iph)            GET_IP6_SDU_SIZE(iph)
-#define GET_IF_IP_HDR_SIZE(nbuf)        GET_IF_IP6_HDR_SIZE(nbuf)
-
-#define SET_IP_SDU_SIZE(iph,len)        SET_IP6_SDU_SIZE(iph,len)
-
-#define IP_OUTPUT(nbuf,tmout)           ip6_output(nbuf,0,tmout)
-#define IP_INIT()                       ip6_init()
-#define IP_REMOVE_OPTIONS(nbuf)         ip6_remove_exthdrs(nbuf)
-
-/*
  *  IPv6 の MMTU サイズのネットワークバッファ
  */
+
+#if defined(IF_HDR_SIZE)
 
 typedef struct t_net_buf_ipv6_mmtu {
@@ -181 +161 @@
                                 /* バッファ本体               */
         } T_NET_BUF_IPV6_MMTU;
+
+#endif  /* of #if defined(IF_HDR_SIZE) */
 
 /*
@@ -258 +240 @@
  */
 
-typedef struct t_tcp_ip6_q_hdr {
+typedef struct t_ip6_tcp_q_hdr {
         uint8_t vc;             /* Version:        4 bit                */
         uint8_t cf;             /* Traffic Class:  8 bit                */
@@ -268 +250 @@
         T_IN6_ADDR src; /* Source Address                       */
         T_IN6_ADDR dst; /* Destination Address                  */
-        } __attribute__((packed, aligned(2)))T_TCP_IP6_Q_HDR;
+        } __attribute__((packed, aligned(2))) T_IP6_TCP_Q_HDR;
 
 #ifdef SUPPORT_MIB
@@ -304 +286 @@
 
 /*
+ *  変数
+ */
+
+extern uint8_t  ip6_defhlim;
+
+/*
  *  関数
  */
@@ -310 +298 @@
 extern void ip6_init (void);
 extern uint8_t *ip6_get_prev_hdr (T_NET_BUF *nbuf, uint_t off);
-extern uint_t get_ip6_hdr_size (T_IP6_HDR *iph);
+extern uint_t get_ip6_hdr_size (T_NET_BUF *nbuf);
 extern ER_UINT ip6_nexthdr (T_NET_BUF *nbuf, uint_t off, uint_t proto, uint_t *nextp);
 extern ER_UINT ip6_lasthdr (T_NET_BUF *nbuf, uint_t off, uint_t proto, uint_t *nextp);
@@ -320 +308 @@
 extern ER ip6_remove_exthdrs (T_NET_BUF *nbuf);
 
-#endif  /* of #ifdef SUPPORT_INET6 */
-
 #endif  /* of #ifndef _IP6_VAR_H_ */