Changeset 364 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet

Timestamp:

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

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

Location:

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet

Files:

• icmp6.h (modified) (1 diff)
• in4_subr.c (modified) (1 diff)
• in_itron.h (modified) (2 diffs)
• tcp_input.c (modified) (1 diff)
• tcp_output.c (modified) (1 diff)
• tcp_usrreq.c (modified) (1 diff)
• udp_var.h (modified) (1 diff)
• udpn_input.c (modified) (5 diffs)
• udpn_usrreq.c (modified) (2 diffs)
• udpn_usrreq_nblk.c (modified) (1 diff)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/icmp6.h

@@ -291 +291 @@
 typedef struct t_router_advert_hdr {
         T_ICMP6_HDR     hdr;
-        uint32_t        reachable;              /* [ms] 到達可能時間  */
-        uint32_t        retransmit;             /* [ms] 近隣要請送信間隔        */
+        uint32_t        reachable;              /* [us] 到達可能時間  */
+        uint32_t        retransmit;             /* [us] 近隣要請送信間隔        */
         /* この後にオプションが続く */
         } __attribute__((packed, aligned(2))) T_ROUTER_ADVERT_HDR;

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

@@ -287 +287 @@
 
         /* IP ヘッダを設定する。*/
-        if ((error = in4_set_header(*nbuf, len, dstaddr, srcaddr, proto, ttl)) != E_OK)
+        if ((error = in4_set_header(*nbuf, len, dstaddr, srcaddr, proto, ttl)) != E_OK) {
+                syscall(rel_net_buf(*nbuf));
+                *nbuf = NULL;
                 return error;
+                }
 
         /* 4 オクテット境界までパディングで埋める。*/

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/in_itron.h

@@ -62 +62 @@
 #define TFN_TCP_ALL             (0)
 
-#define TEV_TCP_RCV_OOB         (-0x201)
+#define TEV_TCP_RCV_OOB         (0x201)
 
 /* UDP 関係 */
@@ -75 +75 @@
 #define TFN_UDP_ALL             (0)
 
-#define TEV_UDP_RCV_DAT         (-0x221)
+#define TEV_UDP_RCV_DAT         (0x221)
 
 /* 一般 */

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

@@ -1364 +1364 @@
         NTOHS(tcph->dport);
 
+        /* SDU 長 より 緊急ポインタが大きい場合 */
+        if (tcph->urp > tcph->sum)
+                goto drop;
+
 find_cep:
 

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

@@ -369 +369 @@
                 tcph->flags |= TCP_FLG_URG;
                 }
-        else
+        else {
+                tcph->urp = 0;
                 cep->snd_up  = cep->snd_una;
+                }
 
 #endif  /* of #ifdef TCP_CFG_EXTENTIONS */

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

@@ -897 +897 @@
 
         /* tcp_rcv_buf の割当て長をリセットする。*/
-        cep->rcv_buf_len = 0;
+        cep->rcv_buf_len -= len;
 
         /* 通信端点のロックを解除する。*/

asp3_tinet_ecnl_arm/trunk/asp3_dcre/tinet/netinet/udp_var.h

@@ -101 +101 @@
 typedef ER      (*t_udp_callback)(ID cepid, FN fncd, void *p_parblk);
 
+typedef struct t_udp_rcv_dat_para {
+        uint_t          len;
+        T_NET_BUF       *input;
+        uint_t          off;
+        union {
+                T_IPV4EP rep4;
+                T_IPV6EP rep6;
+        };
+        } T_UDP_RCV_DAT_PARA;
+
 /*
  *  UDP 通信端点

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 {

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

@@ -411 +411 @@
                 return E_NOEXS;
 #if defined(SUPPORT_INET6)
-#endif
-#if defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
+#elif defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
         switch (optname) {
         case IP_MULTICAST_LOOP:
@@ -488 +487 @@
                 return E_NOEXS;
 #if defined(SUPPORT_INET6)
-#endif
-#if defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
+#elif defined(SUPPORT_INET4) && defined(SUPPORT_IGMP) && TNUM_UDP4_CEPID > 0
         switch (optname) {
         case IP_MULTICAST_LOOP:

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

@@ -122 +122 @@
 
 #ifdef TCP_CFG_NON_BLOCKING_COMPAT14
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)error);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_CAN_CEP, (void*)error);
 #else
-                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_RCV_DAT, (void*)&error);
+                        (*cep->callback)(GET_UDP_CEPID(cep), TFN_UDP_CAN_CEP, (void*)&error);
 #endif
                 else