Changeset 448

Timestamp:

Jul 21, 2020, 6:41:25 PM (4 years ago)

Author:

coas-nagasima

Message:

DHCPの機能はありで、固定IPにする設定を更新

Location:

EcnlProtoTool/trunk/ntshell/src

Files:

• main.c (modified) (1 diff)
• tinet_app_config.h (modified) (4 diffs)

EcnlProtoTool/trunk/ntshell/src/main.c

@@ -355 +355 @@
 #ifndef NTSHELL_NO_SOCKET
                 ether_set_link_callback(netif_link_callback);
+
+                if (!dhcp_enable) {
+                        dhcp4c_rel_info();
+                        in4_add_ifaddr(IPV4_ADDR_STAIC_LOCAL, IPV4_ADDR_STAIC_LOCAL_MASK);
+                }
 #endif
                 {

EcnlProtoTool/trunk/ntshell/src/tinet_app_config.h

@@ -2 +2 @@
  *  TINET (TCP/IP Protocol Stack)
  * 
- *  Copyright (C) 2001-2012 by Dep. of Computer Science and Engineering
+ *  Copyright (C) 2001-2017 by Dep. of Computer Science and Engineering
  *                   Tomakomai National College of Technology, JAPAN
  *
@@ -285 +285 @@
 #ifdef SUPPORT_ETHER
 
-#define IPV4_ADDR_LOCAL                 MAKE_IPV4_ADDR(192,168,137,110)
-#define IPV4_ADDR_LOCAL_MASK    MAKE_IPV4_ADDR(255,255,255,0)
-#define IPV4_ADDR_DEFAULT_GW    MAKE_IPV4_ADDR(192,168,137,1)
+#define IPV4_ADDR_STAIC_LOCAL                   MAKE_IPV4_ADDR(192,168,137,110)
+#define IPV4_ADDR_STAIC_LOCAL_MASK              MAKE_IPV4_ADDR(255,255,255,0)
+#define IPV4_ADDR_STAIC_DEFAULT_GW              MAKE_IPV4_ADDR(192,168,137,1)
+
+#ifdef DHCP4_CLI_CFG
+
+#define IPV4_ADDR_LOCAL                 MAKE_IPV4_ADDR(0,0,0,0)
+#define IPV4_ADDR_LOCAL_MASK    MAKE_IPV4_ADDR(0,0,0,0)
+#define IPV4_ADDR_DEFAULT_GW    MAKE_IPV4_ADDR(0,0,0,0)
+
+#else   /* of #ifdef DHCP4_CLI_CFG */
+
+#define IPV4_ADDR_LOCAL                 IPV4_ADDR_STAIC_LOCAL
+#define IPV4_ADDR_LOCAL_MASK    IPV4_ADDR_STAIC_LOCAL_MASK
+#define IPV4_ADDR_DEFAULT_GW    IPV4_ADDR_STAIC_DEFAULT_GW
+
+#endif  /* of #ifdef DHCP4_CLI_CFG */
 
 #define NUM_IN4_STATIC_ROUTE_ENTRY      3
@@ -610 +624 @@
 /* DNS サーバの IP アドレス */
 
-#if !defined(DHCP6_CLI_CFG)
+//#if !defined(DHCP6_CLI_CFG)
 
 #define IPV6_ADDR_DNS_INIT      \
@@ -618 +632 @@
             UINT_C(0xfe), UINT_C(0x56), UINT_C(0xc5), UINT_C(0xd6) }}}
 
-#endif  /* of #if !defined(DHCP6_CLI_CFG) */
-
-#if !defined(DHCP4_CLI_CFG)
-#define IPV4_ADDR_DNS           MAKE_IPV4_ADDR(192,168,2,1)
-#endif
+//#endif        /* of #if !defined(DHCP6_CLI_CFG) */
+
+//#if !defined(DHCP4_CLI_CFG)
+#define IPV4_ADDR_DNS           MAKE_IPV4_ADDR(192,168,137,1)
+//#endif
 
 /* DOMAIN 名 */