Changeset 364 for asp3_tinet_ecnl_rx/trunk/ntshell/echonet/echonet_udp6_task.c

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/ntshell/echonet/echonet_udp6_task.c (modified) (7 diffs)

asp3_tinet_ecnl_rx/trunk/ntshell/echonet/echonet_udp6_task.c

@@ -151 +151 @@
 
         /* echonet_taskに送る */
-        a_ret = snd_dtq(ecn_svc_mailboxid, (intptr_t)a_fbs_id.ptr);
-        if (a_ret != E_OK) {
-                ECN_DBG_PUT_2("[UDP ECHO SRV] snd_dtq(ecn_svc_mailboxid) result = %d:%s", a_ret, itron_strerror(a_ret));
+        a_ret = snd_dtq(ecn_svc_dataqueueid, (intptr_t)a_fbs_id.ptr);
+        if (a_ret != E_OK) {
+                ECN_DBG_PUT_2("[UDP ECHO SRV] snd_dtq(ecn_svc_dataqueueid) result = %d:%s", a_ret, itron_strerror(a_ret));
                 goto lb_except;
         }
@@ -201 +201 @@
                 a_timer = ECHONET_UDP_TASK_GET_TIMER;
 
-                a_ret = trcv_dtq(ecn_udp_mailboxid, (intptr_t *)&a_mdt.p_msg, a_timer);
+                a_ret = trcv_dtq(ecn_udp_dataqueueid, (intptr_t *)&a_mdt.p_msg, a_timer);
                 if ((a_ret != E_OK) && (a_ret != E_TMOUT)) {
                         ECN_DBG_PUT_2("trcv_dtq() result = %d:%s", a_ret, itron_strerror(a_ret));
@@ -261 +261 @@
         req.ptr->hdr.type = ECN_MSG_INTERNAL;
         req.ptr->hdr.sender.dtqid = sender;
-        req.ptr->hdr.target.dtqid = ecn_udp_mailboxid;
+        req.ptr->hdr.target.dtqid = ecn_udp_dataqueueid;
         req.ptr->hdr.reply.dtqid = sender;
 
@@ -289 +289 @@
 
         res.ptr->hdr.type = ECN_MSG_INTERNAL;
-        res.ptr->hdr.sender.dtqid = ecn_udp_mailboxid;
+        res.ptr->hdr.sender.dtqid = ecn_udp_dataqueueid;
         res.ptr->hdr.target.dtqid = req.ptr->hdr.reply.dtqid;
-        res.ptr->hdr.reply.dtqid = ecn_udp_mailboxid;
+        res.ptr->hdr.reply.dtqid = ecn_udp_dataqueueid;
 
         *pk_res = res;
@@ -416 +416 @@
                 else if (memcmp(&a_dst.ipaddr, &locl, sizeof(a_dst.ipaddr)) == 0) {
                         /* 送信先が127.0.0.1 → dtqに転送 */
-                        ECN_DBG_PUT_1("redirect ecn_udp_mailboxid → ecn_svc_mailboxid (esv:0x%02X)",
+                        ECN_DBG_PUT_1("redirect ecn_udp_dataqueueid → ecn_svc_dataqueueid (esv:0x%02X)",
                                 ((T_EDATA *)fbs_id.ptr)->hdr.edata.esv);
 
@@ -462 +462 @@
 
         switch (fncd) {
-        case TFN_UDP_CRE_CEP:
+        case TEV_UDP_RCV_DAT:
         case TFN_UDP_RCV_DAT:
                 /* ECN_CAP_PUT("[UDP ECHO SRV] callback_nblk_udp() recv: %u", *(int *)p_parblk); */
@@ -488 +488 @@
                 return E_OK;
 
+        case TFN_UDP_CRE_CEP:
         case TFN_UDP_SND_DAT:
                 break;
         default:
                 ECN_CAP_PUT_2("[UDP ECHO SRV] fncd:0x%04X(%s)", -fncd,
+                        (fncd == TEV_UDP_RCV_DAT ? "TEV_UDP_RCV_DAT" :
                         (fncd == TFN_UDP_CRE_CEP ? "TFN_UDP_CRE_CEP" :
                         (fncd == TFN_UDP_RCV_DAT ? "TFN_UDP_RCV_DAT" :
-                        (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef"))));
+                        (fncd == TFN_UDP_SND_DAT ? "TFN_UDP_SND_DAT" : "undef")))));
 
                 error = E_PAR;