Changeset 364 for asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netapp

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

Location:

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netapp

Files:

• Makefile.netapp (modified) (2 diffs)
• dbg_cons.c (modified) (7 diffs)
• dhcp4_cli.c (modified) (2 diffs)
• wwws.c (modified) (2 diffs)

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netapp/Makefile.netapp

@@ -183 +183 @@
                 NETAPP_COBJS := $(NETAPP_COBJS) udp6_echo_cli.o
                 NETAPP_KERNEL_CFG := $(NETAPP_KERNEL_CFG) $(NETAPP_DIRS)/udp6_echo_cli.cfg
-        
+
                 ifeq ($(SUPPORT_INET4),true)
                         ifeq ($(USE_UDP4_ECHO_CLI),true)
@@ -191 +191 @@
                         endif
                 endif
-        else
+                else
                 ifeq ($(SUPPORT_INET4),true)
                         SUPPORT_UDP = true

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netapp/dbg_cons.c

@@ -666 +666 @@
                     "IX Expire State      MAC Address       IP Address\n");
 
-        /* expire の単位は [ms]。*/
+        /* expire の単位は [us]。*/
         get_tim(&now);
         cache = nd6_get_cache();
@@ -705 +705 @@
                     "IX Expire MAC Address       IP Address\n");
 
-        /* expire の単位は [ms]。*/
+        /* expire の単位は [us]。*/
         cache = arp_get_cache();
         for (ix = 0; ix < NUM_ARP_ENTRY; ix ++) {
@@ -753 +753 @@
         WAI_NET_CONS_PRINTF();
         get_tim(&now);
-        cons_printf(portid, "ネットワーク統計情報\t経過時間[ms]\t%lu\t", now);
+        cons_printf(portid, "ネットワーク統計情報\t経過時間[us]\t%lu\t", now);
         if (now > (1000 * 3600 * 24))
                 cons_printf(portid, "%3lu日 %2lu時間 %2lu分 %2lu秒\n",
@@ -938 +938 @@
                 }
 
-        cons_printf(portid, "\nネットワーク統計情報\t経過時間[ms]\t%lu\t", now);
+        cons_printf(portid, "\nネットワーク統計情報\t経過時間[us]\t%lu\t", now);
         if (now > (1000 * 3600 * 24))
                 cons_printf(portid, "%3lu日 %2lu時間 %2lu分 %2lu秒\n",
@@ -1065 +1065 @@
         WAI_NET_CONS_PRINTF();
         get_tim(&now);
-        cons_printf(portid, "ネットワークバッファ情報\t経過時間[ms]\t%u\n", now);
+        cons_printf(portid, "ネットワークバッファ情報\t経過時間[us]\t%u\n", now);
 
 #if NET_COUNT_ENABLE
@@ -1577 +1577 @@
         cons_printf(portid, " IP Address\n");
 
-        /* expire の単位は [ms]。*/
+        /* expire の単位は [us]。*/
         get_tim(&now);
         dr = nd6_get_drl(&count);
@@ -2298 +2298 @@
 
         cons_printf(portid, "ND:\n");
-        cons_printf(portid, "  TMO_ND6_RTR_SOL_DELAY:    %5d[ms]\n", TMO_ND6_RTR_SOL_DELAY);
-        cons_printf(portid, "  TMO_ND6_RTR_SOL_INTERVAL: %5d[ms]\n", TMO_ND6_RTR_SOL_INTERVAL);
+        cons_printf(portid, "  TMO_ND6_RTR_SOL_DELAY:    %5d[us]\n", TMO_ND6_RTR_SOL_DELAY);
+        cons_printf(portid, "  TMO_ND6_RTR_SOL_INTERVAL: %5d[us]\n", TMO_ND6_RTR_SOL_INTERVAL);
         cons_printf(portid, "  NUM_IP6_DAD_COUNT:        %5d\n",     NUM_IP6_DAD_COUNT);
         cons_printf(portid, "  NUM_ND6_CACHE_ENTRY:      %5d\n",     NUM_ND6_CACHE_ENTRY);

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netapp/dhcp4_cli.c

@@ -2031 +2031 @@
 
                         /* 休止する。*/
-                        if (error == E_OK)
-                                syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        if (error == E_OK) {
+                                if (ct->fsm != DHCP4_FSM_SLEEP)
+                                        syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        }
                         else {
                                 syslog(LOG_NOTICE, "[DHCP4C] server not available, go to sleep, error: %s.", itron_strerror(error));
@@ -2158 +2160 @@
 
                         /* 休止する。*/
-                        if (ct->error == E_OK)
-                                syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        if (ct->error == E_OK) {
+                                if (ct->fsm != DHCP4_FSM_SLEEP)
+                                        syslog(LOG_NOTICE, "[DHCP4C] lease released, go to sleep.");
+                        }
                         else {
                                 syslog(LOG_NOTICE, "[DHCP4C] server not available, go to sleep, error: %s.", itron_strerror(ct->error));

asp3_tinet_ecnl_rx/trunk/asp3_dcre/tinet/netapp/wwws.c

@@ -708 +708 @@
         len += put_str(cepid, srbuf, response);
         get_tim(&finish);
-        syslog(LOG_NOTICE, "[WWWn:%02u SND] send: index.html, len: %4u, time: %lu [ms]",
+        syslog(LOG_NOTICE, "[WWWn:%02u SND] send: index.html, len: %4u, time: %lu [us]",
                            cepid, len, (finish - start) * 1000 / SYSTIM_HZ);
         return E_OK;
@@ -1609 +1609 @@
 
         get_tim(&finish);
-        syslog(LOG_NOTICE, "[WWWn:%02u SND]send: stat.html,  len: %4u, time: %lu [ms]",
+        syslog(LOG_NOTICE, "[WWWn:%02u SND]send: stat.html,  len: %4u, time: %lu [us]",
                            cepid, len, (finish - start) * 1000 / SYSTIM_HZ);
         return E_OK;