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

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/nd6_nbr.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_ipcp.h>
 #include <net/net.h>
+#include <net/net_endian.h>
 #include <net/net_var.h>
 #include <net/net_buf.h>
@@ -100 +101 @@
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-
-#include <netinet6/in6.h>
-#include <netinet6/in6_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 <netinet/icmp6.h>
-#include <netinet6/ip6_var.h>
-
 #include <net/if6_var.h>
 
-#ifdef SUPPORT_INET6
+#ifdef _IP6_CFG
 
 /*
@@ -363 +361 @@
 
 void
-nd6_ns_output (T_IFNET *ifp, T_IN6_ADDR *daddr,
-               T_IN6_ADDR *taddr, T_LLINFO_ND6 *ln, bool_t dad)
+nd6_ns_output (T_IFNET *ifp, const T_IN6_ADDR *daddr,
+               const T_IN6_ADDR *taddr, T_LLINFO_ND6 *ln, bool_t dad)
 {
         T_NEIGHBOR_SOLICIT_HDR  *nsh;
@@ -429 +427 @@
 
                 if (saddr && in6_lookup_ifaddr(ifp, saddr))
-                        ip6h->src = *saddr;
+                        memcpy(&ip6h->src, saddr, sizeof(T_IN6_ADDR));
                 else {
                         /*
@@ -441 +439 @@
                                 return;
                                 }
-                        ip6h->src = ifa->addr;
+                        memcpy(&ip6h->src, &ifa->addr, sizeof(T_IN6_ADDR));
                         }
                 }
@@ -455 +453 @@
         nsh->hdr.code        = 0;
         nsh->hdr.data.data32 = 0;
-        nsh->target          = *taddr;
+        memcpy(&nsh->target, taddr, sizeof(T_IN6_ADDR));
 
         if (!dad && (mac = IF_SOFTC_TO_IFADDR(ifp->ic)) != NULL) {
@@ -699 +697 @@
 
 void
-nd6_na_output (T_IFNET *ifp, T_IN6_ADDR *daddr,
-               T_IN6_ADDR *taddr, uint32_t flags, bool_t tlladdr)
+nd6_na_output (T_IFNET *ifp, const T_IN6_ADDR *daddr,
+               const T_IN6_ADDR *taddr, uint32_t flags, bool_t tlladdr)
 {
         T_NEIGHBOR_ADVERT_HDR   *nah;
@@ -747 +745 @@
                 }
         else
-                ip6h->dst = *daddr;
+                memcpy(&ip6h->dst, daddr, sizeof(T_IN6_ADDR));
 
         /*
@@ -757 +755 @@
                 return;
                 }
-        ip6h->src = ifa->addr;
-
-        /* 近隣通知ヘッダを設定する。*/
-        nah = GET_NEIGHBOR_ADVERT_HDR(output, IF_IP6_NEIGHBOR_ADVERT_HDR_OFFSET);
-        nah->hdr.type        = ND_NEIGHBOR_ADVERT;
-        nah->hdr.code        = 0;
-        nah->target          = *taddr;
+        memcpy(&ip6h->src, &ifa->addr, sizeof(T_IN6_ADDR));
+
+        /* 近隣通知ヘッダを設定する。*/
+        nah = GET_NEIGHBOR_ADVERT_HDR(output, IF_IP6_NEIGHBOR_ADVERT_HDR_OFFSET);
+        nah->hdr.type        = ND_NEIGHBOR_ADVERT;
+        nah->hdr.code        = 0;
+        memcpy(&nah->target, taddr, sizeof(T_IN6_ADDR));
 
         /* tlladdr が真ならネットワークインタフェースのアドレスを追加する。*/
@@ -851 +849 @@
         }
 
-#endif /* of #ifdef SUPPORT_INET6 */
+#endif /* of #ifdef _IP6_CFG */