Changeset 265 for uKadecot/trunk/ecnl_ssp/echonet_uip_task.c

Timestamp:

Nov 18, 2016, 5:30:16 PM (7 years ago)

Author:

coas-nagasima

Message:

ECNL 1.0.3の修正内容を盛り込み
内蔵Webアプリで機器が取得できないのを修正

File:

• uKadecot/trunk/ecnl_ssp/echonet_uip_task.c (modified) (7 diffs)

uKadecot/trunk/ecnl_ssp/echonet_uip_task.c

@@ -127 +127 @@
         }
         a_fbs_id.ptr->hdr.type = ECN_MSG_ECHONET;
-        a_fbs_id.ptr->hdr.target = ENOD_LOCAL_ID;
-        a_fbs_id.ptr->hdr.sender = ENOD_NOT_MATCH_ID;
+        a_fbs_id.ptr->hdr.target.id = ENOD_LOCAL_ID;
+        a_fbs_id.ptr->hdr.sender.id = ENOD_NOT_MATCH_ID;
 
         /* IPアドレスからリモートECHONETノードへ変換 */
@@ -137 +137 @@
         } else {
                 /* 送信元ECHONETノードを記録 */
-                a_fbs_id.ptr->hdr.sender = a_enod_id;
-        }
-        a_fbs_id.ptr->hdr.reply = a_fbs_id.ptr->hdr.sender;
+                a_fbs_id.ptr->hdr.sender.id = a_enod_id;
+        }
+        a_fbs_id.ptr->hdr.reply.id = a_fbs_id.ptr->hdr.sender.id;
 
         /* echonet_taskに送る */
@@ -301 +301 @@
 
         req.ptr->hdr.type = ECN_MSG_INTERNAL;
-        req.ptr->hdr.sender_mbxid = sender;
-        req.ptr->hdr.target_mbxid = ecn_udp_mailboxid;
-        req.ptr->hdr.reply_mbxid = sender;
+        req.ptr->hdr.sender.mbxid = sender;
+        req.ptr->hdr.target.mbxid = ecn_udp_mailboxid;
+        req.ptr->hdr.reply.mbxid = sender;
 
         *pk_req = req;
@@ -330 +330 @@
 
         res.ptr->hdr.type = ECN_MSG_INTERNAL;
-        res.ptr->hdr.sender_mbxid = ecn_udp_mailboxid;
-        res.ptr->hdr.target_mbxid = req.ptr->hdr.reply_mbxid;
-        res.ptr->hdr.reply_mbxid = ecn_udp_mailboxid;
+        res.ptr->hdr.sender.mbxid = ecn_udp_mailboxid;
+        res.ptr->hdr.target.mbxid = req.ptr->hdr.reply.mbxid;
+        res.ptr->hdr.reply.mbxid = ecn_udp_mailboxid;
 
         *pk_res = res;
@@ -395 +395 @@
                 }
 
-                a_ret = psnd_dtq(buf.ptr->hdr.target_mbxid, (intptr_t)buf.ptr);
+                a_ret = psnd_dtq(buf.ptr->hdr.target.mbxid, (intptr_t)buf.ptr);
                 if (a_ret != E_OK) {
                         _ecn_fbs_del(buf);
@@ -418 +418 @@
         }
 
-        a_ret = psnd_dtq(buf.ptr->hdr.target_mbxid, (intptr_t)buf.ptr);
+        a_ret = psnd_dtq(buf.ptr->hdr.target.mbxid, (intptr_t)buf.ptr);
         if (a_ret != E_OK) {
                 _ecn_fbs_del(buf);
@@ -441 +441 @@
         a_dst.portno = 0;
         /* 送信先IPアドレス */
-        a_ret = udp_get_ip(&a_dst, fbs_id.ptr->hdr.target);
+        a_ret = udp_get_ip(&a_dst, fbs_id.ptr->hdr.target.id);
         if (!a_ret) {
                 ECN_DBG_PUT("[UDP TSK] echonet-node 0x%02X-0x%02X-0x%02X → udp dest(%s)",