Changeset 364 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udpn_input.c

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udpn_input.c (modified) (5 diffs)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udpn_input.c

@@ -75 +75 @@
 {
         T_UDP_HDR       *udph;
-        uint_t          len;
+        T_UDP_RCV_DAT_PARA para;
 
         udph = (T_UDP_HDR *)(input->buf + off);
-        len  = (uint_t)(ntohs(udph->ulen) - UDP_HDR_SIZE);
+        para.len  = (uint_t)(ntohs(udph->ulen) - UDP_HDR_SIZE);
 
         if (cep->rcv_tskid != TA_NULL) {        /* 非ノンブロッキングコールでペンディング中 */
@@ -98 +98 @@
                 /* データをバッファに移す。*/
                 memcpy(cep->rcv_data, GET_UDP_SDU(input, off),
-                       (size_t)(len < cep->rcv_len ? len : cep->rcv_len));
+                       (size_t)(para.len < cep->rcv_len ? para.len : cep->rcv_len));
                 syscall(rel_net_buf(input));
 
@@ -104 +104 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)(uint32_t)len);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)(uint32_t)para.len);
 #else
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)&len);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)&para.len);
 #endif
                 else
@@ -121 +121 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)(uint32_t)len);
+                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)(uint32_t)para.len);
 #else
-                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)&len);
+                para.input = input;
+                para.off = off;
+#if API_PROTO == API_PROTO_IPV4
+                para.rep4.portno = ntohs(udph->sport);
+                IN_COPY_TO_HOST(&para.rep4.ipaddr, input);
+#else
+                para.rep6.portno = ntohs(udph->sport);
+                IN_COPY_TO_HOST(&para.rep6.ipaddr, input);
+#endif
+                (*cep->callback)(GET_UDP_CEPID(cep), TEV_UDP_RCV_DAT, (void*)&para.len);
 #endif
                 /*
@@ -129 +138 @@
                  *  データを読み出さなかったことになるので、捨てる。
                  */
-                if (cep->cb_netbuf != NULL)
-                        syscall(rel_net_buf(cep->cb_netbuf));
+                if (cep->cb_netbuf != NULL) {
+                        if ((input->flags & NB_FLG_NOREL_IFOUT) == 0)
+                                syscall(rel_net_buf(cep->cb_netbuf));
+                        cep->cb_netbuf = NULL;
+                        }
                 }
         else {