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

EcnlProtoTool/trunk/asp3_dcre/tinet/netinet6/nd6_rtr.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 <netinet6/in6_ifattach.h>
-#include <netinet/ip6.h>
-#include <netinet/icmp6.h>
-#include <netinet6/ip6_var.h>
-
-#include <net/if6_var.h>
+
+#include <net/if_var.h>
 
 /*
@@ -116 +116 @@
 extern const char *itron_strerror (ER ercd);
 
-#ifdef SUPPORT_INET6
+#ifdef _IP6_CFG
 
 #if NUM_ND6_DEF_RTR_ENTRY > 0
@@ -284 +284 @@
          */
         for (ix = NUM_IN6_IFADDR_ENTRY; ix -- > 0; ) {
-                ia = &ifp->in_ifaddrs[ix];
+                ia = &ifp->in6_ifaddrs[ix];
                 if ((ia->flags & (IN6_IFF_DEFINED | IN6_IFF_AUTOCONF)) != 0 &&
                      ia->prefix_index != ND6_PREFIX_IX_INVALID) {
@@ -299 +299 @@
                  */
                 for (ix = NUM_IN6_IFADDR_ENTRY; ix -- > 0; ) {
-                        ia = &ifp->in_ifaddrs[ix];
+                        ia = &ifp->in6_ifaddrs[ix];
                         if ((ia->flags & (IN6_IFF_DEFINED | IN6_IFF_AUTOCONF)) != 0 &&
                              ia->prefix_index != ND6_PREFIX_IX_INVALID) {
@@ -316 +316 @@
                  */
                 for (ix = NUM_IN6_IFADDR_ENTRY; ix -- > 0; ) {
-                        ia = &ifp->in_ifaddrs[ix];
+                        ia = &ifp->in6_ifaddrs[ix];
                         if ((ia->flags & (IN6_IFF_DEFINED | IN6_IFF_AUTOCONF)) != 0)
                                 ia->flags &= ~IN6_IFF_DETACHED;
@@ -448 +448 @@
         /* 各メンバに値を設定する。*/
         fdr->plistmap = 0;
-        fdr->addr     = *src;
+        memcpy(&fdr->addr, src, sizeof(T_IN6_ADDR));
         fdr->lifetime = lifetime * SYSTIM_HZ;           /* lifetime の単位は秒 */
         fdr->flags    = flags;
@@ -478 +478 @@
         int_t           ix;
 
-        lla = &ifp->in_ifaddrs[IPV6_IFADDR_IX_LINKLOCAL];
+        lla = &ifp->in6_ifaddrs[IPV6_IFADDR_IX_LINKLOCAL];
 
         /*
@@ -585 +585 @@
 
         /* リンクローカルアドレスが未登録であれば何もしない。*/
-        lla = &ifp->in_ifaddrs[IPV6_IFADDR_IX_LINKLOCAL];
+        lla = &ifp->in6_ifaddrs[IPV6_IFADDR_IX_LINKLOCAL];
         if ((lla->flags & IN6_IFF_DEFINED) == 0)
                 return E_OK;
@@ -594 +594 @@
          */
         for (ix = NUM_IN6_IFADDR_ENTRY; ix --; ) {
-                ia = &ifp->in_ifaddrs[ix];
+                ia = &ifp->in6_ifaddrs[ix];
                 if (ia->prefix_index == (pr - nd6_prefix))
                         break;
@@ -634 +634 @@
          */
         for (ix = NUM_IN6_IFADDR_ENTRY; ix --; ) {
-                ia = &ifp->in_ifaddrs[ix];
+                ia = &ifp->in6_ifaddrs[ix];
                 if (ia->prefix_index == (pr - nd6_prefix))
                         break;
@@ -692 +692 @@
         T_ND6_PREFIX    *pr = NULL;
         int_t           ix;
-        ER              error;
 
         /* プレフィックスリストから空きのプレフィックスエントリを探索する。*/
@@ -723 +722 @@
 
         if ((pr->flags & ND6_PREFIX_FLAG_ONLINK) != 0) {
-                if ((error = nd6_prefix_onlink(pr)) != E_OK)
+                if (nd6_prefix_onlink(pr) != E_OK)
                         return NULL;
                 }
@@ -812 +811 @@
                         }
 
+#if 1           /* プレフィックスが未登録の場合だけ表示する。*/
+                syslog(LOG_NOTICE, "[ND6 RTR] add prefix: flags[MOH]: %02x, addr: %s\n"
+                                   "                                      from: %s.",
+                                   nd6_def_router[router_index].flags,
+                                   ipv62str(NULL, &pi->prefix),
+                                   ipv62str(NULL, &nd6_def_router[router_index].addr));
+#endif
                 if ((pr->flags & ND6_PREFIX_FLAG_ONLINK) == 0) {
                         /*
@@ -836 +842 @@
          */
         for (ix = NUM_IN6_IFADDR_ENTRY; ix --; ) {
-                ia = &ifp->in_ifaddrs[ix];
+                ia = &ifp->in6_ifaddrs[ix];
                 if ((ia->flags & IN6_IFF_DEFINED) != 0 &&
                     ia->prefix_len == pr->prefix_len &&
@@ -892 +898 @@
                                 }
 
-                        lla = &ifp->in_ifaddrs[IPV6_IFADDR_IX_LINKLOCAL];
+                        lla = &ifp->in6_ifaddrs[IPV6_IFADDR_IX_LINKLOCAL];
 
                         /* プレフィックスマスクを生成する。*/
@@ -922 +928 @@
 
                         for (ix = NUM_IN6_IFADDR_ENTRY; ix --; ) {
-                                ia = &ifp->in_ifaddrs[ix];
+                                ia = &ifp->in6_ifaddrs[ix];
                                 if ((ia->flags & IN6_IFF_DEFINED) == 0) {
                                         in6_ifadd(pr, ia, router_index);
@@ -971 +977 @@
         T_NET_BUF               *output;
         T_IN6_IFADDR            *ifa;
-        T_IN6_ADDR              *saddr;
+        const T_IN6_ADDR        *saddr;
         uint16_t                len;
 
@@ -1017 +1023 @@
 
 T_DEF_ROUTER *
-nd6_defrtrlist_lookup (T_IN6_ADDR *src)
+nd6_defrtrlist_lookup (const T_IN6_ADDR *src)
 {
         T_DEF_ROUTER    *dr = NULL;
@@ -1036 +1042 @@
  */
 
-T_IN6_ADDR *
+const T_IN6_ADDR *
 nd6_router_lookup (void)
 {
@@ -1260 +1266 @@
                                 syslog(LOG_NOTICE, "[ND6 RTR] preferred(%d) > valid time(%d).", ntohl(pi->preferred), ntohl(pi->valid));
                         else {
-                                syslog(LOG_NOTICE, "[ND6 RTR] update prefix: %s from %s.",
-                                                   ipv62str(NULL, &pi->prefix), ipv62str(NULL, &ip6h->src));
+#if 0   /* プレフィックスが未登録の場合だけ表示する。*/
+                                syslog(LOG_NOTICE, "[ND6 RTR] update prefix: flags[MOH]: %02x, addr: %s\n"
+                                                   "                                         from: %s.",
+                                                   rah->nd_ra_flags, ipv62str(NULL, &pi->prefix), ipv62str(NULL, &ip6h->src));
+#endif
                                 if (rix >= 0) {
                                         /*
@@ -1391 +1400 @@
 
 T_ND6_PREFIX *
-nd6_onlink_prefix_lookup (T_IN6_ADDR *dst)
+nd6_onlink_prefix_lookup (const T_IN6_ADDR *dst)
 {
         SYSTIM          now;
@@ -1427 +1436 @@
         }
 
-#endif /* of #ifdef SUPPORT_INET6 */
+#endif /* of #ifdef _IP6_CFG */